174 files changed, 52040 insertions, 27891 deletions

diff --git a/muse2/CMakeLists.txt b/muse2/CMakeLists.txt
index cfffaa8e..b670930e 100644
--- a/muse2/CMakeLists.txt
+++ b/muse2/CMakeLists.txt
@@ -66,9 +66,9 @@ set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
 SET(MusE_VERSION_MAJOR 2)
 SET(MusE_VERSION_MINOR 0)
 SET(MusE_VERSION_PATCH 0)
-SET(MusE_VERSION       "2.0beta2")
-SET(MusE_VERSION_FULL  "2.0beta2")
-SET(MusE_INSTALL_NAME  "muse-2.0beta")
+SET(MusE_VERSION       "2.0rc1")
+SET(MusE_VERSION_FULL  "2.0rc1")
+SET(MusE_INSTALL_NAME  "muse-2.0rc1")
 SET(MusE_EXEC_NAME     "muse2")
 
 ## The directory where we will install the shared components:
diff --git a/muse2/ChangeLog b/muse2/ChangeLog
index 04e0c297..356e62d5 100644
--- a/muse2/ChangeLog
+++ b/muse2/ChangeLog
@@ -1,3 +1,203 @@
+12.12.2011:
+        * Improved: Midi ports list now fills automatically at start. (Marked as p4.0.41 Tim...)
+          An effort to help new users and others. If auto-filling the mid ports proves too much or unpopular, a simple change
+           will keep them out of the list, yet still auto-create and auto-connect Jack midi devices, which is still better than before.
+          Even if and when 'set and forget' configuration is added, this initial filling step may be welcome for new users.
+          NOTE: Virtually impossible to 'auto-pair' together Jack midi inputs and outputs. But I'm working on it, some code in there...
+        - When opening a song, choosing only 'Song data', without configuration, now does not upset the midi configuration at all, 
+           yet controller data was attempted to be kept - may need to remove that effort.
+        - Moved start song loading into main.cpp, with helper in app.cpp. Disabled Florian's 'hackish loader', may be fixed now - TO BE TESTED!. 
+        - List only writeable ports in track list output port column and midi track info combo box.
+        - Jack midi devices now save an additional required rwFlags xml tag.
+        - ALSA Midi fixes: (Un)subscription errors. Delete our simple port! Unsubscribe from announce port. Ignore SND_SEQ_PORT_CAP_NO_EXPORT 
+           ports like 'qjackctrl' or 'port'. TODO: Possibly auto-assign newly discovered devices to available midi ports, in alsaScanMidiPorts().
+        - Hack: "Midi Through" ALSA and Jack devices pushed to end of list, and list sorted, so useful outputs appear first. 
+        - Stopped our own ALSA client from appearing as Jack midi alsa_pcm device.
+10.12.2011:
+        - More improvements to project save dialog. And tries to suggest parent folder if saving existing project. (Tim...)
+        - Midi ports dialog: Auto dis/connect the stated default channels when selecting a device. 
+09.12.2011:
+        - Fixed popup menu behaviour with (nonstandard!) checkable submenus (flo)
+        - Fixed wrong START_DRAG when clicking on popup-columns (flo)
+06.12.2011:
+        - Fixed drawing of logarithmic values (god how I hate these conversions!..!$%) hopefully...
+          should be improved by precalulating max and min values (rj)
+05.12.2011:
+        - Complete Spanish translation from Cristian Ramos (rj)
+03.12.2011:
+        * Improved: Project save dialog: Now has quick save as Template. Separate project/result paths shown. Editable project folder. (Tim...)
+        * Added: Project directory in global settings dialog. 
+        * Added: Untitled project unique names.
+        - Fixed bug saving compressed files with spaces in name, in filedialog.cpp fileOpen().
+          More work in progress... 
+02.12.2011:
+        * Added: Project creation dialog now has file type combobox (.med, .med.gz, .med.bz2) (Tim)
+        * Fixed: Remaining bugs with Header saving and loading (ex track, drum list header). (Tim)
+                 Made two slight fixes in Header::writeStatus and readStatus. Tested thoroughly OK.
+01.12.2011:
+        - Removed global settings User Instruments dir. Now fixed to muse config. Support for old files included. (Tim...)
+        - Changed:  In File Dialog, 'User' initial prepend path changed to muse ./config path. So user files + templates are shown.
+        - Fixed: Template directory changed from /home/templates to muse config directory. Support for old files included.
+        - Moved QSocketNotifier from Audio::Audio into MusE::MusE.
+        - Fixed mixer and main geometry restoration. Moved ahead of doReadGlobalConfig check. 
+        - Work In Progress! More to follow...
+28.11.2011:
+        *Fixed: DSSI synth audio inputs. This means dssi vocoders, samplers etc. should work now. (Tim...)
+        *Re-write: Fixed audio mixing, meter processing. Audio, and meters, for all mono <-> stereo route combinations work sensibly now.
+        - Do not apply the track pan or volume to extra synth channels above 2.
+        - (Re-)fixed valgrind 'invalid read size' in node.cpp, my very-old bad. Moved temp stack buffers to top. (Thnx to Flo)
+        - Window titles of ladspa and dssi plugins now have track name prefix to help identify them.
+        
+        - Added "Unused Devices" menu to the arranger's port popupmenu for rapid device selection (flo)
+28.11.2011:
+        - MusE 2.0 release candidate 1 released (rj)
+27.11.2011:
+        - fixed invalid read problem in node.cpp: replaced the (ab-)use
+          of a temporary stacked buffer (which was deleted too soon)
+          by the use of a temporary heap buffer (new[])   (flo)
+26.11.2011:
+        - Added config properties for add-track menu, show all, show only visible and property for making visible what you add (rj)
+        - Split behaviour and style configuration to two tabs (rj)
+        - Adding invisible tracks no longer update track-info in arranger (rj)
+        - clicking the background in tracklist and arranger no longer clear focus (rj)
+        - moved configuration items for track visibility to global config (rj)
+        - Added right click quit to channel strips (rj)
+25.11.2011:
+        - fixed segfault when closing and SndFileList had more than 1 entry (flo)
+        - fixed some mismatched deletes (delete vs delete[]) (flo)
+24.11.2011:
+        - Fixed: xml song loading ignores very large text such as with Hexter-DSSI. Reported by jphaenlin. (Tim)
+          Changed all local buffers to QByteArray (for unlimited size). Test OK loading/saving large songs + Hexter-DSSI.
+        - Fixed "Invalid Read/Write"-bug with moving parts past the song's end or past the last track. (flo93)
+          The problem was: when the song was automatically enlargened / a new track has automatically been
+                           created, the song was update()d, and thus songChanged() was called. Within
+                           songChanged(), the PartCanvas clearDelete()d its items list, deleting every
+                           data pointed to by that list. However, right after that, the current loop's
+                           CItem* is still used (which has just been deleted, that is, invalidated.).
+                           In case the loop will go on, there would be even more similar errors.
+          Solution: - Added UndoOp::ModifySongLen-action, and used that one for altering song length.
+                    - changed Song::addTrack() to write into operation groups.
+                      adapted all code using Song::addTrack() accordingly
+                    - changed PartCanvas::moveItem() to support whole lists of operations.
+        - Fixed a small unused-parameter warning (flo)
+        - Updated broken (but unused) UndoOp::typeName() function (flo)
+                    
+23.11.2011:
+        - Fundamental audio engine fixes/changes together with a variety of other fixes. (Tim...)
+        - Process track and plugin dssi controls always now, even if off. Fixed problems adjusting/saving gui values. TODO: Dssi when off.
+        - User is now forbidden to do circular routing. Routing menu items are now disabled according to whether they would cause a loop.
+          Installed anti-circular routing mechanism, allows processing should a circular route actually exist (old files, bugs, deliberate? etc). 
+        - Fixed jack.cpp: Connecting routes. Some code was not checking if routes were JACK_ROUTE types, leading to errors.
+        * Fixed: Soloing system problems. Forgot to solo-chain all the way back to a midi track. Also fixed crashes if soloing a circular route.
+        * Fixed: Aux Tracks. They should 'just work' always now. Required major processing-order changes and routing path support/checking.
+          NOTE: Cannot use a track's aux sends if the track has an input route path from ANY Aux Track! Aux knobs/labels now DISABLED in that case.
+22.11.2011:
+        - Increased contrast for midi event drawing in parts (rj)
+21.11.2011:
+        - added super-glue feature (flo)
+17.11.2011:
+        - Fixed all arranger/pianoroll/drumedit keyboard scrolling. (Tim)
+          Changed PartCanvas and EventCanvas ::keyPress() key scrolling sections. Plus custom behavior tweaks in each case.
+16.11.2011:
+        - Ctrl+click or middle button now sets an absolute value for Knobs (as good as possible without advanced arithmetic) (rj)
+        - Structure operations: Split,Cut,Insert now work on audio tracks. The previous functionality with operating on selected
+          tracks have been split into separate menu items (rj)
+15.11.2011:
+        - Fixed wacky arranger part selection via KB when 'Move single armed track with selection' set. (Tim)
+          Arranger::songChanged() was way too liberal, esp calling partsChanged(). Side benefit: Arranger speed-ups.
+        - Changed internal 'undo' shortcut from ctrl-y to standard shift-ctrl-z. (Tim)
+14.11.2011:
+        - Fixed: Do not clear midi ports upon 'new' (template) or 'import midi'. (Tim)
+          Enabled some old code with which I had problems before, but that was long before 'clearing' fixes. 
+          Remaining TODOS: 'New' Synth.med template still replaces existing midi ports, and only
+           the first port appears to be auto-connected to inputs upon import midi.
+        - fixed ScoreEdit bug: names are removed from the set on close and on delete. (Flo)
+        - indentation fixes in scoreedit.cpp,h and cobject.cpp (Flo)
+        - Removed 18.06.2011 experiment. Do not allow Synths to route to midi track inputs. (Tim) 
+          It worked with MESS so far, allowed recording gui control movement. May prove useful 
+           in future, but is a big auto-routing hassle ATM. Sections marked p4.0.35.
+13.11.2011:
+        - ScoreEdit now saves some default init values (flo)
+        - seems like this fixed some valgrind bugs as well (flo)
+12.11.2011:
+        - fixed "newly created subwins aren't focussed" problem (flo)
+        - when closing a subwin, automatically another (topmost) subwin 
+          gets activated (flo)
+        - fixed "non-subwin topwin-states aren't restored when using
+          'muse2 songfile.med'. (don't know who, probably Tim)
+11.11.2011:
+        -  Fixed all template .med song files. (Tim)
+10.11.2011:
+        - Updated spanish translation by Cristian Ramos (rj)
+        - Fixed meters not updating upon vertically shrinking arranger. (Tim)
+        - Fixed TopWin xml errors such as "MusE: unknown tag <topwin [or tool or arranger] > at line xxxx". (Tim)
+          Used new TopLevelList::findType() in MusE::readToplevels() to find arranger, marker, and cliplist. Was broken !
+          So, arranger now remembers its settings (mostly).
+          TODO: Fix broken default.med file, has serious xml errors. For long time MarkerView hasn't recalled its visibility.
+09.11.2011: 
+        - Further to 02.11.2011: Automatically convert old songs to use new 'fluid_synth' name.  (Tim...)
+        - Added enum Synth::Type (MESS_SYNTH, DSSI_SYNTH etc) and used it throughout, ex. in findSynth(), also in song file.
+          Protects from name conflicts with future MESS, DSSI synths, and simplifies adding future types (say LV2 etc.)
+        - Simplified populateAddSynth(), made it agnostic. No more hard-coded synth type sorting - uses Synth::Type now. 
+        - Fixed settings synth config lists not updated when 'Remove Instance' clicked. Also now shows the type in the lists. 
+        - Fixed regression: No synthesizer patch names were listed.
+07.11.2011:
+        - fixed restore-window-state bug (flo)
+        - fixed dialog translation problem (flo)
+        - Updated spanish translation by Cristian Ramos (rj)
+06.11.2011:
+        - auto-expand fix (flo)
+        - NoteInfo-toolbar fix (flo)
+04.11.2011:
+        - more valgrind fixes (flo)
+02.11.2011:
+        - Fixed new runtime errors "undefined symbol fluid_synth_cc" and "fluid_synth_set_reverb", seen on Ubuntu 11.10 (Tim).
+          MusE "fluidsynth.so" module renamed "fluid_synth.so". Error seems due to required cmakelists LINK_FLAGS line, now removed. 
+          Also removed required LINK_FLAGS line in fluid cmakelists.  
+          PLEASE REMOVE THE OLD fluidsynth.so ! Or uninstall muse before installing again.
+01.11.2011:
+        - Fixed Shortcut translations (flo)
+        - Added a QSplitter to the shortcut dialog (flo)
+31.10.2011:
+        - Translation code fixes and added almost-complete German translation (flo)
+28.10.2011:
+        - Slight fix of midi SMF 1 export. Include meta 0x01 text event comment. (Tim)
+        - Added Automation header in Song::execMidiAutomationCtlPopup().
+        - Code comments cleanup in Song. 
+27.10.2011:
+        - Adapt context menu in arranger after what track types are currently visible there
+          Now it only allows to create the track types which are set to be visible (rj)
+        - Uninitalized value fixes in ScoreEdit (flo)
+26.10.2011:
+        - Changed visibility of utility tracks so they are not seen by default in arranger (rj)
+        - Added a default audio connection in default.med (rj)
+        - More memory access fixes (flo)
+24.10.2011:
+        - Fixed bug #3293339: Midi file export SMF format 0 broken. (Tim)
+          Removed erroneous extra 2 bytes. Allow metas in SMF0 in MidiFile::writeEvent().
+          Fixed very weird timing issue MidiFile::write(). See comments there (hidden problems lurking still?). 
+          Use single MidiFileTrack for SMF0 in MusE::exportMidi(). Added info to export dialog indicating that 
+           SMF 0 grabs the track name and comment from first midi track in arranger. Iterate full tracks list 
+           instead of midis list in MusE::exportMidi(), so that user can rearrange tracks on the fly before exporting. 
+          Some not fully understood useage of meta 0x0F/0x01 text events in MusE::exportMidi(). Hopefully correct...
+        - Memory access fixes (flo)
+22.10.2011:
+        - Catch return in spin boxes and move focus away (rj)
+21.10.2011:
+        - rename fix (flo)
+20.10.2011:
+        - Added missing triplets in quantisation dialog (rj)
+16.10.2011:
+        - Fixed crashes reloading songs having open editors. Previous memleak fixes revealed some problems. (Tim)
+          Installed bool TopWin::deleting(). It is set true when closeEvent() is called in any self-deleting TopWins.
+          Used it to make all such TopWins and their corresponding child canvasses ignore songChanged signals.
+          Test OK so far, multiple reloads of song with all track types, all windows open.
+14.10.2011:
+        - Fixed keyboard navigation in tracks to work with hidden tracks (rj)
+12.10.2011:
+        - Made the plugins aware of namespaces. (Orcan)
+11.10.2011:
+        - Fixed the build of experimental rhythm generator. (Orcan)
 09.10.2011:
         - Fixed track list midi port popup menu - too many ports listed. Separated empty ports into submenu. (Tim)
 06.10.2011:
diff --git a/muse2/README b/muse2/README
index 1770950b..f9287458 100644
--- a/muse2/README
+++ b/muse2/README
@@ -17,99 +17,145 @@ details.
 `-----------------------------------------------------------------'
 
   =============================
-      Requirements
+      Requirements:
   =============================
       
 
       - CMake >= 2.4 
-        http:/www.cmake.org/HTML/Download.html
+          http:/www.cmake.org/HTML/Download.html
 
       - QT: Qt >= 4.2.0 
-        ftp://ftp.trolltech.com/qt/source
-        MusE does _not_ compile with older versions
+          http://qt.nokia.com/products/
+          MusE does _not_ compile with older versions
 
       - gcc >= 4.x.x
 
       - libsndfile >= 1.0.1
-        http://www.mega-nerd.com/libsndfile/
+          http://www.mega-nerd.com/libsndfile/
 
       - libsamplerate
+          http://www.mega-nerd.com/SRC/
 
       - JACK >= 0.103
           http://jackit.sourceforge.net/download/
 
+      - libuuid
+         e2fsprogs package http://e2fsprogs.sourceforge.net/
+         Some distros may include it in another package, offering a choice.
+
       Optional:
 
       - fluidsynth >= 1.0.3 (formerly known as iiwusynth) from
         http://savannah.nongnu.org/download/fluid
 
-      - OSC (Open Sound Control) 
-      - DSSI (Disposable Soft Synth Interface) with support for DSSI vst plugins.
-        (Both recommended - DSSI alone will have no DSSI GUIs. OSC alone does nothing, for now.)
+      - liblo           Lightweight OSC (Open Sound Control)    http://liblo.sourceforge.net/
+      - DSSI            Disposable Soft Synth Interface.        http://dssi.sourceforge.net/
+          (Both recommended - DSSI alone will have no native GUIs, OSC alone does nothing, for now.)
+
+      - dssi-vst        Support for DSSI vst plugins            http://www.breakfastquay.com/dssi-vst/
 
-      - LASH Audio Session Handler
+      - LASH            Audio Session Handler                   http://lash.nongnu.org/
+         Recently LADISH has been emulating it instead.         http://ladish.org/
       
       - ConTeXt (for building documentation, by default the build
                script tries to build documentation, can be
                disabled by setting ENABLE_DOCUMENTATION to OFF)
 
   =============================
-      Compiling:
+      Building MusE:
   =============================
 
       - Download source from http://lmuse.sourceforge.net/
 
-      - Command line to unpack source:
-            tar xvofz muse-x.y.z.tar.gz 
-         where x.y.z is the version number.
-        Or just use a graphical de-compressor to unpack it somewhere.  
+      - Unpack the source somewhere.  
+
+        You may also try the various MusE development SVN branches for 
+         up-to-the-minute features and fixes, but they may be less stable. 
 
       - To compile MusE, run the following commands from the 
          top level directory where the source code was unpacked
-         (the directory where THIS README FILE is): 
+         (the directory where THIS README FILE is found): 
        
 	******************************************************
         *                      Notice:                       *
-        * a quicker way is to run the ./compile_muse.sh      *
+        * A quick way is to run the ./compile_muse.sh        *
         * script in the same dir, it should perform the same *
         * steps for a basic setup without asking any         *
-        * questions. If it fails you may be better of using  *
+        * questions. If it fails you may be better off using *
         * the instructions below.                            *
         ******************************************************
  
-          # Create build directory. Choose any name like 'build'.
-              mkdir build                                      
-          # Enter build directory.
-              cd build                                         
-          
-          # Create make system in the build directory.
-          # Optional <Prefix> is the location to install MusE, default /usr/local.
-          # Build type can be blank (to reset a previous cached type to 'empty'), 
-          #  debug, release, RelWithDebInfo and MinSizeRel.
-          # If no CMAKE_BUILD_TYPE is given at all, cmake uses either the previous 
-          #  cached value, or else 'empty' (plain unoptimized).
-          # ('Release' type is recommended, otherwise it builds a plain unoptimized program.)
-              cmake -DCMAKE_BUILD_TYPE=release [-DCMAKE_INSTALL_PREFIX=<prefix>] ../
-          
-          # Compile muse
-              make                                             
-            
-      - Install MusE:
-              Run "make install"  (as root user)
+        The build directory:
+        --------------------
+          Building in a subdirectory is recommended to keep the build directory separate from the source tree. 
+          So create a new subdirectory with a useful name like "build" or "debug" or "release": 
+            mkdir build
+          Change directory (cd) to the new directory: 
+            cd build  
+
+        Configuration:
+        --------------
+          There are a few different ways to configure (notice the two dots):
+
+          Type "cmake -i .." to run in step-by-step 'Wizard' mode. 
+
+          Or type "cmake -L .." to see options, then compose "cmake <options>" yourself. 
+          Some <options> are:
+
+            -DCMAKE_BUILD_TYPE=<type>
+               <type> can be blank (to reset a previous cached type to 'empty'), 
+                debug, release, RelWithDebInfo and MinSizeRel.
+               Release is recommended, to get optimizations.
+               If no CMAKE_BUILD_TYPE is given at all, cmake uses either the previous 
+                cached value, or else 'empty' (plain or default system optimizations).
+
+            -DCMAKE_INSTALL_PREFIX=<prefix>
+               The installation <prefix> where the program is installed.
+               The default is to install in /usr/local.
+
+          Or type "ccmake .." (if you have it - text-mode GUI). It may be blank so hit  
+           'C' to first-time configure. Fiddle with yer options if ye so desire, then hit 
+           'C' to configure then 'G' to generate and exit, or 'Q' to quit without 
+           generating. 
+
+          Or there is also a desktop GUI for cmake called cmake-gui.
+
+        Compiling:
+        ----------  
+          After configuration, while still in the build directory,type:
+            make 
+
+        Installing:
+        ----------  
+          After compiling, type:
+            make install (as root) 
+           or
+            sudo make install
 
   =============================
-      running MusE
+      Running MusE:
   =============================
 
-      MusE is a realtime program which requires special rights to
-      work poperly.
       Recommended setup:
+      ------------------
+        MusE is a realtime program which requires special rights to work properly.
 
-      - check if you are running a sufficiently new linux kernel > 2.6.x
+      - Check if you are running a sufficiently new linux kernel > 2.6.x
+        A modern, standard destop kernel might suit your needs.
+        However, for the best performance a so-called 'low latency' or 'realtime' 
+         kernel may be required. Check your distro's packages for availability. 
 
       - create an "audio" group if it does not already exists
         and put yourself into this group
 
+      - For realtime priority, you may want to ensure either the file:
+           /etc/security/limits.conf
+         or
+           /etc/security/limits.d/audio.conf
+         contains:
+           @audio   -  rtprio     95
+           @audio   -  memlock    unlimited
+
       - make sure you can acces the realtime clock (RTC)
             chmod 660 /dev/rtc
             chgrp audio /dev/rtc
@@ -119,18 +165,39 @@ details.
             inspect with:
             cat /proc/sys/dev/rtc/max-user-freq
 
-      - for MusE to gain RT priviledges load the "realtime-lsm"
-        modul; the modul should be configured to give all "audio"
-        group members realtime priviledges
-
       - some distros do not load the alsa sequencer module by default.
         if necessary, load the alsa sequencer module with:
             /sbin/modprobe snd-seq
 
-      - start qjackctl
-            - start JACK with qjackctl
-
-      - start MusE
+      - Start jack, typically by using the qjackctl application.
+        MusE can also be run without Jack. MusE will use a dummy audio 
+         driver if Jack is not detected, or the -a option is given.
+
+
+      Running:
+      ------------------
+        start MusE by typing:
+            muse2 <options>
+
+          Some <options> are:
+            -h       help
+            -v       print version
+            -d       debug mode: no threads, no RT
+            -D       debug mode: enable some debug messages
+                                  specify twice for lots of debug messages
+                                  this may slow down MusE massively!
+            -m       debug mode: trace midi Input
+            -M       debug mode: trace midi Output
+            -s       debug mode: trace sync
+            -a       no audio
+            -P  n    set audio driver real time priority to n
+                      (Dummy only, default 40. Else fixed by Jack.)
+            -Y  n    force midi real time priority to n (default: audio driver prio +2)
+            -p       don't load LADSPA plugins
+            -I       don't load DSSI plugins
+            -L       don't use LASH
+            -l  xx   force locale to the given language/country code
+                      (xx = de,en,es,fr,pl,ru,sv_SE)
 
       (JACK and all its clients (qjackctl & MusE) must run with the
       same user id)
@@ -140,7 +207,7 @@ details.
       known bugs
   =============================
 
-      - many
+      - not so many: only some usability quirks we're working on currently
 
 ====================================================================
 Let us know whether MusE works for you !!!
diff --git a/muse2/README.de b/muse2/README.de
index 00b55960..04e2c301 100644
--- a/muse2/README.de
+++ b/muse2/README.de
@@ -67,4 +67,5 @@ Für Einzelheiten siehe COPYING.
 ====================================================================
 Aktuelle(re) Infos gibt es auf der MusE Homepage
 http://lmuse.sourceforge.net/
+und in der englischen README
 
diff --git a/muse2/README.svn-branch b/muse2/README.svn-branch
new file mode 100644
index 00000000..94e44ed8
--- /dev/null
+++ b/muse2/README.svn-branch
@@ -0,0 +1,125 @@
+Branches are handy for developing larger features (especially if you
+temporarily break muse and then fix it again). You might want to ask
+why you shouldn't simply develop in your local working copy, and then
+commit a huge chunk. Well, this has multiple reasons:
+  o with branches, you'll have a history, because there are many small
+    commits. this makes bisecting for finding a bug possible.
+  o when you develop your feature publicly, others can check out half-done
+    versions, and already test the one half. they also could fix bugs.
+  o another advantage of keeping it public is: others can see whether you
+    may exclude some use case and inform you about that in time. otherwise
+    you'd spend lots of work in a design which was obsolete from the
+    beginning.
+  o and it shows that there's something going on :)
+
+also, branching makes "feature freezes" easier, for release planning.
+
+General note: ^/trunk means [url of the repo]/trunk. when you're inside
+a working copy, svn understands the ^/trunk notation.
+i assume you're inside some working copy
+
+whenever merging, make sure you're in the correct directory!
+
+CREATING A BRANCH
+  the following command creates a branch called yourbranch in the branches
+  directory, which is built upon the current (NOT the checked out!) trunk
+  revision:
+
+  svn copy ^/trunk ^/branches/yourbranch
+
+  svn copy does a "light copy", that is, as long as you don't change files,
+  they don't occupy any disk space.
+
+USING THE BRANCH
+  you might want to checkout every branch relevant to you into another local
+  copy. believe me, it makes life easier. alternatively, svn switch is your
+  friend.
+  just develop inside the working copy, then commit.
+
+MERGING WITH THE PARENT BRANCH (in my example: the trunk)
+  from time to time, you want to update your branch to represent the
+  current trunk plus your changes (and not an ancient trunk plus your
+  changes). to be safe, only merge with the parent branch, and only
+  merge in one direction (usually from trunk into your branch), unless
+  you know what you're doing. if you're reading and not skimming this,
+  you're probably NOT knowing. svn help and google are your friends.
+
+  be in your branch'es working directory root (the dir which is containing
+  all the files/dirs also trunk (the parent) is containing as well.
+
+  svn merge ^/trunk --accept postpone
+
+  does the job for you. there might be conflicts, when both in your branch
+  and in trunk some file has been changes at a similar location. svn by
+  default asks you what to do then, which is annoying. --accept postpone
+  turns this off, and gives you a summary at the end of the merge.
+  
+  If There Were Conflicts:
+    if any file in "svn status"'s output has a C in front of it, there are
+    conflicts. open the file in your editor, and look for markers like
+    "<<<<<", "=====" and ">>>>>". these show what code is in the trunk
+    (between <<<< and ====), and what code is in your branch (between
+    ==== and >>>>) (or vice versa. svn tells you).
+    you have to make it work again and save the file.
+    
+    with "svn resolved FILENAME" or "svn resolved -R some/directory" you
+    mark the conflicts for FILENAME or all files below some/directory as
+    solved.
+  
+  Another word about conflicts: there may be conflicts, even if svn doesn't
+  note them. ALWAYS recompile the merged code and test it.
+  
+  if done, you can commit the merge normally using "svn commit"
+  
+PUTTING YOUR WORK BACK INTO THE PARENT BRANCH (in my example: trunk)
+  do a final merge from your parent branch into your branch. compile and
+  test.
+  then there are several ways to proceed:
+    o use svn merge --reintegrate, which doesn't work with the old repo
+      version muse is using :(
+    o go into the trunk (or the parent branch'es directory), and issue
+         svn merge ^/branches/yourbranch --accept theirs-full
+      the problem with the merge is, that every previous merge from trunk
+      into your branch will be applied a second time, which doesn't work.
+      --accept theirs-full will basically use the files in your branch.
+      you might want to verify with diff:
+         diff -R /path/to/local/trunk /path/to/local/yourbranch
+      there should be no differences.
+      
+      commit that to trunk: svn commit
+
+      then, "fake-merge" trunk into your branch again. otherwise, with the
+      next merge from trunk into your branch, we would have the duplicate
+      changes problem again. if you're _SURE_ that you aren't using the
+      branch any more, you can leave this step out.
+
+      svn merge ^/trunk ^/branches/yourbranch --record-only
+      svn commit
+     
+
+  this solution is a bit hackish :( but it works
+
+
+NOTES FOR RELEASE BRANCHES
+  after creating the release branch, ALL commits which are fixing bugs
+  must go into the release branch. ALL commits which are adding features
+  must go into trunk or other branches.
+  the team should focus on fixing bugs in the release branch.
+  to get the fixes into the trunk, from time to time run:
+
+  svn merge ^/branches/releasebranch ^/trunk
+  svn commit (in trunk's local copy)
+  
+  when releasing the release branch, merge it into the trunk a last time,
+  and then never touch the release branch again.
+  for the next release, create a new one.
+
+TAGGING
+  when there's any reason for tagging a revision, simply do
+  svn copy ^/whatever ^/tags/yourtagname
+  read the svn manual for details
+
+GETTING HELP:
+  svn help <command> (usage notes, short explanations)
+  google (everything)
+  the svn book (->google) (long explanations)
diff --git a/muse2/awl/drawbar.cpp b/muse2/awl/drawbar.cpp
index 7352218c..f87dab5e 100644
--- a/muse2/awl/drawbar.cpp
+++ b/muse2/awl/drawbar.cpp
@@ -26,10 +26,6 @@
 
 namespace Awl {
 
-#if 0
-      }
-#endif
-
 //---------------------------------------------------------
 //   Drawbar
 //---------------------------------------------------------
diff --git a/muse2/awl/sigspinbox.cpp b/muse2/awl/sigspinbox.cpp
index 6e38b164..f1399538 100644
--- a/muse2/awl/sigspinbox.cpp
+++ b/muse2/awl/sigspinbox.cpp
@@ -1,14 +1,33 @@
 #include "sigspinbox.h"
 #include "al/sig.h"
 #include <QKeyEvent>
+#include <QMouseEvent>
 #include <stdio.h>
+#include <QLineEdit>
+
+class MyLineEdit : public QLineEdit
+{
+  public:
+    MyLineEdit() : QLineEdit() {};
+    MyLineEdit(QWidget* parent) : QLineEdit(parent) {};
+    
+  protected:
+    virtual void mousePressEvent (QMouseEvent* e)
+    {
+      QLineEdit::mousePressEvent(e);
+      selectAll();
+    }
+};
+
 
 SigSpinBox::SigSpinBox(QWidget *parent) :
     QSpinBox(parent)
 {
   _denominator=false;
+  setLineEdit(new MyLineEdit(this));
 }
-void SigSpinBox::keyPressEvent(QKeyEvent*ev)
+
+void SigSpinBox::keyPressEvent(QKeyEvent* ev)
 {
     switch (ev->key()) {
       case Qt::Key_Return:
diff --git a/muse2/muse/app.cpp b/muse2/muse/app.cpp
index 386cf226..c71e23fc 100644
--- a/muse2/muse/app.cpp
+++ b/muse2/muse/app.cpp
@@ -4,6 +4,7 @@
 //  $Id: app.cpp,v 1.113.2.68 2009/12/21 14:51:51 spamatica Exp $
 //
 //  (C) Copyright 1999-2011 Werner Schweer (ws@seh.de)
+//  (C) Copyright 2011 Tim E. Real (terminator356 on sourceforge)
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -33,6 +34,8 @@
 #include <QProgressDialog>
 #include <QMdiArea>
 #include <QMdiSubWindow>
+#include <QSocketNotifier>  
+#include <QString>
 
 #include <iostream>
 
@@ -55,6 +58,7 @@
 #include "filedialog.h"
 #include "gconfig.h"
 #include "gui.h"
+#include "helper.h"
 #include "icons.h"
 #include "instruments/editinstrument.h"
 #include "listedit.h"
@@ -84,8 +88,11 @@ extern void exitJackAudio();
 extern void exitDummyAudio();
 extern void exitOSC();
 extern void exitMidiAlsa();
-}
 
+extern void initMidiSequencer();   
+extern void initAudio();           
+extern void initAudioPrefetch();   
+}
 
 namespace MusEGui {
 
@@ -93,31 +100,13 @@ namespace MusEGui {
 
 static pthread_t watchdogThread;
 //ErrorHandler *error;
-static const char* fileOpenText =
-      QT_TRANSLATE_NOOP("@default", "Click this button to open a <em>new song</em>.<br>"
-      "You can also select the <b>Open command</b> from the File menu.");
-static const char* fileSaveText =
-      QT_TRANSLATE_NOOP("@default", "Click this button to save the song you are "
-      "editing.  You will be prompted for a file name.\n"
-      "You can also select the Save command from the File menu.");
-static const char* fileNewText        = QT_TRANSLATE_NOOP("@default", "Create New Song");
-
-static const char* infoLoopButton     = QT_TRANSLATE_NOOP("@default", "loop between left mark and right mark");
-static const char* infoPunchinButton  = QT_TRANSLATE_NOOP("@default", "record starts at left mark");
-static const char* infoPunchoutButton = QT_TRANSLATE_NOOP("@default", "record stops at right mark");
-static const char* infoStartButton    = QT_TRANSLATE_NOOP("@default", "rewind to start position");
-static const char* infoRewindButton   = QT_TRANSLATE_NOOP("@default", "rewind current position");
-static const char* infoForwardButton  = QT_TRANSLATE_NOOP("@default", "move current position");
-static const char* infoStopButton     = QT_TRANSLATE_NOOP("@default", "stop sequencer");
-static const char* infoPlayButton     = QT_TRANSLATE_NOOP("@default", "start sequencer play");
-static const char* infoRecordButton   = QT_TRANSLATE_NOOP("@default", "to record press record and then play");
-static const char* infoPanicButton    = QT_TRANSLATE_NOOP("@default", "send note off to all midi channels");
 
 #define PROJECT_LIST_LEN  6
 static QString* projectList[PROJECT_LIST_LEN];
 
 #ifdef HAVE_LASH
 #include <lash/lash.h>
+#include <lo/lo_osc_types.h>
 lash_client_t * lash_client = 0;
 extern snd_seq_t * alsaSeq;
 #endif /* HAVE_LASH */
@@ -189,14 +178,7 @@ bool MusE::seqStart()
       if(MusEGlobal::realTimeScheduling) 
       {
         {
-          //pfprio = MusEGlobal::realTimePriority - 5;
-          // p3.3.40
           pfprio = MusEGlobal::realTimePriority + 1;
-          
-          //midiprio = MusEGlobal::realTimePriority - 2;
-          // p3.3.37
-          //midiprio = MusEGlobal::realTimePriority + 1;
-          // p3.3.40
           midiprio = MusEGlobal::realTimePriority + 2;
         }  
       }
@@ -216,9 +198,6 @@ bool MusE::seqStart()
       
       MusEGlobal::audioPrefetch->msgSeek(0, true); // force
       
-      //MusEGlobal::midiSeqRunning = !midiSeq->start(MusEGlobal::realTimeScheduling ? MusEGlobal::realTimePriority : 0);
-      // Changed by Tim. p3.3.22
-      //MusEGlobal::midiSeq->start(MusEGlobal::realTimeScheduling ? MusEGlobal::realTimePriority : 0);
       MusEGlobal::midiSeq->start(midiprio);
       
       int counter=0;
@@ -242,7 +221,7 @@ bool MusE::seqStart()
       }  
       return true;
       }
-
+      
 //---------------------------------------------------------
 //   stop
 //---------------------------------------------------------
@@ -276,6 +255,7 @@ bool MusE::seqRestart()
                 }
           seqStop();
           }
+
     if(!seqStart())
         return false;
 
@@ -317,7 +297,7 @@ void addProject(const QString& name)
 //---------------------------------------------------------
 
 //MusE::MusE(int argc, char** argv) : QMainWindow(0, "mainwindow")
-MusE::MusE(int argc, char** argv) : QMainWindow()
+MusE::MusE(int /*argc*/, char** /*argv*/) : QMainWindow()
       {
       // By T356. For LADSPA plugins in plugin.cpp
       // QWidgetFactory::addWidgetFactory( new PluginWidgetFactory ); ddskrjo
@@ -351,6 +331,7 @@ MusE::MusE(int argc, char** argv) : QMainWindow()
       progress              = 0;
       activeTopWin          = NULL;
       currentMenuSharingTopwin = NULL;
+      waitingForTopwin      = NULL;
       
       appName               = QString("MusE");
       setWindowTitle(appName);
@@ -364,8 +345,6 @@ MusE::MusE(int argc, char** argv) : QMainWindow()
       MusEGlobal::heartBeatTimer = new QTimer(this);
       MusEGlobal::heartBeatTimer->setObjectName("timer");
       connect(MusEGlobal::heartBeatTimer, SIGNAL(timeout()), MusEGlobal::song, SLOT(beat()));
-      
-      
       connect(this, SIGNAL(activeTopWinChanged(MusEGui::TopWin*)), SLOT(activeTopWinChangedSlot(MusEGui::TopWin*)));
       
 #ifdef ENABLE_PYTHON
@@ -411,21 +390,21 @@ MusE::MusE(int argc, char** argv) : QMainWindow()
          tr("Loop"), MusEGlobal::transportAction);
       MusEGlobal::loopAction->setCheckable(true);
 
-      MusEGlobal::loopAction->setWhatsThis(tr(infoLoopButton));
+      MusEGlobal::loopAction->setWhatsThis(tr("loop between left mark and right mark"));
       connect(MusEGlobal::loopAction, SIGNAL(toggled(bool)), MusEGlobal::song, SLOT(setLoop(bool)));
       
       MusEGlobal::punchinAction = new QAction(QIcon(*MusEGui::punchin1Icon),
          tr("Punchin"), MusEGlobal::transportAction);
       MusEGlobal::punchinAction->setCheckable(true);
 
-      MusEGlobal::punchinAction->setWhatsThis(tr(infoPunchinButton));
+      MusEGlobal::punchinAction->setWhatsThis(tr("record starts at left mark"));
       connect(MusEGlobal::punchinAction, SIGNAL(toggled(bool)), MusEGlobal::song, SLOT(setPunchin(bool)));
 
       MusEGlobal::punchoutAction = new QAction(QIcon(*MusEGui::punchout1Icon),
          tr("Punchout"), MusEGlobal::transportAction);
       MusEGlobal::punchoutAction->setCheckable(true);
 
-      MusEGlobal::punchoutAction->setWhatsThis(tr(infoPunchoutButton));
+      MusEGlobal::punchoutAction->setWhatsThis(tr("record stops at right mark"));
       connect(MusEGlobal::punchoutAction, SIGNAL(toggled(bool)), MusEGlobal::song, SLOT(setPunchout(bool)));
 
       QAction *tseparator = new QAction(this);
@@ -435,26 +414,26 @@ MusE::MusE(int argc, char** argv) : QMainWindow()
       MusEGlobal::startAction = new QAction(QIcon(*MusEGui::startIcon),
          tr("Start"), MusEGlobal::transportAction);
 
-      MusEGlobal::startAction->setWhatsThis(tr(infoStartButton));
+      MusEGlobal::startAction->setWhatsThis(tr("rewind to start position"));
       connect(MusEGlobal::startAction, SIGNAL(activated()), MusEGlobal::song, SLOT(rewindStart()));
 
       MusEGlobal::rewindAction = new QAction(QIcon(*MusEGui::frewindIcon),
          tr("Rewind"), MusEGlobal::transportAction);
 
-      MusEGlobal::rewindAction->setWhatsThis(tr(infoRewindButton));
+      MusEGlobal::rewindAction->setWhatsThis(tr("rewind current position"));
       connect(MusEGlobal::rewindAction, SIGNAL(activated()), MusEGlobal::song, SLOT(rewind()));
 
       MusEGlobal::forwardAction = new QAction(QIcon(*MusEGui::fforwardIcon),
 	 tr("Forward"), MusEGlobal::transportAction);
 
-      MusEGlobal::forwardAction->setWhatsThis(tr(infoForwardButton));
+      MusEGlobal::forwardAction->setWhatsThis(tr("move current position"));
       connect(MusEGlobal::forwardAction, SIGNAL(activated()), MusEGlobal::song, SLOT(forward()));
 
       MusEGlobal::stopAction = new QAction(QIcon(*MusEGui::stopIcon),
          tr("Stop"), MusEGlobal::transportAction);
       MusEGlobal::stopAction->setCheckable(true);
 
-      MusEGlobal::stopAction->setWhatsThis(tr(infoStopButton));
+      MusEGlobal::stopAction->setWhatsThis(tr("stop sequencer"));
       MusEGlobal::stopAction->setChecked(true);
       connect(MusEGlobal::stopAction, SIGNAL(toggled(bool)), MusEGlobal::song, SLOT(setStop(bool)));
 
@@ -462,23 +441,23 @@ MusE::MusE(int argc, char** argv) : QMainWindow()
          tr("Play"), MusEGlobal::transportAction);
       MusEGlobal::playAction->setCheckable(true);
 
-      MusEGlobal::playAction->setWhatsThis(tr(infoPlayButton));
+      MusEGlobal::playAction->setWhatsThis(tr("start sequencer play"));
       MusEGlobal::playAction->setChecked(false);
       connect(MusEGlobal::playAction, SIGNAL(toggled(bool)), MusEGlobal::song, SLOT(setPlay(bool)));
 
       MusEGlobal::recordAction = new QAction(QIcon(*MusEGui::recordIcon),
          tr("Record"), MusEGlobal::transportAction);
       MusEGlobal::recordAction->setCheckable(true);
-      MusEGlobal::recordAction->setWhatsThis(tr(infoRecordButton));
+      MusEGlobal::recordAction->setWhatsThis(tr("to record press record and then play"));
       connect(MusEGlobal::recordAction, SIGNAL(toggled(bool)), MusEGlobal::song, SLOT(setRecord(bool)));
 
       MusEGlobal::panicAction = new QAction(QIcon(*MusEGui::panicIcon),
          tr("Panic"), this);
 
-      MusEGlobal::panicAction->setWhatsThis(tr(infoPanicButton));
+      MusEGlobal::panicAction->setWhatsThis(tr("send note off to all midi channels"));
       connect(MusEGlobal::panicAction, SIGNAL(activated()), MusEGlobal::song, SLOT(panic()));
 
-      MusECore::initMidiInstruments();
+      MusECore::initMidiInstruments();  
       MusECore::initMidiPorts();
       MusECore::initMidiDevices();
 
@@ -486,20 +465,26 @@ MusE::MusE(int argc, char** argv) : QMainWindow()
       //-------- File Actions
 
       fileNewAction = new QAction(QIcon(*MusEGui::filenewIcon), tr("&New"), this); 
-      fileNewAction->setToolTip(tr(fileNewText));
-      fileNewAction->setWhatsThis(tr(fileNewText));
+      fileNewAction->setToolTip(tr("Create New Song"));
+      fileNewAction->setWhatsThis(tr("Create New Song"));
 
       fileOpenAction = new QAction(QIcon(*MusEGui::openIcon), tr("&Open"), this); 
 
-      fileOpenAction->setToolTip(tr(fileOpenText));
-      fileOpenAction->setWhatsThis(tr(fileOpenText));
+      fileOpenAction->setToolTip(tr("Click this button to open a <em>new song</em>.<br>"
+      "You can also select the <b>Open command</b> from the File menu."));
+      fileOpenAction->setWhatsThis(tr("Click this button to open a <em>new song</em>.<br>"
+      "You can also select the <b>Open command</b> from the File menu."));
 
       openRecent = new QMenu(tr("Open &Recent"), this);
 
       fileSaveAction = new QAction(QIcon(*MusEGui::saveIcon), tr("&Save"), this); 
 
-      fileSaveAction->setToolTip(tr(fileSaveText));
-      fileSaveAction->setWhatsThis(tr(fileSaveText));
+      fileSaveAction->setToolTip(tr("Click this button to save the song you are "
+      "editing.  You will be prompted for a file name.\n"
+      "You can also select the Save command from the File menu."));
+      fileSaveAction->setWhatsThis(tr("Click this button to save the song you are "
+      "editing.  You will be prompted for a file name.\n"
+      "You can also select the Save command from the File menu."));
 
       fileSaveAsAction = new QAction(tr("Save &As"), this);
 
@@ -718,7 +703,7 @@ MusE::MusE(int argc, char** argv) : QMainWindow()
       //rlimit lim;
       //getrlimit(RLIMIT_RTPRIO, &lim);
       //printf("RLIMIT_RTPRIO soft:%d hard:%d\n", lim.rlim_cur, lim.rlim_max);    // Reported 80, 80 even with non-RT kernel.
-      
+
       if (MusEGlobal::realTimePriority < sched_get_priority_min(SCHED_FIFO))
             MusEGlobal::realTimePriority = sched_get_priority_min(SCHED_FIFO);
       else if (MusEGlobal::realTimePriority > sched_get_priority_max(SCHED_FIFO))
@@ -733,18 +718,19 @@ MusE::MusE(int argc, char** argv) : QMainWindow()
             MusEGlobal::midiRTPrioOverride = sched_get_priority_max(SCHED_FIFO);
       }
             
-      // Changed by Tim. p3.3.17
-      //MusEGlobal::midiSeq       = new MusECore::MidiSeq(MusEGlobal::realTimeScheduling ? MusEGlobal::realTimePriority : 0, "Midi");
-      MusEGlobal::midiSeq       = new MusECore::MidiSeq("Midi");
-      MusEGlobal::audio = new MusECore::Audio();
-      //MusEGlobal::audioPrefetch = new MusECore::AudioPrefetch(0, "Disc");
-      MusEGlobal::audioPrefetch = new MusECore::AudioPrefetch("Prefetch");
-
+      MusECore::initMidiSequencer();   
+      MusECore::initAudio();           
+      
+      // Moved here from Audio::Audio
+      QSocketNotifier* ss = new QSocketNotifier(MusEGlobal::audio->getFromThreadFdr(), QSocketNotifier::Read, this); 
+      connect(ss, SIGNAL(activated(int)), MusEGlobal::song, SLOT(seqSignal(int)));  
+      
+      MusECore::initAudioPrefetch();   
+      
       //---------------------------------------------------
       //    Popups
       //---------------------------------------------------
 
-
       // when adding a menu to the main window, remember adding it to
       // either the leadingMenus or trailingMenus list!
       // also do NOT use menuBar()->addMenu(QString&), but ALWAYS
@@ -973,6 +959,11 @@ MusE::MusE(int argc, char** argv) : QMainWindow()
       transport = new MusEGui::Transport(this, "transport");
       bigtime   = 0;
 
+      MusEGlobal::song->blockSignals(false);
+      
+      // Load start song moved to main.cpp     p4.0.41 REMOVE Tim.
+      /*
+      
       //---------------------------------------------------
       //  load project
       //    if no songname entered on command line:
@@ -987,7 +978,8 @@ MusE::MusE(int argc, char** argv) : QMainWindow()
             name = argv[0];
       else if (MusEGlobal::config.startMode == 0) {
             if (argc < 2)
-                  name = projectList[0] ? *projectList[0] : QString("untitled");
+                  //name = projectList[0] ? *projectList[0] : QString("untitled");
+                  name = projectList[0] ? *projectList[0] : MusEGui::getUniqueUntitledName();  // p4.0.40
             else
                   name = argv[0];
             printf("starting with selected song %s\n", MusEGlobal::config.startSong.toLatin1().constData());
@@ -1001,19 +993,47 @@ MusE::MusE(int argc, char** argv) : QMainWindow()
             printf("starting with pre configured song %s\n", MusEGlobal::config.startSong.toLatin1().constData());
             name = MusEGlobal::config.startSong;
       }
-      MusEGlobal::song->blockSignals(false);
-      loadProjectFile(name, useTemplate, true);
-
+      
+      // loadProjectFile(name, useTemplate, true);  //commented out by flo: see below (*)
+      */
+      
       changeConfig(false);
       QSettings settings("MusE", "MusE-qt");
       restoreGeometry(settings.value("MusE/geometry").toByteArray());
       //restoreState(settings.value("MusE/windowState").toByteArray());
 
-      MusEGlobal::song->update();
-      
-      updateWindowMenu();
+      MusEGlobal::song->update(); // commented out by flo: will be done by the below (*)
+      updateWindowMenu();         // same here
+
+      // Load start song moved to main.cpp     p4.0.41 REMOVE Tim.
+      /*
+
+      // this is (*).
+      // this is a really hackish workaround for the loading-on-startup problem.
+      // i have absolutely no idea WHY it breaks when using loadProjectFile()
+      // above, but it does on my machine (it doesn't on others!).
+      // the problem can be worked around by delaying loading the song file.
+      // i use hackishSongOpenTimer for this, which calls after 10ms a slot
+      // which then does the actual loadProjectFile() call.
+      // FIXME: please, if anyone finds the real problem, FIX it and
+      //        remove that dirty, dirty workaround!
+      hackishSongOpenFilename=name;
+      hackishSongOpenUseTemplate=useTemplate;
+      hackishSongOpenTimer=new QTimer(this);
+      hackishSongOpenTimer->setInterval(10);
+      hackishSongOpenTimer->setSingleShot(true);
+      connect(hackishSongOpenTimer, SIGNAL(timeout()), this, SLOT(hackishSongOpenTimerTimeout()));
+      hackishSongOpenTimer->start();
+      */
       }
 
+// Load start song moved to main.cpp     p4.0.41 REMOVE Tim.
+//void MusE::hackishSongOpenTimerTimeout()
+//{
+  ///loadProjectFile(hackishSongOpenFilename, hackishSongOpenUseTemplate, true);   
+  //loadProjectFile(hackishSongOpenFilename, hackishSongOpenUseTemplate, !hackishSongOpenUseTemplate);   
+//}
+
 MusE::~MusE()
 {
 }
@@ -1027,6 +1047,44 @@ void MusE::setHeartBeat()
       MusEGlobal::heartBeatTimer->start(1000/MusEGlobal::config.guiRefresh);
       }
 
+//---------------------------------------------------
+//  loadDefaultSong
+//    if no songname entered on command line:
+//    startMode: 0  - load last song
+//               1  - load default template
+//               2  - load configured start song
+//---------------------------------------------------
+
+void MusE::loadDefaultSong(int argc, char** argv)
+{
+  QString name;
+  bool useTemplate = false;
+  if (argc >= 2)
+        name = argv[0];
+  else if (MusEGlobal::config.startMode == 0) {
+        if (argc < 2)
+              //name = projectList[0] ? *projectList[0] : QString("untitled");
+              name = projectList[0] ? *projectList[0] : MusEGui::getUniqueUntitledName();  // p4.0.40
+        else
+              name = argv[0];
+        printf("starting with selected song %s\n", MusEGlobal::config.startSong.toLatin1().constData());
+        }
+  else if (MusEGlobal::config.startMode == 1) {
+        printf("starting with default template\n");
+        name = MusEGlobal::museGlobalShare + QString("/templates/default.med");
+        useTemplate = true;
+        }
+  else if (MusEGlobal::config.startMode == 2) {
+        printf("starting with pre configured song %s\n", MusEGlobal::config.startSong.toLatin1().constData());
+        name = MusEGlobal::config.startSong;
+  }
+  //loadProjectFile(name, useTemplate, true);  
+  loadProjectFile(name, useTemplate, !useTemplate);  
+  
+  //MusEGlobal::song->update(); 
+  //updateWindowMenu();         
+}
+      
 //---------------------------------------------------------
 //   resetDevices
 //---------------------------------------------------------
@@ -1168,7 +1226,8 @@ void MusE::loadProjectFile1(const QString& name, bool songTemplate, bool loadAll
                   QApplication::restoreOverrideCursor();
                   return;
                   }
-            project.setFile("untitled");
+            //project.setFile("untitled");
+            project.setFile(MusEGui::getUniqueUntitledName());  // p4.0.40
             MusEGlobal::museProject = MusEGlobal::museProjectInitPath;
             }
       else {
@@ -1226,7 +1285,8 @@ void MusE::loadProjectFile1(const QString& name, bool songTemplate, bool loadAll
             }
       if (!songTemplate) {
             addProject(project.absoluteFilePath());
-            setWindowTitle(QString("MusE: Song: ") + project.completeBaseName());
+            //setWindowTitle(QString("MusE: Song: ") + project.completeBaseName());
+            setWindowTitle(QString("MusE: Song: ") + MusEGui::projectTitleFromFilename(project.absoluteFilePath()));
             }
       MusEGlobal::song->dirty = false;
       progress->setValue(30);
@@ -1248,7 +1308,7 @@ void MusE::loadProjectFile1(const QString& name, bool songTemplate, bool loadAll
             //  set the geometry if the mixer has already been created.
             if(mixer1)
             {
-              //if(mixer1->geometry().size() != MusEGlobal::config.mixer1.geometry.size())   // p3.3.53 Moved below
+              //if(mixer1->geometry().size() != MusEGlobal::config.mixer1.geometry.size())   // Moved below
               //  mixer1->resize(MusEGlobal::config.mixer1.geometry.size());
               
               if(mixer1->geometry().topLeft() != MusEGlobal::config.mixer1.geometry.topLeft())
@@ -1256,7 +1316,7 @@ void MusE::loadProjectFile1(const QString& name, bool songTemplate, bool loadAll
             }
             if(mixer2)
             {
-              //if(mixer2->geometry().size() != MusEGlobal::config.mixer2.geometry.size())   // p3.3.53 Moved below
+              //if(mixer2->geometry().size() != MusEGlobal::config.mixer2.geometry.size())   // Moved below
               //  mixer2->resize(MusEGlobal::config.mixer2.geometry.size());
               
               if(mixer2->geometry().topLeft() != MusEGlobal::config.mixer2.geometry.topLeft())
@@ -1285,7 +1345,7 @@ void MusE::loadProjectFile1(const QString& name, bool songTemplate, bool loadAll
       arrangerView->scoreNamingChanged(); // inform the score menus about the new scores and their names
       progress->setValue(50);
 
-      // p3.3.53 Try this AFTER the song update above which does a mixer update... Tested OK - mixers resize properly now.
+      // Try this AFTER the song update above which does a mixer update... Tested OK - mixers resize properly now.
       if (loadAll) 
       {
         if(mixer1)
@@ -1348,10 +1408,13 @@ void MusE::loadProjectFile1(const QString& name, bool songTemplate, bool loadAll
 void MusE::setUntitledProject()
       {
       setConfigDefaults();
-      QString name("untitled");
+      //QString name("untitled");
+      QString name(MusEGui::getUniqueUntitledName());  // p4.0.40
+
       MusEGlobal::museProject = "./"; //QFileInfo(name).absolutePath();
       project.setFile(name);
-      setWindowTitle(tr("MusE: Song: %1").arg(project.completeBaseName()));
+      //setWindowTitle(tr("MusE: Song: %1").arg(project.completeBaseName()));
+      setWindowTitle(tr("MusE: Song: %1").arg(MusEGui::projectTitleFromFilename(name)));
       }
 
 //---------------------------------------------------------
@@ -1403,14 +1466,14 @@ void MusE::loadTemplate()
       if (!fn.isEmpty()) {
             // MusEGlobal::museProject = QFileInfo(fn).absolutePath();
             
-            loadProjectFile(fn, true, true);
+            //loadProjectFile(fn, true, true);
             // With templates, don't clear midi ports. 
             // Any named ports in the template file are useless since they likely 
             //  would not be found on other users' machines.
             // So keep whatever the user currently has set up for ports.  
             // Note that this will also keep the current window configurations etc.
             //  but actually that's also probably a good thing. p4.0.17 Tim.  TESTING: Maybe some problems...
-            //loadProjectFile(fn, true, false);
+            loadProjectFile(fn, true, false);
             
             setUntitledProject();
             }
@@ -1422,7 +1485,11 @@ void MusE::loadTemplate()
 
 bool MusE::save()
       {
-      if (project.completeBaseName() == "untitled")
+      //if (project.completeBaseName() == "untitled")    // p4.0.40 Must catch "untitled 1" "untitled 2" etc  
+      //if (MusEGui::projectTitleFromFilename(project.absoluteFilePath()) == "untitled")                      
+      //if (MusEGui::projectTitleFromFilename(project.absoluteFilePath()) == MusEGui::getUniqueUntitledName())  
+      ///if (project.absoluteFilePath() == MusEGui::getUniqueUntitledName())  
+      if (MusEGlobal::museProject == MusEGlobal::museProjectInitPath )  
             return saveAs();
       else
             return save(project.filePath(), false);
@@ -1554,7 +1621,7 @@ void MusE::closeEvent(QCloseEvent* event)
       MusECore::exitMetronome();
       
       // Make sure to delete the menu. ~routingPopupMenu() will NOT be called automatically.
-      // Even though it is a child of MusE, it just passes MusE onto the underlying PopupMenus. p4.0.26
+      // Even though it is a child of MusE, it just passes MusE onto the underlying PopupMenus. 
       if(routingPopupMenu)
         delete routingPopupMenu;     
       #if 0
@@ -1584,7 +1651,7 @@ void MusE::closeEvent(QCloseEvent* event)
             }
       
 #ifdef HAVE_LASH
-      // Disconnect gracefully from LASH. Tim. p3.3.14
+      // Disconnect gracefully from LASH. 
       if(lash_client)
       {
         if(MusEGlobal::debugMsg)
@@ -1602,7 +1669,6 @@ void MusE::closeEvent(QCloseEvent* event)
         printf("MusE: Exiting OSC\n");
       MusECore::exitOSC();
       
-      // p3.3.47
       delete MusEGlobal::audioPrefetch;
       delete MusEGlobal::audio;
       delete MusEGlobal::midiSeq;
@@ -1631,8 +1697,8 @@ void MusE::showMarker(bool flag)
             markerView = new MusEGui::MarkerView(this);
 
             connect(markerView, SIGNAL(closed()), SLOT(markerClosed()));
-            toplevels.push_back(markerView);
             markerView->show();
+            toplevels.push_back(markerView);
             }
       markerView->setVisible(flag);
       viewMarkerAction->setChecked(flag);
@@ -1654,6 +1720,20 @@ void MusE::markerClosed()
         setCurrentMenuSharingTopwin(NULL);
 
       updateWindowMenu();
+
+      // focus the last activated topwin which is not the marker view
+      QList<QMdiSubWindow*> l = mdiArea->subWindowList(QMdiArea::StackingOrder);
+      for (QList<QMdiSubWindow*>::iterator lit=l.begin(); lit!=l.end(); lit++)
+        if ((*lit)->isVisible() && (*lit)->widget() != markerView)
+        {
+          if (MusEGlobal::debugMsg)
+            printf("bringing '%s' to front instead of closed arranger window\n",(*lit)->widget()->windowTitle().toAscii().data());
+
+          bringToFront((*lit)->widget());
+
+          break; 
+        }
+      
       }
 
 //---------------------------------------------------------
@@ -1687,6 +1767,20 @@ void MusE::arrangerClosed()
       {
       viewArrangerAction->setChecked(false);
       updateWindowMenu();
+
+      // focus the last activated topwin which is not the arranger view
+      QList<QMdiSubWindow*> l = mdiArea->subWindowList(QMdiArea::StackingOrder);
+      for (QList<QMdiSubWindow*>::iterator lit=l.begin(); lit!=l.end(); lit++)
+        if ((*lit)->isVisible() && (*lit)->widget() != arrangerView)
+        {
+          if (MusEGlobal::debugMsg)
+            printf("bringing '%s' to front instead of closed arranger window\n",(*lit)->widget()->windowTitle().toAscii().data());
+
+          bringToFront((*lit)->widget());
+
+          break; 
+        }
+      
       }
 
 //---------------------------------------------------------
@@ -1728,7 +1822,7 @@ MusEGui::RoutePopupMenu* MusE::getRoutingPopupMenu()
 bool MusE::saveAs()
       {
       QString name;
-      if (MusEGlobal::museProject == MusEGlobal::museProjectInitPath ) {
+      //if (MusEGlobal::museProject == MusEGlobal::museProjectInitPath )  // Use project dialog always now.
         if (MusEGlobal::config.useProjectSaveDialog) {
             MusEGui::ProjectCreateImpl pci(MusEGlobal::muse);
             if (pci.exec() == QDialog::Rejected) {
@@ -1749,10 +1843,11 @@ bool MusE::saveAs()
           QMessageBox::warning(this,"Path error","Can't create project path", QMessageBox::Ok);
           return false;
         }
-      }
-      else {
-        name = MusEGui::getSaveFileName(QString(""), MusEGlobal::med_file_save_pattern, this, tr("MusE: Save As"));
-      }
+      //}
+      //else {
+      //  name = MusEGui::getSaveFileName(QString(""), MusEGlobal::med_file_save_pattern, this, tr("MusE: Save As"));
+      //}
+      
       bool ok = false;
       if (!name.isEmpty()) {
             QString tempOldProj = MusEGlobal::museProject;
@@ -1760,7 +1855,8 @@ bool MusE::saveAs()
             ok = save(name, true);
             if (ok) {
                   project.setFile(name);
-                  setWindowTitle(tr("MusE: Song: %1").arg(project.completeBaseName()));
+                  //setWindowTitle(tr("MusE: Song: %1").arg(project.completeBaseName()));
+                  setWindowTitle(tr("MusE: Song: %1").arg(MusEGui::projectTitleFromFilename(name)));
                   addProject(name);
                   }
             else
@@ -1843,9 +1939,9 @@ void MusE::openInScoreEdit(MusEGui::ScoreEdit* destination, MusECore::PartList*
 	if (destination==NULL) // if no destination given, create a new one
 	{
       destination = new MusEGui::ScoreEdit(this, 0, _arranger->cursorValue());
-      destination->show();
       toplevels.push_back(destination);
-      connect(destination, SIGNAL(deleted(MusEGui::TopWin*)), SLOT(toplevelDeleted(MusEGui::TopWin*)));
+      destination->show();
+      connect(destination, SIGNAL(isDeleting(MusEGui::TopWin*)), SLOT(toplevelDeleting(MusEGui::TopWin*)));
       connect(destination, SIGNAL(name_changed()), arrangerView, SLOT(scoreNamingChanged()));
       //connect(muse, SIGNAL(configChanged()), destination, SLOT(config_changed()));
       //commented out by flo, because the ScoreEditor connects to all 
@@ -1879,11 +1975,11 @@ void MusE::startPianoroll(MusECore::PartList* pl, bool showDefaultCtrls)
       {
       
       MusEGui::PianoRoll* pianoroll = new MusEGui::PianoRoll(pl, this, 0, _arranger->cursorValue());
-      if(showDefaultCtrls)       // p4.0.12
+      if(showDefaultCtrls)       
         pianoroll->addCtrl();
-      pianoroll->show();
       toplevels.push_back(pianoroll);
-      connect(pianoroll, SIGNAL(deleted(MusEGui::TopWin*)), SLOT(toplevelDeleted(MusEGui::TopWin*)));
+      pianoroll->show();
+      connect(pianoroll, SIGNAL(isDeleting(MusEGui::TopWin*)), SLOT(toplevelDeleting(MusEGui::TopWin*)));
       connect(MusEGlobal::muse, SIGNAL(configChanged()), pianoroll, SLOT(configChanged()));
       updateWindowMenu();
       }
@@ -1903,9 +1999,9 @@ void MusE::startListEditor()
 void MusE::startListEditor(MusECore::PartList* pl)
       {
       MusEGui::ListEdit* listEditor = new MusEGui::ListEdit(pl);
-      listEditor->show();
       toplevels.push_back(listEditor);
-      connect(listEditor, SIGNAL(deleted(MusEGui::TopWin*)), SLOT(toplevelDeleted(MusEGui::TopWin*)));
+      listEditor->show();
+      connect(listEditor, SIGNAL(isDeleting(MusEGui::TopWin*)), SLOT(toplevelDeleting(MusEGui::TopWin*)));
       connect(MusEGlobal::muse,SIGNAL(configChanged()), listEditor, SLOT(configChanged()));
       updateWindowMenu();
       }
@@ -1917,9 +2013,9 @@ void MusE::startListEditor(MusECore::PartList* pl)
 void MusE::startMasterEditor()
       {
       MusEGui::MasterEdit* masterEditor = new MusEGui::MasterEdit();
-      masterEditor->show();
       toplevels.push_back(masterEditor);
-      connect(masterEditor, SIGNAL(deleted(MusEGui::TopWin*)), SLOT(toplevelDeleted(MusEGui::TopWin*)));
+      masterEditor->show();
+      connect(masterEditor, SIGNAL(isDeleting(MusEGui::TopWin*)), SLOT(toplevelDeleting(MusEGui::TopWin*)));
       updateWindowMenu();
       }
 
@@ -1930,9 +2026,9 @@ void MusE::startMasterEditor()
 void MusE::startLMasterEditor()
       {
       MusEGui::LMaster* lmaster = new MusEGui::LMaster();
-      lmaster->show();
       toplevels.push_back(lmaster);
-      connect(lmaster, SIGNAL(deleted(MusEGui::TopWin*)), SLOT(toplevelDeleted(MusEGui::TopWin*)));
+      lmaster->show();
+      connect(lmaster, SIGNAL(isDeleting(MusEGui::TopWin*)), SLOT(toplevelDeleting(MusEGui::TopWin*)));
       connect(MusEGlobal::muse, SIGNAL(configChanged()), lmaster, SLOT(configChanged()));
       updateWindowMenu();
       }
@@ -1952,11 +2048,11 @@ void MusE::startDrumEditor()
 void MusE::startDrumEditor(MusECore::PartList* pl, bool showDefaultCtrls)
       {
       MusEGui::DrumEdit* drumEditor = new MusEGui::DrumEdit(pl, this, 0, _arranger->cursorValue());
-      if(showDefaultCtrls)       // p4.0.12
+      if(showDefaultCtrls)       
         drumEditor->addCtrl();
-      drumEditor->show();
       toplevels.push_back(drumEditor);
-      connect(drumEditor, SIGNAL(deleted(MusEGui::TopWin*)), SLOT(toplevelDeleted(MusEGui::TopWin*)));
+      drumEditor->show();
+      connect(drumEditor, SIGNAL(isDeleting(MusEGui::TopWin*)), SLOT(toplevelDeleting(MusEGui::TopWin*)));
       connect(MusEGlobal::muse, SIGNAL(configChanged()), drumEditor, SLOT(configChanged()));
       updateWindowMenu();
       }
@@ -1979,9 +2075,9 @@ void MusE::startWaveEditor(MusECore::PartList* pl)
       {
       MusEGui::WaveEdit* waveEditor = new MusEGui::WaveEdit(pl);
       waveEditor->show();
-      connect(MusEGlobal::muse, SIGNAL(configChanged()), waveEditor, SLOT(configChanged()));
       toplevels.push_back(waveEditor);
-      connect(waveEditor, SIGNAL(deleted(MusEGui::TopWin*)), SLOT(toplevelDeleted(MusEGui::TopWin*)));
+      connect(MusEGlobal::muse, SIGNAL(configChanged()), waveEditor, SLOT(configChanged()));
+      connect(waveEditor, SIGNAL(isDeleting(MusEGui::TopWin*)), SLOT(toplevelDeleting(MusEGui::TopWin*)));
       updateWindowMenu();
       }
 
@@ -2039,7 +2135,7 @@ void MusE::startClipList(bool checked)
             //clipListEdit = new ClipListEdit();
             clipListEdit = new MusEGui::ClipListEdit(this);
             toplevels.push_back(clipListEdit);
-            connect(clipListEdit, SIGNAL(deleted(MusEGui::TopWin*)), SLOT(toplevelDeleted(MusEGui::TopWin*)));
+            connect(clipListEdit, SIGNAL(isDeleting(MusEGui::TopWin*)), SLOT(toplevelDeleting(MusEGui::TopWin*)));
             }
       clipListEdit->show();
       viewCliplistAction->setChecked(checked);
@@ -2077,7 +2173,11 @@ void MusE::selectProject(QAction* act)
       if (!act)
             return;
       int id = act->data().toInt();
-      assert(id < PROJECT_LIST_LEN);
+      if (!(id < PROJECT_LIST_LEN))
+      {
+        printf("THIS SHOULD NEVER HAPPEN: id(%i) < PROJECT_LIST_LEN(%i) in MusE::selectProject!\n",id, PROJECT_LIST_LEN);
+        return;
+      }
       QString* name = projectList[id];
       if (name == 0)
             return;
@@ -2085,10 +2185,10 @@ void MusE::selectProject(QAction* act)
       }
 
 //---------------------------------------------------------
-//   toplevelDeleted
+//   toplevelDeleting
 //---------------------------------------------------------
 
-void MusE::toplevelDeleted(MusEGui::TopWin* tl)
+void MusE::toplevelDeleting(MusEGui::TopWin* tl)
       {
       for (MusEGui::iToplevel i = toplevels.begin(); i != toplevels.end(); ++i) {
             if (*i == tl) {
@@ -2097,6 +2197,19 @@ void MusE::toplevelDeleted(MusEGui::TopWin* tl)
                   {
                     activeTopWin=NULL;
                     emit activeTopWinChanged(NULL);
+
+                    // focus the last activated topwin which is not the deleting one
+                    QList<QMdiSubWindow*> l = mdiArea->subWindowList(QMdiArea::StackingOrder);
+                    for (QList<QMdiSubWindow*>::iterator lit=l.begin(); lit!=l.end(); lit++)
+                      if ((*lit)->isVisible() && (*lit)->widget() != tl)
+                      {
+                        if (MusEGlobal::debugMsg)
+                          printf("bringing '%s' to front instead of closed window\n",(*lit)->widget()->windowTitle().toAscii().data());
+
+                        bringToFront((*lit)->widget());
+
+                        break; 
+                      }
                   }
               
                   if (tl == currentMenuSharingTopwin)
@@ -2133,19 +2246,16 @@ void MusE::toplevelDeleted(MusEGui::TopWin* tl)
                         case MusEGui::TopWin::TOPLEVELTYPE_LAST_ENTRY: //to avoid a warning
                           break;
                         }
-                  toplevels.erase(i);
+                  toplevels.erase(i);   
                   if (mustUpdateScoreMenus)
                         arrangerView->updateScoreMenus();
                   updateWindowMenu();
                   return;
                   }
             }
-      printf("topLevelDeleted: top level %p not found\n", tl);
-      //assert(false);
+      printf("topLevelDeleting: top level %p not found\n", tl);
       }
 
-
-
 //---------------------------------------------------------
 //   kbAccel
 //---------------------------------------------------------
@@ -2180,7 +2290,7 @@ void MusE::kbAccel(int key)
             MusEGlobal::song->setPlay(true);
             }
       
-      // p4.0.10 Tim. Normally each editor window handles these, to inc by the editor's raster snap value.
+      // Normally each editor window handles these, to inc by the editor's raster snap value.
       // But users were asking for a global version - "they don't work when I'm in mixer or transport".
       // Since no editor claimed the key event, we don't know a specific editor's snap setting,
       //  so adopt a policy where the arranger is the 'main' raster reference, I guess...
@@ -2661,7 +2771,8 @@ MusE::lash_idle_cb ()
           int ok = save (ss.toAscii(), false);
           if (ok) {
             project.setFile(ss.toAscii());
-            setWindowTitle(tr("MusE: Song: %1").arg(project.completeBaseName()));
+            //setWindowTitle(tr("MusE: Song: %1").arg(project.completeBaseName()));
+            setWindowTitle(tr("MusE: Song: %1").arg(MusEGui::projectTitleFromFilename(project.absoluteFilePath())));
             addProject(ss.toAscii());
             MusEGlobal::museProject = QFileInfo(ss.toAscii()).absolutePath();
           }
@@ -2751,16 +2862,22 @@ again:
                   case MusEGui::TopWin::MASTER:
                   case MusEGui::TopWin::WAVE:
                   case MusEGui::TopWin::LMASTER:
-                        tl->close();
-                        goto again;
-                  
+                  {  
+                        if(tl->isVisible())   // Don't keep trying to close, only if visible.
+                        {  
+                          if(!tl->close())
+                            printf("MusE::clearSong TopWin did not close!\n");  
+                          goto again;
+                        }  
+                  }
                   case MusEGui::TopWin::TOPLEVELTYPE_LAST_ENTRY: //to avoid a warning
                     break;
                   }
             }
-      microSleep(100000);
+      microSleep(100000);  
+      _arranger->songIsClearing();
       MusEGlobal::song->clear(true, clear_all);
-      microSleep(100000);
+      microSleep(100000);  
       return false;
       }
 
@@ -3077,21 +3194,32 @@ void MusE::focusChanged(QWidget*, QWidget* now)
   if (currentMenuSharingTopwin && (currentMenuSharingTopwin!=activeTopWin))
     currentMenuSharingTopwin->storeInitialState();
 
-
+  // if the activated widget is a QMdiSubWindow containing some TopWin
+  if ( (dynamic_cast<QMdiSubWindow*>(ptr)!=0) &&
+       (dynamic_cast<MusEGui::TopWin*>( ((QMdiSubWindow*)ptr)->widget() )!=0) )
+  {
+    waitingForTopwin=(MusEGui::TopWin*) ((QMdiSubWindow*)ptr)->widget();
+    return;
+  }
 
   while (ptr)
   {
+    if (MusEGlobal::heavyDebugMsg)  
+      printf("focusChanged: at widget %p with type %s\n",ptr, typeid(*ptr).name());
+    
     if ( (dynamic_cast<MusEGui::TopWin*>(ptr)!=0) || // *ptr is a TopWin or a derived class
          (ptr==this) )                      // the main window is selected
       break;
     ptr=dynamic_cast<QWidget*>(ptr->parent()); //in the unlikely case that ptr is a QObject, this returns NULL, which stops the loop
   }
   
+  MusEGui::TopWin* win=dynamic_cast<MusEGui::TopWin*>(ptr);
   // ptr is either NULL, this or the pointer to a TopWin
-  if (ptr!=this) // if the main win is selected, don't treat that as "none", but also don't handle it
+  
+  // if the main win or some deleting topwin is selected,
+  // don't treat that as "none", but also don't handle it
+  if (ptr!=this && (!win || !win->deleting()) )
   {
-    MusEGui::TopWin* win=dynamic_cast<MusEGui::TopWin*>(ptr);
-    
     // now 'win' is either NULL or the pointer to the active TopWin
     if (win!=activeTopWin)
     {
@@ -3239,6 +3367,26 @@ void MusE::shareMenuAndToolbarChanged(MusEGui::TopWin* win, bool val)
   }
 }
 
+void MusE::topwinMenuInited(MusEGui::TopWin* topwin)
+{
+  if (topwin==NULL)
+    return;
+    
+  if (topwin == waitingForTopwin)
+  {
+    if (waitingForTopwin->deleting())
+    {
+      waitingForTopwin=NULL;
+    }
+    else
+    {
+      activeTopWin=waitingForTopwin;
+      waitingForTopwin=NULL;
+      emit activeTopWinChanged(activeTopWin);
+    }
+  }
+}
+
 void MusE::updateWindowMenu()
 {
   bool sep;
@@ -3292,6 +3440,8 @@ void MusE::updateWindowMenu()
 void MusE::bringToFront(QWidget* widget)
 {
   MusEGui::TopWin* win=dynamic_cast<MusEGui::TopWin*>(widget);
+  if (!win) return;
+  
   if (win->isMdiWin())
   {
     win->show();
@@ -3455,4 +3605,19 @@ void MusE::tileSubWindows()
   }
 }
 
+QString MusE::projectTitle() const
+{ 
+  return MusEGui::projectTitleFromFilename(project.fileName());
+}
+
+QString MusE::projectPath() const 
+{ 
+  return MusEGui::projectPathFromFilename(project.absoluteFilePath()); 
+}
+
+QString MusE::projectExtension() const
+{
+  return MusEGui::projectExtensionFromFilename(project.fileName()); 
+}
+
 } //namespace MusEGui
diff --git a/muse2/muse/app.h b/muse2/muse/app.h
index 46e9f99b..184581dc 100644
--- a/muse2/muse/app.h
+++ b/muse2/muse/app.h
@@ -43,6 +43,7 @@ class QToolBar;
 class QToolButton;
 class QProgressDialog;
 class QMdiArea;
+class QTimer;
 
 namespace MusECore {
 class AudioOutput;
@@ -91,7 +92,7 @@ class TopWin;
 class Transport;
 class VisibleTracks;
 
-#define MENU_ADD_SYNTH_ID_BASE 0x1000
+#define MENU_ADD_SYNTH_ID_BASE 0x8000
 
 
 //---------------------------------------------------------
@@ -128,6 +129,7 @@ class MusE : public QMainWindow
       
       TopWin* activeTopWin;
       TopWin* currentMenuSharingTopwin;
+      TopWin* waitingForTopwin;
       
       std::list<QToolBar*> requiredToolbars; //always displayed
       std::list<QToolBar*> optionalToolbars; //only displayed when no toolbar-sharing window is active
@@ -213,6 +215,10 @@ class MusE : public QMainWindow
       MidiTransformerDialog* midiTransformerDialog;
       QMenu* openRecent;
       
+      //QTimer* hackishSongOpenTimer;
+      //QString hackishSongOpenFilename;
+      //bool hackishSongOpenUseTemplate;
+
       bool readMidi(FILE*);
       void read(MusECore::Xml& xml, bool skipConfig, bool isTemplate);
       void processTrack(MusECore::MidiTrack* track);
@@ -327,13 +333,15 @@ class MusE : public QMainWindow
       void arrangeSubWindowsColumns();
       void tileSubWindows();
 
+      //void hackishSongOpenTimerTimeout();
+      
    public slots:
       bool saveAs();
       void bounceToFile(MusECore::AudioOutput* ao = 0);
       void closeEvent(QCloseEvent*e);
       void loadProjectFile(const QString&);
       void loadProjectFile(const QString&, bool songTemplate, bool loadAll);
-      void toplevelDeleted(MusEGui::TopWin* tl);
+      void toplevelDeleting(MusEGui::TopWin* tl);
       void loadTheme(const QString&);
       void loadStyleSheetFile(const QString&);
       bool seqRestart();
@@ -371,12 +379,14 @@ class MusE : public QMainWindow
       
       void addMdiSubWindow(QMdiSubWindow*);
       void shareMenuAndToolbarChanged(MusEGui::TopWin*, bool);
+      void topwinMenuInited(MusEGui::TopWin*);
 
       void updateWindowMenu();
 
    public:
       MusE(int argc, char** argv);
       ~MusE();
+      void loadDefaultSong(int argc, char** argv);
       Arranger* arranger() const { return _arranger; }
       QRect configGeometryMain;
       QProgressDialog *progress;
@@ -384,10 +394,13 @@ class MusE : public QMainWindow
       void kbAccel(int);
       void changeConfig(bool writeFlag);
       void seqStop();
-      bool seqStart();
+      bool seqStart();  
       void setHeartBeat();
       void importController(int, MusECore::MidiPort*, int);
       QString projectName() { return project.fileName(); }
+      QString projectTitle() const;
+      QString projectPath() const;
+      QString projectExtension() const;
       QWidget* mixer1Window();
       QWidget* mixer2Window();
       QWidget* transportWindow();
diff --git a/muse2/muse/arranger/alayout.cpp b/muse2/muse/arranger/alayout.cpp
index a892356c..119da498 100644
--- a/muse2/muse/arranger/alayout.cpp
+++ b/muse2/muse/arranger/alayout.cpp
@@ -117,7 +117,7 @@ void TLLayout::setGeometry(const QRect &rect)
 
       QSize s1 = li[1]->sizeHint();
       QSize s2 = li[2]->sizeHint();
-      QSize s3 = li[3]->sizeHint();
+      //QSize s3 = li[3]->sizeHint();
       QSize s4 = li[4]->sizeHint();
       QSize s5 = li[5]->sizeHint();
 
diff --git a/muse2/muse/arranger/arranger.cpp b/muse2/muse/arranger/arranger.cpp
index 89245d64..cb024070 100644
--- a/muse2/muse/arranger/arranger.cpp
+++ b/muse2/muse/arranger/arranger.cpp
@@ -152,7 +152,7 @@ Arranger::Arranger(ArrangerView* parent, const char* name)
       toolbar->addWidget(cursorPos);
 
       const char* rastval[] = {
-            QT_TRANSLATE_NOOP("@default", "Off"), QT_TRANSLATE_NOOP("@default", "Bar"), "1/2", "1/4", "1/8", "1/16"
+            QT_TRANSLATE_NOOP("MusEGui::Arranger", "Off"), QT_TRANSLATE_NOOP("MusEGui::Arranger", "Bar"), "1/2", "1/4", "1/8", "1/16"
             };
       label = new QLabel(tr("Snap"));
       label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
@@ -569,27 +569,40 @@ void Arranger::songChanged(int type)
       // Is it simply a midi controller value adjustment? Forget it.
       if(type != SC_MIDI_CONTROLLER)
       {
-        unsigned endTick = MusEGlobal::song->len();
-        int offset  = AL::sigmap.ticksMeasure(endTick);
-        hscroll->setRange(-offset, endTick + offset);  //DEBUG
-        canvas->setOrigin(-offset, 0);
-        time->setOrigin(-offset, 0);
-  
-        int bar, beat;
-        unsigned tick;
-        AL::sigmap.tickValues(endTick, &bar, &beat, &tick);
-        if (tick || beat)
-              ++bar;
-        lenEntry->blockSignals(true);
-        lenEntry->setValue(bar);
-        lenEntry->blockSignals(false);
-  
-        if(type & SC_SONG_TYPE)    // p4.0.7 Tim.
+        // TEST p4.0.36 Try these, may need more/less. 
+        if(type & ( SC_TRACK_INSERTED | SC_TRACK_REMOVED | SC_TRACK_MODIFIED | 
+           SC_PART_INSERTED | SC_PART_REMOVED | SC_PART_MODIFIED))  
+        {
+          unsigned endTick = MusEGlobal::song->len();
+          int offset  = AL::sigmap.ticksMeasure(endTick);
+          hscroll->setRange(-offset, endTick + offset);  //DEBUG
+          canvas->setOrigin(-offset, 0);
+          time->setOrigin(-offset, 0);
+    
+          int bar, beat;
+          unsigned tick;
+          AL::sigmap.tickValues(endTick, &bar, &beat, &tick);
+          if (tick || beat)
+                ++bar;
+          lenEntry->blockSignals(true);
+          lenEntry->setValue(bar);
+          lenEntry->blockSignals(false);
+        }
+        
+        if(type & SC_SONG_TYPE)    
           setMode(MusEGlobal::song->mtype());
           
-        trackSelectionChanged();
-        canvas->partsChanged();
-        typeBox->setCurrentIndex(int(MusEGlobal::song->mtype()));
+        if(type & SC_SELECTION)       // TEST p4.0.36 Try this alone, may need more.
+          trackSelectionChanged();
+        
+        // Keep this light, partsChanged is a heavy move!       TEST p4.0.36 Try these, may need more.
+        if(type & (SC_TRACK_INSERTED | SC_TRACK_REMOVED | SC_TRACK_MODIFIED | 
+                   SC_PART_INSERTED | SC_PART_REMOVED | SC_PART_MODIFIED | 
+                   SC_SIG | SC_TEMPO)) // Maybe sig. Requires tempo.
+          canvas->partsChanged();
+        
+        //typeBox->setCurrentIndex(int(MusEGlobal::song->mtype()));  // REMOVE Tim.  Redundant.
+        
         if (type & SC_SIG)
               time->redraw();
         if (type & SC_TEMPO)
@@ -616,6 +629,14 @@ void Arranger::songChanged(int type)
             }   
           } 
         }
+        
+        // TEST p4.0.36 Try this
+        if(type & ( //SC_TRACK_INSERTED | SC_TRACK_REMOVED | SC_TRACK_MODIFIED | 
+           SC_PART_INSERTED | SC_PART_REMOVED | SC_PART_MODIFIED | 
+           SC_EVENT_INSERTED | SC_EVENT_REMOVED | SC_EVENT_MODIFIED)) //|
+           //SC_SIG | SC_TEMPO))  // Maybe sig. and tempo. No, moved above.
+        canvas->redraw();
+        
       }
             
       updateTrackInfo(type);
diff --git a/muse2/muse/arranger/arranger.h b/muse2/muse/arranger/arranger.h
index d4193c01..35a3fe36 100644
--- a/muse2/muse/arranger/arranger.h
+++ b/muse2/muse/arranger/arranger.h
@@ -187,6 +187,7 @@ class Arranger : public QWidget {
       int selectionSize() { return canvas->selectionSize(); }
       void setGlobalTempo(int);
       void clear();
+      void songIsClearing() { canvas->songIsClearing(); }
       
       unsigned cursorValue() { return cursVal; }
       
diff --git a/muse2/muse/arranger/arrangerview.cpp b/muse2/muse/arranger/arrangerview.cpp
index 51fc3bb0..1bb45863 100644
--- a/muse2/muse/arranger/arrangerview.cpp
+++ b/muse2/muse/arranger/arrangerview.cpp
@@ -37,7 +37,7 @@
 #include <QMessageBox>
 #include <QMimeData>
 #include <QPushButton>
-#include <QResizeEvent>
+//#include <QResizeEvent>
 #include <QScrollArea>
 #include <QScrollBar>
 #include <QSettings>
@@ -129,6 +129,7 @@ ArrangerView::ArrangerView(QWidget* parent)
   connect(muse, SIGNAL(configChanged()), arranger, SLOT(configChanged()));
   connect(arranger, SIGNAL(setUsedTool(int)), editTools, SLOT(set(int)));
   connect(arranger, SIGNAL(selectionChanged()), SLOT(selectionChanged()));
+  connect(MusEGlobal::song, SIGNAL(songChanged(int)), visTracks, SLOT(updateVisibleTracksButtons()));
 
 
 
@@ -167,8 +168,8 @@ ArrangerView::ArrangerView(QWidget* parent)
   scoreSubmenu = new QMenu(tr("Score"), this);
   scoreSubmenu->setIcon(QIcon(*scoreIconSet));
 
-  scoreAllInOneSubsubmenu = new QMenu(tr("all parts in one staff"), this);
-  scoreOneStaffPerTrackSubsubmenu = new QMenu(tr("one staff per part"), this);
+  scoreAllInOneSubsubmenu = new QMenu(tr("all tracks in one staff"), this);
+  scoreOneStaffPerTrackSubsubmenu = new QMenu(tr("one staff per track"), this);
 
   scoreSubmenu->addMenu(scoreAllInOneSubsubmenu);
   scoreSubmenu->addMenu(scoreOneStaffPerTrackSubsubmenu);
@@ -193,6 +194,10 @@ ArrangerView::ArrangerView(QWidget* parent)
   strGlobalInsertAction = new QAction(tr("Global Insert"), this);
   strGlobalSplitAction = new QAction(tr("Global Split"), this);
 
+  strGlobalCutSelAction = new QAction(tr("Global Cut - selected tracks"), this);
+  strGlobalInsertSelAction = new QAction(tr("Global Insert - selected tracks"), this);
+  strGlobalSplitSelAction = new QAction(tr("Global Split - selected tracks"), this);
+
 
 
   //-------------------------------------------------------------
@@ -246,7 +251,11 @@ ArrangerView::ArrangerView(QWidget* parent)
     menuStructure->addAction(strGlobalCutAction);
     menuStructure->addAction(strGlobalInsertAction);
     menuStructure->addAction(strGlobalSplitAction);
-  
+    menuStructure->addSeparator();
+    menuStructure->addAction(strGlobalCutSelAction);
+    menuStructure->addAction(strGlobalInsertSelAction);
+    menuStructure->addAction(strGlobalSplitSelAction);
+
   
   
   QMenu* functions_menu = menuBar()->addMenu(tr("Functions"));
@@ -341,6 +350,9 @@ ArrangerView::ArrangerView(QWidget* parent)
   connect(strGlobalCutAction, SIGNAL(activated()), SLOT(globalCut()));
   connect(strGlobalInsertAction, SIGNAL(activated()), SLOT(globalInsert()));
   connect(strGlobalSplitAction, SIGNAL(activated()), SLOT(globalSplit()));
+  connect(strGlobalCutSelAction, SIGNAL(activated()), SLOT(globalCutSel()));
+  connect(strGlobalInsertSelAction, SIGNAL(activated()), SLOT(globalInsertSel()));
+  connect(strGlobalSplitSelAction, SIGNAL(activated()), SLOT(globalSplitSel()));
 
 
 
@@ -351,7 +363,7 @@ ArrangerView::ArrangerView(QWidget* parent)
   connect(cb, SIGNAL(dataChanged()), SLOT(clipboardChanged()));
   connect(cb, SIGNAL(selectionChanged()), SLOT(clipboardChanged()));
 
-
+  MusEGlobal::muse->topwinMenuInited(this);
 
   // work around for probable QT/WM interaction bug.
   // for certain window managers, e.g xfce, this window is
@@ -368,7 +380,7 @@ ArrangerView::~ArrangerView()
 
 void ArrangerView::closeEvent(QCloseEvent* e)
 {
-  emit deleted(static_cast<TopWin*>(this));
+  emit isDeleting(static_cast<TopWin*>(this));
   emit closed();
   e->accept();
 }
@@ -629,7 +641,7 @@ void ArrangerView::clearScoreMenuMappers()
 
 void ArrangerView::populateAddTrack()
 {
-      QActionGroup *grp = MusEGui::populateAddTrack(addTrack);
+      QActionGroup *grp = MusEGui::populateAddTrack(addTrack, true);
       connect(addTrack, SIGNAL(triggered(QAction *)), SLOT(addNewTrack(QAction *)));
       
       trackMidiAction = grp->actions()[0];
@@ -731,4 +743,9 @@ void ArrangerView::globalCut() { MusECore::globalCut(); }
 void ArrangerView::globalInsert() { MusECore::globalInsert(); }
 void ArrangerView::globalSplit() { MusECore::globalSplit(); }
 
+// variants only applicable for selected tracks
+void ArrangerView::globalCutSel() { MusECore::globalCut(true); }
+void ArrangerView::globalInsertSel() { MusECore::globalInsert(true); }
+void ArrangerView::globalSplitSel() { MusECore::globalSplit(true); }
+
 } // namespace MusEGui
diff --git a/muse2/muse/arranger/arrangerview.h b/muse2/muse/arranger/arrangerview.h
index d52c5cc4..0dac67e4 100644
--- a/muse2/muse/arranger/arrangerview.h
+++ b/muse2/muse/arranger/arrangerview.h
@@ -89,7 +89,8 @@ class ArrangerView : public TopWin
 		QMenu* master;
 
 		QAction *strGlobalCutAction, *strGlobalInsertAction, *strGlobalSplitAction;
-		QAction *trackMidiAction, *trackDrumAction, *trackNewStyleDrumAction, *trackWaveAction, *trackAOutputAction, *trackAGroupAction;
+    QAction *strGlobalCutSelAction, *strGlobalInsertSelAction, *strGlobalSplitSelAction;
+    QAction *trackMidiAction, *trackDrumAction, *trackNewStyleDrumAction, *trackWaveAction, *trackAOutputAction, *trackAGroupAction;
 		QAction *trackAInputAction, *trackAAuxAction;
 		QAction *editCutAction, *editCopyAction, *editCopyRangeAction;
 		QAction *editPasteAction, *editPasteCloneAction, *editPasteDialogAction, *editPasteCloneDialogAction;
@@ -119,11 +120,14 @@ class ArrangerView : public TopWin
 		void globalCut();
 		void globalInsert();
 		void globalSplit();
-		void cmd(int);
+    void globalCutSel();
+    void globalInsertSel();
+    void globalSplitSel();
+    void cmd(int);
                 void addNewTrack(QAction* action);
 
 	signals:
-		void deleted(MusEGui::TopWin*);
+		void isDeleting(MusEGui::TopWin*);
 		void closed();
 
 	public slots:
diff --git a/muse2/muse/arranger/pcanvas.cpp b/muse2/muse/arranger/pcanvas.cpp
index 987a7e9a..3889928f 100644
--- a/muse2/muse/arranger/pcanvas.cpp
+++ b/muse2/muse/arranger/pcanvas.cpp
@@ -3,7 +3,7 @@
 //  Linux Music Editor
 //    $Id: pcanvas.cpp,v 1.48.2.26 2009/11/22 11:08:33 spamatica Exp $
 //  (C) Copyright 1999 Werner Schweer (ws@seh.de)
-//  (C) Copyright 2011 Tim E. Real (terminator356 on users DOT sourceforge DOT net)
+//  (C) Copyright 2011 Tim E. Real (terminator356 on sourceforge)
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -54,6 +54,7 @@
 #include "shortcuts.h"
 #include "gconfig.h"
 #include "app.h"
+#include "functions.h"
 #include "filedialog.h"
 #include "marker/marker.h"
 #include "mpevent.h"
@@ -68,6 +69,8 @@
 //#define ABS(x) (x>=0?x:-x)
 #define ABS(x) (abs(x))
 
+#define EDITING_FINISHED_TIMEOUT 50 /* in milliseconds */
+
 using std::set;
 
 namespace MusEGui {
@@ -181,6 +184,8 @@ void PartCanvas::returnPressed()
           MusEGlobal::audio->msgChangePart(oldPart, newPart, true, true, false);
           
           editMode = false;
+          
+          editingFinishedTime.start();
           }
       }
 
@@ -298,12 +303,9 @@ void PartCanvas::moveCanvasItems(CItemList& items, int dp, int dx, DragType dtyp
     QPoint newpos = raster(QPoint(nx, ny));
     selectItem(ci, true);
     
-    MusECore::UndoOp operation=moveItem(ci, newpos, dtype);
-    if (operation.type != MusECore::UndoOp::DoNothing)
-    {
+    bool result=moveItem(operations, ci, newpos, dtype);
+    if (result)
     	ci->move(newpos);
-      operations.push_back(operation);
-    }
     
     if(moving.size() == 1) {
           itemReleased(curItem, newpos);
@@ -322,37 +324,41 @@ void PartCanvas::moveCanvasItems(CItemList& items, int dp, int dx, DragType dtyp
 //---------------------------------------------------------
 
 // Changed by T356.
-MusECore::UndoOp PartCanvas::moveItem(CItem* item, const QPoint& newpos, DragType t)
+bool PartCanvas::moveItem(MusECore::Undo& operations, CItem* item, const QPoint& newpos, DragType t)
       {
-      MusECore::UndoOp result;
       NPart* npart    = (NPart*) item;
       MusECore::Part* spart     = npart->part();
       MusECore::Track* track    = npart->track();
+      MusECore::Track* dtrack=NULL;
       unsigned dtick  = newpos.x();
       unsigned ntrack = y2pitch(item->mp().y());
       MusECore::Track::TrackType type = track->type();
       if (tracks->index(track) == ntrack && (dtick == spart->tick())) {
-            return MusECore::UndoOp(MusECore::UndoOp::DoNothing);
+            return false;
             }
       if (ntrack >= tracks->size()) {
             ntrack = tracks->size();
             if (MusEGlobal::debugMsg)
                 printf("PartCanvas::moveItem - add new track\n");
-            MusECore::Track* newTrack = MusEGlobal::song->addTrack(type);  // Add at end of list.
+            dtrack = MusEGlobal::song->addTrack(operations, type);  // Add at end of list.
+
             if (type == MusECore::Track::WAVE) {
                   MusECore::WaveTrack* st = (MusECore::WaveTrack*) track;
-                  MusECore::WaveTrack* dt = (MusECore::WaveTrack*) newTrack;
+                  MusECore::WaveTrack* dt = (MusECore::WaveTrack*) dtrack;
                   dt->setChannels(st->channels());
                   }
             emit tracklistChanged();
             }
-      MusECore::Track* dtrack = tracks->index(ntrack);
-      if (dtrack->type() != type) {
-            QMessageBox::critical(this, QString("MusE"),
-               tr("Cannot copy/move/clone to different Track-Type"));
-            return MusECore::UndoOp(MusECore::UndoOp::DoNothing);
+      else
+      {      
+            dtrack = tracks->index(ntrack);
+            if (dtrack->type() != type) {
+                  QMessageBox::critical(this, QString("MusE"),
+                     tr("Cannot copy/move/clone to different Track-Type"));
+                  return false;
+                  }
             }
-
+      
       MusECore::Part* dpart;
       bool clone = (t == MOVE_CLONE || (t == MOVE_COPY && spart->events()->arefCount() > 1));
       
@@ -392,23 +398,25 @@ MusECore::UndoOp PartCanvas::moveItem(CItem* item, const QPoint& newpos, DragTyp
 
       if (t == MOVE_COPY || t == MOVE_CLONE) {
             // These will not increment ref count, and will not chain clones... 
-            // TODO: is comment this still correct (by flo93)? i doubt it!
-            result=MusECore::UndoOp(MusECore::UndoOp::AddPart,dpart);
+            // TODO: is this comment still correct (by flo93)? i doubt it!
+            operations.push_back(MusECore::UndoOp(MusECore::UndoOp::AddPart,dpart));
             }
       else if (t == MOVE_MOVE) {
             dpart->setSelected(spart->selected());
             // These will increment ref count if not a clone, and will chain clones...
             // TODO: is this comment still correct (by flo93)? i doubt it!
-            result=MusECore::UndoOp(MusECore::UndoOp::ModifyPart,spart, dpart, true, false);
+            operations.push_back(MusECore::UndoOp(MusECore::UndoOp::ModifyPart,spart, dpart, true, false));
             
             spart->setSelected(false);
             }
-      // else // will never happen -> result will always be defined
+      // else // will never happen -> operations will never be empty
       
       if (MusEGlobal::song->len() < (dpart->lenTick() + dpart->tick()))
-            MusEGlobal::song->setLen(dpart->lenTick() + dpart->tick());
-
-      return result;
+            operations.push_back(  MusECore::UndoOp(MusECore::UndoOp::ModifySongLen, 
+                                                    dpart->lenTick() + dpart->tick(),
+                                                    MusEGlobal::song->len() )  );
+      
+      return true;
       }
 
 //---------------------------------------------------------
@@ -427,6 +435,13 @@ QPoint PartCanvas::raster(const QPoint& p) const
       return QPoint(x, y);
       }
 
+
+void PartCanvas::songIsClearing()
+{
+  curItem=NULL;
+  items.clearDelete();
+}
+
 //---------------------------------------------------------
 //   partsChanged
 //---------------------------------------------------------
@@ -434,6 +449,10 @@ QPoint PartCanvas::raster(const QPoint& p) const
 void PartCanvas::partsChanged()
       {
       //items.clear();
+      int sn = -1;
+      if (curItem) sn=curItem->part()->sn();
+      curItem=NULL;      
+      
       items.clearDelete();
       for (MusECore::iTrack t = tracks->begin(); t != tracks->end(); ++t) {
             MusECore::PartList* pl = (*t)->parts();
@@ -441,6 +460,10 @@ void PartCanvas::partsChanged()
                   MusECore::Part* part = i->second;
                   NPart* np = new NPart(part);
                   items.add(np);
+                  
+                  if (np->part()->sn() == sn)
+                    curItem=np;
+                  
                   if (i->second->selected()) {
                         selectItem(np, true);
                         }
@@ -647,6 +670,8 @@ QMenu* PartCanvas::genItemPopup(CItem* item)
       act_split->setData(2);
       QAction *act_glue = partPopup->addAction(QIcon(*glueIcon), tr("glue"));
       act_glue->setData(3);
+      QAction *act_superglue = partPopup->addAction(QIcon(*glueIcon), tr("super glue (merge selection)"));
+      act_superglue->setData(6);
       QAction *act_declone = partPopup->addAction(tr("de-clone"));
       act_declone->setData(15);
 
@@ -736,6 +761,9 @@ void PartCanvas::itemPopup(CItem* item, int n, const QPoint& pt)
             case 5:
                   copy(pl);
                   break;
+            case 6:
+                  MusECore::merge_selected_parts();
+                  break;
 
             case 14:    // wave edit
                     emit startEditor(pl, 4);
@@ -756,7 +784,7 @@ void PartCanvas::itemPopup(CItem* item, int n, const QPoint& pt)
                   // Indicate undo, and do port controller values but not clone parts. 
                   // changed by flo93: removed start and endUndo, instead changed first bool to true
                   MusEGlobal::audio->msgChangePart(spart, dpart, true, true, false);
-                  break; // Has to be break here, right?
+                  break;
                   }
             case 16: // Export to file
                   {
@@ -784,7 +812,7 @@ void PartCanvas::itemPopup(CItem* item, int n, const QPoint& pt)
                     for (MusECore::iEvent e = el->begin(); e != el->end(); ++e) 
                     {
                       MusECore::Event event = e->second;
-		      MusECore::SndFileR f  = event.sndFile();
+                      MusECore::SndFileR f  = event.sndFile();
                       if (f.isNull())
                         continue;
                       str.append(QString("\n@") + QString().setNum(event.tick()) + QString(" len:") + 
@@ -858,8 +886,8 @@ void PartCanvas::mousePress(QMouseEvent* event)
             default:
                   if (item)
                       emit trackChanged(item->part()->track());
-                  else
-                      emit trackChanged(NULL);
+                  //else -- don't see the point of removing track selection, commenting out (rj)
+                  //    emit trackChanged(NULL);
                   break;
             case CutTool:
                   if (item) splitItem(item, pt);
@@ -952,11 +980,14 @@ void PartCanvas::keyPress(QKeyEvent* event)
 //      }
       if (editMode)
             {
+            // this will probably never happen, as edit mode has been set
+            // to "false" some usec ago by returnPressed, called by editingFinished.
             if ( key == Qt::Key_Return || key == Qt::Key_Enter ) 
                   {
                   //returnPressed(); commented out by flo
                   return;
                   }
+            // the below CAN indeed happen.
             else if ( key == Qt::Key_Escape )
                   {
                   lineEditor->hide();
@@ -964,6 +995,11 @@ void PartCanvas::keyPress(QKeyEvent* event)
                   return;
                   }
             }
+      // if returnPressed, called by editingFinished, was executed
+      // a short time ago, ignore this keypress if it was enter or return
+      if (editingFinishedTime.elapsed() < EDITING_FINISHED_TIMEOUT &&
+          (key == Qt::Key_Return || key == Qt::Key_Enter) )
+        return;
 
       if (event->modifiers() &  Qt::ShiftModifier)
             key +=  Qt::SHIFT;
@@ -1160,7 +1196,7 @@ void PartCanvas::keyPress(QKeyEvent* event)
 
             //If we're at topmost, leave
             if (!track) {
-              printf("no track above!\n");
+              //printf("no track above!\n");
                   return;
                 }
             int middle = curItem->x() + curItem->part()->lenTick()/2;
@@ -1295,17 +1331,25 @@ void PartCanvas::keyPress(QKeyEvent* event)
             curItem = newItem;
             selectItem(newItem, true);
 
-            //Check if we've hit the upper or lower boundaries of the window. If so, set a new position
+            //Check if we've hit the left, right, upper or lower boundaries of the window. If so, scroll to new position.
             if (newItem->x() < mapxDev(0)) {
-                  int curpos = pos[0];
-                  setPos(0,newItem->x(),true);
-                  setPos(0,curpos,false); //Dummy to put the current position back once we've scrolled
+                  emit horizontalScroll(rmapx(newItem->x() - xorg) - 10);  // Leave some room.
+                  }
+            else if (newItem->x() + newItem->width() > mapxDev(width())) {
+                  int mx = rmapx(newItem->x());
+                  int newx = mx + rmapx(newItem->width()) - width();
+                  emit horizontalScroll( (newx > mx ? mx - 10 : newx + 10) - rmapx(xorg) );
+                  }
+                  
+            if (newItem->y() < mapyDev(0)) {
+                  int my = rmapy(newItem->y());
+                  int newy = my + rmapy(newItem->height()) - height();
+                  emit verticalScroll( (newy < my ? my - 10 : newy + 10) - rmapy(yorg) );
                   }
-            else if (newItem->x() > mapxDev(width())) {
-                  int curpos = pos[0];
-                  setPos(0,newItem->x(),true);
-                  setPos(0,curpos,false); //Dummy to put the current position back once we've scrolled
+            else if (newItem->y() + newItem->height() > mapyDev(height())) {
+                  emit verticalScroll( rmapy(newItem->y() + newItem->height() - yorg) - height() + 10);
                   }
+                  
             redraw();
             }
       }
@@ -2267,9 +2311,9 @@ void PartCanvas::drawMidiPart(QPainter& p, const QRect&, MusECore::EventList* ev
     //else
     //  color_brightness=64;  // otherwise use dark color 
     if (brightness >= 12000 && !pt->selected())
-      color_brightness=64; // 96;    // too bright: use dark color 
+      color_brightness=54; // 96;    // too bright: use dark color
     else
-      color_brightness=190; //160;   // too dark: use lighter color 
+      color_brightness=200; //160;   // too dark: use lighter color
   }
   else
     color_brightness=80;
@@ -3175,9 +3219,13 @@ void PartCanvas::viewDropEvent(QDropEvent* event)
 
                 if (!track) { // we need to create a track for this drop
                     if (text.endsWith(".mpt", Qt::CaseInsensitive)) {
-                        track = MusEGlobal::song->addTrack(MusECore::Track::MIDI);    // Add at end of list.
+                        MusECore::Undo operations;
+                        track = MusEGlobal::song->addTrack(operations, MusECore::Track::MIDI);    // Add at end of list.
+                        MusEGlobal::song->applyOperationGroup(operations);
                     } else {
-                        track = MusEGlobal::song->addTrack(MusECore::Track::WAVE);    // Add at end of list.
+                        MusECore::Undo operations;
+                        track = MusEGlobal::song->addTrack(operations, MusECore::Track::WAVE);    // Add at end of list.
+                        MusEGlobal::song->applyOperationGroup(operations);
                     }
                 }
                 if (track->type() == MusECore::Track::WAVE &&
@@ -3602,7 +3650,8 @@ void PartCanvas::drawAutomation(QPainter& p, const QRect& rr, MusECore::AudioTra
       {
         double y;   
         if (cl->valueType() == MusECore::VAL_LOG ) { // use db scale for volume
-          y = dbToVal(cl->curVal()); // represent volume between 0 and 1
+          //printf("log conversion val=%f min=%f max=%f\n", cl->curVal(), min, max);
+          y = logToVal(cl->curVal(), min, max); // represent volume between 0 and 1
           if (y < 0) y = 0.0;
         }
         else 
@@ -3615,7 +3664,8 @@ void PartCanvas::drawAutomation(QPainter& p, const QRect& rr, MusECore::AudioTra
         {
             double y = ic->second.val; 
             if (cl->valueType() == MusECore::VAL_LOG ) { // use db scale for volume
-              y = dbToVal(y); // represent volume between 0 and 1
+              //printf("log conversion val=%f min=%f max=%f\n", cl->curVal(), min, max);
+              y = logToVal(y, min, max); // represent volume between 0 and 1
               if (y < 0) y = 0.0;
             }
             else 
@@ -3714,7 +3764,7 @@ void PartCanvas::checkAutomation(MusECore::Track * t, const QPoint &pointer, boo
         {
           double y;   
           if (cl->valueType() == MusECore::VAL_LOG ) { // use db scale for volume
-            y = dbToVal(cl->curVal()); // represent volume between 0 and 1
+            y = logToVal(cl->curVal(), min, max); // represent volume between 0 and 1
             if (y < 0) y = 0.0;
           }
           else 
@@ -3727,7 +3777,7 @@ void PartCanvas::checkAutomation(MusECore::Track * t, const QPoint &pointer, boo
           {
              double y = ic->second.val;
              if (cl->valueType() == MusECore::VAL_LOG ) { // use db scale for volume
-                y = dbToVal(y); // represent volume between 0 and 1
+                y = logToVal(y, min, max); // represent volume between 0 and 1
                if (y < 0) y = 0;
              }
              else 
@@ -3919,7 +3969,8 @@ void PartCanvas::processAutomationMovements(QPoint pos, bool addPoint)
     automation.currentCtrlList->range(&min,&max);
     double cvval;    
     if (automation.currentCtrlList->valueType() == MusECore::VAL_LOG  ) { // use db scale for volume
-       cvval = valToDb(yfraction);
+       printf("log conversion val=%f min=%f max=%f\n", yfraction, min, max);
+       cvval = valToLog(yfraction, min, max);
        //printf("calc yfraction = %f v=%f ",yfraction,cvval);
        if (cvval< min) cvval=min;
        if (cvval>max) cvval=max;
@@ -3952,13 +4003,45 @@ void PartCanvas::processAutomationMovements(QPoint pos, bool addPoint)
 
 }
 
-double PartCanvas::dbToVal(double inDb)
+//---------------------------------------------------------
+//
+//  logToVal
+//   - represent logarithmic value on linear scale from 0 to 1
+//
+//---------------------------------------------------------
+double PartCanvas::logToVal(double inLog, double min, double max)
 {
-    return (20.0*MusECore::fast_log10(inDb)+60.0) / 70.0;
+    //printf("logToVal inLog %f :", inLog);
+    if (inLog < min) inLog = min;
+    if (inLog > max) inLog = max;
+    double linMin = 20.0*MusECore::fast_log10(min);
+    double linMax = 20.0*MusECore::fast_log10(max);
+    double linVal = 20.0*MusECore::fast_log10(inLog);
+
+    double outVal = (linVal-linMin) / (linMax - linMin);
+    // printf("inLog %f outVal %f linVal %f min %f max %f dbMin %f dbMax %f\n", inLog, outVal, linVal, min, max, linMin, linMax);
+
+    return outVal;
 }
-double PartCanvas::valToDb(double inV)
+
+//---------------------------------------------------------
+//
+//  valToLog
+//   - represent value from 0 to 1 as logarithmic value between min and max
+//
+//---------------------------------------------------------
+double PartCanvas::valToLog(double inV, double min, double max)
 {
-    return exp10((inV*70.0-60.0)/20.0);
+    double linMin = 20.0*MusECore::fast_log10(min);
+    double linMax = 20.0*MusECore::fast_log10(max);
+
+    double linVal = (inV * (linMax - linMin)) + linMin;
+    double outVal = exp10((linVal)/20.0);
+
+    //printf("::valToLog inV %f outVal %f linVal %f min %f max %f\n", inV, outVal, linVal, min, max);
+    if (outVal > max) outVal = max;
+    if (outVal < min) outVal = min;
+    return outVal;
 }
 
 //---------------------------------------------------------
diff --git a/muse2/muse/arranger/pcanvas.h b/muse2/muse/arranger/pcanvas.h
index 8a108055..34395688 100644
--- a/muse2/muse/arranger/pcanvas.h
+++ b/muse2/muse/arranger/pcanvas.h
@@ -26,6 +26,7 @@
 
 #include <QVector>
 #include <set>
+#include <QTime>
 
 #include "song.h"
 #include "canvas.h"
@@ -93,6 +94,8 @@ class PartCanvas : public Canvas {
       NPart* editPart;
       int curColorIndex;
       bool editMode;
+      
+      QTime editingFinishedTime;
 
       AutomationObject automation;
 
@@ -116,7 +119,7 @@ class PartCanvas : public Canvas {
       virtual void newItem(CItem*,bool);
       virtual bool deleteItem(CItem*);
       virtual void moveCanvasItems(CItemList&, int, int, DragType);
-      virtual MusECore::UndoOp moveItem(CItem*, const QPoint&, DragType);
+      virtual bool moveItem(MusECore::Undo& operations, CItem*, const QPoint&, DragType);
 
       virtual void updateSong(DragType, int);
       virtual void startDrag(CItem*, DragType);
@@ -145,8 +148,8 @@ class PartCanvas : public Canvas {
 
       void checkAutomation(MusECore::Track * t, const QPoint& pointer, bool addNewCtrl);
       void processAutomationMovements(QPoint pos, bool addPoint);
-      double dbToVal(double inDb);
-      double valToDb(double inV);
+      double logToVal(double inLog, double min, double max);
+      double valToLog(double inV, double min, double max);
 
    protected:
       virtual void drawCanvas(QPainter&, const QRect&);
@@ -177,9 +180,11 @@ class PartCanvas : public Canvas {
       virtual ~PartCanvas();
       void partsChanged();
       void cmd(int);
+      void songIsClearing();
+      
    public slots:
-   void redirKeypress(QKeyEvent* e) { keyPress(e); }
-   void controllerChanged(MusECore::Track *t);
+      void redirKeypress(QKeyEvent* e) { keyPress(e); }
+      void controllerChanged(MusECore::Track *t);
 };
 
 } // namespace MusEGui
diff --git a/muse2/muse/arranger/tlist.cpp b/muse2/muse/arranger/tlist.cpp
index c209ba9c..f5edc8cf 100644
--- a/muse2/muse/arranger/tlist.cpp
+++ b/muse2/muse/arranger/tlist.cpp
@@ -63,6 +63,7 @@
 #include "config.h"
 #include "popupmenu.h"
 #include "filedialog.h"
+#include "menutitleitem.h"
 
 #ifdef DSSI_SUPPORT
 #include "dssihost.h"
@@ -397,7 +398,7 @@ void TList::paint(const QRect& r)
                                             countVisible++;
                                     }
                                     //int count = ((MusECore::AudioTrack*)track)->controller()->size(); //commented out by flo: gives a "unused variable" warning
-                                    s.sprintf(" %d(%d) visible",countVisible, countAll);
+                                    s.sprintf(" %d(%d) %s",countVisible, countAll, tr("visible").toAscii().data());
                                     }
 
 
@@ -584,19 +585,23 @@ void TList::mouseDoubleClickEvent(QMouseEvent* ev)
 //---------------------------------------------------------
 //   portsPopupMenu
 //---------------------------------------------------------
-
 void TList::portsPopupMenu(MusECore::Track* t, int x, int y)
       {
       switch(t->type()) {
             case MusECore::Track::MIDI:
             case MusECore::Track::DRUM:
             case MusECore::Track::NEW_DRUM:
+            // FINDMICHJETZT: this is a notice for flo's experimental
+            //                branch! don't forget NEW_DRUM here!
+            //                please don't remove this. i'll do it when
+            //                the time is there.
             case MusECore::Track::AUDIO_SOFTSYNTH: 
             {
                   MusECore::MidiTrack* track = (MusECore::MidiTrack*)t;
                   
                   //QPopupMenu* p = MusECore::midiPortsPopup(0);
                   MusECore::MidiDevice* md = 0;
+                  int potential_new_port_no=-1;
                   int port = -1; 
                   if(t->type() == MusECore::Track::AUDIO_SOFTSYNTH) 
                   {
@@ -609,25 +614,158 @@ void TList::portsPopupMenu(MusECore::Track* t, int x, int y)
                     port = track->outPort();
                     
                   QMenu* p = MusECore::midiPortsPopup(this, port);     // 0, port);
+                  
+                  if (t->type()==MusECore::Track::MIDI || t->type()==MusECore::Track::DRUM) //FINDMICHJETZT
+                  {
+                    // extend that menu a bit
+
+
+                    // find first free port number
+                    // do not permit numbers already used in other tracks!
+                    // except if it's only used in this track.
+                    int no;
+                    for (no=0;no<MIDI_PORTS;no++)
+                      if (MusEGlobal::midiPorts[no].device()==NULL)
+                      {
+                        MusECore::ciTrack it;
+                        for (it=MusEGlobal::song->tracks()->begin(); it!=MusEGlobal::song->tracks()->end(); it++)
+                        {
+                          MusECore::MidiTrack* mt=dynamic_cast<MusECore::MidiTrack*>(*it);
+                          if (mt && mt!=t && mt->outPort()==no)
+                            break;
+                        }
+                        if (it == MusEGlobal::song->tracks()->end())
+                          break;
+                      }
+                  
+                    if (no==MIDI_PORTS)
+                    {
+                      delete p;
+                      printf("THIS IS VERY UNLIKELY TO HAPPEN: no free midi ports! you have used all %i!\n",MIDI_PORTS);
+                      break;
+                    }
+                    
+                    
+                    potential_new_port_no=no;
+                    typedef std::map<std::string, int > asmap;
+                    typedef std::map<std::string, int >::iterator imap;
+                    
+                    asmap mapALSA;
+                    asmap mapJACK;
+                    
+                    int aix = 0x10000000;
+                    int jix = 0x20000000;
+                    for(MusECore::iMidiDevice i = MusEGlobal::midiDevices.begin(); i != MusEGlobal::midiDevices.end(); ++i) 
+                    {
+                      if((*i)->deviceType() == MusECore::MidiDevice::ALSA_MIDI)
+                      {
+                        // don't add devices which are used somewhere
+                        int j;
+                        for (j=0;j<MIDI_PORTS;j++)
+                          if (MusEGlobal::midiPorts[j].device() == *i)
+                            break;
+                            
+                        if (j==MIDI_PORTS) mapALSA.insert( std::pair<std::string, int> (std::string((*i)->name().toLatin1().constData()), aix) );
+                        
+                        ++aix;
+                      }  
+                      else if((*i)->deviceType() == MusECore::MidiDevice::JACK_MIDI)
+                      {
+                        // don't add devices which are used somewhere
+                        int j;
+                        for (j=0;j<MIDI_PORTS;j++)
+                          if (MusEGlobal::midiPorts[j].device() == *i)
+                            break;
+
+                        if (j==MIDI_PORTS) mapJACK.insert( std::pair<std::string, int> (std::string((*i)->name().toLatin1().constData()), jix) );
+                        ++jix;
+                      }
+                    }
+
+                    if (!mapALSA.empty() || !mapJACK.empty())
+                    {
+                      QMenu* pup = p->addMenu(tr("Unused Devices"));
+                      QAction* act;
+                      
+                      
+                      if (!mapALSA.empty())
+                      {
+                        pup->addAction(new MusEGui::MenuTitleItem("ALSA:", pup));
+                        
+                        for(imap i = mapALSA.begin(); i != mapALSA.end(); ++i) 
+                        {
+                          int idx = i->second;
+                          QString s(i->first.c_str());
+                          MusECore::MidiDevice* md = MusEGlobal::midiDevices.find(s, MusECore::MidiDevice::ALSA_MIDI);
+                          if(md)
+                          {
+                            if(md->deviceType() != MusECore::MidiDevice::ALSA_MIDI)  
+                              continue;
+                              
+                            act = pup->addAction(md->name());
+                            act->setData(idx);
+                          }  
+                        }
+                      }
+                      
+                      if (!mapALSA.empty() && !mapJACK.empty())
+                        pup->addSeparator();
+                      
+                      if (!mapJACK.empty())
+                      {
+                        pup->addAction(new MusEGui::MenuTitleItem("JACK:", pup));
+                        
+                        for(imap i = mapJACK.begin(); i != mapJACK.end(); ++i) 
+                        {
+                          int idx = i->second;
+                          QString s(i->first.c_str());
+                          MusECore::MidiDevice* md = MusEGlobal::midiDevices.find(s, MusECore::MidiDevice::JACK_MIDI);
+                          if(md)
+                          {
+                            if(md->deviceType() != MusECore::MidiDevice::JACK_MIDI)  
+                              continue;
+                              
+                            act = pup->addAction(md->name());
+                            act->setData(idx);
+                          }  
+                        }
+                      }
+                    }
+                  }
+                  
+                  
                   QAction* act = p->exec(mapToGlobal(QPoint(x, y)), 0);
                   if(!act) 
                   {
                     delete p;
                     break;
                   }  
-                    
+                  
+                  QString acttext=act->text();
                   int n = act->data().toInt();
                   delete p;
                         
                   if(n < 0)              // Invalid item.
                     break;
                   
-                  if(n >= MIDI_PORTS)    // Show port config dialog.
+                  if(n == MIDI_PORTS)    // Show port config dialog.
                   {
                     MusEGlobal::muse->configMidiPorts();
                     break;
                   }
+                  else if (n & 0x30000000)
+                  {
+                    int typ;
+                    if (n & 0x10000000)
+                      typ = MusECore::MidiDevice::ALSA_MIDI;
+                    else
+                      typ = MusECore::MidiDevice::JACK_MIDI;
+
+                    MusECore::MidiDevice* sdev = MusEGlobal::midiDevices.find(acttext, typ);
 
+                    MusEGlobal::midiSeq->msgSetMidiDevice(&MusEGlobal::midiPorts[potential_new_port_no], sdev);
+                    n=potential_new_port_no;
+                  }
                   // Changed by T356.
                   //track->setOutPort(n);
                   //MusEGlobal::audio->msgSetTrackOutPort(track, n);
@@ -892,16 +1030,24 @@ void TList::moveSelection(int n)
                               if (t == tracks->end()) {
                                     --t;
                                     break;
-                                    }
                               }
-                        }
+                              // skip over hidden tracks
+                              if (!(*t)->isVisible()) {
+                                    n++;
+                              }
+                         }
+                  }
                   else {
                         while (n++ != 0) {
                               if (t == tracks->begin())
                                     break;
                               --t;
+                              // skip over hidden tracks
+                              if (!(*t)->isVisible()) {
+                                    n--;
                               }
                         }
+                  }
                   (*s)->setSelected(false);
                   (*t)->setSelected(true);
 
@@ -1048,7 +1194,7 @@ void TList::mousePressEvent(QMouseEvent* ev)
                   if(act)
                   {
                     t = MusEGlobal::song->addNewTrack(act);  // Add at end of list.
-                    if(t)
+                    if(t && t->isVisible())
                     {
                       MusEGlobal::song->deselectTracks();
                       t->setSelected(true);
@@ -1063,13 +1209,13 @@ void TList::mousePressEvent(QMouseEvent* ev)
                   //delete synp;
                   delete p;
             }
-            else if (button == Qt::LeftButton) {
+            /*else if (button == Qt::LeftButton) {
               if (!ctrl) 
               {
                 MusEGlobal::song->deselectTracks();
                 emit selectionChanged(0);
               }  
-            }
+            }*/
             return;
             }
 
@@ -1107,7 +1253,8 @@ void TList::mousePressEvent(QMouseEvent* ev)
 
             return;
             }
-      mode = START_DRAG;
+
+      mode = NORMAL;
 
       switch (col) {
               case COL_CLEF:
@@ -1136,8 +1283,8 @@ void TList::mousePressEvent(QMouseEvent* ev)
                   }
                   delete p;
                 }
-
                 break;
+                
               case COL_AUTOMATION:
                 {
                 if (!t->isMidiTrack()) {
@@ -1173,6 +1320,8 @@ void TList::mousePressEvent(QMouseEvent* ev)
 
             case COL_RECORD:
                   {
+                      mode = START_DRAG;
+                      
                       bool val = !(t->recordFlag());
                       if (button == Qt::LeftButton) {
                         if (!t->isMidiTrack()) {
@@ -1211,6 +1360,7 @@ void TList::mousePressEvent(QMouseEvent* ev)
                   }
                   break;
             case COL_NONE:
+                  mode = START_DRAG;
                   break;
             case COL_CLASS:
                   if (t->isMidiTrack())
@@ -1231,9 +1381,10 @@ void TList::mousePressEvent(QMouseEvent* ev)
                     
                   //MusEGlobal::audio->msgUpdateSoloStates(); // p4.0.14
                   //MusEGlobal::song->update(SC_ROUTE);       //
-                  
                   break;
+                  
             case COL_MUTE:
+                  mode = START_DRAG;
                   // p3.3.29
                   if ((button == Qt::RightButton) || (((QInputEvent*)ev)->modifiers() & Qt::ShiftModifier))
                     t->setOff(!t->off());
@@ -1247,11 +1398,13 @@ void TList::mousePressEvent(QMouseEvent* ev)
                   MusEGlobal::song->update(SC_MUTE);
                   break;
             case COL_SOLO:
+                  mode = START_DRAG;
                   MusEGlobal::audio->msgSetSolo(t, !t->solo());
                   MusEGlobal::song->update(SC_SOLO);
                   break;
 
             case COL_NAME:
+                  mode = START_DRAG;
                   if (button == Qt::LeftButton) {
                         if (!ctrl) {
                               MusEGlobal::song->deselectTracks();
@@ -1367,11 +1520,13 @@ void TList::mousePressEvent(QMouseEvent* ev)
                   break;
 
             case COL_TIMELOCK:
+                  mode = START_DRAG;
                   t->setLocked(!t->locked());
                   break;
 
             case COL_OCHANNEL:
                   {
+                    mode = START_DRAG; // or not? (flo)
                     int delta = 0;
                     if (button == Qt::RightButton) 
                       delta = 1;
@@ -1437,6 +1592,9 @@ void TList::mousePressEvent(QMouseEvent* ev)
                     }      
                   }
                   break;
+            
+            default:
+                  mode = START_DRAG;
           }        
       redraw();
       }
diff --git a/muse2/muse/audio.cpp b/muse2/muse/audio.cpp
index fd90c2c2..0b1574cc 100644
--- a/muse2/muse/audio.cpp
+++ b/muse2/muse/audio.cpp
@@ -25,8 +25,6 @@
 #include <cmath>
 #include <errno.h>
 
-#include <QSocketNotifier>
-
 #include "app.h"
 #include "song.h"
 #include "node.h"
@@ -51,10 +49,18 @@
 namespace MusEGlobal {
 MusECore::Audio* audio;
 MusECore::AudioDevice* audioDevice;   // current audio device in use
-extern unsigned int volatile midiExtSyncTicks;   // p3.3.25
+extern unsigned int volatile midiExtSyncTicks;   
 }
 
 namespace MusECore {
+  
+  
+void initAudio()   
+{
+      MusEGlobal::audio = new Audio();
+}
+
+  
 extern double curTime();
 
 //static const unsigned char mmcDeferredPlayMsg[] = { 0x7f, 0x7f, 0x06, 0x03 };
@@ -166,8 +172,11 @@ Audio::Audio()
             exit(-1);
             }
       sigFd = filedes[1];
-      QSocketNotifier* ss = new QSocketNotifier(filedes[0], QSocketNotifier::Read);
-      MusEGlobal::song->connect(ss, SIGNAL(activated(int)), MusEGlobal::song, SLOT(seqSignal(int)));
+      sigFdr = filedes[0];
+
+      // Moved to MusE::MusE
+      //QSocketNotifier* ss = new QSocketNotifier(filedes[0], QSocketNotifier::Read);
+      //MusEGlobal::song->connect(ss, SIGNAL(activated(int)), MusEGlobal::song, SLOT(seqSignal(int)));
       }
 
 //---------------------------------------------------------
@@ -182,7 +191,9 @@ bool Audio::start()
       //process(MusEGlobal::segmentSize);   // warm up caches
       state = STOP;
       _loopCount = 0;
-      MusEGlobal::muse->setHeartBeat();
+      
+      MusEGlobal::muse->setHeartBeat();  
+      
       if (MusEGlobal::audioDevice) {
           //_running = true;
           //MusEGlobal::audioDevice->start();
@@ -221,9 +232,11 @@ bool Audio::start()
       // shall we really stop JACK transport and locate to
       // saved position?
 
-      MusEGlobal::audioDevice->stopTransport();
+      MusEGlobal::audioDevice->stopTransport();  
+      
       //MusEGlobal::audioDevice->seekTransport(MusEGlobal::song->cPos().frame());
-      MusEGlobal::audioDevice->seekTransport(MusEGlobal::song->cPos());
+      MusEGlobal::audioDevice->seekTransport(MusEGlobal::song->cPos());   
+      
       return true;
       }
 
@@ -531,6 +544,26 @@ void Audio::process1(unsigned samplePos, unsigned offset, unsigned frames)
       // Pre-process the metronome.
       ((AudioTrack*)metronome)->preProcessAlways();
       
+      // Process Aux tracks first.
+      for(ciTrack it = tl->begin(); it != tl->end(); ++it) 
+      {
+        if((*it)->isMidiTrack())
+          continue;
+        track = (AudioTrack*)(*it);
+        if(!track->processed() && track->type() == Track::AUDIO_AUX)
+        {
+          //printf("Audio::process1 Do aux: track:%s\n", track->name().toLatin1().constData());  
+          channels = track->channels();
+          // Just a dummy buffer.
+          float* buffer[channels];
+          float data[frames * channels];
+          for (int i = 0; i < channels; ++i)
+                buffer[i] = data + i * frames;
+          //printf("Audio::process1 calling track->copyData for track:%s\n", track->name().toLatin1());
+          track->copyData(samplePos, channels, -1, -1, frames, buffer);
+        }
+      }      
+      
       OutputList* ol = MusEGlobal::song->outputs();
       for (ciAudioOutput i = ol->begin(); i != ol->end(); ++i) 
         (*i)->process(samplePos, offset, frames);
@@ -548,8 +581,11 @@ void Audio::process1(unsigned samplePos, unsigned offset, unsigned frames)
         track = (AudioTrack*)(*it);
         // Ignore unprocessed tracks which have an output route, because they will be processed by 
         //  whatever track(s) they are routed to.
-        if(!track->processed() && track->noOutRoute() && (track->type() != Track::AUDIO_OUTPUT))
+        //if(!track->processed() && track->noOutRoute() && (track->type() != Track::AUDIO_OUTPUT))
+        // No, do all.
+        if(!track->processed() && (track->type() != Track::AUDIO_OUTPUT))
         {
+          //printf("Audio::process1 track:%s\n", track->name().toLatin1().constData()); 
           channels = track->channels();
           // Just a dummy buffer.
           float* buffer[channels];
diff --git a/muse2/muse/audio.h b/muse2/muse/audio.h
index 8d89be78..3c4eb17d 100644
--- a/muse2/muse/audio.h
+++ b/muse2/muse/audio.h
@@ -166,7 +166,9 @@ class Audio {
       int fromThreadFdw, fromThreadFdr;  // message pipe
 
       int sigFd;              // pipe fd for messages to gui
-
+      //QSocketNotifier* _socketNotifier;
+      int sigFdr;
+      
       // record values:
       Pos startRecordPos;
       Pos endRecordPos;
@@ -189,8 +191,12 @@ class Audio {
 
    public:
       Audio();
-      virtual ~Audio() {}
+      virtual ~Audio() { } 
 
+      // Access to message pipe (like from gui namespace), otherwise audio would need to depend on gui.
+      int getFromThreadFdw() { return sigFd; } 
+      int getFromThreadFdr() { return sigFdr; }  
+      
       void process(unsigned frames);
       bool sync(int state, unsigned frame);
       void shutdown();
diff --git a/muse2/muse/audioprefetch.cpp b/muse2/muse/audioprefetch.cpp
index 9406911f..1fcb7cef 100644
--- a/muse2/muse/audioprefetch.cpp
+++ b/muse2/muse/audioprefetch.cpp
@@ -39,7 +39,11 @@ MusECore::AudioPrefetch* audioPrefetch;
 
 namespace MusECore {
 
-// Added by Tim. p3.3.20
+void initAudioPrefetch()  
+{
+  MusEGlobal::audioPrefetch = new AudioPrefetch("Prefetch");
+}
+
 //#define AUDIOPREFETCH_DEBUG
 
 enum { PREFETCH_TICK, PREFETCH_SEEK
@@ -140,6 +144,7 @@ void AudioPrefetch::msgTick()
       {
       PrefetchMsg msg;
       msg.id  = PREFETCH_TICK;
+      msg.pos = 0; // seems to be unused, was uninitalized.
       while (sendMsg1(&msg, sizeof(msg))) {
             printf("AudioPrefetch::msgTick(): send failed!\n");
             }
diff --git a/muse2/muse/audiotrack.cpp b/muse2/muse/audiotrack.cpp
index 7de92434..aceacc75 100644
--- a/muse2/muse/audiotrack.cpp
+++ b/muse2/muse/audiotrack.cpp
@@ -42,10 +42,10 @@
 
 namespace MusECore {
 
-bool AudioAux::_isVisible=true;
-bool AudioInput::_isVisible=true;
-bool AudioOutput::_isVisible=true;
-bool AudioGroup::_isVisible = true;
+bool AudioAux::_isVisible=false;
+bool AudioInput::_isVisible=false;
+bool AudioOutput::_isVisible=false;
+bool AudioGroup::_isVisible =false;
 bool WaveTrack::_isVisible=true;
 
 // By T356. For caching jack in/out routing names BEFORE file save. 
@@ -107,7 +107,7 @@ AudioTrack::AudioTrack(TrackType t)
       _automationType = AUTO_OFF;
       //setChannels(1);
       setChannels(2);
-      addController(new CtrlList(AC_VOLUME,"Volume",0.0,3.16 /* roughly 10 db */, VAL_LOG));
+      addController(new CtrlList(AC_VOLUME,"Volume",0.001,3.163 /* roughly 10 db */, VAL_LOG));
       addController(new CtrlList(AC_PAN, "Pan", -1.0, 1.0, VAL_LINEAR));
       addController(new CtrlList(AC_MUTE,"Mute",0.0,1.0, VAL_LINEAR, true /*dont show in arranger */));
       
@@ -1610,8 +1610,40 @@ void AudioAux::read(Xml& xml)
 //   getData
 //---------------------------------------------------------
 
-bool AudioAux::getData(unsigned /*pos*/, int ch, unsigned /*samples*/, float** data)
+bool AudioAux::getData(unsigned pos, int ch, unsigned samples, float** data)
       {
+      // Make sure all the aux-supporting tracks are processed first so aux data is gathered.    p4.0.37
+      TrackList* tl = MusEGlobal::song->tracks();
+      AudioTrack* track;
+      for(ciTrack it = tl->begin(); it != tl->end(); ++it) 
+      {
+        if((*it)->isMidiTrack())
+          continue;
+        track = (AudioTrack*)(*it);
+        // If there are any Aux route paths to the track, defer processing until the second main track processing pass.  
+        if(!track->processed() && track->hasAuxSend() && !track->auxRefCount())
+        {
+          int chans = track->channels();
+          // Just a dummy buffer.
+          float* buff[chans];
+          float buff_data[samples * chans];
+          for (int i = 0; i < chans; ++i)
+                buff[i] = buff_data + i * samples;
+          
+          //printf("AudioAux::getData name:%s\n    calling copyData on:%s auxRefCount:%d\n", 
+          //       name().toLatin1().constData(), track->name().toLatin1().constData(), track->auxRefCount()); 
+          
+          track->copyData(pos, chans, -1, -1, samples, buff);
+          
+          /* float* buff[ch];
+          float buff_data[samples * ch];
+          for (int i = 0; i < ch; ++i)
+                buff[i] = buff_data + i * samples;
+          //printf("Audio::process1 calling track->copyData for track:%s\n", track->name().toLatin1());
+          track->copyData(pos, ch, -1, -1, samples, buff);  */
+        }
+      }      
+  
       for (int i = 0; i < ch; ++i)
             data[i] = buffer[i % channels()];
       return true;
diff --git a/muse2/muse/cliplist/cliplist.cpp b/muse2/muse/cliplist/cliplist.cpp
index a4702137..60041dae 100644
--- a/muse2/muse/cliplist/cliplist.cpp
+++ b/muse2/muse/cliplist/cliplist.cpp
@@ -32,6 +32,7 @@
 #include "wave.h"
 #include "xml.h"
 #include "ui_cliplisteditorbase.h"
+#include "app.h"
 
 
 namespace MusEGui {
@@ -168,6 +169,7 @@ ClipListEdit::ClipListEdit(QWidget* parent)
       connect(editor->len, SIGNAL(valueChanged(const MusECore::Pos&)), SLOT(lenChanged(const MusECore::Pos&)));
 
       updateList();
+      MusEGlobal::muse->topwinMenuInited(this);
       }
 
 ClipListEdit::~ClipListEdit()
@@ -194,7 +196,7 @@ void ClipListEdit::updateList()
 
 void ClipListEdit::closeEvent(QCloseEvent* e)
       {
-      emit deleted(static_cast<TopWin*>(this));
+      emit isDeleting(static_cast<TopWin*>(this));
       e->accept();
       }
 
diff --git a/muse2/muse/cliplist/cliplist.h b/muse2/muse/cliplist/cliplist.h
index b490663c..0972df97 100644
--- a/muse2/muse/cliplist/cliplist.h
+++ b/muse2/muse/cliplist/cliplist.h
@@ -73,7 +73,7 @@ class ClipListEdit : public TopWin {
       void clicked(QTreeWidgetItem*, int);
 
    signals:
-      void deleted(MusEGui::TopWin*);
+      void isDeleting(MusEGui::TopWin*);
 
    public:
       ClipListEdit(QWidget* parent);
diff --git a/muse2/muse/cobject.cpp b/muse2/muse/cobject.cpp
index 59a9463e..50586d45 100644
--- a/muse2/muse/cobject.cpp
+++ b/muse2/muse/cobject.cpp
@@ -50,6 +50,7 @@ bool TopWin::initInited=false;
 TopWin::TopWin(ToplevelType t, QWidget* parent, const char* name, Qt::WindowFlags f)
                  : QMainWindow(parent, f)
 {
+	_isDeleting = false;
 	if (initInited==false)
 		initConfiguration();
 
@@ -77,7 +78,10 @@ TopWin::TopWin(ToplevelType t, QWidget* parent, const char* name, Qt::WindowFlag
 	mdisubwin=NULL;
 	_sharesToolsAndMenu=_defaultSubwin[_type] ? _sharesWhenSubwin[_type] : _sharesWhenFree[_type];
 	if (_defaultSubwin[_type])
+	{
 		setIsMdiWin(true);
+		_savedToolbarState=_toolbarNonsharedInit[_type];
+	}
 
 	if (_sharesToolsAndMenu)
 		menuBar()->hide();
@@ -85,8 +89,11 @@ TopWin::TopWin(ToplevelType t, QWidget* parent, const char* name, Qt::WindowFlag
 	subwinAction->setChecked(isMdiWin());
 	shareAction->setChecked(_sharesToolsAndMenu);
 	fullscreenAction->setEnabled(!isMdiWin());
-
-	resize(_widthInit[_type], _heightInit[_type]);
+	
+	if (mdisubwin)
+		mdisubwin->resize(_widthInit[_type], _heightInit[_type]);
+	else
+		resize(_widthInit[_type], _heightInit[_type]);
 }
 
 
@@ -96,6 +103,8 @@ TopWin::TopWin(ToplevelType t, QWidget* parent, const char* name, Qt::WindowFlag
 
 void TopWin::readStatus(MusECore::Xml& xml)
 {
+	int x=0, y=0, width=800, height=600;
+	
 	for (;;)
 	{
 		MusECore::Xml::Token token = xml.parse();
@@ -106,17 +115,24 @@ void TopWin::readStatus(MusECore::Xml& xml)
 		switch (token)
 		{
 			case MusECore::Xml::TagStart:
-				if (tag == "geometry_state")
-				{
-					if (!restoreGeometry(QByteArray::fromHex(xml.parse1().toAscii())))
-						fprintf(stderr,"ERROR: couldn't restore geometry. however, this is probably not really a problem.\n");
-				}
+				if (tag == "x")
+					x=xml.parseInt();
+				else if (tag == "y")
+					y=xml.parseInt();
+				else if (tag == "width")
+					width=xml.parseInt();
+				else if (tag == "height")
+					height=xml.parseInt();
 				else if (tag == "toolbars")
 				{
 					if (!sharesToolsAndMenu())
 					{
 						if (!restoreState(QByteArray::fromHex(xml.parse1().toAscii())))
-						 fprintf(stderr,"ERROR: couldn't restore toolbars. however, this is not really a problem.\n");
+						{
+							fprintf(stderr,"ERROR: couldn't restore toolbars. trying default configuration...\n");
+							if (!restoreState(_toolbarNonsharedInit[_type]))
+								fprintf(stderr,"ERROR: couldn't restore default toolbars. this is not really a problem.\n");
+						}
 					}
 					else
 					{
@@ -139,7 +155,20 @@ void TopWin::readStatus(MusECore::Xml& xml)
 
 			case MusECore::Xml::TagEnd:
 				if (tag == "topwin")
+				{
+					if (mdisubwin)
+					{
+						mdisubwin->move(x, y);
+						mdisubwin->resize(width, height);
+					}
+					else
+					{
+						move(x,y);
+						resize(width,height);
+					}
+
 					return;
+				}
 	
 			default:
 				break;
@@ -159,7 +188,22 @@ void TopWin::writeStatus(int level, MusECore::Xml& xml) const
 	// changing it won't break muse, but it may break proper
 	// restoring of the positions
 	xml.intTag(level, "is_subwin", isMdiWin());
-	xml.strTag(level, "geometry_state", saveGeometry().toHex().data());
+
+	if (mdisubwin)
+	{
+		xml.intTag(level, "x", mdisubwin->x());
+		xml.intTag(level, "y", mdisubwin->y());
+		xml.intTag(level, "width", mdisubwin->width());
+		xml.intTag(level, "height", mdisubwin->height());
+	}
+	else
+	{
+		xml.intTag(level, "x", x());
+		xml.intTag(level, "y", y());
+		xml.intTag(level, "width", width());
+		xml.intTag(level, "height", height());
+	}
+
 	xml.intTag(level, "shares_menu", sharesToolsAndMenu());
 
 	if (!sharesToolsAndMenu())
@@ -359,8 +403,17 @@ void TopWin::shareToolsAndMenu(bool val)
 
 void TopWin::storeInitialState() const
 {
-	_widthInit[_type] = width();
-	_heightInit[_type] = height();
+	if (mdisubwin)
+	{
+		_widthInit[_type] = mdisubwin->width();
+		_heightInit[_type] = mdisubwin->height();
+	}
+	else
+	{
+		_widthInit[_type] = width();
+		_heightInit[_type] = height();
+	}
+	
 	if (sharesToolsAndMenu())
 	{
 		if (muse->getCurrentMenuSharingTopwin() == this)
@@ -519,4 +572,15 @@ void TopWin::resize(const QSize& s)
 	resize(s.width(), s.height());
 }
 
+TopWin* ToplevelList::findType(TopWin::ToplevelType type) const
+{
+	for (ciToplevel i = begin(); i != end(); ++i) 
+	{
+		if((*i)->type() == type) 
+			return (*i);
+	}  
+	return 0;
+}
+
+
 } // namespace MusEGui
diff --git a/muse2/muse/cobject.h b/muse2/muse/cobject.h
index c1c45039..f6ea2ce1 100644
--- a/muse2/muse/cobject.h
+++ b/muse2/muse/cobject.h
@@ -62,7 +62,8 @@ class TopWin : public QMainWindow
       ToplevelType type() const { return _type; }
       static QString typeName(ToplevelType t);
 
-
+      bool deleting() const { return _isDeleting; }
+      
       virtual void readStatus(MusECore::Xml&);
       virtual void writeStatus(int, MusECore::Xml&) const;
 
@@ -118,6 +119,11 @@ class TopWin : public QMainWindow
       
       QByteArray _savedToolbarState;
       
+      // Set if close has been called on a TopWin having the WA_DeleteOnClose attribute.
+      // The TopWins and any children should ignore any signals such as songChanged
+      //  which may cause a crash while deleting.
+      bool _isDeleting;  
+      
       void initTopwinState();
 
   private slots:
@@ -131,13 +137,25 @@ class TopWin : public QMainWindow
       void shareToolsAndMenu(bool);
       void restoreMainwinState();
       void storeInitialState() const;
-  
+      
       };
 
 
-typedef std::list <TopWin*> ToplevelList;
-typedef ToplevelList::iterator iToplevel;
-typedef ToplevelList::const_iterator ciToplevel;
+//---------------------------------------------------------
+//   ToplevelList
+//---------------------------------------------------------
+
+//typedef std::list <TopWin*> ToplevelList;
+//typedef ToplevelList::iterator iToplevel;
+//typedef ToplevelList::const_iterator ciToplevel;
+
+typedef std::list<TopWin*>::iterator iToplevel;
+typedef std::list<TopWin*>::const_iterator ciToplevel;
+
+class ToplevelList : public std::list<TopWin* > {
+   public:
+        TopWin* findType(TopWin::ToplevelType) const;
+      };
 
 } // namespace MusEGui
 
diff --git a/muse2/muse/conf.cpp b/muse2/muse/conf.cpp
index 26f96bf1..5376734c 100644
--- a/muse2/muse/conf.cpp
+++ b/muse2/muse/conf.cpp
@@ -220,7 +220,7 @@ static void readPortChannel(Xml& xml, int midiPort)
 //   readConfigMidiPort
 //---------------------------------------------------------
 
-static void readConfigMidiPort(Xml& xml)
+static void readConfigMidiPort(Xml& xml, bool skipConfig)
       {
       int idx = 0;
       QString device;
@@ -234,11 +234,9 @@ static void readConfigMidiPort(Xml& xml)
       // FIXME: TODO: Make this user-configurable!
       QString instrument("GM"); 
       
+      int rwFlags = 3;
       int openFlags = 1;
-      bool thruFlag = false;
-      //int dic = 0;
-      //int doc = 0;
-      int dic = -1;   // p4.0.17
+      int dic = -1;   
       int doc = -1;
       
       MidiSyncInfo tmpSi;
@@ -251,6 +249,19 @@ static void readConfigMidiPort(Xml& xml)
             QString tag = xml.s1();
             switch (token) {
                   case Xml::TagStart:
+                        
+                        // skipConfig added so it doesn't overwrite midi ports.   p4.0.41 Tim.
+                        // Try to keep the controller information. But, this may need to be moved below.  
+                        // Also may want to try to keep sync info, but that's a bit risky, so let's not for now.
+                        if (tag == "channel") {
+                              readPortChannel(xml, idx);
+                              break;
+                              }
+                        else if (skipConfig){
+                              xml.skip(tag);
+                              break;
+                              }
+                              
                         if (tag == "name")
                               device = xml.parse1();
                         else if (tag == "type")
@@ -262,6 +273,8 @@ static void readConfigMidiPort(Xml& xml)
                               }
                         else if (tag == "openFlags")
                               openFlags = xml.parseInt();
+                        else if (tag == "rwFlags")             // Jack midi devs need this.   p4.0.41
+                              rwFlags = xml.parseInt();
                         else if (tag == "defaultInChans")
                               dic = xml.parseInt(); 
                         else if (tag == "defaultOutChans")
@@ -270,16 +283,15 @@ static void readConfigMidiPort(Xml& xml)
                               tmpSi.read(xml);
                         else if (tag == "instrument") {
                               instrument = xml.parse1();
-                              // Moved by Tim.
-                              //MusEGlobal::midiPorts[idx].setInstrument(
+                              //MusEGlobal::midiPorts[idx].setInstrument(    // Moved below
                               //   registerMidiInstrument(instrument)
                               //   );
                               }
                         else if (tag == "midithru")
-                              thruFlag = xml.parseInt(); // obsolete
-                        else if (tag == "channel") {
-                              readPortChannel(xml, idx);
-                              }
+                              xml.parseInt(); // obsolete
+                        //else if (tag == "channel") {
+                        //      readPortChannel(xml, idx);   // Moved above
+                        //      }
                         else
                               xml.unknown("MidiDevice");
                         break;
@@ -290,6 +302,10 @@ static void readConfigMidiPort(Xml& xml)
                         break;
                   case Xml::TagEnd:
                         if (tag == "midiport") {
+                              
+                              if(skipConfig)      // p4.0.41
+                                return;
+                              
                               //if (idx > MIDI_PORTS) {
                               if (idx < 0 || idx >= MIDI_PORTS) {
                                     fprintf(stderr, "bad midi port %d (>%d)\n",
@@ -305,9 +321,8 @@ static void readConfigMidiPort(Xml& xml)
                               if(!dev && type == MidiDevice::JACK_MIDI)
                               {
                                 if(MusEGlobal::debugMsg)
-                                  fprintf(stderr, "readConfigMidiPort: creating jack midi device %s\n", device.toLatin1().constData());
-                                //dev = MidiJackDevice::createJackMidiDevice(device, openFlags);
-                                dev = MidiJackDevice::createJackMidiDevice(device);  // p3.3.55
+                                  fprintf(stderr, "readConfigMidiPort: creating jack midi device %s with rwFlags:%d\n", device.toLatin1().constData(), rwFlags);
+                                dev = MidiJackDevice::createJackMidiDevice(device, rwFlags);  
                               }
                               
                               if(MusEGlobal::debugMsg && !dev)
@@ -315,7 +330,7 @@ static void readConfigMidiPort(Xml& xml)
                               
                               MidiPort* mp = &MusEGlobal::midiPorts[idx];
                               
-                              mp->setInstrument(registerMidiInstrument(instrument));  // By Tim.
+                              mp->setInstrument(registerMidiInstrument(instrument));  
                               if(dic != -1)                      // p4.0.17 Leave them alone unless set by song.
                                 mp->setDefaultInChannels(dic);
                               if(doc != -1)
@@ -480,7 +495,7 @@ static void loadConfigMetronom(Xml& xml)
 //   readSeqConfiguration
 //---------------------------------------------------------
 
-static void readSeqConfiguration(Xml& xml)
+static void readSeqConfiguration(Xml& xml, bool skipConfig)
       {
       for (;;) {
             Xml::Token token = xml.parse();
@@ -492,7 +507,7 @@ static void readSeqConfiguration(Xml& xml)
                         if (tag == "metronom")
                               loadConfigMetronom(xml);
                         else if (tag == "midiport")
-                              readConfigMidiPort(xml);
+                              readConfigMidiPort(xml, skipConfig);
                         else if (tag == "rcStop")
                               MusEGlobal::rcStopNote = xml.parseInt();
                         else if (tag == "rcEnable")
@@ -542,7 +557,7 @@ void readConfiguration(Xml& xml, bool readOnlySequencer, bool doReadGlobalConfig
                            midiport configuration and VOLUME.
                         */
                         if (tag == "sequencer") {
-                              readSeqConfiguration(xml);
+                              readSeqConfiguration(xml, readOnlySequencer);
                               break;
                               }
                         else if (readOnlySequencer) {
@@ -580,8 +595,10 @@ void readConfiguration(Xml& xml, bool readOnlySequencer, bool doReadGlobalConfig
                                  MidiTrack::setVisible((bool)xml.parseInt());
                         else if (tag == "inputTracksVisible")
                                  AudioInput::setVisible((bool)xml.parseInt());
-                        else if (tag == "outputTracksVisible")
+                        else if (tag == "outputTracksVisible") {
+                                 printf("output track set from config!\n");
                                  AudioOutput::setVisible((bool)xml.parseInt());
+                        }
                         else if (tag == "synthTracksVisible")
                                  SynthI::setVisible((bool)xml.parseInt());
                         else if (tag == "bigtimeVisible")
@@ -624,7 +641,18 @@ void readConfiguration(Xml& xml, bool readOnlySequencer, bool doReadGlobalConfig
                               MusEGlobal::config.geometryTransport = readGeometry(xml, tag);
                         else if (tag == "geometryBigTime")
                               MusEGlobal::config.geometryBigTime = readGeometry(xml, tag);
-
+                        else if (tag == "Mixer") {
+                              if(mixers == 0)
+                                MusEGlobal::config.mixer1.read(xml);
+                              else  
+                                MusEGlobal::config.mixer2.read(xml);
+                              ++mixers;
+                              }
+                        else if (tag == "geometryMain")
+                              MusEGlobal::config.geometryMain = readGeometry(xml, tag);
+                              
+                        // don't insert else if(...) clauses between
+                        // this line and "Global config stuff begins here".
                         else if (!doReadGlobalConfig) {
                               xml.skip(tag);
                               break;
@@ -636,9 +664,6 @@ void readConfiguration(Xml& xml, bool readOnlySequencer, bool doReadGlobalConfig
                         
                         // ---- Global config stuff begins here ----
 
-                        else if (tag == "geometryMain")
-                              MusEGlobal::config.geometryMain = readGeometry(xml, tag);
-
                         else if (tag == "theme")
                               MusEGlobal::config.style = xml.parse1();
                         else if (tag == "styleSheetFile")
@@ -851,20 +876,6 @@ void readConfiguration(Xml& xml, bool readOnlySequencer, bool doReadGlobalConfig
                               MusEGlobal::config.canvasBgPixmap = xml.parse1();
                         else if (tag == "canvasCustomBgList")
                               MusEGlobal::config.canvasCustomBgList = xml.parse1().split(";", QString::SkipEmptyParts);
-                        
-                        //else if (tag == "mixer1")
-                        //      MusEGlobal::config.mixer1.read(xml);
-                        //else if (tag == "mixer2")
-                        //      MusEGlobal::config.mixer2.read(xml);
-                        else if (tag == "Mixer")
-                        {
-                              if(mixers == 0)
-                                MusEGlobal::config.mixer1.read(xml);
-                              else  
-                                MusEGlobal::config.mixer2.read(xml);
-                              ++mixers;
-                        }
-                        
                         else if (tag == "bigtimeForegroundcolor")
                               MusEGlobal::config.bigTimeForegroundColor = readColor(xml);
                         else if (tag == "bigtimeBackgroundcolor")
@@ -936,8 +947,8 @@ void readConfiguration(Xml& xml, bool readOnlySequencer, bool doReadGlobalConfig
                               MusEGlobal::config.minControlProcessPeriod = xml.parseUInt();
                         else if (tag == "guiRefresh")
                               MusEGlobal::config.guiRefresh = xml.parseInt();
-                        else if (tag == "userInstrumentsDir")
-                              MusEGlobal::config.userInstrumentsDir = xml.parse1();
+                        else if (tag == "userInstrumentsDir")                        // Obsolete
+                              MusEGlobal::config.userInstrumentsDir = xml.parse1();  // Keep for compatibility 
                         else if (tag == "startMode")
                               MusEGlobal::config.startMode = xml.parseInt();
                         else if (tag == "startSong")
@@ -956,6 +967,10 @@ void readConfiguration(Xml& xml, bool readOnlySequencer, bool doReadGlobalConfig
                               MusEGlobal::config.leftMouseButtonCanDecrease = xml.parseInt();
                         else if (tag == "rangeMarkerWithoutMMB")
                               MusEGlobal::config.rangeMarkerWithoutMMB = xml.parseInt();
+                        else if (tag == "addHiddenTracks")
+                              MusEGlobal::config.addHiddenTracks = xml.parseInt();
+                        else if (tag == "unhideTracks")
+                              MusEGlobal::config.unhideTracks = xml.parseInt();
 
                         // ---- the following only skips obsolete entries ----
                         else if ((tag == "arranger") || (tag == "geometryPianoroll") || (tag == "geometryDrumedit"))
@@ -1179,7 +1194,6 @@ static void writeSeqConfiguration(int level, Xml& xml, bool writePortInfo)
                   if (dev) {
                         xml.strTag(level, "name",   dev->name());
                         
-                        // p3.3.38
                         //if(dynamic_cast<MidiJackDevice*>(dev))
                         if(dev->deviceType() != MidiDevice::ALSA_MIDI)
                           //xml.intTag(level, "type", MidiDevice::JACK_MIDI);
@@ -1189,6 +1203,9 @@ static void writeSeqConfiguration(int level, Xml& xml, bool writePortInfo)
                         // openFlags was read before, but never written here.
                         //xml.intTag(level, "record", dev->rwFlags() & 0x2 ? 1 : 0);
                         xml.intTag(level, "openFlags", dev->openFlags());
+                        
+                        if(dev->deviceType() == MidiDevice::JACK_MIDI)
+                          xml.intTag(level, "rwFlags", dev->rwFlags());   // Need this. Jack midi devs are created by app.   p4.0.41 
                         }
                   mport->syncInfo().write(level, xml);
                   // write out registered controller for all channels
@@ -1255,9 +1272,8 @@ void MusE::writeGlobalConfiguration(int level, MusECore::Xml& xml) const
       xml.intTag(level, "dummyAudioBufSize", MusEGlobal::config.dummyAudioBufSize);
       xml.intTag(level, "dummyAudioSampleRate", MusEGlobal::config.dummyAudioSampleRate);
       xml.uintTag(level, "minControlProcessPeriod", MusEGlobal::config.minControlProcessPeriod);
-
       xml.intTag(level, "guiRefresh", MusEGlobal::config.guiRefresh);
-      xml.strTag(level, "userInstrumentsDir", MusEGlobal::config.userInstrumentsDir);
+      
       // Removed by Orcan. 20101220
       //xml.strTag(level, "helpBrowser", config.helpBrowser);
       xml.intTag(level, "extendedMidi", MusEGlobal::config.extendedMidi);
@@ -1294,6 +1310,17 @@ void MusE::writeGlobalConfiguration(int level, MusECore::Xml& xml) const
       xml.intTag(level, "leftMouseButtonCanDecrease", MusEGlobal::config.leftMouseButtonCanDecrease);
       xml.intTag(level, "rangeMarkerWithoutMMB", MusEGlobal::config.rangeMarkerWithoutMMB);
       
+      xml.intTag(level, "unhideTracks", MusEGlobal::config.unhideTracks);
+      xml.intTag(level, "addHiddenTracks", MusEGlobal::config.addHiddenTracks);
+
+      xml.intTag(level, "waveTracksVisible",  MusECore::WaveTrack::visible());
+      xml.intTag(level, "auxTracksVisible",  MusECore::AudioAux::visible());
+      xml.intTag(level, "groupTracksVisible",  MusECore::AudioGroup::visible());
+      xml.intTag(level, "midiTracksVisible",  MusECore::MidiTrack::visible());
+      xml.intTag(level, "inputTracksVisible",  MusECore::AudioInput::visible());
+      xml.intTag(level, "outputTracksVisible",  MusECore::AudioOutput::visible());
+      xml.intTag(level, "synthTracksVisible",  MusECore::SynthI::visible());
+
       //for (int i = 0; i < 6; ++i) {
       for (int i = 0; i < NUM_FONTS; ++i) {
             char buffer[32];
@@ -1348,7 +1375,6 @@ void MusE::writeGlobalConfiguration(int level, MusECore::Xml& xml) const
       xml.colorTag(level, "auxTrackBg",    MusEGlobal::config.auxTrackBg);
       xml.colorTag(level, "synthTrackBg",  MusEGlobal::config.synthTrackBg);
 
-      // Removed by Tim. p3.3.6
       //xml.intTag(level, "txSyncPort", txSyncPort);
       //xml.intTag(level, "rxSyncPort", rxSyncPort);
       xml.intTag(level, "mtctype", MusEGlobal::mtcType);
@@ -1375,11 +1401,8 @@ void MusE::writeGlobalConfiguration(int level, MusECore::Xml& xml) const
       xml.intTag(level, "bigtimeVisible", MusEGlobal::config.bigTimeVisible);
       xml.intTag(level, "transportVisible", MusEGlobal::config.transportVisible);
       
-      //xml.intTag(level, "mixerVisible", MusEGlobal::config.mixerVisible);  // Obsolete
       xml.intTag(level, "mixer1Visible", MusEGlobal::config.mixer1Visible);
       xml.intTag(level, "mixer2Visible", MusEGlobal::config.mixer2Visible);
-      //MusEGlobal::config.mixer1.write(level, xml, "mixer1");
-      //MusEGlobal::config.mixer2.write(level, xml, "mixer2");
       MusEGlobal::config.mixer1.write(level, xml);
       MusEGlobal::config.mixer2.write(level, xml);
 
@@ -1432,20 +1455,9 @@ void MusE::writeConfiguration(int level, MusECore::Xml& xml) const
       xml.intTag(level, "midiFilterCtrl3",  MusEGlobal::midiFilterCtrl3);
       xml.intTag(level, "midiFilterCtrl4",  MusEGlobal::midiFilterCtrl4);
 
-      xml.intTag(level, "waveTracksVisible",  MusECore::WaveTrack::visible());
-      xml.intTag(level, "auxTracksVisible",  MusECore::AudioAux::visible());
-      xml.intTag(level, "groupTracksVisible",  MusECore::AudioGroup::visible());
-      xml.intTag(level, "midiTracksVisible",  MusECore::MidiTrack::visible());
-      xml.intTag(level, "inputTracksVisible",  MusECore::AudioInput::visible());
-      xml.intTag(level, "outputTracksVisible",  MusECore::AudioOutput::visible());
-      xml.intTag(level, "synthTracksVisible",  MusECore::SynthI::visible());
-      // Removed by Tim. p3.3.6
-      
       //xml.intTag(level, "txDeviceId", txDeviceId);
       //xml.intTag(level, "rxDeviceId", rxDeviceId);
 
-      // Changed by Tim. p3.3.6
-      
       //xml.intTag(level, "txSyncPort", txSyncPort);
       /*
       // To keep old muse versions happy...
@@ -1467,8 +1479,6 @@ void MusE::writeConfiguration(int level, MusECore::Xml& xml) const
       }
       */
       
-      // Added by Tim. p3.3.6
-      
       //xml.tag(level++, "midiSyncInfo");
       //for(iMusECore::MidiDevice id = MusECore::MusEGlobal::midiDevices.begin(); id != MusECore::MusEGlobal::midiDevices.end(); ++id) 
       //{
@@ -1496,8 +1506,6 @@ void MusE::writeConfiguration(int level, MusECore::Xml& xml) const
 
       xml.intTag(level, "bigtimeVisible",   viewBigtimeAction->isChecked());
       xml.intTag(level, "transportVisible", viewTransportAction->isChecked());
-      //xml.intTag(level, "markerVisible",    viewMarkerAction->isChecked()); // Obsolete (done by song's toplevel list)
-      //xml.intTag(level, "mixerVisible",     menuView->isItemChecked(aid1));  // Obsolete
 
       xml.geometryTag(level, "geometryMain", this); // FINDME: maybe remove this? do we want
                                                     // the main win to jump around when loading?
@@ -1506,18 +1514,13 @@ void MusE::writeConfiguration(int level, MusECore::Xml& xml) const
       if (bigtime)
             xml.geometryTag(level, "geometryBigTime", bigtime);
       
-      //if (audioMixer)
-      //      xml.geometryTag(level, "geometryMixer", audioMixer);   // Obsolete
       xml.intTag(level, "mixer1Visible",    viewMixerAAction->isChecked());
       xml.intTag(level, "mixer2Visible",    viewMixerBAction->isChecked());
       if (mixer1)
-            //mixer1->write(level, xml, "mixer1");
             mixer1->write(level, xml);
       if (mixer2)
-            //mixer2->write(level, xml, "mixer2");
             mixer2->write(level, xml);
 
-      //_arranger->writeStatus(level, xml);  // Obsolete.  done by song's toplevel list. arrangerview also handles arranger.
       writeSeqConfiguration(level, xml, true);
 
       MusEGui::write_function_dialog_config(level, xml);
@@ -1658,18 +1661,12 @@ namespace MusEGlobal {
 //   write
 //---------------------------------------------------------
 
-//void MixerConfig::write(MusECore::Xml& xml, const char* name)
 void MixerConfig::write(int level, MusECore::Xml& xml)
-//void MixerConfig::write(int level, MusECore::Xml& xml, const char* name)
       {
-      //xml.stag(QString(name));
-      //xml.tag(level++, name.toLatin1().constData());
       xml.tag(level++, "Mixer");
-      //xml.tag(level++, name);
-      
+
       xml.strTag(level, "name", name);
       
-      //xml.tag("geometry",       geometry);
       xml.qrectTag(level, "geometry", geometry);
       
       xml.intTag(level, "showMidiTracks",   showMidiTracks);
@@ -1682,19 +1679,14 @@ void MixerConfig::write(int level, MusECore::Xml& xml)
       xml.intTag(level, "showAuxTracks",    showAuxTracks);
       xml.intTag(level, "showSyntiTracks",  showSyntiTracks);
       
-      //xml.etag(name);
-      //xml.etag(level, name.toLatin1().constData());
       xml.etag(level, "Mixer");
-      //xml.etag(level, name);
       }
 
 //---------------------------------------------------------
 //   read
 //---------------------------------------------------------
 
-//void MixerConfig::read(QDomNode node)
 void MixerConfig::read(MusECore::Xml& xml)
-//void MixerConfig::read(MusECore::Xml& xml, const QString& name)
       {
       for (;;) {
             MusECore::Xml::Token token(xml.parse());
diff --git a/muse2/muse/confmport.cpp b/muse2/muse/confmport.cpp
index 315e686e..d45dd370 100644
--- a/muse2/muse/confmport.cpp
+++ b/muse2/muse/confmport.cpp
@@ -183,22 +183,25 @@ void MPConfig::changeDefOutputRoutes(QAction* act)
         MusEGlobal::audio->msgUpdateSoloStates();
         MusEGlobal::song->update(SC_ROUTE);                    
         #else
-        int ch = 0;
-        for( ; ch < MIDI_CHANNELS; ++ch)
-          if(defch & (1 << ch)) break;
-           
-        MusEGlobal::audio->msgIdle(true);
-        for(MusECore::iMidiTrack it = mtl->begin(); it != mtl->end(); ++it)
-        {
-          // Leave drum track channel at current setting.
-          if((*it)->type() == MusECore::Track::DRUM)
-            (*it)->setOutPortAndUpdate(no);
-          else
-            (*it)->setOutPortAndChannelAndUpdate(no, ch);
-        }  
-        MusEGlobal::audio->msgIdle(false);
-        MusEGlobal::audio->msgUpdateSoloStates();
-        MusEGlobal::song->update(SC_MIDI_TRACK_PROP);                    
+        for(int ch = 0; ch < MIDI_CHANNELS; ++ch)
+          if(defch & (1 << ch))
+          { 
+            MusEGlobal::audio->msgIdle(true);
+            for(MusECore::iMidiTrack it = mtl->begin(); it != mtl->end(); ++it)
+            {
+              // Leave drum track channel at current setting.
+              if((*it)->type() == MusECore::Track::DRUM)
+                (*it)->setOutPortAndUpdate(no);
+              else
+                (*it)->setOutPortAndChannelAndUpdate(no, ch);
+            }  
+            MusEGlobal::audio->msgIdle(false);
+            MusEGlobal::audio->msgUpdateSoloStates();
+            MusEGlobal::song->update(SC_MIDI_TRACK_PROP);                    
+
+            // Stop at the first output channel found.
+            break;
+          }  
         #endif
       }
     }  
@@ -730,7 +733,7 @@ void MPConfig::rbClicked(QTableWidgetItem* item)
                       //act = pup->addAction(tr("Create") + QT_TRANSLATE_NOOP("@default", " Jack") + tr(" output"));
                       //act = pup->addAction(tr("Create") + QT_TRANSLATE_NOOP("@default", " Jack") + tr(" combo"));
                       // ... or keep it simple and let the user click on the green lights instead.
-                      act = pup->addAction(tr("Create") + QT_TRANSLATE_NOOP("@default", " Jack") + tr(" device"));
+                      act = pup->addAction(tr("Create Jack device"));
                       act->setData(0);
                       
                       typedef std::map<std::string, int > asmap;
@@ -776,7 +779,7 @@ void MPConfig::rbClicked(QTableWidgetItem* item)
                       //if(!mapALSA.empty())
                       {
                         pup->addSeparator();
-                        pup->addAction(new MusEGui::MenuTitleItem(QT_TRANSLATE_NOOP("@default", "ALSA:"), pup));
+                        pup->addAction(new MusEGui::MenuTitleItem("ALSA:", pup));
                         
                         for(imap i = mapALSA.begin(); i != mapALSA.end(); ++i) 
                         {
@@ -791,7 +794,7 @@ void MPConfig::rbClicked(QTableWidgetItem* item)
                             if(md->deviceType() != MusECore::MidiDevice::ALSA_MIDI)  
                               continue;
                               
-                            act = pup->addAction(QT_TRANSLATE_NOOP("@default", md->name()));
+                            act = pup->addAction(md->name());
                             act->setData(idx);
                             act->setCheckable(true);
                             act->setChecked(md == dev);
@@ -802,7 +805,7 @@ void MPConfig::rbClicked(QTableWidgetItem* item)
                       if(!mapSYNTH.empty())
                       {
                         pup->addSeparator();
-                        pup->addAction(new MusEGui::MenuTitleItem(QT_TRANSLATE_NOOP("@default", "SYNTH:"), pup));
+                        pup->addAction(new MusEGui::MenuTitleItem("SYNTH:", pup));
                         
                         for(imap i = mapSYNTH.begin(); i != mapSYNTH.end(); ++i) 
                         {
@@ -817,7 +820,7 @@ void MPConfig::rbClicked(QTableWidgetItem* item)
                             if(md->deviceType() != MusECore::MidiDevice::SYNTH_MIDI)  
                               continue;
                               
-                            act = pup->addAction(QT_TRANSLATE_NOOP("@default", md->name()));
+                            act = pup->addAction(md->name());
                             act->setData(idx);
                             act->setCheckable(true);
                             act->setChecked(md == dev);
@@ -828,7 +831,7 @@ void MPConfig::rbClicked(QTableWidgetItem* item)
                       //if(!mapJACK.empty())
                       {
                         pup->addSeparator();
-                        pup->addAction(new MusEGui::MenuTitleItem(QT_TRANSLATE_NOOP("@default", "JACK:"), pup));
+                        pup->addAction(new MusEGui::MenuTitleItem("JACK:", pup));
                         
                         for(imap i = mapJACK.begin(); i != mapJACK.end(); ++i) 
                         {
@@ -843,7 +846,7 @@ void MPConfig::rbClicked(QTableWidgetItem* item)
                             if(md->deviceType() != MusECore::MidiDevice::JACK_MIDI)  
                               continue;
                               
-                            act = pup->addAction(QT_TRANSLATE_NOOP("@default", md->name()));
+                            act = pup->addAction(md->name());
                             act->setData(idx);
                             act->setCheckable(true);
                             act->setChecked(md == dev);
@@ -902,8 +905,105 @@ void MPConfig::rbClicked(QTableWidgetItem* item)
                           sdev = 0;
                       }    
 
+                      int allch = (1 << MIDI_CHANNELS) - 1;  
+                      MusECore::MidiTrackList* mtl = MusEGlobal::song->midis();
+
+                      // Remove track routes to/from an existing port already using the selected device...
+                      if(sdev) 
+                      {
+                        for(int i = 0; i < MIDI_PORTS; ++i) 
+                        {
+                          if(MusEGlobal::midiPorts[i].device() == sdev) 
+                          {
+                            for(MusECore::iMidiTrack it = mtl->begin(); it != mtl->end(); ++it)
+                              MusEGlobal::audio->msgRemoveRoute(MusECore::Route(i, allch), MusECore::Route(*it, allch));
+
+                            // Turn on if and when multiple output routes are supported.
+                        #if 0
+                            for(MusECore::iMidiTrack it = mtl->begin(); it != mtl->end(); ++it)
+                              MusEGlobal::audio->msgRemoveRoute(MusECore::Route(no, allch), MusECore::Route(*it, allch));
+                            
+                            //MusEGlobal::audio->msgUpdateSoloStates();
+                            //MusEGlobal::song->update(SC_ROUTE);                    
+                        #endif
+                        
+                            break;
+                          }
+                        }
+                      }
+                      
+                      // Remove all track routes to/from this port...
+                      for(MusECore::iMidiTrack it = mtl->begin(); it != mtl->end(); ++it)
+                        // Remove all routes from this port to the tracks.
+                        MusEGlobal::audio->msgRemoveRoute(MusECore::Route(no, allch), MusECore::Route(*it, allch));
+                      // Turn on if and when multiple output routes are supported.
+                  #if 0
+                      for(MusECore::iMidiTrack it = mtl->begin(); it != mtl->end(); ++it)
+                        MusEGlobal::audio->msgRemoveRoute(MusECore::Route(no, allch), MusECore::Route(*it, allch));
+
+                      //MusEGlobal::audio->msgUpdateSoloStates();
+                      //MusEGlobal::song->update(SC_ROUTE);                    
+                  #endif
+                      
                       MusEGlobal::midiSeq->msgSetMidiDevice(port, sdev);
 		      MusEGlobal::muse->changeConfig(true);     // save configuration file
+                      
+                      // Add all track routes to/from this port...
+                      if(sdev)
+                      {  
+                        int chbits = MusEGlobal::midiPorts[no].defaultInChannels();
+                        // Do not add input routes to synths.
+                        if(!sdev->isSynti())  
+                        {
+                          for(MusECore::iMidiTrack it = mtl->begin(); it != mtl->end(); ++it)
+                          {
+                            // Remove all routes from this port to the tracks first.
+                            //MusEGlobal::audio->msgRemoveRoute(MusECore::Route(no, allch), MusECore::Route(*it, allch));
+                            // Now connect all the specified routes.
+                            if(chbits)
+                              MusEGlobal::audio->msgAddRoute(MusECore::Route(no, chbits), MusECore::Route(*it, chbits));
+                          }  
+                        }
+                        chbits = MusEGlobal::midiPorts[no].defaultOutChannels();
+                        // Turn on if and when multiple output routes are supported.
+                    #if 0
+                        for(MusECore::iMidiTrack it = mtl->begin(); it != mtl->end(); ++it)
+                        {
+                          // Remove all routes from this port to the tracks first.
+                          //MusEGlobal::audio->msgRemoveRoute(MusECore::Route(no, allch), MusECore::Route(*it, allch));
+                          // Now connect all the specified routes.
+                          if(chbits)
+                            MusEGlobal::audio->msgAddRoute(MusECore::Route(no, chbits), MusECore::Route(*it, chbits));
+                        }  
+                        //MusEGlobal::audio->msgUpdateSoloStates();
+                        //MusEGlobal::song->update(SC_ROUTE);                    
+                    #else
+                        for(int ch = 0; ch < MIDI_CHANNELS; ++ch)
+                          if(chbits & (1 << ch)) 
+                          {    
+                            MusEGlobal::audio->msgIdle(true);
+                            for(MusECore::iMidiTrack it = mtl->begin(); it != mtl->end(); ++it)
+                            {
+                              // Leave drum track channel at current setting.
+                              if((*it)->type() == MusECore::Track::DRUM)
+                                (*it)->setOutPortAndUpdate(no);
+                              else
+                                (*it)->setOutPortAndChannelAndUpdate(no, ch);
+                            }  
+                            MusEGlobal::audio->msgIdle(false);
+                            //MusEGlobal::audio->msgUpdateSoloStates();
+                            //MusEGlobal::song->update(SC_MIDI_TRACK_PROP);                    
+                            
+                            // Stop at the first output channel found.
+                            break;
+                          }   
+                    #endif
+                      }
+                      
+                      //MusEGlobal::audio->msgUpdateSoloStates();
+                      ////MusEGlobal::song->update(SC_ROUTE);                    
+                      
+                      MusEGlobal::audio->msgUpdateSoloStates();
                       MusEGlobal::song->update();
                     }  
                   }
@@ -1061,7 +1161,8 @@ MPConfig::MPConfig(QWidget* parent)
       //popup      = 0;
       instrPopup = 0;
       defpup = 0;
-      _showAliases = -1; // 0: Show first aliases, if available. Nah, stick with -1: none at first.
+      //_showAliases = -1; // 0: Show first aliases, if available. Nah, stick with -1: none at first.
+      _showAliases = 0; // 0: Show first aliases, if available. 
       
       QStringList columnnames;
       columnnames << tr("Port")
@@ -1125,8 +1226,7 @@ void MPConfig::songChanged(int flags)
       // Is it simply a midi controller value adjustment? Forget it.
       //if(flags == SC_MIDI_CONTROLLER)
       //  return;
-      // No need for anything but this, yet.
-      if(!(flags & SC_CONFIG))
+      if(!(flags & (SC_CONFIG | SC_TRACK_INSERTED | SC_TRACK_REMOVED | SC_TRACK_MODIFIED)))
         return;
     
       // Get currently selected index...
@@ -1299,32 +1399,29 @@ void MPConfig::songChanged(int flags)
       synthList->clear();
       for (std::vector<MusECore::Synth*>::iterator i = MusEGlobal::synthis.begin();
          i != MusEGlobal::synthis.end(); ++i) {
-            //s = (*i)->baseName();
-            //s = (*i)->name();
-
             QTreeWidgetItem* item = new QTreeWidgetItem(synthList);
-            //item->setText(0, s);
             item->setText(0, QString((*i)->baseName()));
+            item->setText(1, MusECore::synthType2String((*i)->synthType()));
             s.setNum((*i)->instances());
-            item->setText(1, s);
-	    item->setTextAlignment(1, Qt::AlignHCenter);
-            //item->setText(2, QString((*i)->baseName()));
-            item->setText(2, QString((*i)->name()));
+            item->setText(2, s);
+            //item->setTextAlignment(2, Qt::AlignHCenter);
+            item->setText(3, QString((*i)->name()));
             
-            item->setText(3, QString((*i)->version()));
-            item->setText(4, QString((*i)->description()));
+            item->setText(4, QString((*i)->version()));
+            item->setText(5, QString((*i)->description()));
             }
       instanceList->clear();
       MusECore::SynthIList* sl = MusEGlobal::song->syntis();
       for (MusECore::iSynthI si = sl->begin(); si != sl->end(); ++si) {
             QTreeWidgetItem* iitem = new QTreeWidgetItem(instanceList);
             iitem->setText(0, (*si)->name());
+            iitem->setText(1, MusECore::synthType2String((*si)->synth()->synthType()));
             if ((*si)->midiPort() == -1)
                   s = tr("<none>");
             else
                   s.setNum((*si)->midiPort() + 1);
-            iitem->setText(1, s);
-	    iitem->setTextAlignment(1, Qt::AlignHCenter);
+            iitem->setText(2, s);
+	    //iitem->setTextAlignment(2, Qt::AlignHCenter);
             }
       synthList->resizeColumnToContents(1);
       mdevView->resizeColumnsToContents();
@@ -1345,7 +1442,10 @@ void MPConfig::addInstanceClicked()
       QTreeWidgetItem* item = synthList->currentItem();
       if (item == 0)
             return;
-      MusECore::SynthI *si = MusEGlobal::song->createSynthI(item->text(0), item->text(2)); // Add at end of list.
+      // Add at end of list.
+      MusECore::SynthI *si = MusEGlobal::song->createSynthI(item->text(0), 
+                                                            item->text(3), 
+                                                            MusECore::string2SynthType(item->text(1))); 
       if(!si)
         return;
 
@@ -1374,8 +1474,9 @@ void MPConfig::removeInstanceClicked()
       MusECore::SynthIList* sl = MusEGlobal::song->syntis();
       MusECore::iSynthI ii;
       for (ii = sl->begin(); ii != sl->end(); ++ii) {
-            if ((*ii)->iname() == item->text(0))
-                  break;
+            if( (*ii)->iname() == item->text(0) && 
+                 MusECore::synthType2String((*ii)->synth()->synthType()) == item->text(1) )
+              break;
             }
       if (ii == sl->end()) {
             printf("synthesizerConfig::removeInstanceClicked(): synthi not found\n");
diff --git a/muse2/muse/ctrl/ctrlcanvas.cpp b/muse2/muse/ctrl/ctrlcanvas.cpp
index f592d4d3..9896de9a 100644
--- a/muse2/muse/ctrl/ctrlcanvas.cpp
+++ b/muse2/muse/ctrl/ctrlcanvas.cpp
@@ -227,13 +227,11 @@ CtrlCanvas::CtrlCanvas(MidiEditor* e, QWidget* parent, int xmag,
       connect(MusEGlobal::song, SIGNAL(posChanged(int, unsigned, bool)), this, SLOT(setPos(int, unsigned, bool)));
 
       setMouseTracking(true);
-      if (editor->parts()->empty()) {
-            curPart = 0;
-            curTrack = 0;
-            }
-      else {
+      curPart = 0;
+      curTrack = 0;
+      if (!editor->parts()->empty())
             setCurTrackAndPart();
-            }
+
       connect(MusEGlobal::song, SIGNAL(songChanged(int)), SLOT(songChanged(int)));
       connect(MusEGlobal::muse, SIGNAL(configChanged()), SLOT(configChanged()));
       
@@ -474,6 +472,9 @@ void CtrlCanvas::configChanged()
 
 void CtrlCanvas::songChanged(int type)
 {
+  if(editor->deleting())  // Ignore while while deleting to prevent crash.
+    return; 
+  
   //printf("CtrlCanvas::songChanged type:%x\n", type);  
   // Is it simply a midi controller value adjustment? Forget it.
   if(type == SC_MIDI_CONTROLLER)
@@ -1947,7 +1948,7 @@ void CtrlCanvas::drawOverlay(QPainter& p)
            //p.setFont(MusEGlobal::config.fonts[3]);
            //p.setPen(Qt::black);
            //p.drawText(width()/2-100,height()/2-10, "Use shift + pencil or line tool to draw new events");
-           p.drawText(2 , y * 2, tr("Use pencil or line tool to draw new events"));
+           p.drawText(2 , y * 2, tr("Drawing hint: Hold Ctrl to affect only existing events"));
            }
       }
 
@@ -1998,7 +1999,7 @@ void CtrlCanvas::draw(QPainter& p, const QRect& rect)
       //    draw line tool
       //---------------------------------------------------
 
-      if (drawLineMode && (tool == MusEGui::DrawTool)) {
+      if ((tool == MusEGui::DrawTool) && drawLineMode) {
             p.setPen(Qt::black);
             p.drawLine(line1x, line1y, line2x, line2y);
             }
diff --git a/muse2/muse/ctrl/ctrlcanvas.h b/muse2/muse/ctrl/ctrlcanvas.h
index 79910b94..1fcaf1d8 100644
--- a/muse2/muse/ctrl/ctrlcanvas.h
+++ b/muse2/muse/ctrl/ctrlcanvas.h
@@ -177,6 +177,8 @@ class CtrlCanvas : public MusEGui::View {
       void updateItems();
       void updateSelections();
 
+      //virtual void closeEvent(QCloseEvent*);
+      
    private slots:
       void songChanged(int type);
       void configChanged();    
diff --git a/muse2/muse/ctrl/ctrlpanel.cpp b/muse2/muse/ctrl/ctrlpanel.cpp
index ed83bab8..e46f949c 100644
--- a/muse2/muse/ctrl/ctrlpanel.cpp
+++ b/muse2/muse/ctrl/ctrlpanel.cpp
@@ -162,6 +162,9 @@ CtrlPanel::CtrlPanel(QWidget* parent, MidiEditor* e, CtrlCanvas* c, const char*
 
 void CtrlPanel::heartBeat()
 {
+  if(editor->deleting())  // Ignore while while deleting to prevent crash.
+    return;
+  
   inHeartBeat = true;
   
   if(_track && _ctrl && _dnum != -1)
diff --git a/muse2/muse/dialogs.cpp b/muse2/muse/dialogs.cpp
index d88977ff..54a080bf 100644
--- a/muse2/muse/dialogs.cpp
+++ b/muse2/muse/dialogs.cpp
@@ -71,6 +71,22 @@ void init_function_dialogs(QWidget* parent)
 	paste_events_dialog = new PasteEventsDialog(parent);
 }
 
+void retranslate_function_dialogs()
+{
+	gatetime_dialog->retranslateUi(gatetime_dialog);
+	velocity_dialog->retranslateUi(velocity_dialog);
+	quantize_dialog->retranslateUi(quantize_dialog);
+	erase_dialog->retranslateUi(erase_dialog);
+	del_overlaps_dialog->retranslateUi(del_overlaps_dialog);
+	set_notelen_dialog->retranslateUi(set_notelen_dialog);
+	move_notes_dialog->retranslateUi(move_notes_dialog);
+	transpose_dialog->retranslateUi(transpose_dialog);
+	crescendo_dialog->retranslateUi(crescendo_dialog);
+	legato_dialog->retranslateUi(legato_dialog);
+	paste_dialog->retranslateUi(paste_dialog);
+	paste_events_dialog->retranslateUi(paste_events_dialog);
+}
+
 void read_function_dialog_config(MusECore::Xml& xml)
 {
 	if (erase_dialog==NULL)
diff --git a/muse2/muse/dialogs.h b/muse2/muse/dialogs.h
index 08830fe0..f2d28f8c 100644
--- a/muse2/muse/dialogs.h
+++ b/muse2/muse/dialogs.h
@@ -59,6 +59,7 @@ extern PasteDialog* paste_dialog;
 extern PasteEventsDialog* paste_events_dialog;
 
 void init_function_dialogs(QWidget* parent);
+void retranslate_function_dialogs();
 void read_function_dialog_config(MusECore::Xml& xml);
 void write_function_dialog_config(int level, MusECore::Xml& xml);
 
diff --git a/muse2/muse/driver/alsamidi.cpp b/muse2/muse/driver/alsamidi.cpp
index eae695db..4687f17f 100644
--- a/muse2/muse/driver/alsamidi.cpp
+++ b/muse2/muse/driver/alsamidi.cpp
@@ -39,6 +39,8 @@
 #include "part.h"
 #include "gconfig.h"
 
+#include <QApplication>
+
 namespace MusECore {
 
 static int alsaSeqFdi = -1;
@@ -46,6 +48,7 @@ static int alsaSeqFdo = -1;
 
 snd_seq_t* alsaSeq = 0;
 static snd_seq_addr_t musePort;
+static snd_seq_addr_t announce_adr;
 
 //---------------------------------------------------------
 //   MidiAlsaDevice
@@ -83,42 +86,55 @@ QString MidiAlsaDevice::open()
       QString estr;
       int wer = 0;
       int rer = 0;
+
+      snd_seq_port_info_t *pinfo;
+      snd_seq_port_info_alloca(&pinfo);
+      //snd_seq_port_info_set_client(pinfo, snd_seq_client_info_get_client(cinfo));
+      snd_seq_port_info_set_addr(pinfo, &adr);
+
+      int cap = snd_seq_port_info_get_capability(pinfo);
       
       // subscribe for writing
       if (_openFlags & 1) 
       {
-            snd_seq_port_subscribe_set_sender(subs, &musePort);
-            snd_seq_port_subscribe_set_dest(subs, &adr);
-            // Not already subscribed (or error)? Then try subscribing.
-            if(snd_seq_get_port_subscription(alsaSeq, subs) < 0)
-            {
-              //int error = snd_seq_subscribe_port(alsaSeq, subs);
-              wer = snd_seq_subscribe_port(alsaSeq, subs);
-              //if (error < 0)
-              if(wer < 0)
-                    //return QString("Play: ")+QString(snd_strerror(error));
-                    estr += (QString("Play: ") + QString(snd_strerror(wer)) + QString(" "));
-            }        
-            if(!wer)
+            if(cap & SND_SEQ_PORT_CAP_SUBS_WRITE)
+            {  
+              snd_seq_port_subscribe_set_sender(subs, &musePort);
+              snd_seq_port_subscribe_set_dest(subs, &adr);
+              // Not already subscribed (or error)? Then try subscribing.
+              if(snd_seq_get_port_subscription(alsaSeq, subs) < 0)
+              {
+                //int error = snd_seq_subscribe_port(alsaSeq, subs);
+                wer = snd_seq_subscribe_port(alsaSeq, subs);
+                //if (error < 0)
+                if(wer < 0)
+                      //return QString("Play: ")+QString(snd_strerror(error));
+                      estr += (QString("Play: ") + QString(snd_strerror(wer)) + QString(" "));
+              }        
+            }  
+            if(!wer && (cap & SND_SEQ_PORT_CAP_WRITE))
               _writeEnable = true;      
       }
 
       // subscribe for reading
       if (_openFlags & 2) 
       {
-            snd_seq_port_subscribe_set_dest(subs, &musePort);
-	          snd_seq_port_subscribe_set_sender(subs, &adr);
-            // Not already subscribed (or error)? Then try subscribing.
-            if(snd_seq_get_port_subscription(alsaSeq, subs) < 0)
-            {
-              //int error = snd_seq_subscribe_port(alsaSeq, subs);
-              rer = snd_seq_subscribe_port(alsaSeq, subs);
-              //if (error < 0)
-              if(rer < 0)
-                    //return QString("Rec: ") + QString(snd_strerror(error));
-                    estr += (QString("Rec: ") + QString(snd_strerror(rer)));
-            }        
-            if(!rer)
+            if(cap & SND_SEQ_PORT_CAP_SUBS_READ)
+            {  
+              snd_seq_port_subscribe_set_dest(subs, &musePort);
+                    snd_seq_port_subscribe_set_sender(subs, &adr);
+              // Not already subscribed (or error)? Then try subscribing.
+              if(snd_seq_get_port_subscription(alsaSeq, subs) < 0)
+              {
+                //int error = snd_seq_subscribe_port(alsaSeq, subs);
+                rer = snd_seq_subscribe_port(alsaSeq, subs);
+                //if (error < 0)
+                if(rer < 0)
+                      //return QString("Rec: ") + QString(snd_strerror(error));
+                      estr += (QString("Rec: ") + QString(snd_strerror(rer)));
+              }
+            }  
+            if(!rer && (cap & SND_SEQ_PORT_CAP_READ))
               _readEnable = true;      
       }
       
@@ -139,6 +155,16 @@ void MidiAlsaDevice::close()
       // Allocated on stack, no need to call snd_seq_port_subscribe_free() later.
       snd_seq_port_subscribe_alloca(&subs);
       
+      int wer = 0;
+      int rer = 0;
+
+      snd_seq_port_info_t *pinfo;
+      snd_seq_port_info_alloca(&pinfo);
+      //snd_seq_port_info_set_client(pinfo, snd_seq_client_info_get_client(cinfo));
+      snd_seq_port_info_set_addr(pinfo, &adr);
+
+      int cap = snd_seq_port_info_get_capability(pinfo);
+
       // This function appears to be called only by MidiPort::setMidiDevice(), 
       //  which closes then opens the device.
       // Because the open flags are set BEFORE setMidiDevice() is called, we must ignore the flags.
@@ -158,37 +184,49 @@ void MidiAlsaDevice::close()
       //if (_openFlags & 1) {
       //if (!(_openFlags & 1)) 
       {
-            snd_seq_port_subscribe_set_sender(subs, &musePort);
-            snd_seq_port_subscribe_set_dest(subs, &adr);
-            
-            // Already subscribed? Then unsubscribe.
-            if(!snd_seq_get_port_subscription(alsaSeq, subs))
-            {
-              if(!snd_seq_unsubscribe_port(alsaSeq, subs))
-                _writeEnable = false;      
-              else
-                printf("MidiAlsaDevice::close Error unsubscribing alsa midi port for writing\n");
+            if(cap & SND_SEQ_PORT_CAP_SUBS_WRITE)
+            {  
+              snd_seq_port_subscribe_set_sender(subs, &musePort);
+              snd_seq_port_subscribe_set_dest(subs, &adr);
+              
+              // Already subscribed? Then unsubscribe.
+              if(!snd_seq_get_port_subscription(alsaSeq, subs))
+              {
+                wer = snd_seq_unsubscribe_port(alsaSeq, subs);
+                //if(!wer)
+                //  _writeEnable = false;      
+                //else
+                if(wer < 0)
+                  printf("MidiAlsaDevice::close Error unsubscribing alsa midi port %d:%d for writing: %s\n", adr.client, adr.port, snd_strerror(wer));
+              }   
+              //else
+                //_writeEnable = false;      
             }   
-            else
-              _writeEnable = false;      
+            _writeEnable = false;      
       }
 
       //if (_openFlags & 2) {
       //if (!(_openFlags & 2)) 
       {
-            snd_seq_port_subscribe_set_dest(subs, &musePort);
-            snd_seq_port_subscribe_set_sender(subs, &adr);
-            
-            // Already subscribed? Then unsubscribe.
-            if(!snd_seq_get_port_subscription(alsaSeq, subs))
-            {
-              if(!snd_seq_unsubscribe_port(alsaSeq, subs))
-                _readEnable = false;      
-              else  
-                printf("MidiAlsaDevice::close Error unsubscribing alsa midi port for reading\n");
-            }  
-            else
-              _readEnable = false;      
+            if(cap & SND_SEQ_PORT_CAP_SUBS_READ)
+            {  
+              snd_seq_port_subscribe_set_dest(subs, &musePort);
+              snd_seq_port_subscribe_set_sender(subs, &adr);
+              
+              // Already subscribed? Then unsubscribe.
+              if(!snd_seq_get_port_subscription(alsaSeq, subs))
+              {
+                rer = snd_seq_unsubscribe_port(alsaSeq, subs);
+                //if(!rer)
+                //  _readEnable = false;      
+                //else  
+                if(rer < 0)
+                  printf("MidiAlsaDevice::close Error unsubscribing alsa midi port %d:%d for reading: %s\n", adr.client, adr.port, snd_strerror(rer));
+              }  
+              //else
+              //  _readEnable = false;      
+            }   
+            _readEnable = false;      
       }
 }
 
@@ -208,18 +246,18 @@ void MidiAlsaDevice::writeRouting(int level, Xml& xml) const
       {
         if(!r->name().isEmpty())
         {
-          s = QT_TRANSLATE_NOOP("@default", "Route");
+          s = "Route";
           if(r->channel != -1)
-            s += QString(QT_TRANSLATE_NOOP("@default", " channel=\"%1\"")).arg(r->channel);
+            s += QString(" channel=\"%1\"").arg(r->channel);
           xml.tag(level++, s.toLatin1().constData());
           xml.tag(level, "source devtype=\"%d\" name=\"%s\"/", MidiDevice::ALSA_MIDI, Xml::xmlString(name()).toLatin1().constData());
-          s = QT_TRANSLATE_NOOP("@default", "dest");
+          s = "dest";
           if(r->type == Route::MIDI_DEVICE_ROUTE)
-            s += QString(QT_TRANSLATE_NOOP("@default", " devtype=\"%1\"")).arg(r->device->deviceType());
+            s += QString(" devtype=\"%1\"").arg(r->device->deviceType());
           else
           if(r->type != Route::TRACK_ROUTE)
-            s += QString(QT_TRANSLATE_NOOP("@default", " type=\"%1\"")).arg(r->type);
-          s += QString(QT_TRANSLATE_NOOP("@default", " name=\"%1\"/")).arg(Xml::xmlString(r->name()));
+            s += QString(" type=\"%1\"").arg(r->type);
+          s += QString(" name=\"%1\"/").arg(Xml::xmlString(r->name()));
           xml.tag(level, s.toLatin1().constData());
           
           xml.etag(level--, "Route");
@@ -696,6 +734,13 @@ bool initMidiAlsa()
       snd_seq_client_info_set_client(cinfo, -1);
 
       while (snd_seq_query_next_client(alsaSeq, cinfo) >= 0) {
+            const char* cname = snd_seq_client_info_get_name(cinfo);
+            //printf( "ALSA client name: %s\n", cname);  
+            
+            // Put Midi Through and user clients after others. Insert other unwanted clients here:          // p4.0.41
+            if(snd_seq_client_info_get_type(cinfo) == SND_SEQ_USER_CLIENT || strcmp("Midi Through", cname) == 0)                   
+              continue;
+            
             snd_seq_port_info_t *pinfo;
             snd_seq_port_info_alloca(&pinfo);
             snd_seq_port_info_set_client(pinfo, snd_seq_client_info_get_client(cinfo));
@@ -703,6 +748,8 @@ bool initMidiAlsa()
 
             while (snd_seq_query_next_port(alsaSeq, pinfo) >= 0) {
                   unsigned int capability = snd_seq_port_info_get_capability(pinfo);
+                  if (capability & SND_SEQ_PORT_CAP_NO_EXPORT)  // Ignore ports like "qjackctl" or "port".    p4.0.41
+                    continue;
                   if ((capability & outCap) == 0) {
                           const char *name = snd_seq_port_info_get_name(pinfo);
                           if (strcmp("Timer", name) == 0 || 
@@ -724,29 +771,52 @@ bool initMidiAlsa()
                            adr.client, adr.port,
                            flags, capability);
                   MusEGlobal::midiDevices.add(dev);
-                  
-                  /*
-                  // Experimental... Need to list 'sensible' devices first and ignore unwanted ones...
-                  // Add instance last in midi device list.
-                  for(int i = 0; i < MIDI_PORTS; ++i) 
-                  {
-                    MidiPort* mp  = &MusEGlobal::midiPorts[i];
-                    if(mp->device() == 0) 
-                    {
-                      // midiSeq might not be initialzed yet!
-                      //MusEGlobal::midiSeq->msgSetMidiDevice(mp, dev);
-                      mp->setMidiDevice(dev);
-                      
-                      //muse->changeConfig(true);     // save configuration file
-                      //update();
-                      break;
-                    }
                   }
-                  */
-                  
+            }
+
+      snd_seq_client_info_set_client(cinfo, -1);   // Reset
+      while (snd_seq_query_next_client(alsaSeq, cinfo) >= 0) {
+            const char* cname = snd_seq_client_info_get_name(cinfo);
+            //printf( "ALSA client name: %s\n", cname);  
+            
+            // Put Midi Through and user clients after others. Insert other unwanted clients here:          // p4.0.41
+            if( !(snd_seq_client_info_get_type(cinfo) == SND_SEQ_USER_CLIENT || strcmp("Midi Through", cname) == 0) )                   
+              continue;
+            
+            snd_seq_port_info_t *pinfo;
+            snd_seq_port_info_alloca(&pinfo);
+            snd_seq_port_info_set_client(pinfo, snd_seq_client_info_get_client(cinfo));
+            snd_seq_port_info_set_port(pinfo, -1);
+
+            while (snd_seq_query_next_port(alsaSeq, pinfo) >= 0) {
+                  unsigned int capability = snd_seq_port_info_get_capability(pinfo);
+                  if (capability & SND_SEQ_PORT_CAP_NO_EXPORT)  // Ignore ports like "qjackctl" or "port".    p4.0.41
+                    continue;
+                  if ((capability & outCap) == 0) {
+                          const char *name = snd_seq_port_info_get_name(pinfo);
+                          if (strcmp("Timer", name) == 0 || 
+                              strcmp("Announce", name) == 0 || 
+                              strcmp("Receiver", name) == 0)
+                                continue;
+                          }
+                  snd_seq_addr_t adr = *snd_seq_port_info_get_addr(pinfo);
+                  MidiAlsaDevice* dev = new MidiAlsaDevice(adr, QString(snd_seq_port_info_get_name(pinfo)));
+                  int flags = 0;
+                  if (capability & outCap)
+                        flags |= 1;
+                  if (capability & inCap)
+                        flags |= 2;
+                  dev->setrwFlags(flags);
+                  if (MusEGlobal::debugMsg)
+                        printf("ALSA port add: <%s>, %d:%d flags %d 0x%0x\n",
+                           snd_seq_port_info_get_name(pinfo),
+                           adr.client, adr.port,
+                           flags, capability);
+                  MusEGlobal::midiDevices.add(dev);
                   }
             }
-      
+            
+            
       //snd_seq_set_client_name(alsaSeq, "MusE Sequencer");
       snd_seq_set_client_name(alsaSeq, MusEGlobal::audioDevice->clientName());
       
@@ -781,14 +851,14 @@ bool initMidiAlsa()
       //    alsa port changes
       //-----------------------------------------
 
-      snd_seq_addr_t aadr;
-      aadr.client = SND_SEQ_CLIENT_SYSTEM;
-      aadr.port   = SND_SEQ_PORT_SYSTEM_ANNOUNCE;
+      //snd_seq_addr_t aadr;
+      announce_adr.client = SND_SEQ_CLIENT_SYSTEM;
+      announce_adr.port   = SND_SEQ_PORT_SYSTEM_ANNOUNCE;
 
       snd_seq_port_subscribe_t* subs;
       snd_seq_port_subscribe_alloca(&subs);
       snd_seq_port_subscribe_set_dest(subs, &musePort);
-      snd_seq_port_subscribe_set_sender(subs, &aadr);
+      snd_seq_port_subscribe_set_sender(subs, &announce_adr);
       error = snd_seq_subscribe_port(alsaSeq, subs);
       if (error < 0) {
             printf("Alsa: Subscribe System failed: %s", snd_strerror(error));
@@ -805,12 +875,35 @@ bool initMidiAlsa()
 void exitMidiAlsa()
 {
   if(alsaSeq)
-  {  
-    int error = snd_seq_close(alsaSeq);  // FIXME Hm, this did not get rid of a buch of valgrind leaks.
-    if(error < 0) 
+  { 
+    int error = 0;
+    snd_seq_port_subscribe_t* subs;
+    // Allocated on stack, no need to call snd_seq_port_subscribe_free() later.
+    snd_seq_port_subscribe_alloca(&subs);
+    
+    snd_seq_port_info_t *pinfo;
+    snd_seq_port_info_alloca(&pinfo);
+    //snd_seq_port_info_set_client(pinfo, snd_seq_client_info_get_client(cinfo));
+    snd_seq_port_info_set_addr(pinfo, &announce_adr);
+
+    snd_seq_port_subscribe_set_dest(subs, &musePort);
+    snd_seq_port_subscribe_set_sender(subs, &announce_adr);
+    
+    // Already subscribed? Then unsubscribe.
+    if(!snd_seq_get_port_subscription(alsaSeq, subs))
     {
-      fprintf(stderr, "Could not close ALSA sequencer: %s\n", snd_strerror(error));
-    }
+      error = snd_seq_unsubscribe_port(alsaSeq, subs);
+      if(error < 0)
+        printf("MusE: exitMidiAlsa: Error unsubscribing alsa midi Announce port %d:%d for reading: %s\n", announce_adr.client, announce_adr.port, snd_strerror(error));
+    }   
+    
+    error = snd_seq_delete_simple_port(alsaSeq, musePort.port);
+    if(error < 0) 
+      fprintf(stderr, "MusE: Could not delete ALSA simple port: %s\n", snd_strerror(error));
+    
+    error = snd_seq_close(alsaSeq);  
+    if(error < 0) 
+      fprintf(stderr, "MusE: Could not close ALSA sequencer: %s\n", snd_strerror(error));
   }  
 }
 
@@ -850,7 +943,9 @@ void alsaScanMidiPorts()
             snd_seq_port_info_set_client(pinfo, snd_seq_client_info_get_client(cinfo));
             snd_seq_port_info_set_port(pinfo, -1);
             while (snd_seq_query_next_port(alsaSeq, pinfo) >= 0) {
-		      unsigned int capability = snd_seq_port_info_get_capability(pinfo);
+                  unsigned int capability = snd_seq_port_info_get_capability(pinfo);
+                  if (capability & SND_SEQ_PORT_CAP_NO_EXPORT)  // Ignore ports like "qjackctl" or "port".    p4.0.41
+                    continue;
                   if (((capability & outCap) == 0)
                      && ((capability & inCap) == 0))
                         continue;
@@ -900,6 +995,8 @@ void alsaScanMidiPorts()
       //
       //  check for devices to add
       //
+      // TODO: Possibly auto-add them to available midi ports.    p4.0.41            
+      //
       for (std::list<AlsaPort>::iterator k = portList.begin(); k != portList.end(); ++k) {
             iMidiDevice i = MusEGlobal::midiDevices.begin();
 // printf("ALSA port: <%s>\n", k->name);
@@ -920,6 +1017,8 @@ void alsaScanMidiPorts()
 // printf("add device\n");
                   }
             }
+            
+            
       }
 
 //---------------------------------------------------------
diff --git a/muse2/muse/driver/jack.cpp b/muse2/muse/driver/jack.cpp
index 733353d8..421152a7 100644
--- a/muse2/muse/driver/jack.cpp
+++ b/muse2/muse/driver/jack.cpp
@@ -735,7 +735,11 @@ void JackAudioDevice::connectJackMidiPorts()
       {
         RouteList* rl = md->outRoutes();
         for (ciRoute r = rl->begin(); r != rl->end(); ++r) 
+        {  
+          if(r->type != Route::JACK_ROUTE)  
+            continue;
           connect(port, r->jackPort);
+        }  
       }    
     }
     
@@ -748,7 +752,11 @@ void JackAudioDevice::connectJackMidiPorts()
       {
         RouteList* rl = md->inRoutes();
         for (ciRoute r = rl->begin(); r != rl->end(); ++r) 
+        {  
+          if(r->type != Route::JACK_ROUTE)  
+            continue;
           connect(r->jackPort, port);
+        }
       }    
     }    
   }
@@ -939,6 +947,8 @@ void JackAudioDevice::graphChanged()
                   for (int i = 0;i < 20;i++) {
                         erased = false;
                         for (ciRoute irl = rl->begin(); irl != rl->end(); ++irl) {
+                              if(irl->type != Route::JACK_ROUTE)  
+                                continue;
                               if (irl->channel != channel)
                                     continue;
                               QString name = irl->name();
@@ -977,6 +987,8 @@ void JackAudioDevice::graphChanged()
                         while (*pn) {
                               bool found = false;
                               for (ciRoute irl = rl->begin(); irl != rl->end(); ++irl) {
+                                    if(irl->type != Route::JACK_ROUTE)  
+                                      continue;
                                     if (irl->channel != channel)
                                           continue;
                                     QString name = irl->name();
@@ -1027,6 +1039,8 @@ void JackAudioDevice::graphChanged()
                   for (int i = 0; i < 20 ; i++) {
                         erased = false;
                         for (ciRoute irl = rl->begin(); irl != rl->end(); ++irl) {
+                              if(irl->type != Route::JACK_ROUTE)  
+                                continue;
                               if (irl->channel != channel)
                                     continue;
                               QString name = irl->name();
@@ -1064,6 +1078,8 @@ void JackAudioDevice::graphChanged()
                         while (*pn) {
                               bool found = false;
                               for (ciRoute irl = rl->begin(); irl != rl->end(); ++irl) {
+                                    if(irl->type != Route::JACK_ROUTE)  
+                                      continue;
                                     if (irl->channel != channel)
                                           continue;
                                     QString name = irl->name();
@@ -1139,6 +1155,8 @@ void JackAudioDevice::graphChanged()
                       {
                             erased = false;
                             for (ciRoute irl = rl->begin(); irl != rl->end(); ++irl) {
+                                  if(irl->type != Route::JACK_ROUTE)  
+                                    continue;
                                   //if (irl->channel != channel)
                                   //      continue;
                                   QString name = irl->name();
@@ -1181,6 +1199,8 @@ void JackAudioDevice::graphChanged()
                             while (*pn) {
                                   bool found = false;
                                   for (ciRoute irl = rl->begin(); irl != rl->end(); ++irl) {
+                                        if(irl->type != Route::JACK_ROUTE)  
+                                          continue;
                                         //if (irl->channel != channel)
                                         //      continue;
                                         QString name = irl->name();
@@ -1239,6 +1259,8 @@ void JackAudioDevice::graphChanged()
                       {
                             erased = false;
                             for (ciRoute irl = rl->begin(); irl != rl->end(); ++irl) {
+                                  if(irl->type != Route::JACK_ROUTE)  
+                                    continue;
                                   //if (irl->channel != channel)
                                   //      continue;
                                   QString name = irl->name();
@@ -1280,6 +1302,8 @@ void JackAudioDevice::graphChanged()
                             while (*pn) {
                                   bool found = false;
                                   for (ciRoute irl = rl->begin(); irl != rl->end(); ++irl) {
+                                        if(irl->type != Route::JACK_ROUTE)  
+                                          continue;
                                         //if (irl->channel != channel)
                                         //      continue;
                                         QString name = irl->name();
@@ -1482,6 +1506,8 @@ void JackAudioDevice::start(int /*priority*/)
                   RouteList* rl = ai->inRoutes();
                   void* port = ai->jackPort(ch);
                   for (ciRoute ir = rl->begin(); ir != rl->end(); ++ir) {
+                        if(ir->type != Route::JACK_ROUTE)  
+                          continue;
                         if (ir->channel == ch)
                               connect(ir->jackPort, port);
                         }
@@ -1495,6 +1521,8 @@ void JackAudioDevice::start(int /*priority*/)
                   RouteList* rl = ai->outRoutes();
                   void* port = ai->jackPort(ch);
                   for (ciRoute r = rl->begin(); r != rl->end(); ++r) {
+                        if(r->type != Route::JACK_ROUTE)  
+                          continue;
                         if (r->channel == ch) {
                               connect(port, r->jackPort);
                               }
@@ -1603,6 +1631,107 @@ int JackAudioDevice::frameDelay() const
 #endif
 
 //---------------------------------------------------------
+//   getJackPorts
+//---------------------------------------------------------
+
+void JackAudioDevice::getJackPorts(const char** ports, std::list<QString>& name_list, bool midi, bool physical, int aliases)
+      {
+      if (JACK_DEBUG)
+            printf("JackAudioDevice::getJackPorts()\n");
+      //std::list<QString> clientList;
+      //if(!checkJackClient(_client)) return clientList;
+      //if(!checkJackClient(_client)) return;
+      QString qname;
+      //const char* type = midi ? JACK_DEFAULT_MIDI_TYPE : JACK_DEFAULT_AUDIO_TYPE;
+      //const char** ports = jack_get_ports(_client, 0, type, JackPortIsInput);
+      //const char** ports = jack_get_ports(_client, 0, type, jflags);
+      
+      QString cname(jack_get_client_name(_client));
+      
+      for (const char** p = ports; p && *p; ++p) {
+            jack_port_t* port = jack_port_by_name(_client, *p);
+            //int flags = jack_port_flags(port);
+            //if (!(flags & JackPortIsInput))
+            //      continue;
+            //char buffer[128];
+            
+            int port_flags = jack_port_flags(port);
+            //printf("JackAudioDevice::getJackPorts port: %s flags: %d\n", *p, port_flags); 
+
+            // Ignore our own client ports.
+            if(jack_port_is_mine(_client, port))
+            {
+              if(MusEGlobal::debugMsg)
+                printf("JackAudioDevice::getJackPorts ignoring own port: %s\n", *p);
+              continue;         
+            }
+            
+            int nsz = jack_port_name_size();
+            char buffer[nsz];
+
+            bool mthrough = false;
+            
+            if(midi)
+            {  
+              strncpy(buffer, *p, nsz);
+              char a2[nsz]; 
+              char* al[2];
+              al[0] = buffer;
+              al[1] = a2;
+              int na = jack_port_get_aliases(port, al);
+              if(na >= 1)
+              {
+                qname = QString(al[0]);
+                    //printf("Checking port name for: %s\n", (QString("alsa_pcm:") + cname + QString("/")).toLatin1().constData());  
+                // Ignore our own ALSA client!
+                if(qname.startsWith(QString("alsa_pcm:") + cname + QString("/")))
+                  continue;
+                // Put Midi Through after all others.
+                mthrough = qname.startsWith(QString("alsa_pcm:Midi-Through/"));  
+                //if((physical && mthrough) || (!physical && !mthrough))
+                //if(physical && mthrough)
+                //  continue;
+              }    
+            }  
+            // Put physical/terminal ports before others.
+            bool is_phys = (port_flags & (JackPortIsTerminal | JackPortIsPhysical)) && !mthrough;
+            if((physical && !is_phys) || (!physical && is_phys))
+              continue;
+            
+
+            strncpy(buffer, *p, nsz);
+            if((aliases == 0) || (aliases == 1)) 
+            {
+              char a2[nsz]; 
+              char* al[2];
+              al[0] = buffer;
+              al[1] = a2;
+              int na = jack_port_get_aliases(port, al);  
+              int a = aliases;
+              if(a >= na)
+              {
+                a = na;
+                if(a > 0)
+                  a--;
+              }    
+              qname = QString(al[a]);
+            }
+            else
+              qname = QString(buffer);
+            
+            //clientList.push_back(QString(buffer));
+            name_list.push_back(qname);
+            }
+            
+      // p3.3.37
+      //if(ports)
+        //free(ports);      
+      //  jack_free(ports);  // p4.0.29
+      
+      //return clientList;
+      }
+      
+//---------------------------------------------------------
 //   outputPorts
 //---------------------------------------------------------
 
@@ -1612,9 +1741,11 @@ std::list<QString> JackAudioDevice::outputPorts(bool midi, int aliases)
             printf("JackAudioDevice::outputPorts()\n");
       std::list<QString> clientList;
       if(!checkJackClient(_client)) return clientList;
-      QString qname;
       const char* type = midi ? JACK_DEFAULT_MIDI_TYPE : JACK_DEFAULT_AUDIO_TYPE;
       const char** ports = jack_get_ports(_client, 0, type, JackPortIsOutput);
+      
+      /*
+      QString qname;
       for (const char** p = ports; p && *p; ++p) {
             jack_port_t* port = jack_port_by_name(_client, *p);
             //int flags = jack_port_flags(port);
@@ -1666,12 +1797,15 @@ std::list<QString> JackAudioDevice::outputPorts(bool midi, int aliases)
             //clientList.push_back(QString(buffer));
             clientList.push_back(qname);
             }
-            
-      // p3.3.37
-      if(ports)
-        //free(ports);      
-        jack_free(ports);  // p4.0.29
+      */
       
+      if(ports)
+      {
+        getJackPorts(ports, clientList, midi, true, aliases);   // Get physical ports first.
+        getJackPorts(ports, clientList, midi, false, aliases);  // Get non-physical ports last.
+        jack_free(ports);  
+      }
+        
       return clientList;
       }
 
@@ -1683,11 +1817,14 @@ std::list<QString> JackAudioDevice::inputPorts(bool midi, int aliases)
       {
       if (JACK_DEBUG)
             printf("JackAudioDevice::inputPorts()\n");
+      
       std::list<QString> clientList;
       if(!checkJackClient(_client)) return clientList;
-      QString qname;
       const char* type = midi ? JACK_DEFAULT_MIDI_TYPE : JACK_DEFAULT_AUDIO_TYPE;
       const char** ports = jack_get_ports(_client, 0, type, JackPortIsInput);
+      
+      /*
+      QString qname;
       for (const char** p = ports; p && *p; ++p) {
             jack_port_t* port = jack_port_by_name(_client, *p);
             //int flags = jack_port_flags(port);
@@ -1739,12 +1876,15 @@ std::list<QString> JackAudioDevice::inputPorts(bool midi, int aliases)
             //clientList.push_back(QString(buffer));
             clientList.push_back(qname);
             }
-            
-      // p3.3.37
-      if(ports)
-        //free(ports);      
-        jack_free(ports);  // p4.0.29
+      */
       
+      if(ports)
+      {
+        getJackPorts(ports, clientList, midi, true, aliases);   // Get physical ports first.
+        getJackPorts(ports, clientList, midi, false, aliases);  // Get non-physical ports last.
+        jack_free(ports);  
+      }
+        
       return clientList;
       }
 
diff --git a/muse2/muse/driver/jackaudio.h b/muse2/muse/driver/jackaudio.h
index bd78d481..c4d37db9 100644
--- a/muse2/muse/driver/jackaudio.h
+++ b/muse2/muse/driver/jackaudio.h
@@ -50,6 +50,7 @@ class JackAudioDevice : public AudioDevice {
       // Free-running frame counter incremented always in process.
       jack_nframes_t _frameCounter; 
       
+      void getJackPorts(const char** ports, std::list<QString>& name_list, bool midi, bool physical, int aliases);
       static int processAudio(jack_nframes_t frames, void*);
 
    public:
diff --git a/muse2/muse/driver/jackmidi.cpp b/muse2/muse/driver/jackmidi.cpp
index fa23d336..7a12b92d 100644
--- a/muse2/muse/driver/jackmidi.cpp
+++ b/muse2/muse/driver/jackmidi.cpp
@@ -276,10 +276,10 @@ void MidiJackDevice::writeRouting(int level, Xml& xml) const
           if(!r->name().isEmpty())
           {
             xml.tag(level++, "Route");
-            s = QT_TRANSLATE_NOOP("@default", "source");
+            s = "source";
             if(r->type != Route::TRACK_ROUTE)
-              s += QString(QT_TRANSLATE_NOOP("@default", " type=\"%1\"")).arg(r->type);
-            s += QString(QT_TRANSLATE_NOOP("@default", " name=\"%1\"/")).arg(Xml::xmlString(r->name()));
+              s += QString(" type=\"%1\"").arg(r->type);
+            s += QString(" name=\"%1\"/").arg(Xml::xmlString(r->name()));
             xml.tag(level, s.toLatin1().constData());
             xml.tag(level, "dest devtype=\"%d\" name=\"%s\"/", MidiDevice::JACK_MIDI, Xml::xmlString(name()).toLatin1().constData());
             xml.etag(level--, "Route");
@@ -291,18 +291,18 @@ void MidiJackDevice::writeRouting(int level, Xml& xml) const
       {
         if(!r->name().isEmpty())
         {
-          s = QT_TRANSLATE_NOOP("@default", "Route");
+          s = "Route";
           if(r->channel != -1)
-            s += QString(QT_TRANSLATE_NOOP("@default", " channel=\"%1\"")).arg(r->channel);
+            s += QString(" channel=\"%1\"").arg(r->channel);
           xml.tag(level++, s.toLatin1().constData());
           xml.tag(level, "source devtype=\"%d\" name=\"%s\"/", MidiDevice::JACK_MIDI, Xml::xmlString(name()).toLatin1().constData());
-          s = QT_TRANSLATE_NOOP("@default", "dest");
+          s = "dest";
           if(r->type == Route::MIDI_DEVICE_ROUTE)
-            s += QString(QT_TRANSLATE_NOOP("@default", " devtype=\"%1\"")).arg(r->device->deviceType());
+            s += QString(" devtype=\"%1\"").arg(r->device->deviceType());
           else
           if(r->type != Route::TRACK_ROUTE)
-            s += QString(QT_TRANSLATE_NOOP("@default", " type=\"%1\"")).arg(r->type);
-          s += QString(QT_TRANSLATE_NOOP("@default", " name=\"%1\"/")).arg(Xml::xmlString(r->name()));
+            s += QString(" type=\"%1\"").arg(r->type);
+          s += QString(" name=\"%1\"/").arg(Xml::xmlString(r->name()));
           xml.tag(level, s.toLatin1().constData());
           
           
diff --git a/muse2/muse/dssihost.cpp b/muse2/muse/dssihost.cpp
index 92120dbb..2e4e6d35 100644
--- a/muse2/muse/dssihost.cpp
+++ b/muse2/muse/dssihost.cpp
@@ -99,6 +99,7 @@ static void scanDSSILib(QFileInfo& fi) // ddskrjo removed const for argument
           // That way we cover all bases - effect plugins and synths. 
           // Non-synths will show up in the ladspa effect dialog, while synths will show up here...
           // There should be nothing left out...
+          // TIP: Until we add programs to plugins, comment these four checks to load dssi effects as synths, in order to have programs. 
           if(descr->run_synth ||                  
             descr->run_synth_adding ||
             descr->run_multiple_synths ||
@@ -498,6 +499,9 @@ bool DssiSynthIF::init(DssiSynth* s)
       int inports = synth->_inports;
       if(inports != 0)
       {
+        posix_memalign((void**)&audioInSilenceBuf, 16, sizeof(float) * MusEGlobal::segmentSize);
+        memset(audioInSilenceBuf, 0, sizeof(float) * MusEGlobal::segmentSize);
+        
         audioInBuffers = new float*[inports];
         for(int k = 0; k < inports; ++k)
         {
@@ -723,6 +727,7 @@ DssiSynthIF::DssiSynthIF(SynthI* s)
       controls = 0;
       controlsOut = 0;
       audioInBuffers = 0;
+      audioInSilenceBuf = 0;
       audioOutBuffers = 0;
       }
 
@@ -785,6 +790,9 @@ DssiSynthIF::~DssiSynthIF()
         delete[] audioInBuffers;
       }  
       
+      if(audioInSilenceBuf)
+        free(audioInSilenceBuf);
+      
       if(audioOutBuffers)
       {
         for(unsigned long i = 0; i < synth->_outports; ++i) 
@@ -1420,7 +1428,7 @@ bool DssiSynthIF::processEvent(const MusECore::MidiPlayEvent& e, snd_seq_event_t
 //   getData
 //---------------------------------------------------------
 
-MusECore::iMPEvent DssiSynthIF::getData(MusECore::MidiPort* /*mp*/, MusECore::MPEventList* el, MusECore::iMPEvent i, unsigned pos, int ports, unsigned n, float** buffer)
+MusECore::iMPEvent DssiSynthIF::getData(MusECore::MidiPort* /*mp*/, MusECore::MPEventList* el, MusECore::iMPEvent start_event, unsigned pos, int ports, unsigned nframes, float** buffer)
 {
   //#ifdef DSSI_DEBUG 
   //  fprintf(stderr, "DssiSynthIF::getData elsize:%d pos:%d ports:%d samples:%d processed already?:%d\n", el->size(), pos, ports, n, synti->processed());
@@ -1440,19 +1448,11 @@ MusECore::iMPEvent DssiSynthIF::getData(MusECore::MidiPort* /*mp*/, MusECore::MP
   
   // All ports must be connected to something!
   unsigned long nop, k;
-  // First, copy the given input buffers to our local input buffers.
-  //np = portsin > synth->_inports ? synth->_inports : portsin;
-  //for(k = 0; k < np; ++k)
-  //  memcpy(audioInBuffers[k], inbuffer[k], sizeof(float) * n);
-  //for(; k < portsin; ++k)
-  //  memset(audioInBuffers[k], 0, sizeof(float) * n);
   
   // Watch our limits.
   //willyfoobar-2011-02-13
   //old code//np = ports > synth->_outports ? synth->_outports : ports;
   nop = ((unsigned long) ports) > synth->_outports ? synth->_outports : ((unsigned long) ports);
-  // TODO Number of inports requested?
-  //nip = ((unsigned long) iports) > synth->_inports ? synth->_inports : ((unsigned long) iports);
   
   const DSSI_Descriptor* dssi = synth->dssi;
   const LADSPA_Descriptor* descr = dssi->LADSPA_Plugin;
@@ -1484,18 +1484,109 @@ MusECore::iMPEvent DssiSynthIF::getData(MusECore::MidiPort* /*mp*/, MusECore::MP
   // Note for dssi-vst this MUST equal MusEGlobal::audio period. It doesn't like broken-up runs (it stutters), 
   //  even with fixed sizes. Could be a Wine + Jack thing, wanting a full Jack buffer's length.
   //unsigned long fixedsize = 2048;   
-  unsigned long fixedsize = n;     
+  unsigned long fixedsize = nframes;     
   
   // For now, the fixed size is clamped to the MusEGlobal::audio buffer size.
   // TODO: We could later add slower processing over several cycles -
   //  so that users can select a small MusEGlobal::audio period but a larger control period. 
-  if(fixedsize > n)
-    fixedsize = n;
+  if(fixedsize > nframes)
+    fixedsize = nframes;
   
   unsigned long min_per = MusEGlobal::config.minControlProcessPeriod;  
-  if(min_per > n)
-    min_per = n;
+  if(min_per > nframes)
+    min_per = nframes;
+  
+  //
+  // p4.0.38 Handle inputs...
+  //
+  if(!((MusECore::AudioTrack*)synti)->noInRoute()) 
+  {
+    RouteList* irl = ((MusECore::AudioTrack*)synti)->inRoutes();
+    iRoute i = irl->begin();
+    if(i->track->isMidiTrack())
+    {
+      //if(MusEGlobal::debugMsg)
+        //printf("DssiSynthIF::getData: Error: First route is a midi track route!\n");   
+    }
+    else
+    {
+      int ch     = i->channel       == -1 ? 0 : i->channel;
+      int remch  = i->remoteChannel == -1 ? 0 : i->remoteChannel;
+      int chs    = i->channels      == -1 ? 0 : i->channels;
+      
+      if((unsigned)ch < synth->_inports && (unsigned)(ch + chs) <= synth->_inports)
+      {  
+        //printf("DssiSynthIF::getData calling copyData on %s ch:%d remch:%d chs:%d\n", i->track->name().toLatin1().constData(), ch, remch, chs);  
+        
+        int h = remch + chs;
+        for(int j = remch; j < h; ++j)
+        {
+          //printf(" setting used idx:%d\n", j);  
+          synth->iUsedIdx[j] = true;
+        }
+        
+        ((MusECore::AudioTrack*)i->track)->copyData(pos, chs, ch, -1, nframes, &audioInBuffers[remch]);
+      }
+    }  
+  
+    ++i;
+    for(; i != irl->end(); ++i)
+    {
+      if(i->track->isMidiTrack())
+      {
+        //if(MusEGlobal::debugMsg)
+        //  printf("DssiSynthIF::getData: Error: Route is a midi track route!\n");     
+        continue;
+      }
+
+      int ch     = i->channel       == -1 ? 0 : i->channel;
+      int remch  = i->remoteChannel == -1 ? 0 : i->remoteChannel;
+      int chs    = i->channels      == -1 ? 0 : i->channels;
       
+      if((unsigned)ch < synth->_inports && (unsigned)(ch + chs) <= synth->_inports)
+      {  
+        //printf("DssiSynthIF::getData calling addData on %s ch:%d remch:%d chs:%d\n", i->track->name().toLatin1().constData(), ch, remch, chs);  
+
+        bool u1 = synth->iUsedIdx[remch];
+        if(chs >= 2) 
+        {
+          bool u2 = synth->iUsedIdx[remch + 1];
+          if(u1 && u2)
+            ((MusECore::AudioTrack*)i->track)->addData(pos, chs, ch, -1, nframes, &audioInBuffers[remch]);
+          else
+          if(!u1 && !u2)
+            ((MusECore::AudioTrack*)i->track)->copyData(pos, chs, ch, -1, nframes, &audioInBuffers[remch]);
+          else 
+          {  
+            if(u1) 
+              ((MusECore::AudioTrack*)i->track)->addData(pos, 1, ch, 1, nframes, &audioInBuffers[remch]);
+            else
+              ((MusECore::AudioTrack*)i->track)->copyData(pos, 1, ch, 1, nframes, &audioInBuffers[remch]);
+
+            if(u2)  
+              ((MusECore::AudioTrack*)i->track)->addData(pos, 1, ch + 1, 1, nframes, &audioInBuffers[remch + 1]);
+            else
+              ((MusECore::AudioTrack*)i->track)->copyData(pos, 1, ch + 1, 1, nframes, &audioInBuffers[remch + 1]);
+          }  
+        }
+        else
+        {
+            if(u1) 
+              ((MusECore::AudioTrack*)i->track)->addData(pos, 1, ch, -1, nframes, &audioInBuffers[remch]);
+            else
+              ((MusECore::AudioTrack*)i->track)->copyData(pos, 1, ch, -1, nframes, &audioInBuffers[remch]);
+        }
+          
+        int h = remch + chs;
+        for(int j = remch; j < h; ++j)
+        {
+          //printf(" setting used idx:%d\n", j);  
+          synth->iUsedIdx[j] = true;
+        }
+      }
+    }
+  }  
+  
   // Process automation control values now.
   // TODO: This needs to be respect frame resolution. Put this inside the sample loop below.
   if(MusEGlobal::automation && synti && synti->automationType() != AUTO_OFF && id() != -1)
@@ -1507,11 +1598,11 @@ MusECore::iMPEvent DssiSynthIF::getData(MusECore::MidiPort* /*mp*/, MusECore::MP
     }      
   }
         
-  while(sample < n)
+  while(sample < nframes)
   {
     //unsigned long nsamp = n;
     //unsigned long nsamp = n - sample;
-    unsigned long nsamp = usefixedrate ? fixedsize : n - sample;
+    unsigned long nsamp = usefixedrate ? fixedsize : nframes - sample;
     bool found = false;
     unsigned long frame = 0; 
     unsigned long index = 0;
@@ -1525,7 +1616,7 @@ MusECore::iMPEvent DssiSynthIF::getData(MusECore::MidiPort* /*mp*/, MusECore::MP
       // The events happened in the last period or even before that. Shift into this period with + n. This will sync with MusEGlobal::audio. 
       // If the events happened even before current frame - n, make sure they are counted immediately as zero-frame.
       //evframe = (pos + frameOffset > v.frame + n) ? 0 : v.frame - pos - frameOffset + n; 
-      evframe = (syncFrame > v.frame + n) ? 0 : v.frame - syncFrame + n; 
+      evframe = (syncFrame > v.frame + nframes) ? 0 : v.frame - syncFrame + nframes; 
       // Protection. Observed this condition. Why? Supposed to be linear timestamps.
       if(found && evframe < frame)
       {
@@ -1545,7 +1636,7 @@ MusECore::iMPEvent DssiSynthIF::getData(MusECore::MidiPort* /*mp*/, MusECore::MP
       //if(v.frame < startPos || v.frame >= (endPos + frameOffset)  
       //if(evframe < sample || evframe >= n  
       //if(evframe < sample || evframe >= (n + frameOffset)
-      if(evframe >= n
+      if(evframe >= nframes
          //|| (found && v.frame != frame)  
          //|| (!usefixedrate && found && !v.unique && v.frame != frame)  
          //|| (found && !v.unique && evframe != frame)  
@@ -1567,6 +1658,31 @@ MusECore::iMPEvent DssiSynthIF::getData(MusECore::MidiPort* /*mp*/, MusECore::MP
       index = v.idx;
       // Set the ladspa control port value.
       controls[v.idx].val = v.value;
+      
+      // Need to update the automation value, otherwise it overwrites later with the last MusEGlobal::automation value.
+      if(id() != -1)
+      {
+        // Since we are now in the audio thread context, there's no need to send a message,
+        //  just modify directly.
+        //MusEGlobal::audio->msgSetPluginCtrlVal(_track, genACnum(_id, k), controls[k].val);
+        synti->setPluginCtrlVal(genACnum(id(), v.idx), v.value);
+        
+        // Record automation.
+        // NO! Take care of this immediately in the OSC control handler, because we don't want 
+        //  any delay.
+        // OTOH Since this is the actual place and time where the control ports values
+        //  are set, best to reflect what happens here to automation.
+        // However for dssi-vst it might be best to handle it that way.
+        
+        //AutomationType at = _track->automationType();
+        // TODO: Taken from our native gui control handlers. 
+        // This may need modification or may cause problems - 
+        //  we don't have the luxury of access to the dssi gui controls !
+        //if(at == AUTO_WRITE || (MusEGlobal::audio->isPlaying() && at == AUTO_TOUCH))
+        //  enableController(k, false);
+        //_track->recordAutomation(id, v.value);
+      }  
+      
     }
     
     // Process automation control values now.
@@ -1583,8 +1699,8 @@ MusECore::iMPEvent DssiSynthIF::getData(MusECore::MidiPort* /*mp*/, MusECore::MP
     if(found && !usefixedrate)
       //nsamp = frame - sample + 1;
       nsamp = frame - sample;
-    if(sample + nsamp >= n)         // Safety check.
-      nsamp = n - sample; 
+    if(sample + nsamp >= nframes)         // Safety check.
+      nsamp = nframes - sample; 
     
     //printf("DssiSynthIF::getData n:%d frame:%lu sample:%lu nsamp:%lu pos:%d fOffset:%d syncFrame:%lu loopcount:%d\n", 
     //       n, frame, sample, nsamp, pos, frameOffset, syncFrame, loopcount);   // REMOVE Tim.
@@ -1596,10 +1712,10 @@ MusECore::iMPEvent DssiSynthIF::getData(MusECore::MidiPort* /*mp*/, MusECore::MP
       
     nevents = 0;
     // Process event list events...
-    for(; i != el->end(); ++i) 
+    for(; start_event != el->end(); ++start_event) 
     {
       //if(i->time() >= (endPos + frameOffset))  // NOTE: frameOffset? Tested, examined printouts of times: Seems OK for playback.
-      if(i->time() >= (pos + sample + nsamp + frameOffset))  // frameOffset? Test again...
+      if(start_event->time() >= (pos + sample + nsamp + frameOffset))  // frameOffset? Test again...
         break;
         
       #ifdef DSSI_DEBUG 
@@ -1611,40 +1727,40 @@ MusECore::iMPEvent DssiSynthIF::getData(MusECore::MidiPort* /*mp*/, MusECore::MP
       if(synti->midiPort() != -1)
       {
         MusECore::MidiPort* mp = &MusEGlobal::midiPorts[synti->midiPort()];
-        if(i->type() == MusECore::ME_CONTROLLER) 
+        if(start_event->type() == MusECore::ME_CONTROLLER) 
         {
-          int da = i->dataA();
-          int db = i->dataB();
+          int da = start_event->dataA();
+          int db = start_event->dataB();
           db = mp->limitValToInstrCtlRange(da, db);
-          if(!mp->setHwCtrlState(i->channel(), da, db))
+          if(!mp->setHwCtrlState(start_event->channel(), da, db))
             continue;
         }
         else
-        if(i->type() == MusECore::ME_PITCHBEND) 
+        if(start_event->type() == MusECore::ME_PITCHBEND) 
         {
-          int da = mp->limitValToInstrCtlRange(MusECore::CTRL_PITCH, i->dataA());
-          if(!mp->setHwCtrlState(i->channel(), MusECore::CTRL_PITCH, da))
+          int da = mp->limitValToInstrCtlRange(MusECore::CTRL_PITCH, start_event->dataA());
+          if(!mp->setHwCtrlState(start_event->channel(), MusECore::CTRL_PITCH, da))
             continue;
         }
         else
-        if(i->type() == MusECore::ME_PROGRAM) 
+        if(start_event->type() == MusECore::ME_PROGRAM) 
         {
-          if(!mp->setHwCtrlState(i->channel(), MusECore::CTRL_PROGRAM, i->dataA()))
+          if(!mp->setHwCtrlState(start_event->channel(), MusECore::CTRL_PROGRAM, start_event->dataA()))
             continue;
         }
       }
           
       // Returns false if the event was not filled. It was handled, but some other way.
-      if(processEvent(*i, &events[nevents]))
+      if(processEvent(*start_event, &events[nevents]))
       {
         // Time-stamp the event.   p4.0.15 Tim.
-        int ft = i->time() - frameOffset - pos;
+        int ft = start_event->time() - frameOffset - pos;
         if(ft < 0)
           ft = 0;
         //if (ft >= (int)MusEGlobal::segmentSize) 
         if (ft >= int(sample + nsamp)) 
         {
-          printf("DssiSynthIF::getData: eventlist event time:%d out of range. pos:%d offset:%d ft:%d sample:%lu nsamp:%lu\n", i->time(), pos, frameOffset, ft, sample, nsamp);
+          printf("DssiSynthIF::getData: eventlist event time:%d out of range. pos:%d offset:%d ft:%d sample:%lu nsamp:%lu\n", start_event->time(), pos, frameOffset, ft, sample, nsamp);
           ///if (ft > (int)MusEGlobal::segmentSize)
             //ft = MusEGlobal::segmentSize - 1;
             ft = sample + nsamp - 1;
@@ -1696,61 +1812,6 @@ MusECore::iMPEvent DssiSynthIF::getData(MusECore::MidiPort* /*mp*/, MusECore::MP
       }  
     }
     
-    /*
-    //
-    // p3.3.39 Handle inputs...
-    //
-    //if((MusEGlobal::song->bounceTrack != this) && !noInRoute()) 
-    if(!((MusECore::AudioTrack*)synti)->noInRoute()) 
-    {
-      RouteList* irl = ((MusECore::AudioTrack*)synti)->inRoutes();
-      iRoute i = irl->begin();
-      if(!i->track->isMidiTrack())
-      {
-        //if(MusEGlobal::debugMsg)
-          printf("DssiSynthIF::getData: Error: First route is a midi track route!\n");
-      }
-      else
-      {
-        int ch     = i->channel       == -1 ? 0 : i->channel;
-        int remch  = i->remoteChannel == -1 ? 0 : i->remoteChannel;
-        int chs    = i->channels      == -1 ? 0 : i->channels;
-        
-        // TODO:
-        //if(ch >= synth->_inports)
-        //iUsedIdx[ch] = true;
-        //if(chs == 2)
-        //  iUsedIdx[ch + 1] = true;
-        
-        //((MusECore::AudioTrack*)i->track)->copyData(framePos, channels, nframe, bp);
-        ((MusECore::AudioTrack*)i->track)->copyData(pos, ports, 
-                                        //(i->track->type() == Track::AUDIO_SOFTSYNTH && i->channel != -1) ? i->channel : 0, 
-                                        i->channel, 
-                                        i->channels,
-                                        n, bp);
-      }
-      
-      //unsigned pos, int ports, unsigned n, float** buffer    
-      
-      ++i;
-      for(; i != irl->end(); ++i)
-      {
-        if(i->track->isMidiTrack())
-        {
-          //if(MusEGlobal::debugMsg)
-            printf("DssiSynthIF::getData: Error: Route is a midi track route!\n");
-          continue;
-        }
-        //((MusECore::AudioTrack*)i->track)->addData(framePos, channels, nframe, bp);
-        ((MusECore::AudioTrack*)i->track)->addData(framePos, channels, 
-                                          //(i->track->type() == Track::AUDIO_SOFTSYNTH && i->channel != -1) ? i->channel : 0, 
-                                          i->channel, 
-                                          i->channels,
-                                          nframe, bp);
-      }
-    }  
-    */  
-      
     k = 0;
     // Connect the given buffers directly to the ports, up to a max of synth ports.
     for(; k < nop; ++k)
@@ -1758,9 +1819,21 @@ MusECore::iMPEvent DssiSynthIF::getData(MusECore::MidiPort* /*mp*/, MusECore::MP
     // Connect the remaining ports to some local buffers (not used yet).
     for(; k < synth->_outports; ++k)
       descr->connect_port(handle, synth->oIdx[k], audioOutBuffers[k] + sample);
-    // Just connect all inputs to some local buffers (not used yet). TODO: Support inputs. 
+    // Connect all inputs either to some local buffers, or a silence buffer. 
     for(k = 0; k < synth->_inports; ++k)
-      descr->connect_port(handle, synth->iIdx[k], audioInBuffers[k] + sample);
+    {  
+      //printf(" k:%d synth->iIdx[k]:%d\n", k, synth->iIdx[k]);  
+      if(synth->iUsedIdx[k])
+      {
+        synth->iUsedIdx[k] = false; // Reset
+        descr->connect_port(handle, synth->iIdx[k], audioInBuffers[k] + sample);
+      }
+      else
+      {
+        //printf(" input used size:%ld idx:%ld = %d silencing...\n", synth->iUsedIdx.size(), k, synth->iUsedIdx[k]);  
+        descr->connect_port(handle, synth->iIdx[k], audioInSilenceBuf + sample);
+      }  
+    }
     
     // Run the synth for a period of time. This processes events and gets/fills our local buffers...
     if(synth->dssi->run_synth)
@@ -1772,10 +1845,10 @@ MusECore::iMPEvent DssiSynthIF::getData(MusECore::MidiPort* /*mp*/, MusECore::MP
       snd_seq_event_t* ev = events;
       synth->dssi->run_multiple_synths(1, &handle, nsamp, &ev, &nevents);
     }
+    // TIP: Until we add programs to plugins, uncomment these four checks to load dssi effects as synths, in order to have programs. 
     //else 
     //if(synth->dssi->LADSPA_Plugin->run)         
     //{
-    //  // Just a test, worked OK.
     //  synth->dssi->LADSPA_Plugin->run(handle, nsamp);     
     //}
     
@@ -1783,14 +1856,13 @@ MusECore::iMPEvent DssiSynthIF::getData(MusECore::MidiPort* /*mp*/, MusECore::MP
     loopcount++;       // REMOVE Tim.
   }
   
-  return i;
+  return start_event;
 }
 
 //---------------------------------------------------------
 //   putEvent
 //---------------------------------------------------------
 
-//bool DssiSynthIF::putEvent(const MidiEvent& ev)
 bool DssiSynthIF::putEvent(const MusECore::MidiPlayEvent& ev)
       {
       #ifdef DSSI_DEBUG 
@@ -2033,16 +2105,37 @@ int DssiSynthIF::oscControl(unsigned long port, float value)
     fprintf(stderr, "DssiSynthIF::oscControl: fifo overflow: in control number:%lu\n", cport);
   }
   
-  MusECore::ciMidiCtl2LadspaPort ip = synth->port2MidiCtlMap.find(cport);
-  if(ip != synth->port2MidiCtlMap.end())
+  // Record automation:
+  // Take care of this immediately, because we don't want the silly delay associated with 
+  //  processing the fifo one-at-a-time in the apply().
+  // NOTE: With some vsts we don't receive control events until the user RELEASES a control. 
+  // So the events all arrive at once when the user releases a control.
+  // That makes this pretty useless... But what the heck...
+  if(id() != -1)
   {
+    //int id = genACnum(_id, cport);
+    unsigned long pid = genACnum(id(), cport);
+    AutomationType at = synti->automationType();
+  
+    // TODO: Taken from our native gui control handlers. 
+    // This may need modification or may cause problems - 
+    //  we don't have the luxury of access to the dssi gui controls !
+    if(at == AUTO_WRITE || (MusEGlobal::audio->isPlaying() && at == AUTO_TOUCH))
+      enableController(cport, false);
+      
+    synti->recordAutomation(pid, value);
+  } 
+   
+  //MusECore::ciMidiCtl2LadspaPort ip = synth->port2MidiCtlMap.find(cport);
+  //if(ip != synth->port2MidiCtlMap.end())
+  //{
     // TODO: TODO: Update midi MusE's midi controller knobs, sliders, boxes etc with a call to the midi port's setHwCtrlState() etc.
     // But first we need a ladspa2MidiValue() function!  ... 
     //
     //
     //float val = ladspa2MidiValue(ld, i, ?, ?); 
   
-  }
+  //}
 
   return 0;
 }
@@ -2064,8 +2157,8 @@ int DssiSynthIF::oscMidi(int a, int b, int c)
       {
         MusECore::MidiPlayEvent event(0, port, channel, a, b, c);
       
-        #ifdef DSSI_DEBUG 
-        printf(stderr, "DssiSynthIF::oscMidi midi event chn:%d a:%d b:%d\n", event.channel(), event.dataA(), event.dataB());  
+        #ifdef DSSI_DEBUG   
+        printf("DssiSynthIF::oscMidi midi event chn:%d a:%d b:%d\n", event.channel(), event.dataA(), event.dataB());  
         #endif
         
         MusEGlobal::midiPorts[port].sendEvent(event);
@@ -2329,7 +2422,8 @@ QString DssiSynthIF::name() const                            { return synti->nam
 QString DssiSynthIF::lib() const                             { return synth ? synth->completeBaseName() : QString(); }
 QString DssiSynthIF::dirPath() const                         { return synth ? synth->absolutePath() : QString(); }
 QString DssiSynthIF::fileName() const                        { return synth ? synth->fileName() : QString(); }
-MusECore::AudioTrack* DssiSynthIF::track()                  { return (MusECore::AudioTrack*)synti; }
+QString DssiSynthIF::titlePrefix() const                     { return QString(); }
+MusECore::AudioTrack* DssiSynthIF::track()                   { return (MusECore::AudioTrack*)synti; }
 void DssiSynthIF::enableController(unsigned long i, bool v)  { controls[i].enCtrl = v; } 
 bool DssiSynthIF::controllerEnabled(unsigned long i) const   { return controls[i].enCtrl; }  
 bool DssiSynthIF::controllerEnabled2(unsigned long i) const  { return controls[i].en2Ctrl; }   
diff --git a/muse2/muse/dssihost.h b/muse2/muse/dssihost.h
index 9b00b642..2836d72e 100644
--- a/muse2/muse/dssihost.h
+++ b/muse2/muse/dssihost.h
@@ -76,7 +76,8 @@ class DssiSynth : public Synth {
       unsigned long _portCount, _inports, _outports, _controlInPorts, _controlOutPorts;
       std::vector<unsigned long> iIdx;  // Audio input index to port number.
       std::vector<unsigned long> oIdx;  // Audio output index to port number.
-      std::vector<bool> iUsedIdx;       // During process, tells whether an audio input port was used by any input routes.
+      //std::vector<bool> iUsedIdx;       // During process, tells whether an audio input port was used by any input routes.
+      std::vector<int> iUsedIdx;       // During process, tells whether an audio input port was used by any input routes.
       std::vector<unsigned long> rpIdx; // Port number to control input index. Item is -1 if it's not a control input.
       MusECore::MidiCtl2LadspaPortMap midiCtl2PortMap;   // Maps midi controller numbers to DSSI port numbers.
       MusECore::MidiCtl2LadspaPortMap port2MidiCtlMap;   // Maps DSSI port numbers to midi controller numbers.
@@ -88,6 +89,8 @@ class DssiSynth : public Synth {
    public:
       DssiSynth(QFileInfo&, const DSSI_Descriptor*); // removed const for QFileInfo
       virtual ~DssiSynth();
+      virtual Type synthType() const { return DSSI_SYNTH; }
+
       virtual void incInstances(int);
       virtual SynthIF* createSIF(SynthI*);
       
@@ -122,6 +125,7 @@ class DssiSynthIF : public SynthIF, public PluginIBase
       
       float** audioInBuffers;
       float** audioOutBuffers;
+      float*  audioInSilenceBuf; // Just all zeros all the time, so we don't have to clear for silence.
       
    public:
       DssiSynthIF(SynthI* s);
@@ -195,6 +199,7 @@ class DssiSynthIF : public SynthIF, public PluginIBase
       QString lib() const;            
       QString dirPath() const;
       QString fileName() const;
+      QString titlePrefix() const;
       MusECore::AudioTrack* track();          
       void enableController(unsigned long /*i*/, bool v = true);      
       bool controllerEnabled(unsigned long /*i*/) const;          
diff --git a/muse2/muse/exportmidi.cpp b/muse2/muse/exportmidi.cpp
index b892e808..4a9c1f6d 100644
--- a/muse2/muse/exportmidi.cpp
+++ b/muse2/muse/exportmidi.cpp
@@ -149,15 +149,28 @@ void MusE::exportMidi()
             return;
       MusECore::MidiFile mf(fp);
 
-      MusECore::MidiTrackList* tl = MusEGlobal::song->midis();
-      int ntracks = tl->size();
+      //MusECore::MidiTrackList* tl = MusEGlobal::song->midis();
+      MusECore::TrackList* tl = MusEGlobal::song->tracks();       // Changed to full track list so user can rearrange tracks.
+      //int ntracks = tl->size();
       MusECore::MidiFileTrackList* mtl = new MusECore::MidiFileTrackList;
 
       int i = 0;
-      for (MusECore::iMidiTrack im = tl->begin(); im != tl->end(); ++im, ++i) {
-            MusECore::MidiTrack* track = *im;
-            MusECore::MidiFileTrack* mft = new MusECore::MidiFileTrack;
-            mtl->push_back(mft);
+      MusECore::MidiFileTrack* mft = 0;
+      //for (MusECore::iMidiTrack im = tl->begin(); im != tl->end(); ++im, ++i) {
+      for (MusECore::ciTrack im = tl->begin(); im != tl->end(); ++im) {
+        
+            if(!(*im)->isMidiTrack())
+              continue;
+              
+            MusECore::MidiTrack* track = (MusECore::MidiTrack*)(*im);
+
+            //MusECore::MidiFileTrack* mft = new MusECore::MidiFileTrack;
+            if (i == 0 || (i != 0 && MusEGlobal::config.smfFormat != 0))    // Changed to single track. Tim
+            {  
+              mft = new MusECore::MidiFileTrack;
+              mtl->push_back(mft);
+            }
+            
             MusECore::MPEventList* l   = &(mft->events);
             int port         = track->outPort();
             int channel      = track->outChannel();
@@ -200,14 +213,17 @@ void MusE::exportMidi()
                   //---------------------------------------------------
                   //    Write Coment
                   //
-                  QString comment = track->comment();
-                  if (!comment.isEmpty()) {
-                        int len = comment.length();
-                        MusECore::MidiPlayEvent ev(0, port, MusECore::ME_META, (const unsigned char*)(comment.toLatin1().constData()), len);
-                        ev.setA(0x1);
-                        l->add(ev);
-                        }
-
+                  //if (MusEGlobal::config.smfFormat == 0)  // Only for smf 0 added by Tim. FIXME: Is this correct? See below.
+                  {
+                    QString comment = track->comment();
+                    if (!comment.isEmpty()) {
+                          int len = comment.length();
+                          MusECore::MidiPlayEvent ev(0, port, MusECore::ME_META, (const unsigned char*)(comment.toLatin1().constData()), len);
+                          ev.setA(0x1);
+                          l->add(ev);
+                          }
+                  }
+                  
                   //---------------------------------------------------
                   //    Write Songtype SYSEX: GM/GS/XG
                   //
@@ -287,27 +303,38 @@ void MusE::exportMidi()
             //   track name
             //-----------------------------------
 
-            if (!track->name().isEmpty()) {
-                  QByteArray ba = track->name().toLatin1();
-                  const char* name = ba.constData();
-                  int len = strlen(name);
-                  MusECore::MidiPlayEvent ev(0, port, MusECore::ME_META, (unsigned char*)name, len+1);
-                  ev.setA(0x3);    // Meta Sequence/Track Name
-                  l->add(ev);
-                  }
-
+            if (i == 0 || (i != 0 && MusEGlobal::config.smfFormat != 0))
+            {
+              if (!track->name().isEmpty()) {
+                    QByteArray ba = track->name().toLatin1();
+                    const char* name = ba.constData();
+                    int len = strlen(name);
+                    MusECore::MidiPlayEvent ev(0, port, MusECore::ME_META, (unsigned char*)name, len+1);
+                    ev.setA(0x3);    // Meta Sequence/Track Name
+                    l->add(ev);
+                    }
+            }
+            
             //-----------------------------------
             //   track comment
             //-----------------------------------
 
-            if (!track->comment().isEmpty()) {
-                  QByteArray ba = track->comment().toLatin1();
-                  const char* comment = ba.constData();
-                  int len = strlen(comment);
-                  MusECore::MidiPlayEvent ev(0, port, MusECore::ME_META, (unsigned char*)comment, len+1);
-                  ev.setA(0xf);    // Meta Text
-                  l->add(ev);
-                  }
+            // FIXME: What are these 0x0F? All I found was that they are unspecified part of the sixteen text meta events.
+            //        So why not use 0x01? And do we include it for all tracks, or only above 1?   Tim.
+            //if (i == 0 || (i != 0 && MusEGlobal::config.smfFormat != 0))
+            //if (i != 0 && MusEGlobal::config.smfFormat != 0)
+            if (MusEGlobal::config.smfFormat != 0)
+            {
+              if (!track->comment().isEmpty()) {
+                    QByteArray ba = track->comment().toLatin1();
+                    const char* comment = ba.constData();
+                    int len = strlen(comment);
+                    MusECore::MidiPlayEvent ev(0, port, MusECore::ME_META, (unsigned char*)comment, len+1);
+                    ev.setA(0xf);    // Meta Text
+                    l->add(ev);
+                    }
+            }
+            
             MusECore::PartList* parts = track->parts();
             for (MusECore::iPart p = parts->begin(); p != parts->end(); ++p) {
                   MusECore::MidiPart* part    = (MusECore::MidiPart*) (p->second);
@@ -315,7 +342,6 @@ void MusE::exportMidi()
                   for (MusECore::iEvent i = evlist->begin(); i != evlist->end(); ++i) {
                         MusECore::Event ev = i->second;
                         int tick = ev.tick() + part->tick();
-
                         switch (ev.type()) {
                               case MusECore::Note:
                                     {
@@ -400,11 +426,19 @@ void MusE::exportMidi()
                               }
                         }
                   }
+              ++i;  
+            
             }
       mf.setDivision(MusEGlobal::config.midiDivision);
       mf.setMType(MusEGlobal::song->mtype());
-      mf.setTrackList(mtl, ntracks);
+      //mf.setTrackList(mtl, ntracks);
+      mf.setTrackList(mtl, i);
       mf.write();
+      
+      // TESTING: Cleanup. I did not valgrind this feature in last memleak fixes, but I suspect it leaked. 
+      //for(MusECore::iMidiFileTrack imft = mtl->begin(); imft != mtl->end(); ++imft)
+      //  delete *imft;
+      //delete mtl;
       }
 
 } // namespace MusEGui
diff --git a/muse2/muse/functions.cpp b/muse2/muse/functions.cpp
index e0f9690c..77825f52 100644
--- a/muse2/muse/functions.cpp
+++ b/muse2/muse/functions.cpp
@@ -55,7 +55,7 @@
 #include <QDrag>
 #include <QMessageBox>
 #include <QClipboard>
-
+#include <QSet>
 
 
 using namespace std;
@@ -177,8 +177,9 @@ bool quantize_notes(const set<Part*>& parts)
 {
 	if (!MusEGui::quantize_dialog->exec())
 		return false;
-		
-	quantize_notes(parts, MusEGui::quantize_dialog->range, (MusEGlobal::config.division*4)/(1<<MusEGui::quantize_dialog->raster_power2),
+//  (1<<MusEGui::quantize_dialog->raster_power2)
+  int raster = MusEGui::rasterVals[MusEGui::quantize_dialog->raster_index];
+  quantize_notes(parts, MusEGui::quantize_dialog->range, (MusEGlobal::config.division*4)/raster,
 	               MusEGui::quantize_dialog->quant_len, MusEGui::quantize_dialog->strength, MusEGui::quantize_dialog->swing,
 	               MusEGui::quantize_dialog->threshold);
 	
@@ -306,8 +307,9 @@ bool quantize_notes()
 		parts=get_all_selected_parts();
 	else
 		parts=get_all_parts();
-		
-	quantize_notes(parts, MusEGui::quantize_dialog->range & FUNCTION_RANGE_ONLY_BETWEEN_MARKERS, (config.division*4)/(1<<MusEGui::quantize_dialog->raster_power2),
+
+  int raster = MusEGui::rasterVals[MusEGui::quantize_dialog->raster_index];
+  quantize_notes(parts, MusEGui::quantize_dialog->range & FUNCTION_RANGE_ONLY_BETWEEN_MARKERS, (config.division*4)/raster,
 	               MusEGui::quantize_dialog->quant_len, MusEGui::quantize_dialog->strength, MusEGui::quantize_dialog->swing,
 	               MusEGui::quantize_dialog->threshold);
 	
@@ -1276,34 +1278,22 @@ void shrink_parts(int raster)
 	MusEGlobal::song->applyOperationGroup(operations);
 }
 
-void internal_schedule_expand_part(Part* part, int raster, Undo& operations)
-{
-	EventList* events=part->events();
-	unsigned len=part->lenTick();
-	
-	for (iEvent ev=events->begin(); ev!=events->end(); ev++)
-		if (ev->second.endTick() > len)
-			len=ev->second.endTick();
-
-	if (raster) len=ceil((float)len/raster)*raster;
-					
-	if (len > part->lenTick())
-	{
-		MidiPart* new_part = new MidiPart(*(MidiPart*)part);
-		new_part->setLenTick(len);
-		operations.push_back(UndoOp(UndoOp::ModifyPart, part, new_part, true, false));
-	}
-}
 
 void schedule_resize_all_same_len_clone_parts(Part* part, unsigned new_len, Undo& operations)
 {
+	QSet<const Part*> already_done;
+	
+	for (Undo::iterator op_it=operations.begin(); op_it!=operations.end();op_it++)
+		if (op_it->type==UndoOp::ModifyPart || op_it->type==UndoOp::DeletePart)
+			already_done.insert(op_it->nPart);
+			
 	unsigned old_len=part->lenTick();
 	if (old_len!=new_len)
 	{
 		Part* part_it=part;
 		do
 		{
-			if (part_it->lenTick()==old_len)
+			if (part_it->lenTick()==old_len && !already_done.contains(part_it))
 			{
 				MidiPart* new_part = new MidiPart(*(MidiPart*)part_it);
 				new_part->setLenTick(new_len);
@@ -1393,4 +1383,81 @@ void clean_parts()
 	MusEGlobal::song->applyOperationGroup(operations);
 }
 
+bool merge_selected_parts()
+{
+	set<Part*> temp = get_all_selected_parts();
+	return merge_parts(temp);
+}
+
+bool merge_parts(const set<Part*>& parts)
+{
+	set<Track*> tracks;
+	for (set<Part*>::iterator it=parts.begin(); it!=parts.end(); it++)
+		tracks.insert( (*it)->track() );
+
+	Undo operations;
+	
+	// process tracks separately
+	for (set<Track*>::iterator t_it=tracks.begin(); t_it!=tracks.end(); t_it++)
+	{
+		Track* track=*t_it;
+
+		unsigned begin=MAXINT, end=0;
+		Part* first_part=NULL;
+		
+		// find begin of the first and end of the last part
+		for (set<Part*>::iterator it=parts.begin(); it!=parts.end(); it++)
+			if ((*it)->track()==track)
+			{
+				Part* p=*it;
+				if (p->tick() < begin)
+				{
+					begin=p->tick();
+					first_part=p;
+				}
+				
+				if (p->endTick() > end)
+					end=p->endTick();
+			}
+		
+		if (begin==MAXINT || end==0)
+		{
+			printf("THIS SHOULD NEVER HAPPEN: begin==MAXINT || end==0 in merge_parts()\n");
+			continue; // skip the actual work, as we cannot work under errornous conditions.
+		}
+		
+		// create and prepare the new part
+		Part* new_part = track->newPart(first_part); 
+		new_part->setTick(begin);
+		new_part->setLenTick(end-begin);
+		
+		EventList* new_el = new_part->events();
+		new_el->incARef(-1); // the later MusEGlobal::song->applyOperationGroup() will increment it
+		                     // so we must decrement it first :/
+		new_el->clear();
+		
+		// copy all events from the source parts into the new part
+		for (set<Part*>::iterator p_it=parts.begin(); p_it!=parts.end(); p_it++)
+			if ((*p_it)->track()==track)
+			{
+				EventList* old_el= (*p_it)->events();
+				for (iEvent ev_it=old_el->begin(); ev_it!=old_el->end(); ev_it++)
+				{
+					Event new_event=ev_it->second;
+					new_event.setTick( new_event.tick() + (*p_it)->tick() - new_part->tick() );
+					new_el->add(new_event);
+				}
+			}
+		
+		// delete all the source parts
+		for (set<Part*>::iterator it=parts.begin(); it!=parts.end(); it++)
+			if ((*it)->track()==track)
+				operations.push_back( UndoOp(UndoOp::DeletePart, *it) );
+		// and add the new one
+		operations.push_back( UndoOp(UndoOp::AddPart, new_part) );
+	}
+	
+	return MusEGlobal::song->applyOperationGroup(operations);
+}
+
 } // namespace MusECore
diff --git a/muse2/muse/functions.h b/muse2/muse/functions.h
index 2cf9c245..c81dd2bc 100644
--- a/muse2/muse/functions.h
+++ b/muse2/muse/functions.h
@@ -102,6 +102,8 @@ void shrink_parts(int raster=-1); //negative values mean "config.division"
 void expand_parts(int raster=-1);
 void schedule_resize_all_same_len_clone_parts(Part* part, unsigned new_len, Undo& operations);
 void clean_parts();
+bool merge_selected_parts();
+bool merge_parts(const std::set<Part*>& parts);
 
 } // namespace MusECore
 
diff --git a/muse2/muse/gconfig.cpp b/muse2/muse/gconfig.cpp
index a19d9ed8..a6abbb93 100644
--- a/muse2/muse/gconfig.cpp
+++ b/muse2/muse/gconfig.cpp
@@ -131,8 +131,8 @@ GlobalConfigValues config = {
       -60.0,                        // double minSlider;
       false,                        // use Jack freewheel
       20,                           // int guiRefresh;
-      QString(""),                  // userInstrumentsDir
-      //QString(""),                  // helpBrowser; // Obsolete
+      QString(""),                  // userInstrumentsDir  // Obsolete. Must keep for compatibility.
+      //QString(""),                // helpBrowser; // Obsolete
       true,                         // extendedMidi
       384,                          // division for smf export
       QString(""),                  // copyright string for smf export
@@ -191,7 +191,11 @@ GlobalConfigValues config = {
       false,                        // popupsDefaultStayOpen
       false,                        // leftMouseButtonCanDecrease
       false,                        // rangeMarkerWithoutMMB
-      MusECore::DONT_REC_MUTED_OR_HIDDEN
+      MusECore::DONT_REC_MUTED_OR_HIDDEN,
+      true,                         // addHiddenTracks
+      true                          // unhideTracks
     };
 
+//GlobalConfigValues globalConfig = config;
+    
 } // namespace MusEGlobal
diff --git a/muse2/muse/gconfig.h b/muse2/muse/gconfig.h
index 24fd787a..f611687f 100644
--- a/muse2/muse/gconfig.h
+++ b/muse2/muse/gconfig.h
@@ -121,7 +121,7 @@ struct GlobalConfigValues {
       double minSlider;
       bool freewheelMode;
       int guiRefresh;
-      QString userInstrumentsDir;
+      QString userInstrumentsDir;  // Obsolete. Must keep for compatibility.
 
       bool extendedMidi;      // extended smf format
       int midiDivision;       // division for smf export
@@ -178,6 +178,8 @@ struct GlobalConfigValues {
       bool leftMouseButtonCanDecrease;
       bool rangeMarkerWithoutMMB;
       MusECore::newDrumRecordCondition_t newDrumRecordCondition;
+      bool addHiddenTracks;
+      bool unhideTracks;
       };
 
 
diff --git a/muse2/muse/globals.cpp b/muse2/muse/globals.cpp
index fad6472e..d50ea1eb 100644
--- a/muse2/muse/globals.cpp
+++ b/muse2/muse/globals.cpp
@@ -116,21 +116,13 @@ bool loadDSSI = true;
 bool usePythonBridge = false;
 bool useLASH = true;
 
-/*
 const char* midi_file_pattern[] = {
-      QT_TRANSLATE_NOOP("@default", "Midi/Kar (*.mid *.MID *.kar *.KAR *.mid.gz *.mid.bz2)"),
-      QT_TRANSLATE_NOOP("@default", "Midi (*.mid *.MID *.mid.gz *.mid.bz2)"),
-      QT_TRANSLATE_NOOP("@default", "Karaoke (*.kar *.KAR *.kar.gz *.kar.bz2)"),
-      QT_TRANSLATE_NOOP("@default", "All Files (*)"),
+      QT_TRANSLATE_NOOP("file_patterns", "Midi/Kar (*.mid *.MID *.kar *.KAR *.mid.gz *.mid.bz2)"),
+      QT_TRANSLATE_NOOP("file_patterns", "Midi (*.mid *.MID *.mid.gz *.mid.bz2)"),
+      QT_TRANSLATE_NOOP("file_patterns", "Karaoke (*.kar *.KAR *.kar.gz *.kar.bz2)"),
+      QT_TRANSLATE_NOOP("file_patterns", "All Files (*)"),
       0
       };
-*/      
-const QStringList midi_file_pattern =  
-      QT_TRANSLATE_NOOP("@default", 
-      QString("Midi/Kar (*.mid *.MID *.kar *.KAR *.mid.gz *.mid.bz2);;") +
-      QString("Midi (*.mid *.MID *.mid.gz *.mid.bz2);;") +
-      QString("Karaoke (*.kar *.KAR *.kar.gz *.kar.bz2);;") +
-      QString("All Files (*)")).split(";;");
 
 //FIXME: By T356 01/19/2010
 // If saving as a compressed file (gz or bz2),
@@ -148,80 +140,46 @@ const char* midi_file_save_pattern[] = {
       "All Files (*)",
       0
       };
-QStringList midi_file_save_pattern =  
-      QStringList::split(";;", QT_TRANSLATE_NOOP("@default", 
-      QString("Midi (*.mid);;") +
-      QString("gzip compressed Midi (*.mid.gz);;") +
-      QString("bzip2 compressed Midi (*.mid.bz2);;") +
-      QString("Karaoke (*.kar);;") +
-      QString("gzip compressed karaoke (*.kar.gz);;") +
-      QString("bzip2 compressed karaoke (*.kar.bz2);;") +
-      QString("All Files (*)")) );
 */
-/*
 const char* midi_file_save_pattern[] = {
-      QT_TRANSLATE_NOOP("@default", "Midi (*.mid)"),
-      QT_TRANSLATE_NOOP("@default", "Karaoke (*.kar)"),
-      QT_TRANSLATE_NOOP("@default", "All Files (*)"),
+      QT_TRANSLATE_NOOP("file_patterns", "Midi (*.mid)"),
+      QT_TRANSLATE_NOOP("file_patterns", "Karaoke (*.kar)"),
+      QT_TRANSLATE_NOOP("file_patterns", "All Files (*)"),
       0
       };
-*/
-const QStringList midi_file_save_pattern =  
-      QT_TRANSLATE_NOOP("@default", 
-      QString("Midi (*.mid);;") +
-      QString("Karaoke (*.kar);;") +
-      QString("All Files (*)")).split(";;");
 
-/*
 const char* med_file_pattern[] = {
-      QT_TRANSLATE_NOOP("@default", "med Files (*.med *.med.gz *.med.bz2)"),
-      QT_TRANSLATE_NOOP("@default", "Uncompressed med Files (*.med)"),
-      QT_TRANSLATE_NOOP("@default", "gzip compressed med Files (*.med.gz)"),
-      QT_TRANSLATE_NOOP("@default", "bzip2 compressed med Files (*.med.bz2)"),
-      QT_TRANSLATE_NOOP("@default", "All Files (*)"),
+      QT_TRANSLATE_NOOP("file_patterns", "all known files (*.med *.med.gz *.med.bz2 *.mid *.midi *.kar)"),
+      QT_TRANSLATE_NOOP("file_patterns", "med Files (*.med *.med.gz *.med.bz2)"),
+      QT_TRANSLATE_NOOP("file_patterns", "Uncompressed med Files (*.med)"),
+      QT_TRANSLATE_NOOP("file_patterns", "gzip compressed med Files (*.med.gz)"),
+      QT_TRANSLATE_NOOP("file_patterns", "bzip2 compressed med Files (*.med.bz2)"),
+      QT_TRANSLATE_NOOP("file_patterns", "mid Files (*.mid *.midi *.kar *.MID *.MIDI *.KAR)"),
+      QT_TRANSLATE_NOOP("file_patterns", "All Files (*)"),
       0
       };
 const char* med_file_save_pattern[] = {
-      QT_TRANSLATE_NOOP("@default", "Uncompressed med Files (*.med)"),
-      QT_TRANSLATE_NOOP("@default", "gzip compressed med Files (*.med.gz)"),
-      QT_TRANSLATE_NOOP("@default", "bzip2 compressed med Files (*.med.bz2)"),
-      QT_TRANSLATE_NOOP("@default", "All Files (*)"),
+      QT_TRANSLATE_NOOP("file_patterns", "Uncompressed med Files (*.med)"),
+      QT_TRANSLATE_NOOP("file_patterns", "gzip compressed med Files (*.med.gz)"),
+      QT_TRANSLATE_NOOP("file_patterns", "bzip2 compressed med Files (*.med.bz2)"),
+      QT_TRANSLATE_NOOP("file_patterns", "All Files (*)"),
+      0
+      };
+const char* project_create_file_save_pattern[] = {
+      QT_TRANSLATE_NOOP("file_patterns", "Uncompressed med Files (*.med)"),
+      QT_TRANSLATE_NOOP("file_patterns", "gzip compressed med Files (*.med.gz)"),
+      QT_TRANSLATE_NOOP("file_patterns", "bzip2 compressed med Files (*.med.bz2)"),
       0
       };
-*/      
-const QStringList med_file_pattern =  
-      QT_TRANSLATE_NOOP("@default", 
-      QString("all known files (*.med *.med.gz *.med.bz2 *.mid *.midi *.kar);;") +
-      QString("med Files (*.med *.med.gz *.med.bz2);;") +
-      QString("Uncompressed med Files (*.med);;") +
-      QString("gzip compressed med Files (*.med.gz);;") +
-      QString("bzip2 compressed med Files (*.med.bz2);;") +
-      QString("mid Files (*.mid *.midi *.kar);;") +
-      QString("All Files (*)")).split(";;");
-const QStringList med_file_save_pattern =  
-      QT_TRANSLATE_NOOP("@default", 
-      QString("Uncompressed med Files (*.med);;") +
-      QString("gzip compressed med Files (*.med.gz);;") +
-      QString("bzip2 compressed med Files (*.med.bz2);;") +
-      QString("All Files (*)")).split(";;");
 
-/*
 const char* image_file_pattern[] = {
-      QT_TRANSLATE_NOOP("@default", "(*.jpg *.gif *.png)"),
-      QT_TRANSLATE_NOOP("@default", "(*.jpg)"),
-      QT_TRANSLATE_NOOP("@default", "(*.gif)"),
-      QT_TRANSLATE_NOOP("@default", "(*.png)"),
-      QT_TRANSLATE_NOOP("@default", "All Files (*)"),
+      QT_TRANSLATE_NOOP("file_patterns", "(*.jpg *.gif *.png)"),
+      QT_TRANSLATE_NOOP("file_patterns", "(*.jpg)"),
+      QT_TRANSLATE_NOOP("file_patterns", "(*.gif)"),
+      QT_TRANSLATE_NOOP("file_patterns", "(*.png)"),
+      QT_TRANSLATE_NOOP("file_patterns", "All Files (*)"),
       0
       };
-*/      
-const QStringList image_file_pattern =  
-      QT_TRANSLATE_NOOP("@default", 
-      QString("(*.jpg *.gif *.png);;") +
-      QString("(*.jpg);;") +
-      QString("(*.gif);;") +
-      QString("(*.png);;") +
-      QString("All Files (*)")).split(";;");
 
 // Not used.
 /*
@@ -232,84 +190,62 @@ const char* ctrl_file_pattern[] = {
       };
 */
 
-/*
 const char* part_file_pattern[] = {
-      //QT_TRANSLATE_NOOP("@default", "part Files (*.mpt)"),
-      QT_TRANSLATE_NOOP("@default", "part Files (*.mpt *.mpt.gz *.mpt.bz2)"),
-      QT_TRANSLATE_NOOP("@default", "All Files (*)"),
+      QT_TRANSLATE_NOOP("file_patterns", "part Files (*.mpt *.mpt.gz *.mpt.bz2)"),
+      QT_TRANSLATE_NOOP("file_patterns", "All Files (*)"),
       0
       };
 const char* part_file_save_pattern[] = {
-      QT_TRANSLATE_NOOP("@default", "part Files (*.mpt)"),
-      QT_TRANSLATE_NOOP("@default", "gzip compressed part Files (*.mpt.gz)"),
-      QT_TRANSLATE_NOOP("@default", "bzip2 compressed part Files (*.mpt.bz2)"),
-      QT_TRANSLATE_NOOP("@default", "All Files (*)"),
+      QT_TRANSLATE_NOOP("file_patterns", "part Files (*.mpt)"),
+      QT_TRANSLATE_NOOP("file_patterns", "gzip compressed part Files (*.mpt.gz)"),
+      QT_TRANSLATE_NOOP("file_patterns", "bzip2 compressed part Files (*.mpt.bz2)"),
+      QT_TRANSLATE_NOOP("file_patterns", "All Files (*)"),
       0
       };
-*/
-const QStringList part_file_pattern =  
-      QT_TRANSLATE_NOOP("@default", 
-      QString("part Files (*.mpt *.mpt.gz *.mpt.bz2);;") +
-      QString("All Files (*)")).split(";;");
-
-const QStringList part_file_save_pattern =  
-      QT_TRANSLATE_NOOP("@default", 
-      QString("part Files (*.mpt);;") +
-      QString("gzip compressed part Files (*.mpt.gz);;") +
-      QString("bzip2 compressed part Files (*.mpt.bz2);;") +
-      QString("All Files (*)")).split(";;");
 
 /*
 const char* plug_file_pattern[] = {
-      QT_TRANSLATE_NOOP("@default", "part Files (*.pre)"),
-      QT_TRANSLATE_NOOP("@default", "All Files (*)"),
+      QT_TRANSLATE_NOOP("file_patterns", "part Files (*.pre)"),
+      QT_TRANSLATE_NOOP("file_patterns", "All Files (*)"),
       0
       };
 */
-/*
+
 const char* preset_file_pattern[] = {
-      QT_TRANSLATE_NOOP("@default", "Presets (*.pre *.pre.gz *.pre.bz2)"),
-      QT_TRANSLATE_NOOP("@default", "All Files (*)"),
+      QT_TRANSLATE_NOOP("file_patterns", "Presets (*.pre *.pre.gz *.pre.bz2)"),
+      QT_TRANSLATE_NOOP("file_patterns", "All Files (*)"),
       0
       };
 
 const char* preset_file_save_pattern[] = {
-      QT_TRANSLATE_NOOP("@default", "Presets (*.pre)"),
-      QT_TRANSLATE_NOOP("@default", "gzip compressed presets (*.pre.gz)"),
-      QT_TRANSLATE_NOOP("@default", "bzip2 compressed presets (*.pre.bz2)"),
-      QT_TRANSLATE_NOOP("@default", "All Files (*)"),
+      QT_TRANSLATE_NOOP("file_patterns", "Presets (*.pre)"),
+      QT_TRANSLATE_NOOP("file_patterns", "gzip compressed presets (*.pre.gz)"),
+      QT_TRANSLATE_NOOP("file_patterns", "bzip2 compressed presets (*.pre.bz2)"),
+      QT_TRANSLATE_NOOP("file_patterns", "All Files (*)"),
       0
       };
-*/
-const QStringList preset_file_pattern =  
-      QT_TRANSLATE_NOOP("@default", 
-      QString("Presets (*.pre *.pre.gz *.pre.bz2);;") +
-      QString("All Files (*)")).split(";;");
-
-const QStringList preset_file_save_pattern =  
-      QT_TRANSLATE_NOOP("@default", 
-      QString("Presets (*.pre);;") +
-      QString("gzip compressed presets (*.pre.gz);;") +
-      QString("bzip2 compressed presets (*.pre.bz2);;") +
-      QString("All Files (*)")).split(";;");
-
-const QStringList drum_map_file_pattern =  
-      QT_TRANSLATE_NOOP("@default", 
-      QString("Presets (*.map *.map.gz *.map.bz2);;") +
-      QString("All Files (*)")).split(";;");
-const QStringList drum_map_file_save_pattern =  
-      QT_TRANSLATE_NOOP("@default", 
-      QString("Presets (*.map);;") +
-      QString("gzip compressed presets (*.map.gz);;") +
-      QString("bzip2 compressed presets (*.map.bz2);;") +
-      QString("All Files (*)")).split(";;");
-
-const QStringList audio_file_pattern =  
-      QT_TRANSLATE_NOOP("@default", 
-      QString("Wave/Binary (*.wav *.ogg *.bin);;") +
-      QString("Wave (*.wav *.ogg);;") +
-      QString("Binary (*.bin);;") +
-      QString("All Files (*)")).split(";;");
+
+const char* drum_map_file_pattern[] = {
+      QT_TRANSLATE_NOOP("file_patterns", "Presets (*.map *.map.gz *.map.bz2)"),
+      QT_TRANSLATE_NOOP("file_patterns", "All Files (*)"),
+      0
+};
+
+const char* drum_map_file_save_pattern[] = {
+      QT_TRANSLATE_NOOP("file_patterns", "Presets (*.map)"),
+      QT_TRANSLATE_NOOP("file_patterns", "gzip compressed presets (*.map.gz)"),
+      QT_TRANSLATE_NOOP("file_patterns", "bzip2 compressed presets (*.map.bz2)"),
+      QT_TRANSLATE_NOOP("file_patterns", "All Files (*)"),
+      0
+};
+
+const char* audio_file_pattern[] = {
+      QT_TRANSLATE_NOOP("file_patterns", "Wave/Binary (*.wav *.ogg *.bin)"),
+      QT_TRANSLATE_NOOP("file_patterns", "Wave (*.wav *.ogg)"),
+      QT_TRANSLATE_NOOP("file_patterns", "Binary (*.bin)"),
+      QT_TRANSLATE_NOOP("file_patterns", "All Files (*)"),
+      0
+};
 
 ///Qt::ButtonState globalKeyState;
 Qt::KeyboardModifiers globalKeyState;
diff --git a/muse2/muse/globals.h b/muse2/muse/globals.h
index c0a3395a..7563c171 100644
--- a/muse2/muse/globals.h
+++ b/muse2/muse/globals.h
@@ -34,7 +34,6 @@
 class QString;
 class QAction;
 class QActionGroup;
-class QStringList;
 class QTimer;
 
 namespace MusEGui {
@@ -91,33 +90,20 @@ extern bool realTimeScheduling;
 extern int realTimePriority;
 extern int midiRTPrioOverride;
 
-/*
-extern const char* midi_file_pattern[];  //!< File name pattern for midi files
-extern const char* midi_file_save_pattern[];  //!< File name pattern for saving midi files
-extern const char* med_file_pattern[];   //!< File name pattern for muse project files
-extern const char* med_file_save_pattern[];   //!< File name pattern for saving muse project files
-extern const char* image_file_pattern[]; //!< File name pattern for image files (gfx)
-//extern const char* ctrl_file_pattern[];  //!< File name pattern for controller-files
-extern const char* part_file_pattern[];  //!< File name pattern for part files
-extern const char* part_file_save_pattern[];  //!< File name pattern for saving part files
-//extern const char* plug_file_pattern[];  //!< File name pattern for plugin files
-extern const char* preset_file_pattern[];  //!< File name pattern for plugin files
-extern const char* preset_file_save_pattern[];  //!< File name pattern for saving plugin files
-*/
-
-extern const QStringList midi_file_pattern;
-extern const QStringList midi_file_save_pattern;
-extern const QStringList med_file_pattern;
-extern const QStringList med_file_save_pattern;
-extern const QStringList image_file_pattern;
-//extern const QStringList ctrl_file_pattern;
-extern const QStringList part_file_pattern;
-extern const QStringList part_file_save_pattern;
-extern const QStringList preset_file_pattern;
-extern const QStringList preset_file_save_pattern;
-extern const QStringList drum_map_file_pattern;
-extern const QStringList drum_map_file_save_pattern;
-extern const QStringList audio_file_pattern;
+extern const char* midi_file_pattern[];
+extern const char* midi_file_save_pattern[];
+extern const char* med_file_pattern[];
+extern const char* med_file_save_pattern[];
+extern const char* project_create_file_save_pattern[];
+extern const char* image_file_pattern[];
+//extern const char* ctrl_file_pattern[];
+extern const char* part_file_pattern[];
+extern const char* part_file_save_pattern[];
+extern const char* preset_file_pattern[];
+extern const char* preset_file_save_pattern[];
+extern const char* drum_map_file_pattern[];
+extern const char* drum_map_file_save_pattern[];
+extern const char* audio_file_pattern[];
 
 ///extern Qt::ButtonState globalKeyState;
 extern Qt::KeyboardModifiers globalKeyState;
diff --git a/muse2/muse/helper.cpp b/muse2/muse/helper.cpp
index 1298b2d2..144d876d 100644
--- a/muse2/muse/helper.cpp
+++ b/muse2/muse/helper.cpp
@@ -20,6 +20,8 @@
 //
 //=========================================================
 
+#include <list>
+
 #include "helper.h"
 #include "part.h"
 #include "track.h"
@@ -28,6 +30,22 @@
 #include "icons.h"
 #include "synth.h"
 #include "functions.h"
+#include "gconfig.h"
+
+#include "driver/jackmidi.h"
+#include "route.h"
+#include "mididev.h"
+#include "globaldefs.h"
+#include "audio.h"
+#include "audiodev.h"
+#include "midiseq.h"
+
+#include <QApplication>
+#include <QDir>
+#include <QFileInfo>
+#include <QFileDialog>
+#include <QString>
+//#include <QTemporaryFile>
 
 #ifdef DSSI_SUPPORT
 #include "dssihost.h"
@@ -165,237 +183,544 @@ QMenu* populateAddSynth(QWidget* parent)
   //typedef std::multimap<std::string, int, addSynth_cmp_str >::iterator imap;
   typedef std::multimap<std::string, int >::iterator imap;
   
-  MusECore::MessSynth* synMESS   = 0;
-  QMenu* synpMESS = 0;
-  asmap mapMESS;
-
-  #ifdef DSSI_SUPPORT
-  MusECore::DssiSynth* synDSSI   = 0;
-  QMenu* synpDSSI = 0;
-  asmap mapDSSI;
-  #endif                  
   
-  #ifdef VST_SUPPORT
-  MusECore::VstSynth*  synVST    = 0;
-  QMenu* synpVST  = 0;
-  asmap mapVST;
-  #endif                  
+  int ntypes = MusECore::Synth::SYNTH_TYPE_END;
+  asmap smaps[ntypes];
+  QMenu* mmaps[ntypes];
+  for(int itype = 0; itype < ntypes; ++itype)
+    mmaps[itype] = 0;
   
-  // Not necessary, but what the heck.
-  QMenu* synpOther = 0;
-  asmap mapOther;
+  MusECore::Synth* synth;
+  MusECore::Synth::Type type;
   
-  //const int synth_base_id = 0x1000;
   int ii = 0;
   for(std::vector<MusECore::Synth*>::iterator i = MusEGlobal::synthis.begin(); i != MusEGlobal::synthis.end(); ++i) 
   {
-    synMESS = dynamic_cast<MusECore::MessSynth*>(*i);
-    if(synMESS)
-    {
-      mapMESS.insert( std::pair<std::string, int> (std::string(synMESS->description().toLower().toLatin1().constData()), ii) );
-    }
-    else
-    {
-      
-      #ifdef DSSI_SUPPORT
-      synDSSI = dynamic_cast<MusECore::DssiSynth*>(*i);
-      if(synDSSI)
-      {
-        mapDSSI.insert( std::pair<std::string, int> (std::string(synDSSI->description().toLower().toLatin1().constData()), ii) );
-      }
-      else
-      #endif                      
-      
-      {
-        #ifdef VST_SUPPORT
-        synVST = dynamic_cast<MusECore::VstSynth*>(*i);
-        if(synVST)
-        {
-          mapVST.insert( std::pair<std::string, int> (std::string(synVST->description().toLower().toLatin1().constData()), ii) );
-        }
-        else
-        #endif                      
-        
-        {
-          mapOther.insert( std::pair<std::string, int> (std::string((*i)->description().toLower().toLatin1().constData()), ii) );
-        }
-      }
-    }
+    synth = *i;
+    type = synth->synthType();
+    if(type >= ntypes)
+      continue; 
+    smaps[type].insert( std::pair<std::string, int> (std::string(synth->description().toLower().toLatin1().constData()), ii) );
   
     ++ii;
   }
   
   int sz = MusEGlobal::synthis.size();
-  for(imap i = mapMESS.begin(); i != mapMESS.end(); ++i) 
-  {
-    int idx = i->second;
-    if(idx > sz)           // Sanity check
-      continue;
-    MusECore::Synth* s = MusEGlobal::synthis[idx];
-    if(s)
+  for(int itype = 0; itype < ntypes; ++itype)
+  {  
+    for(imap i = smaps[itype].begin(); i != smaps[itype].end(); ++i) 
     {
-      // No MESS sub-menu yet? Create it now.
-      if(!synpMESS)
-        synpMESS = new QMenu(parent);
-      QAction* sM = synpMESS->addAction(QT_TRANSLATE_NOOP("@default", s->description()) + " <" + QT_TRANSLATE_NOOP("@default", s->name()) + ">");
-      sM->setData(MENU_ADD_SYNTH_ID_BASE + idx);
-    }  
-  }
-  
-  #ifdef DSSI_SUPPORT
-  for(imap i = mapDSSI.begin(); i != mapDSSI.end(); ++i) 
-  {
-    int idx = i->second;
-    if(idx > sz)           
-      continue;
-    MusECore::Synth* s = MusEGlobal::synthis[idx];
-    if(s)
-    {
-      // No DSSI sub-menu yet? Create it now.
-      if(!synpDSSI)
-        synpDSSI = new QMenu(parent);
-      //synpDSSI->insertItem(QT_TRANSLATE_NOOP("@default", s->description()) + " <" + QT_TRANSLATE_NOOP("@default", s->name()) + ">", MENU_ADD_SYNTH_ID_BASE + idx);
-      QAction* sD = synpDSSI->addAction(QT_TRANSLATE_NOOP("@default", s->description()) + " <" + QT_TRANSLATE_NOOP("@default", s->name()) + ">");
-      sD->setData(MENU_ADD_SYNTH_ID_BASE + idx);
-    }  
-  }
-  #endif
-  
-  #ifdef VST_SUPPORT
-  for(imap i = mapVST.begin(); i != mapVST.end(); ++i) 
-  {
-    int idx = i->second;
-    if(idx > sz)           
-      continue;
-    Synth* s = MusEGlobal::synthis[idx];
-    if(s)
-    {
-      // No VST sub-menu yet? Create it now.
-      if(!synpVST)
-        synpVST = new QMenu(parent);
-      QAction* sV = synpVST->addAction(QT_TRANSLATE_NOOP("@default", s->description()) + " <" + QT_TRANSLATE_NOOP("@default", s->name()) + ">");
-      sV->setData(MENU_ADD_SYNTH_ID_BASE + idx);
-    }  
-  }
-  #endif
-  
-  for(imap i = mapOther.begin(); i != mapOther.end(); ++i) 
-  {
-    int idx = i->second;
-    if(idx > sz)          
-      continue;
-    MusECore::Synth* s = MusEGlobal::synthis[idx];
-    // No Other sub-menu yet? Create it now.
-    if(!synpOther)
-      synpOther = new QMenu(parent);
-    //synpOther->insertItem(QT_TRANSLATE_NOOP("@default", s->description()) + " <" + QT_TRANSLATE_NOOP("@default", s->name()) + ">", MENU_ADD_SYNTH_ID_BASE + idx);
-    QAction* sO = synpOther->addAction(QT_TRANSLATE_NOOP("@default", s->description()) + " <" + QT_TRANSLATE_NOOP("@default", s->name()) + ">");
-    sO->setData(MENU_ADD_SYNTH_ID_BASE + idx);
-  }
-  
-  if(synpMESS)
-  {
-    synpMESS->setIcon(*synthIcon);
-    synpMESS->setTitle(QT_TRANSLATE_NOOP("@default", "MESS"));
-    synp->addMenu(synpMESS);
-  }
-  
-  #ifdef DSSI_SUPPORT
-  if(synpDSSI)
-  {
-    synpDSSI->setIcon(*synthIcon);
-    synpDSSI->setTitle(QT_TRANSLATE_NOOP("@default", "DSSI"));
-    synp->addMenu(synpDSSI);
-  }  
-  #endif
-  
-  #ifdef VST_SUPPORT
-  if(synpVST)
-  {
-    synpVST->setIcon(*synthIcon);
-    synpVST->setTitle(QT_TRANSLATE_NOOP("@default", "FST"));
-    synp->addMenu(synpVST);
-  }  
-  #endif
-  
-  if(synpOther)
-  {
-    synpOther->setIcon(*synthIcon);
-    synpOther->setTitle(QObject::tr("Other"));
-    synp->addMenu(synpOther);
+      int idx = i->second;
+      if(idx > sz)           // Sanity check
+        continue;
+      synth = MusEGlobal::synthis[idx];
+      if(synth)
+      {
+        // No sub-menu yet? Create it now.
+        if(!mmaps[itype])
+        {  
+          mmaps[itype] = new QMenu(parent);
+          mmaps[itype]->setIcon(*synthIcon);
+          mmaps[itype]->setTitle(MusECore::synthType2String((MusECore::Synth::Type)itype));
+          synp->addMenu(mmaps[itype]);
+        }  
+        QAction* act = mmaps[itype]->addAction(synth->description() + " <" + synth->name() + ">");
+        act->setData( MENU_ADD_SYNTH_ID_BASE * (itype + 1) + idx );
+      }  
+    }
   }
-  
+
   return synp;
 }
 
-
 //---------------------------------------------------------
 //   populateAddTrack
 //    this is also used in "mixer"
 //---------------------------------------------------------
 
-QActionGroup* populateAddTrack(QMenu* addTrack)
+QActionGroup* populateAddTrack(QMenu* addTrack, bool populateAll)
       {
       QActionGroup* grp = new QActionGroup(addTrack);
+      if (MusEGlobal::config.addHiddenTracks)
+        populateAll=true;
+
+      if (populateAll || MusECore::MidiTrack::visible()) {
+        QAction* midi = addTrack->addAction(QIcon(*addtrack_addmiditrackIcon),
+                                          qApp->translate("@default", QT_TRANSLATE_NOOP("@default", "Add Midi Track")));
+        midi->setData(MusECore::Track::MIDI);
+        grp->addAction(midi);
+      }
+      if (populateAll || MusECore::MidiTrack::visible()) {
+        QAction* drum = addTrack->addAction(QIcon(*addtrack_drumtrackIcon),
+                                          qApp->translate("@default", QT_TRANSLATE_NOOP("@default", "Add Drum Track")));
+        drum->setData(MusECore::Track::DRUM);
+        grp->addAction(drum);
+      }
+      if (populateAll || MusECore::MidiTrack::visible()) {
+        QAction* newdrum = addTrack->addAction(QIcon(*addtrack_drumtrackIcon),
+                                          qApp->translate("@default", QT_TRANSLATE_NOOP("@default", "Add New Style Drum Track")));
+        newdrum->setData(MusECore::Track::NEW_DRUM);
+        grp->addAction(newdrum);
+      }
+      if (populateAll || MusECore::WaveTrack::visible()) {
+        QAction* wave = addTrack->addAction(QIcon(*addtrack_wavetrackIcon),
+                                          qApp->translate("@default", QT_TRANSLATE_NOOP("@default", "Add Wave Track")));
+       wave->setData(MusECore::Track::WAVE);
+       grp->addAction(wave);
+      }
 
-      QAction* midi = addTrack->addAction(QIcon(*addtrack_addmiditrackIcon),
-                                          QT_TRANSLATE_NOOP("@default", "Add Midi Track"));
-      midi->setData(MusECore::Track::MIDI);
-      grp->addAction(midi);
+      if (populateAll || MusECore::AudioOutput::visible()) {
+        QAction* aoutput = addTrack->addAction(QIcon(*addtrack_audiooutputIcon),
+                                               qApp->translate("@default", QT_TRANSLATE_NOOP("@default", "Add Audio Output")));
+        aoutput->setData(MusECore::Track::AUDIO_OUTPUT);
+        grp->addAction(aoutput);
+      }
 
+      if (populateAll || MusECore::AudioGroup::visible()) {
+        QAction* agroup = addTrack->addAction(QIcon(*addtrack_audiogroupIcon),
+                                              qApp->translate("@default", QT_TRANSLATE_NOOP("@default", "Add Audio Group")));
+        agroup->setData(MusECore::Track::AUDIO_GROUP);
+        grp->addAction(agroup);
+      }
 
-      QAction* drum = addTrack->addAction(QIcon(*addtrack_drumtrackIcon),
-                                          QT_TRANSLATE_NOOP("@default", "Add Drum Track"));
-      drum->setData(MusECore::Track::DRUM);
-      grp->addAction(drum);
+      if (populateAll || MusECore::AudioInput::visible()) {
+        QAction* ainput = addTrack->addAction(QIcon(*addtrack_audioinputIcon),
+                                              qApp->translate("@default", QT_TRANSLATE_NOOP("@default", "Add Audio Input")));
+        ainput->setData(MusECore::Track::AUDIO_INPUT);
+        grp->addAction(ainput);
+      }
 
+      if (populateAll || MusECore::AudioAux::visible()) {
+        QAction* aaux = addTrack->addAction(QIcon(*addtrack_auxsendIcon),
+                                            qApp->translate("@default", QT_TRANSLATE_NOOP("@default", "Add Aux Send")));
+        aaux->setData(MusECore::Track::AUDIO_AUX);
+        grp->addAction(aaux);
+      }
 
-      QAction* newdrum = addTrack->addAction(QIcon(*addtrack_drumtrackIcon),
-                                          QT_TRANSLATE_NOOP("@default", "Add New Style Drum Track"));
-      newdrum->setData(MusECore::Track::NEW_DRUM);
-      grp->addAction(newdrum);
+      if (populateAll || MusECore::SynthI::visible()) {
+        // Create a sub-menu and fill it with found synth types. Make addTrack the owner.
+        QMenu* synp = populateAddSynth(addTrack);
+        synp->setIcon(*synthIcon);
+        synp->setTitle(qApp->translate("@default", QT_TRANSLATE_NOOP("@default", "Add Synth")));
 
+        // Add the sub-menu to the given menu.
+        addTrack->addMenu(synp);
+      }
 
-      QAction* wave = addTrack->addAction(QIcon(*addtrack_wavetrackIcon),
-                                          QT_TRANSLATE_NOOP("@default", "Add Wave Track"));
-      wave->setData(MusECore::Track::WAVE);
-      grp->addAction(wave);
+      //QObject::connect(addTrack, SIGNAL(triggered(QAction *)), MusEGlobal::song, SLOT(addNewTrack(QAction *)));
 
+      return grp;
+      }
+  
+//---------------------------------------------------------
+//   getFilterExtension
+//---------------------------------------------------------
 
-      QAction* aoutput = addTrack->addAction(QIcon(*addtrack_audiooutputIcon),
-                                             QT_TRANSLATE_NOOP("@default", "Add Audio Output"));
-      aoutput->setData(MusECore::Track::AUDIO_OUTPUT);
-      grp->addAction(aoutput);
+QString getFilterExtension(const QString &filter)
+{
+  //
+  // Return the first extension found. Must contain at least one * character.
+  //
+  
+  int pos = filter.indexOf('*');
+  if(pos == -1)
+    return QString(); 
+  
+  QString filt;
+  int len = filter.length();
+  ++pos;
+  for( ; pos < len; ++pos)
+  {
+    QChar c = filter[pos];
+    if((c == ')') || (c == ';') || (c == ',') || (c == ' '))
+      break; 
+    filt += filter[pos];
+  }
+  return filt;
+}
 
+QStringList localizedStringListFromCharArray(const char** array, const char* context)
+{
+  QStringList temp;
+  for (int i=0;array[i];i++)
+    temp << qApp->translate(context, array[i]);
+  
+  return temp;
+}
 
-      QAction* agroup = addTrack->addAction(QIcon(*addtrack_audiogroupIcon),
-                                            QT_TRANSLATE_NOOP("@default", "Add Audio Group"));
-      agroup->setData(MusECore::Track::AUDIO_GROUP);
-      grp->addAction(agroup);
+QString browseProjectFolder(QWidget* parent)
+{
+  QString path;
+  if(!MusEGlobal::config.projectBaseFolder.isEmpty())
+  {  
+    QDir d(MusEGlobal::config.projectBaseFolder);
+    path = d.absolutePath();
+  }
+  
+  QString dir = QFileDialog::getExistingDirectory(parent, qApp->tr("Select project directory"), path);
+  if(dir.isEmpty())
+    dir = MusEGlobal::config.projectBaseFolder;
+  //  projDirLineEdit->setText(dir);
+  //return QFileDialog::getExistingDirectory(this, qApp.tr("Select project directory"), path);
+  return dir;
+}
 
+QString projectTitleFromFilename(QString filename)
+{
+  int idx;
+  idx = filename.lastIndexOf(".med.bz2", -1, Qt::CaseInsensitive);
+  if(idx == -1)
+    idx = filename.lastIndexOf(".med.gz", -1, Qt::CaseInsensitive);
+  if(idx == -1)
+    idx = filename.lastIndexOf(".med", -1, Qt::CaseInsensitive);
+   
+  if(idx != -1)
+    filename.truncate(idx);
+  
+  QFileInfo fi(filename);
 
-      QAction* ainput = addTrack->addAction(QIcon(*addtrack_audioinputIcon),
-                                            QT_TRANSLATE_NOOP("@default", "Add Audio Input"));
-      ainput->setData(MusECore::Track::AUDIO_INPUT);
-      grp->addAction(ainput);
+  //return fi.baseName();
+  return fi.fileName();
+}
+
+QString projectPathFromFilename(QString filename)
+{
+  QFileInfo fi(filename);
+  return QDir::cleanPath(fi.absolutePath());
+}
+
+QString projectExtensionFromFilename(QString filename)
+{
+  int idx;
+  idx = filename.lastIndexOf(".med.bz2", -1, Qt::CaseInsensitive);
+  if(idx == -1)
+    idx = filename.lastIndexOf(".med.gz", -1, Qt::CaseInsensitive);
+  if(idx == -1)
+    idx = filename.lastIndexOf(".med", -1, Qt::CaseInsensitive);
+  if(idx == -1)
+    idx = filename.lastIndexOf(".bz2", -1, Qt::CaseInsensitive);
+  if(idx == -1)
+    idx = filename.lastIndexOf(".gz", -1, Qt::CaseInsensitive);
+   
+  return (idx == -1) ? QString() : filename.right(filename.size() - idx);
+}
+
+QString getUniqueUntitledName()
+{
+  QString filename("untitled");
+  //QTemporaryFile tf(MusEGlobal::config.projectBaseFolder +"/" + s + "XXXXXX.med");
+  //if(tf.open())
+  //  s = MusEGui::projectTitleFromFilename(tf.fileName());
+  
+  QString fbase(MusEGlobal::config.projectBaseFolder);
+  
+  QString nfb = fbase;
+  if(MusEGlobal::config.projectStoreInFolder) 
+    nfb += "/" + filename;
+  QFileInfo fi(nfb + "/" + filename + ".med");  // TODO p4.0.40 Check other extensions.
+  if(!fi.exists())
+    //return filename;
+    return fi.filePath();
+
+  // Find a new filename
+  QString nfn = filename;  
+  int idx;
+  for (idx=2; idx<10000; idx++) {
+      QString num = QString::number(idx);
+      nfn = filename + "_" + num;
+      nfb = fbase;
+      if(MusEGlobal::config.projectStoreInFolder) 
+        nfb += "/" + nfn;
+      QFileInfo fi(nfb + "/" + nfn + ".med");
+      if(!fi.exists())
+        //break;
+        return fi.filePath();
+  }    
+
+  //if(idx >= 10000)
+    printf("MusE error: Could not make untitled project name (10000 or more untitled projects in project dir - clean up!\n");
+  
+  //return nfn;
+    
+  nfb = fbase;
+  if(MusEGlobal::config.projectStoreInFolder) 
+    nfb += "/" + filename;
+  return nfb + "/" + filename + ".med";
+}
 
 
-      QAction* aaux = addTrack->addAction(QIcon(*addtrack_auxsendIcon),
-                                          QT_TRANSLATE_NOOP("@default", "Add Aux Send"));
-      aaux->setData(MusECore::Track::AUDIO_AUX);
-      grp->addAction(aaux);
+#if 1
 
-      // Create a sub-menu and fill it with found synth types. Make addTrack the owner.
-      QMenu* synp = populateAddSynth(addTrack);
-      synp->setIcon(*synthIcon);
-      synp->setTitle(QT_TRANSLATE_NOOP("@default", "Add Synth"));
+// -------------------------------------------------------------------------------------------------------
+// populateMidiPorts()
+// This version creats separate devices for input and output ports. 
+// It does not attempt to pair them together.
+// -------------------------------------------------------------------------------------------------------
+void populateMidiPorts()
+{
+  if(!MusEGlobal::checkAudioDevice())
+    return;
 
-      // Add the sub-menu to the given menu.
-      addTrack->addMenu(synp);
+  MusECore::MidiDevice* dev = 0;
+  
+  int port_num = 0;
+  
+  // If Jack is running, prefer Jack midi devices over ALSA.
+  if(MusEGlobal::audioDevice->deviceType() == MusECore::AudioDevice::JACK_AUDIO)  
+  {
+    std::list<QString> sl;
+    sl = MusEGlobal::audioDevice->inputPorts(true, 1);  // Ask for second aliases.
+    for(std::list<QString>::iterator i = sl.begin(); i != sl.end(); ++i)
+    {
+      dev = MusECore::MidiJackDevice::createJackMidiDevice(*i, 1); 
+      if(dev)
+      {
+        //printf("populateMidiPorts Created jack writeable device: %s\n", dev->name().toLatin1().constData()); 
+        //dev->setOpenFlags(1);
+        MusEGlobal::midiSeq->msgSetMidiDevice(&MusEGlobal::midiPorts[port_num], dev);
+        MusECore::Route srcRoute(dev, -1);
+        MusECore::Route dstRoute(*i, true, -1, MusECore::Route::JACK_ROUTE);
+        MusEGlobal::audio->msgAddRoute(srcRoute, dstRoute);
+        if(++port_num == MIDI_PORTS)
+          return;
+      }  
+    }
+    
+    sl = MusEGlobal::audioDevice->outputPorts(true, 1); // Ask for second aliases.
+    for(std::list<QString>::iterator i = sl.begin(); i != sl.end(); ++i)
+    {
+      dev = MusECore::MidiJackDevice::createJackMidiDevice(*i, 2); 
+      if(dev)
+      {
+        //printf("populateMidiPorts Created jack readable device: %s\n", dev->name().toLatin1().constData()); 
+        //dev->setOpenFlags(2);
+        MusEGlobal::midiSeq->msgSetMidiDevice(&MusEGlobal::midiPorts[port_num], dev);
+        MusECore::Route srcRoute(*i, false, -1, MusECore::Route::JACK_ROUTE);
+        MusECore::Route dstRoute(dev, -1);
+        MusEGlobal::audio->msgAddRoute(srcRoute, dstRoute);
+        if(++port_num == MIDI_PORTS)
+          return;
+      }  
+    }
+  }
+  else
+  // If Jack is not running, use ALSA devices.
+  if(MusEGlobal::audioDevice->deviceType() == MusECore::AudioDevice::DUMMY_AUDIO)  
+  {
+    for(MusECore::iMidiDevice i = MusEGlobal::midiDevices.begin(); i != MusEGlobal::midiDevices.end(); ++i) 
+    {
+      if((*i)->deviceType() != MusECore::MidiDevice::ALSA_MIDI)
+        continue;
+      dev = *i;
+      // Select only sensible devices first - not thru etc.
+      //if( ... )
+      //  continue;
       
-      //QObject::connect(addTrack, SIGNAL(triggered(QAction *)), MusEGlobal::song, SLOT(addNewTrack(QAction *)));
+      //dev->setOpenFlags(1);
+      MusEGlobal::midiSeq->msgSetMidiDevice(&MusEGlobal::midiPorts[port_num], dev);
+        
+      if(++port_num == MIDI_PORTS)
+        return;
+    }
 
-      return grp;
+    //for(MusECore::iMidiDevice i = MusEGlobal::midiDevices.begin(); i != MusEGlobal::midiDevices.end(); ++i) 
+    //{
+    //  if((*i)->deviceType() != MusECore::MidiDevice::ALSA_MIDI)
+    //    continue;
+    //  // Select the ones ignored in the first pass.
+    //  if(!  ... )
+    //    continue;
+    //    
+    //  dev->setOpenFlags(1);
+    //  MusEGlobal::midiSeq->msgSetMidiDevice(port_num, dev);
+    //    
+    //  if(++port_num == MIDI_PORTS)
+    //    return;
+    //}
+  }
+    
+  //MusEGlobal::muse->changeConfig(true);     // save configuration file
+  //MusEGlobal::song->update();
+  
+}
+
+#else // this code is disabled
+
+DISABLED AND MAYBE OUT-OF-DATE CODE!
+the code below is disabled for a longer period of time,
+there were certain changes and merges. dunno if that code
+works at all. before activating it again, intensively
+verify whether its still okay!
+
+// -------------------------------------------------------------------------------------------------------
+// populateMidiPorts()
+// This version worked somewhat well with system devices. 
+// But no, it is virtually impossible to tell from the names whether ports should be paired.
+// There is too much room for error - what markers to look for ("capture_"/"playback_") etc.
+// It works kind of OK with 'seq' Jack Midi ALSA devices, but not for 'raw' which have a different
+//  naming structure ("in-hw-0-0-0"/"out-hw-0-0-0").
+// It also fails to combine if the ports were named by a client app, for example another instance of MusE.
+// -------------------------------------------------------------------------------------------------------
+
+void populateMidiPorts()
+{
+  if(!MusEGlobal::checkAudioDevice())
+    return;
+
+  MusECore::MidiDevice* dev = 0;
+  
+  int port_num = 0;
+  
+  // If Jack is running, prefer Jack midi devices over ALSA.
+  if(MusEGlobal::audioDevice->deviceType() == MusECore::AudioDevice::JACK_AUDIO)  
+  {
+    std::list<QString> wsl;
+    std::list<QString> rsl;
+    //wsl = MusEGlobal::audioDevice->inputPorts(true, 1);  // Ask for second aliases.
+    wsl = MusEGlobal::audioDevice->inputPorts(true, 0);  // Ask for first aliases.
+    //rsl = MusEGlobal::audioDevice->outputPorts(true, 1); // Ask for second aliases.
+    rsl = MusEGlobal::audioDevice->outputPorts(true, 0); // Ask for first aliases.
+
+    for(std::list<QString>::iterator wi = wsl.begin(); wi != wsl.end(); ++wi)
+    {
+      QString ws = *wi;
+      int y = ws.lastIndexOf("_");
+      if(y >= 1)
+      {  
+        int x = ws.lastIndexOf("_", y-1);
+        if(x >= 0)
+          ws.remove(x, y - x);
+      }
+      
+      
+      bool match_found = false;
+      for(std::list<QString>::iterator ri = rsl.begin(); ri != rsl.end(); ++ri)
+      {
+        QString rs = *ri;
+        int y = rs.lastIndexOf("_");
+        if(y >= 1)
+        {  
+          int x = rs.lastIndexOf("_", y-1);
+          if(x >= 0)
+            rs.remove(x, y - x);
+        }
+        
+        // Do we have a matching pair?
+        if(rs == ws)
+        {
+          // Would like to remove the client name, but no, we need it as a distinguishing identifier.
+          //int z = ws.indexOf(":");
+          //if(z >= 0)
+          //  ws.remove(0, z + 1);
+          
+          dev = MusECore::MidiJackDevice::createJackMidiDevice(ws, 3); 
+          if(dev)
+          {
+            //printf("populateMidiPorts Created jack writeable/readable device: %s\n", dev->name().toLatin1().constData()); 
+            //dev->setOpenFlags(1);
+            MusEGlobal::midiSeq->msgSetMidiDevice(&MusEGlobal::midiPorts[port_num], dev);
+            MusECore::Route devRoute(dev, -1);
+            MusECore::Route wdstRoute(*wi, true, -1, MusECore::Route::JACK_ROUTE);
+            MusECore::Route rsrcRoute(*ri, false, -1, MusECore::Route::JACK_ROUTE);
+            MusEGlobal::audio->msgAddRoute(devRoute, wdstRoute);
+            MusEGlobal::audio->msgAddRoute(rsrcRoute, devRoute);
+            if(++port_num == MIDI_PORTS)
+              return;
+          }  
+          
+          rsl.erase(ri);  // Done with this read port. Remove.
+          match_found = true;
+          break;
+        }
+      }  
+      
+      if(!match_found)
+      {
+        // No match was found. Create a single writeable device.
+        QString s = *wi;
+        // Would like to remove the client name, but no, we need it as a distinguishing identifier.
+        //int z = s.indexOf(":");
+        //if(z >= 0)
+        //  s.remove(0, z + 1);
+        dev = MusECore::MidiJackDevice::createJackMidiDevice(s, 1); 
+        if(dev)
+        {
+          //printf("populateMidiPorts Created jack writeable device: %s\n", dev->name().toLatin1().constData()); 
+          //dev->setOpenFlags(1);
+          MusEGlobal::midiSeq->msgSetMidiDevice(&MusEGlobal::midiPorts[port_num], dev);
+          MusECore::Route srcRoute(dev, -1);
+          MusECore::Route dstRoute(*wi, true, -1, MusECore::Route::JACK_ROUTE);
+          MusEGlobal::audio->msgAddRoute(srcRoute, dstRoute);
+          if(++port_num == MIDI_PORTS)
+            return;
+        }  
       }
+    }
+
+    // Create the remaining readable ports as single readable devices.
+    for(std::list<QString>::iterator ri = rsl.begin(); ri != rsl.end(); ++ri)
+    {
+      QString s = *ri;
+      // Would like to remove the client name, but no, we need it as a distinguishing identifier.
+      //int z = s.indexOf(":");
+      //if(z >= 0)
+      //  s.remove(0, z + 1);
+      dev = MusECore::MidiJackDevice::createJackMidiDevice(s, 2); 
+      if(dev)
+      {
+        //printf("populateMidiPorts Created jack readable device: %s\n", dev->name().toLatin1().constData()); 
+        //dev->setOpenFlags(2);
+        MusEGlobal::midiSeq->msgSetMidiDevice(&MusEGlobal::midiPorts[port_num], dev);
+        MusECore::Route srcRoute(*ri, false, -1, MusECore::Route::JACK_ROUTE);
+        MusECore::Route dstRoute(dev, -1);
+        MusEGlobal::audio->msgAddRoute(srcRoute, dstRoute);
+        if(++port_num == MIDI_PORTS)
+          return;
+      }  
+    }
+  }
+  else
+  // If Jack is not running, use ALSA devices.
+  if(MusEGlobal::audioDevice->deviceType() == MusECore::AudioDevice::DUMMY_AUDIO)  
+  {
+    for(MusECore::iMidiDevice i = MusEGlobal::midiDevices.begin(); i != MusEGlobal::midiDevices.end(); ++i) 
+    {
+      if((*i)->deviceType() != MusECore::MidiDevice::ALSA_MIDI)
+        continue;
+      dev = *i;
+      // Select only sensible devices first - not thru etc.
+      //if( ... )
+      //  continue;
+      
+      //dev->setOpenFlags(1);
+      MusEGlobal::midiSeq->msgSetMidiDevice(&MusEGlobal::midiPorts[port_num], dev);
+        
+      if(++port_num == MIDI_PORTS)
+        return;
+    }
+
+    //for(MusECore::iMidiDevice i = MusEGlobal::midiDevices.begin(); i != MusEGlobal::midiDevices.end(); ++i) 
+    //{
+    //  if((*i)->deviceType() != MusECore::MidiDevice::ALSA_MIDI)
+    //    continue;
+    //  // Select the ones ignored in the first pass.
+    //  if(!  ... )
+    //    continue;
+    //    
+    //  dev->setOpenFlags(1);
+    //  MusEGlobal::midiSeq->msgSetMidiDevice(port_num, dev);
+    //    
+    //  if(++port_num == MIDI_PORTS)
+    //    return;
+    //}
+  }
+    
+  //MusEGlobal::muse->changeConfig(true);     // save configuration file
+  //MusEGlobal::song->update();
+  
+}
+#endif   // populateMidiPorts
+
 
 } // namespace MusEGui
+
diff --git a/muse2/muse/helper.h b/muse2/muse/helper.h
index a051cd15..ad531fae 100644
--- a/muse2/muse/helper.h
+++ b/muse2/muse/helper.h
@@ -25,6 +25,7 @@
 
 #include <set>
 #include <QSet>
+#include <QStringList>
 
 #include "drummap.h"
 
@@ -52,7 +53,15 @@ QSet<Part*> parts_at_tick(unsigned tick, const QSet<Track*>& tracks);
 
 namespace MusEGui {
 QMenu* populateAddSynth(QWidget* parent);
-QActionGroup* populateAddTrack(QMenu* addTrack);
+QActionGroup* populateAddTrack(QMenu* addTrack, bool populateAll=false);
+QStringList localizedStringListFromCharArray(const char** array, const char* context);
+QString getFilterExtension(const QString &filter);
+QString browseProjectFolder(QWidget* parent = 0);
+QString projectTitleFromFilename(QString filename);
+QString projectPathFromFilename(QString filename);
+QString projectExtensionFromFilename(QString filename);
+QString getUniqueUntitledName();
+void populateMidiPorts();
 } 
 
 #endif
diff --git a/muse2/muse/importmidi.cpp b/muse2/muse/importmidi.cpp
index 86738fe4..bd3c8a9f 100644
--- a/muse2/muse/importmidi.cpp
+++ b/muse2/muse/importmidi.cpp
@@ -21,7 +21,6 @@
 //
 //=========================================================
 
-#include <assert.h>
 #include <errno.h>
 #include <values.h>
 
@@ -418,7 +417,8 @@ void MusE::processTrack(MusECore::MidiTrack* track)
             i->second.dump();
             }
       // all events should be processed:
-      assert(tevents->empty());
+      if (!tevents->empty())
+        printf("THIS SHOULD NEVER HAPPEN: not all events processed at the end of MusE::processTrack()!\n");
       }
 
 //---------------------------------------------------------
diff --git a/muse2/muse/instruments/editinstrument.cpp b/muse2/muse/instruments/editinstrument.cpp
index 742e0626..b90b872e 100644
--- a/muse2/muse/instruments/editinstrument.cpp
+++ b/muse2/muse/instruments/editinstrument.cpp
@@ -407,27 +407,10 @@ void EditInstrument::saveAs()
       
       if(!QDir(MusEGlobal::museUserInstruments).exists())
       {
-        if(QMessageBox::question(this,
-            tr("MusE:"),
-            tr("The user instrument directory\n%1\ndoes not exist yet. Create it now?\n").arg(MusEGlobal::museUserInstruments) +
-              tr("(You can change the user instruments directory at Settings->Global Settings->Midi)"),
-            QMessageBox::Ok | QMessageBox::Default,
-            QMessageBox::Cancel | QMessageBox::Escape,
-            Qt::NoButton) == QMessageBox::Ok)
-        {
-          if(QDir().mkdir(MusEGlobal::museUserInstruments))
-            printf("Created user instrument directory: %s\n", MusEGlobal::museUserInstruments.toLatin1().constData());
-          else
-          {
-            printf("Unable to create user instrument directory: %s\n", MusEGlobal::museUserInstruments.toLatin1().constData());
-            QMessageBox::critical(this, tr("MusE:"), tr("Unable to create user instrument directory '%1'").arg(MusEGlobal::museUserInstruments));
-            //return;
-            path = MusEGlobal::museUser;
-          }
-        } 
-        else 
-        //  return;  
-          path = MusEGlobal::museUser;
+        printf("MusE Error! User instrument directory: %s does not exist. Should be created at startup!\n", MusEGlobal::museUserInstruments.toLatin1().constData());
+        
+        //path = MusEGlobal::museUser;
+        //path = MusEGlobal::configPath;  
       }
         
       //if (instrument->filePath().isEmpty())
@@ -699,27 +682,10 @@ void EditInstrument::fileSaveAs()
       
       if(!QDir(MusEGlobal::museUserInstruments).exists())
       {
-        if(QMessageBox::question(this,
-            tr("MusE:"),
-            tr("The user instrument directory\n%1\ndoes not exist yet. Create it now?\n").arg(MusEGlobal::museUserInstruments) +
-              tr("(You can change the user instruments directory at Settings->Global Settings->Midi)"),
-            QMessageBox::Ok | QMessageBox::Default,
-            QMessageBox::Cancel | QMessageBox::Escape,
-            Qt::NoButton) == QMessageBox::Ok)
-        {
-          if(QDir().mkdir(MusEGlobal::museUserInstruments))
-            printf("Created user instrument directory: %s\n", MusEGlobal::museUserInstruments.toLatin1().constData());
-          else
-          {
-            printf("Unable to create user instrument directory: %s\n", MusEGlobal::museUserInstruments.toLatin1().constData());
-            QMessageBox::critical(this, tr("MusE:"), tr("Unable to create user instrument directory '%1'").arg(MusEGlobal::museUserInstruments));
-            //return;
-            path = MusEGlobal::museUser;
-          }
-        } 
-        else 
-        //  return;  
-          path = MusEGlobal::museUser;
+        printf("MusE Error! User instrument directory: %s does not exist. Should be created at startup!\n", MusEGlobal::museUserInstruments.toLatin1().constData());
+        
+        //path = MusEGlobal::museUser;
+        //path = MusEGlobal::configPath;  
       }
       path += QString("/%1.idf").arg(so);
       
diff --git a/muse2/muse/instruments/minstrument.cpp b/muse2/muse/instruments/minstrument.cpp
index c479ebc6..a01903ae 100644
--- a/muse2/muse/instruments/minstrument.cpp
+++ b/muse2/muse/instruments/minstrument.cpp
@@ -932,15 +932,11 @@ QString MidiInstrument::getPatchName(int channel, int prog, MType mode, bool dru
       return "<unknown>";
       }
 
-} // namespace MusECore
-
-namespace MusEGui {
-
 //---------------------------------------------------------
 //   populatePatchPopup
 //---------------------------------------------------------
 
-void populatePatchPopup(MusECore::MidiInstrument* midiInstrument, PopupMenu* menu, int chan, MType songType, bool drum)
+void MidiInstrument::populatePatchPopup(MusEGui::PopupMenu* menu, int chan, MType songType, bool drum)
       {
       menu->clear();
       int mask = 0;
@@ -952,7 +948,7 @@ void populatePatchPopup(MusECore::MidiInstrument* midiInstrument, PopupMenu* men
               if(drumchan)
               {
                 int id = (0xff << 16) + (0xff << 8) + 0x00;  // First patch
-                QAction* act = menu->addAction(MusECore::gmdrumname);
+                QAction* act = menu->addAction(gmdrumname);
                 //act->setCheckable(true);
                 act->setData(id);
                 return;
@@ -961,16 +957,16 @@ void populatePatchPopup(MusECore::MidiInstrument* midiInstrument, PopupMenu* men
               break;
             case MT_UNKNOWN:  mask = 7; break;
             }
-      if (midiInstrument->groups()->size() > 1) {
-            for (MusECore::ciPatchGroup i = midiInstrument->groups()->begin(); i != midiInstrument->groups()->end(); ++i) {
-                  MusECore::PatchGroup* pgp = *i;
+      if (pg.size() > 1) {
+            for (ciPatchGroup i = pg.begin(); i != pg.end(); ++i) {
+                  PatchGroup* pgp = *i;
                   //QMenu* pm = menu->addMenu(pgp->name);
-                  PopupMenu* pm = new PopupMenu(pgp->name, menu, menu->stayOpen());  // Use the parent stayOpen here.
+                  MusEGui::PopupMenu* pm = new MusEGui::PopupMenu(pgp->name, menu, menu->stayOpen());  // Use the parent stayOpen here.
                   menu->addMenu(pm);
                   pm->setFont(MusEGlobal::config.fonts[0]);
-                  const MusECore::PatchList& pl = pgp->patches;
-                  for (MusECore::ciPatch ipl = pl.begin(); ipl != pl.end(); ++ipl) {
-                        const MusECore::Patch* mp = *ipl;
+                  const PatchList& pl = pgp->patches;
+                  for (ciPatch ipl = pl.begin(); ipl != pl.end(); ++ipl) {
+                        const Patch* mp = *ipl;
                         if ((mp->typ & mask) && 
                             ((drum && songType != MT_GM) || 
                             (mp->drum == drumchan)) )  
@@ -985,11 +981,11 @@ void populatePatchPopup(MusECore::MidiInstrument* midiInstrument, PopupMenu* men
                         }
                   }
             }
-      else if (midiInstrument->groups()->size() == 1 ){
+      else if (pg.size() == 1 ){
             // no groups
-            const MusECore::PatchList& pl = midiInstrument->groups()->front()->patches;
-            for (MusECore::ciPatch ipl = pl.begin(); ipl != pl.end(); ++ipl) {
-                  const MusECore::Patch* mp = *ipl;
+            const PatchList& pl = pg.front()->patches;
+            for (ciPatch ipl = pl.begin(); ipl != pl.end(); ++ipl) {
+                  const Patch* mp = *ipl;
                   if (mp->typ & mask) {
                         int id = ((mp->hbank & 0xff) << 16)
                                  + ((mp->lbank & 0xff) << 8) + (mp->prog & 0xff);
@@ -999,6 +995,7 @@ void populatePatchPopup(MusECore::MidiInstrument* midiInstrument, PopupMenu* men
                         }
                   }
             }
-      }
 
-} // namespace MusEGui
+    }
+
+} // namespace MusECore
diff --git a/muse2/muse/instruments/minstrument.h b/muse2/muse/instruments/minstrument.h
index 3a645d7f..385e67b4 100644
--- a/muse2/muse/instruments/minstrument.h
+++ b/muse2/muse/instruments/minstrument.h
@@ -143,7 +143,7 @@ class MidiInstrument {
       virtual void reset(int, MType);
       virtual QString getPatchName(int,int,MType,bool);
       //virtual void populatePatchPopup(QMenu*, int, MType, bool);
-      //virtual void populatePatchPopup(MusEGui::PopupMenu*, int, MType, bool);
+      virtual void populatePatchPopup(MusEGui::PopupMenu*, int, MType, bool);
       void read(Xml&);
       void write(int level, Xml&);
       
@@ -171,8 +171,8 @@ extern void removeMidiInstrument(const MidiInstrument* instr);
 
 } // namespace MusECore
 
-namespace MusEGui {
-extern void populatePatchPopup(MusECore::MidiInstrument*, PopupMenu*, int, MType, bool);
-}
+//namespace MusEGui {
+//extern void populatePatchPopup(MusECore::MidiInstrument*, PopupMenu*, int, MType, bool);
+//}
 #endif
 
diff --git a/muse2/muse/liste/editevent.cpp b/muse2/muse/liste/editevent.cpp
index 32a328a8..cc52d26e 100644
--- a/muse2/muse/liste/editevent.cpp
+++ b/muse2/muse/liste/editevent.cpp
@@ -871,20 +871,17 @@ void EditCtrlDialog::instrPopup()
       int port    = track->outPort();
       MusECore::MidiInstrument* instr = MusEGlobal::midiPorts[port].instrument();
       
-      ///instr->populatePatchPopup(pop, channel, MusEGlobal::song->mtype(), track->type() == MusECore::Track::DRUM);
       //QMenu* pup = new QMenu(this);
       MusEGui::PopupMenu* pup = new MusEGui::PopupMenu(this);
-      populatePatchPopup(instr, pup, channel, MusEGlobal::song->mtype(), track->isDrumTrack());
+      //populatePatchPopup(instr, pup, channel, MusEGlobal::song->mtype(), track->isDrumTrack());
+      instr->populatePatchPopup(pup, channel, MusEGlobal::song->mtype(), track->isDrumTrack());
 
-      ///if(pop->actions().count() == 0)
-      ///  return;
       if(pup->actions().count() == 0)
       {
         delete pup;
         return;
       }  
       
-      ///QAction* rv = pop->exec(patchName->mapToGlobal(QPoint(10,5)));
       QAction* rv = pup->exec(patchName->mapToGlobal(QPoint(10,5)));
       if (rv) {
             val = rv->data().toInt();
diff --git a/muse2/muse/liste/listedit.cpp b/muse2/muse/liste/listedit.cpp
index eadfa68c..6795cedb 100644
--- a/muse2/muse/liste/listedit.cpp
+++ b/muse2/muse/liste/listedit.cpp
@@ -45,6 +45,7 @@
 #include "event.h"
 #include "midiport.h"
 #include "midictrl.h"
+#include "app.h"
 
 namespace MusEGui {
 
@@ -183,7 +184,8 @@ static QString midiMetaComment(const MusECore::Event& ev)
 
 void ListEdit::closeEvent(QCloseEvent* e)
       {
-      emit deleted(static_cast<TopWin*>(this));
+      _isDeleting = true;  // Set flag so certain signals like songChanged, which may cause crash during delete, can be ignored.
+      emit isDeleting(static_cast<TopWin*>(this));
       e->accept();
       }
 
@@ -193,6 +195,9 @@ void ListEdit::closeEvent(QCloseEvent* e)
 
 void ListEdit::songChanged(int type)
       {
+      if(_isDeleting)  // Ignore while while deleting to prevent crash.
+        return;
+        
       if (type == 0)
             return;
       if (type & (SC_PART_REMOVED | SC_PART_MODIFIED
@@ -465,6 +470,8 @@ QString EventListItem::text(int col) const
 ListEdit::ListEdit(MusECore::PartList* pl)
    : MidiEditor(TopWin::LISTE, 0, pl)
       {
+      selectedTick=0;
+      
       insertItems = new QActionGroup(this);
       insertItems->setExclusive(false);
       insertNote = new QAction(QIcon(*note1Icon), tr("insert Note"), insertItems);
@@ -587,7 +594,6 @@ ListEdit::ListEdit(MusECore::PartList* pl)
       mainGrid->setColumnStretch(0, 100);
       mainGrid->addWidget(liste, 1, 0, 2, 1);
       connect(MusEGlobal::song, SIGNAL(songChanged(int)), SLOT(songChanged(int)));
-      songChanged(-1);
 
       if(pl->empty())
       {
@@ -605,10 +611,14 @@ ListEdit::ListEdit(MusECore::PartList* pl)
           curPartId = -1;
         }
       }
+
+      songChanged(-1);
       
       initShortcuts();
       
       setWindowTitle("MusE: List Editor");
+      
+      MusEGlobal::muse->topwinMenuInited(this);
       }
 
 //---------------------------------------------------------
diff --git a/muse2/muse/liste/listedit.h b/muse2/muse/liste/listedit.h
index 7548fc86..1c0c1bd9 100644
--- a/muse2/muse/liste/listedit.h
+++ b/muse2/muse/liste/listedit.h
@@ -86,7 +86,7 @@ class ListEdit : public MidiEditor {
       void songChanged(int);
 
    signals:
-      void deleted(MusEGui::TopWin*);
+      void isDeleting(MusEGui::TopWin*);
 
    public:
       ListEdit(MusECore::PartList*);
diff --git a/muse2/muse/main.cpp b/muse2/muse/main.cpp
index 27a8926e..d946bf00 100644
--- a/muse2/muse/main.cpp
+++ b/muse2/muse/main.cpp
@@ -24,6 +24,8 @@
 #include <QApplication>
 #include <QDir>
 #include <QFile>
+#include <QFileInfo>
+#include <QFileInfoList>
 #include <QKeyEvent>
 #include <QMessageBox>
 #include <QLocale>
@@ -31,6 +33,8 @@
 #include <QTimer>
 #include <QTranslator>
 #include <QIcon>
+#include <QString>
+#include <QStringList>
 
 #include <sys/mman.h>
 #include <alsa/asoundlib.h>
@@ -41,6 +45,7 @@
 #include "audiodev.h"
 #include "gconfig.h"
 #include "globals.h"
+#include "helper.h"
 #include "icons.h"
 #include "sync.h"
 #include "functions.h"
@@ -267,9 +272,38 @@ int main(int argc, char* argv[])
       if (! cPath.exists())
             cPath.mkpath(".");
       
+      // Create user templates dir if it doesn't exist
+      QDir utemplDir = QDir(MusEGlobal::configPath + QString("/templates"));
+      if(!utemplDir.exists())
+      {  
+        utemplDir.mkpath(".");
+        // Support old versions: Copy existing templates over.
+        QDir old_utemplDir = QDir(QString(getenv("HOME")) + QString("/templates"));
+        // printf(" old templates dir:%s\n", (QString(getenv("HOME")) + QString("/templates")).toLatin1().constData()); 
+        if(old_utemplDir.exists())
+        {
+          //printf(" found old templates dir\n"); 
+          // We really just want these, even though it's possible other filenames were saved.
+          // Another application might have used that directory.
+          QStringList flt; flt << "*.med" << "*.med.gz" << "*.med.bz2" << "*.mid" << "*.midi" << "*.kar";
+          old_utemplDir.setNameFilters(flt);
+          
+          QFileInfoList fil = old_utemplDir.entryInfoList();
+          QFileInfo fi;
+          foreach(fi, fil)
+          {
+            QString fn = fi.fileName();
+            QFile f(fi.absoluteFilePath());
+            f.copy(utemplDir.absolutePath() + "/" + fn);
+            //printf(" copy old template to:%s result:%d\n", QString(utemplPath.absolutePath() + "/" + fn).toLatin1().constData(), rv); 
+          }
+        }
+      }
+      
       QFile cConf (MusEGlobal::configName);
       QFile cConfTempl (MusEGlobal::museGlobalShare + QString("/templates/MusE.cfg"));
-      if (! cConf.exists())
+      bool cConfExists = cConf.exists();
+      if (!cConfExists)
       {
         printf ("creating new config...\n");
         if (cConfTempl.copy(MusEGlobal::configName))
@@ -303,10 +337,51 @@ int main(int argc, char* argv[])
 
       MusEGui::init_function_dialogs(MusEGlobal::muse);
       MusEGui::initShortCuts();
+
       MusECore::readConfiguration();
 
-      MusEGlobal::museUserInstruments = MusEGlobal::config.userInstrumentsDir;
+      // Need to put a sane default here because we can't use ~ in the file name string.
+      if(!cConfExists)
+        MusEGlobal::config.projectBaseFolder = MusEGlobal::museUser + QString("/MusE");
 
+      //MusEGlobal::museUserInstruments = MusEGlobal::config.userInstrumentsDir;
+      
+      // Create user instruments dir if it doesn't exist
+      {
+        QString uinstrPath = MusEGlobal::configPath + QString("/instruments");
+        QDir uinstrDir = QDir(uinstrPath);
+        if(!uinstrDir.exists())
+          uinstrDir.mkpath(".");
+        
+        if(!MusEGlobal::config.userInstrumentsDir.isEmpty() && MusEGlobal::config.userInstrumentsDir != uinstrPath)  // Only if it is different.
+        {
+          // Support old versions: Copy existing instruments over.
+          QDir old_uinstrDir(MusEGlobal::config.userInstrumentsDir);
+          //printf(" old instruments dir:%s\n", MusEGlobal::config.userInstrumentsDir.toLatin1().constData()); 
+          if(old_uinstrDir.exists())
+          {
+            //printf(" found old instruments dir\n"); 
+            QStringList flt; flt << "*.idf";
+            old_uinstrDir.setNameFilters(flt);
+            
+            QFileInfoList fil = old_uinstrDir.entryInfoList();
+            QFileInfo fi;
+            foreach(fi, fil)
+            {
+              QString fn = fi.fileName();
+              QFile f(fi.absoluteFilePath());
+              QFile newf(uinstrDir.absolutePath() + "/" + fn);
+              if(!newf.exists())
+              {  
+                f.copy(newf.fileName());
+                //printf(" copy old instrument to:%s result:%d\n", newf.fileName().toLatin1().constData(), rv); 
+              }  
+            }
+          }
+        }  
+        MusEGlobal::museUserInstruments = uinstrPath;
+      }
+      
       if (MusEGlobal::config.useDenormalBias)
           printf("Denormal protection enabled.\n");
       // SHOW MUSE SPLASH SCREEN
@@ -324,7 +399,7 @@ int main(int argc, char* argv[])
                   stimer->start(6000);
                   }
             }
-      
+
       int i;
       
       QString optstr("ahvdDmMsP:Y:l:py");
@@ -393,6 +468,7 @@ int main(int argc, char* argv[])
       }
       */
       
+      
       AL::initDsp();
       
       if (MusEGlobal::debugMsg)
@@ -438,8 +514,7 @@ int main(int argc, char* argv[])
       else
             MusEGlobal::realTimeScheduling = MusEGlobal::audioDevice->isRealtime();
 
-      
-      // What unreliable nonsense. With Jack2 this reports true even if it is not running realtime. 
+      // ??? With Jack2 this reports true even if it is not running realtime. 
       // Jack says: "Cannot use real-time scheduling (RR/10)(1: Operation not permitted)". The kernel is non-RT.
       // I cannot seem to find a reliable answer to the question, even with dummy audio and system calls.
       //if (MusEGlobal::debugMsg) 
@@ -448,11 +523,7 @@ int main(int argc, char* argv[])
       MusEGlobal::useJackTransport.setValue(true);
       
       // setup the prefetch fifo length now that the segmentSize is known
-      // Changed by Tim. p3.3.17
-      // Changed to 4 *, JUST FOR TEST!!!
       MusEGlobal::fifoLength = 131072 / MusEGlobal::segmentSize;
-      //MusEGlobal::fifoLength = (131072 / MusEGlobal::segmentSize) * 4;
-      
       
       argc -= optind;
       ++argc;
@@ -486,7 +557,9 @@ int main(int argc, char* argv[])
             printf("locale de\n");
 	    MusEGlobal::hIsB = false;
             }
-
+      
+      MusEGui::retranslate_function_dialogs();
+      
       if (MusEGlobal::loadPlugins)
             MusECore::initPlugins();
 
@@ -496,7 +569,6 @@ int main(int argc, char* argv[])
       if(MusEGlobal::loadDSSI)
             MusECore::initDSSI();
       
-      // p3.3.39
       MusECore::initOSC();
       
       MusEGui::initIcons();
@@ -515,21 +587,19 @@ int main(int argc, char* argv[])
                   ++it;
                   }
             }
-
+            
       MusEGlobal::muse = new MusEGui::MusE(argc, &argv[optind]);
       app.setMuse(MusEGlobal::muse);
       MusEGlobal::muse->setWindowIcon(*MusEGui::museIcon);
       
-      
-      // Added by Tim. p3.3.22
       if (!MusEGlobal::debugMode) {
             if (mlockall(MCL_CURRENT | MCL_FUTURE))
                   perror("WARNING: Cannot lock memory:");
             }
       
       MusEGlobal::muse->show();
-      MusEGlobal::muse->seqStart();
-
+      MusEGlobal::muse->seqStart();  
+      
 #ifdef HAVE_LASH
       {
         MusEGui::lash_client = 0;
@@ -540,14 +610,28 @@ int main(int argc, char* argv[])
           MusEGui::lash_client = lash_init (lash_args, muse_name, lash_flags, LASH_PROTOCOL(2,0));
           lash_alsa_client_id (MusEGui::lash_client, snd_seq_client_id (MusECore::alsaSeq));
           if (!noAudio) {
-                // p3.3.38
-                //char *jack_name = ((JackAudioDevice*)MusEGlobal::audioDevice)->getJackName();
                 const char *jack_name = MusEGlobal::audioDevice->clientName();
                 lash_jack_client_name (MusEGui::lash_client, jack_name);
           }      
         }
       }
 #endif /* HAVE_LASH */
+
+      //--------------------------------------------------
+      // Auto-fill the midi ports, if appropriate.         p4.0.41
+      //--------------------------------------------------
+      if(argc < 2 && MusEGlobal::config.startMode == 1)
+      {  
+        MusEGui::populateMidiPorts();
+        //MusEGlobal::muse->changeConfig(true);     // save configuration file
+        //MusEGlobal::song->update();
+      }
+
+      //--------------------------------------------------
+      // Load the default song.                            
+      //--------------------------------------------------
+      MusEGlobal::muse->loadDefaultSong(argc, &argv[optind]);    // p4.0.41
+      
       QTimer::singleShot(100, MusEGlobal::muse, SLOT(showDidYouKnowDialog()));
       
       int rv = app.exec();
diff --git a/muse2/muse/marker/markerview.cpp b/muse2/muse/marker/markerview.cpp
index bc9e48b9..39ce4fc0 100644
--- a/muse2/muse/marker/markerview.cpp
+++ b/muse2/muse/marker/markerview.cpp
@@ -26,6 +26,7 @@
 #include "markerview.h"
 #include "xml.h"
 #include "globals.h"
+#include "app.h"
 #include "sync.h"
 #include "icons.h"
 #include "song.h"
@@ -157,7 +158,7 @@ void MarkerItem::setTick(unsigned v)
 
 void MarkerView::closeEvent(QCloseEvent* e)
       {
-      emit deleted(static_cast<TopWin*>(this));
+      emit isDeleting(static_cast<TopWin*>(this));
       emit closed();
       e->accept();
       }
@@ -296,6 +297,8 @@ MarkerView::MarkerView(QWidget* parent)
       
       updateList();
 
+      MusEGlobal::muse->topwinMenuInited(this);
+
       // work around for probable QT/WM interaction bug.
       // for certain window managers, e.g xfce, this window is
       // is displayed although not specifically set to show();
diff --git a/muse2/muse/marker/markerview.h b/muse2/muse/marker/markerview.h
index b50ab7a4..06e22daf 100644
--- a/muse2/muse/marker/markerview.h
+++ b/muse2/muse/marker/markerview.h
@@ -96,7 +96,7 @@ class MarkerView : public TopWin {
       void songChanged(int);
       
    signals:
-      void deleted(MusEGui::TopWin*);
+      void isDeleting(MusEGui::TopWin*);
       void closed();
 
    public:
diff --git a/muse2/muse/master/lmaster.cpp b/muse2/muse/master/lmaster.cpp
index bf31cc91..f461e1d3 100644
--- a/muse2/muse/master/lmaster.cpp
+++ b/muse2/muse/master/lmaster.cpp
@@ -27,6 +27,7 @@
 #include "xml.h"
 #include "song.h"
 #include "globals.h"
+#include "app.h"
 #include "audio.h"
 //#include "posedit.h"
 //#include "sigedit.h"
@@ -122,7 +123,9 @@ namespace MusEGui {
 
 void LMaster::closeEvent(QCloseEvent* e)
       {
-      emit deleted(static_cast<TopWin*>(this));
+      _isDeleting = true;  // Set flag so certain signals like songChanged, which may cause crash during delete, can be ignored.
+      
+      emit isDeleting(static_cast<TopWin*>(this));
       e->accept();
       }
 
@@ -132,6 +135,9 @@ void LMaster::closeEvent(QCloseEvent* e)
 
 void LMaster::songChanged(int type)
       {
+      if(_isDeleting)  // Ignore while while deleting to prevent crash.
+        return;
+      
       if (type & (SC_SIG | SC_TEMPO | SC_KEY ))
             updateList();
       }
@@ -281,6 +287,7 @@ LMaster::LMaster()
       connect(keyButton, SIGNAL(clicked()), SLOT(insertKey()));
 
       initShortcuts();
+      MusEGlobal::muse->topwinMenuInited(this);
       }
 
 //---------------------------------------------------------
diff --git a/muse2/muse/master/lmaster.h b/muse2/muse/master/lmaster.h
index 6bc90019..33b40f30 100644
--- a/muse2/muse/master/lmaster.h
+++ b/muse2/muse/master/lmaster.h
@@ -173,7 +173,7 @@ class LMaster : public MidiEditor {
       void configChanged();
 
    signals:
-      void deleted(MusEGui::TopWin*);
+      void isDeleting(MusEGui::TopWin*);
       void seekTo(int tick);
 
    public:
diff --git a/muse2/muse/master/master.cpp b/muse2/muse/master/master.cpp
index 50c3f518..02bef8a1 100644
--- a/muse2/muse/master/master.cpp
+++ b/muse2/muse/master/master.cpp
@@ -27,6 +27,8 @@
 #include <QEvent>
 #include <QMouseEvent>
 #include <QPainter>
+#include <QList>
+#include <QPair>
 
 #include "globals.h"
 #include "master.h"
@@ -52,6 +54,8 @@ Master::Master(MidiEditor* e, QWidget* parent, int xmag, int ymag)
       pos[0]  = 0;
       pos[1]  = 0;
       pos[2]  = 0;
+      drag = DRAG_OFF;
+      tool = MusEGui::PointerTool; // should be overridden soon anyway, but to be sure...
       setFocusPolicy(Qt::StrongFocus);  // Tim.
       setMouseTracking(true);
       connect(MusEGlobal::song, SIGNAL(posChanged(int, unsigned, bool)), this, SLOT(setPos(int, unsigned, bool)));
@@ -288,8 +292,8 @@ void Master::viewMouseReleaseEvent(QMouseEvent*)
 
 bool Master::deleteVal1(unsigned int x1, unsigned int x2)
       {
-      bool songChanged = false;
-
+      QList< QPair<int,int> > stuff_to_do;
+      
       MusECore::TempoList* tl = &MusEGlobal::tempomap;
       for (MusECore::iTEvent i = tl->begin(); i != tl->end(); ++i) {
             if (i->first < x1)
@@ -300,11 +304,17 @@ bool Master::deleteVal1(unsigned int x1, unsigned int x2)
             ++ii;
             if (ii != tl->end()) {
                   int tempo = ii->second->tempo;
-                  MusEGlobal::audio->msgDeleteTempo(i->first, tempo, false);
-                  songChanged = true;
+                  // changed by flo: postpone the actual delete operation
+                  // to avoid race conditions and invalidating the iterator
+                  //MusEGlobal::audio->msgDeleteTempo(i->first, tempo, false);
+                  stuff_to_do.append(QPair<int,int>(i->first, tempo));
                   }
             }
-      return songChanged;
+      
+      for (QList< QPair<int,int> >::iterator it=stuff_to_do.begin(); it!=stuff_to_do.end(); it++)
+        MusEGlobal::audio->msgDeleteTempo(it->first, it->second, false);
+      
+      return !stuff_to_do.empty();
       }
 
 void Master::deleteVal(int x1, int x2)
diff --git a/muse2/muse/master/masteredit.cpp b/muse2/muse/master/masteredit.cpp
index e9d669e1..f6169766 100644
--- a/muse2/muse/master/masteredit.cpp
+++ b/muse2/muse/master/masteredit.cpp
@@ -37,6 +37,7 @@
 #include "doublelabel.h"
 ///#include "sigedit.h"
 #include "globals.h"
+#include "app.h"
 
 #include <values.h>
 
@@ -59,7 +60,9 @@ int MasterEdit::_rasterInit = 0;
 
 void MasterEdit::closeEvent(QCloseEvent* e)
       {
-      emit deleted(static_cast<TopWin*>(this));
+      _isDeleting = true;  // Set flag so certain signals like songChanged, which may cause crash during delete, can be ignored.
+
+      emit isDeleting(static_cast<TopWin*>(this));
       e->accept();
       }
 
@@ -69,6 +72,9 @@ void MasterEdit::closeEvent(QCloseEvent* e)
 
 void MasterEdit::songChanged(int type)
       {
+      if(_isDeleting)  // Ignore while while deleting to prevent crash.
+        return;
+        
       if (type & SC_TEMPO) {
             int tempo = MusEGlobal::tempomap.tempo(MusEGlobal::song->cpos());
             curTempo->blockSignals(true);
@@ -154,7 +160,7 @@ MasterEdit::MasterEdit()
       info->addWidget(tempo);
 
       const char* rastval[] = {
-            QT_TRANSLATE_NOOP("@default", "Off"), "Bar", "1/2", "1/4", "1/8", "1/16"
+            QT_TRANSLATE_NOOP("MusEGui::MasterEdit", "Off"), QT_TRANSLATE_NOOP("MusEGui::MasterEdit", "Bar"), "1/2", "1/4", "1/8", "1/16"
             };
       rasterLabel = new MusEGui::LabelCombo(tr("Snap"), 0);
       rasterLabel->setFocusPolicy(Qt::NoFocus);
@@ -264,6 +270,7 @@ MasterEdit::MasterEdit()
       connect(canvas, SIGNAL(timeChanged(unsigned)),   SLOT(setTime(unsigned)));
 
       initTopwinState();
+      MusEGlobal::muse->topwinMenuInited(this);
       }
 
 //---------------------------------------------------------
diff --git a/muse2/muse/master/masteredit.h b/muse2/muse/master/masteredit.h
index fdf8dd71..835ca879 100644
--- a/muse2/muse/master/masteredit.h
+++ b/muse2/muse/master/masteredit.h
@@ -91,7 +91,7 @@ class MasterEdit : public MidiEditor {
 //      void tempoChanged(double);
 
    signals:
-      void deleted(MusEGui::TopWin*);
+      void isDeleting(MusEGui::TopWin*);
 
    public:
       MasterEdit();
diff --git a/muse2/muse/midi.cpp b/muse2/muse/midi.cpp
index d5ed119d..85a47ead 100644
--- a/muse2/muse/midi.cpp
+++ b/muse2/muse/midi.cpp
@@ -25,7 +25,6 @@
 #include <cmath>
 #include <errno.h>
 #include <values.h>
-#include <assert.h>
 
 #include "song.h"
 #include "midi.h"
@@ -1055,7 +1054,7 @@ void Audio::processMidi()
                                     {
                                       int pitch = ctl & 0x7f;            // pitch is now the incoming pitch
                                       pitch = track->map_drum_in(pitch); // pitch is now the mapped (recorded) pitch
-                                      event.setA(ctl & ~0xff  |  pitch); // map the drum ctrl's value accordingly
+                                      event.setA((ctl & ~0xff)  |  pitch); // map the drum ctrl's value accordingly
 
                                       if (MusEGlobal::config.newDrumRecordCondition & MusECore::DONT_REC_HIDDEN &&
                                           track->drummap_hidden()[pitch] )
diff --git a/muse2/muse/midictrl.cpp b/muse2/muse/midictrl.cpp
index 11849ce7..c477297e 100644
--- a/muse2/muse/midictrl.cpp
+++ b/muse2/muse/midictrl.cpp
@@ -21,7 +21,6 @@
 //
 //=========================================================
 
-#include <assert.h>
 #include <stdio.h>
 
 #include "midictrl.h"
@@ -241,7 +240,7 @@ QString midiCtrlName(int ctrl, bool fullyQualified)
 //---------------------------------------------------------
 
 MidiController::MidiController()
-   : _name(QString(QT_TRANSLATE_NOOP("@default", "Velocity")))
+   : _name(QString("Velocity"))
       {
       _num     = CTRL_VELOCITY;
       _minVal  = 0;
diff --git a/muse2/muse/midiedit/dcanvas.cpp b/muse2/muse/midiedit/dcanvas.cpp
index d024422c..bc8bbdb0 100644
--- a/muse2/muse/midiedit/dcanvas.cpp
+++ b/muse2/muse/midiedit/dcanvas.cpp
@@ -78,18 +78,18 @@ DEvent::DEvent(MusECore::Event e, MusECore::Part* p, int instr)
 //   addItem
 //---------------------------------------------------------
 
-void DrumCanvas::addItem(MusECore::Part* part, MusECore::Event& event)
+CItem* DrumCanvas::addItem(MusECore::Part* part, MusECore::Event& event)
       {
       if (signed(event.tick())<0) {
             printf("ERROR: trying to add event before current part!\n");
-            return;
+            return NULL;
       }
       
       int instr=pitch_and_track_to_instrument(event.pitch(), part->track());
       if (instr<0)
       {
         if (heavyDebugMsg) printf("trying to add event which is hidden or not in any part known to me\n");
-        return;
+        return NULL;
       }
       
       DEvent* ev = new DEvent(event, part, instr);
@@ -104,6 +104,8 @@ void DrumCanvas::addItem(MusECore::Part* part, MusECore::Event& event)
             //part = newPart;
             part->setLenTick(part->lenTick()+diff);
             }
+      
+      return ev;
       }
 
 //---------------------------------------------------------
diff --git a/muse2/muse/midiedit/dcanvas.h b/muse2/muse/midiedit/dcanvas.h
index 9053b3bf..0fd4c9e0 100644
--- a/muse2/muse/midiedit/dcanvas.h
+++ b/muse2/muse/midiedit/dcanvas.h
@@ -124,7 +124,7 @@ class DrumCanvas : public EventCanvas {
       void dragEnterEvent(QDragEnterEvent* event);
       void dragMoveEvent(QDragMoveEvent*);
       void dragLeaveEvent(QDragLeaveEvent*);
-      virtual void addItem(MusECore::Part*, MusECore::Event&);
+      virtual CItem* addItem(MusECore::Part*, MusECore::Event&);
       virtual void resizeEvent(QResizeEvent*);
       virtual void curPartChanged();
       int getNextStep(unsigned int pos, int basicStep, int stepSize=1);
diff --git a/muse2/muse/midiedit/drumedit.cpp b/muse2/muse/midiedit/drumedit.cpp
index 58875b4d..7adab525 100644
--- a/muse2/muse/midiedit/drumedit.cpp
+++ b/muse2/muse/midiedit/drumedit.cpp
@@ -53,6 +53,7 @@
 #include "vscale.h"
 #include "swidget.h"
 #include "globals.h"
+#include "app.h"
 #include "icons.h"
 #include "filedialog.h"
 #include "drummap.h"
@@ -139,6 +140,8 @@ void DrumEdit::setHeaderToolTips()
 
 void DrumEdit::closeEvent(QCloseEvent* e)
       {
+      _isDeleting = true;  // Set flag so certain signals like songChanged, which may cause crash during delete, can be ignored.
+
       QSettings settings("MusE", "MusE-qt");
       //settings.setValue("Drumedit/geometry", saveGeometry());
       settings.setValue("Drumedit/windowState", saveState());
@@ -149,7 +152,7 @@ void DrumEdit::closeEvent(QCloseEvent* e)
       _dlistWidthInit = *it; //There are only 2 values stored in the sizelist, size of dlist widget and dcanvas widget
       it++;
       _dcanvasWidthInit = *it;
-      emit deleted(static_cast<TopWin*>(this));
+      emit isDeleting(static_cast<TopWin*>(this));
       e->accept();
       }
 
@@ -590,6 +593,7 @@ DrumEdit::DrumEdit(MusECore::PartList* pl, QWidget* parent, const char* name, un
       
       
       initTopwinState();
+      MusEGlobal::muse->topwinMenuInited(this);
       }
 
 //---------------------------------------------------------
@@ -598,6 +602,9 @@ DrumEdit::DrumEdit(MusECore::PartList* pl, QWidget* parent, const char* name, un
 
 void DrumEdit::songChanged1(int bits)
       {
+        if(_isDeleting)  // Ignore while while deleting to prevent crash.
+          return;
+        
         if (bits & SC_SOLO)
         {
             toolbar->setSolo(canvas->track()->solo());
@@ -1007,12 +1014,15 @@ void DrumEdit::cmd(int cmd)
             case DrumCanvas::CMD_MODIFY_VELOCITY: modify_velocity(partlist_to_set(parts())); break;
             case DrumCanvas::CMD_CRESCENDO: crescendo(partlist_to_set(parts())); break;
             case DrumCanvas::CMD_QUANTIZE:
+                  {
+                  int raster = MusEGui::rasterVals[MusEGui::quantize_dialog->raster_index];
                   if (quantize_dialog->exec())
                         quantize_notes(partlist_to_set(parts()), quantize_dialog->range, 
-                                       (MusEGlobal::config.division*4)/(1<<quantize_dialog->raster_power2),
+                                       (MusEGlobal::config.division*4)/raster,
                                        /* quant_len= */false, quantize_dialog->strength, 
                                        quantize_dialog->swing, quantize_dialog->threshold);
                   break;
+                  }
             case DrumCanvas::CMD_ERASE_EVENT: erase_notes(partlist_to_set(parts())); break;
             case DrumCanvas::CMD_DEL: erase_notes(partlist_to_set(parts()),1); break; //delete selected events
             case DrumCanvas::CMD_DELETE_OVERLAPS: delete_overlaps(partlist_to_set(parts())); break;
diff --git a/muse2/muse/midiedit/drumedit.h b/muse2/muse/midiedit/drumedit.h
index 08f485e7..59590d34 100644
--- a/muse2/muse/midiedit/drumedit.h
+++ b/muse2/muse/midiedit/drumedit.h
@@ -170,7 +170,7 @@ class DrumEdit : public MidiEditor {
       virtual void updateHScrollRange();
 
    signals:
-      void deleted(MusEGui::TopWin*);
+      void isDeleting(MusEGui::TopWin*);
 
    public:
       DrumEdit(MusECore::PartList*, QWidget* parent = 0, const char* name = 0, unsigned initPos = MAXINT);
diff --git a/muse2/muse/midiedit/ecanvas.cpp b/muse2/muse/midiedit/ecanvas.cpp
index 9941f7e5..3eeb4f84 100644
--- a/muse2/muse/midiedit/ecanvas.cpp
+++ b/muse2/muse/midiedit/ecanvas.cpp
@@ -3,6 +3,7 @@
 //  Linux Music Editor
 //    $Id: ecanvas.cpp,v 1.8.2.6 2009/05/03 04:14:00 terminator356 Exp $
 //  (C) Copyright 2001 Werner Schweer (ws@seh.de)
+//  (C) Copyright 2011 Tim E. Real (terminator356 on sourceforge)
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -151,6 +152,17 @@ void EventCanvas::songChanged(int flags)
     
       if (flags & ~SC_SELECTION) {
             //items.clear();
+            bool curItemNeedsRestore=false;
+            MusECore::Event storedEvent;
+            int partSn;
+            if (curItem)
+            {
+              curItemNeedsRestore=true;
+              storedEvent=curItem->event();
+              partSn=curItem->part()->sn();
+            }
+            curItem=NULL;
+            
             items.clearDelete();
             start_tick  = MAXINT;
             end_tick    = 0;
@@ -177,7 +189,15 @@ void EventCanvas::songChanged(int flags)
                           break;
                         
                         if (e.isNote()) {
-                              addItem(part, e);
+                              CItem* temp = addItem(part, e);
+                              
+                              if (temp && curItemNeedsRestore && e==storedEvent && part->sn()==partSn)
+                              {
+                                  if (curItem!=NULL)
+                                    printf("THIS SHOULD NEVER HAPPEN: curItemNeedsRestore=true, event fits, but there was already a fitting event!?\n");
+                                  
+                                  curItem=temp;
+                                  }
                               }
                         }
                   }
@@ -308,54 +328,54 @@ void EventCanvas::keyPress(QKeyEvent* event)
             }
       // Select items by key (PianoRoll & DrumEditor)
       else if (key == shortcuts[SHRT_SEL_RIGHT].key || key == shortcuts[SHRT_SEL_RIGHT_ADD].key) {
-            iCItem i, iRightmost;
-	    CItem* rightmost = NULL;
-            //Get the rightmost selected note (if any)
-            for (i = items.begin(); i != items.end(); ++i) {
-                  if (i->second->isSelected()) {
-                        iRightmost = i; rightmost = i->second;
-                        }
-                  }
-               if (rightmost) {
-                     iCItem temp = iRightmost; temp++;
-                     //If so, deselect current note and select the one to the right
-                     if (temp != items.end()) {
-                           if (key != shortcuts[SHRT_SEL_RIGHT_ADD].key)
-                                 deselectAll();
-
-                           iRightmost++;
-                           iRightmost->second->setSelected(true);
-                           updateSelection();
-                           }
-                     }
-               //if (rightmost && mapx(rightmost->event().tick()) > width()) for some reason this doesn't this doesnt move the event in view
-               //   emit followEvent(rightmost->x());
-
+              rciCItem i;
+              for (i = items.rbegin(); i != items.rend(); ++i) 
+                if (i->second->isSelected()) 
+                  break;
+
+              if(i == items.rend())
+                i = items.rbegin();
+              
+              if(i != items.rbegin())
+                --i;
+              if(i->second)
+              {
+                if (key != shortcuts[SHRT_SEL_RIGHT_ADD].key)
+                      deselectAll();
+                CItem* sel = i->second;
+                sel->setSelected(true);
+                updateSelection();
+                if (sel->x() + sel->width() > mapxDev(width())) 
+                {  
+                  int mx = rmapx(sel->x());  
+                  int newx = mx + rmapx(sel->width()) - width();
+                  // Leave a bit of room for the specially-drawn drum notes. But good for piano too.
+                  emit horizontalScroll( (newx > mx ? mx - 10: newx + 10) - rmapx(xorg) );
+                }  
+              }
             }
       //Select items by key: (PianoRoll & DrumEditor)
       else if (key == shortcuts[SHRT_SEL_LEFT].key || key == shortcuts[SHRT_SEL_LEFT_ADD].key) {
-            iCItem i, iLeftmost;
-            CItem* leftmost = NULL;
-            if (items.size() > 0 ) {
-                  for (i = items.end(), i--; i != items.begin(); i--) {
-                        if (i->second->isSelected()) {
-                              iLeftmost = i; leftmost = i->second;
-                              }
-                        }
-                    if (leftmost) {
-                          if (iLeftmost != items.begin()) {
-                                //Add item
-                                if (key != shortcuts[SHRT_SEL_LEFT_ADD].key)
-                                      deselectAll();
-      
-                                iLeftmost--;
-                                iLeftmost->second->setSelected(true);
-                                updateSelection();
-                                }
-                          }
-                    //if (leftmost && mapx(leftmost->event().tick())< 0 ) for some reason this doesn't this doesnt move the event in view
-                    //  emit followEvent(leftmost->x());
-                  }
+              ciCItem i;
+              for (i = items.begin(); i != items.end(); ++i) 
+                if (i->second->isSelected()) 
+                  break;
+
+              if(i == items.end())
+                i = items.begin();
+              
+              if(i != items.begin())
+                --i;
+              if(i->second)
+              {
+                if (key != shortcuts[SHRT_SEL_LEFT_ADD].key)
+                      deselectAll();
+                CItem* sel = i->second;
+                sel->setSelected(true);
+                updateSelection();
+                if (sel->x() <= mapxDev(0)) 
+                  emit horizontalScroll(rmapx(sel->x() - xorg) - 10);  // Leave a bit of room.
+              }
             }
       else if (key == shortcuts[SHRT_INC_PITCH].key) {
             modifySelected(NoteInfo::VAL_PITCH, 1);
diff --git a/muse2/muse/midiedit/ecanvas.h b/muse2/muse/midiedit/ecanvas.h
index 2c783332..ad19480e 100644
--- a/muse2/muse/midiedit/ecanvas.h
+++ b/muse2/muse/midiedit/ecanvas.h
@@ -72,7 +72,7 @@ class EventCanvas : public Canvas {
       bool _setCurPartIfOnlyOneEventIsSelected;
 
       void updateSelection();
-      virtual void addItem(MusECore::Part*, MusECore::Event&) = 0;
+      virtual CItem* addItem(MusECore::Part*, MusECore::Event&) = 0;
       // Added by T356.
       virtual QPoint raster(const QPoint&) const;
       virtual MusECore::Undo moveCanvasItems(CItemList&, int, int, DragType) = 0;
diff --git a/muse2/muse/midiedit/pianoroll.cpp b/muse2/muse/midiedit/pianoroll.cpp
index 82a75f7f..8c2a7a87 100644
--- a/muse2/muse/midiedit/pianoroll.cpp
+++ b/muse2/muse/midiedit/pianoroll.cpp
@@ -56,6 +56,7 @@
 #include "tb1.h"
 #include "utils.h"
 #include "globals.h"
+#include "app.h"
 #include "gconfig.h"
 #include "icons.h"
 #include "audio.h"
@@ -118,7 +119,7 @@ PianoRoll::PianoRoll(MusECore::PartList* pl, QWidget* parent, const char* name,
       mapper->setMapping(editPasteAction, PianoCanvas::CMD_PASTE);
       connect(editPasteAction, SIGNAL(triggered()), mapper, SLOT(map()));
       
-      editPasteDialogAction = menuEdit->addAction(QIcon(*editpasteIconSet), tr("&Paste (with dialog)"));
+      editPasteDialogAction = menuEdit->addAction(QIcon(*editpasteIconSet), tr("Paste (with dialog)"));
       mapper->setMapping(editPasteDialogAction, PianoCanvas::CMD_PASTE_DIALOG);
       connect(editPasteDialogAction, SIGNAL(triggered()), mapper, SLOT(map()));
       
@@ -532,6 +533,7 @@ PianoRoll::PianoRoll(MusECore::PartList* pl, QWidget* parent, const char* name,
       }
 
       initTopwinState();
+      MusEGlobal::muse->topwinMenuInited(this);
       }
 
 //---------------------------------------------------------
@@ -540,6 +542,8 @@ PianoRoll::PianoRoll(MusECore::PartList* pl, QWidget* parent, const char* name,
 
 void PianoRoll::songChanged1(int bits)
       {
+        if(_isDeleting)  // Ignore while while deleting to prevent crash.
+          return;
         
         if (bits & SC_SOLO)
         {
@@ -815,15 +819,19 @@ void PianoRoll::removeCtrl(CtrlEdit* ctrl)
 
 //---------------------------------------------------------
 //   closeEvent
+//   Save state. 
+//   Disconnect signals which may cause crash due to Qt deferred deletion on close.
 //---------------------------------------------------------
 
 void PianoRoll::closeEvent(QCloseEvent* e)
       {
+      _isDeleting = true;  // Set flag so certain signals like songChanged, which may cause crash during delete, can be ignored.
+
       QSettings settings("MusE", "MusE-qt");
       //settings.setValue("Pianoroll/geometry", saveGeometry());
       settings.setValue("Pianoroll/windowState", saveState());
 
-      emit deleted(static_cast<TopWin*>(this));
+      emit isDeleting(static_cast<TopWin*>(this));
       e->accept();
       }
 
diff --git a/muse2/muse/midiedit/pianoroll.h b/muse2/muse/midiedit/pianoroll.h
index 0b90b1e6..9b73fc1b 100644
--- a/muse2/muse/midiedit/pianoroll.h
+++ b/muse2/muse/midiedit/pianoroll.h
@@ -176,7 +176,7 @@ class PianoRoll : public MidiEditor {
       void updateTrackInfo();
 
    signals:
-      void deleted(MusEGui::TopWin*);
+      void isDeleting(MusEGui::TopWin*);
    
    public slots:
       virtual void updateHScrollRange();
diff --git a/muse2/muse/midiedit/prcanvas.cpp b/muse2/muse/midiedit/prcanvas.cpp
index e2a05bda..2c32a1cf 100644
--- a/muse2/muse/midiedit/prcanvas.cpp
+++ b/muse2/muse/midiedit/prcanvas.cpp
@@ -29,6 +29,8 @@
 #include <QDragMoveEvent>
 #include <QDropEvent>
 #include <QMouseEvent>
+#include <QList>
+#include <QPair>
 
 #include <set>
 
@@ -74,11 +76,11 @@ NEvent::NEvent(MusECore::Event& e, MusECore::Part* p, int y) : MusEGui::CItem(e,
 //   addItem
 //---------------------------------------------------------
 
-void PianoCanvas::addItem(MusECore::Part* part, MusECore::Event& event)
+CItem* PianoCanvas::addItem(MusECore::Part* part, MusECore::Event& event)
       {
       if (signed(event.tick())<0) {
             printf("ERROR: trying to add event before current part!\n");
-            return;
+            return NULL;
       }
 
       NEvent* ev = new NEvent(event, part, pitch2y(event.pitch()));
@@ -93,6 +95,8 @@ void PianoCanvas::addItem(MusECore::Part* part, MusECore::Event& event)
             //part = newPart;
             part->setLenTick(part->lenTick()+diff);
             }
+      
+      return ev;
       }
 
 //---------------------------------------------------------
@@ -1086,6 +1090,7 @@ void PianoCanvas::curPartChanged()
 
 void PianoCanvas::modifySelected(MusEGui::NoteInfo::ValType type, int delta)
       {
+      QList< QPair<MusECore::EventList*,MusECore::Event> > already_done;
       MusEGlobal::audio->msgIdle(true);
       MusEGlobal::song->startUndo();
       for (MusEGui::iCItem i = items.begin(); i != items.end(); ++i) {
@@ -1097,6 +1102,10 @@ void PianoCanvas::modifySelected(MusEGui::NoteInfo::ValType type, int delta)
                   continue;
 
             MusECore::MidiPart* part = (MusECore::MidiPart*)(e->part());
+            
+            if (already_done.contains(QPair<MusECore::EventList*,MusECore::Event>(part->events(), event)))
+              continue;
+            
             MusECore::Event newEvent = event.clone();
 
             switch (type) {
@@ -1151,6 +1160,8 @@ void PianoCanvas::modifySelected(MusEGui::NoteInfo::ValType type, int delta)
             // Indicate do not do port controller values and clone parts. 
             //MusEGlobal::song->addUndo(MusECore::UndoOp(MusECore::UndoOp::ModifyEvent, newEvent, event, part));
             MusEGlobal::song->addUndo(MusECore::UndoOp(MusECore::UndoOp::ModifyEvent, newEvent, event, part, false, false));
+
+            already_done.append(QPair<MusECore::EventList*,MusECore::Event>(part->events(), event));
             }
       MusEGlobal::song->endUndo(SC_EVENT_MODIFIED);
       MusEGlobal::audio->msgIdle(false);
diff --git a/muse2/muse/midiedit/prcanvas.h b/muse2/muse/midiedit/prcanvas.h
index e9bd654d..35e4975f 100644
--- a/muse2/muse/midiedit/prcanvas.h
+++ b/muse2/muse/midiedit/prcanvas.h
@@ -82,7 +82,7 @@ class PianoCanvas : public EventCanvas {
       virtual void dragEnterEvent(QDragEnterEvent* event);
       virtual void dragMoveEvent(QDragMoveEvent*);
       virtual void dragLeaveEvent(QDragLeaveEvent*);
-      virtual void addItem(MusECore::Part*, MusECore::Event&);
+      virtual CItem* addItem(MusECore::Part*, MusECore::Event&);
 
       int y2pitch(int) const;
       int pitch2y(int) const;
diff --git a/muse2/muse/midiedit/scoreedit.cpp b/muse2/muse/midiedit/scoreedit.cpp
index 2d24fa54..ff1893ce 100644
--- a/muse2/muse/midiedit/scoreedit.cpp
+++ b/muse2/muse/midiedit/scoreedit.cpp
@@ -88,10 +88,6 @@ QString IntToQStr(int i);
 
 
 
-#define APPLY_TO_SELECTED_STRING tr("Apply to selected notes:")
-#define APPLY_TO_NEW_STRING tr("Apply to new notes:")
-
-
 //PIXELS_PER_NOTEPOS must be greater or equal to 3*NOTE_XLEN + 2*NOTE_SHIFT
 //because if tick 0 is at x=0: the notes can be shifted by NOTE_SHIFT.
 //additionally, they can be moved by NOTE_XLEN (collision avoiding)
@@ -170,6 +166,15 @@ QColor* mycolors; // array [NUM_MYCOLORS]
 
 set<QString> ScoreEdit::names;
 
+int ScoreCanvas::_quant_power2_init=3;
+int ScoreCanvas::_pixels_per_whole_init=300;
+int ScoreCanvas::note_velo_init=64;
+int ScoreCanvas::note_velo_off_init=64;
+int ScoreCanvas::new_len_init=0;
+ScoreCanvas::coloring_mode_t ScoreCanvas::coloring_mode_init=COLOR_MODE_BLACK;
+bool ScoreCanvas::preamble_contains_timesig_init=true;
+bool ScoreCanvas::preamble_contains_keysig_init=true;
+
 
 //---------------------------------------------------------
 //   ScoreEdit
@@ -223,6 +228,8 @@ ScoreEdit::ScoreEdit(QWidget* parent, const char* name, unsigned initPos)
 
 	xscroll->setMinimum(0);
 	yscroll->setMinimum(0);
+	xscroll->setValue(0);
+	yscroll->setValue(0);
 
 	menu_mapper=new QSignalMapper(this);
 	connect(menu_mapper, SIGNAL(mapped(int)), SLOT(menu_command(int)));
@@ -295,14 +302,28 @@ ScoreEdit::ScoreEdit(QWidget* parent, const char* name, unsigned initPos)
 	len_actions->addAction(n32_action);
 	len_actions->addAction(nlast_action);
 	
-	nlast_action->setChecked(true);
-	menu_command(CMD_NOTELEN_LAST);
+	switch (ScoreCanvas::new_len_init)
+	{
+		case 0: nlast_action->setChecked(true); menu_command(CMD_NOTELEN_LAST); break;
+		case 1: n1_action->setChecked(true); menu_command(CMD_NOTELEN_1); break;
+		case 2: n2_action->setChecked(true); menu_command(CMD_NOTELEN_2); break;
+		case 4: n4_action->setChecked(true); menu_command(CMD_NOTELEN_4); break;
+		case 8: n8_action->setChecked(true); menu_command(CMD_NOTELEN_8); break;
+		case 16: n16_action->setChecked(true); menu_command(CMD_NOTELEN_16); break;
+		case 32: n32_action->setChecked(true); menu_command(CMD_NOTELEN_32); break;
+		default:
+			cerr << "ERROR: THIS SHOULD NEVER HAPPEN. newLen is invalid in ScoreEdit::ScoreEdit.\n" <<
+							"       (newLen="<<ScoreCanvas::new_len_init<<"; the only valid values are 0,1,2,4,8,16 and 32)\n" <<
+							"       however, don't worry, this is no major problem, using 0 instead" << endl;
+			nlast_action->setChecked(true);
+			menu_command(CMD_NOTELEN_LAST);
+	}
 	
 	note_settings_toolbar->addSeparator();
 	
-	apply_velo_to_label = new QLabel(APPLY_TO_NEW_STRING, note_settings_toolbar);
-		int w1 = apply_velo_to_label->fontMetrics().width(APPLY_TO_NEW_STRING);
-		int w2 = apply_velo_to_label->fontMetrics().width(APPLY_TO_SELECTED_STRING);
+	apply_velo_to_label = new QLabel(tr("Apply to new notes:"), note_settings_toolbar);
+		int w1 = apply_velo_to_label->fontMetrics().width(tr("Apply to new notes:"));
+		int w2 = apply_velo_to_label->fontMetrics().width(tr("Apply to selected notes:"));
 		if (w1>w2) 
 			apply_velo_to_label->setFixedWidth(w1+5);
 		else 
@@ -318,7 +339,7 @@ ScoreEdit::ScoreEdit(QWidget* parent, const char* name, unsigned initPos)
 	connect(velo_spinbox, SIGNAL(editingFinished()), SLOT(velo_box_changed()));
 	connect(this,SIGNAL(velo_changed(int)), score_canvas, SLOT(set_velo(int)));
 	note_settings_toolbar->addWidget(velo_spinbox);
-	velo_spinbox->setValue(64);
+	velo_spinbox->setValue(ScoreCanvas::note_velo_init);
 
 	note_settings_toolbar->addWidget(new QLabel(tr("Off-Velocity:"), note_settings_toolbar));
 	velo_off_spinbox = new QSpinBox(this);
@@ -329,7 +350,7 @@ ScoreEdit::ScoreEdit(QWidget* parent, const char* name, unsigned initPos)
 	connect(velo_off_spinbox, SIGNAL(editingFinished()), SLOT(velo_off_box_changed()));
 	connect(this,SIGNAL(velo_off_changed(int)), score_canvas, SLOT(set_velo_off(int)));
 	note_settings_toolbar->addWidget(velo_off_spinbox);
-	velo_off_spinbox->setValue(64);
+	velo_off_spinbox->setValue(ScoreCanvas::note_velo_off_init);
 
 
 	
@@ -338,13 +359,16 @@ ScoreEdit::ScoreEdit(QWidget* parent, const char* name, unsigned initPos)
 	quant_toolbar->addWidget(new QLabel(tr("Quantisation:"), quant_toolbar));
 	quant_combobox = new QComboBox(this);
 	quant_combobox->addItem("2");  // if you add or remove items from
-	quant_combobox->addItem("4");  // here, also change quant_mapper[]
-	quant_combobox->addItem("8");  // in ScoreCanvas::set_quant()!
+	quant_combobox->addItem("4");  // here, also change all code regarding
+	quant_combobox->addItem("8");  // _quant_power2 and _quant_power2_init
 	quant_combobox->addItem("16"); // and MAX_QUANT_POWER (must be log2(largest_value))
 	quant_combobox->addItem("32");
+	quant_combobox->setCurrentIndex(score_canvas->quant_power2()-1);
+	// the above is intendedly executed BEFORE connecting. otherwise this would
+	// destroy pixels_per_whole_init!
 	connect(quant_combobox, SIGNAL(currentIndexChanged(int)), score_canvas, SLOT(set_quant(int)));
 	quant_toolbar->addWidget(quant_combobox);
-	quant_combobox->setCurrentIndex(2);
+	
 	
 	quant_toolbar->addSeparator();
 
@@ -355,7 +379,7 @@ ScoreEdit::ScoreEdit(QWidget* parent, const char* name, unsigned initPos)
 	connect(px_per_whole_spinbox, SIGNAL(valueChanged(int)), score_canvas, SLOT(set_pixels_per_whole(int)));
 	connect(score_canvas, SIGNAL(pixels_per_whole_changed(int)), px_per_whole_spinbox, SLOT(setValue(int)));
 	quant_toolbar->addWidget(px_per_whole_spinbox);
-	px_per_whole_spinbox->setValue(300);
+	px_per_whole_spinbox->setValue(ScoreCanvas::_pixels_per_whole_init);
 
 	QMenu* edit_menu = menuBar()->addMenu(tr("&Edit"));      
 
@@ -456,8 +480,18 @@ ScoreEdit::ScoreEdit(QWidget* parent, const char* name, unsigned initPos)
 			menu_mapper->setMapping(color_velo_action, CMD_COLOR_VELO);
 			menu_mapper->setMapping(color_part_action, CMD_COLOR_PART);
 			
-			color_black_action->setChecked(true);
-			menu_command(CMD_COLOR_BLACK);
+			switch (ScoreCanvas::coloring_mode_init)
+			{
+				case 0: color_black_action->setChecked(true); menu_command(CMD_COLOR_BLACK); break;
+				case 1: color_velo_action->setChecked(true); menu_command(CMD_COLOR_VELO); break;
+				case 2: color_part_action->setChecked(true); menu_command(CMD_COLOR_PART); break;
+				default:
+					cerr << "ERROR: THIS SHOULD NEVER HAPPEN. noteColor is invalid in ScoreEdit::ScoreEdit.\n" <<
+									"       (noteColor="<<ScoreCanvas::coloring_mode_init<<"; the only valid values are 0,1 and 2)\n" <<
+									"       however, don't worry, this is no major problem, using 0 instead" << endl;
+					color_black_action->setChecked(true);
+					menu_command(CMD_COLOR_BLACK);
+			}
 		
 		QMenu* preamble_menu = settings_menu->addMenu(tr("Set up &preamble"));
 			preamble_keysig_action = preamble_menu->addAction(tr("Display &key signature"));
@@ -468,8 +502,8 @@ ScoreEdit::ScoreEdit(QWidget* parent, const char* name, unsigned initPos)
 			preamble_keysig_action->setCheckable(true);
 			preamble_timesig_action->setCheckable(true);
 			
-			preamble_keysig_action->setChecked(true);
-			preamble_timesig_action->setChecked(true);
+			preamble_keysig_action->setChecked(ScoreCanvas::preamble_contains_keysig_init);
+			preamble_timesig_action->setChecked(ScoreCanvas::preamble_contains_timesig_init);
   
 		QAction* set_name_action = settings_menu->addAction(tr("Set Score &name"), menu_mapper, SLOT(map()));
 		menu_mapper->setMapping(set_name_action, CMD_SET_NAME);
@@ -505,6 +539,7 @@ ScoreEdit::ScoreEdit(QWidget* parent, const char* name, unsigned initPos)
 	apply_velo=true;
 	
 	initTopwinState();
+	MusEGlobal::muse->topwinMenuInited(this);
 }
 
 void ScoreEdit::init_shortcuts()
@@ -589,7 +624,7 @@ bool ScoreEdit::set_name(QString newname, bool emit_signal, bool emergency_name)
 
 ScoreEdit::~ScoreEdit()
 {
-	
+	names.erase(name);
 }
 
 void ScoreEdit::velo_box_changed()
@@ -604,16 +639,19 @@ void ScoreEdit::velo_off_box_changed()
 
 void ScoreEdit::song_changed(int flags)
 {
+	if(_isDeleting)  // Ignore while while deleting to prevent crash.
+		return;
+	     
 	if (flags & (SC_SELECTION | SC_EVENT_MODIFIED | SC_EVENT_REMOVED))
 	{
 		map<MusECore::Event*, MusECore::Part*> selection=get_events(score_canvas->get_all_parts(),1);
 		if (selection.empty())
 		{
-			apply_velo_to_label->setText(APPLY_TO_NEW_STRING);
+			apply_velo_to_label->setText(tr("Apply to new notes:"));
 		}
 		else
 		{
-			apply_velo_to_label->setText(APPLY_TO_SELECTED_STRING);
+			apply_velo_to_label->setText(tr("Apply to selected notes:"));
 			
 			int velo=-1;
 			int velo_off=-1;
@@ -659,6 +697,7 @@ void ScoreEdit::canvas_height_changed(int height)
 void ScoreEdit::viewport_height_changed(int height)
 {
 	int val=score_canvas->canvas_height() - height;
+	// FINDMICHJETZT canvas_height() is uninitalized!
 	if (val<0) val=0;
 	yscroll->setPageStep(height * PAGESTEP);
 	yscroll->setMaximum(val);
@@ -671,11 +710,14 @@ void ScoreEdit::viewport_height_changed(int height)
 
 void ScoreEdit::closeEvent(QCloseEvent* e)
 {
+	_isDeleting = true;  // Set flag so certain signals like songChanged, which may cause crash during delete, can be ignored.
+	names.erase(name);
+	     
 	QSettings settings("MusE", "MusE-qt");
 	//settings.setValue("ScoreEdit/geometry", saveGeometry());
 	settings.setValue("ScoreEdit/windowState", saveState());
 
-	emit deleted(static_cast<TopWin*>(this));
+	emit isDeleting(static_cast<TopWin*>(this));
 	e->accept();
 }
 
@@ -688,8 +730,8 @@ void ScoreEdit::menu_command(int cmd)
 		{
 			bool ok;
 			QString newname = QInputDialog::getText(this, tr("Enter the new score title"),
-                                          tr("Enter the new score title"), QLineEdit::Normal,
-                                          name, &ok);
+			                                    tr("Enter the new score title"), QLineEdit::Normal,
+			                                    name, &ok);
 			if (ok)
 			{
 				if (!set_name(newname))
@@ -1055,7 +1097,23 @@ void ScoreEdit::read_configuration(MusECore::Xml& xml)
 		switch (token)
 		{
 			case MusECore::Xml::TagStart:
-				if (tag == "topwin")
+				if (tag=="quantPowerInit")
+					ScoreCanvas::_quant_power2_init=xml.parseInt();
+				else if (tag=="pxPerWholeInit")
+					ScoreCanvas::_pixels_per_whole_init=xml.parseInt();
+				else if (tag=="newNoteVeloInit")
+					ScoreCanvas::note_velo_init=xml.parseInt();
+				else if (tag=="newNoteVeloOffInit")
+					ScoreCanvas::note_velo_off_init=xml.parseInt();
+				else if (tag=="newLenInit")
+					ScoreCanvas::new_len_init=xml.parseInt();
+				else if (tag=="noteColorInit")
+					ScoreCanvas::coloring_mode_init=(ScoreCanvas::coloring_mode_t)xml.parseInt();
+				else if (tag=="preambleContainsKeysig")
+					ScoreCanvas::preamble_contains_keysig_init=xml.parseInt();
+				else if (tag=="preambleContainsTimesig")
+					ScoreCanvas::preamble_contains_timesig_init=xml.parseInt();
+				else if (tag == "topwin")
 					TopWin::readConfiguration(SCORE, xml);
 				else
 					xml.unknown("ScoreEdit");
@@ -1075,7 +1133,18 @@ void ScoreEdit::read_configuration(MusECore::Xml& xml)
 void ScoreEdit::write_configuration(int level, MusECore::Xml& xml)
 {
 	xml.tag(level++, "scoreedit");
+
+	xml.intTag(level, "quantPowerInit", ScoreCanvas::_quant_power2_init);
+	xml.intTag(level, "pxPerWholeInit", ScoreCanvas::_pixels_per_whole_init);
+	xml.intTag(level, "newNoteVeloInit", ScoreCanvas::note_velo_init);
+	xml.intTag(level, "newNoteVeloOffInit", ScoreCanvas::note_velo_off_init);
+	xml.intTag(level, "newLenInit", ScoreCanvas::new_len_init);
+	xml.intTag(level, "noteColorInit", ScoreCanvas::coloring_mode_init);
+	xml.intTag(level, "preambleContainsKeysig", ScoreCanvas::preamble_contains_keysig_init);
+	xml.intTag(level, "preambleContainsTimesig", ScoreCanvas::preamble_contains_timesig_init);
+	
 	TopWin::writeConfiguration(SCORE, level, xml);
+
 	xml.etag(level, "scoreedit");
 }
 
@@ -1212,22 +1281,20 @@ ScoreCanvas::ScoreCanvas(ScoreEdit* pr, QWidget* parent_widget) : View(parent_wi
 	dragged_event_part=NULL;
 	
 	last_len=384;
-	new_len=-1;
+	new_len=-1; // will be initalized with new_len_init by ScoreEdit::ScoreEdit();
 	
-	set_quant(2); //this is actually unneccessary, as while
-	              //initalizing the quant_combobox, this gets
-	              //called again. but for safety...
-	set_pixels_per_whole(300); //same as above. but safety rocks
+	_quant_power2=_quant_power2_init; // ScoreEdit relies on this to be done!
+	_pixels_per_whole_init = _pixels_per_whole_init;
 
-	set_velo(64);
-	set_velo_off(64);
+	note_velo=note_velo_init;
+	note_velo_off_init=note_velo_off_init;
 	
 	dragging_staff=false;
 	
 	
-	coloring_mode=COLOR_MODE_BLACK;
-	preamble_contains_keysig=true;
-	preamble_contains_timesig=true;
+	coloring_mode=coloring_mode_init;
+	preamble_contains_keysig=preamble_contains_keysig_init;
+	preamble_contains_timesig=preamble_contains_timesig_init;
 	
 	
 	x_scroll_speed=0;
@@ -1454,6 +1521,9 @@ void ScoreCanvas::fully_recalculate()
 
 void ScoreCanvas::song_changed(int flags)
 {
+	if(parent && parent->deleting())  // Ignore while while deleting to prevent crash.
+		return;
+	     
 	if (flags & (SC_PART_MODIFIED | SC_PART_REMOVED | SC_PART_INSERTED | SC_TRACK_REMOVED))
 	{
 		update_parts();
@@ -1503,7 +1573,7 @@ int ScoreCanvas::canvas_width()
 
 int ScoreCanvas::canvas_height()
 {
-	return staves.rbegin()->y_bottom;
+	return staves.empty() ? 0 : staves.rbegin()->y_bottom;
 }
 
 int ScoreCanvas::viewport_width()
@@ -1532,7 +1602,7 @@ void color_image(QImage& img, const QColor& color)
 {
 	uchar* ptr=img.bits();
 	//int bytes=img.byteCount();
-        int bytes=img.bytesPerLine() * img.height();   // By Tim. For older Qt versions. Tested OK on Qt4.5.
+	int bytes=img.bytesPerLine() * img.height();   // By Tim. For older Qt versions. Tested OK on Qt4.5.
 	int r,g,b;
 	color.getRgb(&r,&g,&b);
 	
@@ -2793,6 +2863,7 @@ void ScoreCanvas::draw_note_lines(QPainter& p, int y, bool reserve_akkolade_spac
 {
 	int xbegin = reserve_akkolade_space ? AKKOLADE_LEFTMARGIN+AKKOLADE_WIDTH+AKKOLADE_RIGHTMARGIN : 0;
 	int xend=width();
+	// FINDMICHJETZT y is uninitalized!
 	
 	p.setPen(Qt::black);
 	
@@ -4183,7 +4254,7 @@ void ScoreCanvas::pos_changed(int index, unsigned tick, bool scroll)
 		{
 			switch (MusEGlobal::song->follow())
 			{
-				case  MusECore::Song::NO: break;
+				case MusECore::Song::NO: break;
 				case MusECore::Song::JUMP:  goto_tick(tick,false);  break;
 				case MusECore::Song::CONTINUOUS:  goto_tick(tick,true);  break;
 			}
@@ -4277,16 +4348,16 @@ void ScoreCanvas::menu_command(int cmd)
 {
 	switch (cmd)
 	{
-		case CMD_COLOR_BLACK:  coloring_mode=COLOR_MODE_BLACK; redraw(); break;
-		case CMD_COLOR_PART:   coloring_mode=COLOR_MODE_PART;  redraw(); break;
-		case CMD_COLOR_VELO:   coloring_mode=COLOR_MODE_VELO;  redraw(); break;
-		case CMD_NOTELEN_1:    new_len=TICKS_PER_WHOLE/ 1; break;
-		case CMD_NOTELEN_2:    new_len=TICKS_PER_WHOLE/ 2; break;
-		case CMD_NOTELEN_4:    new_len=TICKS_PER_WHOLE/ 4; break;
-		case CMD_NOTELEN_8:    new_len=TICKS_PER_WHOLE/ 8; break;
-		case CMD_NOTELEN_16:   new_len=TICKS_PER_WHOLE/16; break;
-		case CMD_NOTELEN_32:   new_len=TICKS_PER_WHOLE/32; break;
-		case CMD_NOTELEN_LAST: new_len=-1; break;
+		case CMD_COLOR_BLACK:  coloring_mode_init=coloring_mode=COLOR_MODE_BLACK; redraw(); break;
+		case CMD_COLOR_PART:   coloring_mode_init=coloring_mode=COLOR_MODE_PART;  redraw(); break;
+		case CMD_COLOR_VELO:   coloring_mode_init=coloring_mode=COLOR_MODE_VELO;  redraw(); break;
+		case CMD_NOTELEN_1:    new_len_init= 1; new_len=TICKS_PER_WHOLE/ 1; break;
+		case CMD_NOTELEN_2:    new_len_init= 2; new_len=TICKS_PER_WHOLE/ 2; break;
+		case CMD_NOTELEN_4:    new_len_init= 4; new_len=TICKS_PER_WHOLE/ 4; break;
+		case CMD_NOTELEN_8:    new_len_init= 8; new_len=TICKS_PER_WHOLE/ 8; break;
+		case CMD_NOTELEN_16:   new_len_init=16; new_len=TICKS_PER_WHOLE/16; break;
+		case CMD_NOTELEN_32:   new_len_init=32; new_len=TICKS_PER_WHOLE/32; break;
+		case CMD_NOTELEN_LAST: new_len_init= 0; new_len=-1; break;
 		
 		default: 
 			cerr << "ERROR: ILLEGAL FUNCTION CALL: ScoreCanvas::menu_command called with unknown command ("<<cmd<<")"<<endl;
@@ -4296,23 +4367,24 @@ void ScoreCanvas::menu_command(int cmd)
 void ScoreCanvas::preamble_keysig_slot(bool state)
 {
 	preamble_contains_keysig=state;
+	preamble_contains_keysig_init=state;
 	redraw();
 }
 void ScoreCanvas::preamble_timesig_slot(bool state)
 {
 	preamble_contains_timesig=state;
+	preamble_contains_timesig_init=state;
 	redraw();
 }
 
 void ScoreCanvas::set_quant(int val)
 {
-	int quant_mapper[]={1,2,3,4,5};
-
-	if ((val>=0) && (val<signed(sizeof(quant_mapper)/sizeof(*quant_mapper))))
+	if ((val>=0) && (val<5))
 	{
 		int old_len=quant_len();
 
-		_quant_power2=quant_mapper[val];
+		_quant_power2=val+1;
+		_quant_power2_init=_quant_power2;
 		
 		set_pixels_per_whole(pixels_per_whole() * quant_len() / old_len );
 
@@ -4339,6 +4411,7 @@ void ScoreCanvas::set_pixels_per_whole(int val)
 	// zero!)
 	
 	_pixels_per_whole=val;
+	_pixels_per_whole_init=val;
 	
 	for (list<staff_t>::iterator it=staves.begin(); it!=staves.end(); it++)
 		it->calc_item_pos();
@@ -4380,6 +4453,7 @@ void ScoreCanvas::maybe_close_if_empty()
 void ScoreCanvas::set_velo(int velo)
 {
 	note_velo=velo;
+	note_velo_init=velo;
 
 	if (parent->get_apply_velo())
 		modify_velocity(get_all_parts(),1, 0,velo);
@@ -4388,6 +4462,7 @@ void ScoreCanvas::set_velo(int velo)
 void ScoreCanvas::set_velo_off(int velo)
 {
 	note_velo_off=velo;
+	note_velo_off_init=velo;
 
 	if (parent->get_apply_velo())
 		modify_off_velocity(get_all_parts(),1, 0,velo);
@@ -4583,13 +4658,9 @@ void ScoreCanvas::add_new_parts(const std::map< MusECore::Part*, std::set<MusECo
 /* BUGS and potential bugs
  *   o tied notes don't work properly when there's a key-change in
  *     between, for example, when a cis is tied to a des
- *   o schedule_all_same_len_parts: if there are two clones A and B,
- *     and both A and B get scheduled to be expanded (because we
- *     have one event from A and one event from B), this causes a bug,
- *     because after A (and B) got resized, the B-resize is invalid!
- *   o when changing toolbarstate when sharing and immediately after that
+ * > o when changing toolbarstate when sharing and immediately after that
  *     changing "share" status, the changed state isn't stored
- *   o arranger state and mixer state aren't stored (says tim)
+ *     (could be solved by storing the current window when quitting/saving whatever)
  *   ? pasting in editors sometimes fails oO? ( ERROR: reading eventlist
  *     from clipboard failed. ignoring this one... ) [ not reproducible ]
  *
@@ -4597,9 +4668,16 @@ void ScoreCanvas::add_new_parts(const std::map< MusECore::Part*, std::set<MusECo
  *   o drum controllers
  *       update ctrlcanvas/panel
  *       test!
+ *   o drum editor is buggy. propagate_drum_map may operate on old values
+ *     ("BUGGY! problem is: while changing entries, ourDrumMap
+        may be reallocated which causes abort()s and/or bugs.")
  *   o don't mix DRUM and NEW_DRUM in drumeditor!
+ *   o quantize must round UP, not down when at 0.5
  *   o my record flag handling
  *   o option for disabling old-style / new-style drum tracks?
+ * ! o using super glue while a score editor displaying the glued parts
+ *     is open lets muse segfault. this may or may not be fixed in
+ *     the release branch :/
  * 
  * > o drum editor: channel-stuff
  *        o clearly state in the changelog: when having multiple drumeditors open,
@@ -4611,6 +4689,11 @@ void ScoreCanvas::add_new_parts(const std::map< MusECore::Part*, std::set<MusECo
  *          ask the user if he wants to proceed, and then set maintained_automatically to false
  *        o offer some way to set maintained_automatically to true again
  *        o move generation and deletion of ourDrumMap from DCanvas to DrumEditor and remove ugly wrapper functions
+ * > o fix valgrind problems (the two "FINDMICHJETZT" lines in scoreedit.cpp)
+ * > o add a songposition scrollbar-toolbar (in different sizes)
+ *     this might be equivalent to "redo transport menu" (below).
+ * > o add toolbar(s) for tempo- etc spinboxes from the transport window 
+ *
  *
  *   o find and fix FINDMICHJETZT
  *   o fix all segfaults and non-working stuff!
@@ -4626,9 +4709,9 @@ void ScoreCanvas::add_new_parts(const std::map< MusECore::Part*, std::set<MusECo
  *   o all places where i added doubleclick-edits: only react on left-click double clicks!
  *   o support "new style" reordering with old style drum tracks as well
  *     (not swapping but inserting!)
+ *   o support edge-scrolling when opening a lasso
  *   o add "dotted quarter" quantize option (for 6/8 beat)
  *   o ticks-to-quarter spinboxes
- *   o newly created windows have to be focussed!
  *   o mirror most menus to an additional right-click context menu to avoid the long mouse pointer
  *     journey to the menu bar. try to find a way which does not involve duplicate code!
  *   o implement borland-style maximize: free windows do not cover the main menu, even when maximized
@@ -4651,6 +4734,7 @@ void ScoreCanvas::add_new_parts(const std::map< MusECore::Part*, std::set<MusECo
  *   o thin out: remove unneeded ctrl messages
  *
  * less important stuff
+ *   o allow "fixating" toolbars?
  *   o quantize-templates (everything is forced into a specified
  *                         rhythm)
  *   o part-templates (you specify some notes and a control-chord;
@@ -4662,8 +4746,6 @@ void ScoreCanvas::add_new_parts(const std::map< MusECore::Part*, std::set<MusECo
  *       calc_pos_add_list must be called before calc_item_pos then,
  *       and calc_item_pos must respect the pos_add_list instead of
  *       keeping its own pos_add variable (which is only an optimisation)
- *   o support edge-scrolling when opening a lasso
- *   o save more configuration stuff (quant, color)
  * 
  * really unimportant nice-to-haves
  *   o support in-song clef-changes
@@ -4676,10 +4758,6 @@ void ScoreCanvas::add_new_parts(const std::map< MusECore::Part*, std::set<MusECo
  * 
  * 
  * stuff for the other muse developers
- *   o update translations
- *   o remove ambiguous translation: "offset"="zeitversatz"
- *     this is ambigous in mod. note len and WRONG in mod. velo dialogs
- *
  *   o process accurate timesignatures from muse's list (has to be implemented first in muse)
  *      ( (2+2+3)/4 or (3+2+2)/4 instead of 7/4 )
  */
diff --git a/muse2/muse/midiedit/scoreedit.h b/muse2/muse/midiedit/scoreedit.h
index 0d1432b8..7a16d19f 100644
--- a/muse2/muse/midiedit/scoreedit.h
+++ b/muse2/muse/midiedit/scoreedit.h
@@ -184,7 +184,7 @@ class ScoreEdit : public TopWin
 		void clipboard_changed();
 		
 	signals:
-		void deleted(MusEGui::TopWin*);
+		void isDeleting(MusEGui::TopWin*);
 		void name_changed();
 		void velo_changed(int);
 		void velo_off_changed(int);
@@ -275,6 +275,9 @@ class FloEvent
 			tick=ti;
 			source_event=event;
 			source_part=part;
+			
+			num=denom=0xdeadbeef; //unused, but valgrind complains if uninited
+			key=MusECore::KEY_C;
 		}
 		FloEvent(unsigned ti, typeEnum t, int num_, int denom_)
 		{
@@ -284,6 +287,9 @@ class FloEvent
 			tick=ti;
 			source_event=NULL;
 			source_part=NULL;
+			
+			len=vel=pitch=0xdeadbeef; //unused, but valgrind complains if uninited
+			key=MusECore::KEY_C;
 		}
 		FloEvent(unsigned ti, typeEnum t, MusECore::key_enum k)
 		{
@@ -292,6 +298,8 @@ class FloEvent
 			tick=ti;
 			source_event=NULL;
 			source_part=NULL;
+			
+			pitch=vel=len=num=denom=0xdeadbeef; //unused, but valgrind complains if uninited
 		}
 };
 class FloItem
@@ -345,6 +353,7 @@ class FloItem
 			begin_tick=beg;
 			source_event=event;
 			source_part=part;
+			is_active=false;
 		}
 		
 		FloItem(typeEnum t, int num_, int denom_)
@@ -659,8 +668,20 @@ class ScoreCanvas : public MusEGui::View
 		void move_staff_below(list<staff_t>::iterator dest, list<staff_t>::iterator src);
 		void cleanup_staves();
 		void maybe_close_if_empty();
-		
+
+// defaults  ----------------------------------------------------------
+	public:
+		enum coloring_mode_t {COLOR_MODE_BLACK, COLOR_MODE_PART, COLOR_MODE_VELO};
+		static int _quant_power2_init;
+		static int _pixels_per_whole_init;
+		static int note_velo_init, note_velo_off_init;
+		static int new_len_init;
+		static coloring_mode_t coloring_mode_init;
+		static bool preamble_contains_timesig_init;
+		static bool preamble_contains_keysig_init;
+
 // member variables ---------------------------------------------------
+	private:
 		int _quant_power2;
 		int _pixels_per_whole;
 
@@ -737,7 +758,7 @@ class ScoreCanvas : public MusEGui::View
 		bool srec;
 		bool held_notes[128];
 
-		enum {COLOR_MODE_BLACK, COLOR_MODE_PART, COLOR_MODE_VELO} coloring_mode;
+		coloring_mode_t coloring_mode;
 		bool preamble_contains_keysig;
 		bool preamble_contains_timesig;
 
@@ -767,38 +788,38 @@ class ScoreCanvas : public MusEGui::View
 		
 		void add_new_parts(const std::map< MusECore::Part*, std::set<MusECore::Part*> >&);
 
-   public slots:
-      void x_scroll_event(int);
-      void y_scroll_event(int);
-      void song_changed(int);
-      void fully_recalculate();
-			void goto_tick(int,bool);
-			void pos_changed(int i, unsigned u, bool b);
-			void heartbeat_timer_event();
-			
-			void set_tool(int);
-			void set_quant(int);
-			void menu_command(int);
-			void preamble_keysig_slot(bool);
-			void preamble_timesig_slot(bool);
-			void set_pixels_per_whole(int);
+	public slots:
+		void x_scroll_event(int);
+		void y_scroll_event(int);
+		void song_changed(int);
+		void fully_recalculate();
+		void goto_tick(int,bool);
+		void pos_changed(int i, unsigned u, bool b);
+		void heartbeat_timer_event();
 
-			void set_velo(int);
-			void set_velo_off(int);
+		void set_tool(int);
+		void set_quant(int);
+		void menu_command(int);
+		void preamble_keysig_slot(bool);
+		void preamble_timesig_slot(bool);
+		void set_pixels_per_whole(int);
 
-			void set_steprec(bool);
-			
-			void update_parts(); //re-populates the set<MusECore::Part*>s from the set<int>s
+		void set_velo(int);
+		void set_velo_off(int);
+
+		void set_steprec(bool);
+
+		void update_parts(); //re-populates the set<MusECore::Part*>s from the set<int>s
 	signals:
-			void xscroll_changed(int);
-			void yscroll_changed(int);
-			void viewport_width_changed(int);
-			void canvas_width_changed(int);
-			void preamble_width_changed(int);
-			void viewport_height_changed(int);
-			void canvas_height_changed(int);
-			void pixels_per_whole_changed(int);
-			void pos_add_changed();
+		void xscroll_changed(int);
+		void yscroll_changed(int);
+		void viewport_width_changed(int);
+		void canvas_width_changed(int);
+		void preamble_width_changed(int);
+		void viewport_height_changed(int);
+		void canvas_height_changed(int);
+		void pixels_per_whole_changed(int);
+		void pos_add_changed();
 			
 	protected:
 		virtual void draw(QPainter& p, const QRect& rect);
diff --git a/muse2/muse/midifile.cpp b/muse2/muse/midifile.cpp
index a94644ff..1fc7e114 100644
--- a/muse2/muse/midifile.cpp
+++ b/muse2/muse/midifile.cpp
@@ -23,7 +23,6 @@
 
 #include <errno.h>
 #include <values.h>
-#include <assert.h>
 
 #include "song.h"
 #include "midi.h"
@@ -568,9 +567,9 @@ void MidiFile::writeEvent(const MidiPlayEvent* event)
       int nstat = event->type();
 
       // we dont save meta data into smf type 0 files:
-
-      if (MusEGlobal::config.smfFormat == 0 && nstat == ME_META)
-            return;
+      // Oct 16, 2011: Apparently it is legal to do that. Part of fix for bug tracker 3293339.
+      //if (MusEGlobal::config.smfFormat == 0 && nstat == ME_META)
+      //      return;
 
       nstat |= c;
       //
@@ -621,24 +620,45 @@ bool MidiFile::write()
       writeLong(6);                 // header len
       writeShort(MusEGlobal::config.smfFormat);
       if (MusEGlobal::config.smfFormat == 0) {
-            writeShort(1);
+            /*
+            //writeShort(1);    // Removed. Bug tracker 3293339
             MidiFileTrack dst;
             for (iMidiFileTrack i = _tracks->begin(); i != _tracks->end(); ++i) {
                   MPEventList* sl = &((*i)->events);
                   for (iMPEvent ie = sl->begin(); ie != sl->end(); ++ie)
+                  {  
+                        // ALERT: Observed a problem here, apparently some of the events are being added too fast. 
+                        //        The dump below tells me some of the events (sysex/meta) are missing from the list! 
+                        //        Apparently it's a timing problem. Very puzzling. 
+                        //        Attempting wild-guess fix now to eliminate multiple MidiFileTracks in MusE::exportMidi()...
+                        //        Nope. Didn't help. Now that it's a single MidiFileTrack, try skipping this section altogether...
+                        //        Yes that appears to have fixed it. Weird. What's the difference - the local 'dst' variable ?
+                        //        Or are there still lurking problems, or something more fundamentally wrong with Event or MPEvent?
+                        printf("MidiFile::write adding event to dst:\n"); // REMOVE Tim.
+                        ie->dump();  // REMOVE Tim.
                         dst.events.add(*ie);
+                  }      
                   }
             writeShort(1);
             writeShort(_division);
             writeTrack(&dst);
+            */
+            
+            writeShort(1);
+            //writeShort(_division);
+            //if(!_tracks->empty())
+            //  writeTrack(*(_tracks->begin()));
+            
             }
       else {
+        
+        
             writeShort(ntracks);
-
+      }
             writeShort(_division);
             for (ciMidiFileTrack i = _tracks->begin(); i != _tracks->end(); ++i)
                   writeTrack(*i);
-            }
+///      }
       return (ferror(fp) != 0);
       }
 
diff --git a/muse2/muse/midiport.cpp b/muse2/muse/midiport.cpp
index 71a90fe7..b7d1d7b7 100644
--- a/muse2/muse/midiport.cpp
+++ b/muse2/muse/midiport.cpp
@@ -24,6 +24,7 @@
 //#include "config.h"
 
 #include <QMenu>
+#include <QApplication>
 
 #include "mididev.h"
 #include "midiport.h"
@@ -331,18 +332,18 @@ QMenu* midiPortsPopup(QWidget* parent, int checkPort)
       {
         MusECore::MidiDevice* md = MusEGlobal::midiPorts[pi].device();
         //if(md && !md->isSynti() && (md->rwFlags() & 1))
-        //if(md && (md->rwFlags() & 1))   
-        if(md && (md->rwFlags() & 1 || md->isSynti()) )  
+        if(md && (md->rwFlags() & 1))   
+        //if(md && (md->rwFlags() & 1 || md->isSynti()) )  // Revert. Hm, why synths? Only writeable ports.  p4.0.41
           break;
       }
       if(pi == MIDI_PORTS)
       {
-        act = p->addAction(p->tr("Warning: No output devices!"));
+        act = p->addAction(qApp->translate("@default", QT_TRANSLATE_NOOP("@default", "Warning: No output devices!")));
         act->setCheckable(false);
         act->setData(-1);
         p->addSeparator();
       }
-      act = p->addAction(QIcon(*MusEGui::settings_midiport_softsynthsIcon), p->tr("Open midi config..."));
+      act = p->addAction(QIcon(*MusEGui::settings_midiport_softsynthsIcon), qApp->translate("@default", QT_TRANSLATE_NOOP("@default", "Open midi config...")));
       act->setCheckable(false);
       act->setData(MIDI_PORTS);  
       p->addSeparator();
@@ -351,8 +352,12 @@ QMenu* midiPortsPopup(QWidget* parent, int checkPort)
 
       for (int i = 0; i < MIDI_PORTS; ++i) {
             MidiPort* port = &MusEGlobal::midiPorts[i];
+            MusECore::MidiDevice* md = port->device();
+            //if(md && !(md->rwFlags() & 1 || md->isSynti()) && (i != checkPort))  
+            if(md && !(md->rwFlags() & 1) && (i != checkPort))                     // Only writeable ports, or current one.
+              continue;
             name.sprintf("%d:%s", port->portno()+1, port->portname().toLatin1().constData());
-            if(port->device() || (i == checkPort))   
+            if(md || (i == checkPort))   
             {  
               act = p->addAction(name);
               act->setData(i);
@@ -360,12 +365,12 @@ QMenu* midiPortsPopup(QWidget* parent, int checkPort)
               act->setChecked(i == checkPort);
             }  
 
-            if(!port->device())
+            if(!md)
             {
               if(!subp)                  // No submenu yet? Create it now.
               {
                 subp = new QMenu(p);
-                subp->setTitle(subp->tr("Empty ports"));
+                subp->setTitle(qApp->translate("@default", QT_TRANSLATE_NOOP("@default", "Empty ports")));
                 //subp->addAction(new MusEGui::MenuTitleItem("Empty Ports", subp));
               }  
               //act = subp->addAction(name);               // No need for all those "<None>" names. 
diff --git a/muse2/muse/midiseq.cpp b/muse2/muse/midiseq.cpp
index e31db7c7..1e46db11 100644
--- a/muse2/muse/midiseq.cpp
+++ b/muse2/muse/midiseq.cpp
@@ -44,6 +44,7 @@
 #include "synth.h"
 #include "song.h"
 #include "gconfig.h"
+#include <lo/lo_osc_types.h>
 
 namespace MusEGlobal {
 MusECore::MidiSeq* midiSeq;
@@ -54,6 +55,12 @@ namespace MusECore {
 
 int MidiSeq::ticker = 0;
 
+void initMidiSequencer()   
+{
+      //MusEGlobal::midiSeq       = new MidiSeq(MusEGlobal::realTimeScheduling ? MusEGlobal::realTimePriority : 0, "Midi");
+      MusEGlobal::midiSeq       = new MidiSeq("Midi");
+}
+
 //---------------------------------------------------------
 //   readMsg
 //---------------------------------------------------------
@@ -819,16 +826,16 @@ void MidiSeq::msgMsg(int id)
 
 void MidiSeq::msgSetMidiDevice(MidiPort* port, MidiDevice* device)
       {
-      MusECore::AudioMsg msg;
-      msg.id = MusECore::SEQM_IDLE;
-      msg.a  = true;
-      Thread::sendMsg(&msg);
-
-      port->setMidiDevice(device);
+        MusECore::AudioMsg msg;
+        msg.id = MusECore::SEQM_IDLE;
+        msg.a  = true;
+        Thread::sendMsg(&msg);
+        
+        port->setMidiDevice(device);
 
-      msg.id = MusECore::SEQM_IDLE;
-      msg.a  = false;
-      Thread::sendMsg(&msg);
+        msg.id = MusECore::SEQM_IDLE;
+        msg.a  = false;
+        Thread::sendMsg(&msg);
       }
 
 // This does not appear to be used anymore. Was called in Audio::process1, now Audio::processMidi is called directly. p4.0.15 Tim.
diff --git a/muse2/muse/mixer/amixer.cpp b/muse2/muse/mixer/amixer.cpp
index f9ede36c..34c8190b 100644
--- a/muse2/muse/mixer/amixer.cpp
+++ b/muse2/muse/mixer/amixer.cpp
@@ -169,7 +169,7 @@ AudioMixerApp::AudioMixerApp(QWidget* parent, MusEGlobal::MixerConfig* c)
       setWindowIcon(*museIcon);
 
       QMenu* menuConfig = menuBar()->addMenu(tr("&Create"));
-      MusEGui::populateAddTrack(menuConfig);
+      MusEGui::populateAddTrack(menuConfig,true);
       connect(menuConfig, SIGNAL(triggered(QAction *)), MusEGlobal::song, SLOT(addNewTrack(QAction *)));
       
       QMenu* menuView = menuBar()->addMenu(tr("&View"));
diff --git a/muse2/muse/mixer/astrip.cpp b/muse2/muse/mixer/astrip.cpp
index 10f281fb..9c393a1a 100644
--- a/muse2/muse/mixer/astrip.cpp
+++ b/muse2/muse/mixer/astrip.cpp
@@ -147,6 +147,7 @@ void AudioStrip::songChanged(int val)
         // Set the strip label's font.
         //label->setFont(MusEGlobal::config.fonts[1]);
         setLabelFont();
+        setLabelText();        
         
         // Adjust minimum volume slider and label values.
         slider->setRange(MusEGlobal::config.minSlider-0.1, 10.0);
@@ -203,7 +204,17 @@ void AudioStrip::songChanged(int val)
                   pre->setChecked(src->prefader());
                   pre->blockSignals(false);
                   }
-            }
+            
+            // Are there any Aux Track routing paths to this track? Then we cannot process aux for this track! 
+            // Hate to do this, but as a quick visual reminder, seems most logical to disable Aux knobs and labels. 
+            int rc = track->auxRefCount();
+            int n = auxKnob.size();
+            for (int idx = 0; idx < n; ++idx) 
+            {  
+              auxKnob[idx]->setEnabled( rc == 0 );
+              auxLabel[idx]->setEnabled( rc == 0 );
+            }  
+          }
       if (val & SC_AUX) {
             int n = auxKnob.size();
             for (int idx = 0; idx < n; ++idx) {
@@ -333,11 +344,14 @@ void AudioStrip::updateOffState()
             stereo->setEnabled(val);
       label->setEnabled(val);
       
+      // Are there any Aux Track routing paths to this track? Then we cannot process aux for this track! 
+      // Hate to do this, but as a quick visual reminder, seems most logical to disable Aux knobs and labels. 
+      bool ae = track->auxRefCount() == 0 && val;
       int n = auxKnob.size();
       for (int i = 0; i < n; ++i) 
       {
-        auxKnob[i]->setEnabled(val);
-        auxLabel[i]->setEnabled(val);
+        auxKnob[i]->setEnabled(ae);
+        auxLabel[i]->setEnabled(ae);
       }
             
       if (pre)
@@ -348,12 +362,12 @@ void AudioStrip::updateOffState()
             solo->setEnabled(val);
       if (mute)
             mute->setEnabled(val);
-      if (autoType)
-            autoType->setEnabled(val);
-      if (iR)
-            iR->setEnabled(val);
-      if (oR)
-            oR->setEnabled(val);
+      //if (autoType)
+      //      autoType->setEnabled(val);
+      //if (iR)
+      //      iR->setEnabled(val);
+      //if (oR)
+      //      oR->setEnabled(val);
       if (off) {
             off->blockSignals(true);
             off->setChecked(track->off());
@@ -799,6 +813,12 @@ AudioStrip::AudioStrip(QWidget* parent, MusECore::AudioTrack* at)
                   double val = MusECore::fast_log10(t->auxSend(idx))*20.0;
                   ak->setValue(val);
                   al->setValue(val);
+                  
+                  // Are there any Aux Track routing paths to this track? Then we cannot process aux for this track! 
+                  // Hate to do this, but as a quick visual reminder, seems most logical to disable Aux knobs and labels. 
+                  int rc = track->auxRefCount();
+                  ak->setEnabled( rc == 0 );
+                  al->setEnabled( rc == 0 );
                   }
             }
       else {
diff --git a/muse2/muse/mixer/mstrip.cpp b/muse2/muse/mixer/mstrip.cpp
index 2e51feb9..dc495aa6 100644
--- a/muse2/muse/mixer/mstrip.cpp
+++ b/muse2/muse/mixer/mstrip.cpp
@@ -448,9 +448,8 @@ void MidiStrip::updateOffState()
       // TODO: Disabled for now.
       //if (autoType)
       //      autoType->setEnabled(val);
-      if (iR)
-            iR->setEnabled(val);
-      // TODO: Disabled for now.
+      //if (iR)
+      //      iR->setEnabled(val);
       //if (oR)
       //      oR->setEnabled(val);
       if (off) {
@@ -504,6 +503,7 @@ void MidiStrip::songChanged(int val)
         // Set the strip label's font.
         //label->setFont(MusEGlobal::config.fonts[1]);
         setLabelFont();
+        setLabelText();        
       }  
     }
 
diff --git a/muse2/muse/mixer/strip.cpp b/muse2/muse/mixer/strip.cpp
index 5f5e5e39..146d981c 100644
--- a/muse2/muse/mixer/strip.cpp
+++ b/muse2/muse/mixer/strip.cpp
@@ -29,6 +29,8 @@
 #include <QColor>
 #include <QVBoxLayout>
 #include <QFrame>
+#include <QMouseEvent>
+#include <QMenu>
 
 #include "globals.h"
 #include "gconfig.h"
@@ -165,7 +167,8 @@ void Strip::setLabelText()
       //gradient.setColorAt(0, c.darker());
       //gradient.setColorAt(0, c);
       //gradient.setColorAt(1, c.darker());
-      gradient.setColorAt(0, c.lighter());
+      gradient.setColorAt(0, c);
+      gradient.setColorAt(0.5, c.lighter());
       gradient.setColorAt(1, c);
       //palette.setBrush(QPalette::Button, gradient);
       //palette.setBrush(QPalette::Window, gradient);
@@ -307,6 +310,23 @@ void Strip::resizeEvent(QResizeEvent* ev)
   setLabelText();  
   setLabelFont();
 }  
-      
+
+void Strip::mousePressEvent(QMouseEvent* ev)
+{
+  if (ev->button() == Qt::RightButton) {
+    QMenu* menu = new QMenu;
+    menu->addAction(tr("Remove track?"));
+    QPoint pt = QCursor::pos();
+    QAction* act = menu->exec(pt, 0);
+    if (!act)
+    {
+      delete menu;
+      return;
+    }
+    MusEGlobal::song->removeTrack0(track);
+    MusEGlobal::audio->msgUpdateSoloStates();
+  }
+}
+
 
 } // namespace MusEGui
diff --git a/muse2/muse/mixer/strip.h b/muse2/muse/mixer/strip.h
index 5b3b541b..d0cde1a6 100644
--- a/muse2/muse/mixer/strip.h
+++ b/muse2/muse/mixer/strip.h
@@ -73,6 +73,7 @@ class Strip : public QFrame {
       MusEGui::ComboBox* autoType;
       void setLabelText();
       virtual void resizeEvent(QResizeEvent*);
+      virtual void mousePressEvent(QMouseEvent *);
 
    private slots:
       void recordToggled(bool);
diff --git a/muse2/muse/mpevent.cpp b/muse2/muse/mpevent.cpp
index f72af528..8b65bce1 100644
--- a/muse2/muse/mpevent.cpp
+++ b/muse2/muse/mpevent.cpp
@@ -18,7 +18,6 @@
 //  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.
-//
 //=========================================================
 
 #include "mpevent.h"
@@ -42,6 +41,7 @@ MEvent::MEvent(unsigned t, int port, int tpe, const unsigned char* data, int len
       edata.setData(data, len);
       _type = tpe;
       _loopNum = 0;
+      setChannel(0);
       }
 
 MEvent::MEvent(unsigned tick, int port, int channel, const Event& e)
diff --git a/muse2/muse/mplugins/mitplugin.cpp b/muse2/muse/mplugins/mitplugin.cpp
index 48e30bb6..d4d7dd70 100644
--- a/muse2/muse/mplugins/mitplugin.cpp
+++ b/muse2/muse/mplugins/mitplugin.cpp
@@ -48,7 +48,7 @@ void MusE::startMidiInputPlugin(int id)
       QAction* act;
       if (id == 0) {
             if (!MusEGlobal::mitPluginTranspose) {
-                  MusEGlobal::mitPluginTranspose = new MusEGui::MITPluginTranspose();
+                  MusEGlobal::mitPluginTranspose = new MITPluginTranspose();
                   MusECore::mitPlugins.push_back(MusEGlobal::mitPluginTranspose);
                   connect(MusEGlobal::mitPluginTranspose, SIGNAL(hideWindow()),
                      SLOT(hideMitPluginTranspose()));
@@ -58,7 +58,7 @@ void MusE::startMidiInputPlugin(int id)
             }
       else if (id == 1) {
             if (!midiInputTransform) {
-                  midiInputTransform = new MusEGui::MidiInputTransformDialog();
+                  midiInputTransform = new MidiInputTransformDialog();
                   connect(midiInputTransform, SIGNAL(hideWindow()),
                      SLOT(hideMidiInputTransform()));
                   }
@@ -67,7 +67,7 @@ void MusE::startMidiInputPlugin(int id)
             }
       else if (id == 2) {
             if (!midiFilterConfig) {
-                  midiFilterConfig = new MusEGui::MidiFilterConfig();
+                  midiFilterConfig = new MidiFilterConfig();
                   connect(midiFilterConfig, SIGNAL(hideWindow()),
                      SLOT(hideMidiFilterConfig()));
                   }
@@ -76,7 +76,7 @@ void MusE::startMidiInputPlugin(int id)
             }
       else if (id == 3) {
             if (!midiRemoteConfig) {
-                  midiRemoteConfig = new MusEGui::MRConfig();
+                  midiRemoteConfig = new MRConfig();
                   connect(midiRemoteConfig, SIGNAL(hideWindow()),
                      SLOT(hideMidiRemoteConfig()));
                   }
@@ -134,7 +134,7 @@ void MusE::hideMidiRhythmGenerator()
 void MusE::startMidiTransformer()
       {
       if (midiTransformerDialog == 0)
-            midiTransformerDialog = new MusEGui::MidiTransformerDialog;
+            midiTransformerDialog = new MidiTransformerDialog;
       midiTransformerDialog->show();
       }
 
diff --git a/muse2/muse/mplugins/rhythm.cpp b/muse2/muse/mplugins/rhythm.cpp
index 78dfeee5..7c51227c 100644
--- a/muse2/muse/mplugins/rhythm.cpp
+++ b/muse2/muse/mplugins/rhythm.cpp
@@ -29,6 +29,8 @@
 
 #include "rhythm.h"
 
+namespace MusEGui {
+
 //---------------------------------------------------------
 //   RhythmGen
 //---------------------------------------------------------
@@ -525,5 +527,7 @@ RhythmGenerator::~RhythmGenerator()
 {
     // no need to delete child widgets, Qt does it all for us
 }
+
 #endif
 
+} // namespace MusEGui
diff --git a/muse2/muse/mplugins/rhythm.h b/muse2/muse/mplugins/rhythm.h
index d60e7993..de6c178b 100644
--- a/muse2/muse/mplugins/rhythm.h
+++ b/muse2/muse/mplugins/rhythm.h
@@ -34,17 +34,22 @@
 
 #include <QMainWindow>
 
+#define MAX_GROUPS  5
+#define MAX_KEYS   20
+
 class QCloseEvent;
 
+namespace MusECore {
+class Xml;
+}
+
+namespace MusEGui {
+
 class tTrack;
 class tEventWin;
 class tSong;
 class tBarInfo;
 
-#define MAX_GROUPS  5
-#define MAX_KEYS   20
-
-class Xml;
 
 #if 0
 //---------------------------------------------------------
@@ -59,8 +64,8 @@ struct tRhyGroup {
             listen = 0;
             contrib = 0;
             }
-//      void write(int, Xml&);
-//      void read(Xml&);
+//      void write(int, MusECore::Xml&);
+//      void read(MusECore::Xml&);
       };
 
 //---------------------------------------------------------
@@ -71,8 +76,8 @@ struct tRhyGroups {
       tRhyGroup g[MAX_GROUPS];
       tRhyGroup& operator [] (int i) { return g[i]; }
 
-//      void write(int, Xml&);
-//      void read(Xml&);
+//      void write(int, MusECore::Xml&);
+//      void read(MusECore::Xml&);
       };
 
 //---------------------------------------------------------
@@ -123,8 +128,8 @@ class tRhythm
       void GenInit(long start_clock);
       void GenerateEvent(tTrack *track, long clock, short vel, short len);
 
-      void write(int, Xml&);
-      void read(Xml&);
+      void write(int, MusECore::Xml&);
+      void read(MusECore::Xml&);
       };
 #endif
 
@@ -209,5 +214,7 @@ class RhythmGen : public QMainWindow, public Ui::RhythmBase
 //      bool OnClose();
       };
 
+} // namespace MusEGui
+
 #endif
 
diff --git a/muse2/muse/node.cpp b/muse2/muse/node.cpp
index db11b7bd..cb77f939 100644
--- a/muse2/muse/node.cpp
+++ b/muse2/muse/node.cpp
@@ -4,6 +4,7 @@
 //  $Id: node.cpp,v 1.36.2.25 2009/12/20 05:00:35 terminator356 Exp $
 //
 //  (C) Copyright 2000-2004 Werner Schweer (ws@seh.de)
+//  (C) Copyright 2011 Tim E. Real (terminator356 on sourceforge)
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -22,10 +23,11 @@
 //=========================================================
 
 #include <cmath>
-#include <assert.h>
 #include <sndfile.h>
 #include <stdlib.h>
 
+#include <QString>
+
 #include "node.h"
 #include "globals.h"
 #include "gconfig.h"
@@ -45,7 +47,6 @@
 //#define NODE_DEBUG 
 //#define FIFO_DEBUG 
 
-// Added by Tim. p3.3.18
 //#define METRONOME_DEBUG 
 
 namespace MusECore {
@@ -163,10 +164,19 @@ void Track::updateInternalSoloStates()
 
 void MidiTrack::updateInternalSoloStates()
 {
-      if(this == _tmpSoloChainTrack)
-        return;
-      
-      Track::updateInternalSoloStates();
+  if(_nodeTraversed)         // Anti circular mechanism.
+  {
+    fprintf(stderr, "MidiTrack::updateInternalSoloStates %s :\n  MusE Warning: Please check your routes: Circular path found!\n", name().toLatin1().constData()); 
+    return;                         
+  }  
+  //if(this == _tmpSoloChainTrack)  
+  //  return;
+  
+  _nodeTraversed = true; 
+  
+  Track::updateInternalSoloStates();
+  
+  _nodeTraversed = false;  // Reset.
 }
 
 
@@ -176,40 +186,61 @@ void MidiTrack::updateInternalSoloStates()
 
 void AudioTrack::updateInternalSoloStates()
 {
-      if(this == _tmpSoloChainTrack)
-        return;
-      
-      Track::updateInternalSoloStates();
-      
-      if(_tmpSoloChainDoIns)
+  if(_nodeTraversed)         // Anti circular mechanism.
+  {
+    fprintf(stderr, "AudioTrack::updateInternalSoloStates %s :\n  MusE Warning: Please check your routes: Circular path found!\n", name().toLatin1().constData()); 
+    return;                         
+  }  
+  //if(this == _tmpSoloChainTrack)  
+  //  return;
+  
+  _nodeTraversed = true; 
+
+  Track::updateInternalSoloStates();
+  
+  if(_tmpSoloChainDoIns)
+  {
+    if(type() == AUDIO_SOFTSYNTH)
+    {
+      const MusECore::MidiTrackList* ml = MusEGlobal::song->midis();
+      for(MusECore::ciMidiTrack im = ml->begin(); im != ml->end(); ++im)
       {
-        if(type() == AUDIO_SOFTSYNTH)
-        {
-          const MusECore::MidiTrackList* ml = MusEGlobal::song->midis();
-          for(MusECore::ciMidiTrack im = ml->begin(); im != ml->end(); ++im)
-          {
-            MusECore::MidiTrack* mt = *im;
-            if(mt->outPort() >= 0 && mt->outPort() == ((SynthI*)this)->midiPort())
-              mt->updateInternalSoloStates();
-          }
-        }
-        
-        const RouteList* rl = inRoutes();
-        for(ciRoute ir = rl->begin(); ir != rl->end(); ++ir)
-        {
-          if(ir->type == Route::TRACK_ROUTE)
-            ir->track->updateInternalSoloStates();
-        }
+        MusECore::MidiTrack* mt = *im;
+        if(mt->outPort() >= 0 && mt->outPort() == ((SynthI*)this)->midiPort())
+          mt->updateInternalSoloStates();
       }
-      else
-      {  
-        const RouteList* rl = outRoutes();
-        for(ciRoute ir = rl->begin(); ir != rl->end(); ++ir)
+    }
+    
+    const RouteList* rl = inRoutes();
+    for(ciRoute ir = rl->begin(); ir != rl->end(); ++ir)
+    {
+      if(ir->type == Route::TRACK_ROUTE)
+        ir->track->updateInternalSoloStates();
+      else  
+      // Support Midi Port -> Audio Input solo chains. p4.0.37 Tim.
+      if(ir->type == Route::MIDI_PORT_ROUTE)    
+      {
+        const MidiTrackList* ml = MusEGlobal::song->midis();
+        for(ciMidiTrack im = ml->begin(); im != ml->end(); ++im)
         {
-          if(ir->type == Route::TRACK_ROUTE)
-            ir->track->updateInternalSoloStates();
+          MidiTrack* mt = *im;
+          if(mt->outPort() == ir->midiPort && ((1 << mt->outChannel()) & ir->channel) )
+            mt->updateInternalSoloStates();
         }
-      }  
+      }
+    }
+  }
+  else
+  {  
+    const RouteList* rl = outRoutes();
+    for(ciRoute ir = rl->begin(); ir != rl->end(); ++ir)
+    {
+      if(ir->type == Route::TRACK_ROUTE)
+        ir->track->updateInternalSoloStates();
+    }
+  }  
+  
+  _nodeTraversed = false; // Reset.
 }
 
 
@@ -222,6 +253,8 @@ void MidiTrack::updateSoloStates(bool noDec)
   if(noDec && !_solo)
     return;
   
+  _nodeTraversed = true;  // Anti circular mechanism.
+  
   _tmpSoloChainTrack = this;
   _tmpSoloChainDoIns = false;
   _tmpSoloChainNoDec = noDec;
@@ -245,6 +278,8 @@ void MidiTrack::updateSoloStates(bool noDec)
       }  
     }
   }
+  
+  _nodeTraversed = false; // Reset.
 }
 
 
@@ -257,6 +292,8 @@ void AudioTrack::updateSoloStates(bool noDec)
   if(noDec && !_solo)
     return;
   
+  _nodeTraversed = true;  // Anti circular mechanism.
+
   _tmpSoloChainTrack = this;
   _tmpSoloChainNoDec = noDec;
   updateSoloState();
@@ -302,6 +339,8 @@ void AudioTrack::updateSoloStates(bool noDec)
         ir->track->updateInternalSoloStates();
     }
   }  
+  
+  _nodeTraversed = false; // Reset.
 }
 
 
@@ -328,7 +367,6 @@ void Track::setOff(bool val)
 //   copyData
 //---------------------------------------------------------
 
-//void AudioTrack::copyData(unsigned pos, int dstChannels, unsigned nframes, float** dstBuffer)
 void AudioTrack::copyData(unsigned pos, int dstChannels, int srcStartChan, int srcChannels, unsigned nframes, float** dstBuffer)
 {
   //Changed by T356. 12/12/09. 
@@ -337,60 +375,51 @@ void AudioTrack::copyData(unsigned pos, int dstChannels, int srcStartChan, int s
   // Make better use of AudioTrack::outBuffers as a post-effect pre-volume cache system for multiple calls here during processing.
   // Previously only WaveTrack used them. (Changed WaveTrack as well).
   
+  #ifdef NODE_DEBUG
+  printf("MusE: AudioTrack::copyData name:%s processed:%d\n", name().toLatin1().constData(), processed());
+  #endif
+  
   if(srcStartChan == -1)
     srcStartChan = 0;
     
-  int srcChans = (srcChannels == -1) ? channels() : srcChannels;
+  int trackChans = channels();
+  int srcChans = (srcChannels == -1) ? trackChans : srcChannels;
   int srcTotalOutChans = totalOutChannels();
   if(channels() == 1)
     srcTotalOutChans = 1;
   
-  #ifdef NODE_DEBUG
-  printf("MusE: AudioTrack::copyData name:%s processed:%d\n", name().toLatin1().constData(), processed());
-  #endif
-  
   // Special consideration for metronome: It is not part of the track list,
   //  and it has no in or out routes, yet multiple output tracks may call addData on it !
   // We can't tell how many output tracks call it, so we can only assume there might be more than one.
   // Not strictly necessary here because only addData is ever called, but just to be consistent...
-  //bool usedirectbuf = (outRoutes()->size() <= 1) || (type() == AUDIO_OUTPUT);
-  bool usedirectbuf = ((outRoutes()->size() <= 1) || (type() == AUDIO_OUTPUT)) && (this != metronome);
+  //bool usedirectbuf = ((outRoutes()->size() <= 1) || (type() == AUDIO_OUTPUT)) && (this != metronome);
   
   int i;
   
-  // p3.3.38
-  //float* buffer[srcChannels];
   float* buffer[srcTotalOutChans];
+  float data[nframes * srcTotalOutChans];
   
-  
-  //float data[nframes * srcChannels];
-  //for(i = 0; i < srcChannels; ++i)
-  //      buffer[i] = data + i * nframes;
-        
   // precalculate stereo volume
   double vol[2];
   double _volume = volume();
   double _pan = pan();
   vol[0] = _volume * (1.0 - _pan);
   vol[1] = _volume * (1.0 + _pan);
-  float meter[srcChans];
+  float meter[trackChans];
 
   // Have we been here already during this process cycle?
   if(processed())
   {
     // If there is only one (or no) output routes, it's an error - we've been called more than once per process cycle!
+    // No, this is no longer an error, it's deliberate. Processing no longer done in 'chains', now done randomly.  p4.0.37
     #ifdef NODE_DEBUG
-    if(usedirectbuf)
-      printf("MusE: AudioTrack::copyData Error! One or no out routes, but already processed! Copying local buffers anyway...\n");
+    printf("MusE: AudioTrack::copyData name:%s already processed _haveData:%d\n", name().toLatin1().constData(), _haveData);
     #endif
     
     // Is there already some data gathered from a previous call during this process cycle?
     if(_haveData)
     {
       // Point the input buffers at our local cached 'pre-volume' buffers. They need processing, so continue on after.
-      //for(i = 0; i < srcChannels; ++i)
-      //  buffer[i] = outBuffers[i];
-      // p3.3.38
       for(i = 0; i < srcTotalOutChans; ++i)
         buffer[i] = outBuffers[i];
     }
@@ -414,29 +443,16 @@ void AudioTrack::copyData(unsigned pos, int dstChannels, int srcStartChan, int s
   {
     // First time here during this process cycle. 
     
-    // Point the input buffers at a temporary stack buffer.
-    //float data[nframes * srcChannels];
-    //for(i = 0; i < srcChannels; ++i)
-    //    buffer[i] = data + i * nframes;
-    // p3.3.38
-    float data[nframes * srcTotalOutChans];
-    for(i = 0; i < srcTotalOutChans; ++i)
-        buffer[i] = data + i * nframes;
-  
-    // getData can use the supplied buffers, or change buffer to point to its own local buffers or Jack buffers etc. 
-    // For ex. if this is an audio input, Jack will set the pointers for us in AudioInput::getData!
-    // p3.3.29 1/27/10 Don't do any processing at all if off. Whereas, mute needs to be ready for action at all times,
-    //  so still call getData before it. Off is NOT meant to be toggled rapidly, but mute is !
-    //if(!getData(pos, srcChannels, nframes, buffer) || off() || (isMute() && !_prefader)) 
-    //if(off() || !getData(pos, srcChannels, nframes, buffer) || (isMute() && !_prefader)) 
-    // p3.3.38
-    if(off() || !getData(pos, srcTotalOutChans, nframes, buffer) || (isMute() && !_prefader)) 
-    {
+    _haveData = false;  // Reset.
+    _processed = true;  // Set this now.
+
+    if(off())  
+    {  
       #ifdef NODE_DEBUG
-      printf("MusE: AudioTrack::copyData name:%s dstChannels:%d zeroing buffers\n", name().toLatin1().constData(), dstChannels);
+      printf("MusE: AudioTrack::copyData name:%s dstChannels:%d Off, zeroing buffers\n", name().toLatin1().constData(), dstChannels);
       #endif
       
-      // No data was available. Zero the supplied buffers.
+      // Track is off. Zero the supplied buffers.
       unsigned int q;
       for(i = 0; i < dstChannels; ++i) 
       {
@@ -449,13 +465,12 @@ void AudioTrack::copyData(unsigned pos, int dstChannels, int srcStartChan, int s
           memset(dstBuffer[i], 0, sizeof(float) * nframes);
       }  
       
-      for(i = 0; i < srcChans; ++i) 
+      _efxPipe->apply(0, nframes, 0);  // Just process controls only, not audio (do not 'run').    
+
+      for(i = 0; i < trackChans; ++i) 
       {
-        //_meter[i] = 0;
         _meter[i] = 0.0;
-        
-        /*
-        if(!usedirectbuf)
+        /*if(!usedirectbuf)
         {
           if(MusEGlobal::config.useDenormalBias) 
           {
@@ -464,22 +479,49 @@ void AudioTrack::copyData(unsigned pos, int dstChannels, int srcStartChan, int s
           }
           else    
             memset(outBuffers[i], 0, sizeof(float) * nframes);
-        }
-        */
+        } */
       }
       
-      _haveData = false;
-      _processed = true;
+      //_haveData = false;
+      //_processed = true;
+      //_isProcessing = false;  // Unblock.
       return;
     }
+    
+    // Point the input buffers at a temporary stack buffer.
+    for(i = 0; i < srcTotalOutChans; ++i)
+        buffer[i] = data + i * nframes;
+  
+    // getData can use the supplied buffers, or change buffer to point to its own local buffers or Jack buffers etc. 
+    // For ex. if this is an audio input, Jack will set the pointers for us in AudioInput::getData!
+    // Don't do any processing at all if off. Whereas, mute needs to be ready for action at all times,
+    //  so still call getData before it. Off is NOT meant to be toggled rapidly, but mute is !
+    if(!getData(pos, srcTotalOutChans, nframes, buffer) || (isMute() && !_prefader)) 
+    {
+      #ifdef NODE_DEBUG
+      printf("MusE: AudioTrack::copyData name:%s srcTotalOutChans:%d zeroing buffers\n", name().toLatin1().constData(), srcTotalOutChans);
+      #endif
+      
+      // No data was available. Track is not off. Zero the working buffers and continue on.
+      unsigned int q;
+      for(i = 0; i < srcTotalOutChans; ++i)
+      {  
+        if(MusEGlobal::config.useDenormalBias) 
+        {
+          for(q = 0; q < nframes; ++q)
+            buffer[i][q] = MusEGlobal::denormalBias;
+        } 
+        else
+          memset(buffer[i], 0, sizeof(float) * nframes);
+      }  
+    }
 
     //---------------------------------------------------
     // apply plugin chain
     //---------------------------------------------------
 
-    // p3.3.41
     //fprintf(stderr, "AudioTrack::copyData %s efx apply srcChans:%d\n", name().toLatin1().constData(), srcChans);
-    _efxPipe->apply(srcChans, nframes, buffer);
+    _efxPipe->apply(trackChans, nframes, buffer);   
 
     //---------------------------------------------------
     // aux sends
@@ -526,18 +568,16 @@ void AudioTrack::copyData(unsigned pos, int dstChannels, int srcStartChan, int s
 
     if(_prefader) 
     {
-      for(i = 0; i < srcChans; ++i) 
+      for(i = 0; i < trackChans; ++i)   
       {
         float* p = buffer[i];
         meter[i] = 0.0;
         for(unsigned k = 0; k < nframes; ++k) 
         {
-          double f = fabs(*p);
+          double f = fabs(*p++);
           if(f > meter[i])
             meter[i] = f;
-          ++p;
         }
-        //_meter[i] = lrint(meter[i] * 32767.0);
         _meter[i] = meter[i];
         if(_meter[i] > _peak[i])
           _peak[i] = _meter[i];
@@ -571,20 +611,19 @@ void AudioTrack::copyData(unsigned pos, int dstChannels, int srcStartChan, int s
           else    
             memset(outBuffers[i], 0, sizeof(float) * nframes);
         }
-      }
-      */  
+      } */
+      
       
-      _haveData = false;
-      _processed = true;
+      if(!_prefader) 
+        for(i = 0; i < trackChans; ++i) // Must process ALL channels, even if unconnected. Only max 2 channels.
+          _meter[i] = 0.0;
+
       return;
     }
     
     // If we're using local cached 'pre-volume' buffers, copy the input buffers (as they are right now: post-effect pre-volume) back to them. 
-    if(!usedirectbuf)
+    //if(!usedirectbuf)
     {
-      //for(i = 0; i < srcChannels; ++i)
-      //  AL::dsp->cpy(outBuffers[i], buffer[i], nframes);
-      // p3.3.38
       for(i = 0; i < srcTotalOutChans; ++i)
         AL::dsp->cpy(outBuffers[i], buffer[i], nframes);
     }
@@ -607,9 +646,9 @@ void AudioTrack::copyData(unsigned pos, int dstChannels, int srcStartChan, int s
       else 
         memset(dstBuffer[i], 0, sizeof(float) * nframes);
     }        
-    _processed = true;
     return;
   }
+
   // Force a source range to fit actual available total out channels.
   if((srcStartChan + srcChans) > srcTotalOutChans) 
     srcChans = srcTotalOutChans - srcStartChan;
@@ -619,132 +658,94 @@ void AudioTrack::copyData(unsigned pos, int dstChannels, int srcStartChan, int s
   //    postfader metering
   //---------------------------------------------------
 
-    
-  if(srcChans == dstChannels) 
+  #ifdef NODE_DEBUG
+  printf("MusE: AudioTrack::copyData trackChans:%d srcTotalOutChans:%d srcStartChan:%d srcChans:%d dstChannels:%d\n", trackChans, srcTotalOutChans, srcStartChan, srcChans, dstChannels);
+  #endif
+      
+  if(!_prefader) 
   {
-    if(_prefader) 
+    for(int c = 0; c < trackChans; ++c)     
     {
-      for(int c = 0; c < dstChannels; ++c) 
+      meter[c] = 0.0;
+      double v = (trackChans == 1 ? _volume : vol[c]);        
+      float* sp = buffer[c];
+      for(unsigned k = 0; k < nframes; ++k) 
       {
-        // p3.3.38
-        //float* sp = buffer[c];
-        float* sp = buffer[c + srcStartChan];
-        
-        float* dp = dstBuffer[c];
-        for(unsigned k = 0; k < nframes; ++k)
-          *dp++ = (*sp++ * vol[c]);
+        float val = *sp++ * v;  // If the track is mono pan has no effect on meters.
+        double f = fabs(val);
+        if(f > meter[c])
+          meter[c] = f;
       }
-    }
-    else 
+      _meter[c] = meter[c];
+      if(_meter[c] > _peak[c])
+        _peak[c] = _meter[c];
+    }  
+  }
+    
+  if(srcChans == dstChannels) 
+  {
+    for(int c = 0; c < dstChannels; ++c) 
     {
-      for(int c = 0; c < dstChannels; ++c) 
-      {
-        meter[c] = 0.0;
-        
-        // p3.3.38
-        //float* sp = buffer[c];
-        float* sp = buffer[c + srcStartChan];
-        
-        float* dp = dstBuffer[c];
-        //printf("2 dstBuffer[c]=%d\n",long(dstBuffer[c]));
-        for(unsigned k = 0; k < nframes; ++k) 
-        {
-          float val = *sp++ * vol[c];
-          *dp++ = val;
-          double f = fabs(val);
-          if(f > meter[c])
-            meter[c] = f;
-        }
-        //_meter[c] = lrint(meter[c] * 32767.0);
-        _meter[c] = meter[c];
-        if(_meter[c] > _peak[c])
-          _peak[c] = _meter[c];
-      }
+      double v;
+      if(srcStartChan > 2)      // Don't apply pan or volume to extra channels above 2.
+        //v = _volume;
+        v = 1.0;
+      else
+      if(srcChans >= 2)         // If 2 channels apply pan normally.
+        v = vol[c];
+      else
+      if(trackChans < 2)        // If 1 channel and track is 1 channel, don't apply pan.
+        v = _volume;
+      else
+        v = vol[srcStartChan];  // Otherwise 1 channel but track is 2 channels. Apply the channel volume.
+      
+      float* sp = buffer[c + srcStartChan];
+      float* dp = dstBuffer[c];
+      for(unsigned k = 0; k < nframes; ++k)
+        //*dp++ = (*sp++ * vol[c]);
+        *dp++ = (*sp++ * v);
     }
   }
   else if(srcChans == 1 && dstChannels == 2) 
   {
-    // p3.3.38
-    //float* sp = buffer[0];
-    float* sp = buffer[srcStartChan];
-    
-    if(_prefader) 
+    for(int c = 0; c < dstChannels; ++c) 
     {
-      for(int c = 0; c < dstChannels; ++c) 
-      {
-        float* dp = dstBuffer[c];
-        for(unsigned k = 0; k < nframes; ++k)
-          *dp++ = (*sp++ * vol[c]);
-      }
-    }
-    else 
-    {
-      meter[0] = 0.0;
-      for(unsigned k = 0; k < nframes; ++k) 
-      {
-        float val = *sp++;
-        double f = fabs(val) * _volume;
-        if(f > meter[0])
-          meter[0] = f;
-        *(dstBuffer[0] + k) = val * vol[0];
-        *(dstBuffer[1] + k) = val * vol[1];
-      }
-      //_meter[0] = lrint(meter[0] * 32767.0);
-      _meter[0] = meter[0];
-      if(_meter[0] > _peak[0])
-        _peak[0] = _meter[0];
+      double v;
+      if(srcStartChan > 2)      // Don't apply pan or volume to extra channels above 2.
+        //v = _volume;
+        v = 1.0;
+      else
+      if(trackChans <= 1)       // If track is mono apply pan.
+        v = vol[c];
+      else
+        v = vol[srcStartChan];  // Otherwise track is stereo, apply the same channel volume to both.
+      
+      float* sp = buffer[srcStartChan];
+      float* dp = dstBuffer[c];
+      for(unsigned k = 0; k < nframes; ++k)
+        //*dp++ = (*sp++ * vol[c]);
+        *dp++ = (*sp++ * v);
     }
   }
   else if(srcChans == 2 && dstChannels == 1) 
   {
-    // p3.3.38
-    //float* sp1 = buffer[0];
-    //float* sp2 = buffer[1];
+    //double v1 = (srcStartChan > 2 ? _volume : vol[srcStartChan]);       // Don't apply pan to extra channels above 2.
+    //double v2 = (srcStartChan > 2 ? _volume : vol[srcStartChan + 1]);   // 
+    double v1 = (srcStartChan > 2 ? 1.0 : vol[srcStartChan]);             // Don't apply pan or volume to extra channels above 2.
+    double v2 = (srcStartChan > 2 ? 1.0 : vol[srcStartChan + 1]);         // 
+    float* dp = dstBuffer[0];
     float* sp1 = buffer[srcStartChan];
     float* sp2 = buffer[srcStartChan + 1];
-    
-    if(_prefader) 
-    {
-      float* dp = dstBuffer[0];
-      for(unsigned k = 0; k < nframes; ++k)
-        *dp++ = (*sp1++ * vol[0] + *sp2++ * vol[1]);
-    }
-    else 
-    {
-      float* dp = dstBuffer[0];
-      meter[0] = 0.0;
-      meter[1] = 0.0;
-      for(unsigned k = 0; k < nframes; ++k) 
-      {
-        float val1 = *sp1++ * vol[0];
-        float val2 = *sp2++ * vol[1];
-        double f1 = fabs(val1);
-        if(f1 > meter[0])
-          meter[0] = f1;
-        double f2 = fabs(val2);
-        if(f2 > meter[1])
-          meter[1] = f2;
-        *dp++ = (val1 + val2);
-      }
-      //_meter[0] = lrint(meter[0] * 32767.0);
-      _meter[0] = meter[0];
-      if(_meter[0] > _peak[0])
-        _peak[0] = _meter[0];
-      //_meter[1] = lrint(meter[1] * 32767.0);
-      _meter[1] = meter[1];
-      if(_meter[1] > _peak[1])
-        _peak[1] = _meter[1];
-    }
+    for(unsigned k = 0; k < nframes; ++k)
+      //*dp++ = (*sp1++ * vol[0] + *sp2++ * vol[1]);
+      *dp++ = (*sp1++ * v1 + *sp2++ * v2);
   }
-        
-  _processed = true;
 }
 
 //---------------------------------------------------------
 //   addData
 //---------------------------------------------------------
 
-//void AudioTrack::addData(unsigned pos, int dstChannels, unsigned nframes, float** dstBuffer)
 void AudioTrack::addData(unsigned pos, int dstChannels, int srcStartChan, int srcChannels, unsigned nframes, float** dstBuffer)
 {
   //Changed by T356. 12/12/09. 
@@ -753,21 +754,21 @@ void AudioTrack::addData(unsigned pos, int dstChannels, int srcStartChan, int sr
   // Make better use of AudioTrack::outBuffers as a post-effect pre-volume cache system for multiple calls here during processing.
   // Previously only WaveTrack used them. (Changed WaveTrack as well).
   
-  //Added by Tim. p3.3.16
   #ifdef NODE_DEBUG
   printf("MusE: AudioTrack::addData name:%s processed:%d\n", name().toLatin1().constData(), processed());
   #endif
   
-  if (off())
-  {
-    _processed = true;
-    return;
-  } 
+  //if (off())
+  //{
+  //  _processed = true;
+  //  return;
+  //} 
         
   if(srcStartChan == -1)
     srcStartChan = 0;
     
-  int srcChans = (srcChannels == -1) ? channels() : srcChannels;
+  int trackChans = channels();
+  int srcChans = (srcChannels == -1) ? trackChans : srcChannels;
   int srcTotalOutChans = totalOutChannels();
   if(channels() == 1)
     srcTotalOutChans = 1;
@@ -775,18 +776,12 @@ void AudioTrack::addData(unsigned pos, int dstChannels, int srcStartChan, int sr
   // Special consideration for metronome: It is not part of the track list,
   //  and it has no in or out routes, yet multiple output tracks may call addData on it !
   // We can't tell how many output tracks call it, so we can only assume there might be more than one.
-  //bool usedirectbuf = (outRoutes()->size() <= 1) || (type() == AUDIO_OUTPUT);
-  bool usedirectbuf = ((outRoutes()->size() <= 1) || (type() == AUDIO_OUTPUT)) && (this != metronome);
+  //bool usedirectbuf = ((outRoutes()->size() <= 1) || (type() == AUDIO_OUTPUT)) && (this != metronome);
   
   int i;
   
-  // p3.3.38
-  //float* buffer[srcChannels];
   float* buffer[srcTotalOutChans];
-  
-  //float data[nframes * srcChannels];
-  //for (i = 0; i < srcChannels; ++i)
-  //      buffer[i] = data + i * nframes;
+  float data[nframes * srcTotalOutChans];
   
   // precalculate stereo volume
   double vol[2];
@@ -794,105 +789,96 @@ void AudioTrack::addData(unsigned pos, int dstChannels, int srcStartChan, int sr
   double _pan = pan();
   vol[0] = _volume * (1.0 - _pan);
   vol[1] = _volume * (1.0 + _pan);
-  float meter[srcChans];
+  //float meter[srcChans];
+  float meter[trackChans];
 
   // Have we been here already during this process cycle?
   if(processed())
   {
     // If there is only one (or no) output routes, it's an error - we've been called more than once per process cycle!
+    // No, this is no longer an error, it's deliberate. Processing no longer done in 'chains', now done randomly.  p4.0.37
     #ifdef NODE_DEBUG
-    if(usedirectbuf)
-      printf("MusE: AudioTrack::addData Error! One or no out routes, but already processed! Copying local buffers anyway...\n");
+    printf("MusE: AudioTrack::addData name:%s already processed _haveData:%d\n", name().toLatin1().constData(), _haveData);
     #endif
     
     // Is there already some data gathered from a previous call during this process cycle?
     if(_haveData)
     {
       // Point the input buffers at our local cached 'pre-volume' buffers. They need processing, so continue on after.
-      //for(i = 0; i < srcChannels; ++i)
-      //  buffer[i] = outBuffers[i];
-      // p3.3.38
       for(i = 0; i < srcTotalOutChans; ++i)
         buffer[i] = outBuffers[i];
     }
     else
+    {  
       // No data was available from a previous call during this process cycle. Nothing to add, just return.
       return;  
+    }  
   }
   else
   {
     // First time here during this process cycle. 
     
-    // Point the input buffers at a temporary stack buffer.
-    //float data[nframes * srcChannels];
-    //for(i = 0; i < srcChannels; ++i)
-    //  buffer[i] = data + i * nframes;
-    // p3.3.38
-    float data[nframes * srcTotalOutChans];
-    for(i = 0; i < srcTotalOutChans; ++i)
-        buffer[i] = data + i * nframes;
-  
+    _haveData = false;  // Reset.
+    _processed = true;  // Set this now.
     
-    // getData can use the supplied buffers, or change buffer to point to its own local buffers or Jack buffers etc. 
-    // For ex. if this is an audio input, Jack will set the pointers for us.
-    //if(!getData(pos, srcChannels, nframes, buffer)) 
-    // p3.3.38
-    if(!getData(pos, srcTotalOutChans, nframes, buffer)) 
-    {
-      // No data was available. Nothing to add, but zero our local buffers and the meters.
-      for(i = 0; i < srcChans; ++i)
+    if(off())  
+    {  
+      #ifdef NODE_DEBUG
+      printf("MusE: AudioTrack::addData name:%s dstChannels:%d Track is Off \n", name().toLatin1().constData(), dstChannels);
+      #endif
+      
+      //  Nothing to zero or add...
+      
+      _efxPipe->apply(0, nframes, 0);  // Track is off. Just process controls only, not audio (do not 'run').    
+
+      for(i = 0; i < trackChans; ++i) 
       {
-        // If we're using local buffers, we must zero them so that the next thing requiring them 
-        //  during this process cycle will see zeros.
-        /*
-        if(!usedirectbuf)
+        _meter[i] = 0.0;
+        /*if(!usedirectbuf)
         {
           if(MusEGlobal::config.useDenormalBias) 
           {
-            for(unsigned int q = 0; q < nframes; ++q)
+            for(q = 0; q < nframes; ++q)
               outBuffers[i][q] = MusEGlobal::denormalBias;
-          }  
-          else
+          }
+          else    
             memset(outBuffers[i], 0, sizeof(float) * nframes);
-        }
-        */  
-          
-        //_meter[i] = 0;
-        _meter[i] = 0.0;
-      }      
-      
-      _haveData = false;
-      _processed = true;
+        } */
+      }
       return;
     }
-
-    /*
-    // p3.3.41 Added.
-    unsigned int q;
-    for(i = 0; i < srcChans; ++i) 
+      
+    // Point the input buffers at a temporary stack buffer.
+    for(i = 0; i < srcTotalOutChans; ++i)
+        buffer[i] = data + i * nframes;
+  
+    // getData can use the supplied buffers, or change buffer to point to its own local buffers or Jack buffers etc. 
+    // For ex. if this is an audio input, Jack will set the pointers for us.
+    if(!getData(pos, srcTotalOutChans, nframes, buffer)) 
     {
-      if(MusEGlobal::config.useDenormalBias) 
-      {
-        for(q = 0; q < nframes; ++q)
+      // No data was available. Track is not off. Zero the working buffers and continue on.
+      unsigned int q;
+      for(i = 0; i < srcTotalOutChans; ++i)
+      {  
+        if(MusEGlobal::config.useDenormalBias) 
         {
-          if(q & 1)
-            buffer[i][q] -= MusEGlobal::denormalBias;
-          else
-            buffer[i][q] += MusEGlobal::denormalBias;
-        }  
-      } 
-    }  
-    */
-    
+          for(q = 0; q < nframes; ++q)
+            buffer[i][q] = MusEGlobal::denormalBias;
+        } 
+        else
+          memset(buffer[i], 0, sizeof(float) * nframes);
+      }  
+    }
+
     //---------------------------------------------------
     // apply plugin chain
     //---------------------------------------------------
 
-    // p3.3.41
     //fprintf(stderr, "AudioTrack::addData %s efx apply srcChans:%d nframes:%ld %e %e %e %e\n", 
     //        name().toLatin1().constData(), srcChans, nframes, buffer[0][0], buffer[0][1], buffer[0][2], buffer[0][3]);
-    _efxPipe->apply(srcChans, nframes, buffer);
-    // p3.3.41
+    
+    _efxPipe->apply(trackChans, nframes, buffer);   
+    
     //fprintf(stderr, "AudioTrack::addData after efx: %e %e %e %e\n", 
     //        buffer[0][0], buffer[0][1], buffer[0][2], buffer[0][3]);
 
@@ -941,18 +927,16 @@ void AudioTrack::addData(unsigned pos, int dstChannels, int srcStartChan, int sr
 
     if(_prefader) 
     {
-      for(i = 0; i < srcChans; ++i) 
+      for(i = 0; i < trackChans; ++i) 
       {
         float* p = buffer[i];
         meter[i] = 0.0;
         for(unsigned k = 0; k < nframes; ++k) 
         {
-          double f = fabs(*p);
+          double f = fabs(*p++);
           if(f > meter[i])
             meter[i] = f;
-          ++p;
         }
-        //_meter[i] = lrint(meter[i] * 32767.0);
         _meter[i] = meter[i];
         if(_meter[i] > _peak[i])
           _peak[i] = _meter[i];
@@ -962,8 +946,7 @@ void AudioTrack::addData(unsigned pos, int dstChannels, int srcStartChan, int sr
     if(isMute())
     {
       // If we're using local buffers, we must zero them.
-      /*
-      if(!usedirectbuf)
+      /* if(!usedirectbuf)
       {
         for(i = 0; i < srcChannels; ++i)
         {
@@ -975,20 +958,19 @@ void AudioTrack::addData(unsigned pos, int dstChannels, int srcStartChan, int sr
           else
             memset(outBuffers[i], 0, sizeof(float) * nframes);
         }    
-      }  
-      */
+      } */ 
       
-      _haveData = false;
-      _processed = true;
+      if(!_prefader) 
+        //for(i = 0; i < srcChans; ++i) 
+        for(i = 0; i < trackChans; ++i)   
+          _meter[i] = 0.0;
+        
       return;
     }
     
     // If we're using local cached 'pre-volume' buffers, copy the input buffers (as they are right now: post-effect pre-volume) back to them. 
-    if(!usedirectbuf)
+    //if(!usedirectbuf)
     {
-      //for(i = 0; i < srcChannels; ++i)
-      //  AL::dsp->cpy(outBuffers[i], buffer[i], nframes);
-      // p3.3.38
       for(i = 0; i < srcTotalOutChans; ++i)
         AL::dsp->cpy(outBuffers[i], buffer[i], nframes);
     }
@@ -1011,9 +993,9 @@ void AudioTrack::addData(unsigned pos, int dstChannels, int srcStartChan, int sr
       else 
         memset(dstBuffer[i], 0, sizeof(float) * nframes);
     }        
-    _processed = true;
     return;
   }
+  
   // Force a source range to fit actual available total out channels.
   if((srcStartChan + srcChans) > srcTotalOutChans) 
     srcChans = srcTotalOutChans - srcStartChan;
@@ -1023,123 +1005,88 @@ void AudioTrack::addData(unsigned pos, int dstChannels, int srcStartChan, int sr
   //    postfader metering
   //---------------------------------------------------
 
-  if(srcChans == dstChannels) 
+  #ifdef NODE_DEBUG
+  printf("MusE: AudioTrack::addData trackChans:%d srcTotalOutChans:%d srcChans:%d dstChannels:%d\n", trackChans, srcTotalOutChans, srcChans, dstChannels);
+  #endif
+      
+  if(!_prefader) 
   {
-    if(_prefader) 
+    for(int c = 0; c < trackChans; ++c)     
     {
-      for(int c = 0; c < dstChannels; ++c) 
+      meter[c] = 0.0;
+      double v = (trackChans == 1 ? _volume : vol[c]);        
+      float* sp = buffer[c];
+      for(unsigned k = 0; k < nframes; ++k) 
       {
-        // p3.3.38
-        //float* sp = buffer[c];
-        float* sp = buffer[c + srcStartChan];
-        
-        float* dp = dstBuffer[c];
-        for(unsigned k = 0; k < nframes; ++k)
-          *dp++ += (*sp++ * vol[c]);
+        float val = *sp++ * v;  // If the track is mono pan has no effect on meters.
+        double f = fabs(val);
+        if(f > meter[c])
+          meter[c] = f;
       }
-    }
-    else 
+      _meter[c] = meter[c];
+      if(_meter[c] > _peak[c])
+        _peak[c] = _meter[c];
+    }  
+  }
+  
+  if(srcChans == dstChannels) 
+  {
+    for(int c = 0; c < dstChannels; ++c) 
     {
-      for(int c = 0; c < dstChannels; ++c) 
-      {
-        meter[c] = 0.0;
-        // p3.3.38
-        //float* sp = buffer[c];
-        float* sp = buffer[c + srcStartChan];
-        
-        float* dp = dstBuffer[c];
-        for(unsigned k = 0; k < nframes; ++k) 
-        {
-          float val = *sp++ * vol[c];
-          *dp++ += val;
-          double f = fabs(val);
-          if (f > meter[c])
-                meter[c] = f;
-        }
-        //_meter[c] = lrint(meter[c] * 32767.0);
-        _meter[c] = meter[c];
-        if(_meter[c] > _peak[c])
-          _peak[c] = _meter[c];
-      }
+      double v;
+      if(srcStartChan > 2)      // Don't apply pan or volume to extra channels above 2.
+        //v = _volume;
+        v = 1.0;
+      else
+      if(srcChans >= 2)         // If 2 channels apply pan normally.
+        v = vol[c];
+      else
+      if(trackChans < 2)        // If 1 channel and track is 1 channel, don't apply pan.
+        v = _volume;
+      else
+        v = vol[srcStartChan];  // Otherwise 1 channel but track is 2 channels. Apply the channel volume.
+      
+      float* sp = buffer[c + srcStartChan];
+      float* dp = dstBuffer[c];
+      for(unsigned k = 0; k < nframes; ++k)
+        //*dp++ += (*sp++ * vol[c]);
+        *dp++ += (*sp++ * v);
     }
   }
   else if(srcChans == 1 && dstChannels == 2) 
   {
-    // p3.3.38
-    float* sp = buffer[srcStartChan];
-    
-    if(_prefader) 
+    for(int c = 0; c < dstChannels; ++c) 
     {
-      for(int c = 0; c < dstChannels; ++c) 
-      {
-        float* dp = dstBuffer[c];
-        //float* sp = buffer[0];
-        for(unsigned k = 0; k < nframes; ++k)
-          *dp++ += (*sp++ * vol[c]);
-      }
-    }
-    else 
-    {
-      //float* sp = buffer[0];
-      meter[0]  = 0.0;
-      for(unsigned k = 0; k < nframes; ++k) 
-      {
-        float val = *sp++;
-        double f = fabs(val) * _volume;
-        if(f > meter[0])
-          meter[0] = f;
-        *(dstBuffer[0] + k) += val * vol[0];
-        *(dstBuffer[1] + k) += val * vol[1];
-      }
-      //_meter[0] = lrint(meter[0] * 32767.0);
-      _meter[0] = meter[0];
-      if(_meter[0] > _peak[0])
-        _peak[0] = _meter[0];
+      double v;
+      if(srcStartChan > 2)      // Don't apply pan or volume to extra channels above 2.
+        //v = _volume;
+        v = 1.0;
+      else
+      if(trackChans <= 1)       // If track is mono apply pan.
+        v = vol[c];
+      else
+        v = vol[srcStartChan];  // Otherwise track is stereo, apply the same channel volume to both.
+      
+      float* sp = buffer[srcStartChan];
+      float* dp = dstBuffer[c];
+      for(unsigned k = 0; k < nframes; ++k)
+        //*dp++ += (*sp++ * vol[c]);
+        *dp++ += (*sp++ * v);
     }
   }
   else if(srcChans == 2 && dstChannels == 1) 
   {
-    // p3.3.38
-    //float* sp1 = buffer[0];
-    //float* sp2 = buffer[1];
+    //double v1 = (srcStartChan > 2 ? _volume : vol[srcStartChan]);       // Don't apply pan to extra channels above 2.
+    //double v2 = (srcStartChan > 2 ? _volume : vol[srcStartChan + 1]);   // 
+    double v1 = (srcStartChan > 2 ? 1.0 : vol[srcStartChan]);             // Don't apply pan or volume to extra channels above 2.
+    double v2 = (srcStartChan > 2 ? 1.0 : vol[srcStartChan + 1]);         // 
     float* sp1 = buffer[srcStartChan];
     float* sp2 = buffer[srcStartChan + 1];
-    
-    if(_prefader) 
-    {
-      float* dp = dstBuffer[0];
-      for(unsigned k = 0; k < nframes; ++k)
-        *dp++ += (*sp1++ * vol[0] + *sp2++ * vol[1]);
-    }
-    else 
-    {
-      float* dp = dstBuffer[0];
-      meter[0] = 0.0;
-      meter[1] = 0.0;
-      for(unsigned k = 0; k < nframes; ++k) 
-      {
-        float val1 = *sp1++ * vol[0];
-        float val2 = *sp2++ * vol[1];
-        double f1 = fabs(val1);
-        if(f1 > meter[0])
-          meter[0] = f1;
-        double f2 = fabs(val2);
-        if(f2 > meter[1])
-          meter[1] = f2;
-        *dp++ += (val1 + val2);
-      }
-      //_meter[0] = lrint(meter[0] * 32767.0);
-      _meter[0] = meter[0];
-      if(_meter[0] > _peak[0])
-        _peak[0] = _meter[0];
-      //_meter[1] = lrint(meter[1] * 32767.0);
-      _meter[1] = meter[1];
-      if(_meter[1] > _peak[1])
-        _peak[1] = _meter[1];
-    }
+    float* dp = dstBuffer[0];
+    for(unsigned k = 0; k < nframes; ++k)
+      //*dp++ += (*sp1++ * vol[0] + *sp2++ * vol[1]);
+      *dp++ += (*sp1++ * v1 + *sp2++ * v2);
   }
-  
-  _processed = true;
 }
 
 //---------------------------------------------------------
@@ -1301,15 +1248,12 @@ bool AudioTrack::getData(unsigned pos, int channels, unsigned nframes, float** b
       printf("    calling copyData on %s...\n", ir->track->name().toLatin1().constData());
       #endif
       
-      // p3.3.38
-      //((AudioTrack*)ir->track)->copyData(pos, channels, nframes, buffer);
       ((AudioTrack*)ir->track)->copyData(pos, channels, 
                                          //(ir->track->type() == Track::AUDIO_SOFTSYNTH && ir->channel != -1) ? ir->channel : 0,
                                          ir->channel,
                                          ir->channels,
                                          nframes, buffer);
       
-      // p3.3.41
       //fprintf(stderr, "AudioTrack::getData %s data: nframes:%ld %e %e %e %e\n", name().toLatin1().constData(), nframes, buffer[0][0], buffer[0][1], buffer[0][2], buffer[0][3]);
       
       ++ir;
@@ -1321,8 +1265,6 @@ bool AudioTrack::getData(unsigned pos, int channels, unsigned nframes, float** b
             if(ir->track->isMidiTrack())
               continue;
               
-            // p3.3.38
-            //((AudioTrack*)ir->track)->addData(pos, channels, nframes, buffer);
             ((AudioTrack*)ir->track)->addData(pos, channels, 
                                               //(ir->track->type() == Track::AUDIO_SOFTSYNTH && ir->channel != -1) ? ir->channel : 0,
                                               ir->channel,
@@ -1345,12 +1287,11 @@ bool AudioInput::getData(unsigned, int channels, unsigned nframes, float** buffe
             void* jackPort = jackPorts[ch];
             //float* jackbuf = 0;
             
-            //if (jackPort) {
-            // p3.3.41 Do not get buffers of unconnected client ports. Causes repeating leftover data, can be loud, or DC !
+            // Do not get buffers of unconnected client ports. Causes repeating leftover data, can be loud, or DC !
             if (jackPort && MusEGlobal::audioDevice->connections(jackPort)) 
             {
                   //buffer[ch] = MusEGlobal::audioDevice->getBuffer(jackPort, nframes);
-                  // p3.3.41 If the client port buffer is also used by another channel (connected to the same jack port), 
+                  // If the client port buffer is also used by another channel (connected to the same jack port), 
                   //  don't directly set pointer, copy the data instead. 
                   // Otherwise the next channel will interfere - it will overwrite the buffer !
                   // Verified symptoms: Can't use a splitter. Mono noise source on a stereo track sounds in mono. Etc...
@@ -1367,8 +1308,6 @@ bool AudioInput::getData(unsigned, int channels, unsigned nframes, float** buffe
                   {
                       for (unsigned int i=0; i < nframes; i++)
                               buffer[ch][i] += MusEGlobal::denormalBias;
-                      
-                      // p3.3.41
                       //fprintf(stderr, "AudioInput::getData %s Jack port %p efx apply channels:%d nframes:%ld %e %e %e %e\n", 
                       //        name().toLatin1().constData(), jackPort, channels, nframes, buffer[0][0], buffer[0][1], buffer[0][2], buffer[0][3]);
                   }
@@ -1385,8 +1324,6 @@ bool AudioInput::getData(unsigned, int channels, unsigned nframes, float** buffe
                               memset(buffer[ch], 0, nframes * sizeof(float));
                   }
                   
-                  // p3.3.41
-                  //fprintf(stderr, "AudioInput::getData %s No Jack port efx apply channels:%d nframes:%ld %e %e %e %e\n", 
                   //        name().toLatin1().constData(), channels, nframes, buffer[0][0], buffer[0][1], buffer[0][2], buffer[0][3]);
             }
       }
@@ -1525,7 +1462,7 @@ void AudioTrack::record()
                   return;
                   }
             if (_recFile) {
-                  // Line removed by Tim. p3.3.8 Oct 28, 2009
+                  // Line removed by Tim. Oct 28, 2009
                   //_recFile->seek(pos, 0);
                   //
                   // Fix for recorded waves being shifted ahead by an amount
@@ -1571,7 +1508,6 @@ void AudioTrack::record()
                   if( (pos >= fr) && (!MusEGlobal::song->punchout() || (!MusEGlobal::song->loop() && pos < MusEGlobal::song->rPos().frame())) )
                   {
                     pos -= fr;
-                    // Added by Tim. p3.3.8
                     //int position = _recFile->seek(0, SEEK_CUR);
                     //printf("AudioTrack::record loopcnt:%d lframe:%d newpos:%d curpos:%d start:%d end:%d\n", MusEGlobal::audio->loopCount(), MusEGlobal::audio->loopFrame(), pos, position, MusEGlobal::audio->getStartRecordPos().frame(), MusEGlobal::audio->getEndRecordPos().frame());
                     
@@ -1615,7 +1551,6 @@ void AudioOutput::processInit(unsigned nframes)
 
 void AudioOutput::process(unsigned pos, unsigned offset, unsigned n)
 {
-      //Added by Tim. p3.3.16
       #ifdef NODE_DEBUG
       printf("MusE: AudioOutput::process name:%s processed:%d\n", name().toLatin1().constData(), processed());
       #endif
@@ -1623,9 +1558,6 @@ void AudioOutput::process(unsigned pos, unsigned offset, unsigned n)
       for (int i = 0; i < _channels; ++i) {
             buffer1[i] = buffer[i] + offset;
       }
-      
-      // p3.3.38
-      //copyData(pos, _channels, n, buffer1);
       copyData(pos, _channels, -1, -1, n, buffer1);
 }
 
@@ -1667,17 +1599,13 @@ void AudioOutput::processWrite()
                         putFifo(_channels, _nframes, buffer);
                   }
             }
-      // Changed by Tim. p3.3.18
+      // Changed by Tim. 
       //if (MusEGlobal::audioClickFlag && MusEGlobal::song->click()) {
       if (sendMetronome() && MusEGlobal::audioClickFlag && MusEGlobal::song->click()) {
             
-            // Added by Tim. p3.3.18
             #ifdef METRONOME_DEBUG
             printf("MusE: AudioOutput::processWrite Calling metronome->addData frame:%u channels:%d frames:%lu\n", MusEGlobal::audio->pos().frame(), _channels, _nframes);
             #endif
-    
-            // p3.3.38
-            //metronome->addData(MusEGlobal::audio->pos().frame(), _channels, _nframes, buffer);
             metronome->addData(MusEGlobal::audio->pos().frame(), _channels, -1, -1, _nframes, buffer);
             }
       }
@@ -1722,7 +1650,6 @@ Fifo::~Fifo()
       {
       for (int i = 0; i < nbuffer; ++i)
       {
-        // p3.3.45
         if(buffer[i]->buffer)
         {
           //printf("Fifo::~Fifo freeing buffer\n");
@@ -1743,7 +1670,6 @@ Fifo::~Fifo()
 
 bool Fifo::put(int segs, unsigned long samples, float** src, unsigned pos)
       {
-      // Added by Tim. p3.3.17
       #ifdef FIFO_DEBUG
       printf("FIFO::put segs:%d samples:%lu pos:%u\n", segs, samples, pos);
       #endif
@@ -1766,7 +1692,6 @@ bool Fifo::put(int segs, unsigned long samples, float** src, unsigned pos)
             // Changed by Tim. p3.3.15
             //b->buffer  = new float[n];
             posix_memalign((void**)&(b->buffer), 16, sizeof(float) * n);
-            // p3.3.45
             if(!b->buffer)
             {
               printf("Fifo::put could not allocate buffer segs:%d samples:%lu pos:%u\n", segs, samples, pos);
@@ -1775,7 +1700,6 @@ bool Fifo::put(int segs, unsigned long samples, float** src, unsigned pos)
             
             b->maxSize = n;
             }
-      // p3.3.45
       if(!b->buffer)
       {
         printf("Fifo::put no buffer! segs:%d samples:%lu pos:%u\n", segs, samples, pos);
@@ -1799,7 +1723,6 @@ bool Fifo::put(int segs, unsigned long samples, float** src, unsigned pos)
 
 bool Fifo::get(int segs, unsigned long samples, float** dst, unsigned* pos)
       {
-      // Added by Tim. p3.3.17
       #ifdef FIFO_DEBUG
       printf("FIFO::get segs:%d samples:%lu\n", segs, samples);
       #endif
@@ -1809,7 +1732,6 @@ bool Fifo::get(int segs, unsigned long samples, float** dst, unsigned* pos)
             return true;
             }
       FifoBuffer* b = buffer[ridx];
-      // p3.3.45
       if(!b->buffer)
       {
         printf("Fifo::get no buffer! segs:%d samples:%lu b->pos:%u\n", segs, samples, b->pos);
@@ -1845,7 +1767,6 @@ void Fifo::remove()
 
 bool Fifo::getWriteBuffer(int segs, unsigned long samples, float** buf, unsigned pos)
       {
-      // Added by Tim. p3.3.17
       #ifdef FIFO_DEBUG
       printf("Fifo::getWriteBuffer segs:%d samples:%lu pos:%u\n", segs, samples, pos);
       #endif
@@ -1867,7 +1788,6 @@ bool Fifo::getWriteBuffer(int segs, unsigned long samples, float** buf, unsigned
             // Changed by Tim. p3.3.15
             //b->buffer = new float[n];
             posix_memalign((void**)&(b->buffer), 16, sizeof(float) * n);
-            // p3.3.45
             if(!b->buffer)
             {
               printf("Fifo::getWriteBuffer could not allocate buffer segs:%d samples:%lu pos:%u\n", segs, samples, pos);
@@ -1876,8 +1796,6 @@ bool Fifo::getWriteBuffer(int segs, unsigned long samples, float** buf, unsigned
             
             b->maxSize = n;
             }
-      
-      // p3.3.45
       if(!b->buffer)
       {
         printf("Fifo::getWriteBuffer no buffer! segs:%d samples:%lu pos:%u\n", segs, samples, pos);
diff --git a/muse2/muse/osc.cpp b/muse2/muse/osc.cpp
index bc64575a..7daeb9ff 100644
--- a/muse2/muse/osc.cpp
+++ b/muse2/muse/osc.cpp
@@ -824,7 +824,7 @@ bool OscIF::oscInitGui(const QString& typ, const QString& baseName, const QStrin
       }
             
       QString oscUrl;
-      oscUrl = QString("%1%2/%3/%4").arg(QString(QT_TRANSLATE_NOOP("@default", url))).arg(typ).arg(baseName).arg(label);
+      oscUrl = QString("%1%2/%3/%4").arg(QString( url)).arg(typ).arg(baseName).arg(label);
       
                         
 #ifdef _USE_QPROCESS_FOR_GUI_
@@ -841,7 +841,8 @@ bool OscIF::oscInitGui(const QString& typ, const QString& baseName, const QStrin
       arguments << oscUrl
                 << filePath
                 << name
-                << QString("channel-1");
+                //<< QString("channel-1");
+                << (titlePrefix() + label);
 
       #ifdef OSC_DEBUG 
       fprintf(stderr, "OscIF::oscInitGui starting QProcess\n");
@@ -885,7 +886,8 @@ bool OscIF::oscInitGui(const QString& typ, const QString& baseName, const QStrin
                  oscUrl.toLatin1().constData(),
                  filePath.toLatin1().constData(),
                  name.toLatin1().constData(),
-                 "channel 1", (void*)0);
+                 //"channel 1", (void*)0);
+                 label.toLatin1().constData(), (void*)0);
 
         // Should not return after execlp. If so it's an error.
         fprintf(stderr, "exec %s %s %s %s %s failed: %s\n",
@@ -941,13 +943,13 @@ void OscIF::oscShowGui(bool v)
       }  
       
       //for (int i = 0; i < 5; ++i) {
-      for (int i = 0; i < 10; ++i) {    // Give it a wee bit more time?
+      for (int i = 0; i < 20; ++i) {    // Give it a wee bit more time?
             if (_uiOscPath)
                   break;
             sleep(1);
             }
       if (_uiOscPath == 0) {
-            printf("OscIF::oscShowGui(): no _uiOscPath. Error: Timeout - synth gui did not start within 10 seconds.\n");
+            printf("OscIF::oscShowGui(): no _uiOscPath. Error: Timeout - synth gui did not start within 20 seconds.\n");
             return;
             }
       
@@ -1087,14 +1089,18 @@ bool OscDssiIF::oscInitGui()
   if(!_oscSynthIF)
     return false;
     
-  return OscIF::oscInitGui(QT_TRANSLATE_NOOP("@default", "dssi_synth"), _oscSynthIF->dssiSynth()->baseName(), 
+  return OscIF::oscInitGui("dssi_synth", _oscSynthIF->dssiSynth()->baseName(), 
                            _oscSynthIF->dssiSynth()->name(), _oscSynthIF->dssiSynthI()->name(), 
                            _oscSynthIF->dssiSynth()->fileName(), _oscSynthIF->dssi_ui_filename()); 
 }
+
+QString OscDssiIF::titlePrefix() const 
+{ 
+  return _oscSynthIF ? _oscSynthIF->titlePrefix() : QString(); 
+}
       
 #endif   // DSSI_SUPPORT
       
-
 //---------------------------------------------------------
 //   OscEffectIF::
 //   oscSetPluginI
@@ -1160,11 +1166,16 @@ bool OscEffectIF::oscInitGui()
   if(!_oscPluginI)
     return false;
     
-  return OscIF::oscInitGui(QT_TRANSLATE_NOOP("@default", "ladspa_efx"), _oscPluginI->plugin()->lib(false), 
+  return OscIF::oscInitGui("ladspa_efx", _oscPluginI->plugin()->lib(false), 
                            _oscPluginI->plugin()->label(), _oscPluginI->label(), 
                            _oscPluginI->plugin()->fileName(), _oscPluginI->dssi_ui_filename());  
 }
       
+QString OscEffectIF::titlePrefix() const 
+{ 
+  return _oscPluginI ? _oscPluginI->titlePrefix() : QString(); 
+}
+
 
 #else //OSC_SUPPORT
 void initOSC() {}
diff --git a/muse2/muse/osc.h b/muse2/muse/osc.h
index 30df03cb..e3f1a26d 100644
--- a/muse2/muse/osc.h
+++ b/muse2/muse/osc.h
@@ -74,6 +74,8 @@ class OscIF
       virtual bool oscInitGui() { return false; }
       virtual void oscShowGui(bool);
       virtual bool oscGuiVisible() const;
+      
+      virtual QString titlePrefix() const { return QString(); }
 };
  
 class OscEffectIF : public OscIF
@@ -95,6 +97,8 @@ class OscEffectIF : public OscIF
       virtual int oscConfigure(lo_arg**);
       
       virtual bool oscInitGui();
+      
+      virtual QString titlePrefix() const; 
 };
  
 #ifdef DSSI_SUPPORT
@@ -117,6 +121,8 @@ class OscDssiIF : public OscIF
       virtual int oscConfigure(lo_arg**);
       
       virtual bool oscInitGui();
+      
+      virtual QString titlePrefix() const; 
 };
 #endif // DSSI_SUPPORT
  
diff --git a/muse2/muse/part.cpp b/muse2/muse/part.cpp
index 6407dadc..33519e11 100644
--- a/muse2/muse/part.cpp
+++ b/muse2/muse/part.cpp
@@ -23,7 +23,6 @@
 //=========================================================
 
 #include <stdio.h>
-#include <assert.h>
 #include <cmath>
 
 #include "song.h"
@@ -39,7 +38,7 @@
 
 namespace MusECore {
 
-int Part::snGen;
+int Part::snGen=0;
 
 //---------------------------------------------------------
 //   unchainClone
@@ -751,6 +750,18 @@ WavePart::WavePart(const WavePart& p) : Part(p)
 
 Part::~Part()
       {
+      if (_prevClone!=this || _nextClone!=this)
+      {
+        printf("THIS MIGHT BE A HINT FOR BUGS: Part isn't unchained in ~Part()! i'll do that now. this is\n"
+               "not an actual bug, actually that manual unchain should be unneccessary if this was coded\n"
+               "properly. but as it wasn't, and the unchain was always done manually, this might be an\n"
+               "indicator that it have been forgotten. either your computer will explode in 3..2..1..now,\n"
+               "or you can ignore this message.\n"
+               "\n");
+        
+        unchainClone(this);
+      }
+        
       _events->incRef(-1);
       if (_events->refCount() <= 0)
             delete _events;
@@ -805,7 +816,8 @@ void PartList::remove(Part* part)
                   break;
                   }
             }
-      assert(i != end());
+      if (i == end())
+        printf("THIS SHOULD NEVER HAPPEN: could not find the part in PartList::remove()!\n");
       }
 
 //---------------------------------------------------------
diff --git a/muse2/muse/plugin.cpp b/muse2/muse/plugin.cpp
index 63e65f2e..227a9daf 100644
--- a/muse2/muse/plugin.cpp
+++ b/muse2/muse/plugin.cpp
@@ -1573,65 +1573,60 @@ bool Pipeline::nativeGuiVisible(int idx)
 
 //---------------------------------------------------------
 //   apply
+//   If ports is 0, just process controllers only, not audio (do not 'run').
 //---------------------------------------------------------
 
-//void Pipeline::apply(int ports, unsigned long nframes, float** buffer1)
 void Pipeline::apply(unsigned long ports, unsigned long nframes, float** buffer1)
 {
       // prepare a second set of buffers in case a plugin is not
       // capable of inPlace processing
-
-      // Removed by Tim. p3.3.15
       //float* buffer2[ports];
       //float data[nframes * ports];
       //for (int i = 0; i < ports; ++i)
       //      buffer2[i] = data + i * nframes;
 
-      // p3.3.41
-      //fprintf(stderr, "Pipeline::apply data: nframes:%lu %e %e %e %e\n", nframes, buffer1[0][0], buffer1[0][1], buffer1[0][2], buffer1[0][3]);
+      //fprintf(stderr, "Pipeline::apply data: nframes:%lu %e %e %e %e\n", nframes, buffer1[0][0], buffer1[0][1], buffer1[0][2], buffer1[0][3]);  
       
       bool swap = false;
 
       for (iPluginI ip = begin(); ip != end(); ++ip) {
             PluginI* p = *ip;
-            if (p && p->on()) {
-                  if (p->inPlaceCapable()) 
-                  {
-                        if (swap)
-                              //p->connect(ports, buffer2, buffer2);
-                              //p->connect(ports, buffer, buffer);
-                              p->apply(nframes, ports, buffer, buffer);     // p4.0.21
-                        else
-                              //p->connect(ports, buffer1, buffer1);
-                              p->apply(nframes, ports, buffer1, buffer1);   //
-                  }
-                  else 
-                  {
-                        if (swap)
-                              //p->connect(ports, buffer2, buffer1);
-                              //p->connect(ports, buffer, buffer1);
-                              p->apply(nframes, ports, buffer, buffer1);    //
-                        else
-                              //p->connect(ports, buffer1, buffer2);
-                              //p->connect(ports, buffer1, buffer);
-                              p->apply(nframes, ports, buffer1, buffer);    //
-                        swap = !swap;
-                  }
-                  //p->apply(nframes);                                      // Rem. p4.0.21
-                  }
+            
+            if(p)
+            {
+              //if (p && p->on()) {
+              if (p->on()) 
+              {
+                //fprintf(stderr, "Pipeline::apply PluginI:%p on:%d\n", p, p->on()); 
+                if (p->inPlaceCapable()) 
+                {
+                      if (swap)
+                            p->apply(nframes, ports, buffer, buffer);     
+                      else
+                            p->apply(nframes, ports, buffer1, buffer1);   
+                }
+                else 
+                {
+                      if (swap)
+                            p->apply(nframes, ports, buffer, buffer1);    
+                      else
+                            p->apply(nframes, ports, buffer1, buffer);    
+                      swap = !swap;
+                }
+              }
+              else
+              {
+                p->apply(nframes, 0, 0, 0); // Do not process (run) audio, process controllers only.    
+              }
             }
-      if (swap) 
+      }
+      if (ports != 0 && swap) 
       {
-            //for (int i = 0; i < ports; ++i)
-            for (unsigned long i = 0; i < ports; ++i)    // p4.0.21
+            for (unsigned long i = 0; i < ports; ++i)    
                   //memcpy(buffer1[i], buffer2[i], sizeof(float) * nframes);
                   //memcpy(buffer1[i], buffer[i], sizeof(float) * nframes);
                   AL::dsp->cpy(buffer1[i], buffer[i], nframes);
       }
-      
-      // p3.3.41
-      //fprintf(stderr, "Pipeline::apply after data: nframes:%lu %e %e %e %e\n", nframes, buffer1[0][0], buffer1[0][1], buffer1[0][2], buffer1[0][3]);
-      
 }
 
 //---------------------------------------------------------
@@ -2439,6 +2434,7 @@ void PluginI::showGui()
       if (_plugin) {
             if (_gui == 0)
                     makeGui();
+            _gui->setWindowTitle(titlePrefix() + name());
             if (_gui->isVisible())
                     _gui->hide();
             else
@@ -2558,7 +2554,17 @@ void PluginI::enable2AllControllers(bool v)
 }
 
 //---------------------------------------------------------
+//   titlePrefix
+//---------------------------------------------------------
+
+QString PluginI::titlePrefix() const    
+{ 
+  return _track->name() + QString(": "); 
+}
+
+//---------------------------------------------------------
 //   apply
+//   If ports is 0, just process controllers only, not audio (do not 'run').
 //---------------------------------------------------------
 
 /*
@@ -2653,7 +2659,6 @@ void PluginI::apply(unsigned long n)
 */
       
 #if 1
-// p4.0.21
 void PluginI::apply(unsigned long n, unsigned long ports, float** bufIn, float** bufOut)
 {
       // Process control value changes.
@@ -2769,7 +2774,6 @@ void PluginI::apply(unsigned long n, unsigned long ports, float** bufIn, float**
           //controls[v.idx].val = v.value;
           controls[v.idx].tmpVal = v.value;
           
-          /*
           // Need to update the automation value, otherwise it overwrites later with the last MusEGlobal::automation value.
           if(_track && _id != -1)
           {
@@ -2795,7 +2799,6 @@ void PluginI::apply(unsigned long n, unsigned long ports, float** bufIn, float**
             //  enableController(k, false);
             //_track->recordAutomation(id, v.value);
           }  
-          */
         }
 
         // Now update the actual values from the temporary values...
@@ -2813,20 +2816,23 @@ void PluginI::apply(unsigned long n, unsigned long ports, float** bufIn, float**
           nsamp = n - sample; 
         
         //printf("PluginI::apply ports:%lu n:%lu frame:%lu sample:%lu nsamp:%lu syncFrame:%lu loopcount:%d\n", 
-        //      ports, n, frame, sample, nsamp, syncFrame, loopcount);   // REMOVE Tim.
+        //      ports, n, frame, sample, nsamp, syncFrame, loopcount);   
         
         // Don't allow zero-length runs. This could/should be checked in the control loop instead.
         // Note this means it is still possible to get stuck in the top loop (at least for a while).
         if(nsamp == 0)
           continue;
           
-        connect(ports, sample, bufIn, bufOut);
+        if(ports != 0)
+        {  
+          connect(ports, sample, bufIn, bufOut);
         
-        for(int i = 0; i < instances; ++i)
-        {
-          //fprintf(stderr, "PluginI::apply handle %d\n", i);
-          _plugin->apply(handle[i], nsamp);
-        }      
+          for(int i = 0; i < instances; ++i)
+          {
+            //fprintf(stderr, "PluginI::apply handle %d\n", i);
+            _plugin->apply(handle[i], nsamp);
+          }      
+        }
         
         sample += nsamp;
         loopcount++;       // REMOVE Tim.
@@ -3444,7 +3450,8 @@ PluginGui::PluginGui(MusECore::PluginIBase* p)
       params = 0;
       paramsOut = 0;
       plugin = p;
-      setWindowTitle(plugin->name());
+      //setWindowTitle(plugin->name());
+      setWindowTitle(plugin->titlePrefix() + plugin->name());
 
       QToolBar* tools = addToolBar(tr("File Buttons"));
 
@@ -3546,7 +3553,7 @@ PluginGui::PluginGui(MusECore::PluginIBase* p)
                   gw[nobj].param  = parameter;
                   gw[nobj].type   = -1;
 
-                  if (strcmp(obj->metaObject()->className(), "Slider") == 0) {
+                  if (strcmp(obj->metaObject()->className(), "MusEGui::Slider") == 0) {
                         gw[nobj].type = GuiWidgets::SLIDER;
                         ((Slider*)obj)->setId(nobj);
                         ((Slider*)obj)->setCursorHoming(true);
@@ -3561,7 +3568,7 @@ PluginGui::PluginGui(MusECore::PluginIBase* p)
                         connect(obj, SIGNAL(sliderReleased(int)), SLOT(guiSliderReleased(int)));
                         connect(obj, SIGNAL(sliderRightClicked(const QPoint &, int)), SLOT(guiSliderRightClicked(const QPoint &, int)));
                         }
-                  else if (strcmp(obj->metaObject()->className(), "DoubleLabel") == 0) {
+                  else if (strcmp(obj->metaObject()->className(), "MusEGui::DoubleLabel") == 0) {
                         gw[nobj].type = GuiWidgets::DOUBLE_LABEL;
                         ((DoubleLabel*)obj)->setId(nobj);
                         //for(int i = 0; i < nobj; i++)
@@ -4106,16 +4113,18 @@ void PluginGui::save()
 
 void PluginGui::bypassToggled(bool val)
       {
+      setWindowTitle(plugin->titlePrefix() + plugin->name());
       plugin->setOn(val);
       MusEGlobal::song->update(SC_ROUTE);
       }
 
 //---------------------------------------------------------
-//   songChanged
+//   setOn
 //---------------------------------------------------------
 
 void PluginGui::setOn(bool val)
       {
+      setWindowTitle(plugin->titlePrefix() + plugin->name());
       onOff->blockSignals(true);
       onOff->setChecked(val);
       onOff->blockSignals(false);
@@ -4208,11 +4217,11 @@ void PluginGui::updateControls()
        }
 
 
-      if(!MusEGlobal::automation)
-        return;
-      AutomationType at = plugin->track()->automationType();
-      if(at == AUTO_OFF)
-        return;
+      //if(!MusEGlobal::automation)
+      //  return;
+      //AutomationType at = plugin->track()->automationType();
+      //if(at == AUTO_OFF)
+      //  return;
       if (params) {
             //for (int i = 0; i < plugin->parameters(); ++i) {
             for (unsigned long i = 0; i < plugin->parameters(); ++i) {      // p4.0.21
@@ -4611,9 +4620,9 @@ void PluginGui::guiSliderRightClicked(const QPoint &p, int idx)
 //---------------------------------------------------------
 QWidget* PluginLoader::createWidget(const QString & className, QWidget * parent, const QString & name)
 {
-  if(className == QString("DoubleLabel"))
+  if(className == QString("MusEGui::DoubleLabel"))
     return new DoubleLabel(parent, name.toLatin1().constData()); 
-  if(className == QString("Slider"))
+  if(className == QString("MusEGui::Slider"))
     return new Slider(parent, name.toLatin1().constData(), Qt::Horizontal); 
 
   return QUiLoader::createWidget(className, parent, name);
diff --git a/muse2/muse/plugin.h b/muse2/muse/plugin.h
index 717f98b6..044fd863 100644
--- a/muse2/muse/plugin.h
+++ b/muse2/muse/plugin.h
@@ -72,18 +72,6 @@ class Xml;
 
 class MidiController;
 
-/*
-//---------------------------------------------------------
-//   PluginBase
-//---------------------------------------------------------
-
-class PluginBase 
-{
-   protected:
-      void range(unsigned long i, float*, float*) const;
-};
-*/   
-   
 //---------------------------------------------------------
 //   Plugin
 //---------------------------------------------------------
@@ -155,13 +143,11 @@ class Plugin {
             if (plugin && plugin->cleanup)
                   plugin->cleanup(handle);
             }
-      //void connectPort(LADSPA_Handle handle, int port, float* value) {
-      void connectPort(LADSPA_Handle handle, unsigned long port, float* value) {     // p4.0.21
+      void connectPort(LADSPA_Handle handle, unsigned long port, float* value) {     
             if(plugin)
               plugin->connect_port(handle, port, value);
             }
-      //void apply(LADSPA_Handle handle, int n) {
-      void apply(LADSPA_Handle handle, unsigned long n) {                            // p4.0.21
+      void apply(LADSPA_Handle handle, unsigned long n) {                            
             if(plugin)
               plugin->run(handle, n);
             }
@@ -170,12 +156,10 @@ class Plugin {
       int oscConfigure(LADSPA_Handle /*handle*/, const char* /*key*/, const char* /*value*/);
       #endif
       
-      //int ports() { return plugin ? plugin->PortCount : 0; }
       unsigned long ports() { return _portCount; }
       
       LADSPA_PortDescriptor portd(unsigned long k) const {
             return plugin ? plugin->PortDescriptors[k] : 0;
-            //return _portDescriptors[k];
             }
       
       LADSPA_PortRangeHint range(unsigned long i) {
@@ -184,8 +168,7 @@ class Plugin {
             return plugin->PortRangeHints[i];
             }
 
-      //double defaultValue(unsigned long port) const;
-      float defaultValue(unsigned long port) const; // p4.0.21     
+      float defaultValue(unsigned long port) const; 
       void range(unsigned long i, float*, float*) const;
       CtrlValueType ctrlValueType(unsigned long /*i*/) const;
       CtrlList::Mode ctrlMode(unsigned long /*i*/) const;
@@ -202,20 +185,6 @@ class Plugin {
       unsigned long controlInPorts() const  { return _controlInPorts; }
       unsigned long controlOutPorts() const { return _controlOutPorts; }
       bool inPlaceCapable() const           { return _inPlaceCapable; }
-      
-      /*
-      bool isLog(int k) const {
-            LADSPA_PortRangeHint r = plugin->PortRangeHints[pIdx[k]];
-            return LADSPA_IS_HINT_LOGARITHMIC(r.HintDescriptor);
-            }
-      bool isBool(int k) const {
-            return LADSPA_IS_HINT_TOGGLED(plugin->PortRangeHints[pIdx[k]].HintDescriptor);
-            }
-      bool isInt(int k) const {
-            LADSPA_PortRangeHint r = plugin->PortRangeHints[pIdx[k]];
-            return LADSPA_IS_HINT_INTEGER(r.HintDescriptor);
-            }
-      */      
       };
 
 typedef std::list<Plugin>::iterator iPlugin;
@@ -266,21 +235,18 @@ class PluginIBase
       ~PluginIBase(); 
       virtual bool on() const = 0;       
       virtual void setOn(bool /*val*/) = 0;   
-      //virtual int pluginID() = 0;
-      virtual unsigned long pluginID() = 0;        // p4.0.21
+      virtual unsigned long pluginID() = 0;        
       virtual int id() = 0;
       virtual QString pluginLabel() const = 0;  
       virtual QString name() const = 0;
       virtual QString lib() const = 0;
       virtual QString dirPath() const = 0;
       virtual QString fileName() const = 0;
+      virtual QString titlePrefix() const = 0;
       
       virtual AudioTrack* track() = 0;          
       
-      //virtual void enableController(int /*i*/, bool /*v*/ = true) = 0; 
-      //virtual bool controllerEnabled(int /*i*/) const = 0;          
-      //virtual bool controllerEnabled2(int /*i*/) const = 0;          
-      virtual void enableController(unsigned long /*i*/, bool /*v*/ = true) = 0;   // p4.0.21
+      virtual void enableController(unsigned long /*i*/, bool /*v*/ = true) = 0;   
       virtual bool controllerEnabled(unsigned long /*i*/) const = 0;          
       virtual bool controllerEnabled2(unsigned long /*i*/) const = 0;          
       virtual void updateControllers() = 0;
@@ -288,12 +254,7 @@ class PluginIBase
       virtual void writeConfiguration(int /*level*/, Xml& /*xml*/) = 0;
       virtual bool readConfiguration(Xml& /*xml*/, bool /*readPreset*/=false) = 0;
       
-      //virtual int parameters() const = 0;          
-      //virtual void setParam(int /*i*/, double /*val*/) = 0; 
-      //virtual double param(int /*i*/) const = 0;        
-      //virtual const char* paramName(int /*i*/) = 0;     
-      //virtual LADSPA_PortRangeHint range(int /*i*/) = 0; 
-      virtual unsigned long parameters() const = 0;                  // p4.0.21
+      virtual unsigned long parameters() const = 0;                  
       virtual unsigned long parametersOut() const = 0;
       virtual void setParam(unsigned long /*i*/, float /*val*/) = 0;
       virtual float param(unsigned long /*i*/) const = 0;            
@@ -307,8 +268,6 @@ class PluginIBase
       virtual CtrlList::Mode ctrlMode(unsigned long /*i*/) const = 0;
       QString dssi_ui_filename() const;
       
-      //virtual void showGui(bool) = 0;         // p4.0.20
-      //virtual void showNativeGui(bool) = 0;   //
       MusEGui::PluginGui* gui() const { return _gui; }
       void deleteGui();
 };
@@ -353,7 +312,6 @@ class PluginBase
 #define AUDIO_IN (LADSPA_PORT_AUDIO  | LADSPA_PORT_INPUT)
 #define AUDIO_OUT (LADSPA_PORT_AUDIO | LADSPA_PORT_OUTPUT)
 
-//class PluginI {
 class PluginI : public PluginIBase {
       Plugin* _plugin;
       int channel;
@@ -365,10 +323,8 @@ class PluginI : public PluginIBase {
       Port* controls;
       Port* controlsOut;
 
-      //int controlPorts;
-      //int controlOutPorts;
-      unsigned long controlPorts;      // p4.0.21
-      unsigned long controlOutPorts;   // 
+      unsigned long controlPorts;      
+      unsigned long controlOutPorts;    
       
       ///PluginGui* _gui;
       bool _on;
@@ -400,26 +356,17 @@ class PluginI : public PluginIBase {
       
       void setTrack(AudioTrack* t)  { _track = t; }
       AudioTrack* track()           { return _track; }
-      //int pluginID()                { return _plugin->id(); }
-      unsigned long pluginID()           { return _plugin->id(); }    // p4.0.21
+      unsigned long pluginID()      { return _plugin->id(); }    
       void setID(int i);
       int id()                      { return _id; }
       void updateControllers();
       
       bool initPluginInstance(Plugin*, int channels);
       void setChannels(int);
-      //void connect(int ports, float** src, float** dst);
-      //void apply(int n);
-      //void connect(unsigned ports, float** src, float** dst);   
-      //void apply(unsigned n);   
-      void connect(unsigned long ports, unsigned long offset, float** src, float** dst); // p4.0.21
-      void apply(unsigned long n, unsigned long ports, float** bufIn, float** bufOut);   // 
-
-      //void enableController(int i, bool v = true)   { controls[i].enCtrl = v; }
-      //bool controllerEnabled(int i) const           { return controls[i].enCtrl; }
-      //void enable2Controller(int i, bool v = true)  { controls[i].en2Ctrl = v; }
-      //bool controllerEnabled2(int i) const          { return controls[i].en2Ctrl; }
-      void enableController(unsigned long i, bool v = true)   { controls[i].enCtrl = v; }      // p4.0.21
+      void connect(unsigned long ports, unsigned long offset, float** src, float** dst); 
+      void apply(unsigned long n, unsigned long ports, float** bufIn, float** bufOut);    
+
+      void enableController(unsigned long i, bool v = true)   { controls[i].enCtrl = v; }      
       bool controllerEnabled(unsigned long i) const           { return controls[i].enCtrl; }   
       void enable2Controller(unsigned long i, bool v = true)  { controls[i].en2Ctrl = v; }     
       bool controllerEnabled2(unsigned long i) const          { return controls[i].en2Ctrl; }  
@@ -434,6 +381,7 @@ class PluginI : public PluginIBase {
       QString lib() const            { return _plugin->lib(); }
       QString dirPath() const        { return _plugin->dirPath(); }
       QString fileName() const       { return _plugin->fileName(); }
+      QString titlePrefix() const;
 
       #ifdef OSC_SUPPORT
       OscEffectIF& oscIF() { return _oscif; }
@@ -453,8 +401,7 @@ class PluginI : public PluginIBase {
       void writeConfiguration(int level, Xml& xml);
       bool readConfiguration(Xml& xml, bool readPreset=false);
       bool loadControl(Xml& xml);
-      //bool setControl(const QString& s, double val);
-      bool setControl(const QString& s, float val);    // p4.0.21
+      bool setControl(const QString& s, float val);    
       void showGui();
       void showGui(bool);
       bool isDssiPlugin() const { return _plugin->isDssiPlugin(); }  
@@ -464,20 +411,8 @@ class PluginI : public PluginIBase {
       bool guiVisible();
       bool nativeGuiVisible();
 
-      //int parameters() const           { return controlPorts; }
-      //void setParam(int i, double val) { controls[i].tmpVal = val; }
-      //double param(int i) const        { return controls[i].val; }
-      //double defaultValue(unsigned int param) const;
-      //const char* paramName(int i)     { return _plugin->portName(controls[i].idx); }
-      //LADSPA_PortDescriptor portd(int i) const { return _plugin->portd(controls[i].idx); }
-      //void range(int i, float* min, float* max) const { _plugin->range(controls[i].idx, min, max); }
-      //bool isAudioIn(int k) { return (_plugin->portd(k) & AUDIO_IN) == AUDIO_IN; }
-      //bool isAudioOut(int k) { return (_plugin->portd(k) & AUDIO_OUT) == AUDIO_OUT; }
-      //LADSPA_PortRangeHint range(int i) { return _plugin->range(controls[i].idx); }
-      // p4.0.21
       unsigned long parameters() const           { return controlPorts; }    
       unsigned long parametersOut() const           { return controlOutPorts; }
-      //void setParam(unsigned i, float val) { controls[i].tmpVal = val; }
       void setParam(unsigned long i, float val);  
       float param(unsigned long i) const        { return controls[i].val; }       
       float paramOut(unsigned long i) const        { return controlsOut[i].val; }
@@ -500,8 +435,6 @@ class PluginI : public PluginIBase {
 //    chain of connected efx inserts
 //---------------------------------------------------------
 
-//const int PipelineDepth = 4;  // Moved to globaldefs.h
-
 class Pipeline : public std::vector<PluginI*> {
       float* buffer[MAX_CHANNELS];
    
@@ -525,8 +458,7 @@ class Pipeline : public std::vector<PluginI*> {
       void deleteAllGuis();
       bool guiVisible(int);
       bool nativeGuiVisible(int);
-      //void apply(int ports, unsigned long nframes, float** buffer);
-      void apply(unsigned long ports, unsigned long nframes, float** buffer);  // p4.0.21
+      void apply(unsigned long ports, unsigned long nframes, float** buffer);  
       void move(int idx, bool up);
       bool empty(int idx) const;
       void setChannels(int);
@@ -537,11 +469,6 @@ typedef Pipeline::const_iterator ciPluginI;
 
 extern void initPlugins();
 
-//extern bool ladspaDefaultValue(const LADSPA_Descriptor* plugin, int port, float* val);
-//extern void ladspaControlRange(const LADSPA_Descriptor* plugin, int i, float* min, float* max);
-//extern bool ladspa2MidiControlValues(const LADSPA_Descriptor* plugin, int port, int ctlnum, int* min, int* max, int* def);
-//extern float midi2LadspaValue(const LADSPA_Descriptor* plugin, int port, int ctlnum, int val);
-// p4.0.21
 extern bool ladspaDefaultValue(const LADSPA_Descriptor* plugin, unsigned long port, float* val);
 extern void ladspaControlRange(const LADSPA_Descriptor* plugin, unsigned long port, float* min, float* max);
 extern bool ladspa2MidiControlValues(const LADSPA_Descriptor* plugin, unsigned long port, int ctlnum, int* min, int* max, int* def);
@@ -593,8 +520,7 @@ struct GuiWidgets {
             };
       QWidget* widget;
       int type;
-      //int param;
-      unsigned long param;   // p4.0.21
+      unsigned long param;   
       };
 
 //---------------------------------------------------------
@@ -604,13 +530,11 @@ struct GuiWidgets {
 class PluginGui : public QMainWindow {
       Q_OBJECT
 
-      //PluginI* plugin;        // plugin instance
       MusECore::PluginIBase* plugin;        // plugin instance
       
       GuiParam* params;
       GuiParam* paramsOut;
-      //int nobj;               
-      unsigned long nobj;             // number of widgets in gw      // p4.0.21
+      unsigned long nobj;             // number of widgets in gw      
       GuiWidgets* gw;
 
       QAction* onOff;
@@ -640,7 +564,6 @@ class PluginGui : public QMainWindow {
       void heartBeat();
 
    public:
-      //PluginGui(MusECore::PluginI*);
       PluginGui(MusECore::PluginIBase*);
       
       ~PluginGui();
diff --git a/muse2/muse/remote/pyapi.cpp b/muse2/muse/remote/pyapi.cpp
index 57b956ca..90818a44 100644
--- a/muse2/muse/remote/pyapi.cpp
+++ b/muse2/muse/remote/pyapi.cpp
@@ -1131,7 +1131,9 @@ bool Song::event(QEvent* _e)
                   break;
                   }
             case QPybridgeEvent::SONG_ADD_TRACK:
-                  MusEGlobal::song->addTrack((Track::TrackType)e->getP1());  // Add at end of list.
+                  MusECore::Undo operations;
+                  MusEGlobal::song->addTrack(operations, (Track::TrackType)e->getP1());  // Add at end of list.
+                  MusEGlobal::song->applyOperationGroup(operations);
                   break;
             case QPybridgeEvent::SONG_CHANGE_TRACKNAME: {
                   Track* t = this->findTrack(e->getS1());
diff --git a/muse2/muse/route.cpp b/muse2/muse/route.cpp
index f00c6d6c..1d494fb0 100644
--- a/muse2/muse/route.cpp
+++ b/muse2/muse/route.cpp
@@ -4,6 +4,7 @@
 //  $Id: route.cpp,v 1.18.2.3 2008/05/21 00:28:52 terminator356 Exp $
 //
 //  (C) Copyright 2003-2004 Werner Schweer (ws@seh.de)
+//  (C) Copyright 2011 Tim E. Real (terminator356 on sourceforge)
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -37,8 +38,6 @@
 
 //#define ROUTE_DEBUG 
 
-//#define ROUTE_MIDIPORT_NAME_PREFIX       "MusE MidiPort "
-
 namespace MusECore {
 
 const QString ROUTE_MIDIPORT_NAME_PREFIX = "MusE MidiPort ";
@@ -57,9 +56,7 @@ Route::Route(void* t, int ch)
       type     = JACK_ROUTE;
       }
 
-//Route::Route(AudioTrack* t, int ch)
 Route::Route(Track* t, int ch, int chans)
-//Route::Route(Track* t, int ch)
       {
       track    = t;
       midiPort = -1;
@@ -69,7 +66,6 @@ Route::Route(Track* t, int ch, int chans)
       type     = TRACK_ROUTE;
       }
 
-//Route::Route(MidiJackDevice* d)
 Route::Route(MidiDevice* d, int ch)
 {
       device   = d;  
@@ -77,19 +73,10 @@ Route::Route(MidiDevice* d, int ch)
       channel  = ch;
       channels = -1;
       remoteChannel = -1;
-      /*
-      //if(dynamic_cast<MidiJackDevice*>(d))
-      if(d->deviceType() == MidiDevice::JACK_MIDI)
-        type    = JACK_MIDI_ROUTE;
-      else  
-      //if(dynamic_cast<MidiAlsaDevice*>(d))
-      if(d->deviceType() == MidiDevice::ALSA_MIDI)
-        type    = ALSA_MIDI_ROUTE;
-      */  
       type    = MIDI_DEVICE_ROUTE; 
 }
 
-Route::Route(int port, int ch)  // p3.3.49
+Route::Route(int port, int ch)  
 {
       track    = 0;
       midiPort = port; 
@@ -99,16 +86,12 @@ Route::Route(int port, int ch)  // p3.3.49
       type    = MIDI_PORT_ROUTE;     
 }
 
-//Route::Route(const QString& s, bool dst, int ch)
 Route::Route(const QString& s, bool dst, int ch, int rtype)
     {
-      //Route node(name2route(s, dst));
       Route node(name2route(s, dst, rtype));
       channel  = node.channel;
       if(channel == -1)
         channel = ch;
-      //if(channels == -1)
-      //  channels = chans;
       channels = node.channels;
       remoteChannel = node.remoteChannel;
       type = node.type;
@@ -123,14 +106,6 @@ Route::Route(const QString& s, bool dst, int ch, int rtype)
         jackPort = node.jackPort;
         midiPort = -1;
       }
-      /*
-      else
-      if (type == JACK_MIDI_ROUTE)
-            device = node.device;
-      else
-      if (type == ALSA_MIDI_ROUTE)
-            device = node.device;
-      */
       else
       if(type == MIDI_DEVICE_ROUTE)  
       {
@@ -138,10 +113,10 @@ Route::Route(const QString& s, bool dst, int ch, int rtype)
         midiPort = -1;
       }  
       else
-      if(type == MIDI_PORT_ROUTE)     // p3.3.49
+      if(type == MIDI_PORT_ROUTE)    
       {
         track = 0;
-        midiPort = node.midiPort;     //
+        midiPort = node.midiPort;    
       }  
     }
 
@@ -179,31 +154,20 @@ void addRoute(Route src, Route dst)
 //         dst.type, dst.channel, dst.name().toLatin1().constData());
       if (src.type == Route::JACK_ROUTE) 
       {           
-            //if (dst.type != TRACK_ROUTE) 
-            //{
-            //      fprintf(stderr, "addRoute: bad route 1\n");
-                  // exit(-1);
-            //      return;
-            //}
-            
             if (dst.type == Route::TRACK_ROUTE) 
             {
               if (dst.track->type() != Track::AUDIO_INPUT) 
               {
                   fprintf(stderr, "addRoute: source is jack, dest:%s is track but not audio input\n", dst.track->name().toLatin1().constData());
-                  //exit(-1);
                   return;
               }
               if (dst.channel < 0) 
               {
                   fprintf(stderr, "addRoute: source is jack, dest:%s is track but invalid channel:%d\n", dst.track->name().toLatin1().constData(), dst.channel);
-                  //exit(-1);
                   return;
               }
               
-              //src.channel = src.dstChannel = dst.channel;
               src.channel = dst.channel;
-              //src.channels = dst.channels = 1;
               RouteList* inRoutes = dst.track->inRoutes();
               for (ciRoute i = inRoutes->begin(); i != inRoutes->end(); ++i) 
               {
@@ -221,28 +185,11 @@ void addRoute(Route src, Route dst)
               inRoutes->push_back(src);
             }  
             else
-            //if (dst.type == Route::JACK_MIDI_ROUTE) 
             if (dst.type == Route::MIDI_DEVICE_ROUTE) 
-            //if (dst.type == Route::MIDI_PORT_ROUTE)      // p3.3.49
             {
-              //MidiDevice *md = MusEGlobal::midiPorts[dst.midiPort].device();
-              //if(dst.device->deviceType() == MidiDevice::JACK_MIDI)
-              //if(!md)
-              //{
-              //  fprintf(stderr, "addRoute: source is Jack, but no destination port device\n");
-              //  return;
-              //}
-              
               if(dst.device->deviceType() == MidiDevice::JACK_MIDI)
-              //if(md->deviceType() == MidiDevice::JACK_MIDI)
               {
                 src.channel = dst.channel;
-                //src.channel = -1;
-                //src.channel = 0;
-                //src.channel = src.dstChannel = dst.channel;
-                //src.channels = dst.channels = 1;
-                //dst.channel = -1;
-                
                 RouteList* routes = dst.device->inRoutes();
                 for (ciRoute i = routes->begin(); i != routes->end(); ++i) 
                 {
@@ -262,45 +209,32 @@ void addRoute(Route src, Route dst)
               else
               {
                 fprintf(stderr, "addRoute: source is Jack, but destination is not jack midi - type:%d\n", dst.device->deviceType());
-                // exit(-1);
                 return;
               }
             }  
             else
             {
               fprintf(stderr, "addRoute: source is Jack, but destination is not track or midi - type:%d \n", dst.type);
-              // exit(-1);
               return;
             }
       }
       else if (dst.type == Route::JACK_ROUTE) 
       {
-            //if (src.type != TRACK_ROUTE) 
-            //{
-            //      fprintf(stderr, "addRoute: bad route 3\n");
-                  // exit(-1);
-            //      return;
-            //}
-            
             if (src.type == Route::TRACK_ROUTE) 
             {
               if (src.track->type() != Track::AUDIO_OUTPUT) 
               {
                     fprintf(stderr, "addRoute: destination is jack, source is track but not audio output\n");
-                    // exit(-1);
                     return;
               }
               if (src.channel < 0) 
               {
                     fprintf(stderr, "addRoute: destination is jack, source:%s is track but invalid channel:%d\n", src.track->name().toLatin1().constData(), src.channel);
-                    // exit(-1);
                     return;
               }
               
               RouteList* outRoutes = src.track->outRoutes();
-              //dst.channel = dst.dstChannel = src.channel;
               dst.channel = src.channel;
-              //dst.channels = src.channels = 1;
               
               for (ciRoute i = outRoutes->begin(); i != outRoutes->end(); ++i) 
               {
@@ -318,17 +252,11 @@ void addRoute(Route src, Route dst)
               outRoutes->push_back(dst);
             }
             else
-            //if (src.type == Route::JACK_MIDI_ROUTE) 
             if (src.type == Route::MIDI_DEVICE_ROUTE) 
             {
               if(src.device->deviceType() == MidiDevice::JACK_MIDI)
               {
                 dst.channel = src.channel;
-                //dst.channel = -1;
-                //src.channel = -1;
-                //dst.channel = dst.dstChannel = src.channel;
-                //dst.channels = src.channels = 1;
-                
                 RouteList* routes = src.device->outRoutes();
                 for (ciRoute i = routes->begin(); i != routes->end(); ++i) 
                 {
@@ -348,18 +276,16 @@ void addRoute(Route src, Route dst)
               else  
               {
                 fprintf(stderr, "addRoute: destination is Jack, but source is not jack midi - type:%d\n", src.device->deviceType());
-                // exit(-1);
                 return;
               }
             }
             else
             {
               fprintf(stderr, "addRoute: destination is Jack, but source is not track or midi - type:%d \n", src.type);
-              // exit(-1);
               return;
             }
       }
-      else if(src.type == Route::MIDI_PORT_ROUTE)  // p3.3.49
+      else if(src.type == Route::MIDI_PORT_ROUTE)  
       {
             if(dst.type != Route::TRACK_ROUTE)
             {
@@ -367,66 +293,18 @@ void addRoute(Route src, Route dst)
               return;
             }
             
-            // p4.0.14
-            /*
-            if(dst.track->type() == Track::AUDIO_INPUT)
-            {
-              if(src.channel < 1 || src.channel >= (1 << MIDI_CHANNELS))
-              {
-                fprintf(stderr, "addRoute: source is midi port:%d, but channel mask:%d out of range\n", src.midiPort, src.channel);
-                return;
-              }
-              
-              MidiPort *mp = &MusEGlobal::midiPorts[src.midiPort];
-              //src.channel = dst.channel = -1;
-              RouteList* outRoutes = mp->outRoutes();
-              iRoute ir = outRoutes->begin();                                      
-              for ( ; ir != outRoutes->end(); ++ir) 
-              {
-                //if (*i == dst)    // route already there
-                ir->dump(); 
-                if (ir->type == Route::TRACK_ROUTE && ir->track == dst.track)     // Does a route to the track exist?
-                {
-                  //#ifdef ROUTE_DEBUG
-                  fprintf(stderr, "addRoute: src midi port:%d dst audio in track:%s out route already exists. ir->channel:%d |= dst.channel:%d\n", 
-                    src.midiPort, dst.track->name().toLatin1().constData(), ir->channel, dst.channel);  
-                  //#endif
-                  ir->channel |= dst.channel;    // Bitwise OR the desired channel bit with the existing bit mask.
-                  break;
-                  //return;
-                }      
-              }
-              if(ir == outRoutes->end())    // Only if route not found, add the route, with the requested channel bits as mask to start with. 
-                outRoutes->push_back(dst);
-            
-              RouteList* inRoutes = dst.track->inRoutes();
-              
-              ir = inRoutes->begin();
-              for ( ; ir != inRoutes->end(); ++ir)         
-              {
-                if (ir->type == Route::MIDI_PORT_ROUTE && ir->midiPort == src.midiPort)  // Does a route to the midi port exist?
-                {
-                  fprintf(stderr, "addRoute: src midi port:%d dst audio in track:%s in route already exists. ir->channel:%d |= src.channel:%d\n", 
-                    src.midiPort, dst.track->name().toLatin1().constData(), ir->channel, src.channel);  
-                  ir->channel |= src.channel;    // Bitwise OR the desired channel bit with the existing bit mask.
-                  break;
-                }      
-              }
-              if(ir == inRoutes->end())    // Only if route not found, add the route, with the requested channel bits as mask to start with. 
-                inRoutes->push_back(src);
-            
-              return;
-            }
-            */
-            
             MidiPort *mp = &MusEGlobal::midiPorts[src.midiPort];
             
-            // p4.0.17 Do not allow ports with synth midi devices to connect to audio ins!
-            if(dst.track->type() == Track::AUDIO_INPUT && mp->device() && mp->device()->isSynti())
-            {
-              fprintf(stderr, "addRoute: destination is audio in, but source midi port:%d is synth device\n", src.midiPort);
+            // Do not allow ports with synth midi devices to connect to audio ins!   p4.0.17 
+            //if(dst.track->type() == Track::AUDIO_INPUT && mp->device() && mp->device()->isSynti())
+            //{
+            //  fprintf(stderr, "addRoute: destination is audio in, but source midi port:%d is synth device\n", src.midiPort);
+            //  return;
+            //}
+            // Actually, do not allow synth ports to connect to any track. It may be useful in some cases, 
+            //  may be desired later, but for now it's just a routing hassle.  p4.0.35 
+            if(mp->device() && mp->device()->isSynti())
               return;
-            }
             
             if(dst.channel < 1 || dst.channel >= (1 << MIDI_CHANNELS))
             {
@@ -443,46 +321,39 @@ void addRoute(Route src, Route dst)
             
             src.channel = dst.channel;
             RouteList* outRoutes = mp->outRoutes();
-            //for (iRoute i = outRoutes->begin(); i != outRoutes->end(); ++i) 
-            iRoute ir = outRoutes->begin();                                      // p3.3.50
+            iRoute ir = outRoutes->begin();                                      
             for ( ; ir != outRoutes->end(); ++ir) 
             {
-              //if (*i == dst)    // route already there
-              if (ir->type == Route::TRACK_ROUTE && ir->track == dst.track)     // p3.3.50 Does a route to the track exist?
+              if (ir->type == Route::TRACK_ROUTE && ir->track == dst.track)     // Does a route to the track exist?
               {
-                //#ifdef ROUTE_DEBUG
-                //fprintf(stderr, "addRoute: src midi port:%d dst track:%s route already exists.\n", src.midiPort, dst.track->name().toLatin1().constData());
-                //#endif
-                ir->channel |= dst.channel;    // p3.3.50 Bitwise OR the desired channel bit with the existing bit mask.
+                ir->channel |= dst.channel;    // Bitwise OR the desired channel bit with the existing bit mask.
                 break;
-                
-                //return;
               }      
             }
             #ifdef ROUTE_DEBUG
             fprintf(stderr, "addRoute: src midi port:%d dst track name:%s pushing dst and src routes\n", src.midiPort, dst.track->name().toLatin1().constData());
             #endif
             
-            if(ir == outRoutes->end())    // p3.3.50 Only if route not found, add the route, with the requested channel bits as mask to start with. 
+            if(ir == outRoutes->end())    // Only if route not found, add the route, with the requested channel bits as mask to start with. 
               outRoutes->push_back(dst);
               
             RouteList* inRoutes = dst.track->inRoutes();
             
-            // p3.3.50 Make sure only one single route, with a channel mask, can ever exist.
+            // Make sure only one single route, with a channel mask, can ever exist.
             ir = inRoutes->begin();
             for ( ; ir != inRoutes->end(); ++ir)         
             {
-              if (ir->type == Route::MIDI_PORT_ROUTE && ir->midiPort == src.midiPort)  // p3.3.50 Does a route to the midi port exist?
+              if (ir->type == Route::MIDI_PORT_ROUTE && ir->midiPort == src.midiPort)  // Does a route to the midi port exist?
               {
-                ir->channel |= src.channel;    // p3.3.50 Bitwise OR the desired channel bit with the existing bit mask.
+                ir->channel |= src.channel;    // Bitwise OR the desired channel bit with the existing bit mask.
                 break;
               }      
             }
             
-            if(ir == inRoutes->end())    // p3.3.50 Only if route not found, add the route, with the requested channel bits as mask to start with. 
+            if(ir == inRoutes->end())    // Only if route not found, add the route, with the requested channel bits as mask to start with. 
               inRoutes->push_back(src);
       }
-      else if(dst.type == Route::MIDI_PORT_ROUTE)  // p3.3.49
+      else if(dst.type == Route::MIDI_PORT_ROUTE)  
       {
             if(src.type != Route::TRACK_ROUTE)
             {
@@ -495,7 +366,6 @@ void addRoute(Route src, Route dst)
               return;
             }
             
-            
             //MidiDevice *md = MusEGlobal::midiPorts[dst.midiPort].device();
             //if(!md)
             //{
@@ -506,24 +376,17 @@ void addRoute(Route src, Route dst)
             dst.channel = src.channel;
             RouteList* outRoutes = src.track->outRoutes();
       
-            //for (iRoute i = outRoutes->begin(); i != outRoutes->end(); ++i) 
-            iRoute ir = outRoutes->begin();                                      // p3.3.50
+            iRoute ir = outRoutes->begin();                                      
             for ( ; ir != outRoutes->end(); ++ir) 
             {
-              //if (*i == dst)    // route already there
-              if (ir->type == Route::MIDI_PORT_ROUTE && ir->midiPort == dst.midiPort)     // p3.3.50 Does a route to the midi port exist?
+              if (ir->type == Route::MIDI_PORT_ROUTE && ir->midiPort == dst.midiPort)     // Does a route to the midi port exist?
               {
-                //#ifdef ROUTE_DEBUG
-                //fprintf(stderr, "addRoute: dst midi port:%d src track:%s route already exists.\n", dst.midiPort, src.track->name().toLatin1().constData());
-                //#endif
-                //return;
-                
-                ir->channel |= dst.channel;    // p3.3.50 Bitwise OR the desired channel bit with the existing bit mask.
+                ir->channel |= dst.channel;    // Bitwise OR the desired channel bit with the existing bit mask.
                 break;
               }      
             }
             
-            if(ir == outRoutes->end())    // p3.3.50 Only if route not found, add the route, with the requested channel bits as mask to start with. 
+            if(ir == outRoutes->end())    // Only if route not found, add the route, with the requested channel bits as mask to start with. 
               outRoutes->push_back(dst);
             
             MidiPort *mp = &MusEGlobal::midiPorts[dst.midiPort];
@@ -533,167 +396,97 @@ void addRoute(Route src, Route dst)
             #endif
             RouteList* inRoutes = mp->inRoutes();
               
-            // p3.3.50 Make sure only one single route, with a channel mask, can ever exist.
+            // Make sure only one single route, with a channel mask, can ever exist.
             ir = inRoutes->begin();
             for ( ; ir != inRoutes->end(); ++ir)         
             {
-              if (ir->type == Route::TRACK_ROUTE && ir->track == src.track)  // p3.3.50 Does a route to the track exist?
+              if (ir->type == Route::TRACK_ROUTE && ir->track == src.track)  // Does a route to the track exist?
               {
-                ir->channel |= src.channel;    // p3.3.50 Bitwise OR the desired channel bit with the existing bit mask.
+                ir->channel |= src.channel;    // Bitwise OR the desired channel bit with the existing bit mask.
                 break;
               }      
             }
             
-            if(ir == inRoutes->end())    // p3.3.50 Only if route not found, add the route, with the requested channel bits as mask to start with. 
+            if(ir == inRoutes->end())    // Only if route not found, add the route, with the requested channel bits as mask to start with. 
               inRoutes->push_back(src);
-              //inRoutes->insert(inRoutes->begin(), src);
       }
       else 
       {
-        if(src.type != Route::TRACK_ROUTE || dst.type != Route::TRACK_ROUTE)  // p3.3.49
+        if(src.type != Route::TRACK_ROUTE || dst.type != Route::TRACK_ROUTE)  
         {
           fprintf(stderr, "addRoute: source or destination are not track routes\n");
           return;
         }
         
-        // Removed p3.3.49
-        /*
-        //if ((src.type == Route::JACK_MIDI_ROUTE) || (src.type == Route::ALSA_MIDI_ROUTE))
-        if(src.type == Route::MIDI_DEVICE_ROUTE)
-        {           
-            //src.channel = src.dstChannel = dst.dstChannel = dst.channel;
-            src.channel = dst.channel;
-            //src.channels = dst.channels = 1;
-            RouteList* outRoutes = src.device->outRoutes();
-            #ifdef ROUTE_DEBUG
-            fprintf(stderr, "addRoute: src name: %s looking for existing dest in out routes...\n", src.device->name().toLatin1().constData());
-            #endif
-            for (iRoute i = outRoutes->begin(); i != outRoutes->end(); ++i) 
-            {
-                  if (*i == dst)    // route already there
-                  {
-                        //#ifdef ROUTE_DEBUG
-                        fprintf(stderr, "addRoute: src Jack or ALSA midi route already exists.\n");
-                        //#endif
-                        return;
-                  }      
-            }
-            #ifdef ROUTE_DEBUG
-            fprintf(stderr, "addRoute: src midi dst name: %s pushing destination and source routes\n", dst.track->name().toLatin1().constData());
-            #endif
-            
-            outRoutes->push_back(dst);
-            RouteList* inRoutes = dst.track->inRoutes();
-            inRoutes->push_back(src);
-        }          
-        else
-        */
+        RouteList* outRoutes = src.track->outRoutes();
         
-        {           
-            ///if(dst.type == Route::MIDI_DEVICE_ROUTE)  // Removed p3.3.49
-            //{
-            ///  dst.channel = src.channel;
-              //src.channel = src.dstChannel = dst.dstChannel = dst.channel;
-              //src.channels = dst.channels = 1;
-            //}
-            //else
-            //{
-              //src.channel = src.dstChannel = dst.dstChannel = dst.channel;
-              //src.channels = dst.channels = 1;
-            //}
-              
-            RouteList* outRoutes = src.track->outRoutes();
-            
-            //
-            // Must enforce to ensure channel and channels are valid if defaults of -1 passed.
-            //
-            if(src.track->type() == Track::AUDIO_SOFTSYNTH)
-            {
-              if(src.channel == -1)
-                src.channel = 0;
-              if(src.channels == -1)
-                src.channels = src.track->channels();  
-              //if(dst.type == Route::TRACK_ROUTE)      // p3.3.49 Removed
-              //{
-                //if(dst.channel == -1)
-                //  dst.channel = 0;
-                //if(dst.channels == -1)
-                  // Yes, that's correct: dst channels = src track channels.
-                //  dst.channels = src.track->channels();  
-                dst.channel = src.channel;
-                dst.channels = src.channels;
-                dst.remoteChannel = src.remoteChannel;
-              //}
-            }
-            //if(dst.type == Route::TRACK_ROUTE && dst.track->type() == Track::AUDIO_SOFTSYNTH)
-            //{
-            //  if(dst.channel == -1)
-            //    dst.channel = 0;
-            //  if(dst.channels == -1)
-                // Yes, that's correct: dst channels = src track channels.
-            //    dst.channels = src.track->channels();  
-            //}
-            
-            for (ciRoute i = outRoutes->begin(); i != outRoutes->end(); ++i) 
-            {
-                  if (*i == dst)    // route already there
-                  // TODO:
-                  //if (i->type == dst.type && i->channel == dst.channel)    
+        //
+        // Must enforce to ensure channel and channels are valid if defaults of -1 passed.
+        //
+        if(src.track->type() == Track::AUDIO_SOFTSYNTH)
+        {
+          if(src.channel == -1)
+            src.channel = 0;
+          if(src.channels == -1)
+            src.channels = src.track->channels();  
+          dst.channel = src.channel;
+          dst.channels = src.channels;
+          dst.remoteChannel = src.remoteChannel;
+        }
+        
+        for (ciRoute i = outRoutes->begin(); i != outRoutes->end(); ++i) 
+        {
+              if (*i == dst)    // route already there
+              // TODO:
+              //if (i->type == dst.type && i->channel == dst.channel)    
+              {
+                //if(i->type == Route::TRACK_ROUTE)
+                {
+                  //if(i->track == dst.track)
                   {
-                    //if(i->type == Route::TRACK_ROUTE)
+                    //if(i->channels == dst.channels)
                     {
-                      //if(i->track == dst.track)
-                      {
-                        //if(i->channels == dst.channels)
-                        {
-                          //#ifdef ROUTE_DEBUG
-                          fprintf(stderr, "addRoute: src track route already exists.\n");
-                          //#endif
-                          return;
-                        }
-                        //else
-                        //{
-                        
-                        //}
-                      }
+                      //#ifdef ROUTE_DEBUG
+                      fprintf(stderr, "addRoute: src track route already exists.\n");
+                      //#endif
+                      return;
                     }
-                  }      
-            }
-            outRoutes->push_back(dst);
-            RouteList* inRoutes;
-            
-            // Removed p3.3.49
-            /*
-            //if ((dst.type == Route::JACK_MIDI_ROUTE) || (dst.type == Route::ALSA_MIDI_ROUTE))
-            if(dst.type == Route::MIDI_DEVICE_ROUTE)
-            {
-              #ifdef ROUTE_DEBUG
-              fprintf(stderr, "addRoute: src track dst midi name: %s pushing destination and source routes\n", dst.device->name().toLatin1().constData());
-              #endif
-              inRoutes = dst.device->inRoutes();
-            }  
-            else  
-            */
-            
-            {
-              #ifdef ROUTE_DEBUG
-              //fprintf(stderr, "addRoute: src track ch:%d chs:%d  dst track ch:%d chs:%d name: %s pushing destination and source routes\n", src.channel, src.channels, dst.channel, dst.channels, dst.track->name().toLatin1().constData());
-              fprintf(stderr, "addRoute: src track ch:%d chs:%d remch:%d  dst track ch:%d chs:%d remch:%d name: %s pushing dest and source routes\n", 
-                src.channel, src.channels, src.remoteChannel, dst.channel, dst.channels, dst.remoteChannel, dst.track->name().toLatin1().constData());
-              //fprintf(stderr, "addRoute: src track ch:%d  dst track ch:%d name: %s pushing destination and source routes\n", src.channel, dst.channel, dst.track->name().toLatin1().constData());
-              #endif
-              inRoutes = dst.track->inRoutes();
-            }  
-              
-            
-            //
-            // make sure AUDIO_AUX is processed last
-            //
-            if (src.track->type() == Track::AUDIO_AUX)
-                  inRoutes->push_back(src);
-            else
-                  inRoutes->insert(inRoutes->begin(), src);
-        }          
+                    //else
+                    //{
+                    
+                    //}
+                  }
+                }
+              }      
+        }
+        outRoutes->push_back(dst);
+        RouteList* inRoutes;
+        
+        #ifdef ROUTE_DEBUG
+        //fprintf(stderr, "addRoute: src track ch:%d chs:%d  dst track ch:%d chs:%d name: %s pushing destination and source routes\n", src.channel, src.channels, dst.channel, dst.channels, dst.track->name().toLatin1().constData());
+        fprintf(stderr, "addRoute: src track ch:%d chs:%d remch:%d  dst track ch:%d chs:%d remch:%d name: %s pushing dest and source routes\n", 
+          src.channel, src.channels, src.remoteChannel, dst.channel, dst.channels, dst.remoteChannel, dst.track->name().toLatin1().constData());
+        //fprintf(stderr, "addRoute: src track ch:%d  dst track ch:%d name: %s pushing destination and source routes\n", src.channel, dst.channel, dst.track->name().toLatin1().constData());
+        #endif
+        inRoutes = dst.track->inRoutes();
+        
+        //
+        // make sure AUDIO_AUX is processed last
+        //
+        if (src.track->type() == Track::AUDIO_AUX)       // REMOVE Tim. This special aux code may not be useful or needed now.
+              inRoutes->push_back(src);                  //
+        else
+              inRoutes->insert(inRoutes->begin(), src);
+        
+        // Is the source an Aux Track or else does it have Aux Tracks routed to it?
+        // Update the destination track's aux ref count, and all tracks it is routed to.
+        if(src.track->auxRefCount())
+            //dst.track->updateAuxStates( src.track->auxRefCount() );
+            src.track->updateAuxRoute( src.track->auxRefCount(), dst.track );
+        else 
+        if(src.track->type() == Track::AUDIO_AUX)
+            //dst.track->updateAuxStates( 1 );
+            src.track->updateAuxRoute( 1, dst.track );
       }
 }
 
@@ -709,12 +502,6 @@ void removeRoute(Route src, Route dst)
          
       if (src.type == Route::JACK_ROUTE) 
       {
-            //if (dst.type != TRACK_ROUTE) 
-            //{
-            //      fprintf(stderr, "removeRoute: bad route 1\n");
-                  // exit(-1);
-            //      return;
-            //}
             if(!dst.isValid())
             {
               printf("removeRoute: source is jack, invalid destination\n");
@@ -726,7 +513,6 @@ void removeRoute(Route src, Route dst)
               if (dst.track->type() != Track::AUDIO_INPUT) 
               {
                     fprintf(stderr, "removeRoute: source is jack, destination is track but not audio input\n");
-                    // exit(-1);
                     return;
               }
               RouteList* inRoutes = dst.track->inRoutes();
@@ -741,7 +527,6 @@ void removeRoute(Route src, Route dst)
               }
             }  
             else
-            //if (dst.type == Route::JACK_MIDI_ROUTE) 
             if (dst.type == Route::MIDI_DEVICE_ROUTE) 
             {
               RouteList* routes = dst.device->inRoutes();
@@ -758,18 +543,11 @@ void removeRoute(Route src, Route dst)
             else
             {
                   fprintf(stderr, "removeRoute: source is jack, destination unknown\n");
-                  // exit(-1);
                   return;
             }
       }
       else if (dst.type == Route::JACK_ROUTE) 
       {
-            //if (src.type != TRACK_ROUTE) 
-            //{
-            //      fprintf(stderr, "removeRoute: bad route 3\n");
-                  // exit(-1);
-            //      return;
-            //}
             if(!src.isValid())
             {
               printf("removeRoute: destination is jack, invalid source\n");
@@ -781,7 +559,6 @@ void removeRoute(Route src, Route dst)
               if (src.track->type() != Track::AUDIO_OUTPUT) 
               {
                     fprintf(stderr, "removeRoute: destination is jack, source is track but not audio output\n");
-                    // exit(-1);
                     return;
               }
               RouteList* outRoutes = src.track->outRoutes();
@@ -795,7 +572,6 @@ void removeRoute(Route src, Route dst)
               }
             }  
             else
-            //if (src.type == Route::JACK_MIDI_ROUTE) 
             if (src.type == Route::MIDI_DEVICE_ROUTE) 
             {
               RouteList* routes = src.device->outRoutes();
@@ -811,11 +587,10 @@ void removeRoute(Route src, Route dst)
             else
             {
                   fprintf(stderr, "removeRoute: destination is jack, source unknown\n");
-                  // exit(-1);
                   return;
             }
       }
-      else if(src.type == Route::MIDI_PORT_ROUTE)  // p3.3.49
+      else if(src.type == Route::MIDI_PORT_ROUTE)  
       {
         if(dst.type != Route::TRACK_ROUTE)
         {
@@ -829,19 +604,18 @@ void removeRoute(Route src, Route dst)
           RouteList* outRoutes = mp->outRoutes();
           for (iRoute i = outRoutes->begin(); i != outRoutes->end(); ++i) 
           {
-            //if (*i == dst) 
-            if(i->type == Route::TRACK_ROUTE && i->track == dst.track)  // p3.3.50 Is there a route to the track?
+            if(i->type == Route::TRACK_ROUTE && i->track == dst.track)  // Is there a route to the track?
             {
               //printf("i->channel:%x dst.channel:%x\n", i->channel, dst.channel);   
-              i->channel &= ~dst.channel;        // p3.3.50 Unset the desired channel bits.
+              i->channel &= ~dst.channel;        // Unset the desired channel bits.
               if(i->channel == 0)                // Only if there are no channel bits set, erase the route.
               {
                 //printf("erasing out route from midi port:%d\n", src.midiPort);   
                 outRoutes->erase(i);
               }  
               
-              break;                             // For safety, keep looking and remove any more found.
-                                                  // No, must break, else crash. There should only be one route anyway...
+              break;  // For safety, keep looking and remove any more found.
+                      // No, must break, else crash. There should only be one route anyway...
             }
           }
         }
@@ -853,22 +627,21 @@ void removeRoute(Route src, Route dst)
           RouteList* inRoutes = dst.track->inRoutes();
           for (iRoute i = inRoutes->begin(); i != inRoutes->end(); ++i) 
           {
-            //if (*i == src) 
-            if (i->type == Route::MIDI_PORT_ROUTE && i->midiPort == src.midiPort)  // p3.3.50 Is there a route to the midi port?
+            if (i->type == Route::MIDI_PORT_ROUTE && i->midiPort == src.midiPort)  // Is there a route to the midi port?
             {
-              i->channel &= ~src.channel;        // p3.3.50 Unset the desired channel bits.
+              i->channel &= ~src.channel;        // Unset the desired channel bits.
               if(i->channel == 0)                // Only if there are no channel bits set, erase the route.
                 inRoutes->erase(i);
               
-              break;                             // For safety, keep looking and remove any more found.
-                                                  // No, must break, else crash. There should only be one route anyway...
+              break;  // For safety, keep looking and remove any more found.
+                      // No, must break, else crash. There should only be one route anyway...
             }
           }
         }
         else
           printf("removeRoute: source is midi port:%d but destination track invalid\n", src.midiPort);
       }      
-      else if(dst.type == Route::MIDI_PORT_ROUTE)  // p3.3.49
+      else if(dst.type == Route::MIDI_PORT_ROUTE)  
       {
         if(src.type != Route::TRACK_ROUTE)
         {
@@ -881,15 +654,14 @@ void removeRoute(Route src, Route dst)
           RouteList* outRoutes = src.track->outRoutes();
           for (iRoute i = outRoutes->begin(); i != outRoutes->end(); ++i) 
           {
-            //if (*i == dst) 
-            if (i->type == Route::MIDI_PORT_ROUTE && i->midiPort == dst.midiPort)  // p3.3.50 Is there a route to the midi port?
+            if (i->type == Route::MIDI_PORT_ROUTE && i->midiPort == dst.midiPort)  // Is there a route to the midi port?
             {
-              i->channel &= ~dst.channel;        // p3.3.50 Unset the desired channel bits.
+              i->channel &= ~dst.channel;        // Unset the desired channel bits.
               if(i->channel == 0)                // Only if there are no channel bits set, erase the route.
                   outRoutes->erase(i);
                   
-              break;                             // For safety, keep looking and remove any more found.
-                                                 // No, must break, else crash. There should only be one route anyway...
+              break;  // For safety, keep looking and remove any more found.
+                      // No, must break, else crash. There should only be one route anyway...
             }
           }
         }  
@@ -902,15 +674,14 @@ void removeRoute(Route src, Route dst)
           RouteList* inRoutes = mp->inRoutes();
           for (iRoute i = inRoutes->begin(); i != inRoutes->end(); ++i) 
           {
-            //if (*i == src) 
-            if (i->type == Route::TRACK_ROUTE && i->track == src.track)  // p3.3.50 Is there a route to the track?
+            if (i->type == Route::TRACK_ROUTE && i->track == src.track)  // Is there a route to the track?
             {
-              i->channel &= ~src.channel;        // p3.3.50 Unset the desired channel bits.
+              i->channel &= ~src.channel;        // Unset the desired channel bits.
               if(i->channel == 0)                // Only if there are no channel bits set, erase the route.
                 inRoutes->erase(i);
                   
-              break;                             // For safety, keep looking and remove any more found.
-                                                 // No, must break, else crash. There should only be one route anyway...
+              break;  // For safety, keep looking and remove any more found.
+                      // No, must break, else crash. There should only be one route anyway...
             }
           }
         }  
@@ -919,87 +690,54 @@ void removeRoute(Route src, Route dst)
       }
       else 
       {
-            if(src.type != Route::TRACK_ROUTE || dst.type != Route::TRACK_ROUTE)  // p3.3.49
+            if(src.type != Route::TRACK_ROUTE || dst.type != Route::TRACK_ROUTE)  
             {
               fprintf(stderr, "removeRoute: source and destination are not tracks\n");
               return;
             }
             
-            // Removed p3.3.49
-            /*
-            //if((src.type == Route::JACK_MIDI_ROUTE) || (src.type == Route::ALSA_MIDI_ROUTE))
-            if(src.type == Route::MIDI_DEVICE_ROUTE)
+            // Is the source an Aux Track or else does it have Aux Tracks routed to it?
+            // Update the destination track's aux ref count, and all tracks it is routed to.
+            if(src.isValid() && dst.isValid())
             {
-              if(src.isValid())
-              {
-                RouteList* outRoutes = src.device->outRoutes();
-                for (iRoute i = outRoutes->begin(); i != outRoutes->end(); ++i) 
-                {
-                      if (*i == dst) {
-                            outRoutes->erase(i);
-                            break;
-                            }
-                }
-              }
+              if(src.track->auxRefCount())
+                //dst.track->updateAuxStates( -src.track->auxRefCount() );
+                src.track->updateAuxRoute( -src.track->auxRefCount(), dst.track );
               else
-                printf("removeRoute: source is midi but invalid\n");
-              
-              if(dst.isValid())
+              if(src.track->type() == Track::AUDIO_AUX)
+                //dst.track->updateAuxStates( -1 );
+                src.track->updateAuxRoute( -1, dst.track );
+            }
+            
+            if(src.isValid())
+            {
+              RouteList* outRoutes = src.track->outRoutes();
+              for (iRoute i = outRoutes->begin(); i != outRoutes->end(); ++i) 
               {
-                RouteList* inRoutes = dst.track->inRoutes();
-                for (iRoute i = inRoutes->begin(); i != inRoutes->end(); ++i) 
-                {
-                      if (*i == src) {
-                            inRoutes->erase(i);
-                            break;
-                            }
-                }
+                    if (*i == dst) {
+                          outRoutes->erase(i);
+                          break;
+                          }
               }
-              else
-                printf("removeRoute: source is midi but destination invalid\n");
-            }
+            }  
             else
-            */
+              printf("removeRoute: source is track but invalid\n");
             
+            if(dst.isValid())
             {
-              if(src.isValid())
-              {
-                RouteList* outRoutes = src.track->outRoutes();
-                for (iRoute i = outRoutes->begin(); i != outRoutes->end(); ++i) 
-                {
-                      if (*i == dst) {
-                            outRoutes->erase(i);
-                            break;
-                            }
-                }
-              }  
-              else
-                printf("removeRoute: source is track but invalid\n");
+              RouteList* inRoutes;
               
-              if(dst.isValid())
+              inRoutes = dst.track->inRoutes();
+              for (iRoute i = inRoutes->begin(); i != inRoutes->end(); ++i) 
               {
-                RouteList* inRoutes;
-                
-                //if ((dst.type == Route::JACK_MIDI_ROUTE) || (dst.type == Route::ALSA_MIDI_ROUTE))
-                // Removed p3.3.49
-                /*
-                if (dst.type == Route::MIDI_DEVICE_ROUTE)
-                  inRoutes = dst.device->inRoutes();
-                else  
-                */
-                
-                  inRoutes = dst.track->inRoutes();
-                for (iRoute i = inRoutes->begin(); i != inRoutes->end(); ++i) 
-                {
-                      if (*i == src) {
-                            inRoutes->erase(i);
-                            break;
-                            }
-                }
-              }  
-              else
-                printf("removeRoute: source is track but destination invalid\n");
-            }      
+                    if (*i == src) {
+                          inRoutes->erase(i);
+                          break;
+                          }
+              }
+            }  
+            else
+              printf("removeRoute: source is track but destination invalid\n");
       }
 }
 
@@ -1013,9 +751,19 @@ void removeRoute(Route src, Route dst)
 //   So far it only works with MidiDevice <-> Jack.
 //---------------------------------------------------------
 
-// p3.3.55
 void removeAllRoutes(Route src, Route dst)
 {
+    // TODO: Is the source an Aux Track or else does it have Aux Tracks routed to it?
+    // Update the destination track's aux ref count, and all tracks it is routed to.
+    /* if(src.isValid() && dst.isValid())
+    {
+      if(src.track->auxRefCount())
+        dst.track->updateAuxStates( -src.track->auxRefCount() );
+      else  
+      if(src.track->type() == Track::TrackType::AUDIO_AUX))
+        dst.track->updateAuxStates( -1 );
+    }  */
+
     if(src.isValid())  
     {
       if(src.type == Route::MIDI_DEVICE_ROUTE)
@@ -1052,22 +800,11 @@ static QString track2name(const Track* n)
 
 QString Route::name() const
 {
-      // p3.3.38 Removed
-      /*
-      QString s;
-      if ((type == TRACK_ROUTE) && (channel != -1)) {
-//      if (channel != -1) {
-            QString c;
-            c.setNum(channel+1);
-            s = c + ":";
-            }
-      */
-      
       if(type == MIDI_DEVICE_ROUTE) 
       {
         if(device)
         {
-          // p3.3.55 Removed for unified jack in/out devices, the actual port names are now different from device name.
+          // For unified jack in/out devices, the actual port names are now different from device name.
           // Like this:   device: "MyJackDevice1" ->  inport: "MyJackDevice1_in"  outport: "MyJackDevice1_out"
           /*  
           if(device->deviceType() == MidiDevice::JACK_MIDI)
@@ -1075,8 +812,7 @@ QString Route::name() const
           else
           */
           
-          //if(device->deviceType() == MidiDevice::ALSA_MIDI)
-            return device->name();
+          return device->name();
         }
         return QWidget::tr("None");
       }
@@ -1084,16 +820,14 @@ QString Route::name() const
       if(type == JACK_ROUTE) 
       {
         if (!MusEGlobal::checkAudioDevice()) return "";
-        //return s + MusEGlobal::audioDevice->portName(jackPort);
         return MusEGlobal::audioDevice->portName(jackPort);
       }
       else
-      if(type == MIDI_PORT_ROUTE) // p3.3.49
+      if(type == MIDI_PORT_ROUTE) 
       {
         return ROUTE_MIDIPORT_NAME_PREFIX + QString().setNum(midiPort);
       }
       else
-        //return s + track2name(track);
         return track2name(track);
 }
 
@@ -1106,7 +840,6 @@ Route name2route(const QString& rn, bool /*dst*/, int rtype)
 {
 // printf("name2route %s\n", rn.toLatin1().constData());
   int channel = -1;
-  //int channel = 0;
   QString s(rn);
   // Support old route style in med files. Obsolete.
   if (rn[0].isNumber() && rn[1]==':') 
@@ -1117,8 +850,6 @@ Route name2route(const QString& rn, bool /*dst*/, int rtype)
   
   if(rtype == -1)
   {  
-    //if(dst) 
-    //{
       if(MusEGlobal::checkAudioDevice())
       {
         void* p = MusEGlobal::audioDevice->findPort(s.toLatin1().constData());
@@ -1149,7 +880,6 @@ Route name2route(const QString& rn, bool /*dst*/, int rtype)
             return Route(*i, channel);
       }
     
-      // p3.3.49
       if(s.left(ROUTE_MIDIPORT_NAME_PREFIX.length()) == ROUTE_MIDIPORT_NAME_PREFIX)
       {
         bool ok = false;
@@ -1160,8 +890,6 @@ Route name2route(const QString& rn, bool /*dst*/, int rtype)
   }
   else
   {
-    //if(dst) 
-    //{
       if(rtype == Route::TRACK_ROUTE)
       {  
         TrackList* tl = MusEGlobal::song->tracks();
@@ -1178,8 +906,6 @@ Route name2route(const QString& rn, bool /*dst*/, int rtype)
             AudioTrack* track = (AudioTrack*)*i;
             if(track->name() == s)
               return Route(track, channel);
-              //return Route(track, channel, 1);
-              //return Route(track, channel, track->channels());
           }      
         }
       }
@@ -1191,7 +917,6 @@ Route name2route(const QString& rn, bool /*dst*/, int rtype)
         for(iMidiDevice i = MusEGlobal::midiDevices.begin(); i != MusEGlobal::midiDevices.end(); ++i) 
         {
           if((*i)->name() == s)
-          //if (jmd->name() == rn)
             return Route(*i, channel);
           
           /*
@@ -1224,7 +949,7 @@ Route name2route(const QString& rn, bool /*dst*/, int rtype)
         }      
       }
       else
-      if(rtype == Route::MIDI_PORT_ROUTE) // p3.3.49
+      if(rtype == Route::MIDI_PORT_ROUTE) 
       {  
         if(s.left(ROUTE_MIDIPORT_NAME_PREFIX.length()) == ROUTE_MIDIPORT_NAME_PREFIX)
         {
@@ -1238,7 +963,6 @@ Route name2route(const QString& rn, bool /*dst*/, int rtype)
   
   printf("  name2route: <%s> not found\n", rn.toLatin1().constData());
   return Route((Track*) 0, channel);
-  //return Route((Track*) 0, channel, 1);
 }
 
 //---------------------------------------------------------
@@ -1255,10 +979,6 @@ bool checkRoute(const QString& s, const QString& d)
             return false;
       if (src.type == Route::JACK_ROUTE) 
       {
-            //if (dst.type != TRACK_ROUTE) {
-            //      return false;
-            //      }
-            
             if (dst.type == Route::TRACK_ROUTE) 
             {
               if (dst.track->type() != Track::AUDIO_INPUT) {
@@ -1274,12 +994,9 @@ bool checkRoute(const QString& s, const QString& d)
               }
             }
             else
-            //if (dst.type == Route::JACK_MIDI_ROUTE) 
             if (dst.type == Route::MIDI_DEVICE_ROUTE) 
             {
-              //src.channel = dst.channel;
               src.channel = -1;
-              //dst.channel = -1;
               RouteList* routes = dst.device->inRoutes();
               for (ciRoute i = routes->begin(); i != routes->end(); ++i) 
               {
@@ -1293,10 +1010,6 @@ bool checkRoute(const QString& s, const QString& d)
       }  
       else if (dst.type == Route::JACK_ROUTE) 
       {
-            //if (src.type != TRACK_ROUTE) {
-            //      return false;
-            //      }
-            
             if (src.type == Route::TRACK_ROUTE) 
             {
               if (src.track->type() != Track::AUDIO_OUTPUT) {
@@ -1312,13 +1025,10 @@ bool checkRoute(const QString& s, const QString& d)
               }
             }
             else
-            //if (src.type == Route::JACK_MIDI_ROUTE) 
             if (src.type == Route::MIDI_DEVICE_ROUTE) 
             {
               RouteList* routes = src.device->outRoutes();
-              //dst.channel = src.channel;
               dst.channel = -1;
-              //src.channel = -1;
               for (ciRoute i = routes->begin(); i != routes->end(); ++i) 
               {
                     if (*i == dst) {   // route already there
@@ -1329,7 +1039,7 @@ bool checkRoute(const QString& s, const QString& d)
             else
               return false;
       }  
-      else if (src.type == Route::MIDI_PORT_ROUTE) // p3.3.49
+      else if (src.type == Route::MIDI_PORT_ROUTE) 
       {
             RouteList* outRoutes = MusEGlobal::midiPorts[src.midiPort].outRoutes();
             for (ciRoute i = outRoutes->begin(); i != outRoutes->end(); ++i) 
@@ -1339,13 +1049,11 @@ bool checkRoute(const QString& s, const QString& d)
                         }
             }
       }
-      //else if (dst.type == Route::MIDI_PORT_ROUTE) // p3.3.49
+      //else if (dst.type == Route::MIDI_PORT_ROUTE) 
       //{
       //}
       else 
       {
-            //RouteList* outRoutes = ((src.type == Route::JACK_MIDI_ROUTE) || (src.type == Route::ALSA_MIDI_ROUTE)) ? 
-            //                       src.device->outRoutes() : src.track->outRoutes();
             RouteList* outRoutes = (src.type == Route::MIDI_DEVICE_ROUTE) ? src.device->outRoutes() : src.track->outRoutes();
             
             for (ciRoute i = outRoutes->begin(); i != outRoutes->end(); ++i) 
@@ -1366,7 +1074,7 @@ void Route::read(Xml& xml)
 {
       QString s;
       int dtype = MidiDevice::ALSA_MIDI;
-      int port = -1;                             // p3.3.49
+      int port = -1;                             
       unsigned char rtype = Route::TRACK_ROUTE;  
       
       for (;;) 
@@ -1397,7 +1105,7 @@ void Route::read(Xml& xml)
                         if(tag == "name")
                           s = xml.s2();
                         else
-                        if(tag == "mport") // p3.3.49
+                        if(tag == "mport") 
                         {
                           port = xml.s2().toInt();
                           rtype = Route::MIDI_PORT_ROUTE;
@@ -1409,7 +1117,7 @@ void Route::read(Xml& xml)
                         #ifdef ROUTE_DEBUG
                         printf("Route::read(): tag end type:%d channel:%d name:%s\n", rtype, channel, s.toLatin1().constData());
                         #endif
-                        if(rtype == MIDI_PORT_ROUTE)  // p3.3.49
+                        if(rtype == MIDI_PORT_ROUTE)  
                         {
                           if(port >= 0 && port < MIDI_PORTS)
                           {
@@ -1462,7 +1170,6 @@ void Route::read(Xml& xml)
                               MidiDevice* md = *imd;
                               if(md->name() == s && md->deviceType() == dtype) 
                               {
-                                // p3.3.45
                                 // We found a device, but if it is not in use by the song (port is -1), ignore it. 
                                 // This prevents loading and propagation of bogus routes in the med file.
                                 if(md->midiPort() == -1)
@@ -1509,7 +1216,7 @@ void Song::readRoute(Xml& xml)
                   case Xml::End:
                         return;
                   case Xml::TagStart:
-                        // p3.3.38 2010/02/03 Support old routes in med files. Now obsolete!
+                        // 2010/02/03 Support old routes in med files. Now obsolete!
                         if (tag == "srcNode")
                               src = xml.parse1();
                         else if (tag == "dstNode")
@@ -1545,7 +1252,7 @@ void Song::readRoute(Xml& xml)
                         if(tag == "remch")
                           remch = xml.s2().toInt();
                         else
-                        if(tag == "channelMask")           // p3.3.50 New channel mask for midi port-track routes.
+                        if(tag == "channelMask")           // New channel mask for midi port-track routes.
                           ch = xml.s2().toInt();               
                         else
                           printf("Song::readRoute(): unknown attribute:%s\n", tag.toLatin1().constData());
@@ -1564,17 +1271,17 @@ void Song::readRoute(Xml& xml)
                           // Support new routes.
                           if(sroute.isValid() && droute.isValid())
                           {    
-                            // p3.3.49 Support pre- 1.1-RC2 midi-device-to-track routes. Obsolete. Replaced with midi port routes.
+                            // Support pre- 1.1-RC2 midi-device-to-track routes. Obsolete. Replaced with midi port routes.
                             if(sroute.type == Route::MIDI_DEVICE_ROUTE && droute.type == Route::TRACK_ROUTE) 
                             {
                               if(sroute.device->midiPort() >= 0 && sroute.device->midiPort() < MIDI_PORTS
-                                 && ch >= 0 && ch < MIDI_CHANNELS)         // p3.3.50
+                                 && ch >= 0 && ch < MIDI_CHANNELS)         
                               {
                                 sroute.midiPort = sroute.device->midiPort();
                                 sroute.device = 0;
                                 sroute.type = Route::MIDI_PORT_ROUTE;
                                 
-                                sroute.channel = 1 << ch;                  // p3.3.50  Convert to new bit-wise channel mask.
+                                sroute.channel = 1 << ch;                  // Convert to new bit-wise channel mask.
                                 droute.channel = sroute.channel;
                                 
                                 addRoute(sroute, droute);
@@ -1586,13 +1293,13 @@ void Song::readRoute(Xml& xml)
                             else if(sroute.type == Route::TRACK_ROUTE && droute.type == Route::MIDI_DEVICE_ROUTE) 
                             {
                               if(droute.device->midiPort() >= 0 && droute.device->midiPort() < MIDI_PORTS
-                                 && ch >= 0 && ch < MIDI_CHANNELS)        // p3.3.50
+                                 && ch >= 0 && ch < MIDI_CHANNELS)        
                               {
                                 droute.midiPort = droute.device->midiPort();
                                 droute.device = 0;
                                 droute.type = Route::MIDI_PORT_ROUTE;
                                 
-                                droute.channel = 1 << ch;                  // p3.3.50  Convert to new bit-wise channel mask.
+                                droute.channel = 1 << ch;                  // Convert to new bit-wise channel mask.
                                 sroute.channel = droute.channel;
                                 
                                 addRoute(sroute, droute);
@@ -1659,7 +1366,7 @@ void Route::dump() const
           printf("Route dump: jack audio port <%s> channel %d\n", MusEGlobal::audioDevice->portName(jackPort).toLatin1().constData(), channel);
       }
       else 
-      if (type == MIDI_PORT_ROUTE) // p3.3.49
+      if (type == MIDI_PORT_ROUTE) 
       {
         printf("Route dump: midi port <%d> channel mask %d\n", midiPort, channel);
       }
@@ -1672,8 +1379,6 @@ void Route::dump() const
           if(device->deviceType() == MidiDevice::JACK_MIDI)
           {
             if(MusEGlobal::checkAudioDevice())
-              //printf("jack midi port device <%s> ", MusEGlobal::audioDevice->portName(device->clientPort()).toLatin1().constData());
-            // p3.3.55
             {  
               printf("jack midi device <%s> ", device->name().toLatin1().constData());
               if(device->inClientPort())
@@ -1730,36 +1435,16 @@ bool Route::operator==(const Route& a) const
               {
                     //if (!MusEGlobal::checkAudioDevice()) return false;
                     //return MusEGlobal::audioDevice->portName(jackPort) == MusEGlobal::audioDevice->portName(a.jackPort);
-                    // p3.3.55 Simplified.
-                    return jackPort == a.jackPort;
+                    return jackPort == a.jackPort;    // Simplified.
               }
               else 
-              if (type == MIDI_PORT_ROUTE) // p3.3.49
+              if (type == MIDI_PORT_ROUTE) 
               {
                 return midiPort == a.midiPort;
               }
               else 
               if (type == MIDI_DEVICE_ROUTE)
               {
-                // p3.3.55 Changed for unified jack in/out devices, the actual port names are now different from device name.
-                // Like this:   device: "MyJackDevice1" ->  inport: "MyJackDevice1_in"  outport: "MyJackDevice1_out"
-                /*
-                if(device && a.device && device->deviceType() == a.device->deviceType())
-                {
-                  if(device->deviceType() == MidiDevice::JACK_MIDI)
-                  {
-                    if (!MusEGlobal::checkAudioDevice()) return false;
-                    return MusEGlobal::audioDevice->portName(device->clientPort()) == MusEGlobal::audioDevice->portName(a.device->clientPort());
-                  }
-                  else
-                  if(device->deviceType() == MidiDevice::ALSA_MIDI)
-                    // TODO: OK ?? 
-                    return device->clientPort() == a.device->clientPort() && (channel == a.channel);
-                  else
-                  if(device->deviceType() == MidiDevice::SYNTH_MIDI)
-                    return device->name() == a.device->name();
-                }    
-                */
                 return device == a.device;
               }
             }    
@@ -1767,4 +1452,56 @@ bool Route::operator==(const Route& a) const
       return false;
 }
 
+/*
+//---------------------------------------------------------
+//   isCircularRoute
+//   Recursive.
+//   If dst is valid, start traversal from there, not from src.
+//   Returns true if circular.
+//---------------------------------------------------------
+
+bool isCircularRoutePath(Track* src, Track* dst)
+{
+  //if(isMidiTrack() || _type == AUDIO_AUX)
+  //if(isMidiTrack())
+  //  return;
+  
+  bool rv = false;
+  
+  if(dst)
+  {  
+    src->setNodeTraversed(true);
+    rv = isCircularRoutePath(dst, NULL);
+    src->setNodeTraversed(false);
+    //if(rv)
+    //  fprintf(stderr, "  Circular route %s -> %s\n", src->name().toLatin1().constData(), dst->name().toLatin1().constData()); 
+    return rv;
+  }
+  
+  if(src->nodeTraversed())
+    return true;
+  
+  src->setNodeTraversed(true);
+  
+  //printf("isCircularRoute %s\n", src->name().toLatin1().constData()); 
+  
+  RouteList* orl = src->outRoutes();
+  for (iRoute i = orl->begin(); i != orl->end(); ++i) 
+  {
+    if( !(*i).isValid() || (*i).type != Route::TRACK_ROUTE )
+      continue;
+    Track* t = (*i).track;
+    //if(t->isMidiTrack())
+    //  continue;
+    rv = isCircularRoutePath(src, NULL);
+    if(rv)
+      break; 
+  }
+  
+  src->setNodeTraversed(false);
+  return rv;
+}
+*/
+
+
 } // namespace MusECore
diff --git a/muse2/muse/route.h b/muse2/muse/route.h
index 36b00d47..587369bc 100644
--- a/muse2/muse/route.h
+++ b/muse2/muse/route.h
@@ -4,6 +4,7 @@
 //  $Id: route.h,v 1.5.2.1 2008/05/21 00:28:52 terminator356 Exp $
 //
 //  (C) Copyright 2001 Werner Schweer (ws@seh.de)
+//  (C) Copyright 2011 Tim E. Real (terminator356 on sourceforge)
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -43,17 +44,15 @@ class Xml;
 //---------------------------------------------------------
 
 struct Route {
-      enum { TRACK_ROUTE=0, JACK_ROUTE=1, MIDI_DEVICE_ROUTE=2, MIDI_PORT_ROUTE=3 }; // p3.3.49
+      enum { TRACK_ROUTE=0, JACK_ROUTE=1, MIDI_DEVICE_ROUTE=2, MIDI_PORT_ROUTE=3 }; 
       
       union {
-            //AudioTrack* track;
             Track* track;
-            //MidiJackDevice* device;
             MidiDevice* device;      
             void* jackPort;
             };
       
-      int midiPort;              // p3.3.49 Midi port number. Best not to put this in the union to avoid problems?
+      int midiPort;              // Midi port number. Best not to put this in the union to avoid problems?
       
       //snd_seq_addr_t alsaAdr;
       
@@ -75,7 +74,7 @@ struct Route {
       Route(void* t, int ch=-1);
       Route(Track* t, int ch = -1, int chans = -1);
       Route(MidiDevice* d, int ch);  
-      Route(int port, int ch);         // p3.3.49
+      Route(int port, int ch);         
       Route(const QString&, bool dst, int ch, int rtype = -1);
       Route();
       
@@ -84,7 +83,7 @@ struct Route {
       bool isValid() const {
             return ((type == TRACK_ROUTE) && (track != 0)) || ((type == JACK_ROUTE) && (jackPort != 0)) || 
                    ((type == MIDI_DEVICE_ROUTE) && (device != 0)) ||
-                   ((type == MIDI_PORT_ROUTE) && (midiPort >= 0) && (midiPort < MIDI_PORTS));   // p3.3.49
+                   ((type == MIDI_PORT_ROUTE) && (midiPort >= 0) && (midiPort < MIDI_PORTS));   
             }
       void read(Xml& xml);
       void dump() const;
@@ -106,6 +105,7 @@ extern void removeRoute(Route, Route);
 extern void removeAllRoutes(Route, Route);  // p3.3.55
 extern Route name2route(const QString&, bool dst, int rtype = -1);
 extern bool checkRoute(const QString&, const QString&);
+//extern bool isCircularRoutePath(Track* src, Track* dst);  // Recursive.
 
 //---------------------------------------------------------
 //   RouteMenuMap
diff --git a/muse2/muse/shortcuts.cpp b/muse2/muse/shortcuts.cpp
index 7563fd93..95df7292 100644
--- a/muse2/muse/shortcuts.cpp
+++ b/muse2/muse/shortcuts.cpp
@@ -42,7 +42,7 @@ ShortCut shortcuts[SHRT_NUM_OF_ELEMENTS];
 void defShrt(int shrt, int key, const char* descr, int type, const char* xml)
 {
       shortcuts[shrt].key   = key;
-      shortcuts[shrt].descr = QT_TRANSLATE_NOOP("@default", descr);
+      shortcuts[shrt].descr = descr;
       shortcuts[shrt].type  = type;
       shortcuts[shrt].xml   = xml;
 }
@@ -51,279 +51,279 @@ void defShrt(int shrt, int key, const char* descr, int type, const char* xml)
 void initShortCuts()
       {
       //Global:
-      defShrt(SHRT_PLAY_SONG,     Qt::Key_Enter, "Transport: Start playback from current location", GLOBAL_SHRT, "play");
-      defShrt(SHRT_TOGGLE_METRO,  Qt::Key_C,     "Transport: Toggle metronome", GLOBAL_SHRT,"toggle_metro");
-      defShrt(SHRT_STOP,          Qt::Key_Insert,"Transport: Stop Playback", GLOBAL_SHRT, "stop");
-      defShrt(SHRT_GOTO_START,    Qt::Key_W,      "Transport: Goto Start", GLOBAL_SHRT, "goto_start");
-      defShrt(SHRT_PLAY_TOGGLE,   Qt::Key_Space, "Transport: Play, Stop, Rewind", GLOBAL_SHRT, "play_toggle");
-      defShrt(SHRT_GOTO_LEFT,     Qt::Key_End,   "Transport: Goto left marker"  , GLOBAL_SHRT, "goto_left");
-      defShrt(SHRT_GOTO_RIGHT,    Qt::Key_PageDown,  "Transport: Goto right marker" , GLOBAL_SHRT, "goto_right");
-      defShrt(SHRT_TOGGLE_LOOP,   Qt::Key_Slash, "Transport: Toggle Loop section", GLOBAL_SHRT, "toggle_loop");
-      defShrt(SHRT_START_REC,     Qt::Key_Asterisk, "Transport: Toggle Record",    GLOBAL_SHRT, "toggle_rec");
-      defShrt(SHRT_REC_CLEAR,     Qt::Key_Backspace, "Transport: Clear all rec enabled tracks",    GLOBAL_SHRT, "rec_clear");
-      defShrt(SHRT_FULLSCREEN,       Qt::CTRL + Qt::Key_F, "Toggle fullscreen", GLOBAL_SHRT, "fullscreen");
-
-      defShrt(SHRT_COPY,          Qt::CTRL + Qt::Key_C, "Edit: Copy", INVIS_SHRT, "copy");
-      defShrt(SHRT_COPY_RANGE,    Qt::CTRL + Qt::SHIFT + Qt::Key_C, "Edit: Copy in range", GLOBAL_SHRT,    "copy_range");
-      defShrt(SHRT_UNDO,          Qt::CTRL + Qt::Key_Z, "Edit: Undo", INVIS_SHRT, "undo");
-      defShrt(SHRT_REDO,          Qt::CTRL + Qt::Key_Y, "Edit: Redo", INVIS_SHRT, "redo");
-      defShrt(SHRT_CUT,           Qt::CTRL + Qt::Key_X, "Edit: Cut", INVIS_SHRT, "cut");
-      defShrt(SHRT_PASTE,         Qt::CTRL + Qt::Key_V, "Edit: Paste", INVIS_SHRT, "paste");
-      defShrt(SHRT_PASTE_DIALOG,  Qt::CTRL + Qt::SHIFT + Qt::Key_V, "Edit: Paste (with dialog)", GLOBAL_SHRT, "paste_dialog");
-      defShrt(SHRT_DELETE,        Qt::Key_Delete, "Edit: Delete", INVIS_SHRT, "delete");
+      defShrt(SHRT_PLAY_SONG,     Qt::Key_Enter, QT_TRANSLATE_NOOP("shortcuts", "Transport: Start playback from current location"), GLOBAL_SHRT, "play");
+      defShrt(SHRT_TOGGLE_METRO,  Qt::Key_C,     QT_TRANSLATE_NOOP("shortcuts", "Transport: Toggle metronome"), GLOBAL_SHRT,"toggle_metro");
+      defShrt(SHRT_STOP,          Qt::Key_Insert,QT_TRANSLATE_NOOP("shortcuts", "Transport: Stop Playback"), GLOBAL_SHRT, "stop");
+      defShrt(SHRT_GOTO_START,    Qt::Key_W,     QT_TRANSLATE_NOOP("shortcuts", "Transport: Goto Start"), GLOBAL_SHRT, "goto_start");
+      defShrt(SHRT_PLAY_TOGGLE,   Qt::Key_Space, QT_TRANSLATE_NOOP("shortcuts", "Transport: Play, Stop, Rewind"), GLOBAL_SHRT, "play_toggle");
+      defShrt(SHRT_GOTO_LEFT,     Qt::Key_End,   QT_TRANSLATE_NOOP("shortcuts", "Transport: Goto left marker")  , GLOBAL_SHRT, "goto_left");
+      defShrt(SHRT_GOTO_RIGHT,    Qt::Key_PageDown,  QT_TRANSLATE_NOOP("shortcuts", "Transport: Goto right marker") , GLOBAL_SHRT, "goto_right");
+      defShrt(SHRT_TOGGLE_LOOP,   Qt::Key_Slash, QT_TRANSLATE_NOOP("shortcuts", "Transport: Toggle Loop section"), GLOBAL_SHRT, "toggle_loop");
+      defShrt(SHRT_START_REC,     Qt::Key_Asterisk, QT_TRANSLATE_NOOP("shortcuts", "Transport: Toggle Record"),    GLOBAL_SHRT, "toggle_rec");
+      defShrt(SHRT_REC_CLEAR,     Qt::Key_Backspace, QT_TRANSLATE_NOOP("shortcuts", "Transport: Clear all rec enabled tracks"),    GLOBAL_SHRT, "rec_clear");
+      defShrt(SHRT_FULLSCREEN,       Qt::CTRL + Qt::Key_F, QT_TRANSLATE_NOOP("shortcuts", "Toggle fullscreen"), GLOBAL_SHRT, "fullscreen");
+
+      defShrt(SHRT_COPY,          Qt::CTRL + Qt::Key_C, QT_TRANSLATE_NOOP("shortcuts", "Edit: Copy"), INVIS_SHRT, "copy");
+      defShrt(SHRT_COPY_RANGE,    Qt::CTRL + Qt::SHIFT + Qt::Key_C, QT_TRANSLATE_NOOP("shortcuts", "Edit: Copy in range"), GLOBAL_SHRT,    "copy_range");
+      defShrt(SHRT_UNDO,          Qt::CTRL + Qt::Key_Z, QT_TRANSLATE_NOOP("shortcuts", "Edit: Undo"), INVIS_SHRT, "undo");
+      defShrt(SHRT_REDO,          Qt::CTRL + Qt::SHIFT + Qt::Key_Z, QT_TRANSLATE_NOOP("shortcuts", "Edit: Redo"), INVIS_SHRT, "redo");
+      defShrt(SHRT_CUT,           Qt::CTRL + Qt::Key_X, QT_TRANSLATE_NOOP("shortcuts", "Edit: Cut"), INVIS_SHRT, "cut");
+      defShrt(SHRT_PASTE,         Qt::CTRL + Qt::Key_V, QT_TRANSLATE_NOOP("shortcuts", "Edit: Paste"), INVIS_SHRT, "paste");
+      defShrt(SHRT_PASTE_DIALOG,  Qt::CTRL + Qt::SHIFT + Qt::Key_V, QT_TRANSLATE_NOOP("shortcuts", "Edit: Paste (with dialog)"), GLOBAL_SHRT, "paste_dialog");
+      defShrt(SHRT_DELETE,        Qt::Key_Delete, QT_TRANSLATE_NOOP("shortcuts", "Edit: Delete"), INVIS_SHRT, "delete");
 
       //-----------------------------------------------------------
       // Arranger:
-      defShrt(SHRT_NEW,           Qt::CTRL + Qt::Key_N, "File: New project", ARRANG_SHRT + DEDIT_SHRT, "new_project");
-      defShrt(SHRT_OPEN,          Qt::CTRL + Qt::Key_O, "File: Open from disk", ARRANG_SHRT + DEDIT_SHRT, "open_project");
-      defShrt(SHRT_SAVE,          Qt::CTRL + Qt::Key_S, "File: Save project", ARRANG_SHRT + DEDIT_SHRT, "save_project");
+      defShrt(SHRT_NEW,           Qt::CTRL + Qt::Key_N, QT_TRANSLATE_NOOP("shortcuts", "File: New project"), ARRANG_SHRT + DEDIT_SHRT, "new_project");
+      defShrt(SHRT_OPEN,          Qt::CTRL + Qt::Key_O, QT_TRANSLATE_NOOP("shortcuts", "File: Open from disk"), ARRANG_SHRT + DEDIT_SHRT, "open_project");
+      defShrt(SHRT_SAVE,          Qt::CTRL + Qt::Key_S, QT_TRANSLATE_NOOP("shortcuts", "File: Save project"), ARRANG_SHRT + DEDIT_SHRT, "save_project");
       //-----------------------------------------------------------
 
-      defShrt(SHRT_OPEN_RECENT,           Qt::CTRL + Qt::Key_1, "File: Open recent file", ARRANG_SHRT, "open_recent");
-      defShrt(SHRT_SAVE_AS,               0 , "File: Save as", ARRANG_SHRT, "save_project_as");
-      defShrt(SHRT_LOAD_TEMPLATE,         0 , "File: Load template", ARRANG_SHRT, "load_template");
-//      defShrt(SHRT_CONFIG_PRINTER,        Qt::CTRL + Qt::Key_P, "Configure printer", ARRANG_SHRT, "config_printer");
-      defShrt(SHRT_IMPORT_MIDI,           0 , "File: Import midi file", ARRANG_SHRT, "import_midi");
-      defShrt(SHRT_EXPORT_MIDI,           0 , "File: Export midi file", ARRANG_SHRT, "export_midi");
-      defShrt(SHRT_IMPORT_PART,           0 , "File: Import midi part", ARRANG_SHRT, "import_part");
-      defShrt(SHRT_IMPORT_AUDIO,          0 , "File: Import audio file", ARRANG_SHRT, "import_audio");
-      defShrt(SHRT_QUIT,                  Qt::CTRL + Qt::Key_Q, "File: Quit MusE", ARRANG_SHRT, "quit");
-//      defShrt(SHRT_DESEL_PARTS,           Qt::CTRL + Qt::Key_B, "Deselect all parts", ARRANG_SHRT, "deselect_parts");
-      defShrt(SHRT_SELECT_PRTSTRACK,      Qt::CTRL+ Qt::ALT + Qt::Key_P, "Edit: Select parts on track", ARRANG_SHRT, "select_parts_on_track");
-      defShrt(SHRT_OPEN_PIANO,            Qt::CTRL + Qt::Key_E, "Open pianoroll", ARRANG_SHRT, "open_pianoroll");
-      defShrt(SHRT_OPEN_DRUMS,            Qt::CTRL + Qt::Key_D, "Open drumeditor", ARRANG_SHRT, "open_drumedit");
-      defShrt(SHRT_OPEN_LIST,             Qt::CTRL + Qt::Key_L, "Open listeditor", ARRANG_SHRT, "open_listedit");
-      defShrt(SHRT_OPEN_WAVE,             Qt::CTRL + Qt::Key_W, "Open waveeditor", ARRANG_SHRT, "open_waveedit");
-      defShrt(SHRT_OPEN_GRAPHIC_MASTER,   Qt::CTRL + Qt::Key_M, "Open graphical mastertrack editor", ARRANG_SHRT, "open_graph_master");
-      defShrt(SHRT_OPEN_LIST_MASTER,      Qt::CTRL + Qt::SHIFT + Qt::Key_M, "Open list mastertrack editor", ARRANG_SHRT, "open_list_master");
-      defShrt(SHRT_OPEN_MIDI_TRANSFORM,   Qt::CTRL + Qt::Key_T, "Open midi transformer", ARRANG_SHRT, "open_midi_transform");
-      defShrt(SHRT_ADD_MIDI_TRACK,        Qt::CTRL + Qt::Key_J, "Add midi track", ARRANG_SHRT, "add_midi_track");
-      defShrt(SHRT_ADD_DRUM_TRACK,        0, "Add drum track", ARRANG_SHRT, "add_drum_track");
-      defShrt(SHRT_ADD_NEW_STYLE_DRUM_TRACK,        0, "Add new style drum track", ARRANG_SHRT, "add_new_style_drum_track");
-      defShrt(SHRT_ADD_WAVE_TRACK,        0, "Add wave track", ARRANG_SHRT, "add_wave_track");
-      defShrt(SHRT_ADD_AUDIO_OUTPUT,      0, "Add audio output", ARRANG_SHRT, "add_audio_output");
-      defShrt(SHRT_ADD_AUDIO_GROUP,       0, "Add audio group", ARRANG_SHRT, "add_audio_group");
-      defShrt(SHRT_ADD_AUDIO_INPUT,       0, "Add audio input", ARRANG_SHRT, "add_audio_input");
-      defShrt(SHRT_ADD_AUDIO_AUX  ,       0, "Add audio aux", ARRANG_SHRT, "add_audio_aux");
-      defShrt(SHRT_GLOBAL_CUT,            0, "Structure: Global cut", ARRANG_SHRT, "global_cut");
-      defShrt(SHRT_GLOBAL_INSERT,         0, "Structure: Global insert", ARRANG_SHRT, "global_insert");
-      defShrt(SHRT_GLOBAL_SPLIT,          0, "Structure: Global split", ARRANG_SHRT,  "global_split");
-      defShrt(SHRT_CUT_EVENTS,            0, "Structure: Cut events", ARRANG_SHRT,    "cut_events");
-      //defShrt(SHRT_OPEN_MIXER,            Qt::Key_F10, "View: Open mixer window", ARRANG_SHRT, "toggle_mixer");
-      defShrt(SHRT_OPEN_MIXER,            Qt::Key_F10, "View: Open mixer #1 window", ARRANG_SHRT, "toggle_mixer");
-      defShrt(SHRT_OPEN_MIXER2,           Qt::CTRL + Qt::Key_F10, "View: Open mixer #2 window", ARRANG_SHRT, "toggle_mixer2");
-      defShrt(SHRT_OPEN_TRANSPORT,        Qt::Key_F11, "View: Toggle transport window", ARRANG_SHRT, "toggle_transport");
-      defShrt(SHRT_OPEN_BIGTIME,          Qt::Key_F12, "View: Toggle bigtime window", ARRANG_SHRT,   "toggle_bigtime");
-      defShrt(SHRT_OPEN_MARKER,           Qt::Key_F9, "View: Open marker window", ARRANG_SHRT,   "marker_window");
-
-      defShrt(SHRT_FOLLOW_JUMP,           0, "Settings: Follow song by page", ARRANG_SHRT, "follow_jump");
-      defShrt(SHRT_FOLLOW_NO,             0, "Settings: Follow song off", ARRANG_SHRT, "follow_no");
-      defShrt(SHRT_FOLLOW_CONTINUOUS,     0, "Settings: Follow song continuous", ARRANG_SHRT, "follow_continuous");
-
-      defShrt(SHRT_GLOBAL_CONFIG,         0, "Settings: Global configuration", ARRANG_SHRT, "configure_global");
-      defShrt(SHRT_CONFIG_SHORTCUTS,      0, "Settings: Configure shortcuts", ARRANG_SHRT, "configure_shortcuts");
-      defShrt(SHRT_CONFIG_METRONOME,      0, "Settings: Configure metronome", ARRANG_SHRT, "configure_metronome");
-      defShrt(SHRT_CONFIG_MIDISYNC,       0, "Settings: Midi sync configuration", ARRANG_SHRT, "configure_midi_sync");
-      defShrt(SHRT_MIDI_FILE_CONFIG,      0, "Settings: Midi file import/export configuration", ARRANG_SHRT, "configure_midi_file");
-      defShrt(SHRT_APPEARANCE_SETTINGS,   0, "Settings: Appearance settings", ARRANG_SHRT, "configure_appearance_settings");
-      defShrt(SHRT_CONFIG_MIDI_PORTS,     0, "Settings: Midi ports / Soft Synth", ARRANG_SHRT, "configure_midi_ports");
-      defShrt(SHRT_CONFIG_AUDIO_PORTS,    0, "Settings: Audio subsystem configuration", ARRANG_SHRT, "configure_audio_ports");
-      //defShrt(SHRT_SAVE_GLOBAL_CONFIG,    0, "Save global configuration", ARRANG_SHRT, "configure_save_global");
-
-      defShrt(SHRT_MIDI_EDIT_INSTRUMENTS, 0, "Midi: Edit midi instruments", ARRANG_SHRT, "midi_edit_instruments");
-      defShrt(SHRT_MIDI_INPUT_TRANSFORM,  0, "Midi: Open midi input transform", ARRANG_SHRT, "midi_open_input_transform");
-      defShrt(SHRT_MIDI_INPUT_FILTER,     0, "Midi: Open midi input filter", ARRANG_SHRT, "midi_open_input_filter");
-      defShrt(SHRT_MIDI_INPUT_TRANSPOSE,  0, "Midi: Midi input transpose", ARRANG_SHRT, "midi_open_input_transpose");
-      defShrt(SHRT_MIDI_REMOTE_CONTROL,   0, "Midi: Midi remote control", ARRANG_SHRT, "midi_remote_control");
+      defShrt(SHRT_OPEN_RECENT,           Qt::CTRL + Qt::Key_1, QT_TRANSLATE_NOOP("shortcuts", "File: Open recent file"), ARRANG_SHRT, "open_recent");
+      defShrt(SHRT_SAVE_AS,               0 , QT_TRANSLATE_NOOP("shortcuts", "File: Save as"), ARRANG_SHRT, "save_project_as");
+      defShrt(SHRT_LOAD_TEMPLATE,         0 , QT_TRANSLATE_NOOP("shortcuts", "File: Load template"), ARRANG_SHRT, "load_template");
+//      defShrt(SHRT_CONFIG_PRINTER,        Qt::CTRL + Qt::Key_P, QT_TRANSLATE_NOOP("shortcuts", "Configure printer"), ARRANG_SHRT, "config_printer");
+      defShrt(SHRT_IMPORT_MIDI,           0 , QT_TRANSLATE_NOOP("shortcuts", "File: Import midi file"), ARRANG_SHRT, "import_midi");
+      defShrt(SHRT_EXPORT_MIDI,           0 , QT_TRANSLATE_NOOP("shortcuts", "File: Export midi file"), ARRANG_SHRT, "export_midi");
+      defShrt(SHRT_IMPORT_PART,           0 , QT_TRANSLATE_NOOP("shortcuts", "File: Import midi part"), ARRANG_SHRT, "import_part");
+      defShrt(SHRT_IMPORT_AUDIO,          0 , QT_TRANSLATE_NOOP("shortcuts", "File: Import audio file"), ARRANG_SHRT, "import_audio");
+      defShrt(SHRT_QUIT,                  Qt::CTRL + Qt::Key_Q, QT_TRANSLATE_NOOP("shortcuts", "File: Quit MusE"), ARRANG_SHRT, "quit");
+//      defShrt(SHRT_DESEL_PARTS,           Qt::CTRL + Qt::Key_B, QT_TRANSLATE_NOOP("shortcuts", "Deselect all parts"), ARRANG_SHRT, "deselect_parts");
+      defShrt(SHRT_SELECT_PRTSTRACK,      Qt::CTRL+ Qt::ALT + Qt::Key_P, QT_TRANSLATE_NOOP("shortcuts", "Edit: Select parts on track"), ARRANG_SHRT, "select_parts_on_track");
+      defShrt(SHRT_OPEN_PIANO,            Qt::CTRL + Qt::Key_E, QT_TRANSLATE_NOOP("shortcuts", "Open pianoroll"), ARRANG_SHRT, "open_pianoroll");
+      defShrt(SHRT_OPEN_DRUMS,            Qt::CTRL + Qt::Key_D, QT_TRANSLATE_NOOP("shortcuts", "Open drumeditor"), ARRANG_SHRT, "open_drumedit");
+      defShrt(SHRT_OPEN_LIST,             Qt::CTRL + Qt::Key_L, QT_TRANSLATE_NOOP("shortcuts", "Open listeditor"), ARRANG_SHRT, "open_listedit");
+      defShrt(SHRT_OPEN_WAVE,             Qt::CTRL + Qt::Key_W, QT_TRANSLATE_NOOP("shortcuts", "Open waveeditor"), ARRANG_SHRT, "open_waveedit");
+      defShrt(SHRT_OPEN_GRAPHIC_MASTER,   Qt::CTRL + Qt::Key_M, QT_TRANSLATE_NOOP("shortcuts", "Open graphical mastertrack editor"), ARRANG_SHRT, "open_graph_master");
+      defShrt(SHRT_OPEN_LIST_MASTER,      Qt::CTRL + Qt::SHIFT + Qt::Key_M, QT_TRANSLATE_NOOP("shortcuts", "Open list mastertrack editor"), ARRANG_SHRT, "open_list_master");
+      defShrt(SHRT_OPEN_MIDI_TRANSFORM,   Qt::CTRL + Qt::Key_T, QT_TRANSLATE_NOOP("shortcuts", "Open midi transformer"), ARRANG_SHRT, "open_midi_transform");
+      defShrt(SHRT_ADD_MIDI_TRACK,        Qt::CTRL + Qt::Key_J, QT_TRANSLATE_NOOP("shortcuts", "Add midi track"), ARRANG_SHRT, "add_midi_track");
+      defShrt(SHRT_ADD_DRUM_TRACK,        0, QT_TRANSLATE_NOOP("shortcuts", "Add drum track"), ARRANG_SHRT, "add_drum_track");
+      defShrt(SHRT_ADD_NEW_STYLE_DRUM_TRACK,        0, QT_TRANSLATE_NOOP("shortcuts", "Add new style drum track"), ARRANG_SHRT, "add_new_style_drum_track");
+      defShrt(SHRT_ADD_WAVE_TRACK,        0, QT_TRANSLATE_NOOP("shortcuts", "Add wave track"), ARRANG_SHRT, "add_wave_track");
+      defShrt(SHRT_ADD_AUDIO_OUTPUT,      0, QT_TRANSLATE_NOOP("shortcuts", "Add audio output"), ARRANG_SHRT, "add_audio_output");
+      defShrt(SHRT_ADD_AUDIO_GROUP,       0, QT_TRANSLATE_NOOP("shortcuts", "Add audio group"), ARRANG_SHRT, "add_audio_group");
+      defShrt(SHRT_ADD_AUDIO_INPUT,       0, QT_TRANSLATE_NOOP("shortcuts", "Add audio input"), ARRANG_SHRT, "add_audio_input");
+      defShrt(SHRT_ADD_AUDIO_AUX  ,       0, QT_TRANSLATE_NOOP("shortcuts", "Add audio aux"), ARRANG_SHRT, "add_audio_aux");
+      defShrt(SHRT_GLOBAL_CUT,            0, QT_TRANSLATE_NOOP("shortcuts", "Structure: Global cut"), ARRANG_SHRT, "global_cut");
+      defShrt(SHRT_GLOBAL_INSERT,         0, QT_TRANSLATE_NOOP("shortcuts", "Structure: Global insert"), ARRANG_SHRT, "global_insert");
+      defShrt(SHRT_GLOBAL_SPLIT,          0, QT_TRANSLATE_NOOP("shortcuts", "Structure: Global split"), ARRANG_SHRT,  "global_split");
+      defShrt(SHRT_CUT_EVENTS,            0, QT_TRANSLATE_NOOP("shortcuts", "Structure: Cut events"), ARRANG_SHRT,    "cut_events");
+      //defShrt(SHRT_OPEN_MIXER,            Qt::Key_F10, QT_TRANSLATE_NOOP("shortcuts", "View: Open mixer window"), ARRANG_SHRT, "toggle_mixer");
+      defShrt(SHRT_OPEN_MIXER,            Qt::Key_F10, QT_TRANSLATE_NOOP("shortcuts", "View: Open mixer #1 window"), ARRANG_SHRT, "toggle_mixer");
+      defShrt(SHRT_OPEN_MIXER2,           Qt::CTRL + Qt::Key_F10, QT_TRANSLATE_NOOP("shortcuts", "View: Open mixer #2 window"), ARRANG_SHRT, "toggle_mixer2");
+      defShrt(SHRT_OPEN_TRANSPORT,        Qt::Key_F11, QT_TRANSLATE_NOOP("shortcuts", "View: Toggle transport window"), ARRANG_SHRT, "toggle_transport");
+      defShrt(SHRT_OPEN_BIGTIME,          Qt::Key_F12, QT_TRANSLATE_NOOP("shortcuts", "View: Toggle bigtime window"), ARRANG_SHRT,   "toggle_bigtime");
+      defShrt(SHRT_OPEN_MARKER,           Qt::Key_F9, QT_TRANSLATE_NOOP("shortcuts", "View: Open marker window"), ARRANG_SHRT,   "marker_window");
+
+      defShrt(SHRT_FOLLOW_JUMP,           0, QT_TRANSLATE_NOOP("shortcuts", "Settings: Follow song by page"), ARRANG_SHRT, "follow_jump");
+      defShrt(SHRT_FOLLOW_NO,             0, QT_TRANSLATE_NOOP("shortcuts", "Settings: Follow song off"), ARRANG_SHRT, "follow_no");
+      defShrt(SHRT_FOLLOW_CONTINUOUS,     0, QT_TRANSLATE_NOOP("shortcuts", "Settings: Follow song continuous"), ARRANG_SHRT, "follow_continuous");
+
+      defShrt(SHRT_GLOBAL_CONFIG,         0, QT_TRANSLATE_NOOP("shortcuts", "Settings: Global configuration"), ARRANG_SHRT, "configure_global");
+      defShrt(SHRT_CONFIG_SHORTCUTS,      0, QT_TRANSLATE_NOOP("shortcuts", "Settings: Configure shortcuts"), ARRANG_SHRT, "configure_shortcuts");
+      defShrt(SHRT_CONFIG_METRONOME,      0, QT_TRANSLATE_NOOP("shortcuts", "Settings: Configure metronome"), ARRANG_SHRT, "configure_metronome");
+      defShrt(SHRT_CONFIG_MIDISYNC,       0, QT_TRANSLATE_NOOP("shortcuts", "Settings: Midi sync configuration"), ARRANG_SHRT, "configure_midi_sync");
+      defShrt(SHRT_MIDI_FILE_CONFIG,      0, QT_TRANSLATE_NOOP("shortcuts", "Settings: Midi file import/export configuration"), ARRANG_SHRT, "configure_midi_file");
+      defShrt(SHRT_APPEARANCE_SETTINGS,   0, QT_TRANSLATE_NOOP("shortcuts", "Settings: Appearance settings"), ARRANG_SHRT, "configure_appearance_settings");
+      defShrt(SHRT_CONFIG_MIDI_PORTS,     0, QT_TRANSLATE_NOOP("shortcuts", "Settings: Midi ports / Soft Synth"), ARRANG_SHRT, "configure_midi_ports");
+      defShrt(SHRT_CONFIG_AUDIO_PORTS,    0, QT_TRANSLATE_NOOP("shortcuts", "Settings: Audio subsystem configuration"), ARRANG_SHRT, "configure_audio_ports");
+      //defShrt(SHRT_SAVE_GLOBAL_CONFIG,    0, QT_TRANSLATE_NOOP("shortcuts", "Save global configuration"), ARRANG_SHRT, "configure_save_global");
+
+      defShrt(SHRT_MIDI_EDIT_INSTRUMENTS, 0, QT_TRANSLATE_NOOP("shortcuts", "Midi: Edit midi instruments"), ARRANG_SHRT, "midi_edit_instruments");
+      defShrt(SHRT_MIDI_INPUT_TRANSFORM,  0, QT_TRANSLATE_NOOP("shortcuts", "Midi: Open midi input transform"), ARRANG_SHRT, "midi_open_input_transform");
+      defShrt(SHRT_MIDI_INPUT_FILTER,     0, QT_TRANSLATE_NOOP("shortcuts", "Midi: Open midi input filter"), ARRANG_SHRT, "midi_open_input_filter");
+      defShrt(SHRT_MIDI_INPUT_TRANSPOSE,  0, QT_TRANSLATE_NOOP("shortcuts", "Midi: Midi input transpose"), ARRANG_SHRT, "midi_open_input_transpose");
+      defShrt(SHRT_MIDI_REMOTE_CONTROL,   0, QT_TRANSLATE_NOOP("shortcuts", "Midi: Midi remote control"), ARRANG_SHRT, "midi_remote_control");
 #ifdef BUILD_EXPERIMENTAL
-      defShrt(SHRT_RANDOM_RHYTHM_GENERATOR,0,"Midi: Random rhythm generator", ARRANG_SHRT, "midi_random_rhythm_generator");
+      defShrt(SHRT_RANDOM_RHYTHM_GENERATOR,0,QT_TRANSLATE_NOOP("shortcuts", "Midi: Random rhythm generator"), ARRANG_SHRT, "midi_random_rhythm_generator");
 #endif
-      defShrt(SHRT_MIDI_RESET,            0, "Midi: Reset midi", ARRANG_SHRT, "midi_reset");
-      defShrt(SHRT_MIDI_INIT,             0, "Midi: Init midi", ARRANG_SHRT, "midi_init");
-      defShrt(SHRT_MIDI_LOCAL_OFF,        0, "Midi: Midi local off", ARRANG_SHRT, "midi_local_off");
+      defShrt(SHRT_MIDI_RESET,            0, QT_TRANSLATE_NOOP("shortcuts", "Midi: Reset midi"), ARRANG_SHRT, "midi_reset");
+      defShrt(SHRT_MIDI_INIT,             0, QT_TRANSLATE_NOOP("shortcuts", "Midi: Init midi"), ARRANG_SHRT, "midi_init");
+      defShrt(SHRT_MIDI_LOCAL_OFF,        0, QT_TRANSLATE_NOOP("shortcuts", "Midi: Midi local off"), ARRANG_SHRT, "midi_local_off");
 
-      defShrt(SHRT_AUDIO_BOUNCE_TO_TRACK, 0, "Audio: Bounce audio to track", ARRANG_SHRT, "audio_bounce_to_track");
-      defShrt(SHRT_AUDIO_BOUNCE_TO_FILE,  0, "Audio: Bounce audio to file", ARRANG_SHRT, "audio_bounce_to_file");
-      defShrt(SHRT_AUDIO_RESTART,         0, "Audio: Restart audio", ARRANG_SHRT, "audio_restart");
+      defShrt(SHRT_AUDIO_BOUNCE_TO_TRACK, 0, QT_TRANSLATE_NOOP("shortcuts", "Audio: Bounce audio to track"), ARRANG_SHRT, "audio_bounce_to_track");
+      defShrt(SHRT_AUDIO_BOUNCE_TO_FILE,  0, QT_TRANSLATE_NOOP("shortcuts", "Audio: Bounce audio to file"), ARRANG_SHRT, "audio_bounce_to_file");
+      defShrt(SHRT_AUDIO_RESTART,         0, QT_TRANSLATE_NOOP("shortcuts", "Audio: Restart audio"), ARRANG_SHRT, "audio_restart");
 
-      defShrt(SHRT_MIXER_AUTOMATION,      0, "Automation: Mixer automation", ARRANG_SHRT, "mixer_automation");
-      defShrt(SHRT_MIXER_SNAPSHOT,        0, "Automation: Take mixer snapshot", ARRANG_SHRT, "mixer_snapshot");
-      defShrt(SHRT_MIXER_AUTOMATION_CLEAR,0, "Automation: Clear mixer automation", ARRANG_SHRT, "mixer_automation_clear");
+      defShrt(SHRT_MIXER_AUTOMATION,      0, QT_TRANSLATE_NOOP("shortcuts", "Automation: Mixer automation"), ARRANG_SHRT, "mixer_automation");
+      defShrt(SHRT_MIXER_SNAPSHOT,        0, QT_TRANSLATE_NOOP("shortcuts", "Automation: Take mixer snapshot"), ARRANG_SHRT, "mixer_snapshot");
+      defShrt(SHRT_MIXER_AUTOMATION_CLEAR,0, QT_TRANSLATE_NOOP("shortcuts", "Automation: Clear mixer automation"), ARRANG_SHRT, "mixer_automation_clear");
 
-//      defShrt(SHRT_OPEN_CLIPS,            0, "View audio clips", ARRANG_SHRT,                  "view_audio_clips");
-      defShrt(SHRT_OPEN_HELP,             Qt::Key_F1, "Help: Open Manual", ARRANG_SHRT,        "open_help");
-      defShrt(SHRT_START_WHATSTHIS,       Qt::SHIFT + Qt::Key_F1, "Help: Toggle whatsthis mode", ARRANG_SHRT, "toggle_whatsthis");
+//      defShrt(SHRT_OPEN_CLIPS,            0, QT_TRANSLATE_NOOP("shortcuts", "View audio clips"), ARRANG_SHRT,                  "view_audio_clips");
+      defShrt(SHRT_OPEN_HELP,             Qt::Key_F1, QT_TRANSLATE_NOOP("shortcuts", "Help: Open Manual"), ARRANG_SHRT,        "open_help");
+      defShrt(SHRT_START_WHATSTHIS,       Qt::SHIFT + Qt::Key_F1, QT_TRANSLATE_NOOP("shortcuts", "Help: Toggle whatsthis mode"), ARRANG_SHRT, "toggle_whatsthis");
 
-      defShrt(SHRT_EDIT_PART,             Qt::Key_Return, "Edit: Edit selected part", ARRANG_SHRT, "edit_selected_part");
-      defShrt(SHRT_SEL_ABOVE,             Qt::Key_Up, "Edit: Select nearest part on track above", ARRANG_SHRT, "sel_part_above");
-      defShrt(SHRT_SEL_ABOVE_ADD,         Qt::SHIFT + Qt::Key_Up, "Edit: Add nearest part on track above", ARRANG_SHRT, "sel_part_above_add");
-      defShrt(SHRT_SEL_BELOW,             Qt::Key_Down, "Edit: Select nearest part on track below", ARRANG_SHRT, "sel_part_below");
-      defShrt(SHRT_SEL_BELOW_ADD,         Qt::SHIFT + Qt::Key_Down, "Edit: Add nearest part on track below", ARRANG_SHRT, "sel_part_below_add");
+      defShrt(SHRT_EDIT_PART,             Qt::Key_Return, QT_TRANSLATE_NOOP("shortcuts", "Edit: Edit selected part"), ARRANG_SHRT, "edit_selected_part");
+      defShrt(SHRT_SEL_ABOVE,             Qt::Key_Up, QT_TRANSLATE_NOOP("shortcuts", "Edit: Select nearest part on track above"), ARRANG_SHRT, "sel_part_above");
+      defShrt(SHRT_SEL_ABOVE_ADD,         Qt::SHIFT + Qt::Key_Up, QT_TRANSLATE_NOOP("shortcuts", "Edit: Add nearest part on track above"), ARRANG_SHRT, "sel_part_above_add");
+      defShrt(SHRT_SEL_BELOW,             Qt::Key_Down, QT_TRANSLATE_NOOP("shortcuts", "Edit: Select nearest part on track below"), ARRANG_SHRT, "sel_part_below");
+      defShrt(SHRT_SEL_BELOW_ADD,         Qt::SHIFT + Qt::Key_Down, QT_TRANSLATE_NOOP("shortcuts", "Edit: Add nearest part on track below"), ARRANG_SHRT, "sel_part_below_add");
 
-      defShrt(SHRT_INSERTMEAS,            Qt::CTRL+Qt::SHIFT+ Qt::Key_O, "Edit: Insert empty measure", ARRANG_SHRT, "insert_measure");
+      defShrt(SHRT_INSERTMEAS,            Qt::CTRL+Qt::SHIFT+ Qt::Key_O, QT_TRANSLATE_NOOP("shortcuts", "Edit: Insert empty measure"), ARRANG_SHRT, "insert_measure");
 
-      defShrt(SHRT_PASTE_CLONE,        Qt::CTRL+Qt::Key_B, "Edit: Paste as clones", ARRANG_SHRT, "paste_as_clone"); // i changed "paste_clone" to "paste_as_clone" intendedly. otherwise muse would keep its old, conflicting definition (ctrl+shift+v instead of ctrl+b) (flo)
-      defShrt(SHRT_PASTE_CLONE_DIALOG,  Qt::CTRL+Qt::SHIFT+Qt::Key_B, "Edit: Paste as clones (with dialog)", ARRANG_SHRT, "paste_as_clone_dialog");
+      defShrt(SHRT_PASTE_CLONE,        Qt::CTRL+Qt::Key_B, QT_TRANSLATE_NOOP("shortcuts", "Edit: Paste as clones"), ARRANG_SHRT, "paste_as_clone"); // i changed "paste_clone" to "paste_as_clone" intendedly. otherwise muse would keep its old, conflicting definition (ctrl+shift+v instead of ctrl+b) (flo)
+      defShrt(SHRT_PASTE_CLONE_DIALOG,  Qt::CTRL+Qt::SHIFT+Qt::Key_B, QT_TRANSLATE_NOOP("shortcuts", "Edit: Paste as clones (with dialog)"), ARRANG_SHRT, "paste_as_clone_dialog");
       
-      defShrt(SHRT_SEL_TRACK_ABOVE,       Qt::CTRL + Qt::Key_Up, "Select track above", ARRANG_SHRT, "sel_track_above");
-      defShrt(SHRT_SEL_TRACK_BELOW,       Qt::CTRL + Qt::Key_Down, "Select track below", ARRANG_SHRT, "sel_track_below");
+      defShrt(SHRT_SEL_TRACK_ABOVE,       Qt::CTRL + Qt::Key_Up, QT_TRANSLATE_NOOP("shortcuts", "Select track above"), ARRANG_SHRT, "sel_track_above");
+      defShrt(SHRT_SEL_TRACK_BELOW,       Qt::CTRL + Qt::Key_Down, QT_TRANSLATE_NOOP("shortcuts", "Select track below"), ARRANG_SHRT, "sel_track_below");
 
       //-----------------------------------------------------------
 
-      defShrt(SHRT_TRANSPOSE,       0, "Midi: Transpose", ARRANG_SHRT + PROLL_SHRT, "midi_transpose");
+      defShrt(SHRT_TRANSPOSE,       0, QT_TRANSLATE_NOOP("shortcuts", "Midi: Transpose"), ARRANG_SHRT + PROLL_SHRT, "midi_transpose");
 
       //-----------------------------------------------------------
 
-      defShrt(SHRT_SELECT_ALL,       Qt::CTRL + Qt::Key_A, "Edit: Select all", ARRANG_SHRT + PROLL_SHRT + DEDIT_SHRT, "sel_all");
-      defShrt(SHRT_SELECT_NONE,      Qt::CTRL + Qt::SHIFT + Qt::Key_A, "Edit: Select none", ARRANG_SHRT + PROLL_SHRT + DEDIT_SHRT, "sel_none");
-      defShrt(SHRT_SELECT_INVERT,    Qt::CTRL + Qt::Key_I, "Edit: Invert Selection", ARRANG_SHRT + PROLL_SHRT + DEDIT_SHRT,  "sel_inv");
-      defShrt(SHRT_SELECT_ILOOP,     0, "Edit: Select events/parts inside locators", ARRANG_SHRT + PROLL_SHRT + DEDIT_SHRT,  "sel_ins_loc");
-      defShrt(SHRT_SELECT_OLOOP,     0, "Edit: Select events/parts outside locators", ARRANG_SHRT + PROLL_SHRT + DEDIT_SHRT, "sel_out_loc");
-      defShrt(SHRT_SELECT_PREV_PART, Qt::ALT + Qt::Key_Left, "Edit: Select previous part", ARRANG_SHRT + PROLL_SHRT + DEDIT_SHRT, "sel_prv_prt");
-      defShrt(SHRT_SELECT_NEXT_PART, Qt::ALT + Qt::Key_Right, "Edit: Select next part", ARRANG_SHRT + PROLL_SHRT + DEDIT_SHRT, "sel_nxt_prt");
-      defShrt(SHRT_SEL_LEFT,         Qt::Key_Left,  "Edit: Select nearest part/event to the left or move cursor", ARRANG_SHRT + PROLL_SHRT + DEDIT_SHRT, "sel_left");
-      defShrt(SHRT_SEL_LEFT_ADD,     Qt::Key_Left + Qt::SHIFT,  "Edit: Add nearest part/event to the left to selection", PROLL_SHRT + DEDIT_SHRT, "sel_left_add");
-      defShrt(SHRT_SEL_RIGHT,        Qt::Key_Right,  "Edit: Select nearest part/event to the right or move cursor", ARRANG_SHRT + PROLL_SHRT + DEDIT_SHRT,"sel_right");
-      defShrt(SHRT_SEL_RIGHT_ADD,    Qt::Key_Right + Qt::SHIFT, "Edit: Add nearest part/event to the right to selection", PROLL_SHRT + DEDIT_SHRT,"sel_right_add");
-      defShrt(SHRT_LOCATORS_TO_SELECTION, Qt::ALT + Qt::Key_P, "Edit: Set locators to selection", ARRANG_SHRT + PROLL_SHRT + DEDIT_SHRT, "loc_to_sel");
-      defShrt(SHRT_INC_PITCH,        Qt::CTRL + Qt::Key_Up, "Edit: Increase pitch", PROLL_SHRT + DEDIT_SHRT, "sel_inc_pitch");
-      defShrt(SHRT_DEC_PITCH,        Qt::CTRL + Qt::Key_Down, "Edit: Decrease pitch", PROLL_SHRT + DEDIT_SHRT, "sel_dec_pitch");
-      defShrt(SHRT_INC_POS,          Qt::CTRL + Qt::Key_Right,  "Edit: Increase event position", PROLL_SHRT + DEDIT_SHRT, "sel_inc_pos");
-      defShrt(SHRT_DEC_POS,          Qt::CTRL + Qt::Key_Left,   "Edit: Decrease event position", PROLL_SHRT + DEDIT_SHRT, "sel_dec_pos");
-      defShrt(SHRT_ZOOM_IN,          Qt::CTRL + Qt::Key_PageUp,   "View: Zoom in",  PROLL_SHRT + DEDIT_SHRT + ARRANG_SHRT, "zoom_in");
-      defShrt(SHRT_ZOOM_OUT,         Qt::CTRL + Qt::Key_PageDown, "View: Zoom out", PROLL_SHRT + DEDIT_SHRT + ARRANG_SHRT, "zoom_out");
-      defShrt(SHRT_GOTO_CPOS,        Qt::Key_C, "View: Goto Current Position", PROLL_SHRT + DEDIT_SHRT, "goto_cpos");
-      defShrt(SHRT_SCROLL_LEFT,      Qt::Key_H, "View: Scroll left", PROLL_SHRT + DEDIT_SHRT, "scroll_left");
-      defShrt(SHRT_SCROLL_RIGHT,     Qt::Key_L, "View: Scroll left", PROLL_SHRT + DEDIT_SHRT, "scroll_right");
+      defShrt(SHRT_SELECT_ALL,       Qt::CTRL + Qt::Key_A, QT_TRANSLATE_NOOP("shortcuts", "Edit: Select all"), ARRANG_SHRT + PROLL_SHRT + DEDIT_SHRT, "sel_all");
+      defShrt(SHRT_SELECT_NONE,      Qt::CTRL + Qt::SHIFT + Qt::Key_A, QT_TRANSLATE_NOOP("shortcuts", "Edit: Select none"), ARRANG_SHRT + PROLL_SHRT + DEDIT_SHRT, "sel_none");
+      defShrt(SHRT_SELECT_INVERT,    Qt::CTRL + Qt::Key_I, QT_TRANSLATE_NOOP("shortcuts", "Edit: Invert Selection"), ARRANG_SHRT + PROLL_SHRT + DEDIT_SHRT,  "sel_inv");
+      defShrt(SHRT_SELECT_ILOOP,     0, QT_TRANSLATE_NOOP("shortcuts", "Edit: Select events/parts inside locators"), ARRANG_SHRT + PROLL_SHRT + DEDIT_SHRT,  "sel_ins_loc");
+      defShrt(SHRT_SELECT_OLOOP,     0, QT_TRANSLATE_NOOP("shortcuts", "Edit: Select events/parts outside locators"), ARRANG_SHRT + PROLL_SHRT + DEDIT_SHRT, "sel_out_loc");
+      defShrt(SHRT_SELECT_PREV_PART, Qt::ALT + Qt::Key_Left, QT_TRANSLATE_NOOP("shortcuts", "Edit: Select previous part"), ARRANG_SHRT + PROLL_SHRT + DEDIT_SHRT, "sel_prv_prt");
+      defShrt(SHRT_SELECT_NEXT_PART, Qt::ALT + Qt::Key_Right, QT_TRANSLATE_NOOP("shortcuts", "Edit: Select next part"), ARRANG_SHRT + PROLL_SHRT + DEDIT_SHRT, "sel_nxt_prt");
+      defShrt(SHRT_SEL_LEFT,         Qt::Key_Left,  QT_TRANSLATE_NOOP("shortcuts", "Edit: Select nearest part/event to the left or move cursor"), ARRANG_SHRT + PROLL_SHRT + DEDIT_SHRT, "sel_left");
+      defShrt(SHRT_SEL_LEFT_ADD,     Qt::Key_Left + Qt::SHIFT,  QT_TRANSLATE_NOOP("shortcuts", "Edit: Add nearest part/event to the left to selection"), PROLL_SHRT + DEDIT_SHRT, "sel_left_add");
+      defShrt(SHRT_SEL_RIGHT,        Qt::Key_Right,  QT_TRANSLATE_NOOP("shortcuts", "Edit: Select nearest part/event to the right or move cursor"), ARRANG_SHRT + PROLL_SHRT + DEDIT_SHRT,"sel_right");
+      defShrt(SHRT_SEL_RIGHT_ADD,    Qt::Key_Right + Qt::SHIFT, QT_TRANSLATE_NOOP("shortcuts", "Edit: Add nearest part/event to the right to selection"), PROLL_SHRT + DEDIT_SHRT,"sel_right_add");
+      defShrt(SHRT_LOCATORS_TO_SELECTION, Qt::ALT + Qt::Key_P, QT_TRANSLATE_NOOP("shortcuts", "Edit: Set locators to selection"), ARRANG_SHRT + PROLL_SHRT + DEDIT_SHRT, "loc_to_sel");
+      defShrt(SHRT_INC_PITCH,        Qt::CTRL + Qt::Key_Up, QT_TRANSLATE_NOOP("shortcuts", "Edit: Increase pitch"), PROLL_SHRT + DEDIT_SHRT, "sel_inc_pitch");
+      defShrt(SHRT_DEC_PITCH,        Qt::CTRL + Qt::Key_Down, QT_TRANSLATE_NOOP("shortcuts", "Edit: Decrease pitch"), PROLL_SHRT + DEDIT_SHRT, "sel_dec_pitch");
+      defShrt(SHRT_INC_POS,          Qt::CTRL + Qt::Key_Right,  QT_TRANSLATE_NOOP("shortcuts", "Edit: Increase event position"), PROLL_SHRT + DEDIT_SHRT, "sel_inc_pos");
+      defShrt(SHRT_DEC_POS,          Qt::CTRL + Qt::Key_Left,   QT_TRANSLATE_NOOP("shortcuts", "Edit: Decrease event position"), PROLL_SHRT + DEDIT_SHRT, "sel_dec_pos");
+      defShrt(SHRT_ZOOM_IN,          Qt::CTRL + Qt::Key_PageUp,   QT_TRANSLATE_NOOP("shortcuts", "View: Zoom in"),  PROLL_SHRT + DEDIT_SHRT + ARRANG_SHRT, "zoom_in");
+      defShrt(SHRT_ZOOM_OUT,         Qt::CTRL + Qt::Key_PageDown, QT_TRANSLATE_NOOP("shortcuts", "View: Zoom out"), PROLL_SHRT + DEDIT_SHRT + ARRANG_SHRT, "zoom_out");
+      defShrt(SHRT_GOTO_CPOS,        Qt::Key_C, QT_TRANSLATE_NOOP("shortcuts", "View: Goto Current Position"), PROLL_SHRT + DEDIT_SHRT, "goto_cpos");
+      defShrt(SHRT_SCROLL_LEFT,      Qt::Key_H, QT_TRANSLATE_NOOP("shortcuts", "View: Scroll left"), PROLL_SHRT + DEDIT_SHRT, "scroll_left");
+      defShrt(SHRT_SCROLL_RIGHT,     Qt::Key_L, QT_TRANSLATE_NOOP("shortcuts", "View: Scroll left"), PROLL_SHRT + DEDIT_SHRT, "scroll_right");
 
       //-----------------------------------------------------------
       //Drum:
       //-----------------------------------------------------------
 
-      defShrt(SHRT_FIXED_LEN,   Qt::ALT + Qt::Key_L, "Edit: Set Fixed Length on Midi Events", PROLL_SHRT + DEDIT_SHRT, "midi_fixed_len");
+      defShrt(SHRT_FIXED_LEN,   Qt::ALT + Qt::Key_L, QT_TRANSLATE_NOOP("shortcuts", "Edit: Set Fixed Length on Midi Events"), PROLL_SHRT + DEDIT_SHRT, "midi_fixed_len");
 
       //-----------------------------------------------------------
       //Pianoroll:
       //-----------------------------------------------------------
 
-      defShrt(SHRT_QUANTIZE,    0, "Quantize", PROLL_SHRT, "midi_quant");
-      defShrt(SHRT_MODIFY_GATE_TIME, 0, "Modify Note Length", PROLL_SHRT, "midi_mod_gate_time");
-      defShrt(SHRT_MODIFY_VELOCITY,  0, "Modify Velocity", PROLL_SHRT,  "midi_mod_velo");
-      defShrt(SHRT_CRESCENDO,        0, "Edit: Crescendo", PROLL_SHRT, "midi_crescendo");
-      defShrt(SHRT_THIN_OUT,         0, "Edit: Thin Out", PROLL_SHRT, "midi_thin_out");
-      defShrt(SHRT_ERASE_EVENT,      0, "Edit: Erase Event", PROLL_SHRT, "midi_erase_event");
-      defShrt(SHRT_DELETE_OVERLAPS,  0, "Edit: Delete Overlaps", PROLL_SHRT, "midi_delete_overlaps");
-      defShrt(SHRT_NOTE_SHIFT,       0, "Edit: Note Shift", PROLL_SHRT, "midi_note_shift");
-      defShrt(SHRT_MOVE_CLOCK,       0, "Edit: Move Clock", PROLL_SHRT, "midi_move_clock");
-      defShrt(SHRT_COPY_MEASURE,     0, "Edit: Copy Measure", PROLL_SHRT, "midi_copy_measure");
-      defShrt(SHRT_ERASE_MEASURE,    0, "Edit: Erase Measure", PROLL_SHRT,"midi_erase_measure");
-      defShrt(SHRT_DELETE_MEASURE,   0, "Edit: Delete Measure", PROLL_SHRT, "midi_delete_measure");
-      defShrt(SHRT_CREATE_MEASURE,   0, "Edit: Create Measure", PROLL_SHRT, "midi_create_measure");
-      defShrt(SHRT_EVENT_COLOR,      Qt::Key_E, "Edit: Change Event Color", PROLL_SHRT, "change_event_color");
+      defShrt(SHRT_QUANTIZE,    0, QT_TRANSLATE_NOOP("shortcuts", "Quantize"), PROLL_SHRT, "midi_quant");
+      defShrt(SHRT_MODIFY_GATE_TIME, 0, QT_TRANSLATE_NOOP("shortcuts", "Modify Note Length"), PROLL_SHRT, "midi_mod_gate_time");
+      defShrt(SHRT_MODIFY_VELOCITY,  0, QT_TRANSLATE_NOOP("shortcuts", "Modify Velocity"), PROLL_SHRT,  "midi_mod_velo");
+      defShrt(SHRT_CRESCENDO,        0, QT_TRANSLATE_NOOP("shortcuts", "Edit: Crescendo"), PROLL_SHRT, "midi_crescendo");
+      defShrt(SHRT_THIN_OUT,         0, QT_TRANSLATE_NOOP("shortcuts", "Edit: Thin Out"), PROLL_SHRT, "midi_thin_out");
+      defShrt(SHRT_ERASE_EVENT,      0, QT_TRANSLATE_NOOP("shortcuts", "Edit: Erase Event"), PROLL_SHRT, "midi_erase_event");
+      defShrt(SHRT_DELETE_OVERLAPS,  0, QT_TRANSLATE_NOOP("shortcuts", "Edit: Delete Overlaps"), PROLL_SHRT, "midi_delete_overlaps");
+      defShrt(SHRT_NOTE_SHIFT,       0, QT_TRANSLATE_NOOP("shortcuts", "Edit: Note Shift"), PROLL_SHRT, "midi_note_shift");
+      defShrt(SHRT_MOVE_CLOCK,       0, QT_TRANSLATE_NOOP("shortcuts", "Edit: Move Clock"), PROLL_SHRT, "midi_move_clock");
+      defShrt(SHRT_COPY_MEASURE,     0, QT_TRANSLATE_NOOP("shortcuts", "Edit: Copy Measure"), PROLL_SHRT, "midi_copy_measure");
+      defShrt(SHRT_ERASE_MEASURE,    0, QT_TRANSLATE_NOOP("shortcuts", "Edit: Erase Measure"), PROLL_SHRT,"midi_erase_measure");
+      defShrt(SHRT_DELETE_MEASURE,   0, QT_TRANSLATE_NOOP("shortcuts", "Edit: Delete Measure"), PROLL_SHRT, "midi_delete_measure");
+      defShrt(SHRT_CREATE_MEASURE,   0, QT_TRANSLATE_NOOP("shortcuts", "Edit: Create Measure"), PROLL_SHRT, "midi_create_measure");
+      defShrt(SHRT_EVENT_COLOR,      Qt::Key_E, QT_TRANSLATE_NOOP("shortcuts", "Edit: Change Event Color"), PROLL_SHRT, "change_event_color");
 
 
       // Shortcuts for tools
       // global
-      defShrt(SHRT_TOOL_POINTER,     Qt::Key_A, "Tool: Pointer", ARRANG_SHRT + PROLL_SHRT + DEDIT_SHRT, "pointer_tool");
-      defShrt(SHRT_TOOL_PENCIL,      Qt::Key_D, "Tool: Pencil", ARRANG_SHRT + PROLL_SHRT + DEDIT_SHRT, "pencil_tool");
-      defShrt(SHRT_TOOL_RUBBER,      Qt::Key_R, "Tool: Eraser", ARRANG_SHRT + PROLL_SHRT + DEDIT_SHRT, "eraser_tool");
+      defShrt(SHRT_TOOL_POINTER,     Qt::Key_A, QT_TRANSLATE_NOOP("shortcuts", "Tool: Pointer"), ARRANG_SHRT + PROLL_SHRT + DEDIT_SHRT, "pointer_tool");
+      defShrt(SHRT_TOOL_PENCIL,      Qt::Key_D, QT_TRANSLATE_NOOP("shortcuts", "Tool: Pencil"), ARRANG_SHRT + PROLL_SHRT + DEDIT_SHRT, "pencil_tool");
+      defShrt(SHRT_TOOL_RUBBER,      Qt::Key_R, QT_TRANSLATE_NOOP("shortcuts", "Tool: Eraser"), ARRANG_SHRT + PROLL_SHRT + DEDIT_SHRT, "eraser_tool");
       // piano roll & drum editor
-      defShrt(SHRT_TOOL_LINEDRAW,    Qt::Key_F, "Tool: Line Draw", ARRANG_SHRT + PROLL_SHRT + DEDIT_SHRT, "line_draw_tool");
+      defShrt(SHRT_TOOL_LINEDRAW,    Qt::Key_F, QT_TRANSLATE_NOOP("shortcuts", "Tool: Line Draw"), ARRANG_SHRT + PROLL_SHRT + DEDIT_SHRT, "line_draw_tool");
 
       // drum editor
-      defShrt(SHRT_TOOL_CURSOR,      Qt::Key_U, "Tool: Cursor", DEDIT_SHRT, "cursor_tool");
-      defShrt(SHRT_ADDNOTE_1,    Qt::Key_V, "Add note velocity 1", DEDIT_SHRT, "add_note_velocity_1");
-      defShrt(SHRT_ADDNOTE_2,    Qt::Key_B, "Add note velocity 2", DEDIT_SHRT, "add_note_velocity_2");
-      defShrt(SHRT_ADDNOTE_3,    Qt::Key_N, "Add note velocity 3", DEDIT_SHRT, "add_note_velocity_3");
-      defShrt(SHRT_ADDNOTE_4,    Qt::Key_M, "Add note velocity 4", DEDIT_SHRT, "add_note_velocity_4");
+      defShrt(SHRT_TOOL_CURSOR,      Qt::Key_U, QT_TRANSLATE_NOOP("shortcuts", "Tool: Cursor"), DEDIT_SHRT, "cursor_tool");
+      defShrt(SHRT_ADDNOTE_1,    Qt::Key_V, QT_TRANSLATE_NOOP("shortcuts", "Add note velocity 1"), DEDIT_SHRT, "add_note_velocity_1");
+      defShrt(SHRT_ADDNOTE_2,    Qt::Key_B, QT_TRANSLATE_NOOP("shortcuts", "Add note velocity 2"), DEDIT_SHRT, "add_note_velocity_2");
+      defShrt(SHRT_ADDNOTE_3,    Qt::Key_N, QT_TRANSLATE_NOOP("shortcuts", "Add note velocity 3"), DEDIT_SHRT, "add_note_velocity_3");
+      defShrt(SHRT_ADDNOTE_4,    Qt::Key_M, QT_TRANSLATE_NOOP("shortcuts", "Add note velocity 4"), DEDIT_SHRT, "add_note_velocity_4");
 
-      defShrt(SHRT_CURSOR_STEP_UP,    Qt::Key_0, "Cursor step size: larger", DEDIT_SHRT, "cursor_step_up");
-      defShrt(SHRT_CURSOR_STEP_DOWN,    Qt::Key_9, "Cursor step size: smaller", DEDIT_SHRT, "cursor_step_down");
-      defShrt(SHRT_INSTRUMENT_STEP_UP,    Qt::Key_Up, "Instrument/Cursor up", DEDIT_SHRT, "instrument_up");
-      defShrt(SHRT_INSTRUMENT_STEP_DOWN,    Qt::Key_Down, "Instrument/Cursor down", DEDIT_SHRT, "instrument_down");
+      defShrt(SHRT_CURSOR_STEP_UP,    Qt::Key_0, QT_TRANSLATE_NOOP("shortcuts", "Cursor step size: larger"), DEDIT_SHRT, "cursor_step_up");
+      defShrt(SHRT_CURSOR_STEP_DOWN,    Qt::Key_9, QT_TRANSLATE_NOOP("shortcuts", "Cursor step size: smaller"), DEDIT_SHRT, "cursor_step_down");
+      defShrt(SHRT_INSTRUMENT_STEP_UP,    Qt::Key_Up, QT_TRANSLATE_NOOP("shortcuts", "Instrument/Cursor up"), DEDIT_SHRT, "instrument_up");
+      defShrt(SHRT_INSTRUMENT_STEP_DOWN,    Qt::Key_Down, QT_TRANSLATE_NOOP("shortcuts", "Instrument/Cursor down"), DEDIT_SHRT, "instrument_down");
 
       // arranger
-      defShrt(SHRT_TOOL_SCISSORS,    Qt::Key_S, "Tool: Scissor", ARRANG_SHRT, "scissor_tool");
-      defShrt(SHRT_TOOL_GLUE,        Qt::Key_G, "Tool: Glue", ARRANG_SHRT, "glue_tool");
-      defShrt(SHRT_TOOL_MUTE,        0, "Tool: Mute", ARRANG_SHRT, "mute_tool");
+      defShrt(SHRT_TOOL_SCISSORS,    Qt::Key_S, QT_TRANSLATE_NOOP("shortcuts", "Tool: Scissor"), ARRANG_SHRT, "scissor_tool");
+      defShrt(SHRT_TOOL_GLUE,        Qt::Key_G, QT_TRANSLATE_NOOP("shortcuts", "Tool: Glue"), ARRANG_SHRT, "glue_tool");
+      defShrt(SHRT_TOOL_MUTE,        0, QT_TRANSLATE_NOOP("shortcuts", "Tool: Mute"), ARRANG_SHRT, "mute_tool");
 
       //Increase/decrease current position, is going to be in arranger & drumeditor as well
       // p4.0.10 Editors and arranger handle these by themselves, otherwise global handler will now use them, too.
-      defShrt(SHRT_POS_INC,          Qt::Key_Plus, "Transport: Increase current position", GLOBAL_SHRT, "curpos_increase");
-      defShrt(SHRT_POS_DEC,          Qt::Key_Minus, "Transport: Decrease current position", GLOBAL_SHRT, "curpos_decrease");
+      defShrt(SHRT_POS_INC,          Qt::Key_Plus, QT_TRANSLATE_NOOP("shortcuts", "Transport: Increase current position"), GLOBAL_SHRT, "curpos_increase");
+      defShrt(SHRT_POS_DEC,          Qt::Key_Minus, QT_TRANSLATE_NOOP("shortcuts", "Transport: Decrease current position"), GLOBAL_SHRT, "curpos_decrease");
       
-      defShrt(SHRT_POS_INC_NOSNAP,   Qt::SHIFT + Qt::Key_Plus, "Transport: Increase current position, no snap", GLOBAL_SHRT, "curpos_increase_nosnap");
-      defShrt(SHRT_POS_DEC_NOSNAP,   Qt::SHIFT + Qt::Key_Minus, "Transport: Decrease current position, no snap", GLOBAL_SHRT,  "curpos_decrease_nosnap");
+      defShrt(SHRT_POS_INC_NOSNAP,   Qt::SHIFT + Qt::Key_Plus, QT_TRANSLATE_NOOP("shortcuts", "Transport: Increase current position, no snap"), GLOBAL_SHRT, "curpos_increase_nosnap");
+      defShrt(SHRT_POS_DEC_NOSNAP,   Qt::SHIFT + Qt::Key_Minus, QT_TRANSLATE_NOOP("shortcuts", "Transport: Decrease current position, no snap"), GLOBAL_SHRT,  "curpos_decrease_nosnap");
       
       /*
-      defShrt(SHRT_POS_INC_BAR,      Qt::CTRL + Qt::ALT + Qt::Key_Plus, "Transport: Increase current position", GLOBAL_SHRT, "curpos_increase_bar");
-      defShrt(SHRT_POS_DEC_BAR,      Qt::CTRL + Qt::ALT + Qt::Key_Minus, "Transport: Decrease current position", GLOBAL_SHRT,  "curpos_decrease_bar");
-      defShrt(SHRT_POS_INC_BAR_NOSNAP,   Qt::SHIFT + Qt::CTRL + Qt::ALT + Qt::Key_Plus, "Transport: Increase current position", GLOBAL_SHRT, "curpos_increase_bar_nosnap");
-      defShrt(SHRT_POS_DEC_BAR_NOSNAP,   Qt::SHIFT + Qt::CTRL + Qt::ALT + Qt::Key_Minus, "Transport: Decrease current position", GLOBAL_SHRT,  "curpos_decrease_bar_nosnap");
+      defShrt(SHRT_POS_INC_BAR,      Qt::CTRL + Qt::ALT + Qt::Key_Plus, QT_TRANSLATE_NOOP("shortcuts", "Transport: Increase current position"), GLOBAL_SHRT, "curpos_increase_bar");
+      defShrt(SHRT_POS_DEC_BAR,      Qt::CTRL + Qt::ALT + Qt::Key_Minus, QT_TRANSLATE_NOOP("shortcuts", "Transport: Decrease current position"), GLOBAL_SHRT,  "curpos_decrease_bar");
+      defShrt(SHRT_POS_INC_BAR_NOSNAP,   Qt::SHIFT + Qt::CTRL + Qt::ALT + Qt::Key_Plus, QT_TRANSLATE_NOOP("shortcuts", "Transport: Increase current position"), GLOBAL_SHRT, "curpos_increase_bar_nosnap");
+      defShrt(SHRT_POS_DEC_BAR_NOSNAP,   Qt::SHIFT + Qt::CTRL + Qt::ALT + Qt::Key_Minus, QT_TRANSLATE_NOOP("shortcuts", "Transport: Decrease current position"), GLOBAL_SHRT,  "curpos_decrease_bar_nosnap");
       
-      defShrt(SHRT_POS_INC_BEAT,      Qt::ALT + Qt::Key_Plus, "Transport: Increase current position", GLOBAL_SHRT, "curpos_increase_beat");
-      defShrt(SHRT_POS_DEC_BEAT,      Qt::ALT + Qt::Key_Minus, "Transport: Decrease current position", GLOBAL_SHRT,  "curpos_decrease_beat");
-      defShrt(SHRT_POS_INC_BEAT_NOSNAP,   Qt::SHIFT + Qt::ALT + Qt::Key_Plus, "Transport: Increase current position", GLOBAL_SHRT, "curpos_increase_beat_nosnap");
-      defShrt(SHRT_POS_DEC_BEAT_NOSNAP,   Qt::SHIFT + Qt::ALT + Qt::Key_Minus, "Transport: Decrease current position", GLOBAL_SHRT,  "curpos_decrease_beat_nosnap");
+      defShrt(SHRT_POS_INC_BEAT,      Qt::ALT + Qt::Key_Plus, QT_TRANSLATE_NOOP("shortcuts", "Transport: Increase current position"), GLOBAL_SHRT, "curpos_increase_beat");
+      defShrt(SHRT_POS_DEC_BEAT,      Qt::ALT + Qt::Key_Minus, QT_TRANSLATE_NOOP("shortcuts", "Transport: Decrease current position"), GLOBAL_SHRT,  "curpos_decrease_beat");
+      defShrt(SHRT_POS_INC_BEAT_NOSNAP,   Qt::SHIFT + Qt::ALT + Qt::Key_Plus, QT_TRANSLATE_NOOP("shortcuts", "Transport: Increase current position"), GLOBAL_SHRT, "curpos_increase_beat_nosnap");
+      defShrt(SHRT_POS_DEC_BEAT_NOSNAP,   Qt::SHIFT + Qt::ALT + Qt::Key_Minus, QT_TRANSLATE_NOOP("shortcuts", "Transport: Decrease current position"), GLOBAL_SHRT,  "curpos_decrease_beat_nosnap");
       
-      defShrt(SHRT_POS_INC_TICK,      Qt::CTRL + Qt::Key_Plus, "Transport: Increase current position", GLOBAL_SHRT, "curpos_increase_tick");
-      defShrt(SHRT_POS_DEC_TICK,      Qt::CTRL + Qt::Key_Minus, "Transport: Decrease current position", GLOBAL_SHRT,  "curpos_decrease_tick");
-      defShrt(SHRT_POS_INC_TICK_NOSNAP,      Qt::SHIFT + Qt::CTRL + Qt::Key_Plus, "Transport: Increase current position", GLOBAL_SHRT, "curpos_increase_tick");
-      defShrt(SHRT_POS_DEC_TICK_NOSNAP,      Qt::SHIFT + Qt::CTRL + Qt::Key_Minus, "Transport: Decrease current position", GLOBAL_SHRT,  "curpos_decrease_tick");
+      defShrt(SHRT_POS_INC_TICK,      Qt::CTRL + Qt::Key_Plus, QT_TRANSLATE_NOOP("shortcuts", "Transport: Increase current position"), GLOBAL_SHRT, "curpos_increase_tick");
+      defShrt(SHRT_POS_DEC_TICK,      Qt::CTRL + Qt::Key_Minus, QT_TRANSLATE_NOOP("shortcuts", "Transport: Decrease current position"), GLOBAL_SHRT,  "curpos_decrease_tick");
+      defShrt(SHRT_POS_INC_TICK_NOSNAP,      Qt::SHIFT + Qt::CTRL + Qt::Key_Plus, QT_TRANSLATE_NOOP("shortcuts", "Transport: Increase current position"), GLOBAL_SHRT, "curpos_increase_tick");
+      defShrt(SHRT_POS_DEC_TICK_NOSNAP,      Qt::SHIFT + Qt::CTRL + Qt::Key_Minus, QT_TRANSLATE_NOOP("shortcuts", "Transport: Decrease current position"), GLOBAL_SHRT,  "curpos_decrease_tick");
       
-      defShrt(SHRT_POS_INC_FRAME,      Qt::Key_N, "Transport: Increase current position", GLOBAL_SHRT, "curpos_increase_frame");
-      defShrt(SHRT_POS_DEC_FRAME,      Qt::Key_B, "Transport: Decrease current position", GLOBAL_SHRT,  "curpos_decrease_frame");
+      defShrt(SHRT_POS_INC_FRAME,      Qt::Key_N, QT_TRANSLATE_NOOP("shortcuts", "Transport: Increase current position"), GLOBAL_SHRT, "curpos_increase_frame");
+      defShrt(SHRT_POS_DEC_FRAME,      Qt::Key_B, QT_TRANSLATE_NOOP("shortcuts", "Transport: Decrease current position"), GLOBAL_SHRT,  "curpos_decrease_frame");
       
-      defShrt(SHRT_POS_INC_SECOND,      Qt::CTRL + Qt::Key_N, "Transport: Increase current position", GLOBAL_SHRT, "curpos_increase_second");
-      defShrt(SHRT_POS_DEC_SECOND,      Qt::CTRL + Qt::Key_B, "Transport: Decrease current position", GLOBAL_SHRT,  "curpos_decrease_second");
-      defShrt(SHRT_POS_INC_SECOND_NOSNAP,   Qt::SHIFT + Qt::CTRL + Qt::Key_N, "Transport: Increase current position", GLOBAL_SHRT, "curpos_increase_second_nosnap");
-      defShrt(SHRT_POS_DEC_SECOND_NOSNAP,   Qt::SHIFT + Qt::CTRL + Qt::Key_B, "Transport: Decrease current position", GLOBAL_SHRT,  "curpos_decrease_second_nosnap");
+      defShrt(SHRT_POS_INC_SECOND,      Qt::CTRL + Qt::Key_N, QT_TRANSLATE_NOOP("shortcuts", "Transport: Increase current position"), GLOBAL_SHRT, "curpos_increase_second");
+      defShrt(SHRT_POS_DEC_SECOND,      Qt::CTRL + Qt::Key_B, QT_TRANSLATE_NOOP("shortcuts", "Transport: Decrease current position"), GLOBAL_SHRT,  "curpos_decrease_second");
+      defShrt(SHRT_POS_INC_SECOND_NOSNAP,   Qt::SHIFT + Qt::CTRL + Qt::Key_N, QT_TRANSLATE_NOOP("shortcuts", "Transport: Increase current position"), GLOBAL_SHRT, "curpos_increase_second_nosnap");
+      defShrt(SHRT_POS_DEC_SECOND_NOSNAP,   Qt::SHIFT + Qt::CTRL + Qt::Key_B, QT_TRANSLATE_NOOP("shortcuts", "Transport: Decrease current position"), GLOBAL_SHRT,  "curpos_decrease_second_nosnap");
       
-      defShrt(SHRT_POS_INC_MINUTE,      Qt::ALT + Qt::Key_N, "Transport: Increase current position", GLOBAL_SHRT, "curpos_increase_minute");
-      defShrt(SHRT_POS_DEC_MINUTE,      Qt::ALT + Qt::Key_B, "Transport: Decrease current position", GLOBAL_SHRT,  "curpos_decrease_minute");
-      defShrt(SHRT_POS_INC_MINUTE_NOSNAP,   Qt::SHIFT + Qt::ALT + Qt::Key_N, "Transport: Increase current position", GLOBAL_SHRT, "curpos_increase_minute_nosnap");
-      defShrt(SHRT_POS_DEC_MINUTE_NOSNAP,   Qt::SHIFT + Qt::ALT + Qt::Key_B, "Transport: Decrease current position", GLOBAL_SHRT,  "curpos_decrease_minute_nosnap");
+      defShrt(SHRT_POS_INC_MINUTE,      Qt::ALT + Qt::Key_N, QT_TRANSLATE_NOOP("shortcuts", "Transport: Increase current position"), GLOBAL_SHRT, "curpos_increase_minute");
+      defShrt(SHRT_POS_DEC_MINUTE,      Qt::ALT + Qt::Key_B, QT_TRANSLATE_NOOP("shortcuts", "Transport: Decrease current position"), GLOBAL_SHRT,  "curpos_decrease_minute");
+      defShrt(SHRT_POS_INC_MINUTE_NOSNAP,   Qt::SHIFT + Qt::ALT + Qt::Key_N, QT_TRANSLATE_NOOP("shortcuts", "Transport: Increase current position"), GLOBAL_SHRT, "curpos_increase_minute_nosnap");
+      defShrt(SHRT_POS_DEC_MINUTE_NOSNAP,   Qt::SHIFT + Qt::ALT + Qt::Key_B, QT_TRANSLATE_NOOP("shortcuts", "Transport: Decrease current position"), GLOBAL_SHRT,  "curpos_decrease_minute_nosnap");
       */
       
       
-      defShrt(SHRT_SET_QUANT_1,      Qt::Key_1, "Quantize: Set quantize to 1/1 note",  PROLL_SHRT, "midi_quant_1");
-      defShrt(SHRT_SET_QUANT_2,      Qt::Key_2, "Quantize: Set quantize to 1/2 note",  PROLL_SHRT, "midi_quant_2");
-      defShrt(SHRT_SET_QUANT_3,      Qt::Key_3, "Quantize: Set quantize to 1/4 note",  PROLL_SHRT, "midi_quant_3");
-      defShrt(SHRT_SET_QUANT_4,      Qt::Key_4, "Quantize: Set quantize to 1/8 note",  PROLL_SHRT, "midi_quant_4");
-      defShrt(SHRT_SET_QUANT_5,      Qt::Key_5, "Quantize: Set quantize to 1/16 note", PROLL_SHRT, "midi_quant_5");
-      defShrt(SHRT_SET_QUANT_6,      Qt::Key_6, "Quantize: Set quantize to 1/32 note", PROLL_SHRT, "midi_quant_6");
-      defShrt(SHRT_SET_QUANT_7,      Qt::Key_7, "Quantize: Set quantize to 1/64 note", PROLL_SHRT, "midi_quant_7");
-
-      defShrt(SHRT_TOGGLE_TRIOL,       Qt::Key_T, "Quantize: Toggle triol quantization", PROLL_SHRT, "midi_quant_triol");
-      defShrt(SHRT_TOGGLE_PUNCT,       Qt::Key_Period, "Quantize: Toggle punctuation quantization", PROLL_SHRT, "midi_quant_punct");
-      defShrt(SHRT_TOGGLE_PUNCT2,      Qt::Key_Comma, "Quantize: Toggle punctuation quantization (2)", PROLL_SHRT, "midi_quant_punct2");
-      defShrt(SHRT_INSERT_AT_LOCATION, Qt::SHIFT + Qt::Key_Right, "Edit: Insert at location", PROLL_SHRT, "midi_insert_at_loc");
-
-      defShrt(SHRT_INCREASE_LEN, Qt::CTRL + Qt::SHIFT + Qt::Key_Right, "Edit: Increase length", PROLL_SHRT, "increase_len");
-      defShrt(SHRT_DECREASE_LEN, Qt::CTRL + Qt::SHIFT + Qt::Key_Left, "Edit: Decrease length", PROLL_SHRT, "decrease_len");
+      defShrt(SHRT_SET_QUANT_1,      Qt::Key_1, QT_TRANSLATE_NOOP("shortcuts", "Quantize: Set quantize to 1/1 note"),  PROLL_SHRT, "midi_quant_1");
+      defShrt(SHRT_SET_QUANT_2,      Qt::Key_2, QT_TRANSLATE_NOOP("shortcuts", "Quantize: Set quantize to 1/2 note"),  PROLL_SHRT, "midi_quant_2");
+      defShrt(SHRT_SET_QUANT_3,      Qt::Key_3, QT_TRANSLATE_NOOP("shortcuts", "Quantize: Set quantize to 1/4 note"),  PROLL_SHRT, "midi_quant_3");
+      defShrt(SHRT_SET_QUANT_4,      Qt::Key_4, QT_TRANSLATE_NOOP("shortcuts", "Quantize: Set quantize to 1/8 note"),  PROLL_SHRT, "midi_quant_4");
+      defShrt(SHRT_SET_QUANT_5,      Qt::Key_5, QT_TRANSLATE_NOOP("shortcuts", "Quantize: Set quantize to 1/16 note"), PROLL_SHRT, "midi_quant_5");
+      defShrt(SHRT_SET_QUANT_6,      Qt::Key_6, QT_TRANSLATE_NOOP("shortcuts", "Quantize: Set quantize to 1/32 note"), PROLL_SHRT, "midi_quant_6");
+      defShrt(SHRT_SET_QUANT_7,      Qt::Key_7, QT_TRANSLATE_NOOP("shortcuts", "Quantize: Set quantize to 1/64 note"), PROLL_SHRT, "midi_quant_7");
+
+      defShrt(SHRT_TOGGLE_TRIOL,       Qt::Key_T, QT_TRANSLATE_NOOP("shortcuts", "Quantize: Toggle triol quantization"), PROLL_SHRT, "midi_quant_triol");
+      defShrt(SHRT_TOGGLE_PUNCT,       Qt::Key_Period, QT_TRANSLATE_NOOP("shortcuts", "Quantize: Toggle punctuation quantization"), PROLL_SHRT, "midi_quant_punct");
+      defShrt(SHRT_TOGGLE_PUNCT2,      Qt::Key_Comma, QT_TRANSLATE_NOOP("shortcuts", "Quantize: Toggle punctuation quantization (2)"), PROLL_SHRT, "midi_quant_punct2");
+      defShrt(SHRT_INSERT_AT_LOCATION, Qt::SHIFT + Qt::Key_Right, QT_TRANSLATE_NOOP("shortcuts", "Edit: Insert at location"), PROLL_SHRT, "midi_insert_at_loc");
+
+      defShrt(SHRT_INCREASE_LEN, Qt::CTRL + Qt::SHIFT + Qt::Key_Right, QT_TRANSLATE_NOOP("shortcuts", "Edit: Increase length"), PROLL_SHRT, "increase_len");
+      defShrt(SHRT_DECREASE_LEN, Qt::CTRL + Qt::SHIFT + Qt::Key_Left, QT_TRANSLATE_NOOP("shortcuts", "Edit: Decrease length"), PROLL_SHRT, "decrease_len");
 
       //-----------------------------------------------------------
       // List edit:
       //-----------------------------------------------------------
 
-      defShrt(SHRT_LE_INS_NOTES, Qt::CTRL + Qt::Key_N, "Insert Note", LEDIT_SHRT,  "le_ins_note");
-      defShrt(SHRT_LE_INS_SYSEX, Qt::CTRL + Qt::Key_S, "Insert SysEx", LEDIT_SHRT, "le_ins_sysex");
-      defShrt(SHRT_LE_INS_CTRL,  Qt::CTRL + Qt::Key_T, "Insert Ctrl", LEDIT_SHRT,  "le_ins_ctrl");
-      defShrt(SHRT_LE_INS_META,                     0, "Insert Meta", LEDIT_SHRT, "le_ins_meta");
-      defShrt(SHRT_LE_INS_CHAN_AFTERTOUCH, Qt::CTRL + Qt::Key_A, "Insert Channel Aftertouch", LEDIT_SHRT, "le_ins_afttouch");
-      defShrt(SHRT_LE_INS_POLY_AFTERTOUCH, Qt::CTRL + Qt::Key_P, "Insert Key Aftertouch", LEDIT_SHRT, "le_ins_poly");
+      defShrt(SHRT_LE_INS_NOTES, Qt::CTRL + Qt::Key_N, QT_TRANSLATE_NOOP("shortcuts", "Insert Note"), LEDIT_SHRT,  "le_ins_note");
+      defShrt(SHRT_LE_INS_SYSEX, Qt::CTRL + Qt::Key_S, QT_TRANSLATE_NOOP("shortcuts", "Insert SysEx"), LEDIT_SHRT, "le_ins_sysex");
+      defShrt(SHRT_LE_INS_CTRL,  Qt::CTRL + Qt::Key_T, QT_TRANSLATE_NOOP("shortcuts", "Insert Ctrl"), LEDIT_SHRT,  "le_ins_ctrl");
+      defShrt(SHRT_LE_INS_META,                     0, QT_TRANSLATE_NOOP("shortcuts", "Insert Meta"), LEDIT_SHRT, "le_ins_meta");
+      defShrt(SHRT_LE_INS_CHAN_AFTERTOUCH, Qt::CTRL + Qt::Key_A, QT_TRANSLATE_NOOP("shortcuts", "Insert Channel Aftertouch"), LEDIT_SHRT, "le_ins_afttouch");
+      defShrt(SHRT_LE_INS_POLY_AFTERTOUCH, Qt::CTRL + Qt::Key_P, QT_TRANSLATE_NOOP("shortcuts", "Insert Key Aftertouch"), LEDIT_SHRT, "le_ins_poly");
 
       //-----------------------------------------------------------
       // List masteredit:
       //-----------------------------------------------------------
-      defShrt(SHRT_LM_INS_TEMPO,  Qt::CTRL + Qt::Key_T,            "Insert Tempo",     LMEDIT_SHRT,  "lm_ins_tempo");
-      defShrt(SHRT_LM_INS_SIG  ,  Qt::CTRL + Qt::Key_R,            "Insert Signature", LMEDIT_SHRT,  "lm_ins_sig");
-      defShrt(SHRT_LM_EDIT_BEAT,  Qt::CTRL + Qt::SHIFT+ Qt::Key_E, "Change Event Position",  LMEDIT_SHRT,  "lm_edit_beat");
-      defShrt(SHRT_LM_EDIT_VALUE, Qt::CTRL + Qt::Key_E,            "Edit Event Value",       LMEDIT_SHRT,  "lm_edit_val");
-      defShrt(SHRT_LM_INS_KEY, Qt::CTRL + Qt::Key_K,            "Insert Key",       LMEDIT_SHRT,  "lm_ins_key");
-
-      defShrt(SHRT_NEXT_MARKER, Qt::Key_F6,            "Goto Next Marker",       ARRANG_SHRT,  "me_sel_next");
-      defShrt(SHRT_PREV_MARKER, Qt::Key_F5,            "Goto Prev Marker",       ARRANG_SHRT,  "me_sel_prev");
+      defShrt(SHRT_LM_INS_TEMPO,  Qt::CTRL + Qt::Key_T,            QT_TRANSLATE_NOOP("shortcuts", "Insert Tempo"),     LMEDIT_SHRT,  "lm_ins_tempo");
+      defShrt(SHRT_LM_INS_SIG  ,  Qt::CTRL + Qt::Key_R,            QT_TRANSLATE_NOOP("shortcuts", "Insert Signature"), LMEDIT_SHRT,  "lm_ins_sig");
+      defShrt(SHRT_LM_EDIT_BEAT,  Qt::CTRL + Qt::SHIFT+ Qt::Key_E, QT_TRANSLATE_NOOP("shortcuts", "Change Event Position"),  LMEDIT_SHRT,  "lm_edit_beat");
+      defShrt(SHRT_LM_EDIT_VALUE, Qt::CTRL + Qt::Key_E,            QT_TRANSLATE_NOOP("shortcuts", "Edit Event Value"),       LMEDIT_SHRT,  "lm_edit_val");
+      defShrt(SHRT_LM_INS_KEY, Qt::CTRL + Qt::Key_K,            QT_TRANSLATE_NOOP("shortcuts", "Insert Key"),       LMEDIT_SHRT,  "lm_ins_key");
+
+      defShrt(SHRT_NEXT_MARKER, Qt::Key_F6,            QT_TRANSLATE_NOOP("shortcuts", "Goto Next Marker"),       ARRANG_SHRT,  "me_sel_next");
+      defShrt(SHRT_PREV_MARKER, Qt::Key_F5,            QT_TRANSLATE_NOOP("shortcuts", "Goto Prev Marker"),       ARRANG_SHRT,  "me_sel_prev");
       
       }
 
diff --git a/muse2/muse/sig.cpp b/muse2/muse/sig.cpp
index 0b62848c..b11aa622 100644
--- a/muse2/muse/sig.cpp
+++ b/muse2/muse/sig.cpp
@@ -22,7 +22,6 @@
 //=========================================================
 
 #include <stdio.h>
-#include <assert.h>
 #include "sig.h"
 #include "gconfig.h"
 #include "xml.h"
@@ -51,14 +50,18 @@ SigList::SigList()
 void SigList::add(unsigned tick, int z, int n)
       {
       if (z == 0 || n == 0) {
-            printf("SigList::add illegal signature %d/%d\n", z, n);
+            printf("THIS SHOULD NEVER HAPPEN: SigList::add() illegal signature %d/%d\n", z, n);
             
             // Added p3.3.43
             return;
             }
       tick = raster1(tick, 0);
       iSigEvent e = upper_bound(tick);
-      assert(e != end());
+      if (e == end())
+      {
+        printf("THIS SHOULD NEVER HAPPEN: could not find upper_bound(%i) in SigList::add()!\n", tick);
+        return;
+      }
 
       if (tick == e->second->tick) {
             e->second->z = z;
@@ -185,7 +188,11 @@ int SigList::ticksMeasure(unsigned tick) const
 int SigList::ticksBeat(unsigned tick) const
       {
       ciSigEvent i = upper_bound(tick);
-      assert(i != end());
+      if (i == end())
+      {
+        printf("THIS SHOULD NEVER HAPPEN: couldn't find sig event for tick=%i in SigList::ticksBeat()!\n",tick);
+        return 0;
+      }
       return ticks_beat(i->second->n);
       }
 
@@ -202,7 +209,7 @@ int SigList::ticks_beat(int n) const
             case 32:  m >>= 3; break;           // 48
             case 64:  m >>= 4; break;           // 24
             case 128: m >>= 5; break;           // 12
-            default: assert(false); break;
+            default: printf("THIS SHOULD NEVER HAPPEN: invalid function call in SigList::ticks_beat(): n=%i\n",n); break;
             }
       return m;
       }
@@ -308,7 +315,11 @@ unsigned SigList::raster1(unsigned t, int raster) const
       if (raster == 1)
             return t;
       ciSigEvent e = upper_bound(t);
-      assert(e != end());
+      if (e == end())
+      {
+        printf("THIS SHOULD NEVER HAPPEN: couldn't find sig event for tick=%i in SigList::raster1()!\n", t);
+        return 0;
+      }
 
       int delta  = t - e->second->tick;
       int ticksM = ticks_beat(e->second->n) * e->second->z;
@@ -329,7 +340,11 @@ unsigned SigList::raster2(unsigned t, int raster) const
       if (raster == 1)
             return t;
       ciSigEvent e = upper_bound(t);
-      assert(e != end());
+      if (e == end())
+      {
+        printf("THIS SHOULD NEVER HAPPEN: couldn't find sig event for tick=%i in SigList::raster2()!\n", t);
+        return 0;
+      }
 
       int delta  = t - e->second->tick;
       int ticksM = ticks_beat(e->second->n) * e->second->z;
@@ -348,7 +363,11 @@ int SigList::rasterStep(unsigned t, int raster) const
       {
       if (raster == 0) {
             ciSigEvent e = upper_bound(t);
-            assert(e != end());
+            if (e == end())
+            {
+              printf("THIS SHOULD NEVER HAPPEN: couldn't find sig event for tick=%i in SigList::rasterStep()!\n", t);
+              return 0;
+            }
             return ticks_beat(e->second->n) * e->second->z;
             }
       return raster;
diff --git a/muse2/muse/song.cpp b/muse2/muse/song.cpp
index b48f134b..484e2d42 100644
--- a/muse2/muse/song.cpp
+++ b/muse2/muse/song.cpp
@@ -72,26 +72,6 @@ namespace MusECore {
 extern void clearMidiTransforms();
 extern void clearMidiInputTransforms();
 
-/*
-//---------------------------------------------------------
-//   RoutingMenuItem
-//---------------------------------------------------------
-
-class RoutingMenuItem : public QCustomMenuItem 
-{
-      Route route;
-      //virtual QSize sizeHint() { return QSize(80, h); }
-      virtual void paint(QPainter* p, const QColorGroup&, bool, bool, int x, int y, int w, int h)
-      {
-        p->fillRect(x, y, w, h, QBrush(lightGray));
-        p->drawText(x, y, w, h, AlignCenter, route.name());
-      }
-
-   public:
-      RoutingMenuItem(const Route& r) : route(r) { }
-};
-*/
-
 //---------------------------------------------------------
 //   Song
 //---------------------------------------------------------
@@ -108,6 +88,8 @@ Song::Song(const char* name)
       redoList     = new UndoList;
       _markerList  = new MarkerList;
       _globalPitchShift = 0;
+      bounceTrack = NULL;
+      bounceOutput = NULL;
       showSongInfo=true;
       clear(false);
       }
@@ -174,6 +156,7 @@ void Song::setSig(const AL::TimeSignature& sig)
 
 Track* Song::addNewTrack(QAction* action, Track* insertAt)
 {
+printf("Song::addNewTrack\n");
     int n = action->data().toInt();
     // Ignore negative numbers since this slot could be called by a menu or list etc. passing -1.
     if(n < 0)
@@ -183,13 +166,20 @@ Track* Song::addNewTrack(QAction* action, Track* insertAt)
     if(n >= MENU_ADD_SYNTH_ID_BASE)
     {
       n -= MENU_ADD_SYNTH_ID_BASE;
+      int ntype = n / MENU_ADD_SYNTH_ID_BASE;
+      if(ntype >= Synth::SYNTH_TYPE_END)
+        return 0;
+
+      n %= MENU_ADD_SYNTH_ID_BASE;
       if(n >= (int)MusEGlobal::synthis.size())
         return 0;
         
-      SynthI* si = createSynthI(MusEGlobal::synthis[n]->baseName(), MusEGlobal::synthis[n]->name(), insertAt);
+      //printf("Song::addNewTrack synth: type:%d idx:%d class:%s label:%s\n", ntype, n, MusEGlobal::synthis[n]->baseName().toLatin1().constData(), MusEGlobal::synthis[n]->name().toLatin1().constData());  
+      SynthI* si = createSynthI(MusEGlobal::synthis[n]->baseName(), MusEGlobal::synthis[n]->name(), (Synth::Type)ntype, insertAt);
       if(!si)
         return 0;
-      
+      if (MusEGlobal::config.unhideTracks) SynthI::setVisible(true);
+
       // Add instance last in midi device list.
       for (int i = 0; i < MIDI_PORTS; ++i) 
       {
@@ -199,15 +189,19 @@ Track* Song::addNewTrack(QAction* action, Track* insertAt)
         {
           MusEGlobal::midiSeq->msgSetMidiDevice(port, si);
           MusEGlobal::muse->changeConfig(true);     // save configuration file
-          deselectTracks();
-          si->setSelected(true);
-          update();
+          if (SynthI::visible()) {
+            deselectTracks();
+            si->setSelected(true);
+            update();
+          }
           return si;
         }
       }
-      deselectTracks();
-      si->setSelected(true);
-      update(SC_SELECTION);
+      if (SynthI::visible()) {
+        deselectTracks();
+        si->setSelected(true);
+        update(SC_SELECTION);
+      }
       return si;
     }  
     // Normal track.
@@ -218,10 +212,14 @@ Track* Song::addNewTrack(QAction* action, Track* insertAt)
       if((Track::TrackType)n >= Track::AUDIO_SOFTSYNTH)
         return 0;
       
-      Track* t = addTrack((Track::TrackType)n, insertAt);
-      deselectTracks();
-      t->setSelected(true);
-      update(SC_SELECTION);
+      Undo operations;
+      Track* t = addTrack(operations, (Track::TrackType)n, insertAt);
+      applyOperationGroup(operations);
+      if (t->isVisible()) {
+        deselectTracks();
+        t->setSelected(true);
+        update(SC_SELECTION);
+      }
       return t;
     }  
 }          
@@ -234,14 +232,16 @@ Track* Song::addNewTrack(QAction* action, Track* insertAt)
 //    If insertAt is valid, inserts before insertAt. Else at the end after all tracks.
 //---------------------------------------------------------
 
-Track* Song::addTrack(Track::TrackType type, Track* insertAt)
+Track* Song::addTrack(Undo& operations, Track::TrackType type, Track* insertAt)
       {
+  printf("Song::addTrack\n");
       Track* track = 0;
       int lastAuxIdx = _auxs.size();
       switch(type) {
             case Track::MIDI:
                   track = new MidiTrack();
                   track->setType(Track::MIDI);
+                  if (MusEGlobal::config.unhideTracks) MidiTrack::setVisible(true);
                   break;
             case Track::NEW_DRUM:
                   track = new MidiTrack();
@@ -252,40 +252,48 @@ Track* Song::addTrack(Track::TrackType type, Track* insertAt)
                   track = new MidiTrack();
                   track->setType(Track::DRUM);
                   ((MidiTrack*)track)->setOutChannel(9);
+                  if (MusEGlobal::config.unhideTracks) MidiTrack::setVisible(true);
                   break;
             case Track::WAVE:
                   track = new MusECore::WaveTrack();
                   ((AudioTrack*)track)->addAuxSend(lastAuxIdx);
+                  if (MusEGlobal::config.unhideTracks) WaveTrack::setVisible(true);
                   break;
             case Track::AUDIO_OUTPUT:
                   track = new AudioOutput();
+                  if (MusEGlobal::config.unhideTracks) AudioOutput::setVisible(true);
                   break;
             case Track::AUDIO_GROUP:
                   track = new AudioGroup();
                   ((AudioTrack*)track)->addAuxSend(lastAuxIdx);
+                  if (MusEGlobal::config.unhideTracks) AudioGroup::setVisible(true);
                   break;
             case Track::AUDIO_AUX:
                   track = new AudioAux();
+                  if (MusEGlobal::config.unhideTracks) AudioAux::setVisible(true);
                   break;
             case Track::AUDIO_INPUT:
                   track = new AudioInput();
                   ((AudioTrack*)track)->addAuxSend(lastAuxIdx);
+                  if (MusEGlobal::config.unhideTracks) AudioInput::setVisible(true);
                   break;
             case Track::AUDIO_SOFTSYNTH:
                   printf("not implemented: Song::addTrack(SOFTSYNTH)\n");
                   // ((AudioTrack*)track)->addAuxSend(lastAuxIdx);
                   break;
             default:
-                  printf("Song::addTrack() illegal type %d\n", type);
-                  abort();
+                  printf("THIS SHOULD NEVER HAPPEN: Song::addTrack() illegal type %d. returning NULL.\n"
+                         "save your work if you can and expect soon crashes!\n", type);
+                  return NULL;
             }
       track->setDefaultName();
       
       int idx = insertAt ? _tracks.index(insertAt) : -1;
       
-      insertTrack1(track, idx);
-      msgInsertTrack(track, idx, true);
-      insertTrack3(track, idx);
+      // insertTrack1(track, idx);         // this and the below are replaced
+      // msgInsertTrack(track, idx, true); // by the UndoOp-operation
+      // insertTrack3(track, idx); // does nothing
+      operations.push_back(UndoOp(UndoOp::AddTrack, idx, track));
 
       // Add default track <-> midiport routes. 
       if(track->isMidiTrack()) 
@@ -436,45 +444,6 @@ void Song::changeTrack(Track* oldTrack, Track* newTrack)
 
 bool Song::addEvent(Event& event, Part* part)
       {
-      /*
-      if (event.type() == Controller) {
-            MidiTrack* track = (MidiTrack*)part->track();
-            int ch    = track->outChannel();
-            int tick  = event.tick() + part->tick();
-            int cntrl = event.dataA();
-            int val   = event.dataB();
-            MidiPort* mp = &MusEGlobal::midiPorts[track->outPort()];
-            
-            // Is it a drum controller event, according to the track port's instrument?
-            if(track->type() == Track::DRUM)
-            {
-              MidiController* mc = mp->drumController(cntrl);
-              if(mc)
-              {
-                int note = cntrl & 0x7f;
-                cntrl &= ~0xff;
-                ch = MusEGlobal::drumMap[note].channel;
-                mp = &MusEGlobal::midiPorts[MusEGlobal::drumMap[note].port];
-                cntrl |= MusEGlobal::drumMap[note].anote;
-              }
-            }
-            
-            // Changed by T356.
-            //if (!mp->setCtrl(ch, tick, cntrl, val)) {
-            //      mp->addManagedController(ch, cntrl);
-            //      if (!mp->setCtrl(ch, tick, cntrl, val))
-            //            return false;
-            //      }
-            // Changed again. Don't depend on return value of this - search for the event, below. 
-            //if(!mp->setControllerVal(ch, tick, cntrl, val, part)) 
-            //  return false;
-            if(mp->setControllerVal(ch, tick, cntrl, val, part)) 
-              updateFlags |= SC_MIDI_CONTROLLER;
-            }
-      */
-      
-      //addPortCtrlEvents(event, part);
-      
       // Return false if the event is already found. 
       // (But allow a port controller value, above, in case it is not already stored.)
       if(part->events()->find(event) != part->events()->end())
@@ -501,7 +470,6 @@ void Song::changeEvent(Event& oldEvent, Event& newEvent, Part* part)
             // This can be normal for some (redundant) operations.
             if(MusEGlobal::debugMsg)
               printf("Song::changeEvent event not found in part:%s size:%zd\n", part->name().toLatin1().constData(), part->events()->size());
-            // abort();
             // Removed by T356. Allow it to add the new event. 
             // (And remove the old one from the midi port controller!)
             //return;
@@ -510,59 +478,6 @@ void Song::changeEvent(Event& oldEvent, Event& newEvent, Part* part)
         part->events()->erase(i);
         
       part->events()->add(newEvent);
-      
-      /*
-      if (oldEvent.type() == Controller) {
-            MidiTrack* track = (MidiTrack*)part->track();
-            int ch    = track->outChannel();
-            int tick  = oldEvent.tick() + part->tick();
-            int cntrl = oldEvent.dataA();
-            MidiPort* mp = &MusEGlobal::midiPorts[track->outPort()];
-            // Is it a drum controller event, according to the track port's instrument?
-            if(track->type() == Track::DRUM)
-            {
-              MidiController* mc = mp->drumController(cntrl);
-              if(mc)
-              {
-                int note = cntrl & 0x7f;
-                cntrl &= ~0xff;
-                ch = MusEGlobal::drumMap[note].channel;
-                mp = &MusEGlobal::midiPorts[MusEGlobal::drumMap[note].port];
-                cntrl |= MusEGlobal::drumMap[note].anote;
-              }
-            }
-            
-            mp->deleteController(ch, tick, cntrl, part);
-      }
-      */
-      //removePortCtrlEvents(oldEvent, part);
-
-      /*
-      if (newEvent.type() == Controller) {
-            MidiTrack* track = (MidiTrack*)part->track();
-            int ch    = track->outChannel();
-            int tick  = newEvent.tick() + part->tick();
-            int cntrl = newEvent.dataA();
-            int val   = newEvent.dataB();
-            MidiPort* mp = &MusEGlobal::midiPorts[track->outPort()];
-            // Is it a drum controller event, according to the track port's instrument?
-            if(track->type() == Track::DRUM)
-            {
-              MidiController* mc = mp->drumController(cntrl);
-              if(mc)
-              {
-                int note = cntrl & 0x7f;
-                cntrl &= ~0xff;
-                ch = MusEGlobal::drumMap[note].channel;
-                mp = &MusEGlobal::midiPorts[MusEGlobal::drumMap[note].port];
-                cntrl |= MusEGlobal::drumMap[note].anote;
-              }
-            }
-            
-            mp->setControllerVal(ch, tick, cntrl, val, part);
-            }
-      */    
-      //addPortCtrlEvents(newEvent, part);
 }
 
 //---------------------------------------------------------
@@ -571,33 +486,6 @@ void Song::changeEvent(Event& oldEvent, Event& newEvent, Part* part)
 
 void Song::deleteEvent(Event& event, Part* part)
       {
-      /*
-      if (event.type() == Controller) {
-            MidiTrack* track = (MidiTrack*)part->track();
-            int ch    = track->outChannel();
-            int tick  = event.tick() + part->tick();
-            int cntrl = event.dataA();
-            
-            MidiPort* mp = &MusEGlobal::midiPorts[track->outPort()];
-            // Is it a drum controller event, according to the track port's instrument?
-            if(track->type() == Track::DRUM)
-            {
-              MidiController* mc = mp->drumController(cntrl);
-              if(mc)
-              {
-                int note = cntrl & 0x7f;
-                cntrl &= ~0xff;
-                ch = MusEGlobal::drumMap[note].channel;
-                mp = &MusEGlobal::midiPorts[MusEGlobal::drumMap[note].port];
-                cntrl |= MusEGlobal::drumMap[note].anote;
-              }
-            }
-            
-            mp->deleteController(ch, tick, cntrl, part);
-            }
-      */
-      //removePortCtrlEvents(event, part);
-            
       iEvent ev = part->events()->find(event);
       if (ev == part->events()->end()) {
             // This can be normal for some (redundant) operations.
@@ -944,88 +832,6 @@ void Song::cmdAddRecordedEvents(MidiTrack* mt, EventList* events, unsigned start
                   // Add the event to the new part's port controller values, and do all clone parts.
                   addPortCtrlEvents(event, newPart, true);
                   }
-            
-            
-            /*
-            if (_recMode == REC_REPLACE)
-            {
-                  iEvent si = part->events()->lower_bound(startTick - part->tick());
-                  iEvent ei = part->events()->lower_bound(part->endTick() - part->tick());
-
-                  for (iEvent i = si; i != ei; ++i) 
-                  {
-                    Event event = i->second;
-                    // Create an undo op. Indicate do port controller values and clone parts. 
-                    //addUndo(UndoOp(UndoOp::DeleteEvent, event, part));
-                    addUndo(UndoOp(UndoOp::DeleteEvent, event, part, true, true));
-                    
-                    //if (event.type() == Controller) {
-                    //      MidiTrack* track = (MidiTrack*)part->track();
-                    //      int ch    = track->outChannel();
-                    //      int tick  = event.tick() + part->tick();
-                    //      int cntrl = event.dataA();
-                    //      MusEGlobal::midiPorts[track->outPort()].deleteController(ch, tick, cntrl, part);
-                    //      }
-                    
-                    // Remove the event from the part's port controller values, and do all clone parts.
-                    //removePortCtrlEvents(event, part, true);
-                  }
-                  part->events()->erase(si, ei);
-            }
-            
-            // Remove all of the part's port controller values, and do all clone parts.
-            removePortCtrlEvents(part, true);
-            
-            // Clone the part. This doesn't increment aref count, and doesn't chain clones.
-            // It also gives the new part a new serial number, but it is 
-            //  overwritten with the old one by Song::changePart(), below. 
-            Part* newPart = part->clone();
-            
-            endTick = 0;
-            for (iEvent i = s; i != e; ++i) {
-                  Event event = i->second;
-                  unsigned tick = event.tick() - partTick;
-                  event.setTick(tick);
-                  Event e;
-                  // Create an undo op. Indicate do port controller values and clone parts. 
-                  //addUndo(UndoOp(UndoOp::AddEvent, e, event, newPart));
-                  addUndo(UndoOp(UndoOp::AddEvent, e, event, newPart, true, true));
-                  
-                  // addEvent also adds port controller values. So does msgChangePart, below. Let msgChangePart handle them.
-                  //addEvent(event, (MidiPart*)newPart);
-                  if(newPart->events()->find(event) == newPart->events()->end())
-                    newPart->events()->add(event);
-                  
-                  if (endTick < event.tick() + event.lenTick())
-                        endTick = event.tick() + event.lenTick();
-                  }
-            newPart->setLenTick(endTick); // endTick - part->tick()
-
-            //printf("Song::cmdAddRecordedEvents before changePart part:%p events:%p refs:%d Arefs:%d newPart:%p events:%p refs:%d Arefs:%d\n", part, part->events(), part->events()->refCount(), part->events()->arefCount(), newPart, newPart->events(), newPart->events()->refCount(), newPart->events()->arefCount());
-      
-            // Change the part.
-            changePart(part, newPart);
-            // Manually adjust reference counts.
-            part->events()->incARef(-1);
-            newPart->events()->incARef(1);
-            // Replace the part in the clone chain with the new part.
-            replaceClone(part, newPart);
-            // Now add all of the new part's port controller values, and do all clone parts.
-            addPortCtrlEvents(newPart, true);
-
-            //printf("Song::cmdAddRecordedEvents after changePart part:%p events:%p refs:%d Arefs:%d newPart:%p events:%p refs:%d Arefs:%d\n", part, part->events(), part->events()->refCount(), part->events()->arefCount(), newPart, newPart->events(), newPart->events()->refCount(), newPart->events()->arefCount());
-      
-            //addUndo(UndoOp(UndoOp::ModifyPart, part, newPart));
-            // Create an undo op. Indicate do not do port controller values and clone parts. 
-            addUndo(UndoOp(UndoOp::ModifyPart, part, newPart, false, false));
-            
-            // Removed by T356.
-            //part->events()->incARef(-1);
-            
-            updateFlags |= SC_PART_MODIFIED;
-            //printf("Song::cmdAddRecordedEvents final part:%p events:%p refs:%d Arefs:%d newPart:%p events:%p refs:%d Arefs:%d\n", part, part->events(), part->events()->refCount(), part->events()->arefCount(), newPart, newPart->events(), newPart->events()->refCount(), newPart->events()->arefCount());
-            */
-      
             }
       else {
             if (_recMode == REC_REPLACE) {
@@ -1037,15 +843,6 @@ void Song::cmdAddRecordedEvents(MidiTrack* mt, EventList* events, unsigned start
                         // Create an undo op. Indicate that controller values and clone parts were handled.
                         //addUndo(UndoOp(UndoOp::DeleteEvent, event, part));
                         addUndo(UndoOp(UndoOp::DeleteEvent, event, part, true, true));
-                        /*
-                        if (event.type() == Controller) {
-                              MidiTrack* track = (MidiTrack*)part->track();
-                              int ch    = track->outChannel();
-                              int tick  = event.tick() + part->tick();
-                              int cntrl = event.dataA();
-                              MusEGlobal::midiPorts[track->outPort()].deleteController(ch, tick, cntrl, part);
-                              }
-                        */      
                         // Remove the event from the part's port controller values, and do all clone parts.
                         removePortCtrlEvents(event, part, true);
                         }
@@ -1719,6 +1516,7 @@ void Song::setMType(MType t)
 void Song::beat()
       {
       #if 0
+      // Just a rate test...
       static double _heartbeatRateTimer = 0.0;
       double t = MusEUtil::curTime();
       if(t - _heartbeatRateTimer > 0.0)
@@ -2040,14 +1838,12 @@ void Song::processMsg(AudioMsg* msg)
                   break;
             
             case SEQM_ADD_TEMPO:
-                  //printf("processMsg (SEQM_ADD_TEMPO) UndoOp::AddTempo. adding tempo at: %d with tempo=%d\n", msg->a, msg->b);
                   addUndo(UndoOp(UndoOp::AddTempo, msg->a, msg->b));
                   MusEGlobal::tempomap.addTempo(msg->a, msg->b);
                   updateFlags = SC_TEMPO;
                   break;
 
             case SEQM_SET_TEMPO:
-                  //printf("processMsg (SEQM_SET_TEMPO) UndoOp::AddTempo. adding tempo at: %d with tempo=%d\n", msg->a, msg->b);
                   addUndo(UndoOp(UndoOp::AddTempo, msg->a, msg->b));
                   MusEGlobal::tempomap.setTempo(msg->a, msg->b);
                   updateFlags = SC_TEMPO;
@@ -2058,7 +1854,6 @@ void Song::processMsg(AudioMsg* msg)
                   break;
 
             case SEQM_REMOVE_TEMPO:
-                  //printf("processMsg (SEQM_REMOVE_TEMPO) UndoOp::DeleteTempo. adding tempo at: %d with tempo=%d\n", msg->a, msg->b);
                   addUndo(UndoOp(UndoOp::DeleteTempo, msg->a, msg->b));
                   MusEGlobal::tempomap.delTempo(msg->a);
                   updateFlags = SC_TEMPO;
@@ -2123,7 +1918,6 @@ void Song::cmdRemovePart(Part* part)
 //   cmdChangePart
 //---------------------------------------------------------
 
-//void Song::cmdChangePart(Part* oldPart, Part* newPart)
 void Song::cmdChangePart(Part* oldPart, Part* newPart, bool doCtrls, bool doClones)
       {
       //printf("Song::cmdChangePart before changePart oldPart:%p events:%p refs:%d Arefs:%d sn:%d newPart:%p events:%p refs:%d Arefs:%d sn:%d\n", oldPart, oldPart->events(), oldPart->events()->refCount(), oldPart->events()->arefCount(), oldPart->sn(), newPart, newPart->events(), newPart->events()->refCount(), newPart->events()->arefCount(), newPart->sn());
@@ -2172,13 +1966,13 @@ void Song::panic()
 //    If clear_all is false, it will not touch things like midi ports.  
 //---------------------------------------------------------
 
-void Song::clear(bool signal, bool /*clear_all*/)
+void Song::clear(bool signal, bool clear_all)
       {
       if(MusEGlobal::debugMsg)
         printf("Song::clear\n");
       
       bounceTrack    = 0;
-
+      
       _tracks.clear();
       _midis.clearDelete();
       _waves.clearDelete();
@@ -2197,7 +1991,7 @@ void Song::clear(bool signal, bool /*clear_all*/)
         // p3.3.50 Reset this.
         MusEGlobal::midiPorts[i].setFoundInSongFile(false);
 
-        //if(clear_all)  // Allow not touching devices. p4.0.17  TESTING: Maybe some problems...
+        if(clear_all)  // Allow not touching devices. p4.0.17  TESTING: Maybe some problems...
           // This will also close the device.
           MusEGlobal::midiPorts[i].setMidiDevice(0);
       }
@@ -2216,7 +2010,7 @@ void Song::clear(bool signal, bool /*clear_all*/)
           //if((*imd)->deviceType() == MidiDevice::JACK_MIDI)
           if(dynamic_cast< MidiJackDevice* >(*imd))
           {
-            //if(clear_all)  // Allow not touching devices. p4.0.17  TESTING: Maybe some problems...
+            if(clear_all)  // Allow not touching devices. p4.0.17  TESTING: Maybe some problems...
             {
               // Remove the device from the list.
               MusEGlobal::midiDevices.erase(imd);
@@ -2475,7 +2269,6 @@ void Song::seqSignal(int fd)
                         if(MusEGlobal::debugMsg)
                           printf("Song: seqSignal: case f: setFreewheel start\n");
                         
-                        // Enabled by Tim. p3.3.6
                         if(MusEGlobal::config.freewheelMode)
                           MusEGlobal::audioDevice->setFreewheel(true);
                         
@@ -2485,7 +2278,6 @@ void Song::seqSignal(int fd)
                         if(MusEGlobal::debugMsg)
                           printf("Song: seqSignal: case F: setFreewheel stop\n");
                         
-                        // Enabled by Tim. p3.3.6
                         if(MusEGlobal::config.freewheelMode)
                           MusEGlobal::audioDevice->setFreewheel(false);
                         
@@ -2502,7 +2294,6 @@ void Song::seqSignal(int fd)
                             MusEGlobal::audioDevice->graphChanged();
                         break;
 
-                  // p3.3.37
                   case 'R': // Registration changed
                         if (MusEGlobal::audioDevice)
                             MusEGlobal::audioDevice->registrationChanged();
@@ -2593,8 +2384,7 @@ void Song::recordEvent(MidiTrack* mt, Event& event)
 
 int Song::execAutomationCtlPopup(AudioTrack* track, const QPoint& menupos, int acid)
 {
-  //enum { HEADER, SEP1, PREV_EVENT, NEXT_EVENT, SEP2, ADD_EVENT, CLEAR_EVENT, CLEAR_RANGE, CLEAR_ALL_EVENTS };
-  enum { HEADER, PREV_EVENT, NEXT_EVENT, SEP2, ADD_EVENT, CLEAR_EVENT, CLEAR_RANGE, CLEAR_ALL_EVENTS };
+  enum { PREV_EVENT, NEXT_EVENT, ADD_EVENT, CLEAR_EVENT, CLEAR_RANGE, CLEAR_ALL_EVENTS };
   QMenu* menu = new QMenu;
 
   int count = 0;
@@ -2639,14 +2429,8 @@ int Song::execAutomationCtlPopup(AudioTrack* track, const QPoint& menupos, int a
     }
   }
 
-  //menu->insertItem(tr("Automation:"), HEADER, HEADER);
-  //menu->setItemEnabled(HEADER, false);
-  //MenuTitleItem* title = new MenuTitleItem(tr("Automation:")); ddskrjo
-  //menu->insertItem(title, HEADER, HEADER); ddskrjo
   menu->addAction(new MusEGui::MenuTitleItem(tr("Automation:"), menu));
   
-  //menu->insertSeparator(SEP1);
-  
   QAction* prevEvent = menu->addAction(tr("previous event"));
   prevEvent->setData(PREV_EVENT);
   prevEvent->setEnabled(canSeekPrev);
@@ -2655,7 +2439,6 @@ int Song::execAutomationCtlPopup(AudioTrack* track, const QPoint& menupos, int a
   nextEvent->setData(NEXT_EVENT);
   nextEvent->setEnabled(canSeekNext);
 
-  //menu->insertSeparator(SEP2);
   menu->addSeparator();
 
   QAction* addEvent = new QAction(menu);
@@ -2738,8 +2521,8 @@ int Song::execMidiAutomationCtlPopup(MidiTrack* track, MidiPart* part, const QPo
   if(!track && !part)
     return -1;
     
-  //enum { HEADER, SEP1, PREV_EVENT, NEXT_EVENT, SEP2, ADD_EVENT, CLEAR_EVENT, CLEAR_RANGE, CLEAR_ALL_EVENTS };
-  enum { HEADER, ADD_EVENT, CLEAR_EVENT };
+  //enum { PREV_EVENT, NEXT_EVENT, ADD_EVENT, CLEAR_EVENT, CLEAR_RANGE, CLEAR_ALL_EVENTS };
+  enum { ADD_EVENT, CLEAR_EVENT };
   QMenu* menu = new QMenu;
 
   //int count = 0;
@@ -2825,22 +2608,8 @@ int Song::execMidiAutomationCtlPopup(MidiTrack* track, MidiPart* part, const QPo
     }  
   }
   
-
-  //menu->insertItem(tr("Automation:"), HEADER, HEADER);
-  //menu->setItemEnabled(HEADER, false);
-  //MenuTitleItem* title = new MenuTitleItem(tr("Automation:")); ddskrjo
-  ///menu->insertItem(title, HEADER, HEADER); ddskrjo
-  
-  //menu->insertSeparator(SEP1);
+  menu->addAction(new MusEGui::MenuTitleItem(tr("Automation:"), menu));
   
-//  menu->insertItem(tr("previous event"), PREV_EVENT, PREV_EVENT);
-//  menu->setItemEnabled(PREV_EVENT, canSeekPrev);
-
-//  menu->insertItem(tr("next event"), NEXT_EVENT, NEXT_EVENT);
-//  menu->setItemEnabled(NEXT_EVENT, canSeekNext);
-
-//  menu->insertSeparator(SEP2);
-
   QAction* addEvent = new QAction(menu);
   menu->addAction(addEvent);
   if(isEvent)
@@ -3101,220 +2870,6 @@ void Song::connectJackRoutes(AudioTrack* track, bool disconnect)
   }
 }
 
-/*
-//---------------------------------------------------------
-//   chooseMidiRoutes
-//---------------------------------------------------------
-
-void Song::chooseMidiRoutes(QButton* parent, MidiTrack* track, bool dst)
-{
-  if(!track)
-    return;
-    
-  //if(!track->isMidiTrack())
-  //  return;
-  
-  QPoint ppt = QCursor::pos();
-  //QPoint ppt = parent->rect().bottomLeft();
-    
-  //if(dst)
-  //{
-    // TODO
-    
-  //}
-  //else
-  //{
-    RouteList* rl = dst ? track->outRoutes() : track->inRoutes();
-    //Route dst(track, -1);
-  
-    QPopupMenu* pup = new QPopupMenu(parent);
-    pup->setCheckable(true);
-    
-    int gid = 0;
-    int n;    
-    
-  // FIXME:
-  // Routes can't be re-read until the message sent from msgAddRoute1() 
-  //  has had time to be sent and actually affected the routes.
-  ///_redisplay:
-    
-    pup->clear();
-    gid = 0;
-    
-    //MidiInPortList* tl = MusEGlobal::song->midiInPorts();
-    //for(iMidiInPort i = tl->begin();i != tl->end(); ++i) 
-    for(int i = 0; i < MIDI_PORTS; ++i)
-    {
-      //MidiInPort* track = *i;
-      // NOTE: Could possibly list all devices, bypassing ports, but no, let's stick wth ports.
-      MidiPort* mp = &MusEGlobal::midiPorts[i];
-      MidiDevice* md = mp->device();
-      if(!md)
-        continue;
-      
-      if(!(md->rwFlags() & (dst ? 1 : 2)))
-        continue;
-        
-      //printf("MidiStrip::iRoutePressed adding submenu portnum:%d\n", i);
-      
-      //QMenu* m = menu->addMenu(track->name());
-      QPopupMenu* subp = new QPopupMenu(parent);
-      
-      for(int ch = 0; ch < MIDI_CHANNELS; ++ch) 
-      {
-        //QAction* a = m->addAction(QString("Channel %1").arg(ch+1));
-        //subp->insertItem(QT_TRANSLATE_NOOP("@default", QString("Channel %1").arg(ch+1)), i * MIDI_CHANNELS + ch);
-        gid = i * MIDI_CHANNELS + ch;
-        
-        //printf("MidiStrip::iRoutePressed inserting gid:%d\n", gid);
-        
-        subp->insertItem(QString("Channel %1").arg(ch+1), gid);
-        //a->setCheckable(true);
-        //Route src(track, ch, RouteNode::TRACK);
-        //Route src(md, ch);
-        //Route r = Route(src, dst);
-        //a->setData(QVariant::fromValue(r));
-        //a->setChecked(rl->indexOf(r) != -1);
-        Route srcRoute(md, ch);
-        for(iRoute ir = rl->begin(); ir != rl->end(); ++ir) 
-        {
-          //if(*ir == dst) 
-          if(*ir == srcRoute) 
-          {
-            subp->setItemChecked(gid, true);
-            break;
-          }
-        }
-      }
-      pup->insertItem(QT_TRANSLATE_NOOP("@default", md->name()), subp);
-    }
-        
-//    QPopupMenu* pup = new QPopupMenu(iR);
-//    pup->setCheckable(true);
-    //MidiTrack* t = (MidiTrack*)track;
-//    RouteList* irl = track->inRoutes();
-
-//    MidiTrack* t = (MidiTrack*)track;
-//    int gid = 0;
-//    for (int i = 0; i < channel; ++i) 
-//    {
-//          char buffer[128];
-//          snprintf(buffer, 128, "%s %d", tr("Channel").toLatin1().constData(), i+1);
-//          MenuTitleItem* titel = new MenuTitleItem(QString(buffer));
-//          pup->insertItem(titel);
-
-//          if (!MusEGlobal::checkAudioDevice()) return;
-//          std::list<QString> ol = MusEGlobal::audioDevice->outputPorts();
-//          for (std::list<QString>::iterator ip = ol.begin(); ip != ol.end(); ++ip) {
-//                int id = pup->insertItem(*ip, (gid * 16) + i);
-//                Route dst(*ip, true, i);
-//                ++gid;
-//                for (iRoute ir = irl->begin(); ir != irl->end(); ++ir) {
-//                      if (*ir == dst) {
-//                            pup->setItemChecked(id, true);
-//                            break;
-//                            }
-//                      }
-//                }
-//          if (i+1 != channel)
-//                pup->insertSeparator();
-//    }
-    
-    if(pup->count() == 0)
-    {
-      delete pup;
-      return;
-    }
-    
-    //n = pup->exec(QCursor::pos());
-    n = pup->exec(ppt);
-    ///delete pup;
-    if (n != -1) 
-    {
-          int mdidx = n / MIDI_CHANNELS;
-          int ch = n % MIDI_CHANNELS;
-          
-          //if(MusEGlobal::debugMsg)
-            //printf("Song::chooseMidiRoutes mdidx:%d ch:%d\n", mdidx, ch);
-            
-          MidiPort* mp = &MusEGlobal::midiPorts[mdidx];
-          MidiDevice* md = mp->device();
-          if(!md)
-          {
-            delete pup;
-            return;
-          }
-          
-          //if(!(md->rwFlags() & 2))
-          if(!(md->rwFlags() & (dst ? 1 : 2)))
-          {
-            delete pup;
-            return;
-          }  
-          
-          //QString s(pup->text(n));
-          //QT_TRANSLATE_NOOP("@default", md->name())
-          
-          //Route srcRoute(s, false, -1);
-          Route aRoute(md, ch);
-          //Route srcRoute(md, -1);
-          //Route dstRoute(track, -1);
-          Route bRoute(track, ch);
-
-          //if (track->type() == Track::AUDIO_INPUT)
-          //      srcRoute.channel = dstRoute.channel = n & 0xf;
-          iRoute iir = rl->begin();
-          for (; iir != rl->end(); ++iir) 
-          {
-            //if(*iir == (dst ? bRoute : aRoute))
-            if(*iir == aRoute)
-                  break;
-          }
-          if (iir != rl->end()) 
-          {
-            // disconnect
-            if(dst)
-            {
-              //printf("Song::chooseMidiRoutes removing route src track name: %s dst device name: %s\n", track->name().toLatin1().constData(), md->name().toLatin1().constData());
-              MusEGlobal::audio->msgRemoveRoute(bRoute, aRoute);
-            }
-            else
-            {
-              //printf("Song::chooseMidiRoutes removing route src device name: %s dst track name: %s\n", md->name().toLatin1().constData(), track->name().toLatin1().constData());
-              MusEGlobal::audio->msgRemoveRoute(aRoute, bRoute);
-            }
-          }
-          else 
-          {
-            // connect
-            if(dst)
-            {
-              //printf("Song::chooseMidiRoutes adding route src track name: %s dst device name: %s\n", track->name().toLatin1().constData(), md->name().toLatin1().constData());
-              MusEGlobal::audio->msgAddRoute(bRoute, aRoute);
-            }
-            else
-            {
-              //printf("Song::chooseMidiRoutes adding route src device name: %s dst track name: %s\n", md->name().toLatin1().constData(), track->name().toLatin1().constData());
-              MusEGlobal::audio->msgAddRoute(aRoute, bRoute);
-            }  
-          }
-          
-          //printf("Song::chooseMidiRoutes calling msgUpdateSoloStates\n");
-          MusEGlobal::audio->msgUpdateSoloStates();
-          //printf("Song::chooseMidiRoutes calling MusEGlobal::song->update\n");
-          MusEGlobal::song->update(SC_ROUTE);
-          
-          // p3.3.46
-          ///goto _redisplay;
-    }
-    delete pup;
-    parent->setDown(false);     // pup->exec() catches mouse release event
-    //printf("Song::chooseMidiRoutes end\n");
-    
-  //}  
-}
-*/
-
 //---------------------------------------------------------
 //   insertTrack0
 //---------------------------------------------------------
@@ -3403,7 +2958,6 @@ void Song::insertTrack2(Track* track, int idx)
                   break;
             default:
                   fprintf(stderr, "unknown track type %d\n", track->type());
-                  // abort();
                   return;
             }
 
@@ -3420,43 +2974,12 @@ void Song::insertTrack2(Track* track, int idx)
       for (iTrack i = _tracks.begin(); i != _tracks.end(); ++i) {
             if ((*i)->isMidiTrack())
                   continue;
-            MusECore::WaveTrack* wt = (MusECore::WaveTrack*)*i;
+            MusECore::AudioTrack* wt = (MusECore::AudioTrack*)*i;
             if (wt->hasAuxSend()) {
                   wt->addAuxSend(n);
                   }
             }
 
-      /*
-      //
-      //  add routes
-      //
-
-      if (track->isMidiTrack())
-            return;
-      AudioTrack* at = (AudioTrack*)track;
-      Route src(at, -1);
-      if (at->type() == Track::AUDIO_OUTPUT) {
-            const RouteList* rl = at->inRoutes();
-            for (ciRoute r = rl->begin(); r != rl->end(); ++r)
-                  r->track->outRoutes()->push_back(src);
-            }
-      else if (at->type() == Track::AUDIO_INPUT) {
-            const RouteList* rl = at->outRoutes();
-            for (ciRoute r = rl->begin(); r != rl->end(); ++r)
-                  r->track->inRoutes()->push_back(src);
-            }
-      else {
-            const RouteList* rl = at->inRoutes();
-            for (ciRoute r = rl->begin(); r != rl->end(); ++r)
-                  r->track->outRoutes()->push_back(src);
-            rl = at->outRoutes();
-            for (ciRoute r = rl->begin(); r != rl->end(); ++r)
-                  r->track->inRoutes()->push_back(src);
-            }
-      */
-      
-      // p3.3.38
-      
       //
       //  add routes
       //
@@ -3472,6 +2995,13 @@ void Song::insertTrack2(Track* track, int idx)
                   Route src(track, r->channel, r->channels);
                   src.remoteChannel = r->remoteChannel;
                   r->track->outRoutes()->push_back(src);
+                  // Is the source an Aux Track or else does it have Aux Tracks routed to it?
+                  // Update the Audio Output track's aux ref count.     p4.0.37
+                  if(r->track->auxRefCount())
+                    track->updateAuxRoute( r->track->auxRefCount(), NULL );
+                  else
+                  if(r->track->type() == Track::AUDIO_AUX)
+                    track->updateAuxRoute( 1, NULL );
             }      
       }
       else if (track->type() == Track::AUDIO_INPUT) 
@@ -3485,6 +3015,13 @@ void Song::insertTrack2(Track* track, int idx)
                   Route src(track, r->channel, r->channels);
                   src.remoteChannel = r->remoteChannel;
                   r->track->inRoutes()->push_back(src);
+                  // Is this track an Aux Track or else does it have Aux Tracks routed to it?
+                  // Update the other track's aux ref count and all tracks it is connected to.     p4.0.37
+                  if(track->auxRefCount())
+                    r->track->updateAuxRoute( track->auxRefCount(), NULL );
+                  else
+                  if(track->type() == Track::AUDIO_AUX)
+                    r->track->updateAuxRoute( 1, NULL );
             }      
       }
       else if (track->isMidiTrack())          // p3.3.50
@@ -3492,14 +3029,14 @@ void Song::insertTrack2(Track* track, int idx)
             const RouteList* rl = track->inRoutes();
             for (ciRoute r = rl->begin(); r != rl->end(); ++r)
             {
-                  //printf("Song::insertTrack2 %s in route port:%d\n", track->name().toLatin1().constData(), r->midiPort);   // p3.3.50
+                  //printf("Song::insertTrack2 %s in route port:%d\n", track->name().toLatin1().constData(), r->midiPort);   
                   Route src(track, r->channel);
                   MusEGlobal::midiPorts[r->midiPort].outRoutes()->push_back(src);
             }
             rl = track->outRoutes();
             for (ciRoute r = rl->begin(); r != rl->end(); ++r)
             {
-                  //printf("Song::insertTrack2 %s out route port:%d\n", track->name().toLatin1().constData(), r->midiPort);  // p3.3.50
+                  //printf("Song::insertTrack2 %s out route port:%d\n", track->name().toLatin1().constData(), r->midiPort);  
                   Route src(track, r->channel);
                   MusEGlobal::midiPorts[r->midiPort].inRoutes()->push_back(src);
             }      
@@ -3515,6 +3052,13 @@ void Song::insertTrack2(Track* track, int idx)
                   Route src(track, r->channel, r->channels);
                   src.remoteChannel = r->remoteChannel;
                   r->track->outRoutes()->push_back(src);
+                  // Is the source an Aux Track or else does it have Aux Tracks routed to it?
+                  // Update this track's aux ref count.     p4.0.37
+                  if(r->track->auxRefCount())
+                    track->updateAuxRoute( r->track->auxRefCount(), NULL );
+                  else
+                  if(r->track->type() == Track::AUDIO_AUX)
+                    track->updateAuxRoute( 1, NULL );
             }
             rl = track->outRoutes();
             for (ciRoute r = rl->begin(); r != rl->end(); ++r)
@@ -3525,6 +3069,13 @@ void Song::insertTrack2(Track* track, int idx)
                   Route src(track, r->channel, r->channels);
                   src.remoteChannel = r->remoteChannel;
                   r->track->inRoutes()->push_back(src);
+                  // Is this track an Aux Track or else does it have Aux Tracks routed to it?
+                  // Update the other track's aux ref count and all tracks it is connected to.     p4.0.37
+                  if(track->auxRefCount())
+                    r->track->updateAuxRoute( track->auxRefCount(), NULL );
+                  else
+                  if(track->type() == Track::AUDIO_AUX)
+                    r->track->updateAuxRoute( 1, NULL );
             }      
       }
       
@@ -3537,18 +3088,9 @@ void Song::insertTrack2(Track* track, int idx)
 //    non realtime part of insertTrack
 //---------------------------------------------------------
 
+// empty. gets executed after the realtime part
 void Song::insertTrack3(Track* /*track*/, int /*idx*/)//prevent compiler warning: unused parameter
 {
-      //printf("Song::insertTrack3\n");
-      
-      /*
-      switch(track->type()) {
-            case Track::AUDIO_SOFTSYNTH:
-                  break;
-            default:
-                  break;
-            }
-      */
 }
 
 //---------------------------------------------------------
@@ -3596,7 +3138,7 @@ void Song::removeTrack1(Track* track)
                 SynthI* si = (SynthI*)track;
                 if(si->hasGui())
                   si->showGui(false);
-                if(si->hasNativeGui())       // p4.0.20
+                if(si->hasNativeGui())       
                   si->showNativeGui(false);
                 }
               break;
@@ -3612,7 +3154,7 @@ void Song::removeTrack1(Track* track)
 
 void Song::removeTrack2(Track* track)
 {
-      //printf("Song::removeTrack2 track:%s\n", track->name().toLatin1().constData());  // p3.3.50
+      //printf("Song::removeTrack2 track:%s\n", track->name().toLatin1().constData());  
                   
       switch(track->type()) {
             case Track::MIDI:
@@ -3653,38 +3195,6 @@ void Song::removeTrack2(Track* track)
             }
       _tracks.erase(track);
       
-      
-      /*
-      if (track->isMidiTrack())
-            return;
-      //
-      //  remove routes
-      //
-
-      AudioTrack* at = (AudioTrack*)track;
-      Route src(at, -1);
-      if (at->type() == Track::AUDIO_OUTPUT) {
-            const RouteList* rl = at->inRoutes();
-            for (ciRoute r = rl->begin(); r != rl->end(); ++r)
-                  r->track->outRoutes()->removeRoute(src);
-            }
-      else if (at->type() == Track::AUDIO_INPUT) {
-            const RouteList* rl = at->outRoutes();
-            for (ciRoute r = rl->begin(); r != rl->end(); ++r)
-                  r->track->inRoutes()->removeRoute(src);
-            }
-      else {
-            const RouteList* rl = at->inRoutes();
-            for (ciRoute r = rl->begin(); r != rl->end(); ++r)
-                  r->track->outRoutes()->removeRoute(src);
-            rl = at->outRoutes();
-            for (ciRoute r = rl->begin(); r != rl->end(); ++r)
-                  r->track->inRoutes()->removeRoute(src);
-            }
-      */      
-      
-      // p3.3.38
-      
       //
       //  remove routes
       //
@@ -3696,11 +3206,18 @@ void Song::removeTrack2(Track* track)
             {
                   //if(r->track == track)  
                   //  r->track->outRoutes()->removeRoute(*r);
-                  //printf("Song::removeTrack2 %s audio out track:%s\n", track->name().toLatin1().constData(), r->track->name().toLatin1().constData());  // p3.3.50
+                  //printf("Song::removeTrack2 %s audio out track:%s\n", track->name().toLatin1().constData(), r->track->name().toLatin1().constData());  
                   // p3.3.50
                   Route src(track, r->channel, r->channels);
                   src.remoteChannel = r->remoteChannel;
                   r->track->outRoutes()->removeRoute(src);
+                  // Is the source an Aux Track or else does it have Aux Tracks routed to it?
+                  // Update the Audio Output track's aux ref count.     p4.0.37
+                  if(r->track->auxRefCount())
+                    track->updateAuxRoute( -r->track->auxRefCount(), NULL );
+                  else
+                  if(r->track->type() == Track::AUDIO_AUX)
+                    track->updateAuxRoute( -1, NULL );
             }      
       }
       else if (track->type() == Track::AUDIO_INPUT) 
@@ -3710,11 +3227,18 @@ void Song::removeTrack2(Track* track)
             {
                   //if(r->track == track)  
                   //  r->track->inRoutes()->removeRoute(*r);
-                  //printf("Song::removeTrack2 %s audio in track:%s\n", track->name().toLatin1().constData(), r->track->name().toLatin1().constData());  // p3.3.50
+                  //printf("Song::removeTrack2 %s audio in track:%s\n", track->name().toLatin1().constData(), r->track->name().toLatin1().constData());  
                   // p3.3.50
                   Route src(track, r->channel, r->channels);
                   src.remoteChannel = r->remoteChannel;
                   r->track->inRoutes()->removeRoute(src);
+                  // Is this track an Aux Track or else does it have Aux Tracks routed to it?
+                  // Update the other track's aux ref count and all tracks it is connected to.     p4.0.37
+                  if(track->auxRefCount())
+                    r->track->updateAuxRoute( -track->auxRefCount(), NULL );
+                  else
+                  if(track->type() == Track::AUDIO_AUX)
+                    r->track->updateAuxRoute( -1, NULL );
             }      
       }
       else if (track->isMidiTrack())          // p3.3.50
@@ -3722,14 +3246,14 @@ void Song::removeTrack2(Track* track)
             const RouteList* rl = track->inRoutes();
             for (ciRoute r = rl->begin(); r != rl->end(); ++r)
             {
-                  //printf("Song::removeTrack2 %s in route port:%d\n", track->name().toLatin1().constData(), r->midiPort);   // p3.3.50
+                  //printf("Song::removeTrack2 %s in route port:%d\n", track->name().toLatin1().constData(), r->midiPort);   
                   Route src(track, r->channel);
                   MusEGlobal::midiPorts[r->midiPort].outRoutes()->removeRoute(src);
             }
             rl = track->outRoutes();
             for (ciRoute r = rl->begin(); r != rl->end(); ++r)
             {
-                  //printf("Song::removeTrack2 %s out route port:%d\n", track->name().toLatin1().constData(), r->midiPort);  // p3.3.50
+                  //printf("Song::removeTrack2 %s out route port:%d\n", track->name().toLatin1().constData(), r->midiPort);  
                   Route src(track, r->channel);
                   MusEGlobal::midiPorts[r->midiPort].inRoutes()->removeRoute(src);
             }      
@@ -3741,22 +3265,36 @@ void Song::removeTrack2(Track* track)
             {
                   //if(r->track == track)   
                   //  r->track->outRoutes()->removeRoute(*r);
-                  //printf("Song::removeTrack2 %s in route track:%s\n", track->name().toLatin1().constData(), r->track->name().toLatin1().constData());  // p3.3.50
+                  //printf("Song::removeTrack2 %s in route track:%s\n", track->name().toLatin1().constData(), r->track->name().toLatin1().constData());  
                   // p3.3.50
                   Route src(track, r->channel, r->channels);
                   src.remoteChannel = r->remoteChannel;
                   r->track->outRoutes()->removeRoute(src);
+                  // Is the source an Aux Track or else does it have Aux Tracks routed to it?
+                  // Update this track's aux ref count.     p4.0.37
+                  if(r->track->auxRefCount())
+                    track->updateAuxRoute( -r->track->auxRefCount(), NULL );
+                  else
+                  if(r->track->type() == Track::AUDIO_AUX)
+                    track->updateAuxRoute( -1, NULL );
             }
             rl = track->outRoutes();
             for (ciRoute r = rl->begin(); r != rl->end(); ++r)
             {
                   //if(r->track == track)  
                   //  r->track->inRoutes()->removeRoute(*r);
-                  //printf("Song::removeTrack2 %s out route track:%s\n", track->name().toLatin1().constData(), r->track->name().toLatin1().constData());  // p3.3.50
+                  //printf("Song::removeTrack2 %s out route track:%s\n", track->name().toLatin1().constData(), r->track->name().toLatin1().constData()); 
                   // p3.3.50
                   Route src(track, r->channel, r->channels);
                   src.remoteChannel = r->remoteChannel;
                   r->track->inRoutes()->removeRoute(src);
+                  // Is this track an Aux Track or else does it have Aux Tracks routed to it?
+                  // Update the other track's aux ref count and all tracks it is connected to.     p4.0.37
+                  if(track->auxRefCount())
+                    r->track->updateAuxRoute( -track->auxRefCount(), NULL );
+                  else
+                  if(track->type() == Track::AUDIO_AUX)
+                    r->track->updateAuxRoute( -1, NULL );
             }      
       }
       
@@ -3767,21 +3305,10 @@ void Song::removeTrack2(Track* track)
 //    non realtime part of removeTrack
 //---------------------------------------------------------
 
+//empty. gets executed after the realtime part
 void Song::removeTrack3(Track* /*track*/)//prevent of compiler warning: unused parameter
-      {
-      /*
-      switch(track->type()) {
-            case Track::AUDIO_SOFTSYNTH:
-                  {
-                  SynthI* s = (SynthI*) track;
-                  s->deactivate3();
-                  }
-                  break;
-            default:
-                  break;
-            }
-      */
-      }
+{
+}
 
 //---------------------------------------------------------
 //   executeScript
diff --git a/muse2/muse/song.h b/muse2/muse/song.h
index d6d3628c..047dbac3 100644
--- a/muse2/muse/song.h
+++ b/muse2/muse/song.h
@@ -37,6 +37,7 @@
 #include "al/sig.h"
 #include "undo.h"
 #include "track.h"
+#include "synth.h"
 
 class QAction;
 class QFont;
@@ -362,7 +363,7 @@ class Song : public QObject {
       //   Configuration
       //-----------------------------------------
 
-      SynthI* createSynthI(const QString& sclass, const QString& label = QString(), Track* insertAt = 0);
+      SynthI* createSynthI(const QString& sclass, const QString& label = QString(), Synth::Type type = Synth::SYNTH_TYPE_END, Track* insertAt = 0);
       
       void rescanAlsaPorts();
 
@@ -412,7 +413,7 @@ class Song : public QObject {
       void setQuantize(bool val);
       void panic();
       void seqSignal(int fd);
-      Track* addTrack(Track::TrackType type, Track* insertAt = 0);
+      Track* addTrack(Undo& operations, Track::TrackType type, Track* insertAt = 0);
       Track* addNewTrack(QAction* action, Track* insertAt = 0);
       QString getScriptPath(int id, bool delivered);
       void populateScriptMenu(QMenu* menuPlugins, QObject* receiver);
diff --git a/muse2/muse/songfile.cpp b/muse2/muse/songfile.cpp
index b5c3382d..5726345e 100644
--- a/muse2/muse/songfile.cpp
+++ b/muse2/muse/songfile.cpp
@@ -21,7 +21,6 @@
 //
 //=========================================================
 
-#include <assert.h>
 #include <uuid/uuid.h>
 #include <QProgressDialog>
 #include <QMessageBox>
@@ -29,6 +28,7 @@
 #include "app.h"
 #include "song.h"
 #include "arranger.h"
+#include "arrangerview.h"
 //#include "arranger/arranger.h"  // p4.0.2
 #include "cobject.h"
 #include "drumedit.h"
@@ -1302,10 +1302,10 @@ void MusE::readToplevels(MusECore::Xml& xml)
                               }
                         else if (tag == "scoreedit") {
                                 MusEGui::ScoreEdit* score = new MusEGui::ScoreEdit(this, 0, _arranger->cursorValue());
-                                score->show();
                                 toplevels.push_back(score);
-                                connect(score, SIGNAL(deleted(MusEGui::TopWin*)), SLOT(toplevelDeleted(MusEGui::TopWin*)));
-                                connect(score, SIGNAL(name_changed()), SLOT(scoreNamingChanged()));
+                                connect(score, SIGNAL(isDeleting(MusEGui::TopWin*)), SLOT(toplevelDeleting(MusEGui::TopWin*)));
+                                connect(score, SIGNAL(name_changed()), arrangerView, SLOT(scoreNamingChanged()));
+                                score->show();
                                 score->readStatus(xml);
                               }
                         else if (tag == "drumedit") {
@@ -1334,13 +1334,19 @@ void MusE::readToplevels(MusECore::Xml& xml)
                               }
                         else if (tag == "marker") {
                               showMarker(true);
-                              if (toplevels.back()->type()==MusEGui::TopWin::MARKER)
-                                toplevels.back()->readStatus(xml);
+                              TopWin* tw = toplevels.findType(TopWin::MARKER);
+                              if(!tw)
+                                xml.skip("marker");
+                              else
+                                tw->readStatus(xml);
                               }
                         else if (tag == "arrangerview") {
                               showArranger(true);
-                              if (toplevels.back()->type()==MusEGui::TopWin::ARRANGER)
-                                toplevels.back()->readStatus(xml);
+                              TopWin* tw = toplevels.findType(TopWin::ARRANGER);
+                              if(!tw)
+                                xml.skip("arrangerview");
+                              else
+                                tw->readStatus(xml);
                               }
                         else if (tag == "waveedit") {
                               if(!pl->empty())
@@ -1352,8 +1358,11 @@ void MusE::readToplevels(MusECore::Xml& xml)
                               }
                         else if (tag == "cliplist") {
                               startClipList(true);
-                              if (toplevels.back()->type()==MusEGui::TopWin::CLIPLIST)
-                                toplevels.back()->readStatus(xml);
+                              TopWin* tw = toplevels.findType(TopWin::CLIPLIST);
+                              if(!tw)
+                                xml.skip("cliplist");
+                              else
+                                tw->readStatus(xml);
                               }
                         else
                               xml.unknown("MusE");
@@ -1515,9 +1524,34 @@ void MusE::read(MusECore::Xml& xml, bool skipConfig, bool isTemplate)
                         else if (tag == "configuration")
                               if (skipConfig)
                                     //xml.skip(tag);
-                                    readConfiguration(xml,true /* only read sequencer settings */, false /* do NOT read global settings */);
+                                    readConfiguration(xml,true /* only read sequencer settings */, false /* do NOT read global settings, see below */);
+                                    // see even more below!
                               else
-                                    readConfiguration(xml, false, false /* do NOT read global settings */);
+                                    readConfiguration(xml, false, false /* do NOT read global settings, see below */);
+                        /* Explanation for why "do NOT read global settings":
+                         * if you would use true here, then muse would overwrite certain global config stuff
+                         * by the settings stored in the song. but you don't want this. imagine that you
+                         * send a friend a .med file. your friend opens it and baaam, his configuration is
+                         * garbled. why? well, because these readConfigurations here would have overwritten
+                         * parts (but not all) of his global config (like MDI/SDI, toolbar states etc.)
+                         * with the data stored in the song. (it IS stored there. dunny why, i find it pretty
+                         * senseless.)
+                         * 
+                         * If you've a problem which seems to be solved by replacing "false" with "true", i've
+                         * a better solution for you: go into conf.cpp, in void readConfiguration(Xml& xml, bool readOnlySequencer, bool doReadGlobalConfig)
+                         * (around line 525), look for a comment like this:
+                         * "Global and/or per-song config stuff ends here" (alternatively just search for
+                         * "----"). Your problem is probably that some non-global setting should be loaded but
+                         * is not. Fix it by either placing the else if (foo)... clause responsible for that
+                         * setting to be loaded into the first part, that is, before "else if (!doReadGlobalConfig)"
+                         * or (if the settings actually IS global and not per-song), ensure that the routine
+                         * which writes the global (and not the song-)configuration really writes that setting.
+                         * (it might happen that it formerly worked because it was written to the song instead
+                         *  of the global config by mistake, and now isn't loaded anymore. write it to the
+                         *  correct location.)
+                         * 
+                         *                                                                                -- flo93
+                         */
                         else if (tag == "song")
                         {
                               MusEGlobal::song->read(xml, isTemplate);
diff --git a/muse2/muse/structure.cpp b/muse2/muse/structure.cpp
index 90d02908..70b19540 100644
--- a/muse2/muse/structure.cpp
+++ b/muse2/muse/structure.cpp
@@ -137,7 +137,7 @@ void adjustGlobalLists(Undo& operations, int startPos, int diff)
 //    - cut master track
 //---------------------------------------------------------
 
-void globalCut()
+void globalCut(bool onlySelectedTracks)
       {
       int lpos = MusEGlobal::song->lpos();
       int rpos = MusEGlobal::song->rpos();
@@ -146,17 +146,11 @@ void globalCut()
 
       Undo operations;
       TrackList* tracks = MusEGlobal::song->tracks();
-      bool at_least_one_selected=false;
-      
-      for (iTrack it = tracks->begin(); it != tracks->end(); ++it)
-            if ( (*it)->selected() ) {
-                  at_least_one_selected=true;
-                  break;
-                  }
       
       for (iTrack it = tracks->begin(); it != tracks->end(); ++it) {
-            MidiTrack* track = dynamic_cast<MidiTrack*>(*it);
-            if (track == 0 || (at_least_one_selected && !track->selected()))
+            //MidiTrack* track = dynamic_cast<MidiTrack*>(*it);
+            Track* track = *it;
+            if (track == 0 || (onlySelectedTracks && !track->selected()))
                   continue;
             PartList* pl = track->parts();
             for (iPart p = pl->begin(); p != pl->end(); ++p) {
@@ -169,63 +163,61 @@ void globalCut()
                         operations.push_back(UndoOp(UndoOp::DeletePart,part));
                         }
                   else if ((t < lpos) && ((t+l) > lpos) && ((t+l) <= rpos)) {
-                        // remove part tail
-                        int len = lpos - t;
-                        MidiPart* nPart = new MidiPart(*(MidiPart*)part);
-                        nPart->setLenTick(len);
-                        //
-                        // cut Events in nPart
-                        EventList* el = nPart->events();
-                        for (iEvent ie = el->lower_bound(len); ie != el->end(); ++ie)
-                              operations.push_back(UndoOp(UndoOp::DeleteEvent,ie->second, nPart, false, false));
-
-                        operations.push_back(UndoOp(UndoOp::ModifyPart,part, nPart, true, true));
-                        }
+                      // remove part tail
+                      int len = lpos - t;
+                      Part *nPart;
+                      if (track->isMidiTrack())
+                        nPart = new MidiPart(*(MidiPart*)part);
+                      else
+                        nPart = new WavePart(*(WavePart*)part);
+
+                      nPart->setLenTick(len);
+                      //
+                      // cut Events in nPart
+                      EventList* el = nPart->events();
+                      for (iEvent ie = el->lower_bound(len); ie != el->end(); ++ie)
+                            operations.push_back(UndoOp(UndoOp::DeleteEvent,ie->second, nPart, false, false));
+
+                      operations.push_back(UndoOp(UndoOp::ModifyPart,part, nPart, true, true));
+                  }
                   else if ((t < lpos) && ((t+l) > lpos) && ((t+l) > rpos)) {
                         //----------------------
                         // remove part middle
                         //----------------------
+                        Part* p1;
+                        Part* p2;
+                        Part* p3;
+                        track->splitPart(part, lpos, p1, p2);
+                        delete p2;
+                        track->splitPart(part, rpos, p2, p3);
+                        delete p2;
+                        p3->setTick(lpos);
+                        p1->events()->incARef(-1); // the later MusEGlobal::song->applyOperationGroup() will increment it so we must decrement it first :/
+                        p3->events()->incARef(-1); // the later MusEGlobal::song->applyOperationGroup() will increment it so we must decrement it first :/
 
-                        MidiPart* nPart = new MidiPart(*(MidiPart*)part);
-                        EventList* el = nPart->events();
-                        iEvent is = el->lower_bound(lpos-t);
-                        iEvent ie = el->lower_bound(rpos-t); //lower bound, because we do NOT want to erase the events at rpos-t
-                        for (iEvent i = is; i != ie; ++i)
-                              operations.push_back(UndoOp(UndoOp::DeleteEvent,i->second, nPart, false, false));
-
-                        for (iEvent i = el->lower_bound(rpos-t); i != el->end(); ++i) {
-                              Event event = i->second;
-                              Event nEvent = event.clone();
-                              nEvent.setTick(nEvent.tick() - (rpos-lpos));
-                              // Indicate no undo, and do not do port controller values and clone parts.
-                              operations.push_back(UndoOp(UndoOp::ModifyEvent,nEvent, event, nPart, false, false));
-                              }
-                        nPart->setLenTick(l - (rpos-lpos));
                         // Indicate no undo, and do port controller values and clone parts.
-                        operations.push_back(UndoOp(UndoOp::ModifyPart,part, nPart, true, true));
+                        operations.push_back(UndoOp(UndoOp::ModifyPart,part, p1, true, true));
+                        operations.push_back(UndoOp(UndoOp::AddPart,p3));
                         }
                   else if ((t >= lpos) && (t < rpos) && (t+l) > rpos) {
                         // remove part head
                         
-                        MidiPart* nPart = new MidiPart(*(MidiPart*)part);
-                        EventList* el = nPart->events();
-                        iEvent i_end = el->lower_bound(rpos-t); //lower bound, because we do NOT want to erase the events at rpos-t
-                        for (iEvent it = el->begin(); it!=i_end; it++)
-                              operations.push_back(UndoOp(UndoOp::DeleteEvent,it->second, nPart, false, false));
-                        
-                        for (iEvent it = el->lower_bound(rpos-t); it!=el->end(); it++) {
-                              Event event = it->second;
-                              Event nEvent = event.clone();
-                              nEvent.setTick(nEvent.tick() - (rpos-t));
-                              // Indicate no undo, and do not do port controller values and clone parts.
-                              operations.push_back(UndoOp(UndoOp::ModifyEvent,nEvent, event, nPart, false, false));
-                              }
-                        
-                        nPart->setLenTick(l - (rpos-t));
-                        operations.push_back(UndoOp(UndoOp::ModifyPart,part, nPart, true, true));
+                        Part* p1;
+                        Part* p2;
+                        track->splitPart(part, rpos, p1, p2);
+                        delete p1;
+                        p2->setTick(lpos);
+                        p2->events()->incARef(-1); // the later MusEGlobal::song->applyOperationGroup() will increment it so we must decrement it first :/
+                        operations.push_back(UndoOp(UndoOp::ModifyPart,part, p2, true, true));
                         }
                   else if (t >= rpos) {
-                        MidiPart* nPart = new MidiPart(*(MidiPart*)part);
+                        // move part to the left
+                        Part *nPart;
+                        if (track->isMidiTrack())
+                          nPart = new MidiPart(*(MidiPart*)part);
+                        else
+                          nPart = new WavePart(*(WavePart*)part);
+                        //MidiPart* nPart = new MidiPart(*(MidiPart*)part);
                         int nt = part->tick();
                         nPart->setTick(nt - (rpos -lpos));
                         // Indicate no undo, and do port controller values but not clone parts.
@@ -246,33 +238,24 @@ void globalCut()
 //    - insert in master track
 //---------------------------------------------------------
 
-void globalInsert()
-      {
-      Undo operations=movePartsTotheRight(MusEGlobal::song->lpos(), MusEGlobal::song->rpos()-MusEGlobal::song->lpos(), true);
+void globalInsert(bool onlySelectedTracks)
+{
+      Undo operations=movePartsTotheRight(MusEGlobal::song->lpos(), MusEGlobal::song->rpos()-MusEGlobal::song->lpos(), onlySelectedTracks);
       MusEGlobal::song->applyOperationGroup(operations);
-      }
-
+}
 
 Undo movePartsTotheRight(unsigned int startTicks, int moveTicks, bool only_selected, set<Track*>* tracklist)
-      {
+{
       if (moveTicks<=0)
             return Undo();
 
       Undo operations;
       TrackList* tracks = MusEGlobal::song->tracks();
-      bool at_least_one_selected=false;
-      
-      for (iTrack it = tracks->begin(); it != tracks->end(); ++it)
-            if ( (*it)->selected() ) {
-                  at_least_one_selected=true;
-                  break;
-                  }
-      
       
       for (iTrack it = tracks->begin(); it != tracks->end(); ++it) {
-            MidiTrack* track = dynamic_cast<MidiTrack*>(*it);
+            Track* track = *it;
             if ( (track == 0) ||
-                 (only_selected && at_least_one_selected && !track->selected()) ||
+                 (only_selected && !track->selected()) ||
                  (tracklist && tracklist->find(track)==tracklist->end()) )
                   continue;
             PartList* pl = track->parts();
@@ -283,23 +266,23 @@ Undo movePartsTotheRight(unsigned int startTicks, int moveTicks, bool only_selec
                   if (t + l <= startTicks)
                         continue;
                   if (startTicks > t && startTicks < (t+l)) {
-                        MidiPart* nPart = new MidiPart(*(MidiPart*)part);
-                        nPart->setLenTick(l + moveTicks);
-                        EventList* el = nPart->events();
-
-                        for (riEvent i = el->rbegin(); i!=el->rend(); ++i)
-                        {
-                              if (i->first < startTicks-t)
-                                    break;
-                              Event event  = i->second;
-                              Event nEvent = i->second.clone();
-                              nEvent.setTick(nEvent.tick() + moveTicks);
-                              operations.push_back(UndoOp(UndoOp::ModifyEvent, nEvent, event, nPart, false, false));
-                              }
-                        operations.push_back(UndoOp(UndoOp::ModifyPart, part, nPart, true, true));
+                        // split part to insert new space
+                        Part* p1;
+                        Part* p2;
+                        track->splitPart(part, startTicks, p1, p2);
+                        p2->setTick(startTicks+moveTicks);
+                        p2->events()->incARef(-1); // the later MusEGlobal::song->applyOperationGroup() will increment it so we must decrement it first :/
+                        p1->events()->incARef(-1); // the later MusEGlobal::song->applyOperationGroup() will increment it so we must decrement it first :/
+
+                        operations.push_back(UndoOp(UndoOp::ModifyPart, part, p1, true, true));
+                        operations.push_back(UndoOp(UndoOp::AddPart, p2));
                         }
                   else if (t >= startTicks) {
-                        MidiPart* nPart = new MidiPart(*(MidiPart*)part);
+                        Part *nPart;
+                        if (track->isMidiTrack())
+                          nPart = new MidiPart(*(MidiPart*)part);
+                        else
+                          nPart = new WavePart(*(WavePart*)part);
                         nPart->setTick(t + moveTicks);
                         operations.push_back(UndoOp(UndoOp::ModifyPart, part, nPart, true, false));
                         }
@@ -317,47 +300,50 @@ Undo movePartsTotheRight(unsigned int startTicks, int moveTicks, bool only_selec
 //    - split all parts at the song position pointer
 //---------------------------------------------------------
 
-void globalSplit()
-      {
-      int pos = MusEGlobal::song->cpos();
-      Undo operations;
-      TrackList* tracks = MusEGlobal::song->tracks();
-      bool at_least_one_selected=false;
-      
-      for (iTrack it = tracks->begin(); it != tracks->end(); ++it)
-            if ( (*it)->selected() ) {
-                  at_least_one_selected=true;
-                  break;
-                  }
-      
-
-      for (iTrack it = tracks->begin(); it != tracks->end(); ++it) {
-            Track* track = *it;
-            if (track == 0 || (at_least_one_selected && !track->selected()))
-                  continue;
-
-            PartList* pl = track->parts();
-            for (iPart p = pl->begin(); p != pl->end(); ++p) {
-                  Part* part = p->second;
-                  int p1 = part->tick();
-                  int l0 = part->lenTick();
-                  if (pos > p1 && pos < (p1+l0)) {
-                        Part* p1;
-                        Part* p2;
-                        track->splitPart(part, pos, p1, p2);
+void globalSplit(bool onlySelectedTracks)
+{
+    Undo operations=partSplitter(MusEGlobal::song->cpos(), onlySelectedTracks);
+    MusEGlobal::song->applyOperationGroup(operations);
+}
 
-                        p1->events()->incARef(-1); // the later MusEGlobal::song->applyOperationGroup() will increment it
-                        p2->events()->incARef(-1); // so we must decrement it first :/
+Undo partSplitter(unsigned int pos, bool onlySelectedTracks)
+{
+    Undo operations;
+    TrackList* tracks = MusEGlobal::song->tracks();
+
+    for (iTrack it = tracks->begin(); it != tracks->end(); ++it) {
+        Track* track = *it;
+        if (track == 0 || (onlySelectedTracks && !track->selected()))
+              continue;
+
+        PartList* pl = track->parts();
+        for (iPart p = pl->begin(); p != pl->end(); ++p) {
+              Part* part = p->second;
+              unsigned int p1 = part->tick();
+              unsigned int l0 = part->lenTick();
+              if (pos > p1 && pos < (p1+l0)) {
+                    Part* p1;
+                    Part* p2;
+                    track->splitPart(part, pos, p1, p2);
+
+                    p1->events()->incARef(-1); // the later MusEGlobal::song->applyOperationGroup() will increment it
+                    p2->events()->incARef(-1); // so we must decrement it first :/
+
+                    //MusEGlobal::song->informAboutNewParts(part, p1); // is unneccessary because of ModifyPart
+                    MusEGlobal::song->informAboutNewParts(part, p2);
+                    operations.push_back(UndoOp(UndoOp::ModifyPart,part, p1, true, false));
+                    operations.push_back(UndoOp(UndoOp::AddPart,p2));
+                    if (MusEGlobal::debugMsg)
+                    {
+                          printf("in partSplitter: part1 %d\n",p1->events()->refCount());
+                          printf("in partSplitter: part2 %d\n",p2->events()->refCount());
+                          }
+                    break;
+                    }
+              }
+        }
+    return operations;
+}
 
-                        //MusEGlobal::song->informAboutNewParts(part, p1); // is unneccessary because of ModifyPart
-                        MusEGlobal::song->informAboutNewParts(part, p2);
-                        operations.push_back(UndoOp(UndoOp::ModifyPart,part, p1, true, false));
-                        operations.push_back(UndoOp(UndoOp::AddPart,p2));
-                        break;
-                        }
-                  }
-            }
-      MusEGlobal::song->applyOperationGroup(operations);
-      }
 
 } // namespace MusECore
diff --git a/muse2/muse/structure.h b/muse2/muse/structure.h
index b92c4e14..3a359dc0 100644
--- a/muse2/muse/structure.h
+++ b/muse2/muse/structure.h
@@ -28,10 +28,11 @@
 
 namespace MusECore {
 Undo movePartsTotheRight(unsigned int startTick, int moveTick, bool only_selected=false, std::set<Track*>* tracklist=NULL);
+Undo partSplitter(unsigned int tick, bool onlySelectedTracks=false);
 void adjustGlobalLists(Undo& operations, int startPos, int diff);
-void globalCut();
-void globalInsert();
-void globalSplit();
+void globalCut(bool onlySelectedTracks=false);
+void globalInsert(bool onlySelectedTracks=false);
+void globalSplit(bool onlySelectedTracks=false);
 }
 
 #endif
diff --git a/muse2/muse/synth.cpp b/muse2/muse/synth.cpp
index fd526931..7ab18bda 100644
--- a/muse2/muse/synth.cpp
+++ b/muse2/muse/synth.cpp
@@ -32,6 +32,7 @@
 #include <dlfcn.h>
 
 #include <QDir>
+#include <QString>
 //#include <QMenu>
 
 #include "app.h"
@@ -60,7 +61,20 @@ std::vector<MusECore::Synth*> synthis;  // array of available MusEGlobal::synthi
 namespace MusECore {
 
 extern void connectNodes(AudioTrack*, AudioTrack*);
-bool SynthI::_isVisible=true;
+bool SynthI::_isVisible=false;
+
+const char* synthTypes[] = { "METRONOME", "MESS", "DSSI", "VST", "UNKNOWN" };
+QString synthType2String(Synth::Type type) { return QString(synthTypes[type]); } 
+
+Synth::Type string2SynthType(const QString& type) 
+{ 
+  for(int i = 0; i < Synth::SYNTH_TYPE_END; ++i)
+  {  
+    if(synthType2String((Synth::Type)i) == type)
+      return (Synth::Type)i; 
+  }  
+  return Synth::SYNTH_TYPE_END;
+} 
 
 /*
 //---------------------------------------------------------
@@ -145,19 +159,17 @@ void MessSynthIF::setNativeGeometry(int x, int y, int w, int h)
 //    search for synthesizer base class
 //---------------------------------------------------------
 
-//static Synth* findSynth(const QString& sclass)
-static Synth* findSynth(const QString& sclass, const QString& label)
+static Synth* findSynth(const QString& sclass, const QString& label, Synth::Type type = Synth::SYNTH_TYPE_END)
       {
       for (std::vector<Synth*>::iterator i = MusEGlobal::synthis.begin();
          i != MusEGlobal::synthis.end(); ++i) 
          {
-            //if ((*i)->baseName() == sclass)
-            //if ((*i)->name() == sclass)
-            if ( ((*i)->baseName() == sclass) && (label.isEmpty() || ((*i)->name() == label)) )
-                  
-                  return *i;
+            if( ((*i)->baseName() == sclass) && 
+                (label.isEmpty() || ((*i)->name() == label)) && 
+                (type == Synth::SYNTH_TYPE_END || type == (*i)->synthType()) )
+              return *i;
          }
-      printf("synthi class:%s label:%s not found\n", sclass.toLatin1().constData(), label.toLatin1().constData());
+      printf("synthi type:%d class:%s label:%s not found\n", type, sclass.toLatin1().constData(), label.toLatin1().constData());
       return 0;
       }
 
@@ -166,10 +178,9 @@ static Synth* findSynth(const QString& sclass, const QString& label)
 //    create a synthesizer instance of class "label"
 //---------------------------------------------------------
 
-static SynthI* createSynthInstance(const QString& sclass, const QString& label)
+static SynthI* createSynthInstance(const QString& sclass, const QString& label, Synth::Type type = Synth::SYNTH_TYPE_END)
       {
-      //Synth* s = findSynth(sclass);
-      Synth* s = findSynth(sclass, label);
+      Synth* s = findSynth(sclass, label, type);
       SynthI* si = 0;
       if (s) {
             si = new SynthI();
@@ -652,13 +663,11 @@ void initMidiSynth()
 //    If insertAt is valid, inserts before insertAt. Else at the end after all tracks.
 //---------------------------------------------------------
 
-SynthI* Song::createSynthI(const QString& sclass, const QString& label, Track* insertAt)
+SynthI* Song::createSynthI(const QString& sclass, const QString& label, Synth::Type type, Track* insertAt)
       {
       //printf("Song::createSynthI calling ::createSynthI class:%s\n", sclass.toLatin1().constData());
       
-      //SynthI* si = ::createSynthI(sclass);
-      //SynthI* si = ::createSynthI(sclass, label);
-      SynthI* si = createSynthInstance(sclass, label);
+      SynthI* si = createSynthInstance(sclass, label, type);
       if(!si)
         return 0;
       //printf("Song::createSynthI created SynthI. Before insertTrack1...\n");
@@ -705,6 +714,9 @@ void SynthI::write(int level, Xml& xml) const
       {
       xml.tag(level++, "SynthI");
       AudioTrack::writeProperties(level, xml);
+      //xml.intTag(level, "synthType", synth()->synthType());
+      xml.strTag(level, "synthType", synthType2String(synth()->synthType()));
+
       xml.strTag(level, "class", synth()->baseName());
       
       // To support plugins like dssi-vst where all the baseNames are the same 'dssi-vst' and the label is the name of the dll file.
@@ -823,7 +835,8 @@ void SynthI::read(Xml& xml)
       {
       QString sclass;
       QString label;
-      
+      Synth::Type type = Synth::SYNTH_TYPE_END;
+
       int port = -1;
       bool startgui = false;
       bool startngui = false;
@@ -837,7 +850,10 @@ void SynthI::read(Xml& xml)
                   case Xml::End:
                         return;
                   case Xml::TagStart:
-                        if (tag == "class")
+                        if (tag == "synthType")
+                              //type = xml.parseInt();
+                              type = string2SynthType(xml.parse1());
+                        else if (tag == "class")
                               sclass = xml.parse1();
                         else if (tag == "label")
                               label  = xml.parse1();
@@ -866,8 +882,15 @@ void SynthI::read(Xml& xml)
                         break;
                   case Xml::TagEnd:
                         if (tag == "SynthI") {
-                              //Synth* s = findSynth(sclass);
-                              Synth* s = findSynth(sclass, label);
+                              
+                              // NOTICE: This is a hack to quietly change songs to use the new 'fluid_synth' name instead of 'fluidsynth'.
+                              //         Recent linker changes required the name change in fluidsynth's cmakelists. Nov 8, 2011 By Tim.
+                              if(sclass == QString("fluidsynth") && 
+                                 (type == Synth::SYNTH_TYPE_END || type == Synth::MESS_SYNTH) &&
+                                 (label.isEmpty() || label == QString("FluidSynth")) )
+                                sclass = QString("fluid_synth");
+                              
+                              Synth* s = findSynth(sclass, label, type);
                               if (s == 0)
                                     return;
                               if (initInstance(s, name()))
diff --git a/muse2/muse/synth.h b/muse2/muse/synth.h
index c5b63424..497395c0 100644
--- a/muse2/muse/synth.h
+++ b/muse2/muse/synth.h
@@ -72,6 +72,8 @@ class Synth {
       QString _version;
 
    public:
+      enum Type { METRO_SYNTH=0, MESS_SYNTH, DSSI_SYNTH, VST_SYNTH, SYNTH_TYPE_END };
+
       //Synth(const QFileInfo& fi);
       //Synth(const QFileInfo& fi, QString label);
       Synth(const QFileInfo& fi, QString label, QString descr, QString maker, QString ver);
@@ -80,6 +82,7 @@ class Synth {
       //virtual const char* description() const { return ""; }
       //virtual const char* version() const { return ""; }
 
+      virtual Type synthType() const = 0;
       int instances() const                            { return _instances; }
       virtual void incInstances(int val)               { _instances += val; }
       QString completeBaseName()             /*const*/ { return info.completeBaseName(); } // ddskrjo
@@ -117,6 +120,8 @@ class MessSynth : public Synth {
       //virtual const char* description() const;
       //virtual const char* version() const;
       
+      virtual Type synthType() const { return MESS_SYNTH; }
+
       //virtual void* instantiate();
       virtual void* instantiate(const QString&);
       
@@ -363,6 +368,9 @@ class MessSynthIF : public SynthIF {
       virtual int getControllerInfo(int id, const char** name, int* ctrl, int* min, int* max, int* initval);
       };
 
+extern QString synthType2String(Synth::Type);
+extern Synth::Type string2SynthType(const QString&); 
+      
 } // namespace MusECore
 
 namespace MusEGlobal {
diff --git a/muse2/muse/ticksynth.cpp b/muse2/muse/ticksynth.cpp
index 1edc0b12..6d3721ea 100644
--- a/muse2/muse/ticksynth.cpp
+++ b/muse2/muse/ticksynth.cpp
@@ -49,6 +49,7 @@ class MetronomeSynth : public Synth {
       //MetronomeSynth(const QFileInfo& fi) : Synth(fi, QString("Metronome")) {}
       MetronomeSynth(const QFileInfo& fi) : Synth(fi, QString("Metronome"), QString("Metronome"), QString(), QString()) {}
       virtual ~MetronomeSynth() {}
+      virtual Type synthType() const { return METRO_SYNTH; }
       virtual void incInstances(int) {}
       virtual void* instantiate();
       
diff --git a/muse2/muse/track.cpp b/muse2/muse/track.cpp
index 4140732d..07a2dff0 100644
--- a/muse2/muse/track.cpp
+++ b/muse2/muse/track.cpp
@@ -4,6 +4,7 @@
 //  $Id: track.cpp,v 1.34.2.11 2009/11/30 05:05:49 terminator356 Exp $
 //
 //  (C) Copyright 2000-2004 Werner Schweer (ws@seh.de)
+//  (C) Copyright 2011 Tim E. Real (terminator356 on sourceforge)
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -37,10 +38,12 @@
 namespace MusECore {
 
 //bool Track::_isVisible=true;
-unsigned int Track::_soloRefCnt = 0;
+unsigned int Track::_soloRefCnt  = 0;
 Track* Track::_tmpSoloChainTrack = 0;
 bool Track::_tmpSoloChainDoIns   = false;
 bool Track::_tmpSoloChainNoDec   = false;
+//bool Track::_tmpIsAuxProcessing  = false; 
+//int Track::_tmpIsAuxProcRefCount = 0; 
 
 const char* Track::_cname[] = {
       "Midi", "Drum", "NewStyleDrum", "Wave",
@@ -145,6 +148,34 @@ void removePortCtrlEvents(MidiTrack* t)
   }
 }
 
+//---------------------------------------------------------
+//   isVisible
+//---------------------------------------------------------
+bool Track::isVisible()
+{
+  switch (type())
+  {
+    case Track::AUDIO_AUX:
+        return AudioAux::visible();
+        break;
+    case Track::AUDIO_GROUP:
+        return AudioGroup::visible();
+    case Track::AUDIO_INPUT:
+        return AudioInput::visible();
+    case Track::AUDIO_OUTPUT:
+        return AudioOutput::visible();
+    case Track::WAVE:
+        return WaveTrack::visible();
+    case Track::MIDI:
+        return MidiTrack::visible();
+    case Track::AUDIO_SOFTSYNTH:
+        return AudioAux::visible();
+  default:
+    break;
+  }
+
+  return false;
+}
 
 
 //---------------------------------------------------------
@@ -172,6 +203,8 @@ int Track::y() const
 
 void Track::init()
       {
+      _auxRouteCount = 0;  
+      _nodeTraversed = false;
       _activity      = 0;
       _lastActivity  = 0;
       _recordFlag    = false;
@@ -206,6 +239,8 @@ Track::Track(Track::TrackType t)
 //Track::Track(const Track& t)
 Track::Track(const Track& t, bool cloneParts)
       {
+      _auxRouteCount = t._auxRouteCount;
+      _nodeTraversed = t._nodeTraversed;
       _activity     = t._activity;
       _lastActivity = t._lastActivity;
       _recordFlag   = t._recordFlag;
@@ -271,6 +306,8 @@ Track::~Track()
 
 Track& Track::operator=(const Track& t) 
 {
+      _auxRouteCount = t._auxRouteCount;
+      _nodeTraversed = t._nodeTraversed;
       _activity     = t._activity;
       _lastActivity = t._lastActivity;
       _recordFlag   = t._recordFlag;
@@ -388,6 +425,107 @@ void Track::dump() const
          _name.toLatin1().constData(), _type, _parts.size(), _selected);
       }
 
+//---------------------------------------------------------
+//   updateAuxRoute
+//   Internal use. Update all the Aux ref counts of tracks dst is connected to.
+//   If dst is valid, start traversal from there, not from this track.
+//---------------------------------------------------------
+
+void Track::updateAuxRoute(int refInc, Track* dst)
+{
+  //if(isMidiTrack() || _type == AUDIO_AUX)
+  if(isMidiTrack())
+    return;
+  
+  //printf("Track::updateAuxRoute %s _auxRouteCount:%d refInc:%d\n", name().toLatin1().constData(), _auxRouteCount, refInc); 
+
+  if(dst)
+  {  
+    _nodeTraversed = true;
+    dst->updateAuxRoute(refInc, NULL);
+    _nodeTraversed = false;
+    return;
+  }  
+  
+  if(_type == AUDIO_AUX)
+    return;
+  
+  if(_nodeTraversed)
+  {
+    fprintf(stderr, "Track::updateAuxRoute %s _auxRouteCount:%d refInc:%d :\n", name().toLatin1().constData(), _auxRouteCount, refInc); 
+    if(refInc >= 0)
+      fprintf(stderr, "  MusE Warning: Please check your routes: Circular path found!\n"); 
+    else
+      fprintf(stderr, "  MusE: Circular path removed.\n"); 
+    return;
+  }
+  
+  _nodeTraversed = true;
+  
+  _auxRouteCount += refInc;
+  if(_auxRouteCount < 0)
+  {
+    fprintf(stderr, "Track::updateAuxRoute Ref underflow! %s _auxRouteCount:%d refInc:%d\n", name().toLatin1().constData(), _auxRouteCount, refInc); 
+    //_auxRouteCount = 0;    
+  }
+  
+  for (iRoute i = _outRoutes.begin(); i != _outRoutes.end(); ++i) 
+  {
+    if( !(*i).isValid() || (*i).type != Route::TRACK_ROUTE )
+      continue;
+    Track* t = (*i).track;
+    //if(t->isMidiTrack())
+    //  continue;
+    t->updateAuxRoute(refInc, NULL);
+  }
+  
+  _nodeTraversed = false;
+}
+
+//---------------------------------------------------------
+//   isCircularRoute
+//   If dst is valid, start traversal from there, not from this track.
+//   Returns true if circular.
+//---------------------------------------------------------
+
+bool Track::isCircularRoute(Track* dst)
+{
+  //if(isMidiTrack() || _type == AUDIO_AUX)
+  //if(isMidiTrack())
+  //  return;
+  
+  bool rv = false;
+  
+  if(dst)
+  {  
+    _nodeTraversed = true;
+    rv = dst->isCircularRoute(NULL);
+    _nodeTraversed = false;
+    //if(rv)
+    //  fprintf(stderr, "  Circular route %s -> %s\n", name().toLatin1().constData(), dst->name().toLatin1().constData()); 
+    return rv;
+  }
+  
+  if(_nodeTraversed)
+    return true;
+  
+  _nodeTraversed = true;
+  
+  for (iRoute i = _outRoutes.begin(); i != _outRoutes.end(); ++i) 
+  {
+    if( !(*i).isValid() || (*i).type != Route::TRACK_ROUTE )
+      continue;
+    Track* t = (*i).track;
+    //if(t->isMidiTrack())
+    //  continue;
+    rv = t->isCircularRoute(NULL);
+    if(rv)
+      break; 
+  }
+  
+  _nodeTraversed = false;
+  return rv;
+}
 
 //---------------------------------------------------------
 //   MidiTrack
@@ -468,7 +606,6 @@ void MidiTrack::init()
       {
       _outPort       = 0;
       _outChannel    = (type()==NEW_DRUM) ? 9 : 0;
-      // Changed by Tim. p3.3.8
       //_inPortMask    = 0xffff;
       ///_inPortMask    = 0xffffffff;
       
@@ -569,7 +706,7 @@ void MidiTrack::setOutPortAndChannelAndUpdate(int port, int ch)
 //---------------------------------------------------------
 //   setInPortAndChannelMask
 //   For old song files with port mask (max 32 ports) and channel mask (16 channels), 
-//    before midi routing was added (the iR button). p3.3.48
+//    before midi routing was added (the iR button). 
 //---------------------------------------------------------
 
 void MidiTrack::setInPortAndChannelMask(unsigned int portmask, int chanmask) 
@@ -582,7 +719,7 @@ void MidiTrack::setInPortAndChannelMask(unsigned int portmask, int chanmask)
   
   for(int port = 0; port < 32; ++port)  // 32 is the old maximum number of ports.
   {
-    // p3.3.50 If the port was not used in the song file to begin with, just ignore it.
+    // If the port was not used in the song file to begin with, just ignore it.
     // This saves from having all of the first 32 ports' channels connected.
     if(!MusEGlobal::midiPorts[port].foundInSongFile())
       continue;
@@ -590,34 +727,18 @@ void MidiTrack::setInPortAndChannelMask(unsigned int portmask, int chanmask)
     //if(!(portmask & (1 << port)))
     //  continue;
     
-    // p3.3.50 Removed. Allow to connect to port with no device so user can change device later.
+    // Removed. Allow to connect to port with no device so user can change device later.
     //MidiPort* mp = &MusEGlobal::midiPorts[port];
     //MidiDevice* md = mp->device();
     //if(!md)
     //  continue;
         
-    //for(int ch = 0; ch < MIDI_CHANNELS; ++ch)  // p3.3.50 Removed.
-    //{
-      //if(!(chanmask & (1 << ch)))
-      //  continue;
-    
-      //Route aRoute(md, ch);
-      //Route bRoute(this, ch);
-      Route aRoute(port, chanmask);     // p3.3.50
+      Route aRoute(port, chanmask);     
       Route bRoute(this, chanmask);
     
-      // p3.3.50 Removed.
-      //iRoute iir = rl->begin();
-      //for(; iir != rl->end(); ++iir) 
-      //{
-        //if(*iir == aRoute)
-      //  if(iir->type == Route::MIDI_PORT_ROUTE && iir->midiPort == port)      // p3.3.50
-      //    break;
-      //}
-      
       // Route wanted?
       //if((portmask & (1 << port)) && (chanmask & (1 << ch)))
-      if(portmask & (1 << port))                                          // p3.3.50
+      if(portmask & (1 << port))                                          
       {
         // Route already exists?
         //if(iir != rl->end()) 
@@ -923,11 +1044,11 @@ void MidiTrack::read(Xml& xml)
                               //setInPortMask(xml.parseInt());
                               ///setInPortMask(xml.parseUInt());
                               //xml.skip(tag);                      // Obsolete. 
-                              portmask = xml.parseUInt();           // p3.3.48: Support old files.
+                              portmask = xml.parseUInt();           // Support old files.
                         else if (tag == "inchannelMap")
                               ///setInChannelMask(xml.parseInt());
                               //xml.skip(tag);                      // Obsolete.
-                              chanmask = xml.parseInt();            // p3.3.48: Support old files.
+                              chanmask = xml.parseInt();            // Support old files.
                         else if (tag == "locked")
                               _locked = xml.parseInt();
                         else if (tag == "echo")
@@ -950,7 +1071,7 @@ void MidiTrack::read(Xml& xml)
                   case Xml::TagEnd:
                         if (tag == "miditrack" || tag == "drumtrack" || tag == "newdrumtrack") 
                         {
-                          setInPortAndChannelMask(portmask, chanmask); // p3.3.48: Support old files.
+                          setInPortAndChannelMask(portmask, chanmask); // Support old files.
                           return;
                         }
                   default:
@@ -1184,15 +1305,15 @@ void Track::writeRouting(int level, Xml& xml) const
           // Support Midi Port to Audio Input track routes. p4.0.14 Tim. 
           if(r->type == Route::MIDI_PORT_ROUTE)
           {
-            s = QT_TRANSLATE_NOOP("@default", "Route");
+            s = "Route";
             if(r->channel != -1 && r->channel != 0)  
-              s += QString(QT_TRANSLATE_NOOP("@default", " channelMask=\"%1\"")).arg(r->channel);  // Use new channel mask.
+              s += QString(" channelMask=\"%1\"").arg(r->channel);  // Use new channel mask.
             xml.tag(level++, s.toLatin1().constData());
             
             xml.tag(level, "source mport=\"%d\"/", r->midiPort);
             
-            s = QT_TRANSLATE_NOOP("@default", "dest");
-            s += QString(QT_TRANSLATE_NOOP("@default", " name=\"%1\"/")).arg(Xml::xmlString(name()));
+            s = "dest";
+            s += QString(" name=\"%1\"/").arg(Xml::xmlString(name()));
             xml.tag(level, s.toLatin1().constData());
             
             xml.etag(level--, "Route");
@@ -1200,17 +1321,17 @@ void Track::writeRouting(int level, Xml& xml) const
           else
           if(!r->name().isEmpty())
           {
-            s = QT_TRANSLATE_NOOP("@default", "Route");
+            s = "Route";
             if(r->channel != -1)
-              s += QString(QT_TRANSLATE_NOOP("@default", " channel=\"%1\"")).arg(r->channel);
+              s += QString(" channel=\"%1\"").arg(r->channel);
             
             xml.tag(level++, s.toAscii().constData());
             
-            // p3.3.38 New routing scheme.
-            s = QT_TRANSLATE_NOOP("@default", "source");
+            // New routing scheme.
+            s = "source";
             if(r->type != Route::TRACK_ROUTE)
-              s += QString(QT_TRANSLATE_NOOP("@default", " type=\"%1\"")).arg(r->type);
-            s += QString(QT_TRANSLATE_NOOP("@default", " name=\"%1\"/")).arg(Xml::xmlString(r->name()));
+              s += QString(" type=\"%1\"").arg(r->type);
+            s += QString(" name=\"%1\"/").arg(Xml::xmlString(r->name()));
             xml.tag(level, s.toAscii().constData());
             
             xml.tag(level, "dest name=\"%s\"/", Xml::xmlString(name()).toLatin1().constData());
@@ -1228,42 +1349,42 @@ void Track::writeRouting(int level, Xml& xml) const
         if(r->type == Route::TRACK_ROUTE && r->track && r->track->type() == Track::AUDIO_INPUT) 
           continue;
             
-        if(r->midiPort != -1 || !r->name().isEmpty()) // p3.3.49
+        if(r->midiPort != -1 || !r->name().isEmpty()) 
         {
-          s = QT_TRANSLATE_NOOP("@default", "Route");
-          if(r->type == Route::MIDI_PORT_ROUTE)  // p3.3.50
+          s = "Route";
+          if(r->type == Route::MIDI_PORT_ROUTE)  
           {
             if(r->channel != -1 && r->channel != 0)
-              s += QString(QT_TRANSLATE_NOOP("@default", " channelMask=\"%1\"")).arg(r->channel);  // Use new channel mask.
+              s += QString(" channelMask=\"%1\"").arg(r->channel);  // Use new channel mask.
           }
           else
           {
             if(r->channel != -1)
-              s += QString(QT_TRANSLATE_NOOP("@default", " channel=\"%1\"")).arg(r->channel);
+              s += QString(" channel=\"%1\"").arg(r->channel);
           }    
           if(r->channels != -1)
-            s += QString(QT_TRANSLATE_NOOP("@default", " channels=\"%1\"")).arg(r->channels);
+            s += QString(" channels=\"%1\"").arg(r->channels);
           if(r->remoteChannel != -1)
-            s += QString(QT_TRANSLATE_NOOP("@default", " remch=\"%1\"")).arg(r->remoteChannel);
+            s += QString(" remch=\"%1\"").arg(r->remoteChannel);
           
           xml.tag(level++, s.toAscii().constData());
           
           // Allow for a regular mono or stereo track to feed a multi-channel synti. 
           xml.tag(level, "source name=\"%s\"/", Xml::xmlString(name()).toLatin1().constData());
           
-          s = QT_TRANSLATE_NOOP("@default", "dest");
+          s = "dest";
           
-          //if(r->type == Route::MIDI_DEVICE_ROUTE)                                      // p3.3.49 Obsolete since 1.1-RC2    
+          //if(r->type == Route::MIDI_DEVICE_ROUTE)                                      // Obsolete since 1.1-RC2    
           //  s += QString(QT_TRANSLATE_NOOP("@default", " devtype=\"%1\"")).arg(r->device->deviceType());  //
           //if(r->type != Route::TRACK_ROUTE)                                            //
           if(r->type != Route::TRACK_ROUTE && r->type != Route::MIDI_PORT_ROUTE)
-            s += QString(QT_TRANSLATE_NOOP("@default", " type=\"%1\"")).arg(r->type);
+            s += QString(" type=\"%1\"").arg(r->type);
 
           //s += QString(QT_TRANSLATE_NOOP("@default", " name=\"%1\"/")).arg(r->name());
-          if(r->type == Route::MIDI_PORT_ROUTE)                                          // p3.3.49 
-            s += QString(QT_TRANSLATE_NOOP("@default", " mport=\"%1\"/")).arg(r->midiPort);
+          if(r->type == Route::MIDI_PORT_ROUTE)                                          
+            s += QString(" mport=\"%1\"/").arg(r->midiPort);
           else  
-            s += QString(QT_TRANSLATE_NOOP("@default", " name=\"%1\"/")).arg(Xml::xmlString(r->name()));
+            s += QString(" name=\"%1\"/").arg(Xml::xmlString(r->name()));
             
           xml.tag(level, s.toAscii().constData());
           
diff --git a/muse2/muse/track.h b/muse2/muse/track.h
index bbda67e4..f2e12e3a 100644
--- a/muse2/muse/track.h
+++ b/muse2/muse/track.h
@@ -4,6 +4,7 @@
 //  $Id: track.h,v 1.39.2.17 2009/12/20 05:00:35 terminator356 Exp $
 //
 //  (C) Copyright 1999-2004 Werner Schweer (ws@seh.de)
+//  (C) Copyright 2011 Tim E. Real (terminator356 on sourceforge)
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -71,9 +72,10 @@ class Track {
       static bool _tmpSoloChainDoIns;
       static bool _tmpSoloChainNoDec;
       
-      // p3.3.38
       RouteList _inRoutes;
       RouteList _outRoutes;
+      bool _nodeTraversed;   // Internal anti circular route traversal flag.
+      int _auxRouteCount;    // Number of aux paths feeding this track.
       
       QString _name;
       bool _recordFlag;
@@ -90,8 +92,6 @@ class Track {
       
       int _activity;
       int _lastActivity;
-      //int _meter[MAX_CHANNELS];
-      //int _peak[MAX_CHANNELS];
       double _meter[MAX_CHANNELS];
       double _peak[MAX_CHANNELS];
 
@@ -148,7 +148,10 @@ class Track {
       bool noInRoute() const   { return _inRoutes.empty();  }
       bool noOutRoute() const  { return _outRoutes.empty(); }
       void writeRouting(int, Xml&) const;
-
+      bool isCircularRoute(Track* dst);   
+      int auxRefCount() const { return _auxRouteCount; }  // Number of Aux Tracks with routing paths to this track. 
+      void updateAuxRoute(int refInc, Track* dst);  // Internal use. 
+      
       PartList* parts()               { return &_parts; }
       const PartList* cparts() const  { return &_parts; }
       Part* findPart(unsigned tick);
@@ -169,20 +172,21 @@ class Track {
 
       virtual void setMute(bool val);
       virtual void setOff(bool val);
-      virtual void updateSoloStates(bool noDec) = 0;
-      virtual void updateInternalSoloStates();
-      void updateSoloState();
       void setInternalSolo(unsigned int val);
-      static void clearSoloRefCounts();
       virtual void setSolo(bool val) = 0;
       virtual bool isMute() const = 0;
-      
       unsigned int internalSolo() const  { return _internalSolo; }
       bool soloMode() const              { return _soloRefCnt; }
       bool solo() const                  { return _solo;         }
       bool mute() const                  { return _mute;         }
       bool off() const                   { return _off;          }
       bool recordFlag() const            { return _recordFlag;   }
+      //
+      // Internal use...
+      static void clearSoloRefCounts();
+      void updateSoloState();
+      virtual void updateSoloStates(bool noDec) = 0;  
+      virtual void updateInternalSoloStates();        
 
       int activity()                     { return _activity;     }
       void setActivity(int v)            { _activity = v;        }
@@ -191,8 +195,6 @@ class Track {
       void addActivity(int v)            { _activity += v;       }
       void resetPeaks();
       static void resetAllMeter();
-      //int meter(int ch) const  { return _meter[ch]; }
-      //int peak(int ch) const   { return _peak[ch]; }
       double meter(int ch) const  { return _meter[ch]; }
       double peak(int ch) const   { return _peak[ch]; }
       void resetMeter();
@@ -207,6 +209,7 @@ class Track {
       virtual AutomationType automationType() const    = 0;
       virtual void setAutomationType(AutomationType t) = 0;
       static void setVisible(bool) { }
+      bool isVisible();
 
       };
 
@@ -221,9 +224,9 @@ class MidiTrack : public Track {
       int _outPort;
       int _outChannel;
       //int _inPortMask;        
-      ///unsigned int _inPortMask; // bitmask of accepted record ports
-      ///int _inChannelMask;     // bitmask of accepted record channels
-      bool _recEcho;          // For midi (and audio). Whether to echo incoming record events to output device.
+      //unsigned int _inPortMask; // bitmask of accepted record ports
+      //int _inChannelMask;       // bitmask of accepted record channels
+      bool _recEcho;              // For midi (and audio). Whether to echo incoming record events to output device.
 
       EventList* _events;     // tmp Events during midi import
       MPEventList* _mpevents; // tmp Events druring recording
@@ -284,17 +287,17 @@ class MidiTrack : public Track {
       void setOutPortAndChannelAndUpdate(int /*port*/, int /*chan*/);
       
       //void setInPortMask(int i)       { _inPortMask = i; }
-      ///void setInPortMask(unsigned int i) { _inPortMask = i; }  // Obsolete
-      ///void setInChannelMask(int i)    { _inChannelMask = i; }  //
+      //void setInPortMask(unsigned int i) { _inPortMask = i; }  // Obsolete
+      //void setInChannelMask(int i)    { _inChannelMask = i; }  //
       // Backward compatibility: For reading old songs.
       void setInPortAndChannelMask(unsigned int /*portmask*/, int /*chanmask*/); 
       
       void setRecEcho(bool b)         { _recEcho = b; }
       int outPort() const             { return _outPort;     }
       //int inPortMask() const          { return _inPortMask;  }
-      ///unsigned int inPortMask() const { return _inPortMask;  }
+      //unsigned int inPortMask() const { return _inPortMask;  }
       int outChannel() const          { return _outChannel;  }
-      ///int inChannelMask() const       { return _inChannelMask; }
+      //int inChannelMask() const       { return _inChannelMask; }
       bool recEcho() const            { return _recEcho; }
 
       virtual bool isMute() const;
@@ -324,14 +327,10 @@ class MidiTrack : public Track {
       void readOurDrumMap(Xml& xml, bool dont_init=false);
       };
 
-} // namespace MusECore
-
-namespace MusECore {
-
 //---------------------------------------------------------
 //   AudioTrack
 //    this track can hold audio automation data and can
-//    hold tracktypes AUDIO, AUDIO_MASTER, AUDIO_GROUP,
+//    hold tracktypes WAVE, AUDIO_GROUP, AUDIO_OUTPUT,
 //    AUDIO_INPUT, AUDIO_SOFTSYNTH, AUDIO_AUX
 //---------------------------------------------------------
 
@@ -339,25 +338,19 @@ class AudioTrack : public Track {
       //friend class MidiTrack;
       //static unsigned int _soloRefCnt;
       
-      bool _haveData;
+      bool _haveData; // Whether we have data from a previous process call during current cycle.
       
       CtrlListList _controller;
       CtrlRecList _recEvents;     // recorded automation events
 
       bool _prefader;               // prefader metering
       std::vector<double> _auxSend;
-      Pipeline* _efxPipe;
-
-      AutomationType _automationType;
-
-      //RouteList _inRoutes;
-      //RouteList _outRoutes;
-      
-      bool _sendMetronome;
-      
       //void readRecfile(Xml& xml);
       void readAuxSend(Xml& xml);
-
+      
+      bool _sendMetronome;
+      AutomationType _automationType;
+      Pipeline* _efxPipe;
 
    protected:
       float** outBuffers;
@@ -370,7 +363,7 @@ class AudioTrack : public Track {
       SndFile* _recFile;
       Fifo fifo;                    // fifo -> _recFile
       bool _processed;
-
+      
    public:
       AudioTrack(TrackType t);
       //AudioTrack(TrackType t, int num_out_bufs = MAX_CHANNELS); 
@@ -450,12 +443,6 @@ class AudioTrack : public Track {
       void readVolume(Xml& xml);
       //void writeRouting(int, Xml&) const;
 
-      // routing
-      //RouteList* inRoutes()    { return &_inRoutes; }
-      //RouteList* outRoutes()   { return &_outRoutes; }
-      //bool noInRoute() const   { return _inRoutes.empty();  }
-      //bool noOutRoute() const  { return _outRoutes.empty(); }
-
       virtual void preProcessAlways() { _processed = false; }
       virtual void  addData(unsigned /*samplePos*/, int /*channels*/, int /*srcStartChan*/, int /*srcChannels*/, unsigned /*frames*/, float** /*buffer*/);
       virtual void copyData(unsigned /*samplePos*/, int /*channels*/, int /*srcStartChan*/, int /*srcChannels*/, unsigned /*frames*/, float** /*buffer*/);
diff --git a/muse2/muse/transport.cpp b/muse2/muse/transport.cpp
index 60494bc4..e978cb2e 100644
--- a/muse2/muse/transport.cpp
+++ b/muse2/muse/transport.cpp
@@ -45,13 +45,6 @@
 
 namespace MusEGui {
 
-static const char* recordTransportText   = QT_TRANSLATE_NOOP("@default", "Click this button to enable recording");
-static const char* stopTransportText     = QT_TRANSLATE_NOOP("@default", "Click this button to stop playback");
-static const char* playTransportText     = QT_TRANSLATE_NOOP("@default", "Click this button to start playback");
-static const char* startTransportText    = QT_TRANSLATE_NOOP("@default", "Click this button to rewind to start position");
-static const char* frewindTransportText  = QT_TRANSLATE_NOOP("@default", "Click this button to rewind");
-static const char* fforwardTransportText = QT_TRANSLATE_NOOP("@default", "Click this button to forward current play position");
-
 //---------------------------------------------------------
 //   toolButton
 //---------------------------------------------------------
@@ -401,25 +394,25 @@ Transport::Transport(QWidget* parent, const char* name)
       tb->setSpacing(0);
 
       buttons[0] = newButton(startIcon, tr("rewind to start"));
-      buttons[0]->setWhatsThis(tr(startTransportText));
+      buttons[0]->setWhatsThis(tr("Click this button to rewind to start position"));
 
       buttons[1] = newButton(frewindIcon, tr("rewind"));
       buttons[1]->setAutoRepeat(true);
-      buttons[1]->setWhatsThis(tr(frewindTransportText));
+      buttons[1]->setWhatsThis(tr("Click this button to rewind"));
 
       buttons[2] = newButton(fforwardIcon, tr("forward"));
       buttons[2]->setAutoRepeat(true);
-      buttons[2]->setWhatsThis(tr(fforwardTransportText));
+      buttons[2]->setWhatsThis(tr("Click this button to forward current play position"));
 
       buttons[3] = newButton(stopIcon, tr("stop"), true);
       buttons[3]->setChecked(true);     // set STOP
-      buttons[3]->setWhatsThis(tr(stopTransportText));
+      buttons[3]->setWhatsThis(tr("Click this button to stop playback"));
 
       buttons[4] = newButton(playIcon, tr("play"), true);
-      buttons[4]->setWhatsThis(tr(playTransportText));
+      buttons[4]->setWhatsThis(tr("Click this button to start playback"));
 
       buttons[5] = newButton(record_on_Icon, tr("record"), true);
-      buttons[5]->setWhatsThis(tr(recordTransportText));
+      buttons[5]->setWhatsThis(tr("Click this button to enable recording"));
 
       for (int i = 0; i < 6; ++i)
         {
diff --git a/muse2/muse/undo.cpp b/muse2/muse/undo.cpp
index 5bbcfcd8..06c190a2 100644
--- a/muse2/muse/undo.cpp
+++ b/muse2/muse/undo.cpp
@@ -50,8 +50,11 @@ const char* UndoOp::typeName()
             "AddTrack", "DeleteTrack", "ModifyTrack",
             "AddPart",  "DeletePart",  "ModifyPart",
             "AddEvent", "DeleteEvent", "ModifyEvent",
-            "AddTempo", "DeleteTempo", "AddSig", "DeleteSig",
-            "SwapTrack", "ModifyClip"
+            "AddTempo", "DeleteTempo",
+            "AddSig", "DeleteSig",
+            "AddKey", "DeleteKey",
+            "SwapTrack", "ModifyClip", "ModifyMarker",
+            "ModifySongLen", "DoNothing"
             };
       return name[type];
       }
@@ -95,6 +98,7 @@ void UndoOp::dump()
             case ModifyMarker:
             case AddKey:
             case DeleteKey:
+            case ModifySongLen:
             case DoNothing:
                   break;
             }
@@ -530,6 +534,10 @@ void Song::doUndo2()
                         MusEGlobal::keymap.addKey(i->a, (key_enum)i->b);
                         updateFlags |= SC_KEY;
                         break;
+                  case UndoOp::ModifySongLen:
+                        _len=i->b;
+                        updateFlags = -1; // set all flags
+                        break;
                   case UndoOp::ModifyClip:
                   case UndoOp::ModifyMarker:
                   case UndoOp::DoNothing:
@@ -767,6 +775,10 @@ void Song::doRedo2()
                         MusEGlobal::keymap.delKey(i->a);
                         updateFlags |= SC_KEY;
                         break;
+                  case UndoOp::ModifySongLen:
+                        _len=i->a;
+                        updateFlags = -1; // set all flags
+                        break;
                   case UndoOp::ModifyClip:
                   case UndoOp::ModifyMarker:
                   case UndoOp::DoNothing:
diff --git a/muse2/muse/undo.h b/muse2/muse/undo.h
index 42a80763..dffa1f55 100644
--- a/muse2/muse/undo.h
+++ b/muse2/muse/undo.h
@@ -54,6 +54,7 @@ struct UndoOp {
             SwapTrack,
             ModifyClip,
             ModifyMarker,
+            ModifySongLen, // a = new len, b = old len
             DoNothing
             };
       UndoType type;
diff --git a/muse2/muse/vst.h b/muse2/muse/vst.h
index b57b598d..b41e7137 100644
--- a/muse2/muse/vst.h
+++ b/muse2/muse/vst.h
@@ -50,6 +50,7 @@ class VstSynth : public Synth {
             }
       
       virtual ~VstSynth() {}
+      virtual Type synthType() const { return VST_SYNTH; }
       virtual void incInstances(int val);
       virtual void* instantiate();
       //virtual SynthIF* createSIF() const;
diff --git a/muse2/muse/wave.cpp b/muse2/muse/wave.cpp
index 06759441..f22f6f97 100644
--- a/muse2/muse/wave.cpp
+++ b/muse2/muse/wave.cpp
@@ -105,7 +105,7 @@ SndFile::~SndFile()
 bool SndFile::openRead()
       {
       if (openFlag) {
-            printf("SndFile:: alread open\n");
+            printf("SndFile:: already open\n");
             return false;
             }
       QString p = path();
@@ -468,7 +468,7 @@ size_t SndFile::readWithHeap(int srcChannels, float** dst, size_t n, bool overwr
       {
       float *buffer = new float[n * sfinfo.channels];
       int rn = readInternal(srcChannels,dst,n,overwrite, buffer);
-      delete buffer;
+      delete[] buffer;
       return rn;
       }
 
@@ -588,11 +588,11 @@ size_t SndFile::write(int srcChannels, float** src, size_t n)
       else {
             printf("SndFile:write channel mismatch %d -> %d\n",
                srcChannels, dstChannels);
-            delete buffer;
+            delete[] buffer;
             return 0;
             }
       int nbr = sf_writef_float(sf, buffer, n) ;
-      delete buffer;
+      delete[] buffer;
       return nbr;
       }
 
@@ -1120,6 +1120,22 @@ SndFileR::~SndFileR()
                 }
       }
 
+void SndFileList::clearDelete()
+{
+      // ~SndFile searches itself on the list (and will find for
+      // sure) and deletes the entry on its own.
+      while (!empty()) 
+            delete *begin();
+
+      /* this is wrong, because ~SndFile deletes itself from the
+       * list, causing the iterator to be invalidated -> fail.
+      for (SndFileList::iterator i = begin(); i != end(); ++i)
+            delete *i;
+      clear();
+      */
+}
+
+
 } // namespace MusECore
 
 namespace MusEGui {
diff --git a/muse2/muse/wave.h b/muse2/muse/wave.h
index 58e0ab87..535df939 100644
--- a/muse2/muse/wave.h
+++ b/muse2/muse/wave.h
@@ -182,11 +182,7 @@ class SndFileR {
 class SndFileList : public std::list<SndFile*> {
    public:
       SndFile* search(const QString& name);
-      void clearDelete() {
-            for (SndFileList::iterator i = begin(); i != end(); ++i)
-                  delete *i;
-            clear();
-            }
+      void clearDelete();
       };
 
 typedef SndFileList::iterator iSndFile;
diff --git a/muse2/muse/waveedit/waveedit.cpp b/muse2/muse/waveedit/waveedit.cpp
index 424f0688..1c1115b1 100644
--- a/muse2/muse/waveedit/waveedit.cpp
+++ b/muse2/muse/waveedit/waveedit.cpp
@@ -64,10 +64,12 @@ namespace MusEGui {
 
 void WaveEdit::closeEvent(QCloseEvent* e)
       {
+      _isDeleting = true;  // Set flag so certain signals like songChanged, which may cause crash during delete, can be ignored.
+      
       QSettings settings("MusE", "MusE-qt");
       //settings.setValue("Waveedit/geometry", saveGeometry());
       settings.setValue("Waveedit/windowState", saveState());
-      emit deleted(static_cast<TopWin*>(this));
+      emit isDeleting(static_cast<TopWin*>(this));
       e->accept();
       }
 
@@ -92,23 +94,23 @@ WaveEdit::WaveEdit(MusECore::PartList* pl)
 
       menuGain = menuFunctions->addMenu(tr("&Gain"));
       
-      act = menuGain->addAction(tr("200%"));
+      act = menuGain->addAction("200%");
       mapper->setMapping(act, CMD_GAIN_200);
       connect(act, SIGNAL(triggered()), mapper, SLOT(map()));
       
-      act = menuGain->addAction(tr("150%"));
+      act = menuGain->addAction("150%");
       mapper->setMapping(act, CMD_GAIN_150);
       connect(act, SIGNAL(triggered()), mapper, SLOT(map()));
       
-      act = menuGain->addAction(tr("75%"));
+      act = menuGain->addAction("75%");
       mapper->setMapping(act, CMD_GAIN_75);
       connect(act, SIGNAL(triggered()), mapper, SLOT(map()));
       
-      act = menuGain->addAction(tr("50%"));
+      act = menuGain->addAction("50%");
       mapper->setMapping(act, CMD_GAIN_50);
       connect(act, SIGNAL(triggered()), mapper, SLOT(map()));
       
-      act = menuGain->addAction(tr("25%"));
+      act = menuGain->addAction("25%");
       mapper->setMapping(act, CMD_GAIN_25);
       connect(act, SIGNAL(triggered()), mapper, SLOT(map()));
       
@@ -287,6 +289,7 @@ WaveEdit::WaveEdit(MusECore::PartList* pl)
       }
 
       initTopwinState();
+      MusEGlobal::muse->topwinMenuInited(this);
       }
 
 void WaveEdit::initShortcuts()
@@ -458,7 +461,9 @@ void WaveEdit::readStatus(MusECore::Xml& xml)
 
 void WaveEdit::songChanged1(int bits)
       {
-        
+        if(_isDeleting)  // Ignore while while deleting to prevent crash.
+          return;
+
         if (bits & SC_SOLO)
         {
           MusECore::WavePart* part = (MusECore::WavePart*)(parts()->begin()->second);
diff --git a/muse2/muse/waveedit/waveedit.h b/muse2/muse/waveedit/waveedit.h
index b40aa93a..85e71a60 100644
--- a/muse2/muse/waveedit/waveedit.h
+++ b/muse2/muse/waveedit/waveedit.h
@@ -94,7 +94,7 @@ class WaveEdit : public MidiEditor {
 
 
    signals:
-      void deleted(MusEGui::TopWin*);
+      void isDeleting(MusEGui::TopWin*);
 
    public:
       WaveEdit(MusECore::PartList*);
diff --git a/muse2/muse/wavetrack.cpp b/muse2/muse/wavetrack.cpp
index 9edeffb6..0d699cbe 100644
--- a/muse2/muse/wavetrack.cpp
+++ b/muse2/muse/wavetrack.cpp
@@ -229,8 +229,8 @@ bool WaveTrack::getData(unsigned framePos, int channels, unsigned nframe, float*
             ciRoute i = irl->begin();
             if(i->track->isMidiTrack())
             {
-              if(MusEGlobal::debugMsg)
-                printf("WaveTrack::getData: Error: First route is a midi track route!\n");
+              //if(MusEGlobal::debugMsg)
+              //  printf("WaveTrack::getData: Error: First route is a midi track route!\n");
               return false;
             }
             // p3.3.38
@@ -246,8 +246,8 @@ bool WaveTrack::getData(unsigned framePos, int channels, unsigned nframe, float*
             {
               if(i->track->isMidiTrack())
               {
-                if(MusEGlobal::debugMsg)
-                  printf("WaveTrack::getData: Error: Route is a midi track route!\n");
+                //if(MusEGlobal::debugMsg)
+                //  printf("WaveTrack::getData: Error: Route is a midi track route!\n");
                 //return false;
                 continue;
               }
diff --git a/muse2/muse/widgets/citem.h b/muse2/muse/widgets/citem.h
index 1777eb23..199d18b0 100644
--- a/muse2/muse/widgets/citem.h
+++ b/muse2/muse/widgets/citem.h
@@ -90,7 +90,7 @@ class CItem {
       };
 
 typedef std::multimap<int, CItem*, std::less<int> >::iterator iCItem;
-//typedef std::multimap<int, CItem*, std::less<int> >::const_iterator ciCItem;
+typedef std::multimap<int, CItem*, std::less<int> >::const_iterator ciCItem;
 typedef std::multimap<int, CItem*, std::less<int> >::const_reverse_iterator rciCItem;
 
 //---------------------------------------------------------
diff --git a/muse2/muse/widgets/comboQuant.cpp b/muse2/muse/widgets/comboQuant.cpp
index aee7ad5c..6d8dc30c 100644
--- a/muse2/muse/widgets/comboQuant.cpp
+++ b/muse2/muse/widgets/comboQuant.cpp
@@ -37,9 +37,9 @@ static int quantTable[] = {
       };
 
 static const char* quantStrings[] = {
-      QT_TRANSLATE_NOOP("@default", "Off"), "64T", "32T", "16T", "8T", "4T", "2T", "1T",
-      QT_TRANSLATE_NOOP("@default", "Off"), "64",  "32",  "16",  "8",  "4",  "2",  "1",
-      QT_TRANSLATE_NOOP("@default", "Off"), "64.", "32.", "16.", "8.", "4.", "2.", "1."
+      QT_TRANSLATE_NOOP("MusEGui::ComboQuant", "Off"), "64T", "32T", "16T", "8T", "4T", "2T", "1T",
+      QT_TRANSLATE_NOOP("MusEGui::ComboQuant", "Off"), "64",  "32",  "16",  "8",  "4",  "2",  "1",
+      QT_TRANSLATE_NOOP("MusEGui::ComboQuant", "Off"), "64.", "32.", "16.", "8.", "4.", "2.", "1."
       };
 
 //---------------------------------------------------------
diff --git a/muse2/muse/widgets/configmidifilebase.ui b/muse2/muse/widgets/configmidifilebase.ui
index c050450c..3eb7063e 100644
--- a/muse2/muse/widgets/configmidifilebase.ui
+++ b/muse2/muse/widgets/configmidifilebase.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>548</width>
-    <height>346</height>
+    <width>546</width>
+    <height>367</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -28,8 +28,8 @@
      <property name="title">
       <string>Import:</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout">
-      <item>
+     <layout class="QGridLayout">
+      <item row="0" column="0">
        <widget class="QCheckBox" name="splitPartsCheckBox">
         <property name="toolTip">
          <string>Split tracks into parts, or one single part</string>
@@ -42,7 +42,7 @@
         </property>
        </widget>
       </item>
-      <item>
+      <item row="1" column="0">
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
          <widget class="QRadioButton" name="newDrumsCheckbox">
@@ -78,10 +78,10 @@
       <string>Export:</string>
      </property>
      <layout class="QGridLayout">
-      <item row="2" column="1">
+      <item row="3" column="1">
        <widget class="QLineEdit" name="copyrightEdit"/>
       </item>
-      <item row="1" column="1">
+      <item row="2" column="1">
        <widget class="QComboBox" name="divisionCombo">
         <item>
          <property name="text">
@@ -100,7 +100,7 @@
         </item>
        </widget>
       </item>
-      <item row="3" column="0" colspan="2">
+      <item row="4" column="0" colspan="2">
        <widget class="QCheckBox" name="extendedFormat">
         <property name="enabled">
          <bool>true</bool>
@@ -110,7 +110,7 @@
         </property>
        </widget>
       </item>
-      <item row="4" column="0" colspan="2">
+      <item row="5" column="0" colspan="2">
        <widget class="QCheckBox" name="twoByteTimeSigs">
         <property name="text">
          <string>Use &amp;2-byte time signatures instead of standard 4</string>
@@ -120,7 +120,7 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="0">
+      <item row="3" column="0">
        <widget class="QLabel" name="textLabel2">
         <property name="text">
          <string>Copyright:</string>
@@ -140,7 +140,23 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="0">
+      <item row="1" column="0" colspan="2">
+       <widget class="QLabel" name="textLabel4">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>Note: Format 0 uses the FIRST midi track's name/comment in the arranger</string>
+        </property>
+        <property name="wordWrap">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
        <widget class="QLabel" name="textLabel1">
         <property name="text">
          <string>Division:</string>
@@ -150,7 +166,7 @@
         </property>
        </widget>
       </item>
-      <item row="5" column="0" colspan="2">
+      <item row="6" column="0" colspan="2">
        <widget class="QCheckBox" name="optNoteOffs">
         <property name="text">
          <string>Save space by replacing note-offs with &amp;zero velocity note-ons</string>
diff --git a/muse2/muse/widgets/filedialog.cpp b/muse2/muse/widgets/filedialog.cpp
index df391b45..7f2c1681 100644
--- a/muse2/muse/widgets/filedialog.cpp
+++ b/muse2/muse/widgets/filedialog.cpp
@@ -33,6 +33,7 @@
 #include "filedialog.h"
 #include "../globals.h"
 #include "gconfig.h"
+#include "helper.h"
 
 namespace MusEGui {
 
@@ -122,11 +123,13 @@ void MFileDialog::userToggled(bool flag)
 
 
             if (lastUserDir.isEmpty()) {
-                  lastUserDir = MusEGlobal::museUser + QString("/") + baseDir; // Initialize if first time
+                  //lastUserDir = MusEGlobal::museUser + QString("/") + baseDir; // Initialize if first time
+                  lastUserDir = MusEGlobal::configPath + QString("/") + baseDir; // Initialize if first time    // p4.0.39
                   }
 
             if (testDirCreate(this, lastUserDir))
-                  setDirectory(MusEGlobal::museUser);
+                  //setDirectory(MusEGlobal::museUser);
+                  setDirectory(MusEGlobal::configPath);  // p4.0.39
             else
                   setDirectory(lastUserDir);
 
@@ -269,40 +272,14 @@ void MFileDialog::directoryChanged(const QString&)
             }
       }
 
-
-//---------------------------------------------------------
-//   getFilterExtension
-//---------------------------------------------------------
-
-QString getFilterExtension(const QString &filter)
-{
-  //
-  // Return the first extension found. Must contain at least one * character.
-  //
-  
-  int pos = filter.indexOf('*');
-  if(pos == -1)
-    return QString(); 
-  
-  QString filt;
-  int len = filter.length();
-  ++pos;
-  for( ; pos < len; ++pos)
-  {
-    QChar c = filter[pos];
-    if((c == ')') || (c == ';') || (c == ',') || (c == ' '))
-      break; 
-    filt += filter[pos];
-  }
-  return filt;
-}
-
 //---------------------------------------------------------
 //   getOpenFileName
 //---------------------------------------------------------
-QString getOpenFileName(const QString &startWith,
-                        const QStringList& filters, QWidget* parent, const QString& name, bool* all, MFileDialog::ViewType viewType)
+QString getOpenFileName(const QString &startWith, const char** filters_chararray,
+            QWidget* parent, const QString& name, bool* all, MFileDialog::ViewType viewType)
       {
+      QStringList filters = localizedStringListFromCharArray(filters_chararray, "file_patterns");
+      
       QString initialSelection;  // FIXME Tim.
       MFileDialog *dlg = new MFileDialog(startWith, QString::null, parent, false);
       dlg->setNameFilters(filters);
@@ -339,9 +316,10 @@ QString getOpenFileName(const QString &startWith,
 //---------------------------------------------------------
 
 QString getSaveFileName(const QString &startWith,
-   //const char** filters, QWidget* parent, const QString& name)
-   const QStringList& filters, QWidget* parent, const QString& name)
+   const char** filters_chararray, QWidget* parent, const QString& name)
       {
+      QStringList filters = localizedStringListFromCharArray(filters_chararray, "file_patterns");
+      
       MFileDialog *dlg = new MFileDialog(startWith, QString::null, parent, true);
       dlg->setNameFilters(filters);
       dlg->setWindowTitle(name);
@@ -404,9 +382,9 @@ QString getSaveFileName(const QString &startWith,
 //---------------------------------------------------------
 
 QString getImageFileName(const QString& startWith,
-   //const char** filters, QWidget* parent, const QString& name)
-   const QStringList& filters, QWidget* parent, const QString& name)
+   const char** filters_chararray, QWidget* parent, const QString& name)
       {
+      QStringList filters = localizedStringListFromCharArray(filters_chararray, "file_patterns");
       QString initialSelection;
 	QString* workingDirectory = new QString(QDir::currentPath());
       if (!startWith.isEmpty() ) {
@@ -505,10 +483,12 @@ FILE* fileOpen(QWidget* parent, QString name, const QString& ext,
       FILE* fp = 0;
       if (popenFlag) {
             if (strcmp(mode, "r") == 0)
-                  zip += QString(" -d < ");
+                  //zip += QString(" -d < ");
+                  zip += QString(" -d < \"");    // p4.0.40
             else
-                  zip += QString(" > ");
-            zip += name;
+                  zip += QString(" > \"");
+            //zip += name;
+            zip = zip + name + QString("\"");    // p4.0.40
             fp  = popen(zip.toAscii().data(), mode);
             }
       else {
@@ -547,15 +527,14 @@ MFile::~MFile()
 //   open
 //---------------------------------------------------------
 
-//FILE* MFile::open(const char* mode, const char** pattern,
-FILE* MFile::open(const char* mode, const QStringList& pattern,
+FILE* MFile::open(const char* mode, const char** patterns_chararray,
    QWidget* parent, bool noError, bool warnIfOverwrite, const QString& caption)
       {
       QString name;
       if (strcmp(mode, "r") == 0)
-           name = getOpenFileName(path, pattern, parent, caption, 0);
+           name = getOpenFileName(path, patterns_chararray, parent, caption, 0);
       else
-           name = getSaveFileName(path, pattern, parent, caption);
+           name = getSaveFileName(path, patterns_chararray, parent, caption);
       if (name.isEmpty())
             return 0;
       f = fileOpen(parent, name, ext, mode, isPopen, noError,
diff --git a/muse2/muse/widgets/filedialog.h b/muse2/muse/widgets/filedialog.h
index e5687494..b4e21e2c 100644
--- a/muse2/muse/widgets/filedialog.h
+++ b/muse2/muse/widgets/filedialog.h
@@ -3,6 +3,7 @@
 //  Linux Music Editor
 //    $Id: filedialog.h,v 1.2.2.2 2008/01/19 13:33:46 wschweer Exp $
 //  (C) Copyright 2000 Werner Schweer (ws@seh.de)
+//  (C) Copyright 2011 Tim E. Real (terminator356 on sourceforge)
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -24,8 +25,6 @@
 
 #include "ui_fdialogbuttons.h"
 
-class QStringList;
-
 namespace MusEGui {
 
 //---------------------------------------------------------
@@ -91,14 +90,11 @@ class ContentsPreview : public QWidget, public Q3FilePreview {
       };
 */
 
-//QString getSaveFileName(const QString& startWidth, const char** filter,
-QString getSaveFileName(const QString& startWidth, const QStringList& filters,
+QString getSaveFileName(const QString& startWidth, const char** filters,
          QWidget* parent, const QString& name);
-//QString getOpenFileName(const QString& startWidth, const char** filter,
-QString getOpenFileName(const QString& startWidth, const QStringList& filters,
+QString getOpenFileName(const QString& startWidth, const char** filters,
                         QWidget* parent, const QString& name, bool* openAll, MFileDialog::ViewType viewType = MFileDialog::PROJECT_VIEW);
-//QString getImageFileName(const QString& startWith, const char** filters, 
-QString getImageFileName(const QString& startWith, const QStringList& filters, 
+QString getImageFileName(const QString& startWith, const char** filters, 
          QWidget* parent, const QString& name);
 
 FILE* fileOpen(QWidget*, QString, const QString&,
@@ -119,8 +115,7 @@ class MFile {
    public:
       MFile(const QString& path, const QString& ext);
       ~MFile();
-      //FILE* open(const char* mode, const char** pattern,
-      FILE* open(const char* mode, const QStringList& pattern,
+      FILE* open(const char* mode, const char** patterns,
          QWidget* parent, bool noError,
          bool warnIfOverwrite, const QString& caption);
       };
diff --git a/muse2/muse/widgets/function_dialogs/quantbase.ui b/muse2/muse/widgets/function_dialogs/quantbase.ui
index 973be7b8..31173e46 100644
--- a/muse2/muse/widgets/function_dialogs/quantbase.ui
+++ b/muse2/muse/widgets/function_dialogs/quantbase.ui
@@ -157,7 +157,7 @@
          <bool>false</bool>
         </property>
         <property name="currentIndex">
-         <number>3</number>
+         <number>0</number>
         </property>
         <property name="frame">
          <bool>true</bool>
@@ -174,7 +174,12 @@
         </item>
         <item>
          <property name="text">
-          <string>Quarter</string>
+          <string>4th</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>4th Triplet</string>
          </property>
         </item>
         <item>
@@ -184,14 +189,29 @@
         </item>
         <item>
          <property name="text">
+          <string>8th Triplet</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
           <string>16th</string>
          </property>
         </item>
         <item>
          <property name="text">
+          <string>16th Triplet</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
           <string>32th</string>
          </property>
         </item>
+        <item>
+         <property name="text">
+          <string>32th Triplet</string>
+         </property>
+        </item>
        </widget>
       </item>
       <item row="3" column="0">
diff --git a/muse2/muse/widgets/function_dialogs/quantize.cpp b/muse2/muse/widgets/function_dialogs/quantize.cpp
index df7c0298..7233c2b8 100644
--- a/muse2/muse/widgets/function_dialogs/quantize.cpp
+++ b/muse2/muse/widgets/function_dialogs/quantize.cpp
@@ -26,6 +26,20 @@
 
 namespace MusEGui {
 
+int rasterVals[] = {
+  1, // Whole note divisor
+  2, // Half note divisor
+  4, // 4th note divisor
+  6, // 4thT divisor
+  8, // 8th divisor
+  12,//8thT divisor
+  16,// ...
+  24,
+  32,
+  48,
+  64
+};
+
 Quantize::Quantize(QWidget* parent)
 	: QDialog(parent)
 {
@@ -44,7 +58,7 @@ void Quantize::pull_values()
 	range = range_group->checkedId();
 	strength = strength_spinbox->value();
 	threshold = threshold_spinbox->value();
-	raster_power2 = raster_combobox->currentIndex();
+  raster_index = raster_combobox->currentIndex();
 	quant_len = len_checkbox->isChecked();
 	swing = swing_spinbox->value();
 }
@@ -62,7 +76,7 @@ int Quantize::exec()
 	range_group->button(range)->setChecked(true);
 	strength_spinbox->setValue(strength);
 	threshold_spinbox->setValue(threshold);
-	raster_combobox->setCurrentIndex(raster_power2);
+  raster_combobox->setCurrentIndex(raster_index);
 	len_checkbox->setChecked(quant_len);
 	swing_spinbox->setValue(swing);
 	
@@ -88,7 +102,7 @@ void Quantize::read_configuration(MusECore::Xml& xml)
 				else if (tag == "threshold")
 					threshold=xml.parseInt();
 				else if (tag == "raster")
-					raster_power2=xml.parseInt();
+          raster_index=xml.parseInt();
 				else if (tag == "swing")
 					swing=xml.parseInt();
 				else if (tag == "quant_len")
@@ -113,7 +127,7 @@ void Quantize::write_configuration(int level, MusECore::Xml& xml)
 	xml.intTag(level, "range", range);
 	xml.intTag(level, "strength", strength);
 	xml.intTag(level, "threshold", threshold);
-	xml.intTag(level, "raster", raster_power2);
+  xml.intTag(level, "raster", raster_index);
 	xml.intTag(level, "swing", swing);
 	xml.intTag(level, "quant_len", quant_len);
 	xml.tag(level, "/quantize");
diff --git a/muse2/muse/widgets/function_dialogs/quantize.h b/muse2/muse/widgets/function_dialogs/quantize.h
index 6ce74215..b5229f9e 100644
--- a/muse2/muse/widgets/function_dialogs/quantize.h
+++ b/muse2/muse/widgets/function_dialogs/quantize.h
@@ -33,6 +33,7 @@ class Xml;
 
 namespace MusEGui {
 
+
 class Quantize : public QDialog, public Ui::QuantBase
 {
  	Q_OBJECT
@@ -50,18 +51,18 @@ class Quantize : public QDialog, public Ui::QuantBase
 		int range;
 		int strength;
 		int threshold;
-		int raster_power2;
+    int raster_index;
 		int swing;
 		bool quant_len;
 		
 		void read_configuration(MusECore::Xml& xml);
 		void write_configuration(int level, MusECore::Xml& xml);
 		
-		
 	public slots:
 		int exec();
 };
 
+extern int rasterVals[];
 } // namespace MusEGui
 
 #endif
diff --git a/muse2/muse/widgets/genset.cpp b/muse2/muse/widgets/genset.cpp
index dd91e9ec..df7dea78 100644
--- a/muse2/muse/widgets/genset.cpp
+++ b/muse2/muse/widgets/genset.cpp
@@ -4,6 +4,7 @@
 //  $Id: genset.cpp,v 1.7.2.8 2009/12/01 03:52:40 terminator356 Exp $
 //
 //  (C) Copyright 2001-2004 Werner Schweer (ws@seh.de)
+//  (C) Copyright 2011 Tim E. Real (terminator356 on sourceforge)
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -24,8 +25,10 @@
 #include <stdio.h>
 
 #include <QFileDialog>
+#include <QFileInfo>
 #include <QRect>
 #include <QShowEvent>
+#include <QString>
 
 #include "genset.h"
 #include "app.h"
@@ -33,6 +36,7 @@
 #include "midiseq.h"
 #include "globals.h"
 #include "icons.h"
+#include "helper.h"
 
 namespace MusEGui {
 
@@ -100,12 +104,6 @@ GlobalSettingsConfig::GlobalSettingsConfig(QWidget* parent)
                   }
             }
 
-      userInstrumentsPath->setText(MusEGlobal::config.userInstrumentsDir);
-      selectInstrumentsDirButton->setIcon(*openIcon);
-      defaultInstrumentsDirButton->setIcon(*undoIcon);
-      connect(selectInstrumentsDirButton, SIGNAL(clicked()), SLOT(selectInstrumentsPath()));
-      connect(defaultInstrumentsDirButton, SIGNAL(clicked()), SLOT(defaultInstrumentsPath()));
-
       guiRefreshSelect->setValue(MusEGlobal::config.guiRefresh);
       minSliderSelect->setValue(int(MusEGlobal::config.minSlider));
       minMeterSelect->setValue(MusEGlobal::config.minMeter);
@@ -126,6 +124,9 @@ GlobalSettingsConfig::GlobalSettingsConfig(QWidget* parent)
 Period affects midi playback resolution. 
 Shorter periods are desirable.</string>
             </property>                       */
+
+      projDirEntry->setText(MusEGlobal::config.projectBaseFolder);
+      projDirOpenToolButton->setIcon(*openIcon);
       
       startSongEntry->setText(MusEGlobal::config.startSong);
       startSongGroup->button(MusEGlobal::config.startMode)->setChecked(true);
@@ -180,9 +181,14 @@ Shorter periods are desirable.</string>
       popsDefStayOpenCheckBox->setChecked(MusEGlobal::config.popupsDefaultStayOpen);
       lmbDecreasesCheckBox->setChecked(MusEGlobal::config.leftMouseButtonCanDecrease);
       rangeMarkerWithoutMMBCheckBox->setChecked(MusEGlobal::config.rangeMarkerWithoutMMB);
-      
+
+      addHiddenCheckBox->setChecked(MusEGlobal::config.addHiddenTracks);
+      unhideTracksCheckBox->setChecked(MusEGlobal::config.unhideTracks);
+
       //updateSettings();    // TESTING
       
+      connect(projDirOpenToolButton, SIGNAL(clicked()), SLOT(browseProjDir()));
+
       connect(applyButton, SIGNAL(clicked()), SLOT(apply()));
       connect(okButton, SIGNAL(clicked()), SLOT(ok()));
       connect(cancelButton, SIGNAL(clicked()), SLOT(cancel()));
@@ -267,6 +273,8 @@ void GlobalSettingsConfig::updateSettings()
       //dummyAudioRealRate->setText(dad ? QString().setNum(sampleRate) : "---");
       //dummyAudioRealRate->setText(QString().setNum(sampleRate));   // Not used any more. p4.0.20 
       
+      projDirEntry->setText(MusEGlobal::config.projectBaseFolder);
+
       startSongEntry->setText(MusEGlobal::config.startSong);
       startSongGroup->button(MusEGlobal::config.startMode)->setChecked(true);
 
@@ -321,6 +329,9 @@ void GlobalSettingsConfig::updateSettings()
       lmbDecreasesCheckBox->setChecked(MusEGlobal::config.leftMouseButtonCanDecrease);
       rangeMarkerWithoutMMBCheckBox->setChecked(MusEGlobal::config.rangeMarkerWithoutMMB);
       
+      addHiddenCheckBox->setChecked(MusEGlobal::config.addHiddenTracks);
+      unhideTracksCheckBox->setChecked(MusEGlobal::config.unhideTracks);
+
       updateMdiSettings();
 }
 
@@ -361,7 +372,9 @@ void GlobalSettingsConfig::apply()
       MusEGlobal::config.useOutputLimiter = outputLimiterCheckBox->isChecked();
       MusEGlobal::config.vstInPlace  = vstInPlaceCheckBox->isChecked();
       MusEGlobal::config.rtcTicks    = rtcResolutions[rtcticks];
-      MusEGlobal::config.userInstrumentsDir = userInstrumentsPath->text();
+      
+      MusEGlobal::config.projectBaseFolder = projDirEntry->text();
+      
       MusEGlobal::config.startSong   = startSongEntry->text();
       MusEGlobal::config.startMode   = startSongGroup->checkedId();
       MusEGlobal::config.newDrumRecordCondition = MusECore::newDrumRecordCondition_t(recDrumGroup->checkedId());
@@ -421,6 +434,9 @@ void GlobalSettingsConfig::apply()
       MusEGlobal::config.leftMouseButtonCanDecrease = lmbDecreasesCheckBox->isChecked();
       MusEGlobal::config.rangeMarkerWithoutMMB = rangeMarkerWithoutMMBCheckBox->isChecked();
 
+      MusEGlobal::config.addHiddenTracks = addHiddenCheckBox->isChecked();
+      MusEGlobal::config.unhideTracks = unhideTracksCheckBox->isChecked();
+
       //MusEGlobal::muse->showMixer(MusEGlobal::config.mixerVisible);
       MusEGlobal::muse->showMixer1(MusEGlobal::config.mixer1Visible);
       MusEGlobal::muse->showMixer2(MusEGlobal::config.mixer2Visible);
@@ -455,8 +471,6 @@ void GlobalSettingsConfig::apply()
       MusEGlobal::muse->resize(MusEGlobal::config.geometryMain.size());
       MusEGlobal::muse->move(MusEGlobal::config.geometryMain.topLeft());
 
-      MusEGlobal::museUserInstruments = MusEGlobal::config.userInstrumentsDir;
-
       MusEGlobal::muse->setHeartBeat();        // set guiRefresh
       MusEGlobal::midiSeq->msgSetRtc();        // set midi tick rate
       
@@ -559,21 +573,6 @@ void GlobalSettingsConfig::transportCurrent()
       transportY->setValue(r.y());
       }
 
-void GlobalSettingsConfig::selectInstrumentsPath()
-      {
-      QString dir = QFileDialog::getExistingDirectory(this, 
-                                                      tr("Selects instruments directory"), 
-                                                      MusEGlobal::config.userInstrumentsDir);
-      userInstrumentsPath->setText(dir);
-      }
-
-void GlobalSettingsConfig::defaultInstrumentsPath()
-      {
-      QString dir = MusEGlobal::configPath + "/instruments";
-      userInstrumentsPath->setText(dir);
-      }
-
-
 void GlobalSettingsConfig::traditionalPreset()
 {
   for (std::list<MdiSettings*>::iterator it = mdisettings.begin(); it!=mdisettings.end(); it++)
@@ -611,5 +610,12 @@ void GlobalSettingsConfig::borlandPreset()
   updateMdiSettings();
 }
 
+void GlobalSettingsConfig::browseProjDir()
+{
+  QString dir = MusEGui::browseProjectFolder(this);
+  if(!dir.isEmpty())
+    projDirEntry->setText(dir);
+}
+
 } // namespace MusEGui
 
diff --git a/muse2/muse/widgets/genset.h b/muse2/muse/widgets/genset.h
index 92da61e3..53f5c2c1 100644
--- a/muse2/muse/widgets/genset.h
+++ b/muse2/muse/widgets/genset.h
@@ -4,6 +4,7 @@
 //  $Id: genset.h,v 1.3 2004/01/25 09:55:17 wschweer Exp $
 //
 //  (C) Copyright 2001 Werner Schweer (ws@seh.de)
+//  (C) Copyright 2011 Tim E. Real (terminator356 on sourceforge)
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -53,8 +54,7 @@ class GlobalSettingsConfig : public QDialog, public Ui::GlobalSettingsDialogBase
       void bigtimeCurrent();
       void mainCurrent();
       void transportCurrent();
-      void selectInstrumentsPath();
-      void defaultInstrumentsPath();
+      void browseProjDir();
       void traditionalPreset();
       void mdiPreset();
       void borlandPreset();
diff --git a/muse2/muse/widgets/gensetbase.ui b/muse2/muse/widgets/gensetbase.ui
index 39dcd4c3..1abc3cd1 100644
--- a/muse2/muse/widgets/gensetbase.ui
+++ b/muse2/muse/widgets/gensetbase.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>556</width>
-    <height>527</height>
+    <height>552</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -23,14 +23,43 @@
       </sizepolicy>
      </property>
      <property name="currentIndex">
-      <number>2</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="TabPage">
       <attribute name="title">
        <string>Application</string>
       </attribute>
       <layout class="QGridLayout">
-       <item row="1" column="0">
+       <item row="0" column="0">
+        <widget class="QGroupBox" name="projDirGroupBox">
+         <property name="title">
+          <string>Project directory</string>
+         </property>
+         <layout class="QHBoxLayout" name="qhboxProjDir">
+          <item>
+           <widget class="QLabel" name="textLabel_ProjDir">
+            <property name="text">
+             <string>Projects:</string>
+            </property>
+            <property name="wordWrap">
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLineEdit" name="projDirEntry"/>
+          </item>
+          <item>
+           <widget class="QToolButton" name="projDirOpenToolButton">
+            <property name="text">
+             <string>...</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item row="2" column="0">
         <widget class="QGroupBox" name="groupBox4">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -413,14 +442,14 @@
          </layout>
         </widget>
        </item>
-       <item row="0" column="0">
+       <item row="1" column="0">
         <widget class="QGroupBox" name="groupBox3">
          <property name="title">
           <string>Start Muse</string>
          </property>
          <layout class="QGridLayout">
           <item row="0" column="0">
-           <layout class="QGridLayout">
+           <layout class="QGridLayout" name="gridLayout11">
             <item row="1" column="0">
              <spacer name="spacer7_2">
               <property name="orientation">
@@ -438,7 +467,7 @@
              </spacer>
             </item>
             <item row="2" column="0" colspan="2">
-             <layout class="QHBoxLayout">
+             <layout class="QHBoxLayout" name="qhboxStartSong">
               <item>
                <widget class="QLabel" name="textLabel1_2">
                 <property name="text">
@@ -811,9 +840,9 @@ Adjusts responsiveness of audio controls and
            <number>2</number>
           </property>
           <item row="0" column="0">
-           <layout class="QGridLayout">
+           <layout class="QGridLayout" name="gridLayoutwaveEditor">
             <item row="0" column="0">
-             <layout class="QHBoxLayout">
+             <layout class="QHBoxLayout" name="qhboxLayoutWaveEditor">
               <item>
                <widget class="QLabel" name="textLabel2_2">
                 <property name="sizePolicy">
@@ -995,13 +1024,7 @@ Adjusts responsiveness of audio controls and
       <attribute name="title">
        <string>Midi</string>
       </attribute>
-      <layout class="QVBoxLayout">
-       <property name="spacing">
-        <number>6</number>
-       </property>
-       <property name="margin">
-        <number>11</number>
-       </property>
+      <layout class="QVBoxLayout" name="verticalLayout_7">
        <item>
         <widget class="QGroupBox" name="GroupBox2">
          <property name="title">
@@ -1179,30 +1202,6 @@ Adjusts responsiveness of audio controls and
             </item>
            </widget>
           </item>
-          <item row="3" column="0">
-           <widget class="QLabel" name="TextLabel3_4">
-            <property name="text">
-             <string>Instruments Directory</string>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="1">
-           <widget class="QLineEdit" name="userInstrumentsPath"/>
-          </item>
-          <item row="3" column="2">
-           <widget class="QPushButton" name="selectInstrumentsDirButton">
-            <property name="text">
-             <string/>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="3">
-           <widget class="QPushButton" name="defaultInstrumentsDirButton">
-            <property name="text">
-             <string/>
-            </property>
-           </widget>
-          </item>
          </layout>
         </widget>
        </item>
@@ -1244,14 +1243,14 @@ Adjusts responsiveness of audio controls and
         </widget>
        </item>
        <item>
-        <spacer name="verticalSpacer_2">
+        <spacer name="verticalSpacer_3">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
-           <width>20</width>
-           <height>40</height>
+           <width>191</width>
+           <height>166</height>
           </size>
          </property>
         </spacer>
@@ -1260,7 +1259,7 @@ Adjusts responsiveness of audio controls and
      </widget>
      <widget class="QWidget" name="tab3">
       <attribute name="title">
-       <string>GUI</string>
+       <string>GUI Behaviour</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_3">
        <property name="spacing">
@@ -1443,10 +1442,58 @@ left button behave like the middle button in such areas.</string>
             </property>
            </widget>
           </item>
+          <item row="9" column="0">
+           <spacer name="verticalSpacer_2">
+            <property name="orientation">
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>20</width>
+              <height>40</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item row="7" column="1">
+           <widget class="QCheckBox" name="addHiddenCheckBox">
+            <property name="text">
+             <string/>
+            </property>
+           </widget>
+          </item>
+          <item row="7" column="0">
+           <widget class="QLabel" name="label_4">
+            <property name="text">
+             <string>Allow adding hidden tracks in track list menu</string>
+            </property>
+           </widget>
+          </item>
+          <item row="8" column="0">
+           <widget class="QLabel" name="label_5">
+            <property name="text">
+             <string>Unhide tracks when adding hidden tracks</string>
+            </property>
+           </widget>
+          </item>
+          <item row="8" column="1">
+           <widget class="QCheckBox" name="unhideTracksCheckBox">
+            <property name="text">
+             <string/>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
-       <item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="tab_2">
+      <attribute name="title">
+       <string>GUI Style</string>
+      </attribute>
+      <layout class="QGridLayout" name="gridLayoutTab2">
+       <item row="0" column="0">
         <widget class="QGroupBox" name="groupBox_2">
          <property name="title">
           <string>MDI-subwindowness and sharing menus</string>
@@ -1497,8 +1544,8 @@ left button behave like the middle button in such areas.</string>
               <rect>
                <x>0</x>
                <y>0</y>
-               <width>482</width>
-               <height>143</height>
+               <width>96</width>
+               <height>26</height>
               </rect>
              </property>
              <layout class="QHBoxLayout" name="horizontalLayout_3">
diff --git a/muse2/muse/widgets/header.cpp b/muse2/muse/widgets/header.cpp
index 2c1057c3..968e7f73 100644
--- a/muse2/muse/widgets/header.cpp
+++ b/muse2/muse/widgets/header.cpp
@@ -51,7 +51,7 @@ void Header::readStatus(MusECore::Xml& xml)
                           for (QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
                                 int logialIdx=abs((*it).toInt());
                                 bool isHidden = (*it).toInt() < 0 ? true:false;
-                                int section = visualIndex(logialIdx);
+                                int section = visualIndex(logialIdx - (isHidden? 1:0));
                                 moveSection(section, index);
                                 if (isHidden)
                                   hideSection(logialIdx-1);
@@ -65,7 +65,7 @@ void Header::readStatus(MusECore::Xml& xml)
                               bool foundIt=false;
                               for (QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
                                 int id=((*it).toInt());
-                                if ( id == i || i ==1-id )
+                                if ( id == i || i == -1 - id )
                                     foundIt=true;
                               }
                               if (foundIt == false) {
@@ -97,7 +97,7 @@ void Header::writeStatus(int level, MusECore::Xml& xml) const
       //xml.nput(level, "<%s> ", name());
       xml.nput(level, "<%s> ", MusECore::Xml::xmlString(objectName()).toLatin1().constData());
       int n = count();
-      for (int i = n; i >= 0; --i) {
+      for (int i = n-1; i >= 0; --i) {
             if (isSectionHidden(logicalIndex(i)))
               xml.nput("%d ", -logicalIndex(i)-1); // hidden is stored as negative value starting from -1
             else
diff --git a/muse2/muse/widgets/knob.cpp b/muse2/muse/widgets/knob.cpp
index 920d2028..269f65cf 100644
--- a/muse2/muse/widgets/knob.cpp
+++ b/muse2/muse/widgets/knob.cpp
@@ -323,6 +323,30 @@ void Knob::rangeChange()
     repaint();
 }
 
+void Knob::mousePressEvent(QMouseEvent *e)
+{
+  if (e->button() == Qt::MidButton || e->modifiers() & Qt::ControlModifier) {
+    int xpos = e->x() - width() /2;
+    double v = float(e->y()) / height() * 1.2;
+
+    double halfRange = (maxValue() - minValue())/2;
+    double midValue = minValue() + halfRange;
+    // apply to range
+    if (xpos < 0) { // left values
+     v = -v;
+    }
+    setValue(v * halfRange + midValue);
+    SliderBase::valueChange();
+    
+    // fake a left-click to make the knob still "stick" to
+    // the mouse.
+    QMouseEvent temp(e->type(), e->pos(), Qt::LeftButton, e->buttons(), e->modifiers());
+    SliderBase::mousePressEvent(&temp);
+    return;
+  }
+  SliderBase::mousePressEvent(e);
+}
+
 //---------------------------------------------------------
 //   resizeEvent
 //---------------------------------------------------------
diff --git a/muse2/muse/widgets/knob.h b/muse2/muse/widgets/knob.h
index 483fafa6..bd8621a1 100644
--- a/muse2/muse/widgets/knob.h
+++ b/muse2/muse/widgets/knob.h
@@ -80,6 +80,7 @@ class Knob : public SliderBase, public ScaleIf
 
       virtual void paintEvent(QPaintEvent *);
       virtual void resizeEvent(QResizeEvent *e);
+      virtual void mousePressEvent(QMouseEvent *e);
       double getValue(const QPoint &p);
       void getScrollMode( QPoint &p, const Qt::MouseButton &button, int &scrollMode, int &direction );
       void scaleChange()             { repaint(); }
diff --git a/muse2/muse/widgets/meter.cpp b/muse2/muse/widgets/meter.cpp
index 5c79ffb2..d9ca8e20 100644
--- a/muse2/muse/widgets/meter.cpp
+++ b/muse2/muse/widgets/meter.cpp
@@ -229,6 +229,8 @@ void Meter::setRange(double min, double max)
 
 void Meter::paintEvent(QPaintEvent* ev)
       {
+      // For some reason upon resizing we get double calls here and in resizeEvent.
+
       QPainter p(this);
       p.setRenderHint(QPainter::Antialiasing);  
 
@@ -534,8 +536,11 @@ void Meter::drawVU(QPainter& p, const QRect& rect, const QPainterPath& drawPath,
 
 void Meter::resizeEvent(QResizeEvent* ev)
     {  
-      QFrame::resizeEvent(ev);
+      // For some reason upon resizing we get double calls here and in paintEvent.
+      //printf("Meter::resizeEvent w:%d h:%d\n", ev->size().width(), ev->size().height());  
       cur_yv = -1;  // Force re-initialization.
+      QFrame::resizeEvent(ev);
+      update();
     }
 
 //---------------------------------------------------------
diff --git a/muse2/muse/widgets/metronome.cpp b/muse2/muse/widgets/metronome.cpp
index e6b7bd91..416e9e47 100644
--- a/muse2/muse/widgets/metronome.cpp
+++ b/muse2/muse/widgets/metronome.cpp
@@ -85,7 +85,7 @@ void MetronomeConfig::audioBeepRoutesClicked()
       int nn = 0;
       for(MusECore::iAudioOutput iao = ol->begin(); iao != ol->end(); ++iao)
       {
-        QAction* action = pup->addAction(QT_TRANSLATE_NOOP("@default", (*iao)->name()));
+        QAction* action = pup->addAction((*iao)->name());
         action->setCheckable(true);
         action->setData(nn);
         if((*iao)->sendMetronome())
diff --git a/muse2/muse/widgets/midisync.ui b/muse2/muse/widgets/midisync.ui
index 8fc6248a..81d7451e 100644
--- a/muse2/muse/widgets/midisync.ui
+++ b/muse2/muse/widgets/midisync.ui
@@ -388,6 +388,19 @@ Enabled inputs in the list will
         </column>
        </widget>
       </item>
+      <item row="5" column="0">
+        <widget class="QLabel" name="toBeDoneLabel">
+        <property name="text">
+          <string>Note: Sync delay and MTC sync currently not fully implemeted</string>
+        </property>
+        <property name="alignment">
+          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+        </property>
+        <property name="wordWrap">
+          <bool>false</bool>
+        </property>
+        </widget>
+      </item>
      </layout>
     </widget>
    </item>
diff --git a/muse2/muse/widgets/mtrackinfo.cpp b/muse2/muse/widgets/mtrackinfo.cpp
index d0c0e070..7952308e 100644
--- a/muse2/muse/widgets/mtrackinfo.cpp
+++ b/muse2/muse/widgets/mtrackinfo.cpp
@@ -579,7 +579,8 @@ void MidiTrackInfo::setLabelText()
         //gradient.setColorAt(0, c.darker());
         //gradient.setColorAt(0, c);
         //gradient.setColorAt(1, c.darker());
-        gradient.setColorAt(0, c.lighter());
+        gradient.setColorAt(0, c);
+        gradient.setColorAt(0.5, c.lighter());
         gradient.setColorAt(1, c);
         //palette.setBrush(QPalette::Button, gradient);
         //palette.setBrush(QPalette::Window, gradient);
@@ -640,14 +641,17 @@ void MidiTrackInfo::iOutputPortChanged(int index)
       {
       if(!selected)
         return;
+      int port_num = iOutput->itemData(index).toInt();
+      if(port_num < 0 || port_num >= MIDI_PORTS)
+        return;
       MusECore::MidiTrack* track = (MusECore::MidiTrack*)selected;
-      if (index == track->outPort())
+      if (port_num == track->outPort())
             return;
       // Changed by T356.
-      //track->setOutPort(index);
+      //track->setOutPort(port_num);
       MusEGlobal::audio->msgIdle(true);
-      //audio->msgSetTrackOutPort(track, index);
-      track->setOutPortAndUpdate(index);
+      //audio->msgSetTrackOutPort(track, port_num);
+      track->setOutPortAndUpdate(port_num);
       MusEGlobal::audio->msgIdle(false);
       
       //MusEGlobal::song->update(SC_MIDI_TRACK_PROP);  
@@ -1086,11 +1090,9 @@ void MidiTrackInfo::instrPopup()
       //QMenu* pup = new QMenu;
       PopupMenu* pup = new PopupMenu(true);
       
-      //instr->populatePatchPopup(pop, channel, MusEGlobal::song->mtype(), track->isDrumTrack());
-      populatePatchPopup(instr, pup, channel, MusEGlobal::song->mtype(), track->isDrumTrack());
+      instr->populatePatchPopup(pup, channel, MusEGlobal::song->mtype(), track->isDrumTrack());
+      //populatePatchPopup(instr, pup, channel, MusEGlobal::song->mtype(), track->isDrumTrack());
 
-      //if(pop->actions().count() == 0)
-      //  return;
       if(pup->actions().count() == 0)
       {
         delete pup;
@@ -1100,7 +1102,6 @@ void MidiTrackInfo::instrPopup()
       connect(pup, SIGNAL(triggered(QAction*)), SLOT(instrPopupActivated(QAction*)));
       //connect(pup, SIGNAL(hovered(QAction*)), SLOT(instrPopupActivated(QAction*)));
       
-      //QAction *act = pop->exec(iPatch->mapToGlobal(QPoint(10,5)));
       QAction *act = pup->exec(iPatch->mapToGlobal(QPoint(10,5)));
       if(act) 
       {
@@ -1351,12 +1352,20 @@ void MidiTrackInfo::updateTrackInfo(int flags)
         //iInput->clear();
         iOutput->clear();
   
+        int item_idx = 0;
         for (int i = 0; i < MIDI_PORTS; ++i) {
+              MusECore::MidiDevice* md = MusEGlobal::midiPorts[i].device(); 
+              if(!md)  // In the case of this combo box, don't bother listing empty ports.             p4.0.41
+                continue;
+              //if(!(md->rwFlags() & 1 || md->isSynti()) && (i != outPort))  
+              if(!(md->rwFlags() & 1) && (i != outPort))   // Only writeable ports, or current one.    p4.0.41
+                continue;
               QString name;
               name.sprintf("%d:%s", i+1, MusEGlobal::midiPorts[i].portname().toLatin1().constData());
-              iOutput->insertItem(i, name);
+              iOutput->insertItem(item_idx, name, i);
               if (i == outPort)
-                    iOutput->setCurrentIndex(i);
+                    iOutput->setCurrentIndex(item_idx);
+              item_idx++;
               }
         iOutput->blockSignals(false);
         
diff --git a/muse2/muse/widgets/mtscale_flo.cpp b/muse2/muse/widgets/mtscale_flo.cpp
index df077102..c54ef1ad 100644
--- a/muse2/muse/widgets/mtscale_flo.cpp
+++ b/muse2/muse/widgets/mtscale_flo.cpp
@@ -45,6 +45,9 @@ MTScaleFlo::MTScaleFlo(ScoreCanvas* parent_editor, QWidget* parent_widget)
 			pos[0] = MusEGlobal::song->cpos();
 			pos[1] = MusEGlobal::song->lpos();
 			pos[2] = MusEGlobal::song->rpos();
+      xpos=0;
+      xoffset=0;
+      
       button = Qt::NoButton;
       setMouseTracking(true);
       connect(MusEGlobal::song, SIGNAL(posChanged(int, unsigned, bool)), SLOT(setPos(int, unsigned, bool)));
diff --git a/muse2/muse/widgets/musewidgetsplug.cpp b/muse2/muse/widgets/musewidgetsplug.cpp
index 27e6d523..32a886fa 100644
--- a/muse2/muse/widgets/musewidgetsplug.cpp
+++ b/muse2/muse/widgets/musewidgetsplug.cpp
@@ -159,7 +159,8 @@ MusEGlobal::GlobalConfigValues config = {
       -60.0,                        // double minSlider;
       false,                        // use Jack freewheel
       20,                           // int guiRefresh;
-      QString(""),                  // helpBrowser
+      QString(""),                  // userInstrumentsDir  // Obsolete. Must keep for compatibility.
+      //QString(""),                // helpBrowser  // Obsolete
       true,                         // extendedMidi
       384,                          // division for smf export
       QString(""),                  // copyright string for smf export
diff --git a/muse2/muse/widgets/popupmenu.cpp b/muse2/muse/widgets/popupmenu.cpp
index af546ec3..af870975 100644
--- a/muse2/muse/widgets/popupmenu.cpp
+++ b/muse2/muse/widgets/popupmenu.cpp
@@ -341,21 +341,38 @@ void PopupMenu::popHovered(QAction* action)
 
 void PopupMenu::mouseReleaseEvent(QMouseEvent *e)
 {
-    #ifdef POPUP_MENU_DISABLE_STAY_OPEN    
+    QAction* action = actionAt(e->pos());
+    if (!(action && action == activeAction() && !action->isSeparator() && action->isEnabled()))
+      action=NULL;
+
+    #ifdef POPUP_MENU_DISABLE_STAY_OPEN
+    if (action && action->menu() != NULL  &&  action->isCheckable())
+      action->activate(QAction::Trigger);
+
     QMenu::mouseReleaseEvent(e);
+    
+    if (action && action->menu() != NULL  &&  action->isCheckable())
+      close();
+      
     return;
     
     #else
     // Check for Ctrl to stay open.
     if(!_stayOpen || (!MusEGlobal::config.popupsDefaultStayOpen && (e->modifiers() & Qt::ControlModifier) == 0))  
     {
+      if (action && action->menu() != NULL  &&  action->isCheckable())
+        action->activate(QAction::Trigger);
+
       QMenu::mouseReleaseEvent(e);
+
+      if (action && action->menu() != NULL  &&  action->isCheckable())
+        close();
+
       return;
     }  
     
     //printf("PopupMenu::mouseReleaseEvent\n");  
-    QAction *action = actionAt(e->pos());
-    if (action && action == activeAction() && !action->isSeparator() && action->isEnabled()) 
+    if (action) 
       action->activate(QAction::Trigger);
     else 
       QMenu::mouseReleaseEvent(e);
diff --git a/muse2/muse/widgets/poslabel.cpp b/muse2/muse/widgets/poslabel.cpp
index 6cdcb27e..b893c58d 100644
--- a/muse2/muse/widgets/poslabel.cpp
+++ b/muse2/muse/widgets/poslabel.cpp
@@ -138,7 +138,11 @@ void PosLabel::setTickValue(unsigned val)
       if (val == _tickValue)
             return;
       if (val >= MAX_TICK)
-            abort();
+      {
+            printf("THIS SHOULD NEVER HAPPEN: val=%u > MAX_TICK=%u in PosLabel::setTickValue()!\n",val, MAX_TICK);
+            val=MAX_TICK-1;
+      }
+      
       _tickValue = val;
       updateValue();
       }
diff --git a/muse2/muse/widgets/projectcreate.ui b/muse2/muse/widgets/projectcreate.ui
index 406c83d6..d03f093c 100644
--- a/muse2/muse/widgets/projectcreate.ui
+++ b/muse2/muse/widgets/projectcreate.ui
@@ -17,28 +17,94 @@
    <item>
     <layout class="QVBoxLayout" name="verticalLayout">
      <item>
-      <widget class="QLabel" name="label_2">
-       <property name="text">
-        <string>Project Name:</string>
+      <layout class="QHBoxLayout" name="horizontalLayout_8">
+       <item>
+        <widget class="QLabel" name="label_5">
+         <property name="text">
+          <string>Projects folder:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLineEdit" name="projDirLineEdit">
+         <property name="readOnly">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QToolButton" name="projDirToolButton">
+         <property name="text">
+          <string>...</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <widget class="Line" name="line">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
        </property>
       </widget>
      </item>
      <item>
       <layout class="QHBoxLayout" name="horizontalLayout_3">
        <item>
+        <widget class="QLabel" name="label_2">
+         <property name="text">
+          <string>Project Name:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
         <widget class="QLineEdit" name="projectNameEdit"/>
        </item>
        <item>
+        <widget class="QCheckBox" name="templateCheckBox">
+         <property name="text">
+          <string>Project is a Template</string>
+         </property>
+        </widget>
+       </item>
+       <item>
         <spacer name="horizontalSpacer">
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
          <property name="sizeType">
-          <enum>QSizePolicy::Fixed</enum>
+          <enum>QSizePolicy::Minimum</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>60</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout_5">
+       <item>
+        <widget class="QLabel" name="label_4">
+         <property name="text">
+          <string>Project song file type:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QComboBox" name="projectFileTypeCB"/>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer_3">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
-           <width>75</width>
+           <width>40</width>
            <height>20</height>
           </size>
          </property>
@@ -87,9 +153,16 @@
         </widget>
        </item>
        <item>
-        <widget class="QPushButton" name="browseDirButton">
+        <widget class="QToolButton" name="browseDirButton">
+         <property name="text">
+          <string>...</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QToolButton" name="restorePathButton">
          <property name="text">
-          <string>Browse</string>
+          <string>...</string>
          </property>
         </widget>
        </item>
@@ -123,6 +196,18 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>projectNameEdit</tabstop>
+  <tabstop>templateCheckBox</tabstop>
+  <tabstop>projectFileTypeCB</tabstop>
+  <tabstop>createFolderCheckbox</tabstop>
+  <tabstop>storageDirEdit</tabstop>
+  <tabstop>browseDirButton</tabstop>
+  <tabstop>commentEdit</tabstop>
+  <tabstop>buttonBox</tabstop>
+  <tabstop>projDirLineEdit</tabstop>
+  <tabstop>projDirToolButton</tabstop>
+ </tabstops>
  <resources/>
  <connections>
   <connection>
diff --git a/muse2/muse/widgets/projectcreateimpl.cpp b/muse2/muse/widgets/projectcreateimpl.cpp
index 31973101..665d725e 100644
--- a/muse2/muse/widgets/projectcreateimpl.cpp
+++ b/muse2/muse/widgets/projectcreateimpl.cpp
@@ -4,6 +4,7 @@
 //  $Id: ./muse/widgets/projectcreateimpl.cpp $
 //
 //  Copyright (C) 1999-2011 by Werner Schweer and others
+//  (C) Copyright 2011 Tim E. Real (terminator356 on sourceforge)
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -21,12 +22,16 @@
 //
 //=========================================================
 #include <stdio.h>
-#include <qfiledialog.h>
-#include <qdir.h>
+#include <QFileDialog>
+#include <QDir>
+#include <QStringList>
+
 #include "projectcreateimpl.h"
 #include "gconfig.h"
 #include "globals.h"
 #include "app.h"
+#include "helper.h"
+#include "icons.h"
 
 namespace MusEGui {
 
@@ -35,10 +40,51 @@ ProjectCreateImpl::ProjectCreateImpl(QWidget *parent) :
 {
   setupUi(this);
 
-  createFolderCheckbox->setChecked(MusEGlobal::config.projectStoreInFolder);
+  //bool is_new = (MusEGlobal::museProject == MusEGlobal::museProjectInitPath);  
+  directoryPath = MusEGlobal::config.projectBaseFolder;
+
+  QStringList filters = localizedStringListFromCharArray(MusEGlobal::project_create_file_save_pattern, "file_patterns");
+  projectFileTypeCB->addItems(filters);
+
+  QString proj_title = MusEGlobal::muse->projectTitle();
+  QString proj_path  = MusEGlobal::muse->projectPath();
+  QString proj_ext   = MusEGlobal::muse->projectExtension();
+  
+  projectNameEdit->setText(proj_title); 
+
+  bool is_template = proj_path.startsWith(MusEGlobal::configPath + "/templates");
+  
+  templateCheckBox->setChecked(is_template);
+  
+  projDirPath = proj_path;
+    
+  int type_idx = 0;
+  if(!proj_ext.isEmpty())
+  {  
+    // FIXME Imperfect. Trying to avoid adding yet another series of character strings.   p4.0.40
+    type_idx = projectFileTypeCB->findText(proj_ext, Qt::MatchContains | Qt::MatchCaseSensitive);
+    if(type_idx == -1)
+      type_idx = 0;
+  }  
+  projectFileTypeCB->setCurrentIndex(type_idx);
+  
+  projDirToolButton->setIcon(*openIcon);
+  browseDirButton->setIcon(*openIcon);
+  restorePathButton->setIcon(*undoIcon);
+
+  restorePathButton->setEnabled(false);  // Disabled at first.
+  
+  //createFolderCheckbox->setChecked(MusEGlobal::config.projectStoreInFolder && is_new); // Suggest no folder if not new.
+  
+  connect(templateCheckBox,SIGNAL(clicked()), this, SLOT(templateButtonChanged()));
+  //connect(templateCheckBox,SIGNAL(clicked()), this, SLOT(updateDirectoryPath()));
+  connect(projDirToolButton,SIGNAL(clicked()), this, SLOT(browseProjDir()));
+  connect(restorePathButton,SIGNAL(clicked()), this, SLOT(restorePath()));
   connect(browseDirButton,SIGNAL(clicked()), this, SLOT(selectDirectory()));
-  connect(projectNameEdit,SIGNAL(textChanged(QString)), this, SLOT(updateDirectoryPath()));
-  connect(createFolderCheckbox,SIGNAL(clicked()), this, SLOT(updateDirectoryPath()));
+  //connect(projectNameEdit,SIGNAL(textChanged(QString)), this, SLOT(updateDirectoryPath()));
+  connect(projectNameEdit,SIGNAL(textChanged(QString)), this, SLOT(updateProjectName()));
+  connect(createFolderCheckbox,SIGNAL(clicked()), this, SLOT(createProjFolderChanged()));
+  connect(projectFileTypeCB,SIGNAL(currentIndexChanged(int)), this, SLOT(updateDirectoryPath()));
   connect(buttonBox, SIGNAL(accepted()), this, SLOT(ok()));
 #if QT_VERSION >= 0x040700
   projectNameEdit->setPlaceholderText("<Project Name>");
@@ -46,52 +92,155 @@ ProjectCreateImpl::ProjectCreateImpl(QWidget *parent) :
   //        as of Qt-4.7.1
   //commentEdit->setPlaceholderText("<Add information about project here>");
 #endif
-  directoryPath = MusEGlobal::config.projectBaseFolder;
   updateDirectoryPath();
   show();
 }
 
 void ProjectCreateImpl::selectDirectory()
 {
-  QFileDialog qfd;
-  qfd.selectFile(directoryPath);
-  qfd.setFileMode(QFileDialog::DirectoryOnly);
-  if (qfd.exec() == QDialog::Rejected) {
-    return;
-  }
-  directoryPath=qfd.selectedFiles().first();
+  QString dpath = templateCheckBox->isChecked() ? 
+                   (overrideTemplDirPath.isEmpty()    ? (MusEGlobal::configPath + QString("/templates")) : overrideTemplDirPath) :
+                   (overrideDirPath.isEmpty() ? directoryPath : overrideDirPath);
+  
+  QString dir = QFileDialog::getExistingDirectory(this, tr("Select directory"), dpath);
+  if(dir.isEmpty())
+     return;
+  
+  (templateCheckBox->isChecked() ? overrideTemplDirPath : overrideDirPath) = dir;
+  restorePathButton->setEnabled(true); 
   updateDirectoryPath();
 }
 
-void ProjectCreateImpl::updateDirectoryPath()
+void ProjectCreateImpl::updateProjectName()
 {
+  QString curExt = projectFileTypeCB->currentText();  
+  if(curExt.isEmpty())
+    curExt = ".med";
+  else
+  {  
+    curExt = MusEGui::getFilterExtension(curExt);
+    // Do we have a valid extension?
+    if(curExt.isEmpty())
+      curExt = ".med";
+  }
+  
   QString name = "";
   if (createFolderCheckbox->isChecked()) {
     if (!projectNameEdit->text().isEmpty())
-      name = projectNameEdit->text() + "/" + projectNameEdit->text() + ".med";
+      //name = projectNameEdit->text() + "/" + projectNameEdit->text() + ".med";
+      name = projectNameEdit->text() + "/" + projectNameEdit->text() + curExt;
     //storageDirEdit->setText(directoryPath + name );
   }  else {
     if (!projectNameEdit->text().isEmpty())
-      name = projectNameEdit->text() + ".med";
+      //name = projectNameEdit->text() + ".med";
+      name = projectNameEdit->text() + curExt;
     //storageDirEdit->setText(directoryPath +"/" + name);
   }
-  storageDirEdit->setText(directoryPath +"/" + name );    // Tim
+  
+  bool is_new = (MusEGlobal::museProject == MusEGlobal::museProjectInitPath);  
+
+  QString dpath = templateCheckBox->isChecked() ? 
+                   (overrideTemplDirPath.isEmpty()    ? (MusEGlobal::configPath + QString("/templates")) : overrideTemplDirPath) :
+                   (overrideDirPath.isEmpty() ? (is_new ? directoryPath : projDirPath) : overrideDirPath);
+  
+  QDir proj_dir(dpath);
+  //if(is_project && MusEGlobal::config.projectStoreInFolder)
+  bool is_project = dpath.startsWith(MusEGlobal::config.projectBaseFolder);
+  //bool is_template = dpath.startsWith(MusEGlobal::configPath + "/templates") && templateCheckBox->isChecked();
+  //bool is_new = (MusEGlobal::museProject == MusEGlobal::museProjectInitPath) && MusEGlobal::config.projectStoreInFolder;  
+  //bool is_new = (MusEGlobal::museProject == MusEGlobal::museProjectInitPath) && 
+                MusEGlobal::config.projectStoreInFolder && 
+                (templateCheckBox->isChecked() ? overrideTemplDirPath.isEmpty() : overrideDirPath.isEmpty());  
+  //bool is_template = is_new && dpath.startsWith(MusEGlobal::configPath + "/templates") && templateCheckBox->isChecked();
+  if(!is_new && createFolderCheckbox->isChecked() && !templateCheckBox->isChecked() && 
+     (templateCheckBox->isChecked() ? overrideTemplDirPath.isEmpty() : overrideDirPath.isEmpty()))
+    proj_dir.cdUp();
+  dpath = proj_dir.absolutePath();
+  
+  //if(!initProjPath.isEmpty())
+  //{  
+  //  initProjPath.clear();
+  //}
+  
+  storageDirEdit->blockSignals(true);
+  storageDirEdit->setText(dpath + "/" + name );    
+  storageDirEdit->blockSignals(false);
+  
+  projDirLineEdit->setEnabled(!templateCheckBox->isChecked() && is_project);
+}
+
+void ProjectCreateImpl::updateDirectoryPath()
+{
+  updateProjectName();
+
+  projDirLineEdit->blockSignals(true);
+  projDirLineEdit->setText(MusEGlobal::config.projectBaseFolder);
+  projDirLineEdit->blockSignals(false);
 }
 
-QString ProjectCreateImpl::getProjectPath()
+QString ProjectCreateImpl::getProjectPath() const
 {
    return storageDirEdit->text();
 }
-QString ProjectCreateImpl::getSongInfo()
+
+QString ProjectCreateImpl::getSongInfo() const
 {
    return commentEdit->toPlainText();
 }
+
 void ProjectCreateImpl::ok()
 {
   MusEGlobal::config.projectStoreInFolder = createFolderCheckbox->isChecked();
-  MusEGlobal::config.projectBaseFolder = directoryPath;
-  MusEGlobal::muse->changeConfig(true);
+  //MusEGlobal::config.projectBaseFolder = directoryPath;
+  //MusEGlobal::muse->changeConfig(true);
   emit accept();
 }
 
+void ProjectCreateImpl::createProjFolderChanged()
+{
+  //MusEGlobal::config.projectStoreInFolder = createFolderCheckbox->isChecked();
+  //MusEGlobal::muse->changeConfig(true);  // Save to config file.
+  updateDirectoryPath();
+}
+
+void ProjectCreateImpl::browseProjDir()
+{
+  QString dir = MusEGui::browseProjectFolder(this);
+  if(!dir.isEmpty())
+  {  
+    directoryPath = dir;
+    MusEGlobal::config.projectBaseFolder = dir;
+    MusEGlobal::muse->changeConfig(true);  // Save to config file.
+    updateDirectoryPath();
+  }  
+}
+
+void ProjectCreateImpl::templateButtonChanged()
+{
+  restorePathButton->setEnabled(templateCheckBox->isChecked() ? !overrideTemplDirPath.isEmpty() : !overrideDirPath.isEmpty()); 
+  updateDirectoryPath();
+}
+
+void ProjectCreateImpl::restorePath()  
+{
+  if(templateCheckBox->isChecked())
+    overrideTemplDirPath.clear();
+  else
+    overrideDirPath.clear();
+  restorePathButton->setEnabled(templateCheckBox->isChecked() ? !overrideTemplDirPath.isEmpty() : !overrideDirPath.isEmpty()); 
+  updateDirectoryPath();
+}
+
+/*
+bool ProjectCreateImpl::getProjectIsTemplate() const
+{
+  return templateCheckBox->isChecked();
+}
+
+QString ProjectCreateImpl::getTemplatePath() const
+{
+   return templDirPath;
+}
+*/
+
 } //namespace MusEGui
diff --git a/muse2/muse/widgets/projectcreateimpl.h b/muse2/muse/widgets/projectcreateimpl.h
index 258b0921..f08cb1bc 100644
--- a/muse2/muse/widgets/projectcreateimpl.h
+++ b/muse2/muse/widgets/projectcreateimpl.h
@@ -4,6 +4,7 @@
 //  $Id: ./muse/widgets/projectcreateimpl.h $
 //
 //  Copyright (C) 1999-2011 by Werner Schweer and others
+//  (C) Copyright 2011 Tim E. Real (terminator356 on sourceforge)
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -33,18 +34,28 @@ class ProjectCreateImpl : public QDialog, Ui::ProjectCreate
     Q_OBJECT
 
     QString directoryPath;
+    QString overrideDirPath;
+    QString overrideTemplDirPath;
+    QString projDirPath;
+    
 public:
     explicit ProjectCreateImpl(QWidget *parent = 0);
-    QString getProjectPath();
-    QString getSongInfo();
+    QString getProjectPath() const;
+    QString getSongInfo() const;
+    //bool getProjectIsTemplate() const;
+    //QString getTemplatePath() const;
 
 signals:
 
-public slots:
+protected slots:
+    void updateProjectName();
     void updateDirectoryPath();
     void selectDirectory();
     void ok();
-
+    void createProjFolderChanged();
+    void browseProjDir();
+    void templateButtonChanged();
+    void restorePath();
 };
 
 } // namespace MusEGui
diff --git a/muse2/muse/widgets/routepopup.cpp b/muse2/muse/widgets/routepopup.cpp
index 73d29c25..0f1f8264 100644
--- a/muse2/muse/widgets/routepopup.cpp
+++ b/muse2/muse/widgets/routepopup.cpp
@@ -43,10 +43,10 @@ namespace MusEGui {
 int RoutePopupMenu::addMenuItem(MusECore::AudioTrack* track, MusECore::Track* route_track, PopupMenu* lb, int id, int channel, int channels, bool isOutput)
 {
   // totalInChannels is only used by syntis.
-  int toch = ((MusECore::AudioTrack*)track)->totalOutChannels();
+  //int toch = ((MusECore::AudioTrack*)track)->totalOutChannels();
   // If track channels = 1, it must be a mono synth. And synti channels cannot be changed by user.
-  if(track->channels() == 1)
-    toch = 1;
+  //if(track->channels() == 1)
+  //  toch = 1;
   
   // Don't add the last stray mono route if the track is stereo.
   //if(route_track->channels() > 1 && (channel+1 == chans))
@@ -95,6 +95,13 @@ int RoutePopupMenu::addMenuItem(MusECore::AudioTrack* track, MusECore::Track* ro
       }
     }  
   }
+  
+  if(!act->isChecked())  // If circular route exists, allow user to break it, otherwise forbidden.
+  {
+    if( (isOutput ? track : route_track)->isCircularRoute(isOutput ? route_track : track) ) 
+      act->setEnabled(false);
+  }
+
   return ++id;      
 }
 
@@ -220,9 +227,9 @@ int RoutePopupMenu::addSyntiPorts(MusECore::AudioTrack* t, PopupMenu* lb, int id
               {
                 char buffer[128];
                 if(tchans == 2)
-                  snprintf(buffer, 128, "%s %d,%d", chpup->tr("Channel").toLatin1().constData(), ch+1, ch+2);
+                  snprintf(buffer, 128, "%s %d,%d", tr("Channel").toLatin1().constData(), ch+1, ch+2);
                 else  
-                  snprintf(buffer, 128, "%s %d", chpup->tr("Channel").toLatin1().constData(), ch+1);
+                  snprintf(buffer, 128, "%s %d", tr("Channel").toLatin1().constData(), ch+1);
                 act = chpup->addAction(QString(buffer));
                 act->setCheckable(true);
                 
@@ -259,6 +266,13 @@ int RoutePopupMenu::addSyntiPorts(MusECore::AudioTrack* t, PopupMenu* lb, int id
                     }
                   }
                 }  
+
+                if(!act->isChecked())  // If circular route exists, allow user to break it, otherwise forbidden.
+                {
+                  if( (isOutput ? t : track)->isCircularRoute(isOutput ? track : t) ) 
+                    act->setEnabled(false);
+                }
+
                 ++id;
               }
             
@@ -347,7 +361,7 @@ int RoutePopupMenu::addMultiChannelPorts(MusECore::AudioTrack* t, PopupMenu* pup
     if(chans > 1)
     {
       char buffer[128];
-      snprintf(buffer, 128, "%s %d", pup->tr("Channel").toLatin1().constData(), ch+1);
+      snprintf(buffer, 128, "%s %d", tr("Channel").toLatin1().constData(), ch+1);
       chpup->setTitle(QString(buffer));
       pup->addMenu(chpup);
     }  
@@ -425,7 +439,7 @@ int RoutePopupMenu::addMultiChannelPorts(MusECore::AudioTrack* t, PopupMenu* pup
       if(chans > 2)
       {
         char buffer[128];
-        snprintf(buffer, 128, "%s %d,%d", pup->tr("Channel").toLatin1().constData(), ch+1, ch+2);
+        snprintf(buffer, 128, "%s %d,%d", tr("Channel").toLatin1().constData(), ch+1, ch+2);
         chpup->setTitle(QString(buffer));
         pup->addMenu(chpup);
       }  
@@ -482,7 +496,7 @@ int RoutePopupMenu::nonSyntiTrackAddSyntis(MusECore::AudioTrack* t, PopupMenu* l
               for(int ch = 0; ch < chans; ++ch)
               {
                 char buffer[128];
-                snprintf(buffer, 128, "%s %d", chpup->tr("Channel").toLatin1().constData(), ch+1);
+                snprintf(buffer, 128, "%s %d", tr("Channel").toLatin1().constData(), ch+1);
                 act = chpup->addAction(QString(buffer));
                 act->setCheckable(true);
                 
@@ -520,6 +534,13 @@ int RoutePopupMenu::nonSyntiTrackAddSyntis(MusECore::AudioTrack* t, PopupMenu* l
                     }
                   }
                 }
+                
+                if(!act->isChecked())  // If circular route exists, allow user to break it, otherwise forbidden.
+                {
+                  if( (isOutput ? t : track)->isCircularRoute(isOutput ? track : t) ) 
+                    act->setEnabled(false);
+                }
+
                 ++id;
               }
             
@@ -535,7 +556,7 @@ int RoutePopupMenu::nonSyntiTrackAddSyntis(MusECore::AudioTrack* t, PopupMenu* l
                 for(int ch = 0; ch < chans; ++ch)
                 {
                   char buffer[128];
-                  snprintf(buffer, 128, "%s %d,%d", chpup->tr("Channel").toLatin1().constData(), ch+1, ch+2);
+                  snprintf(buffer, 128, "%s %d,%d", tr("Channel").toLatin1().constData(), ch+1, ch+2);
                   act = chpup->addAction(QString(buffer));
                   act->setCheckable(true);
                   
@@ -573,6 +594,13 @@ int RoutePopupMenu::nonSyntiTrackAddSyntis(MusECore::AudioTrack* t, PopupMenu* l
                       }
                     }  
                   }
+                  
+                  if(!act->isChecked())  // If circular route exists, allow user to break it, otherwise forbidden.
+                  {
+                    if( (isOutput ? t : track)->isCircularRoute(isOutput ? track : t) ) 
+                      act->setEnabled(false);
+                  }
+
                   ++id;
                 }
               }
@@ -1062,9 +1090,8 @@ void RoutePopupMenu::prepare()
       for( ; pi < MIDI_PORTS; ++pi)
       {
         MusECore::MidiDevice* md = MusEGlobal::midiPorts[pi].device();
-        //if(md && !md->isSynti() && (md->rwFlags() & 2))
-        //if(md && (md->rwFlags() & 2))   // p4.0.27
-        if(md && (md->rwFlags() & 2 || md->isSynti()) )  // p4.0.27
+        if(md && !md->isSynti() && (md->rwFlags() & 2))
+        //if(md && (md->rwFlags() & 2 || md->isSynti()) )  // p4.0.27 Reverted p4.0.35 
           break;
       }
       if(pi == MIDI_PORTS)
@@ -1091,12 +1118,9 @@ void RoutePopupMenu::prepare()
         //  continue;
         
         // Do not list synth devices!
-        ///if(md && md->isSynti())
-        ///  continue;
-        ///if(md && !(md->rwFlags() & 2))
-        ///  continue;
-        // p4.0.27 Go ahead. Synths esp MESS send out stuff. 
-        if( md && !(md->rwFlags() & 2) && !md->isSynti() )
+        if( md && (!(md->rwFlags() & 2) || md->isSynti()) )
+        // p4.0.27 Go ahead. Synths esp MESS send out stuff. Reverted p4.0.35 
+        //if( md && !(md->rwFlags() & 2) && !md->isSynti() )
           continue;
           
         //printf("MusE::prepareRoutingPopupMenu adding submenu portnum:%d\n", i);
diff --git a/muse2/muse/widgets/shortcutcapturedialog.cpp b/muse2/muse/widgets/shortcutcapturedialog.cpp
index 46a3e75d..ad78a2ad 100644
--- a/muse2/muse/widgets/shortcutcapturedialog.cpp
+++ b/muse2/muse/widgets/shortcutcapturedialog.cpp
@@ -30,7 +30,6 @@
 //
 // Description:
 // Dialog window for capturing keyboard shortcuts
-//
 
 #include "shortcutcapturedialog.h"
 #include "shortcuts.h"
@@ -39,6 +38,7 @@
 #include <QKeySequence>
 #include <QInputEvent>
 #include <QChar>
+#include <QApplication>
 
 namespace MusEGui {
 
@@ -105,7 +105,7 @@ void ShortcutCaptureDialog::keyPressEvent(QKeyEvent* e)
                       (( shortcuts[i].type  & (shortcuts[shortcutindex].type | INVIS_SHRT)) ||
                          shortcuts[i].type & GLOBAL_SHRT ||
                          shortcuts[shortcutindex].type & GLOBAL_SHRT)) { // affect the same scope
-                      msgString = tr("Shortcut conflicts with %1").arg(shortcuts[i].descr);
+                      msgString = tr("Shortcut conflicts with %1").arg(qApp->translate("shortcuts",shortcuts[i].descr));
                       conflict = true;
                       break;
                       }
diff --git a/muse2/muse/widgets/shortcutconfig.cpp b/muse2/muse/widgets/shortcutconfig.cpp
index fc08e7ce..609564cc 100644
--- a/muse2/muse/widgets/shortcutconfig.cpp
+++ b/muse2/muse/widgets/shortcutconfig.cpp
@@ -30,12 +30,12 @@
 //
 // Description:
 // Dialog for configuring keyboard shortcuts
-//
 
 #include <QCloseEvent>
 #include <QKeySequence>
 #include <QString>
 #include <QSettings>
+#include <QApplication>
 
 #include "shortcutconfig.h"
 #include "shortcutcapturedialog.h"
@@ -86,12 +86,12 @@ void ShortcutConfig::updateSCListView(int category)
       for (int i=0; i < SHRT_NUM_OF_ELEMENTS; i++) {
             if (shortcuts[i].type & category) {
                   newItem = new SCListViewItem(scListView, i);
-                  newItem->setText(SHRT_DESCR_COL, tr(shortcuts[i].descr));
+                  newItem->setText(SHRT_DESCR_COL, qApp->translate("shortcuts", shortcuts[i].descr));
                   //if(category == ALL_SHRT)
                   //  catpre = QString(shortcut_category[shortcuts[i].type].name) + QString(": ");
                   //else 
                   //  catpre.clear();  
-                  //newItem->setText(SHRT_DESCR_COL, catpre + tr(shortcuts[i].descr));  // Tim
+                  //newItem->setText(SHRT_DESCR_COL, catpre + tr(qApp->translate("shortcuts", shortcuts[i].descr));  // Tim
                   QKeySequence key = QKeySequence(shortcuts[i].key);
                   newItem->setText(SHRT_SHRTCUT_COL, key);
                   }
diff --git a/muse2/muse/widgets/shortcutconfigbase.ui b/muse2/muse/widgets/shortcutconfigbase.ui
index 119a7007..6dd5d5b7 100644
--- a/muse2/muse/widgets/shortcutconfigbase.ui
+++ b/muse2/muse/widgets/shortcutconfigbase.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>466</width>
-    <height>403</height>
+    <width>512</width>
+    <height>452</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -16,67 +16,64 @@
   <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>
-  <layout class="QVBoxLayout">
+  <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="QGroupBox" name="groupBox3">
-     <property name="title">
-      <string/>
+    <widget class="QSplitter" name="splitter">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
      </property>
-     <layout class="QHBoxLayout">
-      <property name="spacing">
-       <number>3</number>
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="childrenCollapsible">
+      <bool>false</bool>
+     </property>
+     <widget class="QTreeWidget" name="cgListView">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
+        <horstretch>1</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="minimumSize">
+       <size>
+        <width>105</width>
+        <height>200</height>
+       </size>
+      </property>
+      <column>
+       <property name="text">
+        <string>Shortcut Category</string>
+       </property>
+      </column>
+     </widget>
+     <widget class="QTreeWidget" name="scListView">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+        <horstretch>2</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
       </property>
-      <property name="margin">
-       <number>0</number>
+      <property name="minimumSize">
+       <size>
+        <width>170</width>
+        <height>230</height>
+       </size>
       </property>
-      <item>
-       <widget class="QTreeWidget" name="cgListView">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
-          <horstretch>1</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>105</width>
-          <height>200</height>
-         </size>
-        </property>
-        <column>
-         <property name="text">
-          <string>Shortcut Category</string>
-         </property>
-        </column>
-       </widget>
-      </item>
-      <item>
-       <widget class="QTreeWidget" name="scListView">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-          <horstretch>2</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>170</width>
-          <height>230</height>
-         </size>
-        </property>
-        <column>
-         <property name="text">
-          <string>Shortcut</string>
-         </property>
-        </column>
-        <column>
-         <property name="text">
-          <string>Description</string>
-         </property>
-        </column>
-       </widget>
-      </item>
-     </layout>
+      <column>
+       <property name="text">
+        <string>Shortcut</string>
+       </property>
+      </column>
+      <column>
+       <property name="text">
+        <string>Description</string>
+       </property>
+      </column>
+     </widget>
     </widget>
    </item>
    <item>
diff --git a/muse2/muse/widgets/spinbox.cpp b/muse2/muse/widgets/spinbox.cpp
index f7afcf2a..a763eea1 100644
--- a/muse2/muse/widgets/spinbox.cpp
+++ b/muse2/muse/widgets/spinbox.cpp
@@ -99,4 +99,19 @@ void SpinBox::stepDown()
     _clearFocus = true;
 }
 
+void SpinBox::keyPressEvent(QKeyEvent* ev)
+{
+    switch (ev->key()) {
+      case Qt::Key_Return:
+        clearFocus();
+        //emit returnPressed();
+        //      return;
+        break;
+      default:
+        break;
+    }
+    QSpinBox::keyPressEvent(ev);
+}
+
 } // namespace MusEGui
+
diff --git a/muse2/muse/widgets/spinbox.h b/muse2/muse/widgets/spinbox.h
index cee112d4..cd37fb32 100644
--- a/muse2/muse/widgets/spinbox.h
+++ b/muse2/muse/widgets/spinbox.h
@@ -43,7 +43,8 @@ class SpinBox : public QSpinBox {
 
    protected:
       bool eventFilter(QObject* obj, QEvent* ev);
-      
+      virtual void keyPressEvent(QKeyEvent*);
+
    public slots:
       virtual void stepUp();
       virtual void stepDown();
diff --git a/muse2/muse/widgets/synthconfigbase.ui b/muse2/muse/widgets/synthconfigbase.ui
index 97f0beaa..500241a8 100644
--- a/muse2/muse/widgets/synthconfigbase.ui
+++ b/muse2/muse/widgets/synthconfigbase.ui
@@ -6,12 +6,12 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>630</width>
+    <width>810</width>
     <height>492</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>MusE: Synth Configuration</string>
+   <string>Midi Port and Soft Synth Configuration</string>
   </property>
   <layout class="QGridLayout">
    <item row="1" column="1">
@@ -32,6 +32,11 @@
         </column>
         <column>
          <property name="text">
+          <string>Type</string>
+         </property>
+        </column>
+        <column>
+         <property name="text">
           <string>Midi Port</string>
          </property>
         </column>
@@ -137,6 +142,11 @@
         </column>
         <column>
          <property name="text">
+          <string>Type</string>
+         </property>
+        </column>
+        <column>
+         <property name="text">
           <string>Inst</string>
          </property>
         </column>
diff --git a/muse2/muse/widgets/tb1.cpp b/muse2/muse/widgets/tb1.cpp
index 3174260f..589726a9 100644
--- a/muse2/muse/widgets/tb1.cpp
+++ b/muse2/muse/widgets/tb1.cpp
@@ -20,7 +20,6 @@
 //
 //=========================================================
 
-//#include <assert.h>
 #include <stdio.h>
 #include <values.h>
 
@@ -45,9 +44,9 @@ static int rasterTable[] = {
       };
 
 static const char* rasterStrings[] = {
-      QT_TRANSLATE_NOOP("@default", "Off"), "2pp", "5pp", "64T", "32T", "16T", "8T", "4T", "2T", "1T",
-      QT_TRANSLATE_NOOP("@default", "Off"), "3pp", "6pp", "64",  "32",  "16",  "8",  "4",  "2",  "1",
-      QT_TRANSLATE_NOOP("@default", "Off"), "4pp", "7pp", "64.", "32.", "16.", "8.", "4.", "2.", "1."
+      QT_TRANSLATE_NOOP("MusEGui::Toolbar1", "Off"), "2pp", "5pp", "64T", "32T", "16T", "8T", "4T", "2T", "1T",
+      QT_TRANSLATE_NOOP("MusEGui::Toolbar1", "Off"), "3pp", "6pp", "64",  "32",  "16",  "8",  "4",  "2",  "1",
+      QT_TRANSLATE_NOOP("MusEGui::Toolbar1", "Off"), "4pp", "7pp", "64.", "32.", "16.", "8.", "4.", "2.", "1."
       };
 
 
diff --git a/muse2/muse/widgets/tools.cpp b/muse2/muse/widgets/tools.cpp
index 162d2b97..d46126a9 100644
--- a/muse2/muse/widgets/tools.cpp
+++ b/muse2/muse/widgets/tools.cpp
@@ -30,42 +30,42 @@
 
 namespace MusEGui {
 
-const char* infoPointer = QT_TRANSLATE_NOOP("@default", "select Pointer Tool:\n"
+const char* infoPointer = QT_TRANSLATE_NOOP("MusEGui::EditToolBar", "select Pointer Tool:\n"
       "with the pointer tool you can:\n"
       "  select parts\n"
       "  move parts\n"
       "  copy parts");
-const char* infoPencil = QT_TRANSLATE_NOOP("@default", "select Pencil Tool:\n"
+const char* infoPencil = QT_TRANSLATE_NOOP("MusEGui::EditToolBar", "select Pencil Tool:\n"
       "with the pencil tool you can:\n"
       "  create new parts\n"
       "  modify length of parts");
-const char* infoDel = QT_TRANSLATE_NOOP("@default", "select Delete Tool:\n"
+const char* infoDel = QT_TRANSLATE_NOOP("MusEGui::EditToolBar", "select Delete Tool:\n"
       "with the delete tool you can delete parts");
-const char* infoCut = QT_TRANSLATE_NOOP("@default", "select Cut Tool:\n"
+const char* infoCut = QT_TRANSLATE_NOOP("MusEGui::EditToolBar", "select Cut Tool:\n"
       "with the cut tool you can split a part");
-const char* infoGlue = QT_TRANSLATE_NOOP("@default", "select Glue Tool:\n"
+const char* infoGlue = QT_TRANSLATE_NOOP("MusEGui::EditToolBar", "select Glue Tool:\n"
       "with the glue tool you can glue two parts");
-const char* infoScore = QT_TRANSLATE_NOOP("@default", "select Score Tool:\n");
-const char* infoQuant = QT_TRANSLATE_NOOP("@default", "select Quantize Tool:\n"
+const char* infoScore = QT_TRANSLATE_NOOP("MusEGui::EditToolBar", "select Score Tool:\n");
+const char* infoQuant = QT_TRANSLATE_NOOP("MusEGui::EditToolBar", "select Quantize Tool:\n"
       "insert display quantize event");
-const char* infoDraw = QT_TRANSLATE_NOOP("@default", "select Drawing Tool");
-const char* infoMute = QT_TRANSLATE_NOOP("@default", "select Muting Tool:\n"
+const char* infoDraw = QT_TRANSLATE_NOOP("MusEGui::EditToolBar", "select Drawing Tool");
+const char* infoMute = QT_TRANSLATE_NOOP("MusEGui::EditToolBar", "select Muting Tool:\n"
       "click on part to mute/unmute");
-const char* infoAutomation = QT_TRANSLATE_NOOP("@default", "Manipulate automation");
-const char* infoCursor = QT_TRANSLATE_NOOP("@default", "Cursor tool");
+const char* infoAutomation = QT_TRANSLATE_NOOP("MusEGui::EditToolBar", "Manipulate automation");
+const char* infoCursor = QT_TRANSLATE_NOOP("MusEGui::EditToolBar", "Cursor tool");
 
 ToolB toolList[] = {
-      {&pointerIcon,  QT_TRANSLATE_NOOP("@default", "pointer"),        infoPointer },
-      {&pencilIcon,   QT_TRANSLATE_NOOP("@default", "pencil"),         infoPencil  },
-      {&deleteIcon,   QT_TRANSLATE_NOOP("@default", "eraser"),         infoDel     },
-      {&cutIcon,      QT_TRANSLATE_NOOP("@default", "cutter"),         infoCut     },
-      {&note1Icon,    QT_TRANSLATE_NOOP("@default", "score"),          infoScore   },
-      {&glueIcon,     QT_TRANSLATE_NOOP("@default", "glue"),           infoGlue    },
-      {&quantIcon,    QT_TRANSLATE_NOOP("@default", "quantize"),       infoQuant   },
-      {&drawIcon,     QT_TRANSLATE_NOOP("@default", "draw"),           infoDraw    },
-      {&editmuteIcon, QT_TRANSLATE_NOOP("@default", "mute parts"),     infoMute    },
-      {&drawIcon,     QT_TRANSLATE_NOOP("@default", "edit automation"),infoAutomation},
-      {&cursorIcon,     QT_TRANSLATE_NOOP("@default", "cursor"),         infoCursor},
+      {&pointerIcon,  QT_TRANSLATE_NOOP("MusEGui::EditToolBar", "pointer"),        infoPointer },
+      {&pencilIcon,   QT_TRANSLATE_NOOP("MusEGui::EditToolBar", "pencil"),         infoPencil  },
+      {&deleteIcon,   QT_TRANSLATE_NOOP("MusEGui::EditToolBar", "eraser"),         infoDel     },
+      {&cutIcon,      QT_TRANSLATE_NOOP("MusEGui::EditToolBar", "cutter"),         infoCut     },
+      {&note1Icon,    QT_TRANSLATE_NOOP("MusEGui::EditToolBar", "score"),          infoScore   },
+      {&glueIcon,     QT_TRANSLATE_NOOP("MusEGui::EditToolBar", "glue"),           infoGlue    },
+      {&quantIcon,    QT_TRANSLATE_NOOP("MusEGui::EditToolBar", "quantize"),       infoQuant   },
+      {&drawIcon,     QT_TRANSLATE_NOOP("MusEGui::EditToolBar", "draw"),           infoDraw    },
+      {&editmuteIcon, QT_TRANSLATE_NOOP("MusEGui::EditToolBar", "mute parts"),     infoMute    },
+      {&drawIcon,     QT_TRANSLATE_NOOP("MusEGui::EditToolBar", "edit automation"),infoAutomation},
+      {&cursorIcon,     QT_TRANSLATE_NOOP("MusEGui::EditToolBar", "cursor"),         infoCursor},
       };
 
 //---------------------------------------------------------
@@ -94,7 +94,7 @@ EditToolBar::EditToolBar(QWidget* parent, int tools, const char*)
                   continue;
             ToolB* t = &toolList[i];
 
-            Action* a = new Action(action, 1<<i, t->tip, true);
+            Action* a = new Action(action, 1<<i, tr(t->tip).toAscii().data(), true);
             actions[n] = a;
             //a->setIconSet(QIcon(**(t->icon)));
             a->setIcon(QIcon(**(t->icon)));
diff --git a/muse2/muse/widgets/utils.cpp b/muse2/muse/widgets/utils.cpp
index 708bef07..1641b267 100644
--- a/muse2/muse/widgets/utils.cpp
+++ b/muse2/muse/widgets/utils.cpp
@@ -528,7 +528,8 @@ int get_paste_len()
 
                                     if (p->endTick() > end_tick)
                                           end_tick=p->endTick();
-
+                                    
+                                    unchainClone(p);
                                     delete p;
                                     }
                               }
diff --git a/muse2/muse/widgets/visibletracks.cpp b/muse2/muse/widgets/visibletracks.cpp
index 84e7dd42..4976ecf9 100644
--- a/muse2/muse/widgets/visibletracks.cpp
+++ b/muse2/muse/widgets/visibletracks.cpp
@@ -29,25 +29,26 @@
 #include "action.h"
 #include "track.h"
 #include "synth.h"
+#include "app.h"
 
 namespace MusEGui {
 
-const char* waveTrack = QT_TRANSLATE_NOOP("@default", "Show wave tracks");
-const char* groupTrack = QT_TRANSLATE_NOOP("@default", "Show group tracks");
-const char* auxTrack = QT_TRANSLATE_NOOP("@default", "Show aux tracks");
-const char* inputTrack = QT_TRANSLATE_NOOP("@default", "Show input tracks");
-const char* outputTrack = QT_TRANSLATE_NOOP("@default", "Show output tracks");
-const char* midiTrack = QT_TRANSLATE_NOOP("@default", "Show midi tracks");
-const char* synthTrack = QT_TRANSLATE_NOOP("@default", "Show synth tracks");
+const char* waveTrack = QT_TRANSLATE_NOOP("MusEGui::VisibleTracks", "Show wave tracks");
+const char* groupTrack = QT_TRANSLATE_NOOP("MusEGui::VisibleTracks", "Show group tracks");
+const char* auxTrack = QT_TRANSLATE_NOOP("MusEGui::VisibleTracks", "Show aux tracks");
+const char* inputTrack = QT_TRANSLATE_NOOP("MusEGui::VisibleTracks", "Show input tracks");
+const char* outputTrack = QT_TRANSLATE_NOOP("MusEGui::VisibleTracks", "Show output tracks");
+const char* midiTrack = QT_TRANSLATE_NOOP("MusEGui::VisibleTracks", "Show midi tracks");
+const char* synthTrack = QT_TRANSLATE_NOOP("MusEGui::VisibleTracks", "Show synth tracks");
 
 VisibleToolB visTrackList[] = {
-      {&addtrack_wavetrackIcon,   QT_TRANSLATE_NOOP("@default", "Show wave tracks"),     waveTrack   },
-      {&addtrack_audiogroupIcon,  QT_TRANSLATE_NOOP("@default", "Show group tracks"),    groupTrack  },
-      {&addtrack_auxsendIcon,     QT_TRANSLATE_NOOP("@default", "Show aux tracks"),      auxTrack    },
-      {&addtrack_audioinputIcon,  QT_TRANSLATE_NOOP("@default", "Show input tracks"),    inputTrack  },
-      {&addtrack_audiooutputIcon, QT_TRANSLATE_NOOP("@default", "Show output tracks"),   outputTrack },
-      {&addtrack_addmiditrackIcon,QT_TRANSLATE_NOOP("@default", "Show midi tracks"),     midiTrack   },
-      {&synthIcon,                QT_TRANSLATE_NOOP("@default", "Show synth tracks"),    midiTrack   },
+      {&addtrack_wavetrackIcon,   QT_TRANSLATE_NOOP("MusEGui::VisibleTracks", "Show wave tracks"),     waveTrack   },
+      {&addtrack_audiogroupIcon,  QT_TRANSLATE_NOOP("MusEGui::VisibleTracks", "Show group tracks"),    groupTrack  },
+      {&addtrack_auxsendIcon,     QT_TRANSLATE_NOOP("MusEGui::VisibleTracks", "Show aux tracks"),      auxTrack    },
+      {&addtrack_audioinputIcon,  QT_TRANSLATE_NOOP("MusEGui::VisibleTracks", "Show input tracks"),    inputTrack  },
+      {&addtrack_audiooutputIcon, QT_TRANSLATE_NOOP("MusEGui::VisibleTracks", "Show output tracks"),   outputTrack },
+      {&addtrack_addmiditrackIcon,QT_TRANSLATE_NOOP("MusEGui::VisibleTracks", "Show midi tracks"),     midiTrack   },
+      {&synthIcon,                QT_TRANSLATE_NOOP("MusEGui::VisibleTracks", "Show synth tracks"),    midiTrack   },
       };
 
 //---------------------------------------------------------
@@ -67,7 +68,7 @@ VisibleTracks::VisibleTracks(QWidget* parent, const char*)
       for (unsigned i = 0; i < sizeof(visTrackList)/sizeof(*visTrackList); ++i) {
             VisibleToolB* t = &visTrackList[i];
 
-            Action* a = new Action(action, i, t->tip, true);
+            Action* a = new Action(action, i, tr(t->tip).toAscii().data(), true);
             actions[n] = a;
             //a->setIconSet(QIcon(**(t->icon)));
             a->setIcon(QIcon(**(t->icon)));
@@ -130,6 +131,7 @@ void VisibleTracks::visibilityChanged(QAction* action)
       default:
             break;
       }
+      MusEGlobal::muse->changeConfig(true);    // save settings
       emit visibilityChanged();
 }
 
diff --git a/muse2/muse/widgets/visibletracks.h b/muse2/muse/widgets/visibletracks.h
index d56c9ce7..bf49c068 100644
--- a/muse2/muse/widgets/visibletracks.h
+++ b/muse2/muse/widgets/visibletracks.h
@@ -52,13 +52,14 @@ class VisibleTracks : public QToolBar {
 
    private slots:
       void visibilityChanged(QAction* action);
+   public slots:
+      void updateVisibleTracksButtons();
 
    signals:
       void visibilityChanged();
 
    public:
       VisibleTracks(QWidget* /*parent*/, const char* name = 0);  // Needs a parent !
-      void updateVisibleTracksButtons();
       ~VisibleTracks();
       };
 
diff --git a/muse2/muse/xml.cpp b/muse2/muse/xml.cpp
index 139437c1..45bed368 100644
--- a/muse2/muse/xml.cpp
+++ b/muse2/muse/xml.cpp
@@ -4,6 +4,7 @@
 //  $Id: xml.cpp,v 1.17.2.6 2009/12/07 20:48:45 spamatica Exp $
 //
 //  (C) Copyright 2000 Werner Schweer (ws@seh.de)
+//  (C) Copyright 2011 Tim E. Real (terminator356 on sourceforge)
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -24,6 +25,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 
+#include <QByteArray>
 #include <QString>
 #include <QColor>
 #include <QWidget>
@@ -112,9 +114,12 @@ void Xml::nextc()
 
 void Xml::token(int cc)
       {
-      char buffer[512];
+      //char buffer[512];
+      QByteArray buffer;
+
       int i = 0;
-      for (; i < 511;) {
+      //for (; i < 511;) {
+      for (; i < 9999999;) {   // Stop at a reasonably large amount 10 million.
             if (c == ' ' || c == '\t' || c == cc || c == '\n' || c == EOF)
                   break;
             buffer[i++] = c;
@@ -131,12 +136,16 @@ void Xml::token(int cc)
 
 void Xml::stoken()
       {
-      char buffer[1024*4];
+      //char buffer[1024*4];
+      QByteArray buffer;
+      
       int i = 0;
       buffer[i] = c;
       ++i;
       next();
-      for (;i < 1024*4-1;) {
+
+      //for (;i < 1024*4-1;) {
+      for (;i < 10000000*4-1;) {  // Stop at a reasonably large amount 10 million.
             if (c == '"') {
                   buffer[i++] = c;
                   next();
@@ -207,8 +216,10 @@ QString Xml::strip(const QString& s)
 
 Xml::Token Xml::parse()
       {
-      char buffer[1024*1024];   // increase buffer -rj
-      char* p;
+      //char buffer[1024*1024];   // increase buffer -rj
+      //char* p;
+      QByteArray buffer;
+      int idx = 0;
 
  again:
       bool endFlag = false;
@@ -262,15 +273,23 @@ Xml::Token Xml::parse()
                   }
             if (c == '?') {
                   next();
-                  p = buffer;
+                  //p = buffer;
+                  //p = buffer.data();
+                  idx = 0;
                   for (;;) {
                         if (c == '?' || c == EOF || c == '>')
                               break;
-                        *p++ = c;
+                        
+                        //*p++ = c;
+                        buffer[idx++] = c;
+                        
                         // TODO: check overflow
                         next();
                         }
-                  *p = 0;
+                  
+                  //*p = 0;
+                  buffer[idx] = 0;
+                  
                   _s1 = QString(buffer);
                   if (c == EOF) {
                         fprintf(stderr, "XML: unexpected EOF\n");
@@ -298,15 +317,23 @@ Xml::Token Xml::parse()
                         }
                   goto again;
                   }
-            p = buffer;
+            //p = buffer;
+            //p = buffer.data();
+            idx = 0;
             for (;;) {
                   if (c == '/' || c == ' ' || c == '\t' || c == '>' || c == '\n' || c == EOF)
                         break;
                   // TODO: check overflow
-                  *p++ = c;
+                  
+                  //*p++ = c;
+                  buffer[idx++] = c;
+                  
                   next();
                   }
-            *p = 0;
+            
+            //*p = 0;
+            buffer[idx] = 0;
+            
             _s1 = QString(buffer);
             // skip white space:
             while (c == ' ' || c == '\t' || c == '\n')
@@ -355,26 +382,43 @@ Xml::Token Xml::parse()
                   fprintf(stderr, "XML: level = 0\n");
                   goto error;
                   }
-            p = buffer;
+            //p = buffer;
+            //p = buffer.data();
+            idx = 0;
             for (;;) {
                   if (c == EOF || c == '<')
                         break;
                   if (c == '&') {
                         next();
                         if (c == '<') {         // be tolerant with old muse files
-                              *p++ = '&';
+                              
+                              //*p++ = '&';
+                              buffer[idx++] = '&';
+                              
                               continue;
                               }
-                        char name[32];
-                        char* dp = name;
-                        *dp++ = c;
-                        for (; dp-name < 31;) {
+                              
+                        //char name[32];
+                        //char* dp = name;
+                        QByteArray name;
+                        int name_idx = 0;
+                        
+                        //*dp++ = c;
+                        name[name_idx++] = c;
+                        
+                        //for (; dp-name < 31;) {
+                        for (; name_idx < 9999999;) {   // Stop at a reasonably large amount 10 million.
                               next();
                               if (c == ';')
                                     break;
-                              *dp++ = c;
+                              
+                              //*dp++ = c;
+                              name[name_idx++] = c;
                               }
-                        *dp = 0;
+                              
+                        //*dp = 0;
+                        name[name_idx] = 0;
+                        
                         if (strcmp(name, "lt") == 0)
                               c = '<';
                         else if (strcmp(name, "gt") == 0)
@@ -388,10 +432,16 @@ Xml::Token Xml::parse()
                         else
                               c = '?';
                         }
-                  *p++ = c;
+                        
+                  //*p++ = c;
+                  buffer[idx++] = c;
+                  
                   next();
                   }
-            *p = 0;
+                  
+            //*p = 0;
+            buffer[idx] = 0;
+            
             _s1 = QString(buffer);
 
             if (c == '<')
diff --git a/muse2/share/locale/muse_de.ts b/muse2/share/locale/muse_de.ts
index 36406282..5b827ede 100644
--- a/muse2/share/locale/muse_de.ts
+++ b/muse2/share/locale/muse_de.ts
@@ -4,9 +4,8 @@
 <context>
     <name>@default</name>
     <message>
-        <location filename="../../muse/transport.cpp" line="+46"/>
         <source>Click this button to enable recording</source>
-        <translation>Auf diese Schaltfläche klicken um in den Modus &quot;Aufnahme&quot; zu gelangen</translation>
+        <translation type="obsolete">Auf diese Schaltfläche klicken um in den Modus &quot;Aufnahme&quot; zu gelangen</translation>
     </message>
     <message>
         <source>sets amount of quantization:
@@ -17,59 +16,50 @@
 100 - volle Quantisierung</translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/tools.cpp" line="+33"/>
         <source>select Pointer Tool:
 with the pointer tool you can:
   select parts
   move parts
   copy parts</source>
-        <translation>Werkzeug &quot;Zeiger&quot;:
+        <translation type="obsolete">Werkzeug &quot;Zeiger&quot;:
 Dieses Werkzeug ermöglicht:
   Parts auswählen
   Parts verschieben
   Parts kopieren</translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="+89"/>
         <source>Click this button to open a &lt;em&gt;new song&lt;/em&gt;.&lt;br&gt;You can also select the &lt;b&gt;Open command&lt;/b&gt; from the File menu.</source>
-        <translation>Auf diese Schaltfläche klicken um ein &lt;em&gt;Neues Lied&lt;/em&gt; zu öffnen.&lt;br&gt; Alternativ den Befehl &lt;b&gt;Neues Lied&lt;/b&gt; des Menüs &quot;Datei&quot; auswählen.</translation>
+        <translation type="obsolete">Auf diese Schaltfläche klicken um ein &lt;em&gt;Neues Lied&lt;/em&gt; zu öffnen.&lt;br&gt; Alternativ den Befehl &lt;b&gt;Neues Lied&lt;/b&gt; des Menüs &quot;Datei&quot; auswählen.</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Click this button to save the song you are editing.  You will be prompted for a file name.
 You can also select the Save command from the File menu.</source>
-        <translation>Auf diese Schaltfläche klicken um das gerade bearbeitete Lied zu sichern mit der automatischen Aufforderung einen Dateinamen anzugeben.
+        <translation type="obsolete">Auf diese Schaltfläche klicken um das gerade bearbeitete Lied zu sichern mit der automatischen Aufforderung einen Dateinamen anzugeben.
 Alternativ das Lied mit dem Befehl &quot;Sichern&quot; im Menü &quot;Datei&quot; sichern.</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Create New Song</source>
-        <translation>Neues Lied erzeugen</translation>
+        <translation type="obsolete">Neues Lied erzeugen</translation>
     </message>
     <message>
-        <location filename="../../muse/transport.cpp" line="+1"/>
         <source>Click this button to stop playback</source>
-        <translation>Klicke auf diese Schaltfläche um die Wiedergabe zu stoppen</translation>
+        <translation type="obsolete">Klicke auf diese Schaltfläche um die Wiedergabe zu stoppen</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Click this button to start playback</source>
-        <translation>Klicke auf diese Schaltfläche um die Wiedergabe zu starten</translation>
+        <translation type="obsolete">Klicke auf diese Schaltfläche um die Wiedergabe zu starten</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Click this button to rewind to start position</source>
-        <translation>Klicke auf diese Schaltfläche um zur Startposition zurückzukehren</translation>
+        <translation type="obsolete">Klicke auf diese Schaltfläche um zur Startposition zurückzukehren</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Click this button to rewind</source>
-        <translation>Klicke auf diese Schaltfläche um einen Taktschlag rückwärts zu springen</translation>
+        <translation type="obsolete">Klicke auf diese Schaltfläche um einen Taktschlag rückwärts zu springen</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Click this button to forward current play position</source>
-        <translation>Klicke auf diese Schaltfläche um einen Taktschlag vorwärts zu springen</translation>
+        <translation type="obsolete">Klicke auf diese Schaltfläche um einen Taktschlag vorwärts zu springen</translation>
     </message>
     <message>
         <source>don&apos;t quantize notes above this tick limit</source>
@@ -80,183 +70,145 @@ Alternativ das Lied mit dem Befehl &quot;Sichern&quot; im Menü &quot;Datei&quot
         <translation type="obsolete">Auch die Notenlänge als Standard quantisieren</translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="+2"/>
         <source>loop between left mark and right mark</source>
-        <translation>Schleife zwischen linkem und rechtem Marker erzeugen</translation>
+        <translation type="obsolete">Schleife zwischen linkem und rechtem Marker erzeugen</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>record starts at left mark</source>
-        <translation>Aufnahme am linken Marker beginnen</translation>
+        <translation type="obsolete">Aufnahme am linken Marker beginnen</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>record stops at right mark</source>
-        <translation>Aufnahme am rechten Marker beenden</translation>
+        <translation type="obsolete">Aufnahme am rechten Marker beenden</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>rewind to start position</source>
-        <translation>Zur Startposition springen</translation>
+        <translation type="obsolete">Zur Startposition springen</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>rewind current position</source>
-        <translation>Einen Taktschlag rückwärts</translation>
+        <translation type="obsolete">Einen Taktschlag rückwärts</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>move current position</source>
-        <translation>Einen Taktschlag vorwärts</translation>
+        <translation type="obsolete">Einen Taktschlag vorwärts</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>stop sequencer</source>
-        <translation>Wiedergabe beenden</translation>
+        <translation type="obsolete">Wiedergabe beenden</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>start sequencer play</source>
-        <translation>Wiedergabe beginnen</translation>
+        <translation type="obsolete">Wiedergabe beginnen</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>to record press record and then play</source>
-        <translation>Zur Aufnahme erst die Schaltfläche &quot;Aufnahme&quot; und dann &quot;Wiedergabe&quot; klicken</translation>
+        <translation type="obsolete">Zur Aufnahme erst die Schaltfläche &quot;Aufnahme&quot; und dann &quot;Wiedergabe&quot; klicken</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>send note off to all midi channels</source>
-        <translation>Panik - &quot;Note aus&quot; Befehl an alle Midikanäle senden</translation>
+        <translation type="obsolete">Panik - &quot;Note aus&quot; Befehl an alle Midikanäle senden</translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/tools.cpp" line="+5"/>
         <source>select Pencil Tool:
 with the pencil tool you can:
   create new parts
   modify length of parts</source>
-        <translation>Werkzeug &quot;Zeichenstift&quot;:
+        <translation type="obsolete">Werkzeug &quot;Zeichenstift&quot;:
 Dieses Werkzeug ermöglicht:
   Neue Parts erzeugen
   Die Länge einzelner Parts ändern</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>select Delete Tool:
 with the delete tool you can delete parts</source>
-        <translation>Werkzeug &quot;Radierer&quot;:
+        <translation type="obsolete">Werkzeug &quot;Radierer&quot;:
   mit diesem Werkzeug werden Parts gelöscht</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>select Cut Tool:
 with the cut tool you can split a part</source>
-        <translation>Werkzeug &quot;Schnitt&quot;:
+        <translation type="obsolete">Werkzeug &quot;Schnitt&quot;:
   mit diesem Werkzeug werden Parts geteilt</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>select Glue Tool:
 with the glue tool you can glue two parts</source>
-        <translation>Werkzeug &quot;Verbinder&quot;:
+        <translation type="obsolete">Werkzeug &quot;Verbinder&quot;:
   mit diesem Werkzeug werden zwei einzelne Parts zu einem verbunden</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>select Score Tool:
 </source>
-        <translation>Werkzeug &quot;Notensatz&quot;:</translation>
+        <translation type="obsolete">Werkzeug &quot;Notensatz&quot;:</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>select Quantize Tool:
 insert display quantize event</source>
-        <translation>Werkzeug &quot;Quantisierung&quot;:
+        <translation type="obsolete">Werkzeug &quot;Quantisierung&quot;:
  mit diesem Werkzeug werden quantisierte Ereignisse eingefügt</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>select Drawing Tool</source>
-        <translation>Werkzeug &quot;Zeichenstift&quot;</translation>
+        <translation type="obsolete">Werkzeug &quot;Zeichenstift&quot;</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>select Muting Tool:
 click on part to mute/unmute</source>
-        <translation>Werkzeug &quot;Stille&quot;:
+        <translation type="obsolete">Werkzeug &quot;Stille&quot;:
  Klicke auf einen Part um diesen still/laut zu schalten</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Manipulate automation</source>
-        <translation type="unfinished">Automatisierung manipulieren</translation>
+        <translation type="obsolete">Automatisierung manipulieren</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Cursor tool</source>
-        <translation>Zeiger-Werkzeug</translation>
+        <translation type="obsolete">Zeiger-Werkzeug</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>pointer</source>
-        <translation>Zeiger</translation>
+        <translation type="obsolete">Zeiger</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>pencil</source>
-        <translation>Zeichenstift</translation>
+        <translation type="obsolete">Zeichenstift</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>cutter</source>
-        <translation>Schnitt</translation>
+        <translation type="obsolete">Schnitt</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>score</source>
-        <translation>Notensatz</translation>
+        <translation type="obsolete">Notensatz</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>glue</source>
-        <translation>Verbinder</translation>
+        <translation type="obsolete">Verbinder</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>quantize</source>
-        <translation>Quantisierung</translation>
+        <translation type="obsolete">Quantisierung</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>draw</source>
-        <translation>Zeichenstift</translation>
+        <translation type="obsolete">Zeichenstift</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>mute parts</source>
-        <translation>Schalte Part still</translation>
+        <translation type="obsolete">Schalte Part still</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>edit automation</source>
-        <translation>Automatisierung bearbeiten</translation>
+        <translation type="obsolete">Automatisierung bearbeiten</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>cursor</source>
-        <translation>Zeiger</translation>
+        <translation type="obsolete">Zeiger</translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="+155"/>
-        <location filename="../../muse/master/masteredit.cpp" line="+155"/>
-        <location filename="../../muse/widgets/comboQuant.cpp" line="+40"/>
-        <location line="+1"/>
-        <location line="+1"/>
-        <location filename="../../muse/widgets/tb1.cpp" line="+48"/>
-        <location line="+1"/>
-        <location line="+1"/>
         <source>Off</source>
-        <translation>Aus</translation>
+        <translation type="obsolete">Aus</translation>
     </message>
     <message>
         <source>presets (*.pre *.pre.gz *.pre.bz2)</source>
@@ -267,232 +219,188 @@ click on part to mute/unmute</source>
         <translation type="obsolete">Alle Dateien (*)</translation>
     </message>
     <message>
-        <location filename="../../muse/helper.cpp" line="+285"/>
+        <location filename="../../muse/helper.cpp" line="+189"/>
         <source>Add Midi Track</source>
-        <translation type="unfinished">Midispur erzeugen</translation>
+        <translation>Midispur hinzufügen</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>Add Drum Track</source>
-        <translation type="unfinished">Schlagzeugspur erzeugen</translation>
+        <translation>Schlagzeugspur hinzufügen</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>Add Wave Track</source>
-        <translation type="unfinished">Wavespur erzeugen</translation>
+        <translation>Wavespur hinzufügen</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+7"/>
         <source>Add Audio Output</source>
-        <translation type="unfinished">Audioausgang erzeugen</translation>
+        <translation>Audioausgang hinzufügen</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+7"/>
         <source>Add Audio Group</source>
-        <translation type="unfinished">Audiogruppe erzeugen</translation>
+        <translation>Audiogruppe hinzufügen</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+7"/>
         <source>Add Audio Input</source>
-        <translation type="unfinished">Audioeingang erzeugen</translation>
+        <translation>Audioeingang hinzufügen</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+7"/>
         <source>Add Aux Send</source>
-        <translation type="unfinished">Aux Send erzeugen</translation>
+        <translation>Aux Send hinzufügen</translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/tools.cpp" line="-8"/>
         <source>eraser</source>
-        <translation>Radierer</translation>
+        <translation type="obsolete">Radierer</translation>
     </message>
     <message>
-        <location filename="../../muse/helper.cpp" line="-67"/>
         <source>MESS</source>
-        <translation type="unfinished">MESS</translation>
+        <translation type="obsolete">MESS</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>DSSI</source>
-        <translation type="unfinished">DSSI</translation>
+        <translation type="obsolete">DSSI</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>FST</source>
-        <translation type="unfinished">FST</translation>
+        <translation type="obsolete">FST</translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+9"/>
         <source>Add Synth</source>
         <translation>Synthesizer hinzufügen</translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="+0"/>
         <source>Bar</source>
-        <translation>Takt</translation>
+        <translation type="obsolete">Takt</translation>
     </message>
     <message>
-        <location filename="../../muse/confmport.cpp" line="+729"/>
         <source> Jack</source>
-        <translation>Jack</translation>
+        <translation type="obsolete">Jack</translation>
     </message>
     <message>
-        <location line="+46"/>
         <source>ALSA:</source>
-        <translation>ALSA:</translation>
+        <translation type="obsolete">ALSA:</translation>
     </message>
     <message>
-        <location line="+26"/>
         <source>SYNTH:</source>
-        <translation>SYNTH:</translation>
+        <translation type="obsolete">SYNTH:</translation>
     </message>
     <message>
-        <location line="+26"/>
         <source>JACK:</source>
-        <translation>JACK:</translation>
+        <translation type="obsolete">JACK:</translation>
     </message>
     <message>
-        <location filename="../../muse/driver/alsamidi.cpp" line="+209"/>
-        <location filename="../../muse/driver/jackmidi.cpp" line="+290"/>
-        <location filename="../../muse/midiport.cpp" line="+1138"/>
-        <location filename="../../muse/track.cpp" line="+799"/>
-        <location line="+16"/>
-        <location line="+30"/>
+        <location filename="../../muse/midiport.cpp" line="+1190"/>
         <source>Route</source>
         <translation>Signalfluss</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location filename="../../muse/driver/jackmidi.cpp" line="+2"/>
-        <location filename="../../muse/track.cpp" line="-28"/>
-        <location line="+37"/>
         <source> channel=&quot;%1&quot;</source>
-        <translation>Kanal=&quot;%1&quot;</translation>
+        <translation type="obsolete">Kanal=&quot;%1&quot;</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location filename="../../muse/driver/jackmidi.cpp" line="+3"/>
-        <location filename="../../muse/midiport.cpp" line="+7"/>
-        <location filename="../../muse/track.cpp" line="-48"/>
-        <location line="+60"/>
+        <location line="+7"/>
         <source>dest</source>
         <translation>Ziel</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location filename="../../muse/driver/jackmidi.cpp" line="+2"/>
         <source> devtype=&quot;%1&quot;</source>
-        <translation>Gerätetyp=&quot;%1&quot;</translation>
+        <translation type="obsolete">Gerätetyp=&quot;%1&quot;</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location filename="../../muse/driver/jackmidi.cpp" line="-20"/>
-        <location line="+23"/>
-        <location filename="../../muse/track.cpp" line="-42"/>
-        <location line="+48"/>
         <source> type=&quot;%1&quot;</source>
-        <translation>Typ=&quot;%1&quot;</translation>
+        <translation type="obsolete">Typ=&quot;%1&quot;</translation>
     </message>
     <message>
         <location line="+1"/>
-        <location filename="../../muse/driver/jackmidi.cpp" line="-22"/>
-        <location line="+23"/>
-        <location filename="../../muse/midiport.cpp" line="+1"/>
-        <location filename="../../muse/track.cpp" line="-65"/>
-        <location line="+18"/>
-        <location line="+53"/>
         <source> name=&quot;%1&quot;/</source>
         <translation>Name=&quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="../../muse/driver/jackmidi.cpp" line="-26"/>
-        <location filename="../../muse/track.cpp" line="-56"/>
         <source>source</source>
-        <translation>Quelle</translation>
+        <translation type="obsolete">Quelle</translation>
     </message>
     <message>
-        <location filename="../../muse/midictrl.cpp" line="+242"/>
         <source>Velocity</source>
-        <translation>Anschlag</translation>
+        <translation type="obsolete">Anschlag</translation>
+    </message>
+    <message>
+        <location line="-857"/>
+        <source>Warning: No output devices!</source>
+        <translation>Warnung: Keine Ausgangsgeräte!</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Open midi config...</source>
+        <translation>Öffne MIDI-Konfig...</translation>
     </message>
     <message>
-        <location filename="../../muse/midiport.cpp" line="-807"/>
+        <location line="+23"/>
+        <source>Empty ports</source>
+        <translation>Leere Ports</translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>&lt;none&gt;</source>
         <translation>&lt;kein&gt;</translation>
     </message>
     <message>
         <location line="+801"/>
-        <location filename="../../muse/track.cpp" line="-21"/>
-        <location line="+48"/>
         <source> channelMask=&quot;%1&quot;</source>
         <translation>KanalMaske=&quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="../../muse/osc.cpp" line="+1320"/>
         <source>dssi_synth</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">dssi_synth</translation>
     </message>
     <message>
-        <location line="+87"/>
         <source>ladspa_efx</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">ladspa_efx</translation>
     </message>
     <message>
-        <location filename="../../muse/track.cpp" line="+8"/>
         <source> channels=&quot;%1&quot;</source>
-        <translation>Kanäle=&quot;%1&quot;</translation>
+        <translation type="obsolete">Kanäle=&quot;%1&quot;</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source> remch=&quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"> remch=&quot;%1&quot;</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source> mport=&quot;%1&quot;/</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"> mport=&quot;%1&quot;/</translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/visibletracks.cpp" line="+35"/>
-        <location line="+9"/>
         <source>Show wave tracks</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Zeige Wave-Spuren</translation>
     </message>
     <message>
-        <location line="-8"/>
-        <location line="+9"/>
         <source>Show group tracks</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Zeige Gruppen-Spuren</translation>
     </message>
     <message>
-        <location line="-8"/>
-        <location line="+9"/>
         <source>Show aux tracks</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Zeige Aux-Spuren</translation>
     </message>
     <message>
-        <location line="-8"/>
-        <location line="+9"/>
         <source>Show input tracks</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Zeige Eingangs-Spuren</translation>
     </message>
     <message>
-        <location line="-8"/>
-        <location line="+9"/>
         <source>Show output tracks</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Zeige Ausgangs-Spuren</translation>
     </message>
     <message>
-        <location line="-8"/>
-        <location line="+9"/>
         <source>Show midi tracks</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Zeige Midi-Spuren</translation>
     </message>
     <message>
-        <location line="-8"/>
-        <location line="+9"/>
         <source>Show synth tracks</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Zeige Synth-Spuren</translation>
     </message>
 </context>
 <context>
@@ -509,7 +417,7 @@ click on part to mute/unmute</source>
     <message>
         <location line="+37"/>
         <source>Version 2 pre-alpha</source>
-        <translation type="unfinished"></translation>
+        <translation>Version 2 pre-alpha</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -518,95 +426,28 @@ See http://www.muse-sequencer.org for new versions and
 more information.
 
 Published under the GNU Public License</source>
-        <translation type="unfinished"></translation>
+        <translation>(C) Copyright 1999-2010 Werner Schweer und andere.
+Siehe http://www.muse-sequencer.org für neue Versionen und
+mehr Informationen.
+
+Veröffentlicht unter der GNU Public License</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>&amp;Keep On Rocking!</source>
-        <translation type="unfinished"></translation>
+        <translation>Weiterroc&amp;ken!</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Alt+K</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt+K</translation>
     </message>
 </context>
 <context>
     <name>Appearance</name>
     <message>
-        <location filename="../../muse/appearance.cpp" line="+769"/>
         <source>MusE: load image</source>
-        <translation>MusE: Bild laden</translation>
-    </message>
-    <message>
-        <location line="-639"/>
-        <source>Main application font, and default font for any
- controls not defined here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>For small controls like mixer strips.
-Also timescale small numbers, arranger part name overlay,
- and effects rack.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Midi track info panel. Transport controls.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Controller graph and S/X buttons. Large numbers for time
- and tempo scale, and time signature.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Time scale markers.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>List editor: meta event edit dialog multi-line edit box.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Mixer label font. Auto-font-sizing up to chosen font size.
-Word-breaking but only with spaces.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Maximum mixer label auto-font-sizing font size.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Global opacity (opposite of transparency).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Standard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Custom</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+958"/>
-        <source>Select style sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Qt style sheets (*.qss)</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">MusE: Bild laden</translation>
     </message>
 </context>
 <context>
@@ -638,7 +479,7 @@ Word-breaking but only with spaces.</source>
     <message>
         <location line="-16"/>
         <source>MusE: Appearance settings</source>
-        <translation type="unfinished"></translation>
+        <translation>MusE: Erscheinungsbild einstellen</translation>
     </message>
     <message>
         <location line="+28"/>
@@ -663,7 +504,7 @@ Word-breaking but only with spaces.</source>
     <message>
         <location line="+28"/>
         <source>y-stretch</source>
-        <translation type="unfinished"></translation>
+        <translation>strecke y</translation>
     </message>
     <message>
         <location line="+15"/>
@@ -736,12 +577,12 @@ Word-breaking but only with spaces.</source>
     <message>
         <location line="+756"/>
         <source>Color name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Farbname:</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Global opacity</source>
-        <translation type="unfinished"></translation>
+        <translation>Globale Durchsichtigkeit</translation>
     </message>
     <message>
         <location line="+48"/>
@@ -881,12 +722,12 @@ Word-breaking but only with spaces.</source>
     <message>
         <location line="-64"/>
         <source>add</source>
-        <translation type="unfinished">Zufgen</translation>
+        <translation>hinzufügen</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>remove</source>
-        <translation type="unfinished">entfernen</translation>
+        <translation>entfernen</translation>
     </message>
     <message>
         <location line="+586"/>
@@ -926,17 +767,17 @@ Word-breaking but only with spaces.</source>
     <message>
         <location line="-772"/>
         <source>clear</source>
-        <translation type="unfinished"></translation>
+        <translation>löschen</translation>
     </message>
     <message>
         <location line="+953"/>
         <source>Style Sheet:</source>
-        <translation type="unfinished"></translation>
+        <translation>Formatvorlage:</translation>
     </message>
     <message>
         <location line="+345"/>
         <source>Font 6</source>
-        <translation type="unfinished">Schriftart 6</translation>
+        <translation>Schriftart 6</translation>
     </message>
 </context>
 <context>
@@ -1408,12 +1249,12 @@ Word-breaking but only with spaces.</source>
     <message>
         <location filename="../../awl/midivolentry.cpp" line="+37"/>
         <source>off</source>
-        <translation type="unfinished"></translation>
+        <translation>aus</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>db</source>
-        <translation type="unfinished"></translation>
+        <translation>dB</translation>
     </message>
 </context>
 <context>
@@ -1421,7 +1262,7 @@ Word-breaking but only with spaces.</source>
     <message>
         <location filename="../../awl/volentry.cpp" line="+34"/>
         <source>off</source>
-        <translation type="unfinished"></translation>
+        <translation>aus</translation>
     </message>
 </context>
 <context>
@@ -1450,29 +1291,12 @@ Word-breaking but only with spaces.</source>
 <context>
     <name>ClipListEdit</name>
     <message>
-        <location filename="../../muse/cliplist/cliplist.cpp" line="+127"/>
-        <source>MusE: Clip List Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
         <source>Undo/Redo tools</source>
-        <translation type="unfinished">Rückgängig/Wiederho</translation>
+        <translation type="obsolete">Rückgängig/Wiederho</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>panic</source>
-        <translation type="unfinished">Panik</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>transport</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Panik</translation>
     </message>
 </context>
 <context>
@@ -1548,7 +1372,7 @@ Word-breaking but only with spaces.</source>
         <translation type="obsolete">MusE: Konfiguration Midi Datei exportieren</translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/configmidifilebase.ui" line="+193"/>
+        <location filename="../../muse/widgets/configmidifilebase.ui" line="+202"/>
         <source>&amp;OK</source>
         <translation>&amp;Bestätigen</translation>
     </message>
@@ -1568,7 +1392,7 @@ Word-breaking but only with spaces.</source>
         <translation>1 (mehrere Spuren)</translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-52"/>
         <source>Format:</source>
         <translation>Format:</translation>
     </message>
@@ -1588,12 +1412,12 @@ Word-breaking but only with spaces.</source>
         <translation>384</translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+64"/>
         <source>Division:</source>
         <translation>Unterteilung:</translation>
     </message>
     <message>
-        <location line="-20"/>
+        <location line="-36"/>
         <source>Copyright:</source>
         <translation>Copyright:</translation>
     </message>
@@ -1602,59 +1426,64 @@ Word-breaking but only with spaces.</source>
         <translation type="obsolete">Aktiviere erweitertes SMF Format</translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-91"/>
         <source>MusE: Config Midi File Import/Export</source>
-        <translation type="unfinished"></translation>
+        <translation>MusE: Konfiguriere MIDI-Datei Import/Export</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+15"/>
         <source>Import:</source>
-        <translation type="unfinished"></translation>
+        <translation>Import:</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+9"/>
         <source>Split tracks into &amp;parts</source>
-        <translation type="unfinished"></translation>
+        <translation>Spuren in &amp;Parts teilen</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Alt+P</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt+P</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-6"/>
         <source>Split tracks into parts, or one single part</source>
-        <translation type="unfinished"></translation>
+        <translation>Spuren in Parts teilen, oder einzelnen Part erstellen</translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+22"/>
         <source>Export:</source>
-        <translation type="unfinished"></translation>
+        <translation>Export:</translation>
     </message>
     <message>
         <location line="+31"/>
         <source>Enable extended smf format (currently not implemented)</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktiviere erweitertes SMF-Format (momentan nicht implementiert)</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Use &amp;2-byte time signatures instead of standard 4</source>
-        <translation type="unfinished"></translation>
+        <translation>Benutze &amp;2-byte-Zeitsignaturen statt standardmäßig 4-byte</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Alt+2</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt+2</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+33"/>
+        <source>Note: Format 0 uses the FIRST midi track&apos;s name/comment in the arranger</source>
+        <translation>#Hinweis: Format 0 nutzt den Namen/Kommentar der ERSTEN Midispur im Arranger</translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Save space by replacing note-offs with &amp;zero velocity note-ons</source>
-        <translation type="unfinished"></translation>
+        <translation>Platz sparen, indem Note-offs durch Note-ons mit Anschlagsdynamik &amp;0 ersetzt werden</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Alt+Z</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt+Z</translation>
     </message>
 </context>
 <context>
@@ -1662,76 +1491,74 @@ Word-breaking but only with spaces.</source>
     <message>
         <location filename="../../muse/widgets/function_dialogs/crescendobase.ui" line="+14"/>
         <source>MusE: Crescendo/Decrescendo</source>
-        <translation type="unfinished"></translation>
+        <translation>MusE: Crescendo/Decrescendo</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Range</source>
-        <translation type="unfinished">Bereich</translation>
+        <translation>Bereich</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Looped Events</source>
-        <translation type="unfinished">Ereignisse innerhalb Schleife</translation>
+        <translation>Ereignisse innerhalb Schleife</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Selected Looped</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausgewählt und innerhalb der Schleife</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Values</source>
-        <translation type="unfinished">Werte</translation>
+        <translation>Werte</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Start velocity</source>
-        <translation type="unfinished"></translation>
+        <translation>Anfangsdynamik</translation>
     </message>
     <message>
         <location line="+10"/>
         <location line="+43"/>
         <source> %</source>
-        <translation type="unfinished"></translation>
+        <translation>%</translation>
     </message>
     <message>
         <location line="-27"/>
         <source>End velocity</source>
-        <translation type="unfinished"></translation>
+        <translation>Enddynamik</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Absolute</source>
-        <translation type="unfinished"></translation>
+        <translation>Absolut</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Relative</source>
-        <translation type="unfinished"></translation>
+        <translation>Relativ</translation>
     </message>
     <message>
         <location line="+60"/>
         <source>OK</source>
-        <translation type="unfinished">Bestätigen</translation>
+        <translation>Bestätigen</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Cancel</source>
-        <translation type="unfinished">Abbrechen</translation>
+        <translation>Abbrechen</translation>
     </message>
 </context>
 <context>
     <name>CtrlPanel</name>
     <message>
-        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="+94"/>
         <source>select controller</source>
-        <translation>Kontroller wählen</translation>
+        <translation type="obsolete">Kontroller wählen</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>remove panel</source>
-        <translation>Kontrolleransicht schließen</translation>
+        <translation type="obsolete">Kontrolleransicht schließen</translation>
     </message>
     <message>
         <source>Sel</source>
@@ -1742,75 +1569,24 @@ Word-breaking but only with spaces.</source>
         <translation type="obsolete">Schließen</translation>
     </message>
     <message>
-        <location line="+463"/>
-        <location line="+236"/>
         <source>Velocity</source>
-        <translation>Velocity</translation>
+        <translation type="obsolete">Velocity</translation>
     </message>
     <message>
-        <location line="-186"/>
         <source>add new ...</source>
-        <translation>Neuen Kontroller hinzufügen ...</translation>
+        <translation type="obsolete">Neuen Kontroller hinzufügen ...</translation>
     </message>
     <message>
-        <location line="-528"/>
         <source>S</source>
-        <translation type="unfinished">S</translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>X</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>manual adjust</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+9"/>
-        <source>double click on/off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+653"/>
-        <location line="+58"/>
-        <source>Instrument-defined</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-43"/>
-        <location line="+21"/>
-        <source>Add ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-17"/>
-        <source>Others</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+65"/>
-        <source>Edit instrument ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+46"/>
-        <source>Common Controls</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">S</translation>
     </message>
 </context>
 <context>
     <name>DeicsOnzeGui</name>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="+538"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="+540"/>
         <source>Save configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>Konfiguration speichern</translation>
     </message>
     <message>
         <location line="+41"/>
@@ -1824,7 +1600,7 @@ Word-breaking but only with spaces.</source>
         <location line="+165"/>
         <location line="+7"/>
         <source>Critical Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Kritischer Fehler</translation>
     </message>
     <message>
         <location line="-1762"/>
@@ -1833,7 +1609,7 @@ Word-breaking but only with spaces.</source>
         <location line="+167"/>
         <location line="+172"/>
         <source>Cannot open file %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Kann Datei &quot;%1&quot; nicht öffnen</translation>
     </message>
     <message>
         <location line="-1749"/>
@@ -1842,286 +1618,289 @@ Word-breaking but only with spaces.</source>
         <location line="+167"/>
         <location line="+172"/>
         <source>Parsing error for file %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Fehler beim Parsen von Datei &quot;%1&quot;</translation>
     </message>
     <message>
         <location line="-1722"/>
         <location line="+1364"/>
         <source>Load category dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Kategorie laden</translation>
     </message>
     <message>
         <location line="-226"/>
         <source>Load set dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Set laden</translation>
     </message>
     <message>
         <location line="+67"/>
         <source>Save set dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Set speichern</translation>
     </message>
     <message>
         <location line="+24"/>
         <source>New category</source>
-        <translation type="unfinished"></translation>
+        <translation>Neue Kategorie</translation>
     </message>
     <message>
         <location line="+2"/>
         <location line="+101"/>
         <source>Delete category</source>
-        <translation type="unfinished"></translation>
+        <translation>Kategorie löschen</translation>
     </message>
     <message>
         <location line="-99"/>
         <source>Load category</source>
-        <translation type="unfinished"></translation>
+        <translation>Kategorie laden</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Save category</source>
-        <translation type="unfinished"></translation>
+        <translation>Kategorie speichern</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Load set</source>
-        <translation type="unfinished"></translation>
+        <translation>Set laden</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Save set</source>
-        <translation type="unfinished"></translation>
+        <translation>Set speichern</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Delete set</source>
-        <translation type="unfinished"></translation>
+        <translation>Set löschen</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>New subcategory</source>
-        <translation type="unfinished"></translation>
+        <translation>Neue Unterkategorie</translation>
     </message>
     <message>
         <location line="+3"/>
         <location line="+243"/>
         <source>Delete subcategory</source>
-        <translation type="unfinished"></translation>
+        <translation>Unterkategorie löschen</translation>
     </message>
     <message>
         <location line="-240"/>
         <source>Load subcategory</source>
-        <translation type="unfinished"></translation>
+        <translation>Unterkategorie laden</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Save subcategory</source>
-        <translation type="unfinished"></translation>
+        <translation>Unterkategorie speichern</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>New preset</source>
-        <translation type="unfinished"></translation>
+        <translation>Neue Vorlage</translation>
     </message>
     <message>
         <location line="+2"/>
         <location line="+389"/>
         <source>Delete preset</source>
-        <translation type="unfinished"></translation>
+        <translation>Vorlade löschen</translation>
     </message>
     <message>
         <location line="-387"/>
         <source>Load preset</source>
-        <translation type="unfinished"></translation>
+        <translation>Vorlage laden</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Save preset</source>
-        <translation type="unfinished"></translation>
+        <translation>Vorlage speichern</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>No more category supported</source>
-        <translation type="unfinished"></translation>
+        <translation>Keine weiteren Kategorien unterstützt</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>You can not add more categories</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie können keine weiteren Kategorien hinzufügen</translation>
     </message>
     <message>
         <location line="+23"/>
         <location line="+169"/>
         <location line="+171"/>
         <source>Do you really want to delete %1 ?</source>
-        <translation type="unfinished"></translation>
+        <translation>Möchten Sie wirklich %1 löschen?</translation>
     </message>
     <message>
         <location line="-338"/>
         <location line="+170"/>
         <location line="+170"/>
         <source>&amp;Yes</source>
-        <translation type="unfinished">&amp;Ja</translation>
+        <translation>&amp;Ja</translation>
     </message>
     <message>
         <location line="-340"/>
         <location line="+170"/>
         <location line="+170"/>
         <source>&amp;No</source>
-        <translation type="unfinished">&amp;Nein</translation>
+        <translation>&amp;Nein</translation>
     </message>
     <message>
         <location line="-323"/>
         <location line="+110"/>
         <source>No category selected</source>
-        <translation type="unfinished"></translation>
+        <translation>Keine Kategorie ausgewählt</translation>
     </message>
     <message>
         <location line="-109"/>
         <location line="+110"/>
         <source>You must first select a category.</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie müssen zuerst eine Kategorie auswählen.</translation>
     </message>
     <message>
         <location line="-61"/>
         <location line="+167"/>
         <location line="+172"/>
         <source>Replace or add</source>
-        <translation type="unfinished"></translation>
+        <translation>Ersetzen oder Hinzufügen</translation>
     </message>
     <message>
         <location line="-338"/>
         <source>%1 is supposed to be affected to the hbank number %2, but there is already one on this slot.
  Do you want to replace it or to add it in the next free slot ?</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 soll mit der hbank-Nummer %2 beeinflusst werden, aber es gibt bereits eine auf diesem
+Slot. Wollen Sie sie ersetzen oder in den nächsten freien Slot hinzufügen?</translation>
     </message>
     <message>
         <location line="+3"/>
         <location line="+168"/>
         <location line="+171"/>
         <source>&amp;Replace</source>
-        <translation type="unfinished">Erset&amp;zen</translation>
+        <translation>Erset&amp;zen</translation>
     </message>
     <message>
         <location line="-339"/>
         <location line="+168"/>
         <location line="+171"/>
         <source>&amp;Add</source>
-        <translation type="unfinished">&amp;Hinzufügen</translation>
+        <translation>&amp;Hinzufügen</translation>
     </message>
     <message>
         <location line="-329"/>
         <location line="+167"/>
         <location line="+171"/>
         <source>Download error</source>
-        <translation type="unfinished"></translation>
+        <translation>Download-Fehler</translation>
     </message>
     <message>
         <location line="-337"/>
         <source>There is no more free category slot.</source>
-        <translation type="unfinished"></translation>
+        <translation>Es gibt keinen weiteren freien Kategorie-Slot.</translation>
     </message>
     <message>
         <location line="+28"/>
         <source>Save category dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Kategorie speichern</translation>
     </message>
     <message>
         <location line="+30"/>
         <source>No more subcategory supported</source>
-        <translation type="unfinished"></translation>
+        <translation>Keine weiteren Unterkategorien unterstützt</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>You can not add more subcategories</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie können keine weiteren Unterkateogien hinzufügen</translation>
     </message>
     <message>
         <location line="+42"/>
         <location line="+113"/>
         <source>No subcategory selected</source>
-        <translation type="unfinished"></translation>
+        <translation>Keine Unterkategorie ausgewählt</translation>
     </message>
     <message>
         <location line="-112"/>
         <location line="+113"/>
         <source>You must first select a subcategory.</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie müssen erst eine Unterkategorie auswählen.</translation>
     </message>
     <message>
         <location line="-101"/>
         <source>Load subcategory dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Unterkategorie-Laden-Dialog</translation>
     </message>
     <message>
         <location line="+39"/>
         <source>%1 is supposed to be affected to the lbank number %2, but there is already one on this slot.
  Do you want to replace it or to add it in the next free slot ?</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 soll mit der lbank-Nummer %2 beeinflusst werden, aber es gibt bereits eine auf diesem
+Slot. Wollen Sie sie ersetzen oder in den nächsten freien Slot hinzufügen?</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>There is no more free subcategory slot.</source>
-        <translation type="unfinished"></translation>
+        <translation>Es gibt keinen weiteren freien Unterkategorie-Slot.</translation>
     </message>
     <message>
         <location line="+29"/>
         <source>Save subcategory dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Unterkategorie-Speichern-Dialog</translation>
     </message>
     <message>
         <location line="+33"/>
         <source>No more preset supported</source>
-        <translation type="unfinished"></translation>
+        <translation>Keine weiteren Voreinstellungen unterstützt</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>You can not add more presets</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie können keine weiteren Voreinstellungen hinzufügen</translation>
     </message>
     <message>
         <location line="+39"/>
         <location line="+3"/>
         <location line="+111"/>
         <source>No preset selected</source>
-        <translation type="unfinished"></translation>
+        <translation>Keine Voreinstellung ausgewählt</translation>
     </message>
     <message>
         <location line="-113"/>
         <location line="+3"/>
         <location line="+111"/>
         <source>You must first select a preset.</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie müssen erst eine Voreinstellung auswählen.</translation>
     </message>
     <message>
         <location line="-98"/>
         <source>Load preset dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Voreinstellung-Laden-Dialog</translation>
     </message>
     <message>
         <location line="+39"/>
         <source>%1 is supposed to be affected to the prog number %2, but there is already one on this slot.
  Do you want to replace it or to add it in the next free slot ?</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 soll mit der Programm-Nummer %2 beeinflusst werden, aber es gibt bereits eine auf diesem
+Slot. Wollen Sie sie ersetzen oder in den nächsten freien Slot hinzufügen?</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>There is no more free preset slot.</source>
-        <translation type="unfinished"></translation>
+        <translation>Es gibt keinen weiteren freien Voreinstellung-Slot.</translation>
     </message>
     <message>
         <location line="+29"/>
         <source>Save preset dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Voreinstellung-Speichern-Dialog</translation>
     </message>
     <message>
         <location line="+124"/>
         <source>Browse set dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Set-Suchen-Dialog</translation>
     </message>
     <message>
         <location line="+39"/>
         <source>Browse image dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Bild-Suchen-Dialog</translation>
     </message>
 </context>
 <context>
@@ -2129,109 +1908,109 @@ Word-breaking but only with spaces.</source>
     <message>
         <location filename="../../synti/deicsonze/deicsonzegui.ui" line="+15"/>
         <source>DeicsOnze</source>
-        <translation type="unfinished"></translation>
+        <translation>DeicsOnze</translation>
     </message>
     <message>
         <location line="+40"/>
         <source>&amp;Preset</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Vorlage</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Program numerous</source>
-        <translation type="unfinished"></translation>
+        <translation>Programmnummer</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>INITVOICE</source>
-        <translation type="unfinished"></translation>
+        <translation>INITVOICE</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>LBank</source>
-        <translation type="unfinished"></translation>
+        <translation>L-Bank</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Subcategory</source>
-        <translation type="unfinished"></translation>
+        <translation>Unterkategorie</translation>
     </message>
     <message>
         <location line="+11"/>
         <location line="+42"/>
         <source>Bank numerous</source>
-        <translation type="unfinished"></translation>
+        <translation>Banknummer</translation>
     </message>
     <message>
         <location line="-26"/>
         <location line="+13"/>
         <source>NONE</source>
-        <translation type="unfinished"></translation>
+        <translation>KEIN</translation>
     </message>
     <message>
         <location line="+57"/>
         <source>HBank</source>
-        <translation type="unfinished"></translation>
+        <translation>H-Bank</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Category</source>
-        <translation type="unfinished"></translation>
+        <translation>Kategorie</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Prog</source>
-        <translation type="unfinished"></translation>
+        <translation>Prog</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Preset</source>
-        <translation type="unfinished">Vorlage</translation>
+        <translation>Vorlage</translation>
     </message>
     <message>
         <location line="+25"/>
         <source>DeicsOnze v0.5.5 Copyright (c) 2004-2006 Nil Geisweiller. Published under GPL licence.</source>
-        <translation type="unfinished"></translation>
+        <translation>DeicsOnze v0.5.5 Copyright (c) 2004-2006 Nil Geisweiller. Veröffentlicht unter der GPL Lizenz.</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>&amp;Global</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Global</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Pitch Envelope</source>
-        <translation type="unfinished"></translation>
+        <translation>Tonhöhen-Hüllkurve</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>PL3</source>
-        <translation type="unfinished"></translation>
+        <translation>PL3</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>PL2</source>
-        <translation type="unfinished"></translation>
+        <translation>PL2</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>PL1</source>
-        <translation type="unfinished"></translation>
+        <translation>PL1</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>PR1</source>
-        <translation type="unfinished"></translation>
+        <translation>PR1</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>PR2</source>
-        <translation type="unfinished"></translation>
+        <translation>PR2</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>PR3</source>
-        <translation type="unfinished"></translation>
+        <translation>PR3</translation>
     </message>
     <message>
         <location line="+23"/>
@@ -2242,109 +2021,109 @@ Word-breaking but only with spaces.</source>
         <location line="+16"/>
         <location line="+125"/>
         <source>Pitch modulation depth</source>
-        <translation type="unfinished"></translation>
+        <translation>Vibrato-Stärke</translation>
     </message>
     <message>
         <location line="-106"/>
         <source>LFO</source>
-        <translation type="unfinished"></translation>
+        <translation>LFO</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>LFO Sync</source>
-        <translation type="unfinished"></translation>
+        <translation>LFO Sync</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Pitch modulation sensitivity</source>
-        <translation type="unfinished"></translation>
+        <translation>Vibrato-Sensitivität</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Pitch Modulation Sensitivity</source>
-        <translation type="unfinished"></translation>
+        <translation>Vibrato-Sensitivität</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>LFO Delay</source>
-        <translation type="unfinished"></translation>
+        <translation>LFO Verzögerung</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>LFO delay</source>
-        <translation type="unfinished"></translation>
+        <translation>LFO Verzögerung</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>LFO speed</source>
-        <translation type="unfinished"></translation>
+        <translation>LFO Geschwindigkeit</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Amplitude modulation depth</source>
-        <translation type="unfinished"></translation>
+        <translation>Tremolostärke</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Amplitude modulation sensitivity</source>
-        <translation type="unfinished"></translation>
+        <translation>Tremolo-Sensitivität</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Amplitude Modulation Sensitivity</source>
-        <translation type="unfinished"></translation>
+        <translation>Tremolo-Sensitivität</translation>
     </message>
     <message>
         <location line="+25"/>
         <source>AMS</source>
-        <translation type="unfinished"></translation>
+        <translation>AMS</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>LFO Waveform</source>
-        <translation type="unfinished"></translation>
+        <translation>LFO Wellenform</translation>
     </message>
     <message>
         <location line="+52"/>
         <location line="+57"/>
         <source>Pitch Modulation Depth</source>
-        <translation type="unfinished"></translation>
+        <translation>Vibrato-Stärke</translation>
     </message>
     <message>
         <location line="-32"/>
         <source>PMD</source>
-        <translation type="unfinished"></translation>
+        <translation>PMD</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>LFO Speed</source>
-        <translation type="unfinished"></translation>
+        <translation>LFO Geschwindigkeit</translation>
     </message>
     <message>
         <location line="+47"/>
         <source>AMD</source>
-        <translation type="unfinished"></translation>
+        <translation>AMD</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Speed</source>
-        <translation type="unfinished"></translation>
+        <translation>Geschwindigkeit</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Delay</source>
-        <translation type="unfinished">Delay</translation>
+        <translation>Verzögerung</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>PMS</source>
-        <translation type="unfinished"></translation>
+        <translation>PMS</translation>
     </message>
     <message>
         <location line="+13"/>
         <location line="+15"/>
         <source>Modulation Matrix</source>
-        <translation type="unfinished"></translation>
+        <translation>Modulationsmatrix</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -2356,45 +2135,52 @@ Word-breaking but only with spaces.</source>
 &lt;b&gt;Algorithm 6&lt;/b&gt; : addition of the three &lt;i&gt;Op 1, 2, 3&lt;/i&gt; all modulated by &lt;i&gt;Op 4&lt;/i&gt;&lt;br&gt;
 &lt;b&gt;Algorithm 7&lt;/b&gt; : addition of the three &lt;i&gt;Op 1, 2, 3&lt;/i&gt; with &lt;i&gt;Op 3&lt;/i&gt; modulated by &lt;i&gt;Op 4&lt;/i&gt;&lt;br&gt;
 &lt;b&gt;Algorithm 8&lt;/b&gt; : addition of the four &lt;i&gt;Op 1, 2, 3, 4&lt;/i&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Algorithmus 1&lt;/b&gt; : &lt;i&gt;Op 1&lt;/i&gt; moduliert durch &lt;i&gt;Op 2&lt;/i&gt; moduliert durch &lt;i&gt;Op 3&lt;/i&gt; moduliert durch &lt;i&gt;Op 4&lt;/i&gt;&lt;br&gt;
+&lt;b&gt;Algorithmus 2&lt;/b&gt; : &lt;i&gt;Op 1&lt;/i&gt; moduliert durch &lt;i&gt;Op 2&lt;/i&gt; moduliert durch sowohl &lt;i&gt;Op 3&lt;/i&gt; als auch &lt;i&gt;Op 4&lt;/i&gt;&lt;br&gt;
+&lt;b&gt;Algorithmus 3&lt;/b&gt; : &lt;i&gt;Op 1&lt;/i&gt; moduliert durch sowohl&lt;i&gt;Op 4&lt;/i&gt; als auch &lt;i&gt;Op 2&lt;/i&gt; moduliert durch &lt;i&gt;Op 3&lt;/i&gt;&lt;br&gt;
+&lt;b&gt;Algorithmus 4&lt;/b&gt; : &lt;i&gt;Op 1&lt;/i&gt; moduliert durch sowohl&lt;i&gt;Op 2&lt;/i&gt; als auch &lt;i&gt;Op 3&lt;/i&gt; moduliert durch &lt;i&gt;Op 4&lt;/i&gt;&lt;br&gt;
+&lt;b&gt;Algorithmus 5&lt;/b&gt; : (&lt;i&gt;Op 1&lt;/i&gt; moduliert durch &lt;i&gt;Op 2&lt;/i&gt;) addiert zu (&lt;i&gt;Op 3&lt;/i&gt; moduliert durch &lt;i&gt;Op 4&lt;/i&gt;) &lt;br&gt;
+&lt;b&gt;Algorithmus 6&lt;/b&gt; : Summe der drei &lt;i&gt;Op 1, 2, 3&lt;/i&gt; alle moduliert durch &lt;i&gt;Op 4&lt;/i&gt;&lt;br&gt;
+&lt;b&gt;Algorithmus 7&lt;/b&gt; : Summe der drei &lt;i&gt;Op 1, 2, 3&lt;/i&gt; mit &lt;i&gt;Op 3&lt;/i&gt; moduliert durch &lt;i&gt;Op 4&lt;/i&gt;&lt;br&gt;
+&lt;b&gt;Algorithmus 8&lt;/b&gt; : Summe der vier &lt;i&gt;Op 1, 2, 3, 4&lt;/i&gt;</translation>
     </message>
     <message>
         <location line="+98"/>
         <source>Op4 Feedback</source>
-        <translation type="unfinished"></translation>
+        <translation>Op4 Rückspeisung</translation>
     </message>
     <message>
         <location line="+15"/>
         <location line="+19"/>
         <source>Feedback level of the operator 4</source>
-        <translation type="unfinished"></translation>
+        <translation>Rückspeise (&quot;Feedback&quot;)-level des Operators 4</translation>
     </message>
     <message>
         <location line="+13"/>
         <location line="+15"/>
         <location line="+19"/>
         <source>Transpose</source>
-        <translation type="unfinished">Transponieren</translation>
+        <translation>Transponieren</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Op &amp;1</source>
-        <translation type="unfinished"></translation>
+        <translation>Op &amp;1</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Scaling 1</source>
-        <translation type="unfinished"></translation>
+        <translation>Skalierung 1</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>LS1</source>
-        <translation type="unfinished"></translation>
+        <translation>LS1</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>RS1</source>
-        <translation type="unfinished"></translation>
+        <translation>RS1</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -2406,7 +2192,7 @@ Word-breaking but only with spaces.</source>
         <location line="+809"/>
         <location line="+32"/>
         <source>Rate Scaling</source>
-        <translation type="unfinished"></translation>
+        <translation>Ratenskalierung</translation>
     </message>
     <message>
         <location line="-2544"/>
@@ -2422,7 +2208,7 @@ Word-breaking but only with spaces.</source>
         <location line="+25"/>
         <location line="+136"/>
         <source>Attack Rate of the operator 1</source>
-        <translation type="unfinished"></translation>
+        <translation>Attackrate des Operators 1</translation>
     </message>
     <message>
         <location line="-2626"/>
@@ -2434,32 +2220,32 @@ Word-breaking but only with spaces.</source>
         <location line="+794"/>
         <location line="+47"/>
         <source>Level Scaling</source>
-        <translation type="unfinished"></translation>
+        <translation>Levelskalierung</translation>
     </message>
     <message>
         <location line="-2461"/>
         <source>Amplitude Envelope 1</source>
-        <translation type="unfinished"></translation>
+        <translation>Amplitudenhüllkurve 1</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>RR1</source>
-        <translation type="unfinished"></translation>
+        <translation>RR1</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>D1R1</source>
-        <translation type="unfinished"></translation>
+        <translation>D1R1</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>D1L1</source>
-        <translation type="unfinished"></translation>
+        <translation>D1L1</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>D2R1</source>
-        <translation type="unfinished"></translation>
+        <translation>D2R1</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -2467,7 +2253,7 @@ Word-breaking but only with spaces.</source>
         <location line="+741"/>
         <location line="+744"/>
         <source>Release Rate</source>
-        <translation type="unfinished"></translation>
+        <translation>Release Rate</translation>
     </message>
     <message utf8="true">
         <location line="-2137"/>
@@ -2475,7 +2261,7 @@ Word-breaking but only with spaces.</source>
         <location line="+741"/>
         <location line="+744"/>
         <source>2° Decay Rate</source>
-        <translation type="unfinished"></translation>
+        <translation>2° Decay Rate</translation>
     </message>
     <message utf8="true">
         <location line="-2137"/>
@@ -2483,7 +2269,7 @@ Word-breaking but only with spaces.</source>
         <location line="+741"/>
         <location line="+744"/>
         <source>1° Decay Level</source>
-        <translation type="unfinished"></translation>
+        <translation>1° Decay Level</translation>
     </message>
     <message utf8="true">
         <location line="-2137"/>
@@ -2491,7 +2277,7 @@ Word-breaking but only with spaces.</source>
         <location line="+741"/>
         <location line="+744"/>
         <source>1° Decay Rate</source>
-        <translation type="unfinished"></translation>
+        <translation>1° Decay Rate</translation>
     </message>
     <message>
         <location line="-2137"/>
@@ -2499,22 +2285,22 @@ Word-breaking but only with spaces.</source>
         <location line="+741"/>
         <location line="+744"/>
         <source>Attack Rate</source>
-        <translation type="unfinished"></translation>
+        <translation>Attack Rate</translation>
     </message>
     <message>
         <location line="-2016"/>
         <source>AR1</source>
-        <translation type="unfinished"></translation>
+        <translation>AR1</translation>
     </message>
     <message>
         <location line="+32"/>
         <source>Detune, OSCWave, EGShift 1</source>
-        <translation type="unfinished"></translation>
+        <translation>Verstimmung, OSCWave, EGShift 1</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>DET1</source>
-        <translation type="unfinished"></translation>
+        <translation>DET1</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -2527,7 +2313,7 @@ Word-breaking but only with spaces.</source>
         <location line="+16"/>
         <location line="+3414"/>
         <source>Detune</source>
-        <translation type="unfinished"></translation>
+        <translation>Verstimmung</translation>
     </message>
     <message>
         <location line="-5762"/>
@@ -2535,7 +2321,7 @@ Word-breaking but only with spaces.</source>
         <location line="+744"/>
         <location line="+738"/>
         <source>EG Shift</source>
-        <translation type="unfinished"></translation>
+        <translation>EG Shift</translation>
     </message>
     <message>
         <location line="-2375"/>
@@ -2543,7 +2329,7 @@ Word-breaking but only with spaces.</source>
         <location line="+744"/>
         <location line="+738"/>
         <source>96dB</source>
-        <translation type="unfinished"></translation>
+        <translation>96dB</translation>
     </message>
     <message>
         <location line="-2374"/>
@@ -2551,7 +2337,7 @@ Word-breaking but only with spaces.</source>
         <location line="+744"/>
         <location line="+738"/>
         <source>48dB</source>
-        <translation type="unfinished"></translation>
+        <translation>48dB</translation>
     </message>
     <message>
         <location line="-2374"/>
@@ -2559,7 +2345,7 @@ Word-breaking but only with spaces.</source>
         <location line="+744"/>
         <location line="+738"/>
         <source>24dB</source>
-        <translation type="unfinished"></translation>
+        <translation>24dB</translation>
     </message>
     <message>
         <location line="-2374"/>
@@ -2567,7 +2353,7 @@ Word-breaking but only with spaces.</source>
         <location line="+744"/>
         <location line="+738"/>
         <source>12dB</source>
-        <translation type="unfinished"></translation>
+        <translation>12dB</translation>
     </message>
     <message>
         <location line="-2368"/>
@@ -2575,7 +2361,7 @@ Word-breaking but only with spaces.</source>
         <location line="+744"/>
         <location line="+738"/>
         <source>Wave form</source>
-        <translation type="unfinished"></translation>
+        <translation>Wellenform</translation>
     </message>
     <message>
         <location line="-2376"/>
@@ -2590,17 +2376,24 @@ Wave form 5 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
 Wave form 6 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t&lt;/b&gt;)*abs(sin(2*&lt;b&gt;t&lt;/b&gt;)) else 0&lt;/i&gt;&lt;br&gt;
 Wave form 7 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then abs(sin(2*&lt;b&gt;t&lt;/b&gt;)) else 0&lt;/i&gt;&lt;br&gt;
 Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t&lt;/b&gt;)*sin(2*&lt;b&gt;t&lt;/b&gt;) else 0&lt;/i&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>Wellenform 1 = &lt;i&gt;sin(&lt;b&gt;t&lt;/b&gt;)&lt;/i&gt;&lt;br&gt;
+Wellenform 2 = &lt;i&gt;sin(&lt;b&gt;t&lt;/b&gt;)*abs(sin(&lt;b&gt;t&lt;/b&gt;))&lt;/i&gt;&lt;br&gt;
+Wellenform 3 = &lt;i&gt;wenn &lt;b&gt;t&lt;/b&gt;&amp;#060 pi dann sin(&lt;b&gt;t&lt;/b&gt;) sonst 0&lt;/i&gt;&lt;br&gt;
+Wellenform 4 = &lt;i&gt;wenn &lt;b&gt;t&lt;/b&gt;&amp;#060 pi dann sin(&lt;b&gt;t&lt;/b&gt;)*abs(sin(&lt;b&gt;t&lt;/b&gt;)) sonst 0&lt;/i&gt;&lt;br&gt;
+Wellenform 5 = &lt;i&gt;wenn &lt;b&gt;t&lt;/b&gt;&amp;#060 pi dann sin(2*&lt;b&gt;t&lt;/b&gt;) sonst 0&lt;/i&gt;&lt;br&gt;
+Wellenform 6 = &lt;i&gt;wenn &lt;b&gt;t&lt;/b&gt;&amp;#060 pi dann sin(2*&lt;b&gt;t&lt;/b&gt;)*abs(sin(2*&lt;b&gt;t&lt;/b&gt;)) sonst 0&lt;/i&gt;&lt;br&gt;
+Wellenform 7 = &lt;i&gt;wenn &lt;b&gt;t&lt;/b&gt;&amp;#060 pi dann abs(sin(2*&lt;b&gt;t&lt;/b&gt;)) sonst 0&lt;/i&gt;&lt;br&gt;
+Wellenform 8 = &lt;i&gt;wenn &lt;b&gt;t&lt;/b&gt;&amp;#060 pi dann sin(2*&lt;b&gt;t&lt;/b&gt;)*sin(2*&lt;b&gt;t&lt;/b&gt;) sonst 0&lt;/i&gt;</translation>
     </message>
     <message>
         <location line="-2284"/>
         <source>Sensitivity 1</source>
-        <translation type="unfinished"></translation>
+        <translation>Sensitivität 1</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>KVS1</source>
-        <translation type="unfinished"></translation>
+        <translation>KVS1</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -2608,12 +2401,12 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
         <location line="+744"/>
         <location line="+738"/>
         <source>Amplitude Modulation Enable</source>
-        <translation type="unfinished"></translation>
+        <translation>Amplitudenmodulation aktivieren</translation>
     </message>
     <message>
         <location line="-2389"/>
         <source>AME1</source>
-        <translation type="unfinished"></translation>
+        <translation>AME1</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -2621,7 +2414,7 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
         <location line="+744"/>
         <location line="+738"/>
         <source>Keyboard Velocity Sensitivity</source>
-        <translation type="unfinished"></translation>
+        <translation>Keyboard Anschlagsdynamik-Sensitivität</translation>
     </message>
     <message>
         <location line="-2398"/>
@@ -2629,12 +2422,12 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
         <location line="+744"/>
         <location line="+738"/>
         <source>Key Velocity Sensitivity</source>
-        <translation type="unfinished"></translation>
+        <translation>Noten-Anschlagsdynamik-Sensitivität</translation>
     </message>
     <message>
         <location line="-2357"/>
         <source>EBS1</source>
-        <translation type="unfinished"></translation>
+        <translation>EBS1</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -2642,7 +2435,7 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
         <location line="+744"/>
         <location line="+738"/>
         <source>EG Bias Sensitivity</source>
-        <translation type="unfinished"></translation>
+        <translation>EG Bias Sensitivität</translation>
     </message>
     <message>
         <location line="-2357"/>
@@ -2650,17 +2443,17 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
         <location line="+744"/>
         <location line="+738"/>
         <source>Eg Bias Sensitivity</source>
-        <translation type="unfinished"></translation>
+        <translation>EG Bias Sensitivität</translation>
     </message>
     <message>
         <location line="-2360"/>
         <source>Frequency 1</source>
-        <translation type="unfinished"></translation>
+        <translation>Frequenz 1</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Coarse 1</source>
-        <translation type="unfinished"></translation>
+        <translation>Grob 1</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -2668,12 +2461,12 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
         <location line="+905"/>
         <location line="+580"/>
         <source>Coarse Ratio</source>
-        <translation type="unfinished"></translation>
+        <translation>Grob Verhältnis</translation>
     </message>
     <message>
         <location line="-1787"/>
         <source>Fine 1</source>
-        <translation type="unfinished"></translation>
+        <translation>Fein 1</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -2681,12 +2474,12 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
         <location line="+908"/>
         <location line="+577"/>
         <source>Fine Ratio</source>
-        <translation type="unfinished"></translation>
+        <translation>Fein Verhältnis</translation>
     </message>
     <message>
         <location line="-1787"/>
         <source>Freq 1</source>
-        <translation type="unfinished"></translation>
+        <translation>Freq 1</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -2694,7 +2487,7 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
         <location line="+908"/>
         <location line="+577"/>
         <source>Fixed Frequency</source>
-        <translation type="unfinished"></translation>
+        <translation>Feste Frequenz</translation>
     </message>
     <message>
         <location line="-1784"/>
@@ -2702,7 +2495,7 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
         <location line="+908"/>
         <location line="+577"/>
         <source>Toggle Fix Frequency</source>
-        <translation type="unfinished"></translation>
+        <translation>&quot;Feste Frequenz&quot; umschalten</translation>
     </message>
     <message>
         <location line="-1797"/>
@@ -2710,12 +2503,12 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
         <location line="+908"/>
         <location line="+577"/>
         <source>FIX</source>
-        <translation type="unfinished"></translation>
+        <translation>FIX</translation>
     </message>
     <message>
         <location line="-1790"/>
         <source>OUT 1</source>
-        <translation type="unfinished"></translation>
+        <translation>OUT1</translation>
     </message>
     <message>
         <location line="+12"/>
@@ -2723,7 +2516,7 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
         <location line="+641"/>
         <location line="+841"/>
         <source>Output Volume</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausgangslautstärke</translation>
     </message>
     <message>
         <location line="-1898"/>
@@ -2733,327 +2526,327 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
         <location line="+803"/>
         <location line="+2768"/>
         <source>Volume</source>
-        <translation type="unfinished">Volume</translation>
+        <translation>Lautstärke</translation>
     </message>
     <message>
         <location line="-5453"/>
         <source>Op &amp;2</source>
-        <translation type="unfinished"></translation>
+        <translation>Op &amp;2</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Amplitude Envelope 2</source>
-        <translation type="unfinished"></translation>
+        <translation>Amplitudenhüllkurve 2</translation>
     </message>
     <message>
         <location line="+28"/>
         <source>D1R2</source>
-        <translation type="unfinished"></translation>
+        <translation>D1R2</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>D1L2</source>
-        <translation type="unfinished"></translation>
+        <translation>D1L2</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>D2R2</source>
-        <translation type="unfinished"></translation>
+        <translation>D2R2</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>RR2</source>
-        <translation type="unfinished"></translation>
+        <translation>RR2</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>AR2</source>
-        <translation type="unfinished"></translation>
+        <translation>AR2</translation>
     </message>
     <message>
         <location line="+72"/>
         <source>Frequency 2</source>
-        <translation type="unfinished"></translation>
+        <translation>Frequenz 2</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Coarse 2</source>
-        <translation type="unfinished"></translation>
+        <translation>Grob 2</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Fine 2</source>
-        <translation type="unfinished"></translation>
+        <translation>Fein 2</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Freq 2</source>
-        <translation type="unfinished"></translation>
+        <translation>Freq 2</translation>
     </message>
     <message>
         <location line="+39"/>
         <source>Scaling 2</source>
-        <translation type="unfinished"></translation>
+        <translation>Skalierung 2</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>LS2</source>
-        <translation type="unfinished"></translation>
+        <translation>LS2</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>RS2</source>
-        <translation type="unfinished"></translation>
+        <translation>RS2</translation>
     </message>
     <message>
         <location line="+83"/>
         <source>OUT 2</source>
-        <translation type="unfinished"></translation>
+        <translation>OUT 2</translation>
     </message>
     <message>
         <location line="+50"/>
         <source>Detune, OSCWave, EGShift 2</source>
-        <translation type="unfinished"></translation>
+        <translation>Verstimmung, OSCWave, EGShift 2</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>DET2</source>
-        <translation type="unfinished"></translation>
+        <translation>DET2</translation>
     </message>
     <message>
         <location line="+182"/>
         <source>Sensitivity 2</source>
-        <translation type="unfinished"></translation>
+        <translation>Sensitivität 2</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>EBS2</source>
-        <translation type="unfinished"></translation>
+        <translation>EBS2</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>KVS2</source>
-        <translation type="unfinished"></translation>
+        <translation>KVS2</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>AME2</source>
-        <translation type="unfinished"></translation>
+        <translation>AME2</translation>
     </message>
     <message>
         <location line="+72"/>
         <source>Op &amp;3</source>
-        <translation type="unfinished"></translation>
+        <translation>Op &amp;3</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Amplitude Envelope 3</source>
-        <translation type="unfinished"></translation>
+        <translation>Amplitudenhüllkurve 3</translation>
     </message>
     <message>
         <location line="+28"/>
         <source>D1R3</source>
-        <translation type="unfinished"></translation>
+        <translation>D1R3</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>D1L3</source>
-        <translation type="unfinished"></translation>
+        <translation>D1L3</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>D2R3</source>
-        <translation type="unfinished"></translation>
+        <translation>D2R3</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>RR3</source>
-        <translation type="unfinished"></translation>
+        <translation>RR3</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>AR3</source>
-        <translation type="unfinished"></translation>
+        <translation>AR3</translation>
     </message>
     <message>
         <location line="+72"/>
         <source>Scaling 3</source>
-        <translation type="unfinished"></translation>
+        <translation>Skalierung 3</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>LS3</source>
-        <translation type="unfinished"></translation>
+        <translation>LS3</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>RS3</source>
-        <translation type="unfinished"></translation>
+        <translation>RS3</translation>
     </message>
     <message>
         <location line="+80"/>
         <source>OUT 3</source>
-        <translation type="unfinished"></translation>
+        <translation>OUT 3</translation>
     </message>
     <message>
         <location line="+50"/>
         <source>Frequency 3</source>
-        <translation type="unfinished"></translation>
+        <translation>Frequenz 3</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Coarse 3</source>
-        <translation type="unfinished"></translation>
+        <translation>Grob 3</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Fine 3</source>
-        <translation type="unfinished"></translation>
+        <translation>Fein 3</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Freq 3</source>
-        <translation type="unfinished"></translation>
+        <translation>Freq 3</translation>
     </message>
     <message>
         <location line="+39"/>
         <source>Detune, OSCWave, EGShift 3</source>
-        <translation type="unfinished"></translation>
+        <translation>Verstimmung, OSCWave, EGShift 3</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>DET3</source>
-        <translation type="unfinished"></translation>
+        <translation>DET3</translation>
     </message>
     <message>
         <location line="+182"/>
         <source>Sensitivity 3</source>
-        <translation type="unfinished"></translation>
+        <translation>Sensitivität 3</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>EBS3</source>
-        <translation type="unfinished"></translation>
+        <translation>EBS3</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>KVS3</source>
-        <translation type="unfinished"></translation>
+        <translation>KVS3</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>AME3</source>
-        <translation type="unfinished"></translation>
+        <translation>AME3</translation>
     </message>
     <message>
         <location line="+72"/>
         <source>Op &amp;4</source>
-        <translation type="unfinished"></translation>
+        <translation>Op &amp;4</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>amplitude Envelope 4</source>
-        <translation type="unfinished"></translation>
+        <translation>Amplitudenhüllkurve 4</translation>
     </message>
     <message>
         <location line="+28"/>
         <source>AR4</source>
-        <translation type="unfinished"></translation>
+        <translation>AR4</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>D1R4</source>
-        <translation type="unfinished"></translation>
+        <translation>D1R4</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>D1L4</source>
-        <translation type="unfinished"></translation>
+        <translation>D1L4</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>D2R4</source>
-        <translation type="unfinished"></translation>
+        <translation>D2R4</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>RR4</source>
-        <translation type="unfinished"></translation>
+        <translation>RR4</translation>
     </message>
     <message>
         <location line="+72"/>
         <source>Frequency 4</source>
-        <translation type="unfinished"></translation>
+        <translation>Frequenz 4</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Coarse 4</source>
-        <translation type="unfinished"></translation>
+        <translation>Grob 4</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Fine 4</source>
-        <translation type="unfinished"></translation>
+        <translation>Fein 4</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Freq 4</source>
-        <translation type="unfinished"></translation>
+        <translation>Freq 4</translation>
     </message>
     <message>
         <location line="+39"/>
         <source>Scaling 4</source>
-        <translation type="unfinished"></translation>
+        <translation>Skalierung 4</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>LS4</source>
-        <translation type="unfinished"></translation>
+        <translation>LS4</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>RS4</source>
-        <translation type="unfinished"></translation>
+        <translation>RS4</translation>
     </message>
     <message>
         <location line="+80"/>
         <source>OUT 4</source>
-        <translation type="unfinished"></translation>
+        <translation>OUT 4</translation>
     </message>
     <message>
         <location line="+50"/>
         <source>Detune, OSCWave, EGShift 4</source>
-        <translation type="unfinished"></translation>
+        <translation>Verstimmung, OSCWave, EGShift 4</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>DET4</source>
-        <translation type="unfinished"></translation>
+        <translation>DET4</translation>
     </message>
     <message>
         <location line="+182"/>
         <source>Sensitivity 4</source>
-        <translation type="unfinished"></translation>
+        <translation>Sensitivität 4</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>EBS4</source>
-        <translation type="unfinished"></translation>
+        <translation>EBS4</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>KVS4</source>
-        <translation type="unfinished"></translation>
+        <translation>KVS4</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>AME4</source>
-        <translation type="unfinished"></translation>
+        <translation>AME4</translation>
     </message>
     <message>
         <location line="+72"/>
         <source>&amp;Func</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Func</translation>
     </message>
     <message>
         <location line="+18"/>
@@ -3075,7 +2868,7 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
         <location line="+1123"/>
         <location line="+215"/>
         <source>Channel Chorus</source>
-        <translation type="unfinished"></translation>
+        <translation>Kanal-Chorus</translation>
     </message>
     <message>
         <location line="-1316"/>
@@ -3092,7 +2885,7 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
         <location line="+1079"/>
         <location line="+92"/>
         <source>On</source>
-        <translation type="unfinished">An</translation>
+        <translation>An</translation>
     </message>
     <message>
         <location line="-1142"/>
@@ -3107,7 +2900,7 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
     <message>
         <location line="+51"/>
         <source>Foot Control</source>
-        <translation type="unfinished"></translation>
+        <translation>Fußschalter</translation>
     </message>
     <message>
         <location line="+12"/>
@@ -3140,7 +2933,7 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
         <location line="+15"/>
         <location line="+22"/>
         <source>Pitch Bend Range</source>
-        <translation type="unfinished"></translation>
+        <translation>Pitchbend-Bereich</translation>
     </message>
     <message>
         <location line="-703"/>
@@ -3148,7 +2941,7 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
         <location line="+91"/>
         <location line="+140"/>
         <source>Pitch</source>
-        <translation type="unfinished"></translation>
+        <translation>Tonhöhe</translation>
     </message>
     <message>
         <location line="-378"/>
@@ -3156,34 +2949,34 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
         <location line="+143"/>
         <location line="+217"/>
         <source>Amplitude</source>
-        <translation type="unfinished"></translation>
+        <translation>Amplitude</translation>
     </message>
     <message>
         <location line="-448"/>
         <source>Modulation Wheel</source>
-        <translation type="unfinished"></translation>
+        <translation>Modulations-Rad</translation>
     </message>
     <message>
         <location line="+109"/>
         <source>Breath Control</source>
-        <translation type="unfinished"></translation>
+        <translation>Anblaskontrolle</translation>
     </message>
     <message>
         <location line="+96"/>
         <location line="+230"/>
         <source>Pitch Bias</source>
-        <translation type="unfinished"></translation>
+        <translation>Tonhöhen-Bias</translation>
     </message>
     <message>
         <location line="-217"/>
         <location line="+243"/>
         <source>Envelope Bias</source>
-        <translation type="unfinished"></translation>
+        <translation>Hüllkurven-Bias</translation>
     </message>
     <message>
         <location line="-147"/>
         <source>After Touch</source>
-        <translation type="unfinished">Aftertouch</translation>
+        <translation>Aftertouch</translation>
     </message>
     <message>
         <location line="+208"/>
@@ -3193,53 +2986,53 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
     <message>
         <location line="+19"/>
         <source>POLY</source>
-        <translation type="unfinished"></translation>
+        <translation>POLY</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>MONO</source>
-        <translation type="unfinished"></translation>
+        <translation>MONO</translation>
     </message>
     <message>
         <location line="+61"/>
         <source>Potamento</source>
-        <translation type="unfinished"></translation>
+        <translation>Portamento</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Portamento Mode</source>
-        <translation type="unfinished"></translation>
+        <translation>Portamento-Modus</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>FINGER</source>
-        <translation type="unfinished"></translation>
+        <translation>FINGER</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>FULL</source>
-        <translation type="unfinished"></translation>
+        <translation>VOLL</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>PT</source>
-        <translation type="unfinished"></translation>
+        <translation>PT</translation>
     </message>
     <message>
         <location line="+13"/>
         <location line="+25"/>
         <source>Portamento Time</source>
-        <translation type="unfinished"></translation>
+        <translation>Portamento-Dauer</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>C&amp;horus</source>
-        <translation type="unfinished"></translation>
+        <translation>C&amp;horus</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Chorus Parameters</source>
-        <translation type="unfinished"></translation>
+        <translation>Chorus-Parameter</translation>
     </message>
     <message>
         <location line="+21"/>
@@ -3257,175 +3050,175 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
         <location line="-48"/>
         <location line="+92"/>
         <source>Select LADSPA plugin</source>
-        <translation type="unfinished"></translation>
+        <translation>LADSPA-Plugin auswählen</translation>
     </message>
     <message>
         <location line="-80"/>
         <location line="+92"/>
         <source>Change plugin</source>
-        <translation type="unfinished"></translation>
+        <translation>Plugin ändern</translation>
     </message>
     <message>
         <location line="-74"/>
         <source>&amp;Reverb</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Reverb</translation>
     </message>
     <message>
         <location line="+135"/>
         <source>Reverb Parameters</source>
-        <translation type="unfinished"></translation>
+        <translation>Nachhallparameter</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>&amp;Config</source>
-        <translation type="unfinished">&amp;Einstellen</translation>
+        <translation>&amp;Einstellen</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Font Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Schriftgröße</translation>
     </message>
     <message>
         <location line="+28"/>
         <source>Quality</source>
-        <translation type="unfinished"></translation>
+        <translation>Qualität</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>High</source>
-        <translation type="unfinished"></translation>
+        <translation>Hoch</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Middle</source>
-        <translation type="unfinished"></translation>
+        <translation>Mittel</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Low</source>
-        <translation type="unfinished"></translation>
+        <translation>Gering</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Ultra low</source>
-        <translation type="unfinished"></translation>
+        <translation>Sehr Gering</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Filter</source>
-        <translation type="unfinished">Filter</translation>
+        <translation>Filter</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Save Mode (into the song)</source>
-        <translation type="unfinished"></translation>
+        <translation>Speichermodus (in das Lied)</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Save only the used presets</source>
-        <translation type="unfinished"></translation>
+        <translation>Nur die benutzten Vorlagen speichern</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Save the entire set</source>
-        <translation type="unfinished"></translation>
+        <translation>Das gesamte Set speichern</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Save the configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>Die Konfiguration speichern</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Configuration File</source>
-        <translation type="unfinished"></translation>
+        <translation>Konfigurationsdatei</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Save...</source>
-        <translation type="unfinished"></translation>
+        <translation>Speichern...</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Load...</source>
-        <translation type="unfinished"></translation>
+        <translation>Laden...</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Save as default</source>
-        <translation type="unfinished"></translation>
+        <translation>Als Standard speichern</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Colors</source>
-        <translation type="unfinished">Farben</translation>
+        <translation>Farben</translation>
     </message>
     <message>
         <location line="+38"/>
         <source>Text</source>
-        <translation type="unfinished">Text</translation>
+        <translation>Text</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Background</source>
-        <translation type="unfinished"></translation>
+        <translation>Hintergrund</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Edit Text</source>
-        <translation type="unfinished"></translation>
+        <translation>Text bearbeiten</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Edit Background</source>
-        <translation type="unfinished"></translation>
+        <translation>Hintergrund bearbeiten</translation>
     </message>
     <message>
         <location line="+8"/>
         <location line="+45"/>
         <location line="+71"/>
         <source>Red</source>
-        <translation type="unfinished"></translation>
+        <translation>Rot</translation>
     </message>
     <message>
         <location line="-103"/>
         <location line="+51"/>
         <location line="+26"/>
         <source>Blue</source>
-        <translation type="unfinished"></translation>
+        <translation>Blau</translation>
     </message>
     <message>
         <location line="-61"/>
         <location line="+45"/>
         <location line="+29"/>
         <source>Green</source>
-        <translation type="unfinished"></translation>
+        <translation>Grün</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Set Path</source>
-        <translation type="unfinished"></translation>
+        <translation>Pfad setzen</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Image in the background :</source>
-        <translation type="unfinished"></translation>
+        <translation>Hintergrundbild:</translation>
     </message>
     <message>
         <location line="+20"/>
         <location line="+14"/>
         <source>Browse...</source>
-        <translation type="unfinished"></translation>
+        <translation>Durchsuchen...</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Load the set at the initialization :</source>
-        <translation type="unfinished"></translation>
+        <translation>Das Set bei der Initialisierung laden:</translation>
     </message>
     <message>
         <location line="+503"/>
         <source>Set Brightness, Detune, Attack and Release of the current channel to default</source>
-        <translation type="unfinished"></translation>
+        <translation>Helligkeit, Verstimmung, Attack und Release des momentanen Kanals auf den Standard setzen</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -3435,67 +3228,67 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
     <message>
         <location line="+493"/>
         <source>Cut all notes off</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle Noten abschneiden</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Panic!</source>
-        <translation type="unfinished"></translation>
+        <translation>Panik!</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Number of Voices</source>
-        <translation type="unfinished"></translation>
+        <translation>Anzahl der Stimmen</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>Number of voices</source>
-        <translation type="unfinished"></translation>
+        <translation>Anzahl der Stimmen</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Enable</source>
-        <translation type="unfinished">Einschalten</translation>
+        <translation>Einschalten</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Channel</source>
-        <translation type="unfinished">Kanal</translation>
+        <translation>Kanal</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Vol</source>
-        <translation type="unfinished"></translation>
+        <translation>Vol</translation>
     </message>
     <message>
         <location line="+44"/>
         <source>Channel Ctrl</source>
-        <translation type="unfinished"></translation>
+        <translation>Kanal Ctrl</translation>
     </message>
     <message>
         <location line="+37"/>
         <source>Release</source>
-        <translation type="unfinished"></translation>
+        <translation>Release</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>Attack</source>
-        <translation type="unfinished"></translation>
+        <translation>Attack</translation>
     </message>
     <message>
         <location line="+52"/>
         <source>Brightness</source>
-        <translation type="unfinished"></translation>
+        <translation>Helligkeit</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>Modulation</source>
-        <translation type="unfinished"></translation>
+        <translation>Modulation</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>Pan</source>
-        <translation type="unfinished"></translation>
+        <translation>Pan</translation>
     </message>
 </context>
 <context>
@@ -3503,42 +3296,42 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
     <message>
         <location filename="../../muse/widgets/function_dialogs/deloverlapsbase.ui" line="+17"/>
         <source>MusE: Delete Overlaps</source>
-        <translation type="unfinished"></translation>
+        <translation>MusE: Ãœberlappungen entfernen</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Range</source>
-        <translation type="unfinished">Bereich</translation>
+        <translation>Bereich</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>All Events</source>
-        <translation type="unfinished">Alle Ereignisse</translation>
+        <translation>Alle Ereignisse</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Selected Events</source>
-        <translation type="unfinished">Ausgewählte Ereignisse</translation>
+        <translation>Ausgewählte Ereignisse</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Looped Events</source>
-        <translation type="unfinished">Ereignisse innerhalb Schleife</translation>
+        <translation>Ereignisse innerhalb Schleife</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Selected Looped</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausgewählt und innerhalb der Schleife</translation>
     </message>
     <message>
         <location line="+44"/>
         <source>OK</source>
-        <translation type="unfinished">Bestätigen</translation>
+        <translation>Bestätigen</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Cancel</source>
-        <translation type="unfinished">Abbrechen</translation>
+        <translation>Abbrechen</translation>
     </message>
 </context>
 <context>
@@ -3546,423 +3339,260 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
     <message>
         <location filename="../../muse/widgets/didyouknow.ui" line="+14"/>
         <source>Did you know?</source>
-        <translation type="unfinished"></translation>
+        <translation>Wussten Sie?</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Don&apos;t show on startup</source>
-        <translation type="unfinished"></translation>
+        <translation>Nicht beim Starten zeigen</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Next tip</source>
-        <translation type="unfinished"></translation>
+        <translation>Nächster Tipp</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation>Schließen</translation>
     </message>
 </context>
 <context>
     <name>DrumEdit</name>
     <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="+183"/>
         <source>Load Map</source>
-        <translation>Schlagzeugbelegung laden</translation>
+        <translation type="obsolete">Schlagzeugbelegung laden</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Save Map</source>
-        <translation>Schlagzeugbelegung Sichern</translation>
+        <translation type="obsolete">Schlagzeugbelegung Sichern</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>&amp;Edit</source>
-        <translation>&amp;Bearbeiten</translation>
+        <translation type="obsolete">&amp;Bearbeiten</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Cut</source>
-        <translation>Ausschneiden</translation>
+        <translation type="obsolete">Ausschneiden</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Copy</source>
-        <translation>Kopieren</translation>
+        <translation type="obsolete">Kopieren</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Paste</source>
-        <translation>Einfügen</translation>
+        <translation type="obsolete">Einfügen</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Delete Events</source>
-        <translation>Events entfernen</translation>
+        <translation type="obsolete">Events entfernen</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Select All</source>
-        <translation>Alles auswählen</translation>
+        <translation type="obsolete">Alles auswählen</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Select None</source>
-        <translation>Auswahl aufheben</translation>
+        <translation type="obsolete">Auswahl aufheben</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Invert</source>
-        <translation>Auswahl umkehren</translation>
+        <translation type="obsolete">Auswahl umkehren</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Inside Loop</source>
-        <translation>Innerhalb Schleife</translation>
+        <translation type="obsolete">Innerhalb Schleife</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Outside Loop</source>
-        <translation>Ausserhalb Schleife</translation>
+        <translation type="obsolete">Ausserhalb Schleife</translation>
     </message>
     <message>
-        <location line="-7"/>
         <source>&amp;Select</source>
-        <translation>&amp;Auswählen</translation>
+        <translation type="obsolete">&amp;Auswählen</translation>
     </message>
     <message>
-        <location line="+99"/>
         <source>Step Record</source>
-        <translation>Aufnahme taktschlagweise</translation>
+        <translation type="obsolete">Aufnahme taktschlagweise</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Midi Input</source>
-        <translation>Midi Eingang</translation>
+        <translation type="obsolete">Midi Eingang</translation>
     </message>
     <message>
-        <location line="+57"/>
         <source>Add Controller View</source>
-        <translation>Kontrolleransicht hinzufügen</translation>
+        <translation type="obsolete">Kontrolleransicht hinzufügen</translation>
     </message>
     <message>
-        <location line="+57"/>
         <source>M</source>
-        <translation>M</translation>
+        <translation type="obsolete">M</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Sound</source>
-        <translation>Klang</translation>
+        <translation type="obsolete">Klang</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>QNT</source>
-        <translation>QNT</translation>
+        <translation type="obsolete">QNT</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>E-Note</source>
-        <translation>E-Note</translation>
+        <translation type="obsolete">E-Note</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Len</source>
-        <translation>Länge</translation>
+        <translation type="obsolete">Länge</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A-Note</source>
-        <translation>A-Note</translation>
+        <translation type="obsolete">A-Note</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Ch</source>
-        <translation>K</translation>
+        <translation type="obsolete">K</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Port</source>
-        <translation>Port</translation>
+        <translation type="obsolete">Port</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>LV1</source>
-        <translation>LV1</translation>
+        <translation type="obsolete">LV1</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>LV2</source>
-        <translation>LV2</translation>
+        <translation type="obsolete">LV2</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>LV3</source>
-        <translation>LV3</translation>
+        <translation type="obsolete">LV3</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>LV4</source>
-        <translation>LV4</translation>
+        <translation type="obsolete">LV4</translation>
     </message>
     <message>
-        <location line="-271"/>
         <source>&amp;File</source>
-        <translation>&amp;Datei</translation>
+        <translation type="obsolete">&amp;Datei</translation>
     </message>
     <message>
-        <location line="+121"/>
         <source>Load Drummap</source>
-        <translation>Schlagzeugbelegung laden</translation>
+        <translation type="obsolete">Schlagzeugbelegung laden</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Store Drummap</source>
-        <translation>Schlagzeugbelegung sichern</translation>
+        <translation type="obsolete">Schlagzeugbelegung sichern</translation>
     </message>
     <message>
-        <location line="+68"/>
         <source>ctrl</source>
-        <translation>steuern</translation>
+        <translation type="obsolete">steuern</translation>
     </message>
     <message>
         <source>drummaps</source>
         <translation type="obsolete">Schlagzeugbelegungen</translation>
     </message>
     <message>
-        <location line="+449"/>
         <source>Muse: Load Drum Map</source>
-        <translation>MusE: Schlagzeugbelegung laden</translation>
+        <translation type="obsolete">MusE: Schlagzeugbelegung laden</translation>
     </message>
     <message>
-        <location line="+53"/>
         <source>MusE: Store Drum Map</source>
-        <translation>MusE: Schlagzeugbelegung speichern</translation>
+        <translation type="obsolete">MusE: Schlagzeugbelegung speichern</translation>
     </message>
     <message>
-        <location line="-620"/>
         <source>Set Fixed Length</source>
-        <translation>Länge festlegen</translation>
+        <translation type="obsolete">Länge festlegen</translation>
     </message>
     <message>
         <source>&amp;Functions</source>
         <translation type="obsolete">&amp;Funktionen</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Modify Velocity</source>
-        <translation>Velocity ändern</translation>
+        <translation type="obsolete">Velocity ändern</translation>
     </message>
     <message>
-        <location line="-148"/>
-        <location line="+21"/>
         <source>mute instrument</source>
-        <translation type="unfinished">Instrument still schalten</translation>
+        <translation type="obsolete">Instrument still schalten</translation>
     </message>
     <message>
-        <location line="-20"/>
-        <location line="+21"/>
         <source>sound name</source>
-        <translation type="unfinished">Klangname</translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <location line="+21"/>
-        <source>volume percent</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Klangname</translation>
     </message>
     <message>
-        <location line="-20"/>
-        <location line="+21"/>
         <source>quantisation</source>
-        <translation type="unfinished">Quantisierung</translation>
+        <translation type="obsolete">Quantisierung</translation>
     </message>
     <message>
-        <location line="-20"/>
-        <location line="+21"/>
         <source>this input note triggers the sound</source>
-        <translation type="unfinished">Diese Eingangsnote löst den Klang aus</translation>
+        <translation type="obsolete">Diese Eingangsnote löst den Klang aus</translation>
     </message>
     <message>
-        <location line="-20"/>
-        <location line="+21"/>
         <source>note length</source>
-        <translation type="unfinished">Notenlänge</translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <location line="+21"/>
-        <source>this is the note which is played</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <source>output channel (hold ctl to affect all rows)</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Notenlänge</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+21"/>
         <source>output port</source>
-        <translation type="unfinished">Ausgangsanschluss</translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <location line="+21"/>
-        <source>shift + control key: draw velocity level 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <location line="+21"/>
-        <source>control key: draw velocity level 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <location line="+21"/>
-        <source>shift key: draw velocity level 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <location line="+21"/>
-        <source>draw velocity level 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-5"/>
-        <source>output channel (ctl: affect all rows)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+46"/>
-        <source>Reset GM Map</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <source>Copy events in range</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Paste (with Dialog)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+29"/>
-        <source>Previous Part</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Next Part</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
-        <source>Fu&amp;nctions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Re-order list</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Ausgangsanschluss</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Crescendo/Decrescendo</source>
-        <translation type="unfinished">Crescendo/Decrescendo</translation>
+        <translation type="obsolete">Crescendo/Decrescendo</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Quantize</source>
-        <translation>Quantisieren</translation>
+        <translation type="obsolete">Quantisieren</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Erase Event</source>
-        <translation>Ereignis löschen</translation>
+        <translation type="obsolete">Ereignis löschen</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Move Notes</source>
-        <translation>Noten verschieben</translation>
+        <translation type="obsolete">Noten verschieben</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Delete Overlaps</source>
-        <translation>Ãœberlappungen entfernen</translation>
+        <translation type="obsolete">Ãœberlappungen entfernen</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>&amp;Plugins</source>
-        <translation>&amp;Plugins</translation>
+        <translation type="obsolete">&amp;Plugins</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Window &amp;Config</source>
-        <translation>Fenster&amp;konfiguration</translation>
+        <translation type="obsolete">Fenster&amp;konfiguration</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Drum tools</source>
-        <translation>Schlagzeug-Werkzeuge</translation>
+        <translation type="obsolete">Schlagzeug-Werkzeuge</translation>
     </message>
     <message>
-        <location line="+37"/>
         <source>cursor tools</source>
-        <translation>Cursor-Werkzeug</translation>
+        <translation type="obsolete">Cursor-Werkzeug</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Set step size for cursor edit</source>
-        <translation>Schrittweite für Cursor-Modus einstellen</translation>
+        <translation type="obsolete">Schrittweite für Cursor-Modus einstellen</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>panic</source>
-        <translation type="unfinished">Panik</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>transport</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+84"/>
-        <source>Vol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+461"/>
-        <source>Drum map</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Reset the drum map with GM defaults?</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Panik</translation>
     </message>
 </context>
 <context>
     <name>EditCAfterDialog</name>
     <message>
-        <location filename="../../muse/liste/editevent.cpp" line="+445"/>
         <source>Time Position</source>
-        <translation>Position</translation>
+        <translation type="obsolete">Position</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Pressure</source>
-        <translation>Anschlagsdruck</translation>
+        <translation type="obsolete">Anschlagsdruck</translation>
     </message>
     <message>
-        <location line="-6"/>
         <source>MusE: Enter Channel Aftertouch</source>
-        <translation>MusE: Kanal Aftertouch festlegen</translation>
+        <translation type="obsolete">MusE: Kanal Aftertouch festlegen</translation>
     </message>
 </context>
 <context>
@@ -4073,14 +3703,12 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
 <context>
     <name>EditEventDialog</name>
     <message>
-        <location filename="../../muse/liste/editevent.cpp" line="-255"/>
         <source>Ok</source>
-        <translation>Bestätigen</translation>
+        <translation type="obsolete">Bestätigen</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Cancel</source>
-        <translation>Abbrechen</translation>
+        <translation type="obsolete">Abbrechen</translation>
     </message>
 </context>
 <context>
@@ -4088,236 +3716,76 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
     <message>
         <location filename="../../muse/waveedit/editgainbase.ui" line="+14"/>
         <source>MusE: Modify gain</source>
-        <translation type="unfinished"></translation>
+        <translation>MusE: Gain verändern</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Gain</source>
-        <translation type="unfinished"></translation>
+        <translation>Gain</translation>
     </message>
     <message>
         <location line="+51"/>
         <source>200%</source>
-        <translation type="unfinished">200%</translation>
+        <translation>200%</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>100%</source>
-        <translation type="unfinished">100%</translation>
+        <translation>100%</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>0%</source>
-        <translation type="unfinished">0%</translation>
+        <translation>0%</translation>
     </message>
     <message>
         <location line="+51"/>
         <source>&amp;Reset</source>
-        <translation type="unfinished"></translation>
+        <translation>Zu&amp;rücksetzen</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Alt+R</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt+R</translation>
     </message>
     <message>
         <location line="+39"/>
         <source>&amp;Apply</source>
-        <translation type="unfinished">&amp;Anwenden</translation>
+        <translation>&amp;Anwenden</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Alt+A</source>
-        <translation type="unfinished">Alt+A</translation>
+        <translation>Alt+A</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Abbrechen</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Alt+C</source>
-        <translation type="unfinished">Alt+C</translation>
+        <translation>Alt+C</translation>
     </message>
 </context>
 <context>
     <name>EditInstrument</name>
     <message>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="+311"/>
-        <location line="+34"/>
-        <source>MusE: Create file failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+33"/>
         <source>MusE: Write File failed</source>
-        <translation type="unfinished">MusE: Datei schreiben schlug fehl</translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <location line="+12"/>
-        <location line="+280"/>
-        <location line="+12"/>
-        <source>MusE:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-303"/>
-        <location line="+292"/>
-        <source>The user instrument directory
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-292"/>
-        <location line="+292"/>
-        <source>
-does not exist yet. Create it now?
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-291"/>
-        <location line="+292"/>
-        <source>(You can change the user instruments directory at Settings-&gt;Global Settings-&gt;Midi)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-282"/>
-        <location line="+292"/>
-        <source>Unable to create user instrument directory
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-244"/>
-        <location line="+266"/>
-        <source>MusE: Save Instrument Definition</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-265"/>
-        <location line="+266"/>
-        <source>Instrument Definition (*.idf)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-154"/>
-        <location line="+29"/>
-        <source>MusE: Save instrument as</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-29"/>
-        <source>Enter a new unique instrument name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+30"/>
-        <source>The user instrument:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>
-already exists. This will overwrite its .idf instrument file.
-Are you sure?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+525"/>
-        <source>MusE: Bad instrument name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Please choose a unique instrument name.
-(The name might be used by a hidden instrument.)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+136"/>
-        <source>MusE: Bad patch name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Please choose a unique patch name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
-        <source>MusE: Bad patchgroup name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Please choose a unique patchgroup name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+526"/>
-        <source>MusE: Bad controller name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Please choose a unique controller name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1287"/>
-        <location line="+12"/>
-        <source>MusE: Cannot add common controller</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-11"/>
-        <source>A controller named </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <location line="+12"/>
-        <source> already exists.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>A controller number </source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">MusE: Datei schreiben schlug fehl</translation>
     </message>
     <message>
-        <location line="+283"/>
-        <location line="+5"/>
         <source>MusE</source>
-        <translation type="unfinished">MusE</translation>
-    </message>
-    <message>
-        <location line="-4"/>
-        <location line="+5"/>
-        <source>The current Instrument contains unsaved data
-Save Current Instrument?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-3"/>
-        <location line="+5"/>
-        <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">MusE</translation>
     </message>
     <message>
-        <location line="-5"/>
-        <location line="+5"/>
         <source>&amp;Nosave</source>
-        <translation type="unfinished">Lied &amp;nicht Sichern</translation>
+        <translation type="obsolete">Lied &amp;nicht Sichern</translation>
     </message>
     <message>
-        <location line="-5"/>
         <source>&amp;Abort</source>
-        <translation type="unfinished">&amp;Abbrechen</translation>
+        <translation type="obsolete">&amp;Abbrechen</translation>
     </message>
 </context>
 <context>
@@ -4628,229 +4096,229 @@ MusE behandelt allerdings Kontroller wie &quot;pitch&quot; und &quot;program cha
     <message>
         <location line="-1448"/>
         <source>Instrument Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Name des Instruments:</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Selected instrument name.</source>
-        <translation type="unfinished"></translation>
+        <translation>Name des ausgewählten Instruments.</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>List of defined instruments.</source>
-        <translation type="unfinished"></translation>
+        <translation>Liste aller definierten Instrumente.</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Pa&amp;tches</source>
-        <translation type="unfinished"></translation>
+        <translation>Pa&amp;tches</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>List of groups and patches.</source>
-        <translation type="unfinished"></translation>
+        <translation>Liste der Gruppen und Patches.</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Group/Patch</source>
-        <translation type="unfinished"></translation>
+        <translation>Gruppe/Patch</translation>
     </message>
     <message>
         <location line="+15"/>
         <location line="+443"/>
         <location line="+742"/>
         <source>Name:</source>
-        <translation type="unfinished">Name:</translation>
+        <translation>Name:</translation>
     </message>
     <message>
         <location line="-1175"/>
         <location line="+3"/>
         <source>Group or patch name</source>
-        <translation type="unfinished"></translation>
+        <translation>Gruppen- oder Patchname</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>Patch high bank number</source>
-        <translation type="unfinished"></translation>
+        <translation>Hohe Banknummer für den Patch</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Patch high bank number. --- means don&apos;t care.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hohe Banknummer für den Patch. --- i.d.R. uninteressant.</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>---</source>
         <comment>dont care</comment>
-        <translation type="unfinished"></translation>
+        <translation>---</translation>
     </message>
     <message>
         <location line="+46"/>
         <source>Patch low bank number</source>
-        <translation type="unfinished"></translation>
+        <translation>Niedrige Banknummer für den Patch</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Patch low bank number. --- means don&apos;t care.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hohe Banknummer für den Patch. --- i.d.R. uninteressant.</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>---</source>
-        <translation type="unfinished"></translation>
+        <translation>---</translation>
     </message>
     <message>
         <location line="+46"/>
         <location line="+3"/>
         <source>Patch program number</source>
-        <translation type="unfinished"></translation>
+        <translation>Programmnummer für den Patch</translation>
     </message>
     <message>
         <location line="+36"/>
         <source>Drum patch</source>
-        <translation type="unfinished"></translation>
+        <translation>Schlagzeug-Patch</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>If set, the patch is available only for drum channels.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wenn aktiviert, ist der Patch nur für Schlagzeugkanäle verfügbar.</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>GM patch</source>
-        <translation type="unfinished"></translation>
+        <translation>GM Patch</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>If set, the patch is available in a &apos;GM&apos; or &apos;NO&apos; midi song type.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wenn aktiviert, ist der Patch nur in einem &quot;GM&quot; oder &quot;NO&quot; Songtypen verfügbar.</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>GS patch</source>
-        <translation type="unfinished"></translation>
+        <translation>GS Patch</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>If set, the patch is available in a &apos;GS&apos; or &apos;NO&apos; midi song type.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wenn aktiviert, ist der Patch nur in einem &quot;GS&quot; oder &quot;NO&quot; Songtypen verfügbar.</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>XG patch</source>
-        <translation type="unfinished"></translation>
+        <translation>XG Patch</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>If set, the patch is available in an &apos;XG&apos; or &apos;NO&apos; midi song type.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wenn aktiviert, ist der Patch nur in einem &quot;XG&quot; oder &quot;NO&quot; Songtypen verfügbar.</translation>
     </message>
     <message>
         <location line="+39"/>
         <source>Delete group or patch</source>
-        <translation type="unfinished"></translation>
+        <translation>Lösche Gruppe oder Patch</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>New patch</source>
-        <translation type="unfinished"></translation>
+        <translation>Neuer Patch</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>New &amp;Patch</source>
-        <translation type="unfinished"></translation>
+        <translation>Neuer &amp;Patch</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Alt+P</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt+P</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>New group</source>
-        <translation type="unfinished"></translation>
+        <translation>Neue Gruppe</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>New &amp;Group</source>
-        <translation type="unfinished"></translation>
+        <translation>Neue &amp;Gruppe</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Alt+G</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt+G</translation>
     </message>
     <message>
         <location line="+30"/>
         <source>Contro&amp;ller</source>
-        <translation type="unfinished"></translation>
+        <translation>Contro&amp;ller</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>Common:</source>
-        <translation type="unfinished"></translation>
+        <translation>Gemeinsam:</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>List of defined controllers</source>
-        <translation type="unfinished"></translation>
+        <translation>Liste von definierten Controllern</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>List of defined controllers.</source>
-        <translation type="unfinished"></translation>
+        <translation>Liste von definierten Controllern.</translation>
     </message>
     <message>
         <location line="+33"/>
         <source>Min  </source>
-        <translation type="unfinished"></translation>
+        <translation>Min  </translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Max  </source>
-        <translation type="unfinished"></translation>
+        <translation>Max  </translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Def  </source>
-        <translation type="unfinished"></translation>
+        <translation>Def  </translation>
     </message>
     <message>
         <location line="+35"/>
         <source>Midi controller name</source>
-        <translation type="unfinished"></translation>
+        <translation>Name des Midi-Controllers</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Type:</source>
-        <translation type="unfinished">Typ:</translation>
+        <translation>Typ:</translation>
     </message>
     <message>
         <location line="+10"/>
         <location line="+3"/>
         <source>Midi controller type</source>
-        <translation type="unfinished"></translation>
+        <translation>Typ des Midi-Controllers</translation>
     </message>
     <message>
         <location line="+24"/>
         <source>RPN14</source>
-        <translation type="unfinished"></translation>
+        <translation>RPN14</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>NRPN14</source>
-        <translation type="unfinished"></translation>
+        <translation>NRPN14</translation>
     </message>
     <message>
         <location line="+53"/>
         <location line="+3"/>
         <source>Midi controller number high byte</source>
-        <translation type="unfinished"></translation>
+        <translation>Midi Controllernummer höchstwertiges Byte</translation>
     </message>
     <message>
         <location line="+51"/>
         <source>Midi controller number low byte (* means drum controller)</source>
-        <translation type="unfinished"></translation>
+        <translation>Midi Controllernummer niederwertiges Byte (* bedeutet Schlagzeugcontroller)</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -4863,23 +4331,31 @@ Allows controllers for each instrument in
  replaced by the &apos;ANote&apos; in the drum map.
 Examples: The GS and XG instruments&apos; 
  Drum controllers.</source>
-        <translation type="unfinished"></translation>
+        <translation>Niederwertiges Byte der MIDI-Controller-
+nummer. Wenn es &quot;*&quot; ist, ist der Controller
+ein Schlagzeugcontroller. Für Schlagzeug-
+spuren und GS/XG-Songs und -Instrumente.
+Ermöglicht Controller für jedes Instrument
+in der Schlagzeug-Liste. Das niederwertige
+Byte wird durch die &quot;ANote&quot; der Liste ersetzt.
+Beispiele: Die Schlagzeugcontroller der GS-
+und XG-Instrumente.</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>*</source>
         <comment>wild card</comment>
-        <translation type="unfinished"></translation>
+        <translation>*</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Range:</source>
-        <translation type="unfinished"></translation>
+        <translation>Bereich:</translation>
     </message>
     <message>
         <location line="+48"/>
         <source>Minimum value. If negative, auto-translate.</source>
-        <translation type="unfinished"></translation>
+        <translation>Minimalwert. Wenn negativ, automatisch umsetzen.</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -4902,23 +4378,41 @@ Type &apos;Pitch&apos; is the exception. It is biased
  at zero, even with a negative minimum:
 &apos;Pitch&apos;: Min: -8192 Max: 8191
 True range: Min: -8192 Max: 8191 (bias 0)</source>
-        <translation type="unfinished"></translation>
+        <translation>Minimalwert. Wenn er negativ ist, wird
+der Bereich automatisch in einen
+positiven umgesetzt.
+
+Nützlich für Controller, die ohne Bias
+dargestellt werden sollen. Bespielsweise
+&quot;Panorama&quot;: Minimum -64, Maximum 63.
+Wirklicher Bereich: 0 bis 127 (Bias ist also 64)
+&quot;Grobes Stimmen&quot;: -24 bis 23
+In Wirklichkeit: 40 bis 87, Bias=64.
+
+Das Bias wird durch den Controller-Typen
+bestimmt:
+für 7-bittige Controller: Bias=64
+für 14-bittige Controller: Bias= 8192
+
+Der Typ &quot;Pitch&quot; ist die Ausnahme: Er hat
+kein Bias, obwohl er ein negatives Minimum
+besitzt: Er geht von -8192 bis 8191</translation>
     </message>
     <message>
         <location line="+69"/>
         <location line="+3"/>
         <source>Maximum value</source>
-        <translation type="unfinished"></translation>
+        <translation>Maximalwert</translation>
     </message>
     <message>
         <location line="+36"/>
         <source>Default:</source>
-        <translation type="unfinished"></translation>
+        <translation>Standard:</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>L-Bank</source>
-        <translation type="unfinished">L-Bank</translation>
+        <translation>L-Bank</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -4927,27 +4421,27 @@ True range: Min: -8192 Max: 8191 (bias 0)</source>
         <location line="+198"/>
         <location line="+53"/>
         <source>off</source>
-        <translation type="unfinished"></translation>
+        <translation>aus</translation>
     </message>
     <message>
         <location line="-261"/>
         <source>Progr.</source>
-        <translation type="unfinished">Progr.</translation>
+        <translation>Progr.</translation>
     </message>
     <message>
         <location line="+35"/>
         <source>???</source>
-        <translation type="unfinished">???</translation>
+        <translation>???</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>H-Bank</source>
-        <translation type="unfinished">H-Bank</translation>
+        <translation>H-Bank</translation>
     </message>
     <message>
         <location line="+44"/>
         <source>Default value. Off: No default.</source>
-        <translation type="unfinished"></translation>
+        <translation>Standardwert. &quot;Aus&quot;: Kein Standardwert.</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -4966,58 +4460,73 @@ Caution! Watch out for controllers such as
  values. You should probably turn &apos;off&apos; their 
  default (in piano roll or drum edit, and 
  instrument editor).</source>
-        <translation type="unfinished"></translation>
+        <translation>Standard- (Initial-)Wert. Aus bedeutet &quot;kein Standard&quot;.
+
+Wenn ein Standardwert ausgewählt ist, wird der Wert
+zu dem Controller gesendet, wenn er zum Lied hinzu-
+gefügt wird (in der Pianoroll oder dem Eventeditor).
+Wenn das Lied neu geladen wird, wird der Wert erneut
+gesendet. Ansonsten bleibt der Controller auf seinem
+vorherigen Wert. Controller werden auch automatisch
+zu einem Lied hinzugefügt, sobald ein solches MIDI-
+Controller-Event empfangen wurde.
+
+Achtung! Passen Sie bei Controllern wie &quot;Sustain&quot;
+und &quot;ResetAllController&quot; auf Standardwerte auf.
+Sie sollten wahrscheinlich den Standardwert auf
+&quot;aus&quot; setzen (in der Pianoroll oder dem Schlagzeug-
+editor und dem Instrumenteneditor).</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>off</source>
         <comment>dont care</comment>
-        <translation type="unfinished"></translation>
+        <translation>aus</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Add common controller</source>
-        <translation type="unfinished"></translation>
+        <translation>Füge gemeinsamen Controller hinzu</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>&amp;Add</source>
-        <translation type="unfinished">&amp;Hinzufügen</translation>
+        <translation>&amp;Hinzufügen</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Alt+A</source>
-        <translation type="unfinished">Alt+A</translation>
+        <translation>Alt+A</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Delete controller</source>
-        <translation type="unfinished"></translation>
+        <translation>Controller löschen</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Create a new controller</source>
-        <translation type="unfinished"></translation>
+        <translation>Neuen controller erstellen</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>New &amp;Controller</source>
-        <translation type="unfinished"></translation>
+        <translation>Neuer &amp;Controller</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Alt+C</source>
-        <translation type="unfinished">Alt+C</translation>
+        <translation>Alt+C</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Null Param Hi:</source>
-        <translation type="unfinished"></translation>
+        <translation>Null Param Hi:</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Null parameter number High byte</source>
-        <translation type="unfinished"></translation>
+        <translation>Null Parameternummer höchstwertiges Byte</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -5028,77 +4537,79 @@ This prevents subsequent &apos;data&apos; events
  from corrupting the RPN/NRPN controller.
 Typically, set to 127/127, or an unused
  RPN/NRPN controller number.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wenn gesetzt, werden diese &quot;null&quot; Parameter-
+nummern gesendet nach jedem RPN/NRPN-
+Event.
+Das verhindert, dass nachfolgende Datenevents
+die RPN/NRPN-Controller zerstören.
+Normalerweise auf 127/127 oder eine unbenutzte
+RPN/NRPN-Controllernummer gesetzt.</translation>
     </message>
     <message>
         <location line="-13"/>
         <source> Lo:</source>
-        <translation type="unfinished"></translation>
+        <translation>Lo:</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Null parameter number Low byte</source>
-        <translation type="unfinished"></translation>
+        <translation>Null Parameternummer niederwertiges Byte</translation>
     </message>
     <message>
         <location line="+34"/>
         <source>S&amp;ysEx</source>
-        <translation type="unfinished"></translation>
+        <translation>S&amp;ysEx</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>SysEx List:</source>
-        <translation type="unfinished"></translation>
+        <translation>SysEx-Liste:</translation>
     </message>
     <message>
         <location line="+62"/>
         <source>New SysE&amp;x</source>
-        <translation type="unfinished"></translation>
+        <translation>Neuer SysE&amp;x</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Alt+X</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt+X</translation>
     </message>
     <message>
         <location line="+73"/>
         <source>&amp;Help</source>
-        <translation type="unfinished">&amp;Hilfe</translation>
+        <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <location line="+84"/>
         <location line="+3"/>
         <source>new item</source>
-        <translation type="unfinished"></translation>
+        <translation>neuer Eintrag</translation>
     </message>
     <message>
         <location line="+8"/>
         <location line="+3"/>
         <source>What&apos;s this?</source>
-        <translation type="unfinished"></translation>
+        <translation>Was ist das?</translation>
     </message>
 </context>
 <context>
     <name>EditMetaDialog</name>
     <message>
-        <location filename="../../muse/liste/editevent.cpp" line="+120"/>
         <source>Time Position</source>
-        <translation>Position</translation>
+        <translation type="obsolete">Position</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Meta Type</source>
-        <translation>Meta Typ</translation>
+        <translation type="obsolete">Meta Typ</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Enter Hex</source>
-        <translation>Hex Eingabe</translation>
+        <translation type="obsolete">Hex Eingabe</translation>
     </message>
     <message>
-        <location line="-18"/>
         <source>MusE: Enter Meta Event</source>
-        <translation>MusE: Eingabe von Metaereignissen</translation>
+        <translation type="obsolete">MusE: Eingabe von Metaereignissen</translation>
     </message>
 </context>
 <context>
@@ -5178,24 +4689,20 @@ Typically, set to 127/127, or an unused
 <context>
     <name>EditPAfterDialog</name>
     <message>
-        <location filename="../../muse/liste/editevent.cpp" line="+196"/>
         <source>Time Position</source>
-        <translation>Position</translation>
+        <translation type="obsolete">Position</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Pitch</source>
-        <translation>Tonhöhe</translation>
+        <translation type="obsolete">Tonhöhe</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Pressure</source>
-        <translation>Anschlagsdruck</translation>
+        <translation type="obsolete">Anschlagsdruck</translation>
     </message>
     <message>
-        <location line="-8"/>
         <source>MusE: Enter Poly Aftertouch</source>
-        <translation>MusE: Poly Aftertouch eingeben</translation>
+        <translation type="obsolete">MusE: Poly Aftertouch eingeben</translation>
     </message>
 </context>
 <context>
@@ -5273,7 +4780,7 @@ Typically, set to 127/127, or an unused
     <message>
         <location filename="../../synti/fluid/fluidgui.cpp" line="+77"/>
         <source>FLUID: open Soundfile</source>
-        <translation type="unfinished"></translation>
+        <translation>FLUID: Sounddatei öffnen</translation>
     </message>
 </context>
 <context>
@@ -5281,17 +4788,17 @@ Typically, set to 127/127, or an unused
     <message>
         <location filename="../../synti/fluid/fluidguibase.ui" line="+14"/>
         <source>Form1</source>
-        <translation type="unfinished">Form1</translation>
+        <translation>Form1</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Soundfont</source>
-        <translation type="unfinished"></translation>
+        <translation>Soundfont</translation>
     </message>
     <message>
         <location line="+52"/>
         <source>Load</source>
-        <translation type="unfinished"></translation>
+        <translation>Laden</translation>
     </message>
 </context>
 <context>
@@ -5299,17 +4806,17 @@ Typically, set to 127/127, or an unused
     <message>
         <location filename="../../synti/fluidsynth/fluidsynthguibase.ui" line="+14"/>
         <source>FLUID Synth</source>
-        <translation type="unfinished"></translation>
+        <translation>FLUID Synth</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Load</source>
-        <translation type="unfinished"></translation>
+        <translation>Laden</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Delete</source>
-        <translation type="unfinished">Löschen</translation>
+        <translation>Löschen</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -5319,103 +4826,103 @@ Typically, set to 127/127, or an unused
     <message>
         <location line="+17"/>
         <source>ID</source>
-        <translation type="unfinished"></translation>
+        <translation>ID</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Fontname</source>
-        <translation type="unfinished"></translation>
+        <translation>Name</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Chnl</source>
-        <translation type="unfinished"></translation>
+        <translation>Kanal</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Soundfont</source>
-        <translation type="unfinished"></translation>
+        <translation>Soundfont</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Drum Chnl</source>
-        <translation type="unfinished"></translation>
+        <translation>Drumkanal</translation>
     </message>
     <message>
         <location line="+108"/>
         <location line="+235"/>
         <source>Level</source>
-        <translation type="unfinished"></translation>
+        <translation>Level</translation>
     </message>
     <message>
         <location line="-222"/>
         <source>Width</source>
-        <translation type="unfinished"></translation>
+        <translation>Breite</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Damping</source>
-        <translation type="unfinished"></translation>
+        <translation>Dämpfung</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Room Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Raumgröße</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Reverb</source>
-        <translation type="unfinished"></translation>
+        <translation>Reverb</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>CHANNEL SETUP</source>
-        <translation type="unfinished"></translation>
+        <translation>KANAL SETUP</translation>
     </message>
     <message>
         <location line="+29"/>
         <source>Sine</source>
-        <translation type="unfinished"></translation>
+        <translation>Sinus</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Triangle</source>
-        <translation type="unfinished"></translation>
+        <translation>Dreieck</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Type</source>
-        <translation type="unfinished">Typ</translation>
+        <translation>Typ</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Number</source>
-        <translation type="unfinished"></translation>
+        <translation>Anzahl</translation>
     </message>
     <message>
         <location line="+35"/>
         <source>Speed</source>
-        <translation type="unfinished"></translation>
+        <translation>Geschwindigkeit</translation>
     </message>
     <message>
         <location line="+35"/>
         <source>Depth</source>
-        <translation type="unfinished"></translation>
+        <translation>Stärke</translation>
     </message>
     <message>
         <location line="+48"/>
         <source>Chorus</source>
-        <translation type="unfinished"></translation>
+        <translation>Chorus</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Gain</source>
-        <translation type="unfinished"></translation>
+        <translation>Verstärkung</translation>
     </message>
     <message>
         <location line="+50"/>
         <source>LOADED SOUNDFONTS</source>
-        <translation type="unfinished"></translation>
+        <translation>GELADENE SOUNDFONTS</translation>
     </message>
 </context>
 <context>
@@ -5458,13 +4965,14 @@ Songdata</source>
     <message>
         <location line="-129"/>
         <source>fdialogbuttons</source>
-        <translation type="unfinished"></translation>
+        <translation>fdialogbuttons</translation>
     </message>
     <message>
         <location line="+121"/>
         <source>Songdata +
 Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>Lieddaten +
+Konfiguration</translation>
     </message>
 </context>
 <context>
@@ -5472,7 +4980,7 @@ Configuration</source>
     <message>
         <location filename="../../synti/fluidsynth/fluidsynthgui.cpp" line="+188"/>
         <source>Choose soundfont</source>
-        <translation type="unfinished"></translation>
+        <translation>Soundfont auswählen</translation>
     </message>
 </context>
 <context>
@@ -5491,22 +4999,22 @@ Configuration</source>
     <message>
         <location filename="../../muse/widgets/function_dialogs/gatetimebase.ui" line="+26"/>
         <source>Range</source>
-        <translation type="unfinished">Bereich</translation>
+        <translation>Bereich</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>All Events</source>
-        <translation type="unfinished">Alle Ereignisse</translation>
+        <translation>Alle Ereignisse</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Selected Events</source>
-        <translation type="unfinished">Ausgewählte Ereignisse</translation>
+        <translation>Ausgewählte Ereignisse</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Looped Events</source>
-        <translation type="unfinished">Ereignisse innerhalb Schleife</translation>
+        <translation>Ereignisse innerhalb Schleife</translation>
     </message>
     <message>
         <source>Selected &amp; Looped</source>
@@ -5515,47 +5023,47 @@ Configuration</source>
     <message>
         <location line="-41"/>
         <source>MusE: Modify Note Length</source>
-        <translation type="unfinished"></translation>
+        <translation>MusE: Notenlänge verändern</translation>
     </message>
     <message>
         <location line="+48"/>
         <source>Selected Looped</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausgewählt und innerhalb der Schleife</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Values</source>
-        <translation type="unfinished">Werte</translation>
+        <translation>Werte</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Rate:</source>
-        <translation type="unfinished">Rate:</translation>
+        <translation>Rate:</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Offset:</source>
-        <translation type="unfinished">Zeitversatz:</translation>
+        <translation>Zeitversatz:</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>%</source>
-        <translation type="unfinished">%</translation>
+        <translation>%</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>lenNew = (lenOld * rate) + offset</source>
-        <translation type="unfinished"></translation>
+        <translation>lenNeu = (lenAlt * rate) + offset</translation>
     </message>
     <message>
         <location line="+47"/>
         <source>OK</source>
-        <translation type="unfinished">Bestätigen</translation>
+        <translation>Bestätigen</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Cancel</source>
-        <translation type="unfinished">Abbrechen</translation>
+        <translation>Abbrechen</translation>
     </message>
 </context>
 <context>
@@ -5566,7 +5074,7 @@ Configuration</source>
         <translation>MusE: Globale Einstellungen</translation>
     </message>
     <message>
-        <location line="+530"/>
+        <location line="+559"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
@@ -5692,12 +5200,11 @@ Configuration</source>
 (Ticks/Sekunde)</translation>
     </message>
     <message>
-        <location line="+212"/>
         <source>GUI</source>
-        <translation>GUI</translation>
+        <translation type="obsolete">GUI</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+216"/>
         <source>/sec</source>
         <translation>/sek</translation>
     </message>
@@ -5709,43 +5216,81 @@ Configuration</source>
     <message>
         <location line="+72"/>
         <source>Use project save dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Benutze Projekt-Speichern-Dialog</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>Some popup menus stay open (else hold Ctrl)</source>
-        <translation type="unfinished"></translation>
+        <translation>Manche Popup-Menüs bleiben offen (ansonsten Strg halten)</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+13"/>
         <source>Allows some popup menus to stay open.
 Otherwise, hold Ctrl to keep them open.</source>
-        <translation type="unfinished"></translation>
+        <translation>Erlaubt es, dass einige Popup-Menüs offen bleiben.
+Ansonsten können Sie auch Strg drücken, um ein
+solches Menü offen zu halten.</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+11"/>
+        <source>In some areas, the middle mouse button decreases
+values, while the right button increases. Users without a
+middle mouse button can select this option to make the
+left button behave like the middle button in such areas.</source>
+        <translation>In manchen Bereichen vermindert die mittlere Maustaste
+Werte, während die rechte erhöht. Benutzer ohne mittlere
+Maustaste können diese Option nutzen, damit sich in solchen
+Bereichen die linke Maustaste wie die mittlere verhält.</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Use left mouse button for decreasing values</source>
+        <translation>Benutze linke Maustaste, um Werte zu erniedrigen</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Shift + Right click sets left range marker</source>
+        <translation>Shift + Rechtsklick setzt den linken Bereichs-Marker</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Allow adding hidden tracks in track list menu</source>
+        <translation>Erlaube es, verborgene Spurtypen hinzuzufügen in der Spurliste</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Unhide tracks when adding hidden tracks</source>
+        <translation>Verborgene Spurentypen anzeigen, wenn ein solcher Typ hinzugefügt wird</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>GUI Style</source>
+        <translation>GUI-Stil</translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>MDI-subwindowness and sharing menus</source>
-        <translation type="unfinished"></translation>
+        <translation>Unterfenster und Menü-Teilen</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Presets:</source>
-        <translation type="unfinished"></translation>
+        <translation>Voreinstellungen:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>traditional MusE SDI</source>
-        <translation type="unfinished"></translation>
+        <translation>traditionelles MusE SDI</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Cakewalk-like MDI</source>
-        <translation type="unfinished"></translation>
+        <translation>Cakewalk-ähnliches MDI</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Borland-/Mac-like MDI</source>
-        <translation type="unfinished"></translation>
+        <translation>Borland-/Mac-ähnliches MDI</translation>
     </message>
     <message>
         <location line="+56"/>
@@ -5767,12 +5312,12 @@ Otherwise, hold Ctrl to keep them open.</source>
         <translation type="obsolete">Hilfe Browser:</translation>
     </message>
     <message>
-        <location line="-1438"/>
+        <location line="-1543"/>
         <source>Application</source>
         <translation>Anwendung</translation>
     </message>
     <message>
-        <location line="+389"/>
+        <location line="+418"/>
         <source>Start Muse</source>
         <translation>MusE starten</translation>
     </message>
@@ -5883,104 +5428,120 @@ Otherwise, hold Ctrl to keep them open.</source>
     <message>
         <location line="-326"/>
         <source>Mixer A</source>
-        <translation type="unfinished">Mixer A</translation>
+        <translation>Mixer A</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Mixer B</source>
-        <translation type="unfinished">Mixer B</translation>
+        <translation>Mixer B</translation>
     </message>
     <message>
         <location line="+317"/>
         <source>show &quot;Did you know?&quot; dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeige &quot;Wussten Sie?&quot;-Dialog</translation>
     </message>
     <message>
         <location line="-55"/>
         <source>Start song</source>
-        <translation type="unfinished"></translation>
+        <translation>Beim Starten geöffnetes Lied</translation>
     </message>
     <message>
         <location line="+140"/>
         <source>min. Slider Val</source>
-        <translation type="unfinished"></translation>
+        <translation>min. Schiebereglerwert</translation>
     </message>
     <message>
         <location line="+60"/>
         <source>Enable denormal protection</source>
-        <translation type="unfinished"></translation>
+        <translation>Denormal-Schutz aktivieren</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Enable output limiter</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktiviere Ausgangs-Limiter</translation>
     </message>
     <message>
         <location line="+131"/>
         <source>External Waveditor</source>
-        <translation type="unfinished"></translation>
+        <translation>Externer Wave-Editor</translation>
     </message>
     <message>
         <location line="+25"/>
         <source>External Waveditor command</source>
-        <translation type="unfinished"></translation>
+        <translation>Befehl für externen Wave-Editor</translation>
     </message>
     <message>
         <location line="+44"/>
         <source>Note: External editor opened from the internal editor.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hinweis: der externe Editor, der vom internen aus geöffnet wird.</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Dummy Audio Driver (settings require restart)</source>
-        <translation type="unfinished"></translation>
+        <translation>Dummy Audiotreiber (erfordert Neustart)</translation>
     </message>
     <message>
         <location line="+31"/>
         <source>Hz</source>
-        <translation type="unfinished"></translation>
+        <translation>Hz</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>Period size (Frames per period):</source>
-        <translation type="unfinished"></translation>
+        <translation>Periodengröße (Frames pro Periode):</translation>
     </message>
     <message>
         <location line="-180"/>
         <location line="+194"/>
         <source>16</source>
-        <translation type="unfinished">16</translation>
+        <translation>16</translation>
+    </message>
+    <message>
+        <location line="-942"/>
+        <source>Project directory</source>
+        <translation>Projektverzeichnis</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Projects:</source>
+        <translation>Projekte:</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>...</source>
+        <translation>...</translation>
     </message>
     <message>
-        <location line="-719"/>
+        <location line="+204"/>
         <source>Main Window</source>
-        <translation type="unfinished"></translation>
+        <translation>Hauptfenster</translation>
     </message>
     <message>
         <location line="+399"/>
         <source>Try to use Jack Freewheel</source>
-        <translation type="unfinished"></translation>
+        <translation>Versuche, Jack-Freewheel zu nutzen</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Speeds bounce operations</source>
-        <translation type="unfinished"></translation>
+        <translation>Beschleunigt Abmisch-Operationen</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Use Jack Freewheel mode if possible.
 This dramatically speeds bounce operations.</source>
-        <translation type="unfinished"></translation>
+        <translation>Benutzt Jack&apos;s Freewheel-Modus, wenn möglich.
+Das beschleunigt Abmisch-Operationen dramatisch.</translation>
     </message>
     <message>
         <location line="+38"/>
         <source>VST in-place</source>
-        <translation type="unfinished"></translation>
+        <translation>VST in-place</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Enable VST in-place processing (restart required)</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktiviere VST-in-place-verarbeitung (Neustart erforderlich)</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -5988,18 +5549,21 @@ This dramatically speeds bounce operations.</source>
  VST Ladspa effect rack plugins do not work or 
  feedback loudly, even if they are supposed to 
  be in-place capable. Setting requires a restart.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktiviere VST-in-place-verarbeitung: Schalten Sie das
+aus, wenn VST Ladspa Effekt-Rack-Plugins nicht funktionieren
+oder laut rückspeisten, selbst wenn sie in-place-fähig
+sein sollten. Einstellung erfordert Neustart.</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Minimum control period</source>
-        <translation type="unfinished"></translation>
+        <translation>Minimale Kontroll-Periode</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Minimum audio controller process period (samples).
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Minimale Audiocontroller-Periode (Samples).</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -6008,251 +5572,170 @@ Adjusts responsiveness of audio controls and
  controller graphs. Set a low value for fast, smooth 
  control. If it causes performance problems, set a 
  higher value. </source>
-        <translation type="unfinished"></translation>
+        <translation>Minimale Audiocontroller-Periode (Samples).
+Beeinflusst die Reaktionszeit von Audiocontrols
+und Controller-Graphen. Setzen Sie einen niedrigen
+Wert für schnelle, weiche Kontrolle. Wenn das
+Geschwindigkeitsprobleme verursacht, benutzen Sie
+einen höheren Wert.</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>1</source>
-        <translation type="unfinished">1</translation>
+        <translation>1</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>2</source>
-        <translation type="unfinished">2</translation>
+        <translation>2</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>4</source>
-        <translation type="unfinished">4</translation>
+        <translation>4</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>8</source>
-        <translation type="unfinished">8</translation>
+        <translation>8</translation>
     </message>
     <message>
         <location line="+10"/>
         <location line="+194"/>
         <source>32</source>
-        <translation type="unfinished">32</translation>
+        <translation>32</translation>
     </message>
     <message>
         <location line="-189"/>
         <location line="+194"/>
         <source>64</source>
-        <translation type="unfinished">64</translation>
+        <translation>64</translation>
     </message>
     <message>
         <location line="-189"/>
         <location line="+194"/>
         <source>128</source>
-        <translation type="unfinished">128</translation>
+        <translation>128</translation>
     </message>
     <message>
         <location line="-189"/>
         <location line="+194"/>
         <source>256</source>
-        <translation type="unfinished">256</translation>
+        <translation>256</translation>
     </message>
     <message>
         <location line="-189"/>
         <location line="+194"/>
         <source>512</source>
-        <translation type="unfinished">512</translation>
+        <translation>512</translation>
     </message>
     <message>
         <location line="-68"/>
         <source>Sample rate</source>
-        <translation type="unfinished"></translation>
+        <translation>Sampling-Rate</translation>
     </message>
     <message>
         <location line="+39"/>
         <source>Shorter periods give better midi playback resolution.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kürzere Perioden führen zu einer besseren Midi-Abspiel-Auflösung.</translation>
     </message>
     <message>
         <location line="+96"/>
         <source>8192</source>
-        <translation type="unfinished">8192</translation>
+        <translation>8192</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>16384</source>
-        <translation type="unfinished">16384</translation>
+        <translation>16384</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>32768</source>
-        <translation type="unfinished">32768</translation>
+        <translation>32768</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Midi Resolution
 (Ticks/Quarternote)</source>
-        <translation type="unfinished"></translation>
+        <translation>Midi Auflösung
+(Ticks/Viertelnote)</translation>
     </message>
     <message>
-        <location line="+126"/>
         <source>Instruments Directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Instrumentenverzeichnis</translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+143"/>
+        <source>GUI Behaviour</source>
+        <translation>GUI-Verhalten</translation>
+    </message>
+    <message>
+        <location line="+44"/>
         <source>Use old-style stop shortcut:</source>
-        <translation type="unfinished"></translation>
+        <translation>Benutze altes Stopp-Kürzel:</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Move single armed track with selection</source>
-        <translation type="unfinished"></translation>
+        <translation>Bewege &quot;für Aufnahme scharfschalten&quot; mit Auswahl</translation>
     </message>
     <message>
-        <location line="-791"/>
+        <location line="-767"/>
         <source>On Launch</source>
-        <translation type="unfinished"></translation>
+        <translation>Beim Start</translation>
     </message>
     <message>
-        <location line="+736"/>
+        <location line="+712"/>
         <source>Behavior</source>
-        <translation type="unfinished"></translation>
+        <translation>Verhalten</translation>
     </message>
 </context>
 <context>
     <name>LMaster</name>
     <message>
-        <location filename="../../muse/master/lmaster.cpp" line="+207"/>
         <source>new tempo</source>
-        <translation>Neues Tempo</translation>
+        <translation type="obsolete">Neues Tempo</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>new signature</source>
-        <translation>Neues Taktmaß</translation>
+        <translation type="obsolete">Neues Taktmaß</translation>
     </message>
     <message>
-        <location line="+26"/>
         <source>Meter</source>
-        <translation>Taktposition</translation>
+        <translation type="obsolete">Taktposition</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Time</source>
-        <translation>Zeitposition</translation>
+        <translation type="obsolete">Zeitposition</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Type</source>
-        <translation>Typ</translation>
+        <translation type="obsolete">Typ</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Value</source>
-        <translation>Wert</translation>
+        <translation type="obsolete">Wert</translation>
     </message>
     <message>
-        <location line="-90"/>
         <source>MusE: Mastertrack</source>
-        <translation>MusE: Masterspur</translation>
+        <translation type="obsolete">MusE: Masterspur</translation>
     </message>
     <message>
-        <location line="+25"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+23"/>
         <source>Undo/Redo tools</source>
-        <translation type="unfinished">Rückgängig/Wiederho</translation>
+        <translation type="obsolete">Rückgängig/Wiederho</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Tempo</source>
-        <translation>Tempo</translation>
+        <translation type="obsolete">Tempo</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Timesig</source>
-        <translation>Taktmaß</translation>
-    </message>
-    <message>
-        <location line="-45"/>
-        <source>&amp;Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Insert Tempo</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Taktmaß</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Insert Signature</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Insert Key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Edit Positon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Edit Value</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Delete Event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+30"/>
-        <source>Edit tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>new key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
         <source>panic</source>
-        <translation type="unfinished">Panik</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>transport</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+408"/>
-        <source>Reposition of the initial tempo and signature events is not allowed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+54"/>
-        <source>MusE: List Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Input error, conversion not OK or value out of range</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>Reposition of tempo and signature events to start position is not allowed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Panik</translation>
     </message>
 </context>
 <context>
@@ -6260,85 +5743,81 @@ Adjusts responsiveness of audio controls and
     <message>
         <location filename="../../muse/widgets/function_dialogs/legatobase.ui" line="+17"/>
         <source>MusE: Legato</source>
-        <translation type="unfinished"></translation>
+        <translation>MusE: Legato</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Range</source>
-        <translation type="unfinished">Bereich</translation>
+        <translation>Bereich</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>All Events</source>
-        <translation type="unfinished">Alle Ereignisse</translation>
+        <translation>Alle Ereignisse</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Selected Events</source>
-        <translation type="unfinished">Ausgewählte Ereignisse</translation>
+        <translation>Ausgewählte Ereignisse</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Looped Events</source>
-        <translation type="unfinished">Ereignisse innerhalb Schleife</translation>
+        <translation>Ereignisse innerhalb Schleife</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Selected Looped</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausgewählt und innerhalb der Schleife</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Settings</source>
-        <translation type="unfinished">Einstellungen</translation>
+        <translation>Einstellungen</translation>
     </message>
     <message>
         <location line="+24"/>
         <source> ticks</source>
-        <translation type="unfinished"></translation>
+        <translation> Ticks</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>Minimum Length</source>
-        <translation type="unfinished"></translation>
+        <translation>Minimallänge</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Allow shortening notes</source>
-        <translation type="unfinished"></translation>
+        <translation>Erlaube, Noten zu verkürzen</translation>
     </message>
     <message>
         <location line="+56"/>
         <source>OK</source>
-        <translation type="unfinished">Bestätigen</translation>
+        <translation>Bestätigen</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Cancel</source>
-        <translation type="unfinished">Abbrechen</translation>
+        <translation>Abbrechen</translation>
     </message>
 </context>
 <context>
     <name>ListEdit</name>
     <message>
-        <location filename="../../muse/liste/listedit.cpp" line="+486"/>
         <source>&amp;Edit</source>
-        <translation>B&amp;earbeiten</translation>
+        <translation type="obsolete">B&amp;earbeiten</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Cut</source>
-        <translation>Ausschneiden</translation>
+        <translation type="obsolete">Ausschneiden</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Copy</source>
-        <translation>Kopieren</translation>
+        <translation type="obsolete">Kopieren</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Paste</source>
-        <translation>Einfügen</translation>
+        <translation type="obsolete">Einfügen</translation>
     </message>
     <message>
         <source>List Tools</source>
@@ -6349,137 +5828,104 @@ Adjusts responsiveness of audio controls and
         <translation type="obsolete">Werkzeuge &quot;Einfügen&quot;</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Delete Events</source>
-        <translation>Ereignisse löschen</translation>
+        <translation type="obsolete">Ereignisse löschen</translation>
     </message>
     <message>
         <source>Insert Note</source>
         <translation type="obsolete">Note einfügen</translation>
     </message>
     <message>
-        <location line="-37"/>
         <source>insert Note</source>
-        <translation>Note einfügen</translation>
+        <translation type="obsolete">Note einfügen</translation>
     </message>
     <message>
         <source>Insert SysEx</source>
         <translation type="obsolete">SysEx einfügen</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>insert SysEx</source>
-        <translation>SysEx einfügen</translation>
+        <translation type="obsolete">SysEx einfügen</translation>
     </message>
     <message>
         <source>Insert Ctrl</source>
         <translation type="obsolete">Ctrl einfügen</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>insert Ctrl</source>
-        <translation>ctrl einfügen</translation>
+        <translation type="obsolete">ctrl einfügen</translation>
     </message>
     <message>
         <source>Insert Meta</source>
         <translation type="obsolete">Meta einfügen</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>insert Meta</source>
-        <translation>Meta einfügen</translation>
+        <translation type="obsolete">Meta einfügen</translation>
     </message>
     <message>
         <source>Insert Channel Aftertouch</source>
         <translation type="obsolete">Channel Aftertouch einfügen</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>insert Channel Aftertouch</source>
-        <translation>Channel Aftertouch einfügen</translation>
+        <translation type="obsolete">Channel Aftertouch einfügen</translation>
     </message>
     <message>
         <source>Insert Key Aftertouch</source>
         <translation type="obsolete">Key Aftertouch einfügen</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>insert Poly Aftertouch</source>
-        <translation>Poly Aftertouch einfügen</translation>
+        <translation type="obsolete">Poly Aftertouch einfügen</translation>
     </message>
     <message>
-        <location line="+42"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>Undo/Redo tools</source>
-        <translation type="unfinished">Rückgängig/Wiederho</translation>
+        <translation type="obsolete">Rückgängig/Wiederho</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>panic</source>
-        <translation type="unfinished">Panik</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>transport</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Panik</translation>
     </message>
     <message>
-        <location line="+22"/>
         <source>Tick</source>
-        <translation>Tick</translation>
+        <translation type="obsolete">Tick</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Bar</source>
-        <translation>Takt</translation>
+        <translation type="obsolete">Takt</translation>
     </message>
     <message>
         <source>Typ</source>
         <translation type="obsolete">Typ</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Ch</source>
-        <translation>K</translation>
+        <translation type="obsolete">K</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Val A</source>
-        <translation>Wert A</translation>
+        <translation type="obsolete">Wert A</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Val B</source>
-        <translation>Wert B</translation>
+        <translation type="obsolete">Wert B</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Val C</source>
-        <translation>Wert C</translation>
+        <translation type="obsolete">Wert C</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Len</source>
-        <translation>Länge</translation>
+        <translation type="obsolete">Länge</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Comment</source>
-        <translation>Kommentar</translation>
-    </message>
-    <message>
-        <location line="-38"/>
-        <source>Insert tools</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Kommentar</translation>
     </message>
     <message>
-        <location line="+32"/>
         <source>Type</source>
-        <translation type="unfinished">Typ</translation>
+        <translation type="obsolete">Typ</translation>
     </message>
 </context>
 <context>
@@ -6517,269 +5963,52 @@ Adjusts responsiveness of audio controls and
         <translation type="obsolete">kein</translation>
     </message>
     <message>
-        <location filename="../../muse/confmport.cpp" line="+236"/>
         <source>Port</source>
-        <translation>Anschluss</translation>
+        <translation type="obsolete">Anschluss</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>GUI</source>
-        <translation>GUI</translation>
+        <translation type="obsolete">GUI</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Instrument</source>
-        <translation>Instrument</translation>
+        <translation type="obsolete">Instrument</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Device Name</source>
-        <translation>Gerätename</translation>
+        <translation type="obsolete">Gerätename</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>State</source>
-        <translation>Status</translation>
+        <translation type="obsolete">Status</translation>
     </message>
     <message>
         <source>unknown</source>
         <translation type="obsolete">unbekannt</translation>
     </message>
     <message>
-        <location line="-8"/>
         <source>I</source>
-        <translation>E</translation>
+        <translation type="obsolete">E</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>O</source>
-        <translation>A</translation>
-    </message>
-    <message>
-        <location line="-715"/>
-        <source>MusE: bad device name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-254"/>
-        <location line="+176"/>
-        <source>Default input connections</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-175"/>
-        <location line="+66"/>
-        <source>Are you sure you want to apply to all existing midi tracks now?</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">A</translation>
     </message>
     <message>
-        <location line="-1"/>
-        <location line="+148"/>
-        <source>Default output connections</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-37"/>
-        <location line="+38"/>
-        <source>Setting will apply to new midi tracks.
-Do you want to apply to all existing midi tracks now?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+40"/>
-        <source>please choose a unique device name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+72"/>
-        <location line="+860"/>
-        <source>in</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-837"/>
-        <location line="+828"/>
-        <source>out</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-772"/>
-        <source>Show first aliases</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Show second aliases</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+130"/>
-        <location line="+42"/>
-        <source>Toggle all</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-38"/>
-        <location line="+43"/>
-        <source>Change all tracks now</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+43"/>
-        <source>Create</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source> device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+229"/>
-        <location line="+29"/>
         <source>Port Number</source>
-        <translation type="unfinished">Anschlussnummer</translation>
-    </message>
-    <message>
-        <location line="-28"/>
-        <source>Enable gui</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Enable reading</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Enable writing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Port instrument</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Midi device name. Click to edit (Jack)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Connections from Jack Midi outputs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Connections to Jack Midi inputs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Auto-connect these channels to new midi tracks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Auto-connect new midi tracks to these channels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Auto-connect new midi tracks to this channel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>Auto-connect these channels, on this port, to new midi tracks.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Connect new midi tracks to these channels, on this port.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Connect new midi tracks to this channel, on this port.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-45"/>
-        <source>Device state</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+15"/>
-        <source>Enable gui for device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Enable reading from device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Enable writing to device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Name of the midi device associated with this port number. Click to edit Jack midi name.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Anschlussnummer</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Instrument connected to port</source>
-        <translation type="unfinished">Instrument mit Anschluss verbunden</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Connections from Jack Midi output ports</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Connections to Jack Midi input ports</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Instrument mit Anschluss verbunden</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>State: result of opening the device</source>
-        <translation type="unfinished">Status: Ergebnis des Geräteanschlusses</translation>
-    </message>
-    <message>
-        <location line="+47"/>
-        <source>In routes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Out routes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Def in ch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Def out ch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+86"/>
-        <source>&lt;unknown&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Status: Ergebnis des Geräteanschlusses</translation>
     </message>
     <message>
-        <location line="+87"/>
-        <location line="+74"/>
         <source>&lt;none&gt;</source>
-        <translation type="unfinished">&lt;kein&gt;</translation>
+        <translation type="obsolete">&lt;kein&gt;</translation>
     </message>
 </context>
 <context>
@@ -6827,7 +6056,7 @@ Do you want to apply to all existing midi tracks now?</source>
     <message>
         <location line="+25"/>
         <source>Insert rest (step rec) </source>
-        <translation type="unfinished"></translation>
+        <translation>Pause einfügen (StepRec)</translation>
     </message>
 </context>
 <context>
@@ -6840,68 +6069,48 @@ Do you want to apply to all existing midi tracks now?</source>
 <context>
     <name>MarkerView</name>
     <message>
-        <location filename="../../muse/marker/markerview.cpp" line="+192"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>Undo/Redo tools</source>
-        <translation type="unfinished">Rückgängig/Wiederho</translation>
+        <translation type="obsolete">Rückgängig/Wiederho</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>panic</source>
-        <translation type="unfinished">Panik</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>transport</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Panik</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Bar:Beat:Tick</source>
-        <translation>Takt:Schlag:Tick</translation>
+        <translation type="obsolete">Takt:Schlag:Tick</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Hr:Mn:Sc:Fr:Sf</source>
-        <translation>Std:Min:Sek:R:SR</translation>
+        <translation type="obsolete">Std:Min:Sek:R:SR</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Lock</source>
-        <translation>Sperre</translation>
+        <translation type="obsolete">Sperre</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Text</source>
-        <translation>Text</translation>
+        <translation type="obsolete">Text</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Marker Properties</source>
-        <translation>Marker Eigenschaften</translation>
+        <translation type="obsolete">Marker Eigenschaften</translation>
     </message>
     <message>
-        <location line="-70"/>
         <source>MusE: Marker</source>
-        <translation>MusE: Marker</translation>
+        <translation type="obsolete">MusE: Marker</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>add marker</source>
-        <translation>Marker hinzufügen</translation>
+        <translation type="obsolete">Marker hinzufügen</translation>
     </message>
     <message>
         <source>Add Marker</source>
         <translation type="obsolete">Marker hinzufügen</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>delete marker</source>
-        <translation>Marker löschen</translation>
+        <translation type="obsolete">Marker löschen</translation>
     </message>
     <message>
         <source>Delete Marker</source>
@@ -6912,77 +6121,55 @@ Do you want to apply to all existing midi tracks now?</source>
         <translation type="obsolete">&amp;Datei</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>&amp;Edit</source>
-        <translation>&amp;Bearbeiten</translation>
+        <translation type="obsolete">&amp;Bearbeiten</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>edit tools</source>
-        <translation type="unfinished">Werkzeuge &quot;Bearbeitung&quot;</translation>
+        <translation type="obsolete">Werkzeuge &quot;Bearbeitung&quot;</translation>
     </message>
 </context>
 <context>
     <name>MasterEdit</name>
     <message>
-        <location filename="../../muse/master/masteredit.cpp" line="-15"/>
         <source>Cursor</source>
-        <translation>Positionsmarker</translation>
+        <translation type="obsolete">Positionsmarker</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Snap</source>
-        <translation>Magnet</translation>
+        <translation type="obsolete">Magnet</translation>
     </message>
     <message>
-        <location line="-10"/>
         <source>time at cursor position</source>
-        <translation>Zeit an aktuellem Positionsmarker</translation>
-    </message>
-    <message>
-        <location line="-41"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Zeit an aktuellem Positionsmarker</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Undo/Redo tools</source>
-        <translation type="unfinished">Rückgängig/Wiederho</translation>
+        <translation type="obsolete">Rückgängig/Wiederho</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>panic</source>
-        <translation type="unfinished">Panik</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>transport</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Panik</translation>
     </message>
     <message>
-        <location line="+30"/>
         <source>tempo at cursor position</source>
-        <translation>Tempo an aktuellem Positionsmarker</translation>
+        <translation type="obsolete">Tempo an aktuellem Positionsmarker</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>CurPos </source>
-        <translation>AktPos</translation>
+        <translation type="obsolete">AktPos</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>tempo at current position</source>
-        <translation>Tempo an aktuellem Positionsmarker</translation>
+        <translation type="obsolete">Tempo an aktuellem Positionsmarker</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>time signature at current position</source>
-        <translation>Taktmaß an aktuellem Positionsmarker</translation>
+        <translation type="obsolete">Taktmaß an aktuellem Positionsmarker</translation>
     </message>
     <message>
-        <location line="-72"/>
         <source>MusE: Mastertrack</source>
-        <translation>MusE: Masterspur</translation>
+        <translation type="obsolete">MusE: Masterspur</translation>
     </message>
     <message>
         <source>edit tools</source>
@@ -6993,9 +6180,8 @@ Do you want to apply to all existing midi tracks now?</source>
         <translation type="obsolete">Master aktivieren</translation>
     </message>
     <message>
-        <location line="+39"/>
         <source>Info</source>
-        <translation>Info</translation>
+        <translation type="obsolete">Info</translation>
     </message>
     <message>
         <source>Off</source>
@@ -7003,19 +6189,12 @@ Do you want to apply to all existing midi tracks now?</source>
 </translation>
     </message>
     <message>
-        <location line="-6"/>
         <source>Enable</source>
-        <translation>Einschalten</translation>
+        <translation type="obsolete">Einschalten</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Enable usage of master track</source>
-        <translation>Verwendung der Masterspur einschalten</translation>
-    </message>
-    <message>
-        <location line="-5"/>
-        <source>Enable master</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Verwendung der Masterspur einschalten</translation>
     </message>
 </context>
 <context>
@@ -7023,27 +6202,27 @@ Do you want to apply to all existing midi tracks now?</source>
     <message>
         <location filename="../../muse/widgets/mdisettings_base.ui" line="+14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+12"/>
         <source>GroupBox</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+9"/>
         <source>MDI subwin</source>
-        <translation type="unfinished"></translation>
+        <translation>MDI-Unterfenster</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Shares menu when subwin</source>
-        <translation type="unfinished"></translation>
+        <translation>Teilt das Menü, wenn Unterfenster</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Shares menu when free</source>
-        <translation type="unfinished"></translation>
+        <translation>Teilt das Menü, wenn freies Fenster</translation>
     </message>
 </context>
 <context>
@@ -7156,37 +6335,37 @@ Do you want to apply to all existing midi tracks now?</source>
     <message>
         <location line="-425"/>
         <source>Choose outputs...</source>
-        <translation type="unfinished"></translation>
+        <translation>Wähle Ausgänge...</translation>
     </message>
     <message>
         <location line="+36"/>
         <source>50</source>
-        <translation type="unfinished">50</translation>
+        <translation>50</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>% Audio volume</source>
-        <translation type="unfinished"></translation>
+        <translation>% Audiolautstärke</translation>
     </message>
     <message>
         <location line="+324"/>
         <source>Hint: Enable metronome in Transportpanel</source>
-        <translation type="unfinished"></translation>
+        <translation>Hinweis: Aktivieren Sie das Metronom im Transportpanel</translation>
     </message>
     <message>
         <location line="+29"/>
         <source>Alt+A</source>
-        <translation type="unfinished">Alt+A</translation>
+        <translation>Alt+A</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Alt+O</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt+O</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Alt+C</source>
-        <translation type="unfinished">Alt+C</translation>
+        <translation>Alt+C</translation>
     </message>
 </context>
 <context>
@@ -7501,10 +6680,8 @@ Beachte dass in MusE Tonhöhen- und Programmwechselbefehle wie Midikontroller be
 <context>
     <name>MidiInputTransformDialog</name>
     <message>
-        <location filename="../../muse/mplugins/midiitransform.cpp" line="+718"/>
-        <location line="+2"/>
         <source>New</source>
-        <translation>Neu</translation>
+        <translation type="obsolete">Neu</translation>
     </message>
 </context>
 <context>
@@ -8164,28 +7341,28 @@ Beachte dass in MusE Tonhöhen- und Programmwechselbefehle wie Midikontroller be
     <message>
         <location line="+117"/>
         <source>Sync receiving and sending</source>
-        <translation type="unfinished"></translation>
+        <translation>Synchronisiere Empfangen und Senden</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Send and receive Jack transport</source>
-        <translation type="unfinished"></translation>
+        <translation>Sende und empfange Jack Transport</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Send and receive Jack transport information,
  including stop, start and position.</source>
-        <translation type="unfinished"></translation>
+        <translation>Sende und empfange Jack Transport Information, einschließlich Stopp, Start und Position.</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Use Jack transport</source>
-        <translation type="unfinished"></translation>
+        <translation>Benutze Jack-Transport</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Make MusE the Jack transport Timebase Master</source>
-        <translation type="unfinished"></translation>
+        <translation>Mache MusE zum Jack-Transport Timebase-Master</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -8195,17 +7372,22 @@ Allows Jack to show time as
 MusE will try to become master, but other 
  Jack clients can also take over later.
 You can always click here again for Master.</source>
-        <translation type="unfinished"></translation>
+        <translation>Mache MusE zum Jack-Transport Timebase-Master
+Erlaubt es Jack, die Zeit als MusE-Takte,
+Schäge und Ticks zu zeigen.
+MusE wird versuchen, Master zu werden, aber
+andere Jack-Clients können später übernehmen.
+Sie können immer hier klicken, um Master wieder zu aktivieren.</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Jack transport Timebase Master</source>
-        <translation type="unfinished"></translation>
+        <translation>Jack Transport Timebase Master</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Control MusE timing by external midi clock or MTC sync</source>
-        <translation type="unfinished"></translation>
+        <translation>Steuere MusE-Timing via externe Midi-Clock oder MTC sync</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -8214,17 +7396,21 @@ You can always click here again for Master.</source>
 MusE can sync to midi clock, or MTC quarter frame sync. 
 Enabled inputs in the list will
  be in effect (RMC, RMMC, RMTC).</source>
-        <translation type="unfinished"></translation>
+        <translation>Wenn im Slave-Modus, ist das Tempo
+extern gesteuert.
+MusE kann zur Midi-Clock oder MTC quarter frame sync synchronisieren.
+Aktivierte Eingänge in der Liste werden
+Effekt haben (RMC, RMMC, RMTC).</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Slave to external sync</source>
-        <translation type="unfinished"></translation>
+        <translation>Binde an externe sync</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Send start to first clock delay</source>
-        <translation type="unfinished"></translation>
+        <translation>Pause zwischen dem Senden von &quot;Start&quot; bis zum ersten Clock</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -8232,17 +7418,25 @@ Enabled inputs in the list will
  to synchronize to MusE. This value is the
  delay from sending start to sending
  the first clock.</source>
-        <translation type="unfinished"></translation>
+        <translation>Gibt &quot;Slow-Sync&quot;-Geräten Zeit, um sich mit
+MusE zu synchronisieren. Dieser Wert ist
+die Pause zwischen dem Senden von &quot;Start&quot;
+bis zum Senden des ersten Clocks.</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>ms</source>
-        <translation type="unfinished"></translation>
+        <translation>ms</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>Send sync delay</source>
-        <translation type="unfinished"></translation>
+        <translation>Pause für das Senden von Sync</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Note: Sync delay and MTC sync currently not fully implemeted</source>
+        <translation>Hinweis: Sync delay und MTC sync sind momentan nicht komplett implementiert</translation>
     </message>
 </context>
 <context>
@@ -8283,7 +7477,7 @@ Enabled inputs in the list will
     <message>
         <location line="+68"/>
         <source>iR</source>
-        <translation type="unfinished">iR</translation>
+        <translation>iR</translation>
     </message>
     <message>
         <location line="+109"/>
@@ -8329,17 +7523,17 @@ Enabled inputs in the list will
     <message>
         <location line="+35"/>
         <source>Rec:</source>
-        <translation type="unfinished"></translation>
+        <translation>Rec:</translation>
     </message>
     <message>
         <location line="+200"/>
         <source>Prog</source>
-        <translation type="unfinished"></translation>
+        <translation>Prog</translation>
     </message>
     <message>
         <location line="+67"/>
         <source>Vol</source>
-        <translation type="unfinished"></translation>
+        <translation>Vol</translation>
     </message>
     <message>
         <location line="+70"/>
@@ -8431,115 +7625,117 @@ Zur Aufnahme können mehrere Kanäle gewählt werden:
     <message>
         <location line="-268"/>
         <source>all midi events are sent to this output channel</source>
-        <translation type="unfinished"></translation>
+        <translation>alle MIDI-Events werden zu diesem Ausgangskanal gesendet</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Out ch</source>
-        <translation type="unfinished"></translation>
+        <translation>Aus.Kanal</translation>
     </message>
     <message>
         <location line="+27"/>
         <source>input routing</source>
-        <translation type="unfinished">Eingangs-Signalfluss</translation>
+        <translation>Eingangs-Signalfluss</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>output routing</source>
-        <translation type="unfinished">Ausgangs-Signalfluss</translation>
+        <translation>Ausgangs-Signalfluss</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>oR</source>
-        <translation type="unfinished">oR</translation>
+        <translation>oR</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>input detect</source>
-        <translation type="unfinished"></translation>
+        <translation>Eingangserkennung</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Input detect indicator. Detects all note on-off, controller, aftertouch, 
                   program change, and pitchbend (but not sysex or realtime) events 
                   on the selected channels, on the selected midi ports.</source>
-        <translation type="unfinished"></translation>
+        <translation>Eingangserkennungs-Anzeige. Erkennt alle Note an/aus, Controller, Aftertouch,
+                  Programmänderung und Pitchbend (aber nicht Sysex oder Echtzeit)-
+                  Ereignisse auf den ausgewählten Kanälen auf den gewählten MIDI-Ports.</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>W</source>
-        <translation type="unfinished"></translation>
+        <translation>W</translation>
     </message>
     <message>
         <location line="+25"/>
         <source>Midi thru</source>
-        <translation type="unfinished"></translation>
+        <translation>MIDI thru</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Pass input events through (&apos;thru&apos;) to output.</source>
-        <translation type="unfinished"></translation>
+        <translation>Schleife Eingangsevents durch zum Ausgang.</translation>
     </message>
     <message>
         <location line="+288"/>
         <source>Select instrument patch</source>
-        <translation type="unfinished"></translation>
+        <translation>Instrumentenpatch auswählen</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>&lt;unknown&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;unbekannt&gt;</translation>
     </message>
     <message>
         <location line="+37"/>
         <source>Add all settings to song</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle Einstellungen zum Lied hinzufügen</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>All</source>
-        <translation type="unfinished">alle</translation>
+        <translation>alle</translation>
     </message>
     <message>
         <location line="+31"/>
         <source>Bank Select MSB. Double-click on/off.</source>
-        <translation type="unfinished"></translation>
+        <translation>LSB für Bankauswahl. Doppelklick für an/aus.</translation>
     </message>
     <message>
         <location line="+53"/>
         <source>Bank Select LSB. Double-click on/off.</source>
-        <translation type="unfinished"></translation>
+        <translation>MSG für Bankauswahl. Doppelklick für an/aus.</translation>
     </message>
     <message>
         <location line="+53"/>
         <source>Program. Double-click on/off.</source>
-        <translation type="unfinished"></translation>
+        <translation>Programm. Doppelklick für an/aus.</translation>
     </message>
     <message>
         <location line="+33"/>
         <source>Add bank + prog settings to song</source>
-        <translation type="unfinished"></translation>
+        <translation>Füge Bank und Prog Einstellungen zum Lied hinzu</translation>
     </message>
     <message>
         <location line="+34"/>
         <source>Volume. Double-click on/off.</source>
-        <translation type="unfinished"></translation>
+        <translation>Volume. Doppelklick für an/aus.</translation>
     </message>
     <message>
         <location line="+33"/>
         <source>Add vol setting to song</source>
-        <translation type="unfinished"></translation>
+        <translation>Füge Lautstärke Einstellungen zum Lied hinzu</translation>
     </message>
     <message>
         <location line="+34"/>
         <location line="+3"/>
         <source>Change stereo position. Double-click on/off.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ändere Stereo-Position. Doppelklick für an/aus.</translation>
     </message>
     <message>
         <location line="+33"/>
         <source>Add pan setting to song</source>
-        <translation type="unfinished"></translation>
+        <translation>Füge Pan-Einstellung zum Song hinzu</translation>
     </message>
 </context>
 <context>
@@ -8891,10 +8087,8 @@ Zur Aufnahme können mehrere Kanäle gewählt werden:
 <context>
     <name>MidiTransformerDialog</name>
     <message>
-        <location filename="../../muse/miditransform.cpp" line="+263"/>
-        <location line="+2"/>
         <source>New</source>
-        <translation>Neu</translation>
+        <translation type="obsolete">Neu</translation>
     </message>
 </context>
 <context>
@@ -8979,57 +8173,57 @@ Zur Aufnahme können mehrere Kanäle gewählt werden:
     <message>
         <location filename="../../muse/widgets/function_dialogs/movebase.ui" line="+14"/>
         <source>MusE: Move Notes</source>
-        <translation type="unfinished"></translation>
+        <translation>MusE: Verschiebe Noten</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Range</source>
-        <translation type="unfinished">Bereich</translation>
+        <translation>Bereich</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>All Events</source>
-        <translation type="unfinished">Alle Ereignisse</translation>
+        <translation>Alle Ereignisse</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Selected Events</source>
-        <translation type="unfinished">Ausgewählte Ereignisse</translation>
+        <translation>Ausgewählte Ereignisse</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Looped Events</source>
-        <translation type="unfinished">Ereignisse innerhalb Schleife</translation>
+        <translation>Ereignisse innerhalb Schleife</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Selected Looped</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausgewählt und innerhalb der Schleife</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Value</source>
-        <translation type="unfinished">Wert</translation>
+        <translation>Wert</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Move by</source>
-        <translation type="unfinished"></translation>
+        <translation>Bewege um</translation>
     </message>
     <message>
         <location line="+13"/>
         <source> ticks</source>
-        <translation type="unfinished"></translation>
+        <translation> Ticks</translation>
     </message>
     <message>
         <location line="+56"/>
         <source>OK</source>
-        <translation type="unfinished">Bestätigen</translation>
+        <translation>Bestätigen</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Cancel</source>
-        <translation type="unfinished">Abbrechen</translation>
+        <translation>Abbrechen</translation>
     </message>
 </context>
 <context>
@@ -9717,756 +8911,1344 @@ failed: </source>
 <context>
     <name>MusEApp::MusE</name>
     <message>
-        <location filename="../../muse/app.cpp" line="+46"/>
-        <location line="+16"/>
         <source>Failed to start audio!</source>
-        <translation>Audio konnte nicht gestartet werden!</translation>
+        <translation type="obsolete">Audio konnte nicht gestartet werden!</translation>
     </message>
     <message>
-        <location line="-15"/>
         <source>Was not able to start audio, check if jack is running.
 </source>
-        <translation>Audio konnte nicht gestartet werden, überprüfen Sie, ob Jack läuft.</translation>
+        <translation type="obsolete">Audio konnte nicht gestartet werden, überprüfen Sie, ob Jack läuft.</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>Timeout waiting for audio to run. Check if jack is running.
 </source>
-        <translation>Timeout beim Warten auf Audio. Überprüfen Sie, ob Jack läuft.</translation>
+        <translation type="obsolete">Timeout beim Warten auf Audio. Überprüfen Sie, ob Jack läuft.</translation>
     </message>
     <message>
-        <location line="+219"/>
         <source>Und&amp;o</source>
-        <translation>&amp;Rückgängig</translation>
+        <translation type="obsolete">&amp;Rückgängig</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Re&amp;do</source>
-        <translation>&amp;Wiederholen</translation>
+        <translation type="obsolete">&amp;Wiederholen</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>undo last change to song</source>
-        <translation>Letzte Änderung am Lied rücksetzen</translation>
+        <translation type="obsolete">Letzte Änderung am Lied rücksetzen</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>redo last undo</source>
-        <translation>Letztes Rücksetzen wiederholen</translation>
+        <translation type="obsolete">Letztes Rücksetzen wiederholen</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Loop</source>
-        <translation>Schleife</translation>
+        <translation type="obsolete">Schleife</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Punchin</source>
-        <translation>Aufnahme am linken Marker beginnen</translation>
+        <translation type="obsolete">Aufnahme am linken Marker beginnen</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Punchout</source>
-        <translation>Aufnahme am rechten Marker beenden</translation>
+        <translation type="obsolete">Aufnahme am rechten Marker beenden</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Start</source>
-        <translation>Start</translation>
+        <translation type="obsolete">Start</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Rewind</source>
-        <translation>Einen Taktschlag rückwärts</translation>
+        <translation type="obsolete">Einen Taktschlag rückwärts</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Forward</source>
-        <translation>Einen Taktschlag vorwärts</translation>
+        <translation type="obsolete">Einen Taktschlag vorwärts</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Stop</source>
-        <translation>Stopp</translation>
+        <translation type="obsolete">Stopp</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Play</source>
-        <translation>Wiedergabe</translation>
+        <translation type="obsolete">Wiedergabe</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Record</source>
-        <translation>Aufnahme</translation>
+        <translation type="obsolete">Aufnahme</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <location line="+232"/>
         <source>Panic</source>
-        <translation>Panik</translation>
+        <translation type="obsolete">Panik</translation>
     </message>
     <message>
-        <location line="-220"/>
         <source>&amp;New</source>
-        <translation>&amp;Neu</translation>
+        <translation type="obsolete">&amp;Neu</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Open</source>
-        <translation>Lied &amp;öffnen</translation>
+        <translation type="obsolete">Lied &amp;öffnen</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Open &amp;Recent</source>
-        <translation>&amp;Letztes Lied öffnen</translation>
+        <translation type="obsolete">&amp;Letztes Lied öffnen</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location line="+1005"/>
-        <location line="+1207"/>
         <source>&amp;Save</source>
-        <translation>&amp;Speichern</translation>
+        <translation type="obsolete">&amp;Speichern</translation>
     </message>
     <message>
-        <location line="-2207"/>
         <source>Save &amp;As</source>
-        <translation>Lied &amp;speichern als</translation>
+        <translation type="obsolete">Lied &amp;speichern als</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Import Midifile</source>
-        <translation>Mididatei importieren</translation>
+        <translation type="obsolete">Mididatei importieren</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Export Midifile</source>
-        <translation>Mididatei exportieren</translation>
+        <translation type="obsolete">Mididatei exportieren</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Import Part</source>
-        <translation>Part importieren</translation>
+        <translation type="obsolete">Part importieren</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location filename="../../muse/wave.cpp" line="+827"/>
         <source>Import Wave File</source>
-        <translation>Wavedatei importieren</translation>
+        <translation type="obsolete">Wavedatei importieren</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Find unused wave files</source>
-        <translation>Finde ungenutzte Wave-Dateien</translation>
+        <translation type="obsolete">Finde ungenutzte Wave-Dateien</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>&amp;Quit</source>
-        <translation>&amp;Beenden</translation>
+        <translation type="obsolete">&amp;Beenden</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Song Info</source>
-        <translation>Liedinfo</translation>
+        <translation type="obsolete">Liedinfo</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Transport Panel</source>
-        <translation>Transportkonsole</translation>
+        <translation type="obsolete">Transportkonsole</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Bigtime Window</source>
-        <translation>Zeitanzeige groß</translation>
+        <translation type="obsolete">Zeitanzeige groß</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Mixer A</source>
-        <translation>Mixer A</translation>
+        <translation type="obsolete">Mixer A</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Mixer B</source>
-        <translation>Mixer B</translation>
+        <translation type="obsolete">Mixer B</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Cliplist</source>
-        <translation>Cliplist</translation>
+        <translation type="obsolete">Cliplist</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Marker View</source>
-        <translation>Marker-Fenster</translation>
+        <translation type="obsolete">Marker-Fenster</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Arranger View</source>
-        <translation>Arranger-Fenster</translation>
+        <translation type="obsolete">Arranger-Fenster</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Fullscreen</source>
-        <translation>Vollbild</translation>
+        <translation type="obsolete">Vollbild</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>&amp;Plugins</source>
-        <translation>&amp;Plugins</translation>
+        <translation type="obsolete">&amp;Plugins</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Edit Instrument</source>
-        <translation>Instrument bearbeiten</translation>
+        <translation type="obsolete">Instrument bearbeiten</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Input Plugins</source>
-        <translation>Eingangs-PlugIns</translation>
+        <translation type="obsolete">Eingangs-PlugIns</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Transpose</source>
-        <translation>Transponieren</translation>
+        <translation type="obsolete">Transponieren</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Midi Input Transform</source>
-        <translation>Midi Eingang transformieren</translation>
+        <translation type="obsolete">Midi Eingang transformieren</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Midi Input Filter</source>
-        <translation>Midi Eingangsfilter</translation>
+        <translation type="obsolete">Midi Eingangsfilter</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Midi Remote Control</source>
-        <translation>Midi Fernbedienung</translation>
+        <translation type="obsolete">Midi Fernbedienung</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Rhythm Generator</source>
-        <translation>Rhythmusgenerator</translation>
+        <translation type="obsolete">Rhythmusgenerator</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Reset Instr.</source>
-        <translation>Rücksetzen Instr.</translation>
+        <translation type="obsolete">Rücksetzen Instr.</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Init Instr.</source>
-        <translation>Initialisieren Instr.</translation>
+        <translation type="obsolete">Initialisieren Instr.</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Local Off</source>
-        <translation>Lokal off</translation>
+        <translation type="obsolete">Lokal off</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Bounce to Track</source>
-        <translation>Auf Spur abmischen</translation>
+        <translation type="obsolete">Auf Spur abmischen</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Bounce to File</source>
-        <translation>In Datei abmischen</translation>
+        <translation type="obsolete">In Datei abmischen</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Restart Audio</source>
-        <translation>Audio erneut starten</translation>
+        <translation type="obsolete">Audio erneut starten</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Mixer Automation</source>
-        <translation>Mischpult Automatisierung</translation>
+        <translation type="obsolete">Mischpult Automatisierung</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Take Snapshot</source>
-        <translation>Schnappschuss aufnehmen</translation>
+        <translation type="obsolete">Schnappschuss aufnehmen</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Clear Automation Data</source>
-        <translation>Automatisierungsdaten löschen</translation>
+        <translation type="obsolete">Automatisierungsdaten löschen</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Cascade</source>
-        <translation>Staffeln</translation>
+        <translation type="obsolete">Staffeln</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Tile</source>
-        <translation>Kacheln</translation>
+        <translation type="obsolete">Kacheln</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>In rows</source>
-        <translation>In Reihen</translation>
+        <translation type="obsolete">In Reihen</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>In columns</source>
-        <translation>In Spalten</translation>
+        <translation type="obsolete">In Spalten</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Global Settings</source>
-        <translation>Globale Einstellungen</translation>
+        <translation type="obsolete">Globale Einstellungen</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Configure Shortcuts</source>
-        <translation>Tastenkürzel einstellen</translation>
+        <translation type="obsolete">Tastenkürzel einstellen</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Follow Song</source>
-        <translation>Folge dem Lied</translation>
+        <translation type="obsolete">Folge dem Lied</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Don&apos;t Follow Song</source>
-        <translation>Folge dem Lied nicht</translation>
+        <translation type="obsolete">Folge dem Lied nicht</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Follow Page</source>
-        <translation>Folge dem Lied seitenweise</translation>
+        <translation type="obsolete">Folge dem Lied seitenweise</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Follow Continuous</source>
-        <translation>Folge dem Lied ständig</translation>
+        <translation type="obsolete">Folge dem Lied ständig</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Metronome</source>
-        <translation>Metronom</translation>
+        <translation type="obsolete">Metronom</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Midi Sync</source>
-        <translation>Midi Sync</translation>
+        <translation type="obsolete">Midi Sync</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Midi File Import/Export</source>
-        <translation>Midi-Datei Import/Export</translation>
+        <translation type="obsolete">Midi-Datei Import/Export</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Appearance Settings</source>
-        <translation>Erscheinungsbild einstellen</translation>
+        <translation type="obsolete">Erscheinungsbild einstellen</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Midi Ports / Soft Synth</source>
-        <translation>Midi Anschlüsse / Software Synthesizer</translation>
+        <translation type="obsolete">Midi Anschlüsse / Software Synthesizer</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>&amp;Manual</source>
-        <translation>&amp;Handbuch</translation>
+        <translation type="obsolete">&amp;Handbuch</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;MusE Homepage</source>
-        <translation>&amp;MusE Webseite</translation>
+        <translation type="obsolete">&amp;MusE Webseite</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Report Bug...</source>
-        <translation>&amp;Fehler melden ...</translation>
+        <translation type="obsolete">&amp;Fehler melden ...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;About MusE</source>
-        <translation>&amp;Ãœber MusE</translation>
+        <translation type="obsolete">&amp;Ãœber MusE</translation>
     </message>
     <message>
-        <location line="+99"/>
         <source>File Buttons</source>
-        <translation>Datei-Knöpfe</translation>
+        <translation type="obsolete">Datei-Knöpfe</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Undo/Redo</source>
-        <translation>Undo/Redo</translation>
+        <translation type="obsolete">Undo/Redo</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Transport</source>
-        <translation>Transport</translation>
+        <translation type="obsolete">Transport</translation>
     </message>
     <message>
-        <location line="+55"/>
         <source>&amp;File</source>
-        <translation>&amp;Datei</translation>
+        <translation type="obsolete">&amp;Datei</translation>
     </message>
     <message>
-        <location line="+29"/>
         <source>&amp;View</source>
-        <translation>&amp;Zeigen</translation>
+        <translation type="obsolete">&amp;Zeigen</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>&amp;Midi</source>
-        <translation>&amp;Midi</translation>
+        <translation type="obsolete">&amp;Midi</translation>
     </message>
     <message>
-        <location line="+29"/>
         <source>&amp;Audio</source>
-        <translation>&amp;Audio</translation>
+        <translation type="obsolete">&amp;Audio</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>A&amp;utomation</source>
-        <translation>A&amp;utomation</translation>
+        <translation type="obsolete">A&amp;utomation</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>&amp;Windows</source>
-        <translation>F&amp;enster</translation>
+        <translation type="obsolete">F&amp;enster</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>MusE Se&amp;ttings</source>
-        <translation>MusE Ei&amp;nstellungen</translation>
+        <translation type="obsolete">MusE Ei&amp;nstellungen</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>&amp;Help</source>
-        <translation>&amp;Hilfe</translation>
+        <translation type="obsolete">&amp;Hilfe</translation>
     </message>
     <message>
-        <location line="+268"/>
         <source>Cannot read template</source>
-        <translation>Vorlage nicht lesbar</translation>
+        <translation type="obsolete">Vorlage nicht lesbar</translation>
     </message>
     <message>
-        <location line="+31"/>
         <source>File open error</source>
-        <translation>Fehler beim Datei öffnen</translation>
+        <translation type="obsolete">Fehler beim Datei öffnen</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>File read error</source>
-        <translation>Fehler beim Datei lesen</translation>
+        <translation type="obsolete">Fehler beim Datei lesen</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Unknown File Format: </source>
-        <translation>Unbekanntes Dateiformat:</translation>
+        <translation type="obsolete">Unbekanntes Dateiformat:</translation>
     </message>
     <message>
-        <location line="+130"/>
-        <location line="+408"/>
-        <location line="+895"/>
         <source>MusE: Song: </source>
-        <translation>MusE: Lied:</translation>
+        <translation type="obsolete">MusE: Lied:</translation>
     </message>
     <message>
-        <location line="-1269"/>
         <source>MusE: load project</source>
-        <translation>Muse: Projekt laden</translation>
+        <translation type="obsolete">Muse: Projekt laden</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>MusE: load template</source>
-        <translation>Muse: Vorlage laden</translation>
+        <translation type="obsolete">Muse: Vorlage laden</translation>
     </message>
     <message>
-        <location line="+62"/>
         <source>MusE: Write File failed</source>
-        <translation>MusE: Datei schreiben schlug fehl</translation>
+        <translation type="obsolete">MusE: Datei schreiben schlug fehl</translation>
     </message>
     <message>
-        <location line="+38"/>
         <source>The current Project contains unsaved data
 Save Current Project?</source>
-        <translation>Das aktuelle Projekt enthält ungesicherte Daten
+        <translation type="obsolete">Das aktuelle Projekt enthält ungesicherte Daten
 Aktuelles Projekt sichern?</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location line="+1207"/>
-        <source>S&amp;kip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-1207"/>
         <source>&amp;Cancel</source>
-        <translation>&amp;Abbrechen</translation>
+        <translation type="obsolete">&amp;Abbrechen</translation>
     </message>
     <message>
-        <location line="+236"/>
-        <location line="+13"/>
         <source>MusE: Save As</source>
-        <translation>MusE: Lied speichern als</translation>
+        <translation type="obsolete">MusE: Lied speichern als</translation>
     </message>
     <message>
-        <location line="+57"/>
-        <location line="+161"/>
         <source>Nothing to edit</source>
-        <translation>Es gibt Nichts zu editieren</translation>
+        <translation type="obsolete">Es gibt Nichts zu editieren</translation>
     </message>
     <message>
-        <location line="+474"/>
-        <location line="+10"/>
-        <location line="+31"/>
-        <location line="+34"/>
-        <location line="+8"/>
         <source>MusE: Bounce to Track</source>
-        <translation>MusE: Auf Spur abmischen</translation>
+        <translation type="obsolete">MusE: Auf Spur abmischen</translation>
     </message>
     <message>
-        <location line="-82"/>
         <source>No wave tracks found</source>
-        <translation>Keine Wave-Tracks gefunden</translation>
+        <translation type="obsolete">Keine Wave-Tracks gefunden</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location line="+105"/>
         <source>No audio output tracks found</source>
-        <translation>Keine Audio-Tracks gefunden</translation>
-    </message>
-    <message>
-        <location line="-74"/>
-        <source>Select one audio output track,
-and one target wave track</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+34"/>
-        <source>Select one target wave track</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Select one target wave track,
-and one audio output track</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Keine Audio-Tracks gefunden</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location line="+25"/>
         <source>MusE: Bounce to File</source>
-        <translation type="unfinished">MusE: In Datei abmischen</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Select one audio output track</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">MusE: In Datei abmischen</translation>
     </message>
     <message>
-        <location line="+39"/>
         <source>MusE: Bounce</source>
-        <translation type="unfinished">MusE: Abmischen</translation>
+        <translation type="obsolete">MusE: Abmischen</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>set left/right marker for bounce range</source>
-        <translation type="unfinished">Linken/rechten Marker für Abmischbereich einstellen</translation>
+        <translation type="obsolete">Linken/rechten Marker für Abmischbereich einstellen</translation>
     </message>
     <message>
-        <location line="+82"/>
         <source>The current Project contains unsaved data
 Load overwrites current Project:
 Save Current Project?</source>
-        <translation type="unfinished">Das aktuelle Projekt enthält ungesicherte Daten
+        <translation type="obsolete">Das aktuelle Projekt enthält ungesicherte Daten
 Neues Lied laden überschreibt das aktuelle Projekt:
 Aktuelles Projekt sichern?</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location filename="../../muse/importmidi.cpp" line="+86"/>
         <source>&amp;Abort</source>
-        <translation type="unfinished">&amp;Abbrechen</translation>
+        <translation type="obsolete">&amp;Abbrechen</translation>
     </message>
     <message>
-        <location filename="../../muse/exportmidi.cpp" line="+143"/>
         <source>MusE: Export Midi</source>
-        <translation type="unfinished">MusE: Midi exportieren</translation>
+        <translation type="obsolete">MusE: Midi exportieren</translation>
     </message>
     <message>
-        <location filename="../../muse/help.cpp" line="+50"/>
         <source>no help found at: </source>
-        <translation type="unfinished">Hilfe wurde nicht gefunden:</translation>
+        <translation type="obsolete">Hilfe wurde nicht gefunden:</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>MusE: Open Help</source>
-        <translation type="unfinished">MusE: Hilfe öffnen</translation>
-    </message>
-    <message>
-        <location line="+53"/>
-        <source>Unable to launch help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>For some reason MusE has to launch the default
-browser on your machine.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">MusE: Hilfe öffnen</translation>
     </message>
     <message>
-        <location filename="../../muse/importmidi.cpp" line="-12"/>
         <source>MusE: Import Midi</source>
-        <translation>MusE: Midi importieren</translation>
+        <translation type="obsolete">MusE: Midi importieren</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Add midi file to current project?
 </source>
-        <translation>Mididatei zu aktuellem Lied hinzufügen?</translation>
+        <translation type="obsolete">Mididatei zu aktuellem Lied hinzufügen?</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Add to Project</source>
-        <translation>Zu Lied hin&amp;zufügen</translation>
+        <translation type="obsolete">Zu Lied hin&amp;zufügen</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Replace</source>
-        <translation>Erset&amp;zen</translation>
+        <translation type="obsolete">Erset&amp;zen</translation>
     </message>
     <message>
-        <location line="+31"/>
         <source>reading midifile
   </source>
-        <translation>Lese Mididatei</translation>
+        <translation type="obsolete">Lese Mididatei</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>
 failed: </source>
-        <translation>schlug fehl:</translation>
+        <translation type="obsolete">schlug fehl:</translation>
     </message>
     <message>
-        <location line="+356"/>
-        <source>Import part is only valid for midi and wave tracks!</source>
-        <translation type="unfinished"></translation>
+        <source> out of </source>
+        <translation type="obsolete"> von </translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>MusE: load part</source>
-        <translation type="unfinished"></translation>
+        <source> parts</source>
+        <translation type="obsolete">Parts</translation>
     </message>
     <message>
-        <location line="+18"/>
-        <source>No track selected for import</source>
-        <translation type="unfinished"></translation>
+        <source> part</source>
+        <translation type="obsolete">Part</translation>
+    </message>
+    <message>
+        <source>&amp;Yes</source>
+        <translation type="obsolete">&amp;Ja</translation>
+    </message>
+    <message>
+        <source>&amp;No</source>
+        <translation type="obsolete">&amp;Nein</translation>
+    </message>
+</context>
+<context>
+    <name>MusEArranger::Arranger</name>
+    <message>
+        <source>Enable Recording</source>
+        <translation type="obsolete">Aufnahme einschalten</translation>
+    </message>
+    <message>
+        <source>Solo Indicator</source>
+        <translation type="obsolete">Anzeige &quot;Solo&quot;</translation>
+    </message>
+    <message>
+        <source>Track Type</source>
+        <translation type="obsolete">Spurtyp</translation>
+    </message>
+    <message>
+        <source>Time Lock</source>
+        <translation type="obsolete">Sperre &quot;Zeit&quot;</translation>
+    </message>
+    <message>
+        <source>Notation clef</source>
+        <translation type="obsolete">Notenschlüssel</translation>
+    </message>
+    <message>
+        <source>Enable recording. Click to toggle.</source>
+        <translation type="obsolete">Aufnahme einschalten. Klicken zum umschalten.</translation>
+    </message>
+    <message>
+        <source>Arranger</source>
+        <translation type="obsolete">Arrangierer</translation>
+    </message>
+    <message>
+        <source>Snap</source>
+        <translation type="obsolete">Magnet</translation>
+    </message>
+    <message>
+        <source>Len</source>
+        <translation type="obsolete">Länge</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="obsolete">Typ</translation>
+    </message>
+    <message>
+        <source>NO</source>
+        <translation type="obsolete">Kein</translation>
+    </message>
+    <message>
+        <source>GM</source>
+        <translation type="obsolete">GM</translation>
+    </message>
+    <message>
+        <source>GS</source>
+        <translation type="obsolete">GS</translation>
+    </message>
+    <message>
+        <source>XG</source>
+        <translation type="obsolete">XG</translation>
+    </message>
+    <message>
+        <source>midi song type</source>
+        <translation type="obsolete">Midi Lied Typ</translation>
+    </message>
+    <message>
+        <source>midi pitch</source>
+        <translation type="obsolete">Midi Tonhöhenänderung</translation>
+    </message>
+    <message>
+        <source>global midi pitch shift</source>
+        <translation type="obsolete">Globale Midi Tonhöhenänderung</translation>
+    </message>
+    <message>
+        <source>Tempo</source>
+        <translation type="obsolete">Tempo</translation>
+    </message>
+    <message>
+        <source>midi tempo</source>
+        <translation type="obsolete">Midi Tempo</translation>
+    </message>
+    <message>
+        <source>N</source>
+        <translation type="obsolete">N</translation>
+    </message>
+    <message>
+        <source>TrackInfo</source>
+        <translation type="obsolete">Spurinfo</translation>
+    </message>
+    <message>
+        <source>R</source>
+        <translation type="obsolete">R</translation>
+    </message>
+    <message>
+        <source>M</source>
+        <translation type="obsolete">M</translation>
+    </message>
+    <message>
+        <source>S</source>
+        <translation type="obsolete">S</translation>
+    </message>
+    <message>
+        <source>C</source>
+        <translation type="obsolete">C</translation>
+    </message>
+    <message>
+        <source>Track</source>
+        <translation type="obsolete">Spur</translation>
+    </message>
+    <message>
+        <source>Ch</source>
+        <translation type="obsolete">K</translation>
+    </message>
+    <message>
+        <source>T</source>
+        <translation type="obsolete">T</translation>
+    </message>
+    <message>
+        <source>Automation</source>
+        <translation type="obsolete">Automatisierung</translation>
+    </message>
+</context>
+<context>
+    <name>MusEArranger::ArrangerView</name>
+    <message>
+        <source>MusE: Arranger</source>
+        <translation type="obsolete">MusE: Arrangierer</translation>
+    </message>
+    <message>
+        <source>Undo/Redo tools</source>
+        <translation type="obsolete">Undo/Redo tools</translation>
+    </message>
+    <message>
+        <source>panic</source>
+        <translation type="obsolete">Panik</translation>
+    </message>
+    <message>
+        <source>C&amp;ut</source>
+        <translation type="obsolete">&amp;Ausschneiden</translation>
+    </message>
+    <message>
+        <source>&amp;Copy</source>
+        <translation type="obsolete">&amp;Kopieren</translation>
+    </message>
+    <message>
+        <source>&amp;Copy in range</source>
+        <translation type="obsolete">Im Bereich kopieren</translation>
+    </message>
+    <message>
+        <source>Copy in range</source>
+        <translation type="obsolete">Im Bereich kopieren</translation>
+    </message>
+    <message>
+        <source>&amp;Paste</source>
+        <translation type="obsolete">&amp;Einfügen</translation>
+    </message>
+    <message>
+        <source>Paste (show dialog)</source>
+        <translation type="obsolete">Einfügen (Dialog zeigen)</translation>
+    </message>
+    <message>
+        <source>Paste c&amp;lone</source>
+        <translation type="obsolete">K&amp;lon Einfügen</translation>
+    </message>
+    <message>
+        <source>Paste clone (show dialog)</source>
+        <translation type="obsolete">Klon einfügen (Dialog zeigen)</translation>
+    </message>
+    <message>
+        <source>&amp;Insert Empty Measure</source>
+        <translation type="obsolete">Leeren &amp;Takt einfügen</translation>
+    </message>
+    <message>
+        <source>Delete Selected Tracks</source>
+        <translation type="obsolete">Ausgewählte Spuren löschen</translation>
+    </message>
+    <message>
+        <source>Shrink selected parts</source>
+        <translation type="obsolete">Ausgewählte Parts schrumpfen</translation>
+    </message>
+    <message>
+        <source>Expand selected parts</source>
+        <translation type="obsolete">Ausgewählte Parts erweitern</translation>
+    </message>
+    <message>
+        <source>Clean selected parts</source>
+        <translation type="obsolete">Ausgewählte Parts säubern</translation>
+    </message>
+    <message>
+        <source>Add Track</source>
+        <translation type="obsolete">Spur hinzufügen</translation>
+    </message>
+    <message>
+        <source>Select</source>
+        <translation type="obsolete">Auswählen</translation>
+    </message>
+    <message>
+        <source>Select &amp;All</source>
+        <translation type="obsolete">Alles a&amp;uswählen</translation>
+    </message>
+    <message>
+        <source>&amp;Deselect All</source>
+        <translation type="obsolete">Alles ab&amp;wählen</translation>
+    </message>
+    <message>
+        <source>Invert &amp;Selection</source>
+        <translation type="obsolete">Auswa&amp;hl umkehren</translation>
+    </message>
+    <message>
+        <source>&amp;Inside Loop</source>
+        <translation type="obsolete">Bereich &amp;innerhalb der Schleife</translation>
+    </message>
+    <message>
+        <source>&amp;Outside Loop</source>
+        <translation type="obsolete">Bereich außerhalb der Schlei&amp;fe</translation>
+    </message>
+    <message>
+        <source>All &amp;Parts on Track</source>
+        <translation type="obsolete">Alle &amp;Parts der Spur</translation>
+    </message>
+    <message>
+        <source>Score</source>
+        <translation type="obsolete">Partitur</translation>
+    </message>
+    <message>
+        <source>all parts in one staff</source>
+        <translation type="obsolete">alle Parts in ein System</translation>
+    </message>
+    <message>
+        <source>one staff per part</source>
+        <translation type="obsolete">ein System pro Part</translation>
+    </message>
+    <message>
+        <source>New score window</source>
+        <translation type="obsolete">Neues Partiturfenster</translation>
+    </message>
+    <message>
+        <source>Pianoroll</source>
+        <translation type="obsolete">Pianorollen Editor</translation>
+    </message>
+    <message>
+        <source>Drums</source>
+        <translation type="obsolete">Schlagzeug Editor</translation>
+    </message>
+    <message>
+        <source>List</source>
+        <translation type="obsolete">Listen Editor</translation>
+    </message>
+    <message>
+        <source>Wave</source>
+        <translation type="obsolete">Wave-Editor</translation>
+    </message>
+    <message>
+        <source>Mastertrack</source>
+        <translation type="obsolete">Masterspur</translation>
+    </message>
+    <message>
+        <source>Graphic</source>
+        <translation type="obsolete">Graphischer Editor</translation>
+    </message>
+    <message>
+        <source>Midi &amp;Transform</source>
+        <translation type="obsolete">Midi &amp;transformieren</translation>
+    </message>
+    <message>
+        <source>Global Cut</source>
+        <translation type="obsolete">Globaler Schnitt</translation>
+    </message>
+    <message>
+        <source>Global Insert</source>
+        <translation type="obsolete">Globales Einfügen</translation>
+    </message>
+    <message>
+        <source>Global Split</source>
+        <translation type="obsolete">Globales Aufteilen</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="obsolete">&amp;Bearbeiten</translation>
+    </message>
+    <message>
+        <source>&amp;Structure</source>
+        <translation type="obsolete">&amp;Struktur</translation>
+    </message>
+    <message>
+        <source>Functions</source>
+        <translation type="obsolete">Funktionen</translation>
+    </message>
+    <message>
+        <source>&amp;Quantize Notes</source>
+        <translation type="obsolete">Noten &amp;quantisieren</translation>
+    </message>
+    <message>
+        <source>Change note &amp;length</source>
+        <translation type="obsolete">Noten&amp;länge verändern</translation>
+    </message>
+    <message>
+        <source>Change note &amp;velocity</source>
+        <translation type="obsolete">&amp;Anschlagsdynamik verändern</translation>
+    </message>
+    <message>
+        <source>Crescendo/Decrescendo</source>
+        <translation type="obsolete">Crescendo/Decrescendo</translation>
+    </message>
+    <message>
+        <source>Transpose</source>
+        <translation type="obsolete">Transponieren</translation>
+    </message>
+    <message>
+        <source>Erase Events (Not Parts)</source>
+        <translation type="obsolete">Events (nicht Parts) löschen</translation>
+    </message>
+    <message>
+        <source>Move Events (Not Parts)</source>
+        <translation type="obsolete">Events (nicht Parts) verschieben</translation>
+    </message>
+    <message>
+        <source>Set Fixed Note Length</source>
+        <translation type="obsolete">Feste Notenlänge setzen</translation>
+    </message>
+    <message>
+        <source>Delete Overlapping Notes</source>
+        <translation type="obsolete">Ãœberlappende Noten entfernen</translation>
+    </message>
+    <message>
+        <source>Legato</source>
+        <translation type="obsolete">Legato</translation>
+    </message>
+    <message>
+        <source>Window &amp;Config</source>
+        <translation type="obsolete">Fenster&amp;konfiguration</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="obsolete">Neu</translation>
+    </message>
+</context>
+<context>
+    <name>MusEArranger::PartCanvas</name>
+    <message>
+        <source>Cannot copy/move/clone to different Track-Type</source>
+        <translation type="obsolete">Kopieren/verschieben/klonen auf anderen Spurtyp nicht möglich</translation>
+    </message>
+    <message>
+        <source>C&amp;ut</source>
+        <translation type="obsolete">&amp;Ausschneiden</translation>
+    </message>
+    <message>
+        <source>&amp;Copy</source>
+        <translation type="obsolete">&amp;Kopieren</translation>
+    </message>
+    <message>
+        <source>s&amp;elect </source>
+        <translation type="obsolete">&amp;wähle </translation>
+    </message>
+    <message>
+        <source>clones</source>
+        <translation type="obsolete">Klone</translation>
+    </message>
+    <message>
+        <source>rename</source>
+        <translation type="obsolete">Umbenennen</translation>
+    </message>
+    <message>
+        <source>color</source>
+        <translation type="obsolete">Farbe</translation>
+    </message>
+    <message>
+        <source>delete</source>
+        <translation type="obsolete">Löschen</translation>
+    </message>
+    <message>
+        <source>split</source>
+        <translation type="obsolete">Schnitt</translation>
+    </message>
+    <message>
+        <source>glue</source>
+        <translation type="obsolete">Verbinder</translation>
+    </message>
+    <message>
+        <source>de-clone</source>
+        <translation type="obsolete">Entklonen</translation>
+    </message>
+    <message>
+        <source>save part to disk</source>
+        <translation type="obsolete">Speichere Part auf Festplatte</translation>
+    </message>
+    <message>
+        <source>wave edit</source>
+        <translation type="obsolete">Wave Editor</translation>
+    </message>
+    <message>
+        <source>file info</source>
+        <translation type="obsolete">Dateiinfo</translation>
+    </message>
+    <message>
+        <source>MusE: save part</source>
+        <translation type="obsolete">MusE: Speichere Part</translation>
+    </message>
+    <message>
+        <source>Part name</source>
+        <translation type="obsolete">Partname</translation>
+    </message>
+    <message>
+        <source>Files</source>
+        <translation type="obsolete">Dateien</translation>
     </message>
     <message>
-        <location line="+121"/>
         <source> out of </source>
-        <translation type="unfinished"> von </translation>
+        <translation type="obsolete"> von </translation>
     </message>
     <message>
-        <location line="+1"/>
         <source> parts</source>
-        <translation type="unfinished">Parts</translation>
+        <translation type="obsolete">Parts</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source> part</source>
-        <translation type="unfinished">Part</translation>
+        <translatorcomment>igitt</translatorcomment>
+        <translation type="obsolete">Part</translation>
+    </message>
+    <message>
+        <source> could not be pasted.
+Likely the selected track is the wrong type.</source>
+        <translation type="obsolete"> konnte nicht eingefügt werden.
+Wahrscheinlich hat dir ausgewählte Spur den falschen Typ.</translation>
+    </message>
+    <message>
+        <source>Cannot paste: multiple tracks selected</source>
+        <translation type="obsolete">Einfügen nicht möglich: mehrere Spuren ausgewählt</translation>
+    </message>
+    <message>
+        <source>Cannot paste: no track selected</source>
+        <translation type="obsolete">Einfügen nicht möglich: keine Spur ausgewählt</translation>
+    </message>
+    <message>
+        <source>Can only paste to midi/drum track</source>
+        <translation type="obsolete">Einfügen möglich nur in Midi/Drum Spur </translation>
+    </message>
+    <message>
+        <source>Can only paste to wave track</source>
+        <translation type="obsolete">Einfügen möglich nur in Wave Spur</translation>
+    </message>
+    <message>
+        <source>Can only paste to midi or wave track</source>
+        <translation type="obsolete">Einfügen möglich nur in Midi oder Wave Spur </translation>
+    </message>
+    <message>
+        <source>Cannot paste: wrong data type</source>
+        <translation type="obsolete">Einfügen nicht möglich: falscher Datentyp</translation>
+    </message>
+</context>
+<context>
+    <name>MusEArranger::TList</name>
+    <message>
+        <source>&lt;none&gt;</source>
+        <translation type="obsolete">&lt;kein&gt;</translation>
+    </message>
+    <message>
+        <source>no clef</source>
+        <translation type="obsolete">kein Notenschlüssel</translation>
+    </message>
+    <message>
+        <source>Treble</source>
+        <translation type="obsolete">Violinschlüssel</translation>
+    </message>
+    <message>
+        <source>Bass</source>
+        <translation type="obsolete">Bassschlüssel</translation>
+    </message>
+    <message>
+        <source>Grand</source>
+        <translation type="obsolete">Beide Schlüssel</translation>
+    </message>
+    <message>
+        <source>MusE: bad trackname</source>
+        <translation type="obsolete">MusE: ungeeigneter Spurname</translation>
+    </message>
+    <message>
+        <source>please choose a unique track name</source>
+        <translation type="obsolete">Bitte eindeutigen Spurnamen wählen</translation>
+    </message>
+    <message>
+        <source>Update drummap?</source>
+        <translation type="obsolete">Drumbelegung aktualisieren?</translation>
+    </message>
+    <message>
+        <source>Do you want to use same port for all instruments in the drummap?</source>
+        <translation type="obsolete">Möchten Sie für alle Instrumente der Drumbelegung den selben Anschluss verwenden?</translation>
+    </message>
+    <message>
+        <source>&amp;Yes</source>
+        <translation type="obsolete">&amp;Ja</translation>
+    </message>
+    <message>
+        <source>&amp;No</source>
+        <translation type="obsolete">&amp;Nein</translation>
+    </message>
+    <message>
+        <source>show gui</source>
+        <translation type="obsolete">GUI anzeigen</translation>
+    </message>
+    <message>
+        <source>show native gui</source>
+        <translation type="obsolete">Native GUI anzeigen</translation>
+    </message>
+    <message>
+        <source>Treble clef</source>
+        <translation type="obsolete">Violinschlüssel</translation>
+    </message>
+    <message>
+        <source>Bass clef</source>
+        <translation type="obsolete">Bassschlüssel</translation>
+    </message>
+    <message>
+        <source>Grand Staff</source>
+        <translation type="obsolete">Beide Schlüssel</translation>
+    </message>
+    <message>
+        <source>Viewable automation</source>
+        <translation type="obsolete">Sichtbare Automatisierung</translation>
+    </message>
+    <message>
+        <source>Delete Track</source>
+        <translation type="obsolete">Spur löschen</translation>
+    </message>
+    <message>
+        <source>Track Comment</source>
+        <translation type="obsolete">Spur Kommentar</translation>
+    </message>
+    <message>
+        <source>Insert Track</source>
+        <translation type="obsolete">Spur einfügen</translation>
+    </message>
+    <message>
+        <source>Midi</source>
+        <translation type="obsolete">Midi</translation>
+    </message>
+    <message>
+        <source>Drum</source>
+        <translation type="obsolete">Schlagzeug</translation>
+    </message>
+    <message>
+        <source>Do you want to use same port and channel for all instruments in the drummap?</source>
+        <translation type="obsolete">Möchten Sie für alle Instrumente der Drumbelegung den selben Anschluss und Kanal verwenden?</translation>
+    </message>
+</context>
+<context>
+    <name>MusECore</name>
+    <message>
+        <source>Warning: No output devices!</source>
+        <translation type="obsolete">Warnung: Keine Ausgangsgeräte!</translation>
+    </message>
+    <message>
+        <source>Open midi config...</source>
+        <translation type="obsolete">Öffne MIDI-Konfig...</translation>
+    </message>
+    <message>
+        <source>Empty ports</source>
+        <translation type="obsolete">Leere Ports</translation>
+    </message>
+</context>
+<context>
+    <name>MusECore::Song</name>
+    <message>
+        <location filename="../../muse/song.cpp" line="+2233"/>
+        <source>Jack shutdown!</source>
+        <translation>Jack heruntergefahren!</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source> could not be imported.
-Likely the track is the wrong type.</source>
-        <translation type="unfinished"></translation>
+        <source>Jack has detected a performance problem which has lead to
+MusE being disconnected.
+This could happen due to a number of reasons:
+- a performance issue with your particular setup.
+- a bug in MusE (or possibly in another connected software).
+- a random hiccup which might never occur again.
+- jack was voluntary stopped by you or someone else
+- jack crashed
+If there is a persisting problem you are much welcome to discuss it
+on the MusE mailinglist.
+(there is information about joining the mailinglist on the MusE
+ homepage which is available through the help menu)
+
+To proceed check the status of Jack and try to restart it and then .
+click on the Restart button.</source>
+        <translation>Jack hat ein Geschwindigkeitsproblem festgestellt, welches
+dazu geführt hat, dass MusE von Jack getrennt wurde.
+Dies kann aus verschiedenen Gründen passieren:
+- ein Geschwindigkeitsproblem in Ihrer Einrichtung
+- ein Fehler in MusE oder einer anderen verbundenen Software
+- ein zufälliges Verschlucken, das nie wieder passieren könnte
+- Jack wurde absichtlich gestoppt
+- Jack ist abgestürzt
+
+Wenn das Problem erneut auftritt, sind Sie sehr willkommen, in der
+MusE Mailingliste eine Frage zu stellen.
+(Informationen darüber, wie man der Mailingliste beitritt finden sich
+auf der MusE-Homepage, die über das Hilfe-Menü erreichbar ist)
+
+Zum Fortsetzen überprüfen Sie bitten den Zustand von Jack,
+versuchen, Jack neu zu starten und klicken dann auf den &quot;Neustart&quot;-
+Knopf.</translation>
     </message>
     <message>
-        <location filename="../../muse/wave.cpp" line="-6"/>
-        <source>to import an audio file you have first to selecta wave track</source>
-        <translation type="unfinished"></translation>
+        <location line="+186"/>
+        <location line="+179"/>
+        <source>Automation:</source>
+        <translation>Automatisierung:</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <source>Import Wavefile</source>
-        <translation type="unfinished"></translation>
+        <location line="-177"/>
+        <source>previous event</source>
+        <translation>vorheriges Ereignis</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>next event</source>
+        <translation>nächstes Ereignis</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <location line="+169"/>
+        <source>set event</source>
+        <translation>setze Ereignis</translation>
+    </message>
+    <message>
+        <location line="-167"/>
+        <location line="+169"/>
+        <source>add event</source>
+        <translation>füge Ereignis hinzu</translation>
+    </message>
+    <message>
+        <location line="-165"/>
+        <location line="+170"/>
+        <source>erase event</source>
+        <translation>lösche Ereignis</translation>
+    </message>
+    <message>
+        <location line="-166"/>
+        <source>erase range</source>
+        <translation>Lösche Bereich</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>clear automation</source>
+        <translation>Lösche Automatisierung</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Clear all controller events?</source>
+        <translation>Alle Controller-Ereignisse löschen?</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>&amp;Ok</source>
+        <translation>&amp;Bestätigen</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Abbrechen</translation>
+    </message>
+    <message>
+        <location line="+878"/>
+        <source>MusE - external script failed</source>
+        <translation>MusE - externes Skript fehlgeschlagen</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>This wave file has a samplerate of %1,
-as opposed to current setting %2.
-Do you still want to import it?</source>
-        <translation type="unfinished"></translation>
+        <source>MusE was unable to launch the script, error message:
+%1</source>
+        <translation>MusE konnte das Skript nicht starten, Fehlermeldung:
+%1</translation>
+    </message>
+</context>
+<context>
+    <name>MusEDialog::PasteDialog</name>
+    <message numerus="yes">
+        <source>%n quarter(s)</source>
+        <translation type="obsolete">
+            <numerusform>%n Viertelnote</numerusform>
+            <numerusform>%n Viertelnoten</numerusform>
+        </translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>&amp;Yes</source>
-        <translation>&amp;Ja</translation>
+        <source>quarter</source>
+        <translation type="obsolete">Viertelnote</translation>
+    </message>
+    <message>
+        <source>quarters</source>
+        <translation type="obsolete">Viertelnoten</translation>
+    </message>
+</context>
+<context>
+    <name>MusEDialog::PasteEventsDialog</name>
+    <message numerus="yes">
+        <source>%n quarter(s)</source>
+        <translation type="obsolete">
+            <numerusform>%n Viertelnote</numerusform>
+            <numerusform>%n Viertelnoten</numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>quarter</source>
+        <translation type="obsolete">Viertelnote</translation>
+    </message>
+    <message>
+        <source>quarters</source>
+        <translation type="obsolete">Viertelnoten</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui</name>
+    <message>
+        <location filename="../../muse/helper.cpp" line="+56"/>
+        <source>Select project directory</source>
+        <translation>Projektverzeichnis auswählen</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::Appearance</name>
+    <message>
+        <location filename="../../muse/appearance.cpp" line="+132"/>
+        <source>Main application font, and default font for any
+ controls not defined here.</source>
+        <translation>Hauptschriftart, und Standard für alles, was
+hier nicht definiert ist.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>For small controls like mixer strips.
+Also timescale small numbers, arranger part name overlay,
+ and effects rack.</source>
+        <translation>Für kleine Bedienelemente, wie Mixer-Strips.
+Auch die kleinen Timescale-Nummern, Arranger-Partnamen
+und der Effekteinschub.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi track info panel. Transport controls.</source>
+        <translation>MIDI Spurinfo. Transportkontrollen.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Controller graph and S/X buttons. Large numbers for time
+ and tempo scale, and time signature.</source>
+        <translation>Controller-Graph und S/X Knöpfe. Große Zahlen für
+Zeit- und Tempo-Skala und Taktsignaturen.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Time scale markers.</source>
+        <translation>Zeitskala-Marker.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>List editor: meta event edit dialog multi-line edit box.</source>
+        <translation>Listeneditor: Metaevent-Bearbeitungsdialog-Box.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mixer label font. Auto-font-sizing up to chosen font size.
+Word-breaking but only with spaces.</source>
+        <translation>Mixerschriftart. Automatisches Vergrößern bis zur gewählten
+Größe. Zeilenumbruch aber nur mit Leerzeichen.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Maximum mixer label auto-font-sizing font size.</source>
+        <translation>Maximale Mixer-Schriftgröße.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Global opacity (opposite of transparency).</source>
+        <translation>Globale Durchsichtigkeit.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Standard</source>
+        <translation>Standard</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Custom</source>
+        <translation>Benutzerdefiniert</translation>
+    </message>
+    <message>
+        <location line="+624"/>
+        <source>MusE: load image</source>
+        <translation>MusE: Bild laden</translation>
+    </message>
+    <message>
+        <location line="+334"/>
+        <source>Select style sheet</source>
+        <translation>Formatvorlage auswählen</translation>
     </message>
     <message>
         <location line="+0"/>
-        <source>&amp;No</source>
-        <translation>&amp;Nein</translation>
+        <source>Qt style sheets (*.qss)</source>
+        <translation>QT-Formatvorlagen (*.qss)</translation>
     </message>
 </context>
 <context>
-    <name>MusEArranger::Arranger</name>
+    <name>MusEGui::Arranger</name>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="-74"/>
+        <location filename="../../muse/arranger/arranger.cpp" line="+81"/>
         <source>Enable Recording</source>
-        <translation type="unfinished">Aufnahme einschalten</translation>
+        <translation>Aufnahme einschalten</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Mute/Off Indicator</source>
-        <translation type="unfinished"></translation>
+        <translation>Mute/Off Anzeige</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Solo Indicator</source>
-        <translation type="unfinished">Anzeige &quot;Solo&quot;</translation>
+        <translation>Solo-Anzeige</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Track Type</source>
-        <translation type="unfinished">Spurtyp</translation>
+        <translation>Spurtyp</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Track Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Spurname</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Midi output channel number or audio channels</source>
-        <translation type="unfinished"></translation>
+        <translation>Midi-Ausgangskanalnummer oder Audiokanäle</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Midi output port or synth midi port</source>
-        <translation type="unfinished"></translation>
+        <translation>Midi-Ausgangsport oder Synth-Midi-Port</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Time Lock</source>
-        <translation type="unfinished">Sperre &quot;Zeit&quot;</translation>
+        <translation>Sperre &quot;Zeit&quot;</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Automation parameter selection</source>
-        <translation type="unfinished"></translation>
+        <translation>Automatisierungsparameterauswahl</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Notation clef</source>
-        <translation type="unfinished">Notenschlüssel</translation>
+        <translation>Notenschlüssel</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Enable recording. Click to toggle.</source>
-        <translation type="unfinished">Aufnahme einschalten. Klicken zum umschalten.</translation>
+        <translation>Aufnahme einschalten. Klicken zum umschalten.</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -10474,33 +10256,42 @@ Do you still want to import it?</source>
 Right-click to toggle track on/off.
 Mute is designed for rapid, repeated action.
 On/Off is not!</source>
-        <translation type="unfinished"></translation>
+        <translation>Mute-Anzeige. Klicken zum umschalten.
+Rechtsklick um Track an/aus umzuschalten.
+&quot;Mute&quot; ist für schnelles, wiederholtes Umschalten.
+An/aus nicht!</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Solo indicator. Click to toggle.
 Connected tracks are also &apos;phantom&apos; soloed,
  indicated by a dark square.</source>
-        <translation type="unfinished"></translation>
+        <translation>Solo-Anzeige. Klicken zum umschalten.
+Verbundene Spuren sind auch &quot;Phantom-&quot;Solo-geschalten,
+angezeigt durch ein dunkles Quadrat.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Track type. Right-click to change
  midi and drum track types.</source>
-        <translation type="unfinished"></translation>
+        <translation>Spurtyp. Rechtsklick, um Midi und
+Schlagzeug Spurtypen umzuschalten.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Track name. Double-click to edit.
 Right-click for more options.</source>
-        <translation type="unfinished"></translation>
+        <translation>Spurname. Doppelklick zum bearbeiten.
+Rechtsklick für mehr Optionen.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Midi/drum track: Output channel number.
 Audio track: Channels.
 Mid/right-click to change.</source>
-        <translation type="unfinished"></translation>
+        <translation>Midi-/Schlagzeugspur: Ausgangskanalnummer.
+Audiospur: Kanäle.
+Mittel/Rechtsklick zum Ändern.</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -10508,164 +10299,177 @@ Mid/right-click to change.</source>
 Synth track: Assigned midi port.
 Left-click to change.
 Right-click to show GUI.</source>
-        <translation type="unfinished"></translation>
+        <translation>Midi/Schlagzeugspur: Ausgangsport.
+Synth-Spur: Zugewiesener MIDI-Port.
+Linksklick zum ändern.
+Rechtsklick, um die GUI zu zeigen.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Time lock</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeitsperre</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Notation clef. Select this tracks notation clef.</source>
-        <translation type="unfinished"></translation>
+        <translation>Notenschlüssel. Wählt den Schlüssel dieser Spur aus.</translation>
     </message>
     <message>
         <location line="+33"/>
         <source>Arranger</source>
-        <translation type="unfinished">Arrangierer</translation>
+        <translation>Arrangierer</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Cursor</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeiger</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+10"/>
+        <source>Off</source>
+        <translation>Aus</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Bar</source>
+        <translation>Takt</translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Snap</source>
-        <translation type="unfinished">Magnet</translation>
+        <translation>Magnet</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Len</source>
-        <translation type="unfinished">Länge</translation>
+        <translation>Länge</translation>
     </message>
     <message>
         <location line="+10"/>
         <location line="+1"/>
         <source>song length - bars</source>
-        <translation type="unfinished"></translation>
+        <translation>Liedlänge - Takte</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Type</source>
-        <translation type="unfinished">Typ</translation>
+        <translation>Typ</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>NO</source>
-        <translation type="unfinished">Kein</translation>
+        <translation>Kein</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>GM</source>
-        <translation type="unfinished">GM</translation>
+        <translation>GM</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>GS</source>
-        <translation type="unfinished">GS</translation>
+        <translation>GS</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>XG</source>
-        <translation type="unfinished">XG</translation>
+        <translation>XG</translation>
     </message>
     <message>
         <location line="+2"/>
         <location line="+1"/>
         <source>midi song type</source>
-        <translation type="unfinished">Midi Lied Typ</translation>
+        <translation>Midi Lied Typ</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Pitch</source>
-        <translation type="unfinished"></translation>
+        <translation>Tonhöhe</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>midi pitch</source>
-        <translation type="unfinished">Midi Tonhöhenänderung</translation>
+        <translation>Midi Tonhöhenänderung</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>global midi pitch shift</source>
-        <translation type="unfinished">Globale Midi Tonhöhenänderung</translation>
+        <translation>Globale Midi Tonhöhenänderung</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Tempo</source>
-        <translation type="unfinished">Tempo</translation>
+        <translation>Tempo</translation>
     </message>
     <message>
         <location line="+8"/>
         <location line="+1"/>
         <source>midi tempo</source>
-        <translation type="unfinished">Midi Tempo</translation>
+        <translation>Midi Tempo</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>N</source>
-        <translation type="unfinished">N</translation>
+        <translation>N</translation>
     </message>
     <message>
         <location line="+60"/>
         <source>TrackInfo</source>
-        <translation type="unfinished">Spurinfo</translation>
+        <translation>Spurinfo</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>R</source>
-        <translation type="unfinished">R</translation>
+        <translation>R</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>M</source>
-        <translation type="unfinished">M</translation>
+        <translation>M</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>S</source>
-        <translation type="unfinished">S</translation>
+        <translation>S</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>C</source>
-        <translation type="unfinished">C</translation>
+        <translation>C</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Track</source>
-        <translation type="unfinished">Spur</translation>
+        <translation>Spur</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Port</source>
-        <translation type="unfinished"></translation>
+        <translation>Port</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Ch</source>
-        <translation type="unfinished">K</translation>
+        <translation>K</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>T</source>
-        <translation type="unfinished">T</translation>
+        <translation>T</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Automation</source>
-        <translation type="unfinished">Automatisierung</translation>
+        <translation>Automatisierung</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Clef</source>
-        <translation type="unfinished"></translation>
+        <translation>Schlüssel</translation>
     </message>
 </context>
 <context>
-    <name>MusEArranger::ArrangerView</name>
+    <name>MusEGui::ArrangerView</name>
     <message>
         <location filename="../../muse/arranger/arrangerview.cpp" line="+83"/>
         <source>MusE: Arranger</source>
@@ -10674,7 +10478,7 @@ Right-click to show GUI.</source>
     <message>
         <location line="+17"/>
         <source>Undo/Redo tools</source>
-        <translation>Undo/Redo tools</translation>
+        <translation>Rückgängig/Wiederholen-Werkzeuge</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -10684,10 +10488,10 @@ Right-click to show GUI.</source>
     <message>
         <location line="+4"/>
         <source>transport</source>
-        <translation></translation>
+        <translation>Transport</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+31"/>
         <source>C&amp;ut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
@@ -10697,10 +10501,6 @@ Right-click to show GUI.</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
-        <source>&amp;Copy in range</source>
-        <translation type="obsolete">Im Bereich kopieren</translation>
-    </message>
-    <message>
         <location line="+1"/>
         <source>Copy in range</source>
         <translation>Im Bereich kopieren</translation>
@@ -10797,13 +10597,13 @@ Right-click to show GUI.</source>
     </message>
     <message>
         <location line="+3"/>
-        <source>all parts in one staff</source>
-        <translation>alle Parts in ein System</translation>
+        <source>all tracks in one staff</source>
+        <translation>alle Spuren in ein System</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>one staff per part</source>
-        <translation>ein System pro Part</translation>
+        <source>one staff per track</source>
+        <translation>ein System pro Spur</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -10862,6 +10662,21 @@ Right-click to show GUI.</source>
         <translation>Globales Aufteilen</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Global Cut - selected tracks</source>
+        <translation>Globaler Schnitt - markierte Spuren</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Global Insert - selected tracks</source>
+        <translation>Globales Einfügen - markierte Spuren</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Global Split - selected tracks</source>
+        <translation>Globales Aufteilen - markierte Spuren</translation>
+    </message>
+    <message>
         <location line="+8"/>
         <source>&amp;Edit</source>
         <translation>&amp;Bearbeiten</translation>
@@ -10872,7 +10687,7 @@ Right-click to show GUI.</source>
         <translation>&amp;Struktur</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+11"/>
         <source>Functions</source>
         <translation>Funktionen</translation>
     </message>
@@ -10932,489 +10747,1098 @@ Right-click to show GUI.</source>
         <translation>Fenster&amp;konfiguration</translation>
     </message>
     <message>
-        <location line="+308"/>
+        <location line="+314"/>
         <location line="+6"/>
         <source>New</source>
         <translation>Neu</translation>
     </message>
 </context>
 <context>
-    <name>MusEArranger::PartCanvas</name>
+    <name>MusEGui::AudioMixerApp</name>
     <message>
-        <location filename="../../muse/arranger/pcanvas.cpp" line="+346"/>
-        <source>Cannot copy/move/clone to different Track-Type</source>
-        <translation>Kopieren/verschieben/klonen auf anderen Spurtyp nicht möglich</translation>
+        <location filename="../../muse/mixer/amixer.cpp" line="+171"/>
+        <source>&amp;Create</source>
+        <translation>&amp;Erzeugen</translation>
     </message>
     <message>
-        <location line="+261"/>
-        <source>C&amp;ut</source>
-        <translation>&amp;Ausschneiden</translation>
+        <location line="+4"/>
+        <source>&amp;View</source>
+        <translation>&amp;Zeigen</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>&amp;Copy</source>
-        <translation>&amp;Kopieren</translation>
+        <location line="+1"/>
+        <source>Routing</source>
+        <translation>Signalfluss</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Show Midi Tracks</source>
+        <translation>Zeige Midi-Spuren</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show Drum Tracks</source>
+        <translation>Zeige Schlagzeug-Spuren</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show Wave Tracks</source>
+        <translation>Zeige Wave-Spuren</translation>
     </message>
     <message>
         <location line="+6"/>
-        <source>s&amp;elect </source>
-        <translation>&amp;wähle </translation>
+        <source>Show Inputs</source>
+        <translation>Zeige Eingänge</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>clones</source>
-        <translation>Klone</translation>
+        <location line="+1"/>
+        <source>Show Outputs</source>
+        <translation>Zeige Ausgänge</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>rename</source>
-        <translation>Umbenennen</translation>
+        <location line="+1"/>
+        <source>Show Groups</source>
+        <translation>Zeige Gruppen</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>color</source>
-        <translation>Farbe</translation>
+        <location line="+1"/>
+        <source>Show Auxs</source>
+        <translation>Zeige Aux</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>delete</source>
-        <translation>Löschen</translation>
+        <location line="+1"/>
+        <source>Show Synthesizers</source>
+        <translation>Zeige Synthesizer</translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::AudioStrip</name>
     <message>
-        <location line="+2"/>
-        <source>split</source>
-        <translation>Schnitt</translation>
+        <location filename="../../muse/mixer/astrip.cpp" line="+667"/>
+        <source>panorama</source>
+        <translation>Panorama</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>glue</source>
-        <translation>Verbinder</translation>
+        <source>aux send level</source>
+        <translation>Aux Send Pegel</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Pan</source>
+        <translation>Pan</translation>
+    </message>
+    <message>
+        <location line="+87"/>
+        <source>1/2 channel</source>
+        <translation>1/2 Kanäle</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Pre</source>
+        <translation>Pre</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>pre fader - post fader</source>
+        <translation>Vor Regler - nach Regler</translation>
+    </message>
+    <message>
+        <location line="+70"/>
+        <source>dB</source>
+        <translation>dB</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>record</source>
+        <translation>Aufnahme</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>mute</source>
+        <translation>stumm</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>record downmix</source>
+        <translation>Abmischung aufnehmen</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>de-clone</source>
-        <translation>Entklonen</translation>
+        <location line="+4"/>
+        <source>solo mode</source>
+        <translation>Solo Modus</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location line="+7"/>
         <location line="+7"/>
-        <source>save part to disk</source>
-        <translation>Speichere Part auf Festplatte</translation>
+        <source>off</source>
+        <translation>Aus</translation>
     </message>
     <message>
-        <location line="-2"/>
-        <source>wave edit</source>
-        <translation>Wave Editor</translation>
+        <location line="+21"/>
+        <source>iR</source>
+        <translation>iR</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>file info</source>
-        <translation>Dateiinfo</translation>
+        <location line="+2"/>
+        <source>input routing</source>
+        <translation>Eingangs-Signalfluss</translation>
     </message>
     <message>
-        <location line="+88"/>
-        <source>MusE: save part</source>
-        <translation>MusE: Speichere Part</translation>
+        <location line="+8"/>
+        <source>oR</source>
+        <translation>oR</translation>
     </message>
     <message>
-        <location line="+18"/>
-        <source>Part name</source>
-        <translation>Partname</translation>
+        <location line="+2"/>
+        <source>output routing</source>
+        <translation>Ausgangs-Signalfluss</translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Files</source>
-        <translation>Dateien</translation>
+        <location line="+13"/>
+        <source>Off</source>
+        <translation>Aus</translation>
     </message>
     <message>
-        <location line="+2090"/>
-        <source> out of </source>
-        <translation> von </translation>
+        <location line="+1"/>
+        <source>Read</source>
+        <translation>Lesen</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source> parts</source>
-        <translation>Parts</translation>
+        <source>Touch</source>
+        <translation>Berühren</translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source> part</source>
-        <translatorcomment>igitt</translatorcomment>
-        <translation>Part</translation>
+        <location line="+1"/>
+        <source>Write</source>
+        <translation>Schreiben</translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>automation type</source>
+        <translation>Automatisierungstyp</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::BigTime</name>
+    <message>
+        <location filename="../../muse/widgets/bigtime.cpp" line="+62"/>
+        <source>format display</source>
+        <translation>Formatanzeige</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>bar</source>
+        <translation>Takt</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source> could not be pasted.
-Likely the selected track is the wrong type.</source>
-        <translation> konnte nicht eingefügt werden.
-Wahrscheinlich hat dir ausgewählte Spur den falschen Typ.</translation>
+        <source>beat</source>
+        <translation>Schlag</translation>
     </message>
     <message>
-        <location line="+25"/>
-        <source>Cannot paste: multiple tracks selected</source>
-        <translation>Einfügen nicht möglich: mehrere Spuren ausgewählt</translation>
+        <location line="+1"/>
+        <location line="+6"/>
+        <source>tick</source>
+        <translation>Tick</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Cannot paste: no track selected</source>
-        <translation>Einfügen nicht möglich: keine Spur ausgewählt</translation>
+        <location line="-4"/>
+        <source>minute</source>
+        <translation>Minute</translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Can only paste to midi/drum track</source>
-        <translation>Einfügen möglich nur in Midi/Drum Spur </translation>
+        <location line="+1"/>
+        <source>second</source>
+        <translation>Sekunde</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>Can only paste to wave track</source>
-        <translation>Einfügen möglich nur in Wave Spur</translation>
+        <location line="+1"/>
+        <location line="+3"/>
+        <source>frame</source>
+        <translation>Frame</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>Can only paste to midi or wave track</source>
-        <translation>Einfügen möglich nur in Midi oder Wave Spur </translation>
+        <location line="-2"/>
+        <source>subframe</source>
+        <translation>Subframe</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>MusE: Bigtime</source>
+        <translation>MusE: Große Zeitanzeige</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::ClipListEdit</name>
+    <message>
+        <location filename="../../muse/cliplist/cliplist.cpp" line="+130"/>
+        <source>MusE: Clip List Editor</source>
+        <translation>MusE: Clip-Listen-Editor</translation>
     </message>
     <message>
         <location line="+8"/>
-        <source>Cannot paste: wrong data type</source>
-        <translation>Einfügen nicht möglich: falscher Datentyp</translation>
+        <source>Undo/Redo tools</source>
+        <translation>Rückgängig/Wiederholen-Werkzeuge</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>panic</source>
+        <translation>Panik</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>transport</source>
+        <translation>Transport</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Window &amp;Config</source>
+        <translation>Fenster&amp;konfiguration</translation>
     </message>
 </context>
 <context>
-    <name>MusEArranger::TList</name>
+    <name>MusEGui::ComboQuant</name>
     <message>
-        <location filename="../../muse/arranger/tlist.cpp" line="+362"/>
-        <source>&lt;none&gt;</source>
-        <translation>&lt;kein&gt;</translation>
+        <location filename="../../muse/widgets/comboQuant.cpp" line="+40"/>
+        <location line="+1"/>
+        <location line="+1"/>
+        <source>Off</source>
+        <translation>Aus</translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::CtrlPanel</name>
     <message>
-        <location line="+31"/>
-        <source>no clef</source>
-        <translation>kein Notenschlüssel</translation>
+        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="+91"/>
+        <source>S</source>
+        <translation>S</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>select controller</source>
+        <translation>Controller wählen</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>X</source>
+        <translation>X</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>remove panel</source>
+        <translation>Kontrolleransicht schließen</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>manual adjust</source>
+        <translation>Manuelles Einstellen</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>double click on/off</source>
+        <translation>Doppelklick an/aus</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>off</source>
+        <translation>aus</translation>
+    </message>
+    <message>
+        <location line="+443"/>
+        <location line="+236"/>
+        <source>Velocity</source>
+        <translation>Anschlagsdynamik</translation>
+    </message>
+    <message>
+        <location line="-186"/>
+        <source>add new ...</source>
+        <translation>Neuen Kontroller hinzufügen ...</translation>
+    </message>
+    <message>
+        <location line="+163"/>
+        <location line="+58"/>
+        <source>Instrument-defined</source>
+        <translation>Instrumenten-definiert</translation>
+    </message>
+    <message>
+        <location line="-43"/>
+        <location line="+21"/>
+        <source>Add ...</source>
+        <translation>Hinzufügen ...</translation>
+    </message>
+    <message>
+        <location line="-17"/>
+        <source>Others</source>
+        <translation>Andere</translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Edit instrument ...</source>
+        <translation>Instrument bearbeiten ...</translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Common Controls</source>
+        <translation>Gemeinsame Controller</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::DrumEdit</name>
+    <message>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="+114"/>
+        <location line="+21"/>
+        <source>mute instrument</source>
+        <translation>Instrument stummschalten</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>sound name</source>
+        <translation>Klangname</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>volume percent</source>
+        <translation>Lautstärke Prozent</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>quantisation</source>
+        <translation>Quantisierung</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>this input note triggers the sound</source>
+        <translation>Diese Eingangsnote löst den Klang aus</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>note length</source>
+        <translation>Notenlänge</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>this is the note which is played</source>
+        <translation>Das ist die Note, die gespielt wird</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <source>output channel (hold ctl to affect all rows)</source>
+        <translation>Ausgangskanal (halten Sie CTRL, um alle Reihen zu beeinflussen)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>output port (hold ctl to affect all rows)</source>
+        <translation>Ausgangsport (halten Sie CTRL, um alle Reihen zu beeinflussen)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+21"/>
+        <source>shift + control key: draw velocity level 1</source>
+        <translation>Shift + Ctrl: Zeichne Dynamiklevel 1</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>control key: draw velocity level 2</source>
+        <translation>Ctrl: Zeichne Dynamiklevel 2</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>shift key: draw velocity level 3</source>
+        <translation>Shift: Zeichne Dynamiklevel 3</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>draw velocity level 4</source>
+        <translation>Zeichne Dynamiklevel 4</translation>
+    </message>
+    <message>
+        <location line="-5"/>
+        <source>output channel (ctl: affect all rows)</source>
+        <translation>Ausgangskanal (CTRL, um alle Reihen zu beeinflussen)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>output port (ctl: affect all rows)</source>
+        <translation>Ausgangskanal (CTRL, um alle Reihen zu beeinflussen)</translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>&amp;File</source>
+        <translation>&amp;Datei</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>Treble</source>
-        <translation>Violinschlüssel</translation>
+        <source>Load Map</source>
+        <translation>Schlagzeugbelegung laden</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Save Map</source>
+        <translation>Schlagzeugbelegung Sichern</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reset GM Map</source>
+        <translation>Auf GM-Belegung zurücksetzen</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>&amp;Edit</source>
+        <translation>B&amp;earbeiten</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Cut</source>
+        <translation>Ausschneiden</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy</source>
+        <translation>Kopieren</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy events in range</source>
+        <translation>Kopiere Events im Bereich</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Paste</source>
+        <translation>Einfügen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Paste (with Dialog)</source>
+        <translation>Einfügen (Dialog zeigen)</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>Bass</source>
-        <translation>Bassschlüssel</translation>
+        <source>Delete Events</source>
+        <translation>Events entfernen</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>&amp;Select</source>
+        <translation>&amp;Auswählen</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>Grand</source>
-        <translation>Beide Schlüssel</translation>
+        <source>Select All</source>
+        <translation>Alles auswählen</translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>MusE: bad trackname</source>
-        <translation>MusE: ungeeigneter Spurname</translation>
+        <location line="+1"/>
+        <source>Select None</source>
+        <translation>Nichts auswählen</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>please choose a unique track name</source>
-        <translation>Bitte eindeutigen Spurnamen wählen</translation>
+        <source>Invert</source>
+        <translation>Auswahl umkehren</translation>
     </message>
     <message>
-        <location line="+157"/>
-        <location line="+1143"/>
-        <source>Update drummap?</source>
-        <translation>Drumbelegung aktualisieren?</translation>
+        <location line="+2"/>
+        <source>Inside Loop</source>
+        <translation>Innerhalb der Schleife</translation>
     </message>
     <message>
-        <location line="-1142"/>
-        <source>Do you want to use same port for all instruments in the drummap?</source>
-        <translation>Möchten Sie für alle Instrumente der Drumbelegung den selben Anschluss verwenden?</translation>
+        <location line="+1"/>
+        <source>Outside Loop</source>
+        <translation>Ausserhalb der Schleife</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Previous Part</source>
+        <translation>Vorheriger Part</translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+1143"/>
-        <source>&amp;Yes</source>
-        <translation>&amp;Ja</translation>
+        <source>Next Part</source>
+        <translation>Nächster Part</translation>
     </message>
     <message>
-        <location line="-1143"/>
-        <location line="+1143"/>
-        <source>&amp;No</source>
-        <translation>&amp;Nein</translation>
+        <location line="+19"/>
+        <source>Fu&amp;nctions</source>
+        <translation>Fu&amp;nktionen</translation>
     </message>
     <message>
-        <location line="-1066"/>
-        <location line="+55"/>
-        <source>show gui</source>
-        <translation>GUI anzeigen</translation>
+        <location line="+4"/>
+        <source>Re-order list</source>
+        <translation>Liste neu sortieren</translation>
     </message>
     <message>
-        <location line="-46"/>
-        <location line="+55"/>
-        <source>show native gui</source>
-        <translation>Native GUI anzeigen</translation>
+        <location line="+2"/>
+        <source>Set Fixed Length</source>
+        <translation>Länge festlegen</translation>
     </message>
     <message>
-        <location line="+338"/>
-        <source>Treble clef</source>
-        <translation>Violinschlüssel</translation>
+        <location line="+1"/>
+        <source>Modify Velocity</source>
+        <translation>Velocity ändern</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Bass clef</source>
-        <translation>Bassschlüssel</translation>
+        <source>Crescendo/Decrescendo</source>
+        <translation>Crescendo/Decrescendo</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Grand Staff</source>
-        <translation>Beide Schlüssel</translation>
+        <source>Quantize</source>
+        <translation>Quantisieren</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <source>Viewable automation</source>
-        <translation>Sichtbare Automatisierung</translation>
+        <location line="+1"/>
+        <source>Erase Event</source>
+        <translation>Events löschen</translation>
     </message>
     <message>
-        <location line="+131"/>
-        <source>Delete Track</source>
-        <translation>Spur löschen</translation>
+        <location line="+1"/>
+        <source>Move Notes</source>
+        <translation>Noten verschieben</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Track Comment</source>
-        <translation>Spur Kommentar</translation>
+        <source>Delete Overlaps</source>
+        <translation>Ãœberlappungen entfernen</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>&amp;Plugins</source>
+        <translation>&amp;Plugins</translation>
     </message>
     <message>
         <location line="+3"/>
-        <source>Insert Track</source>
-        <translation>Spur einfügen</translation>
+        <source>Window &amp;Config</source>
+        <translation>Fenster&amp;konfiguration</translation>
     </message>
     <message>
-        <location line="+445"/>
-        <source>Midi</source>
-        <translation>Midi</translation>
+        <location line="+11"/>
+        <source>Drum tools</source>
+        <translation>Schlagzeug-Werkzeuge</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Drum</source>
-        <translation>Schlagzeug</translation>
+        <location line="+4"/>
+        <source>Load Drummap</source>
+        <translation>Schlagzeugbelegung laden</translation>
     </message>
     <message>
-        <location line="+50"/>
-        <source>Do you want to use same port and channel for all instruments in the drummap?</source>
-        <translation>Möchten Sie für alle Instrumente der Drumbelegung den selben Anschluss und Kanal verwenden?</translation>
+        <location line="+6"/>
+        <source>Store Drummap</source>
+        <translation>Schlagzeugbelegung sichern</translation>
     </message>
-</context>
-<context>
-    <name>MusEDialog::PasteDialog</name>
-    <message numerus="yes">
-        <location filename="../../muse/widgets/pastedialog.cpp" line="+81"/>
-        <source>%n quarter(s)</source>
-        <translation>
-            <numerusform>%n Viertelnote</numerusform>
-            <numerusform>%n Viertelnoten</numerusform>
-        </translation>
+    <message>
+        <location line="+12"/>
+        <source>Step Record</source>
+        <translation>Aufnahme taktschlagweise</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>quarter</source>
-        <translation>Viertelnote</translation>
+        <location line="+6"/>
+        <source>Midi Input</source>
+        <translation>Midi Eingang</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>quarters</source>
-        <translation>Viertelnoten</translation>
+        <location line="+9"/>
+        <source>cursor tools</source>
+        <translation>Cursor-Werkzeug</translation>
     </message>
-</context>
-<context>
-    <name>MusEDialog::PasteEventsDialog</name>
-    <message numerus="yes">
-        <location filename="../../muse/widgets/pasteeventsdialog.cpp" line="+95"/>
-        <source>%n quarter(s)</source>
-        <translation>
-            <numerusform>%n Viertelnote</numerusform>
-            <numerusform>%n Viertelnoten</numerusform>
-        </translation>
+    <message>
+        <location line="+5"/>
+        <source>Set step size for cursor edit</source>
+        <translation>Schrittweite für Cursor-Modus einstellen</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>panic</source>
+        <translation>Panik</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>transport</source>
+        <translation>Transport</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>ctrl</source>
+        <translation>ctrl</translation>
     </message>
     <message>
         <location line="+7"/>
-        <source>quarter</source>
-        <translation>Viertelnote</translation>
+        <source>Add Controller View</source>
+        <translation>Controlleransicht hinzufügen</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>quarters</source>
-        <translation>Viertelnoten</translation>
+        <location line="+57"/>
+        <source>M</source>
+        <translation>M</translation>
     </message>
-</context>
-<context>
-    <name>MusEMixer::AudioMixerApp</name>
     <message>
-        <location filename="../../muse/mixer/amixer.cpp" line="+171"/>
-        <source>&amp;Create</source>
-        <translation>&amp;Erzeugen</translation>
+        <location line="+1"/>
+        <source>Sound</source>
+        <translation>Klang</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>&amp;View</source>
-        <translation>&amp;Zeigen</translation>
+        <location line="+1"/>
+        <source>Vol</source>
+        <translation>Vol</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Routing</source>
-        <translation>Signalfluss</translation>
+        <source>QNT</source>
+        <translation>QNT</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Show Midi Tracks</source>
-        <translation>Zeige Midi-Spuren</translation>
+        <location line="+1"/>
+        <source>E-Note</source>
+        <translation>E-Note</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Show Drum Tracks</source>
-        <translation>Zeige Schlagzeug-Spuren</translation>
+        <source>Len</source>
+        <translation>Länge</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Show Wave Tracks</source>
-        <translation>Zeige Wave-Spuren</translation>
+        <source>A-Note</source>
+        <translation>A-Note</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Show Inputs</source>
-        <translation>Zeige Eingänge</translation>
+        <location line="+1"/>
+        <source>Ch</source>
+        <translation>K</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Show Outputs</source>
-        <translation>Zeige Ausgänge</translation>
+        <source>Port</source>
+        <translation>Port</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Show Groups</source>
-        <translation>Zeige Gruppen</translation>
+        <source>LV1</source>
+        <translation>LV1</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Show Auxs</source>
-        <translation>Zeige Aux</translation>
+        <source>LV2</source>
+        <translation>LV2</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Show Synthesizers</source>
-        <translation>Zeige Synthesizer</translation>
+        <source>LV3</source>
+        <translation>LV3</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>LV4</source>
+        <translation>LV4</translation>
+    </message>
+    <message>
+        <location line="+377"/>
+        <source>Muse: Load Drum Map</source>
+        <translation>MusE: Schlagzeugbelegung laden</translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>MusE: Store Drum Map</source>
+        <translation>MusE: Schlagzeugbelegung speichern</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Drum map</source>
+        <translation>Schlagzeugbelegung</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reset the drum map with GM defaults?</source>
+        <translation>Die Schlagzeugbelegung auf die GM-Standardwerte zurücksetzen?</translation>
     </message>
 </context>
 <context>
-    <name>MusEMixer::AudioStrip</name>
+    <name>MusEGui::EditCAfterDialog</name>
     <message>
-        <location filename="../../muse/mixer/astrip.cpp" line="+645"/>
-        <source>panorama</source>
-        <translation>Panorama</translation>
+        <location filename="../../muse/liste/editevent.cpp" line="+445"/>
+        <source>MusE: Enter Channel Aftertouch</source>
+        <translation>MusE: Channel Aftertouch festlegen</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>aux send level</source>
-        <translation>Aux Send Pegel</translation>
+        <source>Time Position</source>
+        <translation>Position</translation>
     </message>
     <message>
-        <location line="+23"/>
-        <source>Pan</source>
-        <translation>Pan</translation>
+        <location line="+4"/>
+        <source>Pressure</source>
+        <translation>Anschlagsdruck</translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::EditEventDialog</name>
     <message>
-        <location line="+93"/>
-        <source>1/2 channel</source>
-        <translation>1/2 Kanäle</translation>
+        <location line="-261"/>
+        <source>Ok</source>
+        <translation>Bestätigen</translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>Pre</source>
-        <translation>Pre</translation>
+        <location line="+2"/>
+        <source>Cancel</source>
+        <translation>Abbrechen</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::EditInstrument</name>
+    <message>
+        <location filename="../../muse/instruments/editinstrument.cpp" line="+312"/>
+        <location line="+34"/>
+        <source>MusE: Create file failed</source>
+        <translation>MusE: Erzeugen der Datei schlug fehl</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>MusE: Write File failed</source>
+        <translation>MusE: Datei schreiben schlug fehl</translation>
+    </message>
+    <message>
+        <source>MusE:</source>
+        <translation type="obsolete">MusE:</translation>
+    </message>
+    <message>
+        <source>The user instrument directory
+%1
+does not exist yet. Create it now?
+</source>
+        <translation type="obsolete">Das Benutzerinstrumentenverzeichnis
+%1
+existiert nicht. Jetzt erzeugen?</translation>
+    </message>
+    <message>
+        <source>(You can change the user instruments directory at Settings-&gt;Global Settings-&gt;Midi)</source>
+        <translation type="obsolete">(Sie können das Benutzer-Instrumentenversuchnis unter Einstellungen -&gt; Globale Einstellungen -&gt; Midi ändern)</translation>
+    </message>
+    <message>
+        <source>Unable to create user instrument directory &apos;%1&apos;</source>
+        <translation type="obsolete">Konnte das Benutzer-Instrumentenverzeichnis &quot;%1&quot; nicht anlegen</translation>
+    </message>
+    <message>
+        <location line="+75"/>
+        <location line="+249"/>
+        <source>MusE: Save Instrument Definition</source>
+        <translation>MusE: Instrumentendefinition speichern</translation>
+    </message>
+    <message>
+        <location line="-248"/>
+        <location line="+249"/>
+        <source>Instrument Definition (*.idf)</source>
+        <translation>Instrumentendefinition (*.idf)</translation>
+    </message>
+    <message>
+        <location line="-137"/>
+        <location line="+29"/>
+        <source>MusE: Save instrument as</source>
+        <translation>MusE: Instrument speichern unter</translation>
+    </message>
+    <message>
+        <location line="-29"/>
+        <source>Enter a new unique instrument name:</source>
+        <translation>Geben Sie einen neuen einzigartigen Instrumentennamen ein:</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>The user instrument &apos;%1&apos; already exists. This will overwrite its .idf instrument file.
+Are you sure?</source>
+        <translation>Das Benutzerinstrument &quot;%1&quot; existiert bereits. Dies wird seine .idf Instrumentendatei überschreiben.
+Sind Sie sicher?</translation>
+    </message>
+    <message>
+        <location line="+509"/>
+        <source>MusE: Bad instrument name</source>
+        <translation>MusE: Ungeeigneter Instrumentenname</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>pre fader - post fader</source>
-        <translation>Vor Regler - nach Regler</translation>
+        <source>Please choose a unique instrument name.
+(The name might be used by a hidden instrument.)</source>
+        <translation>Bitte wählen Sie einen einzigartigen Instrumentennamen.
+(Der Name darf von einem versteckten Instrument benutzt werden.)</translation>
     </message>
     <message>
-        <location line="+64"/>
-        <source>dB</source>
-        <translation>dB</translation>
+        <location line="+136"/>
+        <source>MusE: Bad patch name</source>
+        <translation>MusE: Ungeeigneter Patch-Name</translation>
     </message>
     <message>
-        <location line="+36"/>
-        <source>record</source>
-        <translation>Aufnahme</translation>
+        <location line="+1"/>
+        <source>Please choose a unique patch name</source>
+        <translation>Bitte eindeutigen Patchnamen wählen</translation>
     </message>
     <message>
-        <location line="+14"/>
-        <source>mute</source>
-        <translation>stumm</translation>
+        <location line="+22"/>
+        <source>MusE: Bad patchgroup name</source>
+        <translation>MusE: Ungeeigneter Patchgruppen-Name</translation>
     </message>
     <message>
-        <location line="+25"/>
-        <source>record downmix</source>
-        <translation>Abmischung aufnehmen</translation>
+        <location line="+1"/>
+        <source>Please choose a unique patchgroup name</source>
+        <translation>Bitte eindeutigen Patchgruppennamen wählen</translation>
+    </message>
+    <message>
+        <location line="+526"/>
+        <source>MusE: Bad controller name</source>
+        <translation>MusE: Ungeeigneter Controllername</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Please choose a unique controller name</source>
+        <translation>Bitte eindeutigen Controllernamen wählen</translation>
+    </message>
+    <message>
+        <location line="+1287"/>
+        <location line="+12"/>
+        <source>MusE: Cannot add common controller</source>
+        <translation>MusE: Kann gemeinsamen Controller nicht hinzufügen</translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <source>A controller named &apos;%1&apos; already exists.</source>
+        <translation>Ein Controller namens &quot;%1&quot; existiert bereits.</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>A controller number %1 already exists.</source>
+        <translation>Die Controllernummer %1 existiert bereits.</translation>
+    </message>
+    <message>
+        <location line="+283"/>
+        <location line="+5"/>
+        <source>MusE</source>
+        <translation>MusE</translation>
+    </message>
+    <message>
+        <location line="-4"/>
+        <location line="+5"/>
+        <source>The current Instrument contains unsaved data
+Save Current Instrument?</source>
+        <translation>Das momentane Instrument enthält ungespeicherte Daten.
+Instrument speichern?</translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <location line="+5"/>
+        <source>&amp;Save</source>
+        <translation>&amp;Speichern</translation>
+    </message>
+    <message>
+        <location line="-5"/>
+        <location line="+5"/>
+        <source>&amp;Nosave</source>
+        <translation>&amp;Nicht speichern</translation>
+    </message>
+    <message>
+        <location line="-5"/>
+        <source>&amp;Abort</source>
+        <translation>&amp;Abbrechen</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::EditMetaDialog</name>
+    <message>
+        <location filename="../../muse/liste/editevent.cpp" line="+118"/>
+        <source>MusE: Enter Meta Event</source>
+        <translation>MusE: Meta-Event eingeben</translation>
     </message>
     <message>
         <location line="+2"/>
+        <source>Time Position</source>
+        <translation>Position</translation>
+    </message>
+    <message>
         <location line="+4"/>
-        <source>solo mode</source>
-        <translation>Solo Modus</translation>
+        <source>Meta Type</source>
+        <translation>Meta Typ</translation>
     </message>
     <message>
         <location line="+12"/>
-        <source>off</source>
-        <translation>Aus</translation>
+        <source>Enter Hex</source>
+        <translation>Hex eingeben</translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::EditPAfterDialog</name>
     <message>
-        <location line="+19"/>
-        <source>iR</source>
-        <translation>iR</translation>
+        <location line="+176"/>
+        <source>MusE: Enter Poly Aftertouch</source>
+        <translation>MusE: Poly Aftertouch eingeben</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>input routing</source>
-        <translation>Eingangs-Signalfluss</translation>
+        <source>Time Position</source>
+        <translation>Position</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>oR</source>
-        <translation>oR</translation>
+        <location line="+4"/>
+        <source>Pitch</source>
+        <translation>Tonhöhe</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>output routing</source>
-        <translation>Ausgangs-Signalfluss</translation>
+        <source>Pressure</source>
+        <translation>Anschlagsdruck</translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::EditToolBar</name>
     <message>
-        <location line="+12"/>
-        <source>Off</source>
-        <translation>Aus</translation>
+        <location filename="../../muse/widgets/tools.cpp" line="+33"/>
+        <source>select Pointer Tool:
+with the pointer tool you can:
+  select parts
+  move parts
+  copy parts</source>
+        <translation>Werkzeug &quot;Zeiger&quot;:
+Dieses Werkzeug kann:
+  Parts auswählen
+  Parts verschieben
+  Parts kopieren</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>select Pencil Tool:
+with the pencil tool you can:
+  create new parts
+  modify length of parts</source>
+        <translation>Werkzeug &quot;Zeichenstift&quot;:
+Dieses Werkzeug kann:
+  Neue Parts erzeugen
+  Die Länge einzelner Parts ändern</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>select Delete Tool:
+with the delete tool you can delete parts</source>
+        <translation>Werkzeug &quot;Radierer&quot;:
+  mit diesem Werkzeug werden Parts gelöscht</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>select Cut Tool:
+with the cut tool you can split a part</source>
+        <translation>Werkzeug &quot;Schnitt&quot;:
+  mit diesem Werkzeug werden Parts geteilt</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>select Glue Tool:
+with the glue tool you can glue two parts</source>
+        <translation>Werkzeug &quot;Verbinder&quot;:
+  mit diesem Werkzeug werden zwei einzelne Parts zu einem verbunden</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>select Score Tool:
+</source>
+        <translation>Werkzeug &quot;Notensatz&quot;:</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Read</source>
-        <translation>Lesen</translation>
+        <source>select Quantize Tool:
+insert display quantize event</source>
+        <translation>Werkzeug &quot;Quantisierung&quot;:
+ mit diesem Werkzeug werden quantisierte Ereignisse eingefügt</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>select Drawing Tool</source>
+        <translation>Werkzeug &quot;Zeichenstift&quot;</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Touch</source>
-        <translation>Berühren</translation>
+        <source>select Muting Tool:
+click on part to mute/unmute</source>
+        <translation>Werkzeug &quot;Stille&quot;:
+ Klicken Sie auf einen Part um diesen stumm bzw. laut zu schalten</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Manipulate automation</source>
+        <translation>Automatisierung manipulieren</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Write</source>
-        <translation>Schreiben</translation>
+        <source>Cursor tool</source>
+        <translation>Zeiger-Werkzeug</translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>automation type</source>
-        <translation>Automatisationstyp</translation>
+        <location line="+3"/>
+        <source>pointer</source>
+        <translation>Zeiger</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>pencil</source>
+        <translation>Zeichenstift</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>eraser</source>
+        <translation>Radierer</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>cutter</source>
+        <translation>Schnitt</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>score</source>
+        <translation>Notensatz</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>glue</source>
+        <translation>Verbinder</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>quantize</source>
+        <translation>Quantisierung</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>draw</source>
+        <translation>Zeichenstift</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>mute parts</source>
+        <translation>Schalte Parts stumm</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>edit automation</source>
+        <translation>Automatisierung bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>cursor</source>
+        <translation>Zeiger</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Edit Tools</source>
+        <translation>Werkzeuge bearbeiten</translation>
     </message>
 </context>
 <context>
-    <name>MusEMixer::EffectRack</name>
+    <name>MusEGui::EffectRack</name>
     <message>
         <location filename="../../muse/mixer/rack.cpp" line="+193"/>
         <source>effect rack</source>
@@ -11423,7 +11847,7 @@ Wahrscheinlich hat dir ausgewählte Spur den falschen Typ.</translation>
     <message>
         <location line="+83"/>
         <source>new</source>
-        <translation>neu</translation>
+        <translation>Neu</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -11482,235 +11906,885 @@ Wahrscheinlich hat dir ausgewählte Spur den falschen Typ.</translation>
     </message>
 </context>
 <context>
-    <name>MusEMixer::MidiStrip</name>
+    <name>MusEGui::GlobalSettingsConfig</name>
     <message>
-        <location filename="../../muse/mixer/mstrip.cpp" line="+109"/>
-        <location line="+121"/>
-        <location line="+158"/>
-        <source>off</source>
-        <translation type="unfinished"></translation>
+        <source>Selects instruments directory</source>
+        <translation type="obsolete">Wählt Instrumentenverzeichnis aus</translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::Header</name>
     <message>
-        <location line="-278"/>
-        <location line="+122"/>
-        <source>double click on/off</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../muse/widgets/header.cpp" line="+164"/>
+        <source>Track Info Columns</source>
+        <translation>Spur-Info Spalten</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::LMaster</name>
+    <message>
+        <location filename="../../muse/master/lmaster.cpp" line="+158"/>
+        <source>MusE: Mastertrack</source>
+        <translation>MusE: Masterspur</translation>
     </message>
     <message>
-        <location line="-42"/>
-        <source>VariationSend</source>
-        <translation type="unfinished">VariationSend</translation>
+        <location line="+13"/>
+        <source>&amp;Edit</source>
+        <translation>&amp;Bearbeiten</translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Var</source>
-        <translation type="unfinished">Var</translation>
+        <location line="+4"/>
+        <source>Insert Tempo</source>
+        <translation>Tempo einfügen</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>ReverbSend</source>
-        <translation type="unfinished">ReverbSend</translation>
+        <source>Insert Signature</source>
+        <translation>Taktmaß einfügen</translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Rev</source>
-        <translation type="unfinished">Rev</translation>
+        <location line="+1"/>
+        <source>Insert Key</source>
+        <translation>Tonart einfügen</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>ChorusSend</source>
-        <translation type="unfinished">ChorusSend</translation>
+        <source>Edit Positon</source>
+        <translation>Position bearbeiten</translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Cho</source>
-        <translation type="unfinished">Cho</translation>
+        <location line="+1"/>
+        <source>Edit Value</source>
+        <translation>Wert bearbeiten</translation>
     </message>
     <message>
-        <location line="+39"/>
-        <source>dB</source>
-        <translation type="unfinished">dB</translation>
+        <location line="+1"/>
+        <source>Delete Event</source>
+        <translation>Event löschen</translation>
     </message>
     <message>
-        <location line="+54"/>
-        <source>Pan/Balance</source>
-        <translation type="unfinished">Pan/Balance</translation>
+        <location line="+3"/>
+        <source>Window &amp;Config</source>
+        <translation>Fenster&amp;konfiguration</translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Pan</source>
-        <translation type="unfinished"></translation>
+        <location line="+23"/>
+        <source>Undo/Redo tools</source>
+        <translation>Rückgängig/Wiederholen-Werkzeuge</translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>record</source>
-        <translation type="unfinished">Aufnahme</translation>
+        <location line="+4"/>
+        <source>Edit tools</source>
+        <translation></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>mute</source>
-        <translation type="unfinished">still</translation>
+        <location line="+5"/>
+        <source>Tempo</source>
+        <translation>Tempo</translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>solo mode</source>
-        <translation type="unfinished">Solo Modus</translation>
+        <location line="+1"/>
+        <source>Timesig</source>
+        <translation>Taktmaß</translation>
     </message>
     <message>
-        <location line="+67"/>
-        <source>iR</source>
-        <translation type="unfinished">iR</translation>
+        <location line="+1"/>
+        <source>Key</source>
+        <translation>Tonart</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>input routing</source>
-        <translation type="unfinished">Eingangs-Signalfluss</translation>
+        <location line="+1"/>
+        <source>new tempo</source>
+        <translation>Neues Tempo</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>oR</source>
-        <translation type="unfinished">oR</translation>
+        <location line="+1"/>
+        <source>new signature</source>
+        <translation>Neues Taktmaß</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>new key</source>
+        <translation>Neue Tonart</translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>output routing</source>
-        <translation type="unfinished">Ausgangs-Signalfluss</translation>
+        <source>panic</source>
+        <translation>Panik</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>transport</source>
+        <translation>Transport</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Meter</source>
+        <translation>Taktposition</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Time</source>
+        <translation>Zeit</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Type</source>
+        <translation>Typ</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Value</source>
+        <translation>Wert</translation>
+    </message>
+    <message>
+        <location line="+391"/>
+        <source>Reposition of the initial tempo and signature events is not allowed</source>
+        <translation>Das Verschieben der initialen Tempo- und Taktmaß-Events ist nicht erlaubt</translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>MusE: List Editor</source>
+        <translation>MusE: Listeneditor</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Input error, conversion not OK or value out of range</source>
+        <translation>Eingabefehler, Umwandlung nicht in Ordnung oder Wert außerhalb des zulässigen Bereichs</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Reposition of tempo and signature events to start position is not allowed!</source>
+        <translation>Das Verschieben von Tempo- und Taktmaß-Events an die Startposition ist nicht erlaubt!</translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::BigTime</name>
+    <name>MusEGui::ListEdit</name>
     <message>
-        <location filename="../../muse/widgets/bigtime.cpp" line="+60"/>
-        <source>format display</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../muse/liste/listedit.cpp" line="+477"/>
+        <source>insert Note</source>
+        <translation>Note einfügen</translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>bar</source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>insert SysEx</source>
+        <translation>SysEx einfügen</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>beat</source>
-        <translation type="unfinished"></translation>
+        <source>insert Ctrl</source>
+        <translation>Ctrl einfügen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>insert Meta</source>
+        <translation>Meta einfügen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>insert Channel Aftertouch</source>
+        <translation>Channel Aftertouch einfügen</translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>insert Poly Aftertouch</source>
+        <translation>Poly Aftertouch einfügen</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&amp;Edit</source>
+        <translation>B&amp;earbeiten</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Cut</source>
+        <translation>Ausschneiden</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Copy</source>
+        <translation>Kopieren</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Paste</source>
+        <translation>Einfügen</translation>
+    </message>
+    <message>
         <location line="+6"/>
-        <source>tick</source>
-        <translation type="unfinished"></translation>
+        <source>Delete Events</source>
+        <translation>Events löschen</translation>
     </message>
     <message>
-        <location line="-4"/>
-        <source>minute</source>
-        <translation type="unfinished">Minute</translation>
+        <location line="+10"/>
+        <source>Window &amp;Config</source>
+        <translation>Fenster&amp;konfiguration</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Undo/Redo tools</source>
+        <translation>Rückgängig/Wiederholen-Werkzeuge</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Insert tools</source>
+        <translation>Werkzeuge &quot;Einfügen&quot;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>panic</source>
+        <translation>Panik</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>transport</source>
+        <translation>Transport</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Tick</source>
+        <translation>Tick</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>second</source>
-        <translation type="unfinished">Sekunde</translation>
+        <source>Bar</source>
+        <translation>Takt</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Type</source>
+        <translation>Typ</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ch</source>
+        <translation>K</translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Val A</source>
+        <translation>Wert A</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Val B</source>
+        <translation>Wert B</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Val C</source>
+        <translation>Wert C</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Len</source>
+        <translation>Länge</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Comment</source>
+        <translation>Kommentar</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::MPConfig</name>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="+101"/>
+        <location line="+176"/>
+        <source>Default input connections</source>
+        <translation>Standard-Eingangsverbindungen</translation>
+    </message>
+    <message>
+        <location line="-175"/>
+        <location line="+66"/>
+        <source>Are you sure you want to apply to all existing midi tracks now?</source>
+        <translation>Sind Sie sicher, dass Sie das auf alle existierenden MIDI-Spuren anwenden wollen?</translation>
+    </message>
+    <message>
+        <location line="-1"/>
+        <location line="+148"/>
+        <source>Default output connections</source>
+        <translation>Standard-Ausgangsverbindungen</translation>
+    </message>
+    <message>
+        <location line="-37"/>
+        <location line="+38"/>
+        <source>Setting will apply to new midi tracks.
+Do you want to apply to all existing midi tracks now?</source>
+        <translation>Die Einstellung wird auf neue MIDI-Spuren angewendet werden.
+Möchten Sie sie jetzt auf alle existierende MIDI-Spuren anwenden?</translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>MusE: bad device name</source>
+        <translation>MusE: ungeeigneter Gerätename</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>please choose a unique device name</source>
+        <translation>Bitte wählen Sie einen einzigartigen Gerätenamen</translation>
+    </message>
+    <message>
+        <location line="+72"/>
+        <location line="+859"/>
+        <source>in</source>
+        <translation>ein</translation>
+    </message>
+    <message>
+        <location line="-836"/>
+        <location line="+827"/>
+        <source>out</source>
+        <translation>aus</translation>
+    </message>
+    <message>
+        <location line="-771"/>
+        <source>Show first aliases</source>
+        <translation>Zeige erste Aliase</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Show second aliases</source>
+        <translation>Zeige zweite Aliase</translation>
+    </message>
+    <message>
+        <location line="+130"/>
+        <location line="+42"/>
+        <source>Toggle all</source>
+        <translation>Alle umschalten</translation>
+    </message>
+    <message>
+        <location line="-38"/>
+        <location line="+43"/>
+        <source>Change all tracks now</source>
+        <translation>Alle Spuren jetzt ändern</translation>
+    </message>
+    <message>
+        <source>Create</source>
+        <translation type="obsolete">Erstellen</translation>
+    </message>
+    <message>
+        <source> device</source>
+        <translation type="obsolete"> Gerät</translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Create Jack device</source>
+        <translation>Jack-Gerät erstellen</translation>
+    </message>
+    <message>
+        <location line="+229"/>
+        <location line="+29"/>
+        <source>Port Number</source>
+        <translation>Anschlussnummer</translation>
+    </message>
+    <message>
+        <location line="-28"/>
+        <source>Enable gui</source>
+        <translation>GUI aktivieren</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable reading</source>
+        <translation>Lesen aktivieren</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable writing</source>
+        <translation>Schreiben aktivieren</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Port instrument</source>
+        <translation>Anschluss-Instrument</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi device name. Click to edit (Jack)</source>
+        <translation>Midigerätename. Klicken zum bearbeiten (Jack)</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Connections from Jack Midi outputs</source>
+        <translation>Verbindungen von Jack Midi Ausgängen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Connections to Jack Midi inputs</source>
+        <translation>Verbindungen zu Jack Midi Eingängen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Auto-connect these channels to new midi tracks</source>
+        <translation>Verbinde diese Kanäle automatisch mit neuen Midispuren</translation>
+    </message>
+    <message>
         <location line="+3"/>
-        <source>frame</source>
-        <translation type="unfinished">Rahmen</translation>
+        <source>Auto-connect new midi tracks to these channels</source>
+        <translation>Verbinde neue Midispuren automatisch mit diesen Kanälen</translation>
     </message>
     <message>
-        <location line="-2"/>
-        <source>subframe</source>
-        <translation type="unfinished">Subrahmen</translation>
+        <location line="+2"/>
+        <source>Auto-connect new midi tracks to this channel</source>
+        <translation>Verbinde neue Midispuren automatisch mit diesem Kanal</translation>
     </message>
     <message>
-        <location line="+18"/>
-        <source>MusE: Bigtime</source>
-        <translation type="unfinished">MusE: Zeitanzeige groß</translation>
+        <location line="+2"/>
+        <source>Device state</source>
+        <translation>Gerätestatus</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Enable gui for device</source>
+        <translation>GUI für Gerät aktivieren</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Enable reading from device</source>
+        <translation>Lesen vom Gerät aktivieren</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Enable writing to device</source>
+        <translation>Schreiben zum Gerät aktivieren</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Name of the midi device associated with this port number. Click to edit Jack midi name.</source>
+        <translation>Name des MIDI-Gerätes, welches mit dieser Anschlussnummer verknüpft ist. Klicken Sie, um den Jack Midi Namen zu ändern.</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Instrument connected to port</source>
+        <translation>Instrument mit Anschluss verbunden</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Connections from Jack Midi output ports</source>
+        <translation>Verbindungen von Jack Midi Ausgangsports</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Connections to Jack Midi input ports</source>
+        <translation>Verbindungen zu Jack Midi Eingangsports</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Auto-connect these channels, on this port, to new midi tracks.</source>
+        <translation>Verbinde diese Kanäle auf diesem Port automatisch mit neuen MIDI-Spuren.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Connect new midi tracks to these channels, on this port.</source>
+        <translation>Verbinde neue MIDI-Spuren mit diesen Kanälen auf diesem Port.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Connect new midi tracks to this channel, on this port.</source>
+        <translation>Verbinde neue MIDI-Spuren mit diesem Kanal auf diesem Port.</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>State: result of opening the device</source>
+        <translation>Status: Ergebnis vom Öffnen des Gerätes</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Port</source>
+        <translation>Anschluss</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>GUI</source>
+        <translation>GUI</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>I</source>
+        <translation>E</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>O</source>
+        <translation>A</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Instrument</source>
+        <translation>Instrument</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Device Name</source>
+        <translation>Gerätename</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>In routes</source>
+        <translation>Eingangssignalfluss</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Out routes</source>
+        <translation>Ausgangssignalfluss</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Def in ch</source>
+        <translation>Standard Ein-Kanal</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Def out ch</source>
+        <translation>Standard Aus-Kanal</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>State</source>
+        <translation>Status</translation>
+    </message>
+    <message>
+        <location line="+84"/>
+        <source>&lt;unknown&gt;</source>
+        <translation>&lt;unbekannt&gt;</translation>
+    </message>
+    <message>
+        <location line="+87"/>
+        <location line="+71"/>
+        <source>&lt;none&gt;</source>
+        <translation>&lt;kein&gt;</translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::EditToolBar</name>
+    <name>MusEGui::MTScale</name>
     <message>
-        <location filename="../../muse/widgets/tools.cpp" line="+17"/>
-        <source>Edit Tools</source>
-        <translation type="unfinished">Werkzeuge bearbeiten</translation>
+        <location filename="../../muse/widgets/mtscale.cpp" line="+44"/>
+        <source>bar scale</source>
+        <translation>Taktskala</translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::GlobalSettingsConfig</name>
+    <name>MusEGui::MTScaleFlo</name>
     <message>
-        <location filename="../../muse/widgets/genset.cpp" line="+546"/>
-        <source>Selects instruments directory</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../muse/widgets/mtscale_flo.cpp" line="+44"/>
+        <source>bar scale</source>
+        <translation>Taktskala</translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::Header</name>
+    <name>MusEGui::MarkerView</name>
     <message>
-        <location filename="../../muse/widgets/header.cpp" line="+164"/>
-        <source>Track Info Columns</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../muse/marker/markerview.cpp" line="+175"/>
+        <source>MusE: Marker</source>
+        <translation>MusE: Marker</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>add marker</source>
+        <translation>Marker hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>delete marker</source>
+        <translation>Marker löschen</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>&amp;Edit</source>
+        <translation>B&amp;earbeiten</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Window &amp;Config</source>
+        <translation>Fenster&amp;konfiguration</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Undo/Redo tools</source>
+        <translation>Rückgängig/Wiederholen-Werkzeuge</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>edit tools</source>
+        <translation>Werkzeuge &quot;Bearbeiten&quot;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>panic</source>
+        <translation>Panik</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>transport</source>
+        <translation>Transport</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Bar:Beat:Tick</source>
+        <translation>Takt:Schlag:Tick</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hr:Mn:Sc:Fr:Sf</source>
+        <translation>Std:Min:Sek:Fr:SFr</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lock</source>
+        <translation>Sperre</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Text</source>
+        <translation>Text</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Marker Properties</source>
+        <translation>Marker Eigenschaften</translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::MTScale</name>
+    <name>MusEGui::MasterEdit</name>
     <message>
-        <location filename="../../muse/widgets/mtscale.cpp" line="+44"/>
-        <source>bar scale</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../muse/master/masteredit.cpp" line="+107"/>
+        <source>MusE: Mastertrack</source>
+        <translation>MusE: Masterspur</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Window &amp;Config</source>
+        <translation>Fenster&amp;konfiguration</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Undo/Redo tools</source>
+        <translation>Rückgängig/Wiederholen-Werkzeuge</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>panic</source>
+        <translation>Panik</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>transport</source>
+        <translation>Transport</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Enable master</source>
+        <translation>Master einschalten</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Enable</source>
+        <translation>Einschalten</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable usage of master track</source>
+        <translation>Verwendung der Masterspur einschalten</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Info</source>
+        <translation>Info</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cursor</source>
+        <translation>Positionsmarker</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>time at cursor position</source>
+        <translation>Zeit an aktuellem Positionsmarker</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>tempo at cursor position</source>
+        <translation>Tempo an aktuellem Positionsmarker</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Off</source>
+        <translation>Aus</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Bar</source>
+        <translation>Takt</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Snap</source>
+        <translation>Magnet</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>CurPos </source>
+        <translation>AktPos</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>tempo at current position</source>
+        <translation>Tempo an aktuellem Positionsmarker</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>time signature at current position</source>
+        <translation>Taktmaß an aktuellem Positionsmarker</translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::MTScaleFlo</name>
+    <name>MusEGui::MidiInputTransformDialog</name>
     <message>
-        <location filename="../../muse/widgets/mtscale_flo.cpp" line="+44"/>
-        <source>bar scale</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../muse/mplugins/midiitransform.cpp" line="+953"/>
+        <location line="+2"/>
+        <source>New</source>
+        <translation>Neu</translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::MidiSyncConfig</name>
+    <name>MusEGui::MidiStrip</name>
+    <message>
+        <location filename="../../muse/mixer/mstrip.cpp" line="+110"/>
+        <location line="+121"/>
+        <location line="+137"/>
+        <source>off</source>
+        <translation>aus</translation>
+    </message>
+    <message>
+        <location line="-257"/>
+        <location line="+122"/>
+        <source>double click on/off</source>
+        <translation>Doppelklick an/aus</translation>
+    </message>
+    <message>
+        <location line="-42"/>
+        <source>VariationSend</source>
+        <translation>VariationSend</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Var</source>
+        <translation>Var</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>ReverbSend</source>
+        <translation>ReverbSend</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Rev</source>
+        <translation>Rev</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>ChorusSend</source>
+        <translation>ChorusSend</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Cho</source>
+        <translation>Cho</translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>dB</source>
+        <translation>dB</translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Pan/Balance</source>
+        <translation>Pan/Balance</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Pan</source>
+        <translation>Pan</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>record</source>
+        <translation>Aufnahme</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>mute</source>
+        <translation>Stumm</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>solo mode</source>
+        <translation>Solo Modus</translation>
+    </message>
+    <message>
+        <location line="+69"/>
+        <source>iR</source>
+        <translation>iR</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>input routing</source>
+        <translation>Eingangs-Signalfluss</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>oR</source>
+        <translation>oR</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>output routing</source>
+        <translation>Ausgangs-Signalfluss</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::MidiSyncConfig</name>
     <message>
         <location filename="../../muse/widgets/midisyncimpl.cpp" line="+58"/>
         <location line="+29"/>
         <source>Port Number</source>
-        <translation type="unfinished">Anschlussnummer</translation>
+        <translation>Portnummer</translation>
     </message>
     <message>
         <location line="-28"/>
         <location line="+29"/>
         <source>Name of the midi device associated with this port number</source>
-        <translation type="unfinished">Name des Midi Gerätes an dieser Anschlussnummer</translation>
+        <translation>Name des Midi Gerätes an dieser Portnummer</translation>
     </message>
     <message>
         <location line="-27"/>
         <source>Midi clock input detected</source>
-        <translation type="unfinished"></translation>
+        <translation>Midi-Uhr Eingang erkannt</translation>
     </message>
     <message>
         <location line="+1"/>
         <location line="+29"/>
         <source>Midi tick input detected</source>
-        <translation type="unfinished"></translation>
+        <translation>Midi-Tick Eingang erkannt</translation>
     </message>
     <message>
         <location line="-28"/>
         <source>Midi real time input detected</source>
-        <translation type="unfinished"></translation>
+        <translation>Midi Echtzeiteingang erkannt</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>MMC input detected</source>
-        <translation type="unfinished"></translation>
+        <translation>MMC Eingang erkannt</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>MTC input detected</source>
-        <translation type="unfinished"></translation>
+        <translation>MTC Eingang erkannt</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Detected SMPTE format</source>
-        <translation type="unfinished"></translation>
+        <translation>SMPTE-Format erkannt</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -11720,27 +12794,27 @@ Wahrscheinlich hat dir ausgewählte Spur den falschen Typ.</translation>
     <message>
         <location line="+1"/>
         <source>Accept midi clock input</source>
-        <translation type="unfinished"></translation>
+        <translation>Akzeptiere Midi-Uhr-Eingang</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Accept midi real time input</source>
-        <translation type="unfinished"></translation>
+        <translation>Akzeptiere Midi-Echtzeit-Eingang</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Accept MMC input</source>
-        <translation type="unfinished"></translation>
+        <translation>Akzeptiere MMC-Eingang</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Accept MTC input</source>
-        <translation type="unfinished"></translation>
+        <translation>Akzeptiere MTC-Eingang</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Receive start rewinds before playing</source>
-        <translation type="unfinished"></translation>
+        <translation>Das Empfangen von &quot;Start&quot; spult vor dem Abspielen zurück</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -11774,24 +12848,29 @@ Wahrscheinlich hat dir ausgewählte Spur den falschen Typ.</translation>
         <source>Midi clock input detected.
 Current port actually used is red.
 Click to force a port to be used.</source>
-        <translation type="unfinished"></translation>
+        <translation>Midi-Uhr-Eingang erkannt.
+Der momentan verwendete Anschluss ist rot.
+Klicken Sie, um einen anderen Anschluss zu erzwingen.</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Midi realtime input detected, including
  start/stop/continue, and song position.</source>
-        <translation type="unfinished"></translation>
+        <translation>Midi-Echtzeit-Eingang erkannt, einschließlich
+Start/Stopp/Fortsetzen und Liedposition.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>MMC input detected, including stop/play/deferred play, and locate.</source>
-        <translation type="unfinished"></translation>
+        <translation>MMC-Eingang erkannt, einschließlich Stopp/Play/Verzögertes Play und Position.</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>MTC input detected, including forward quarter-frame sync and full-frame locate.
 Current port actually used is red. Click to force a port to be current.</source>
-        <translation type="unfinished"></translation>
+        <translation>MTC-Eingang erkannt, einschließlich Vorwärts-Viertel-Frame-Synchronisation und
+Voll-Frame-Positionserkennung. Der momentan verwendete Anschluss ist rot.
+Klicken Sie, um einen anderen Anschluss zu erzwingen.</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -11812,7 +12891,13 @@ Auto-acquire: If two or more port realtime inputs are enabled,
  then another can take over. Best if each turns off its clock
  at stop, so MusE can re-acquire the clock from another port.
 Click on detect indicator to force another.</source>
-        <translation type="unfinished"></translation>
+        <translation>Midi-Uhr-Eingang akzeptieren. Nur ein Eingang wird für die
+Uhr benutzt. Auto-Benutzen: Wenn mehr als ein Echtzeiteingang
+aktiviert ist, wird die erste erkannte Uhr genutzt, bis sie verloren
+geht. Dann übernimmt eine andere. Es ist am besten, wenn jeder
+seine Uhr beim Stopp ausschaltet, damit MusE die Uhr von einem
+anderen Anschluss benutzen kann. Klicken Sie auf den Erkennungs-
+Indikator, um eine andere zu erzwingen.</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -11823,25 +12908,36 @@ Non-clock events (start,stop etc) are
 This means you may have several master
  devices connected, and muse will accept
  input from them.</source>
-        <translation type="unfinished"></translation>
+        <translation>Akzeptiere MIDI-Echtzeit-Eingänge, einschließlich
+Start/Stopp/Fortsetzen und Liedposition.
+Nicht-Uhr-Ereignisse (Start/Stopp etc.) werden von
+ALLEN aktivierten Anschlüssen angenommen.
+Das bedeutet, dass Sie mehrere Master-Geräte
+verbinden können, und MusE wird deren Daten
+annehmen.</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Accept MMC input, including stop/play/deferred play, and locate.</source>
-        <translation type="unfinished"></translation>
+        <translation>Akzeptiere MMC-Eingang, einschließlich Stopp/Play/Verzögertes Play und Position.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Accept MTC input, including forward quarter-frame sync and full-frame locate.
 See &apos;rc&apos; column for more help.</source>
-        <translation type="unfinished"></translation>
+        <translation>MTC-Eingang erkannt, einschließlich Vorwärts-Viertel-Frame-Synchronisation und
+Voll-Frame-Positionserkennung. Siehe die &quot;rc&quot;-Spalte für mehr Hilfe.</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>When start is received, rewind before playing.
 Note: It may be impossible to rewind fast
  enough to synchronize with the external device.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wenn Start empfangen wird, wird vor dem Abspielen
+zurückgespult.
+Hinweis: Es könnte unmöglich sein, schnell genug
+zurückzuspulen, um mit dem externen Gerät synchron
+zu bleiben.</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -11852,7 +12948,9 @@ Note: It may be impossible to rewind fast
         <location line="+1"/>
         <source>Send midi clock output. If &apos;Slave to External Sync&apos; is chosen,
  muse can re-transmit clock to any other chosen ports.</source>
-        <translation type="unfinished"></translation>
+        <translation>Sende Midi-Uhr-Ausgang. Wenn &quot;Binde an Externe Sync&quot; gewählt ist,
+kann MusE das Uhr-Signal an andere ausgewählte Anschlüsse
+weiterleiten.</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -11862,338 +12960,3030 @@ Note: It may be impossible to rewind fast
  other chosen ports. This means you may have several slave
  devices connected, and muse can re-send realtime messages
  to any or all of them.</source>
-        <translation type="unfinished"></translation>
+        <translation>Sende Midi-Echtzeit Ausgang, einschließlich Start/Stopp/
+Fortsetzen und Liedposition. Wenn &quot;Binde an externe Sync.&quot;
+aktiviert ist, kann MusE Midi Echtzeit-Eingangsnachrichten an
+andere ausgewählte Anschlüsse weiterleiten. Das bedeutet,
+dass Sie mehrere &quot;Sklaven&quot;-Geräte verbinden können, und MusE
+Echtzeitnachrichten an einige oder alle weiterleiten kann.</translation>
     </message>
     <message>
         <location line="+142"/>
         <source>Port</source>
-        <translation type="unfinished"></translation>
+        <translation>Anschluss</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Device Name</source>
-        <translation type="unfinished">Gerätename</translation>
+        <translation>Gerätename</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>c</source>
-        <translation type="unfinished"></translation>
+        <translation>c</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>k</source>
-        <translation type="unfinished"></translation>
+        <translation>k</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>r</source>
-        <translation type="unfinished"></translation>
+        <translation>r</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>m</source>
-        <translation type="unfinished">min</translation>
+        <translation>m</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>t</source>
-        <translation type="unfinished"></translation>
+        <translation>t</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>type</source>
-        <translation type="unfinished"></translation>
+        <translation>Typ</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>rid</source>
-        <translation type="unfinished"></translation>
+        <translation>rid</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>rc</source>
-        <translation type="unfinished"></translation>
+        <translation>rc</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>rr</source>
-        <translation type="unfinished"></translation>
+        <translation>rr</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>rm</source>
-        <translation type="unfinished"></translation>
+        <translation>rm</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>rt</source>
-        <translation type="unfinished"></translation>
+        <translation>rt</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>rw</source>
-        <translation type="unfinished"></translation>
+        <translation>rw</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>tid</source>
-        <translation type="unfinished"></translation>
+        <translation>tid</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>tc</source>
-        <translation type="unfinished"></translation>
+        <translation>tc</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>tr</source>
-        <translation type="unfinished"></translation>
+        <translation>tr</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>tm</source>
-        <translation type="unfinished"></translation>
+        <translation>tm</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>tt</source>
-        <translation type="unfinished"></translation>
+        <translation>tt</translation>
     </message>
     <message>
         <location line="+399"/>
         <source>MusE</source>
-        <translation type="unfinished">MusE</translation>
+        <translation>MusE</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Settings have changed
 Apply sync settings?</source>
-        <translation type="unfinished"></translation>
+        <translation>Einstellungen wurden geändert.
+Sync-Einstellungen anwenden?</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>&amp;Apply</source>
-        <translation type="unfinished">&amp;Anwenden</translation>
+        <translation>&amp;Anwenden</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>&amp;No</source>
-        <translation type="unfinished">&amp;Nein</translation>
+        <translation>&amp;Nein</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>&amp;Abort</source>
-        <translation type="unfinished">&amp;Abbrechen</translation>
+        <translation>A&amp;bbrechen</translation>
     </message>
     <message>
         <location line="+123"/>
         <source>&lt;none&gt;</source>
-        <translation type="unfinished">&lt;kein&gt;</translation>
+        <translation>&lt;kein&gt;</translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::MidiTrackInfo</name>
+    <name>MusEGui::MidiTrackInfo</name>
     <message>
-        <location filename="../../muse/widgets/mtrackinfo.cpp" line="+319"/>
-        <location line="+1046"/>
+        <location filename="../../muse/widgets/mtrackinfo.cpp" line="+335"/>
+        <location line="+1068"/>
         <source>&lt;unknown&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;unbekannt&gt;</translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::MixdownFileDialog</name>
+    <name>MusEGui::MidiTransformerDialog</name>
+    <message>
+        <location filename="../../muse/miditransform.cpp" line="+464"/>
+        <location line="+2"/>
+        <source>New</source>
+        <translation>Neu</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::MixdownFileDialog</name>
     <message>
-        <location filename="../../muse/widgets/mixdowndialog.cpp" line="+118"/>
+        <location filename="../../muse/widgets/mixdowndialog.cpp" line="+122"/>
         <source>Wave Files (*.wav);;All Files (*)</source>
-        <translation type="unfinished">Wave Dateien (*.wav);;Alle Dateien (*)</translation>
+        <translation>Wave Dateien (*.wav);;Alle Dateien (*)</translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::NoteInfo</name>
+    <name>MusEGui::MusE</name>
+    <message>
+        <location filename="../../muse/app.cpp" line="+141"/>
+        <location line="+16"/>
+        <source>Failed to start audio!</source>
+        <translation>Audio konnte nicht gestartet werden!</translation>
+    </message>
+    <message>
+        <location line="-15"/>
+        <source>Was not able to start audio, check if jack is running.
+</source>
+        <translation>Audio konnte nicht gestartet werden, überprüfen Sie, ob Jack läuft.</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Timeout waiting for audio to run. Check if jack is running.
+</source>
+        <translation>Timeout beim Warten auf Audio. Überprüfen Sie, ob Jack läuft.</translation>
+    </message>
+    <message>
+        <location line="+209"/>
+        <source>Und&amp;o</source>
+        <translation>&amp;Rückgängig</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Re&amp;do</source>
+        <translation>&amp;Wiederholen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>undo last change to song</source>
+        <translation>Letzte Änderung am Lied rückgängig machen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>redo last undo</source>
+        <translation>Letztes Rückgängigmachen wiederholen</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Loop</source>
+        <translation>Schleife</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>loop between left mark and right mark</source>
+        <translation>Schleife zwischen linkem und rechtem Marker</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Punchin</source>
+        <translation>Aufnahme am linken Marker beginnen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>record starts at left mark</source>
+        <translation>Aufnahme am linken Marker beginnen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Punchout</source>
+        <translation>Aufnahme am rechten Marker beenden</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>record stops at right mark</source>
+        <translation>Aufnahme am rechten Marker beenden</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Start</source>
+        <translation>Start</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>rewind to start position</source>
+        <translation>Zur Startposition springen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Rewind</source>
+        <translation>Einen Taktschlag rückwärts</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>rewind current position</source>
+        <translation>Einen Taktschlag rückwärts</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Forward</source>
+        <translation>Einen Taktschlag vorwärts</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>move current position</source>
+        <translation>Einen Taktschlag vorwärts</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Stop</source>
+        <translation>Stopp</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop sequencer</source>
+        <translation>Wiedergabe beenden</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Play</source>
+        <translation>Wiedergabe</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>start sequencer play</source>
+        <translation>Wiedergabe beginnen</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Record</source>
+        <translation>Aufnahme</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>to record press record and then play</source>
+        <translation>Zur Aufnahme erst die Schaltfläche &quot;Aufnahme&quot; und dann &quot;Wiedergabe&quot; klicken</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+238"/>
+        <source>Panic</source>
+        <translation>Panik</translation>
+    </message>
+    <message>
+        <location line="-236"/>
+        <source>send note off to all midi channels</source>
+        <translation>Panik - &quot;Note aus&quot; Befehl an alle Midikanäle senden</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>&amp;New</source>
+        <translation>&amp;Neu</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+1"/>
+        <source>Create New Song</source>
+        <translation>Neues Lied erzeugen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Open</source>
+        <translation>Lied &amp;öffnen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+2"/>
+        <source>Click this button to open a &lt;em&gt;new song&lt;/em&gt;.&lt;br&gt;You can also select the &lt;b&gt;Open command&lt;/b&gt; from the File menu.</source>
+        <translation>Auf diese Schaltfläche klicken um ein &lt;em&gt;Neues Lied&lt;/em&gt; zu öffnen.&lt;br&gt; Alternativ den Befehl &lt;b&gt;Neues Lied&lt;/b&gt; des Menüs &quot;Datei&quot; auswählen.</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Open &amp;Recent</source>
+        <translation>&amp;Letztes Lied öffnen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+1039"/>
+        <location line="+1257"/>
+        <source>&amp;Save</source>
+        <translation>&amp;Speichern</translation>
+    </message>
+    <message>
+        <location line="-2294"/>
+        <location line="+3"/>
+        <source>Click this button to save the song you are editing.  You will be prompted for a file name.
+You can also select the Save command from the File menu.</source>
+        <translation>Auf diese Schaltfläche klicken um das gerade bearbeitete Lied zu sichern mit der automatischen Aufforderung einen Dateinamen anzugeben.
+Alternativ das Lied mit dem Befehl &quot;Sichern&quot; im Menü &quot;Datei&quot; sichern.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Save &amp;As</source>
+        <translation>Speichern &amp;unter</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Import Midifile</source>
+        <translation>Mididatei importieren</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Export Midifile</source>
+        <translation>Mididatei exportieren</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Import Part</source>
+        <translation>Part importieren</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../../muse/wave.cpp" line="+1158"/>
+        <source>Import Wave File</source>
+        <translation>Wavedatei importieren</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Find unused wave files</source>
+        <translation>Finde ungenutzte Wave-Dateien</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Quit</source>
+        <translation>&amp;Beenden</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Song Info</source>
+        <translation>Liedinfo</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Transport Panel</source>
+        <translation>Transportkonsole</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Bigtime Window</source>
+        <translation>Große Zeitanzeige</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Mixer A</source>
+        <translation>Mixer A</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Mixer B</source>
+        <translation>Mixer B</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cliplist</source>
+        <translation>Cliplist</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Marker View</source>
+        <translation>Marker-Fenster</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Arranger View</source>
+        <translation>Arranger-Fenster</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Fullscreen</source>
+        <translation>Vollbild</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Plugins</source>
+        <translation>&amp;Plugins</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit Instrument</source>
+        <translation>Instrument bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Input Plugins</source>
+        <translation>Eingangs-PlugIns</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Transpose</source>
+        <translation>Transponieren</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi Input Transform</source>
+        <translation>Midi Eingang transformieren</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi Input Filter</source>
+        <translation>Midi Eingangsfilter</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi Remote Control</source>
+        <translation>Midi Fernbedienung</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Rhythm Generator</source>
+        <translation>Rhythmusgenerator</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Reset Instr.</source>
+        <translation>Instr. zurücksetzen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Init Instr.</source>
+        <translation>Instr. initialisieren</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Local Off</source>
+        <translation>Lokal aus</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Bounce to Track</source>
+        <translation>Auf Spur abmischen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bounce to File</source>
+        <translation>In Datei abmischen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Restart Audio</source>
+        <translation>Audio erneut starten</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Mixer Automation</source>
+        <translation>Mischpult Automatisierung</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Take Snapshot</source>
+        <translation>Schnappschuss aufnehmen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Clear Automation Data</source>
+        <translation>Automatisierungsdaten löschen</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Cascade</source>
+        <translation>Staffeln</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tile</source>
+        <translation>Kacheln</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>In rows</source>
+        <translation>In Reihen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>In columns</source>
+        <translation>In Spalten</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Global Settings</source>
+        <translation>Globale Einstellungen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Configure Shortcuts</source>
+        <translation>Tastenkürzel einstellen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Follow Song</source>
+        <translation>Folge dem Lied</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Don&apos;t Follow Song</source>
+        <translation>Folge dem Lied nicht</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Follow Page</source>
+        <translation>Folge dem Lied seitenweise</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Follow Continuous</source>
+        <translation>Folge dem Lied ständig</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Metronome</source>
+        <translation>Metronom</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi Sync</source>
+        <translation>Midi Sync</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi File Import/Export</source>
+        <translation>Midi-Datei Import/Export</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Appearance Settings</source>
+        <translation>Erscheinungsbild einstellen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi Ports / Soft Synth</source>
+        <translation>Midi Anschlüsse / Software Synthesizer</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>&amp;Manual</source>
+        <translation>&amp;Handbuch</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;MusE Homepage</source>
+        <translation>&amp;MusE Webseite</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Report Bug...</source>
+        <translation>&amp;Fehler melden ...</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;About MusE</source>
+        <translation>&amp;Ãœber MusE</translation>
+    </message>
+    <message>
+        <location line="+99"/>
+        <source>File Buttons</source>
+        <translation>Datei-Knöpfe</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Undo/Redo</source>
+        <translation>Rückgängig/Wiederholen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Transport</source>
+        <translation>Transport</translation>
+    </message>
+    <message>
+        <location line="+56"/>
+        <source>&amp;File</source>
+        <translation>&amp;Datei</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>&amp;View</source>
+        <translation>&amp;Zeigen</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>&amp;Midi</source>
+        <translation>&amp;Midi</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>&amp;Audio</source>
+        <translation>&amp;Audio</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>A&amp;utomation</source>
+        <translation>A&amp;utomatisierung</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&amp;Windows</source>
+        <translation>F&amp;enster</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>MusE Se&amp;ttings</source>
+        <translation>MusE Ei&amp;nstellungen</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>&amp;Help</source>
+        <translation>&amp;Hilfe</translation>
+    </message>
+    <message>
+        <location line="+290"/>
+        <source>Cannot read template</source>
+        <translation>Vorlage nicht lesbar</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>File open error</source>
+        <translation>Fehler beim Datei öffnen</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>File read error</source>
+        <translation>Fehler beim Datei lesen</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Unknown File Format: %1</source>
+        <translation>Unbekanntes Dateiformat: %1</translation>
+    </message>
+    <message>
+        <location line="+134"/>
+        <location line="+440"/>
+        <location line="+915"/>
+        <source>MusE: Song: %1</source>
+        <translation>MusE: Lied: %1</translation>
+    </message>
+    <message>
+        <location line="-1321"/>
+        <source>MusE: load project</source>
+        <translation>Muse: Projekt laden</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>MusE: load template</source>
+        <translation>Muse: Vorlage laden</translation>
+    </message>
+    <message>
+        <location line="+64"/>
+        <source>MusE: Write File failed</source>
+        <translation>MusE: Datei schreiben schlug fehl</translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>The current Project contains unsaved data
+Save Current Project?</source>
+        <translation>Das aktuelle Projekt enthält ungesicherte Daten
+Aktuelles Projekt sichern?</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+1257"/>
+        <source>S&amp;kip</source>
+        <translation>&amp;Ãœberspringen</translation>
+    </message>
+    <message>
+        <location line="-1257"/>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Abbrechen</translation>
+    </message>
+    <message>
+        <location line="+264"/>
+        <source>MusE: Save As</source>
+        <translation>MusE: Speichern unter</translation>
+    </message>
+    <message>
+        <location line="+72"/>
+        <location line="+160"/>
+        <source>Nothing to edit</source>
+        <translation>Es gibt nichts zu editieren</translation>
+    </message>
+    <message>
+        <location line="+494"/>
+        <location line="+10"/>
+        <location line="+31"/>
+        <location line="+34"/>
+        <location line="+8"/>
+        <source>MusE: Bounce to Track</source>
+        <translation>MusE: Auf Spur abmischen</translation>
+    </message>
+    <message>
+        <location line="-82"/>
+        <source>No wave tracks found</source>
+        <translation>Keine Wave-Tracks gefunden</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+105"/>
+        <source>No audio output tracks found</source>
+        <translation>Keine Audio-Tracks gefunden</translation>
+    </message>
+    <message>
+        <location line="-74"/>
+        <source>Select one audio output track,
+and one target wave track</source>
+        <translation>Wählen Sie eine Audio-Ausgangsspur
+und eine Ziel-Wave-Spur</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <source>Select one target wave track</source>
+        <translation>Wählen Sie eine Ziel-Wave-Spur</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Select one target wave track,
+and one audio output track</source>
+        <translation>Wählen Sie eine Ziel-Wave-Spur
+und eine Audio-Ausgangs-Spur</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <location line="+25"/>
+        <source>MusE: Bounce to File</source>
+        <translation>MusE: In Datei abmischen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Select one audio output track</source>
+        <translation>Wählen Sie eine Audio-Ausgangs-Spur</translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>MusE: Bounce</source>
+        <translation>MusE: Abmischen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>set left/right marker for bounce range</source>
+        <translation>Linken/rechten Marker für Abmischbereich einstellen</translation>
+    </message>
+    <message>
+        <location line="+83"/>
+        <source>The current Project contains unsaved data
+Load overwrites current Project:
+Save Current Project?</source>
+        <translation>Das aktuelle Projekt enthält ungesicherte Daten
+Neues Lied laden überschreibt das aktuelle Projekt:
+Aktuelles Projekt sichern?</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location filename="../../muse/importmidi.cpp" line="+85"/>
+        <source>&amp;Abort</source>
+        <translation>&amp;Abbrechen</translation>
+    </message>
+    <message>
+        <location filename="../../muse/exportmidi.cpp" line="+147"/>
+        <source>MusE: Export Midi</source>
+        <translation>MusE: Midi exportieren</translation>
+    </message>
+    <message>
+        <location filename="../../muse/help.cpp" line="+50"/>
+        <source>no help found at: </source>
+        <translation>Hilfe wurde nicht gefunden:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>MusE: Open Help</source>
+        <translation>MusE: Hilfe öffnen</translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>Unable to launch help</source>
+        <translation>Konnte Hilfe nicht starten</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>For some reason MusE has to launch the default
+browser on your machine.</source>
+        <translation>Aus irgendeinem Grund muss MusE den Standardbrowser auf Ihrem System starten.</translation>
+    </message>
+    <message>
+        <location filename="../../muse/importmidi.cpp" line="-12"/>
+        <source>MusE: Import Midi</source>
+        <translation>MusE: Midi importieren</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Add midi file to current project?
+</source>
+        <translation>Mididatei zu aktuellem Lied hinzufügen?</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Add to Project</source>
+        <translation>Zu Lied hin&amp;zufügen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Replace</source>
+        <translation>Erset&amp;zen</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>reading midifile
+  </source>
+        <translation>Lese Mididatei
+</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>
+failed: </source>
+        <translation>
+schlug fehl:</translation>
+    </message>
+    <message>
+        <location line="+357"/>
+        <source>Import part is only valid for midi and wave tracks!</source>
+        <translation>Part importieren ist nur möglich für MIDI und WAVE-Spuren!</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>MusE: load part</source>
+        <translation>MusE: Part laden</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>No track selected for import</source>
+        <translation>Keine Spur ist für den Import ausgewählt</translation>
+    </message>
+    <message numerus="yes">
+        <location line="+121"/>
+        <source>%n part(s) out of %1 could not be imported.
+Likely the selected track is the wrong type.</source>
+        <translation>
+            <numerusform>%n Part von insgesamt %1 konnte nicht eingefügt werden.
+Wahrscheinlich hat die ausgewählte Spur den falschen Typ.</numerusform>
+            <numerusform>%n Parts von insgesamt %1 konnten nicht eingefügt werden.
+Wahrscheinlich hat die ausgewählte Spur den falschen Typ.</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location line="+1"/>
+        <source>%n part(s) could not be imported.
+Likely the selected track is the wrong type.</source>
+        <translation>
+            <numerusform>%n Part konnte nicht eingefügt werden.
+Wahrscheinlich hat die ausgewählte Spur den falschen Typ.</numerusform>
+            <numerusform>%n Parts konnten nicht eingefügt werden.
+Wahrscheinlich hat die ausgewählte Spur den falschen Typ.</numerusform>
+        </translation>
+    </message>
+    <message>
+        <location filename="../../muse/wave.cpp" line="-6"/>
+        <source>to import an audio file you have first to selecta wave track</source>
+        <translation>um eine Audio-Datei zu importieren müssen Sie erst ein Wave-Spur auswählen</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Import Wavefile</source>
+        <translation>Wavedatei importieren</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>This wave file has a samplerate of %1,
+as opposed to current setting %2.
+Do you still want to import it?</source>
+        <translation>Diese Wavedatei hat eine samplerate von %1,
+im Gegensatz zur momentanen Einstellung %2.
+Möchten Sie sie dennoch importieren?</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>&amp;Yes</source>
+        <translation>&amp;Ja</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>&amp;No</source>
+        <translation>&amp;Nein</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::NoteInfo</name>
     <message>
         <location filename="../../muse/widgets/noteinfo.cpp" line="+44"/>
         <source>Note Info</source>
-        <translation type="unfinished">Noteninformation</translation>
+        <translation>Noteninformation</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Start</source>
-        <translation type="unfinished">Start</translation>
+        <translation>Start</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Len</source>
-        <translation type="unfinished">Länge</translation>
+        <translation>Länge</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Pitch</source>
-        <translation type="unfinished"></translation>
+        <translation>Tonhöhe</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Velo On</source>
-        <translation type="unfinished">Velo an</translation>
+        <translation>Velo an</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Velo Off</source>
-        <translation type="unfinished">Velo aus</translation>
+        <translation>Velo aus</translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::RoutePopupMenu</name>
+    <name>MusEGui::PartCanvas</name>
+    <message>
+        <location filename="../../muse/arranger/pcanvas.cpp" line="+355"/>
+        <source>Cannot copy/move/clone to different Track-Type</source>
+        <translation>Kopieren/verschieben/klonen auf anderen Spurtyp nicht möglich</translation>
+    </message>
+    <message>
+        <location line="+280"/>
+        <source>C&amp;ut</source>
+        <translation>&amp;Ausschneiden</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Copy</source>
+        <translation>&amp;Kopieren</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>s&amp;elect </source>
+        <translation>&amp;wähle </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>clones</source>
+        <translation>Klone</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>rename</source>
+        <translation>Umbenennen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>color</source>
+        <translation>Farbe</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>delete</source>
+        <translation>löschen</translation>
+    </message>
     <message>
-        <location filename="../../muse/widgets/routepopup.cpp" line="+223"/>
         <location line="+2"/>
-        <location line="+125"/>
+        <source>split</source>
+        <translation>Schnitt</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>glue</source>
+        <translation>Verbinder</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>de-clone</source>
+        <translation>Entklonen</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <source>save part to disk</source>
+        <translation>Speichere Part auf Festplatte</translation>
+    </message>
+    <message>
+        <location line="-2"/>
+        <source>wave edit</source>
+        <translation>Wave Editor</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>file info</source>
+        <translation>Dateiinfo</translation>
+    </message>
+    <message>
+        <location line="+88"/>
+        <source>MusE: save part</source>
+        <translation>MusE: Speichere Part</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>Part name: %1
+Files:</source>
+        <translation>Part Name: %1
+Dateien:</translation>
+    </message>
+    <message numerus="yes">
+        <location line="+2136"/>
+        <source>%n part(s) out of %1 could not be pasted.
+Likely the selected track is the wrong type.</source>
+        <translation>
+            <numerusform>%n Part von insgesamt %1 konnte nicht eingefügt werden.
+Wahrscheinlich hat die ausgewählte Spur den falschen Typ.</numerusform>
+            <numerusform>%n Parts von insgesamt %1 konnten nicht eingefügt werden.
+Wahrscheinlich hat die ausgewählte Spur den falschen Typ.</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location line="+1"/>
+        <source>%n part(s) could not be pasted.
+Likely the selected track is the wrong type.</source>
+        <translation>
+            <numerusform>%n Part konnte nicht eingefügt werden.
+Wahrscheinlich hat die ausgewählte Spur den falschen Typ.</numerusform>
+            <numerusform>%n Parts konnten nicht eingefügt werden.
+Wahrscheinlich hat die ausgewählte Spur den falschen Typ.</numerusform>
+        </translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Cannot paste: multiple tracks selected</source>
+        <translation>Einfügen nicht möglich: mehrere Spuren ausgewählt</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Cannot paste: no track selected</source>
+        <translation>Einfügen nicht möglich: keine Spur ausgewählt</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Can only paste to midi/drum track</source>
+        <translation>Einfügen möglich nur in Midi/Drum Spur </translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Can only paste to wave track</source>
+        <translation>Einfügen möglich nur in Wave Spur</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Can only paste to midi or wave track</source>
+        <translation>Einfügen möglich nur in Midi oder Wave Spur </translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Cannot paste: wrong data type</source>
+        <translation>Einfügen nicht möglich: falscher Datentyp</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::PasteDialog</name>
+    <message numerus="yes">
+        <location filename="../../muse/widgets/pastedialog.cpp" line="+81"/>
+        <source>%n quarter(s)</source>
+        <translation>
+            <numerusform>%n Viertelnote</numerusform>
+            <numerusform>%n Viertelnoten</numerusform>
+        </translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>%1 quarter</source>
+        <comment>for floating-point arguments like 1.5</comment>
+        <translation>%1 Viertelnote</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>%1 quarters</source>
+        <comment>for floating-point arguments like 1.5</comment>
+        <translation>%1 Viertelnoten</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::PasteEventsDialog</name>
+    <message numerus="yes">
+        <location filename="../../muse/widgets/pasteeventsdialog.cpp" line="+95"/>
+        <source>%n quarter(s)</source>
+        <translation>
+            <numerusform>%n Viertelnote</numerusform>
+            <numerusform>%n Viertelnoten</numerusform>
+        </translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>%1 quarter</source>
+        <comment>for floating-point arguments like 1.5</comment>
+        <translation>%1 Viertelnote</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>%1 quarters</source>
+        <comment>for floating-point arguments like 1.5</comment>
+        <translation>%1 Viertelnoten</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::PianoRoll</name>
+    <message>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="+100"/>
+        <source>&amp;Edit</source>
+        <translation>&amp;Bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>C&amp;ut</source>
+        <translation>&amp;Ausschneiden</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Copy</source>
+        <translation>&amp;Kopieren</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Copy events in range</source>
+        <translation>Kopiere Events im Bereich</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Paste</source>
+        <translation>&amp;Einfügen</translation>
+    </message>
+    <message>
+        <source>&amp;Paste (with dialog)</source>
+        <translation type="obsolete">Einfügen (Dialog zeigen)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Paste (with dialog)</source>
+        <translation>Einfügen (Dialog zeigen)</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Delete &amp;Events</source>
+        <translation>&amp;Events löschen</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>&amp;Select</source>
+        <translation>&amp;Auswählen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select &amp;All</source>
+        <translation>Alles a&amp;uswählen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Deselect All</source>
+        <translation>Alles ab&amp;wählen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Invert &amp;Selection</source>
+        <translation>Auswa&amp;hl umkehren</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>&amp;Inside Loop</source>
+        <translation>Bereich &amp;innerhalb der Schleife</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Outside Loop</source>
+        <translation>Bereich außerhalb der Schlei&amp;fe</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&amp;Previous Part</source>
+        <translation>Vorheriger &amp;Part</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Next Part</source>
+        <translation>&amp;Nächster Part</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Fu&amp;nctions</source>
+        <translation>&amp;Funktionen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Quantize</source>
+        <translation>Quantisieren</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Modify Note Length</source>
+        <translation>Notenlänge verändern</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Modify Velocity</source>
+        <translation>Anschlagsdynamik ändern</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Crescendo/Decrescendo</source>
+        <translation>Crescendo/Decrescendo</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Transpose</source>
+        <translation>Transponieren</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Erase Events</source>
+        <translation>Events löschen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Move Notes</source>
+        <translation>Noten verschieben</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Set Fixed Length</source>
+        <translation>Länge festlegen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Delete Overlaps</source>
+        <translation>Ãœberlappungen entfernen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Legato</source>
+        <translation>Legato</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Plugins</source>
+        <translation>&amp;Plugins</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Window &amp;Config</source>
+        <translation>Fenster&amp;konfiguration</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Event Color</source>
+        <translation>&amp;Eventfarbe</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>&amp;Blue</source>
+        <translation>&amp;Blau</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Pitch colors</source>
+        <translation>Farme nach &amp;Tonhöhe</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Velocity colors</source>
+        <translation>Farbe nach &amp;Anschlagsdynamik</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Pianoroll tools</source>
+        <translation>Werkzeug &quot;Pianorollen Editor&quot;</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Step Record</source>
+        <translation>Aufnahme taktschlagweise</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Midi Input</source>
+        <translation>Midi Eingang</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Play Events</source>
+        <translation>Ereignisse abspielen</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>panic</source>
+        <translation>Panik</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>transport</source>
+        <translation>Transport</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>ctrl</source>
+        <translation>Ctrl</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Add Controller View</source>
+        <translation>Controlleransicht hinzufügen</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::PluginDialog</name>
+    <message>
+        <location filename="../../muse/plugin.cpp" line="+3147"/>
+        <source>MusE: select plugin</source>
+        <translation>MusE: PlugIn wählen</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Lib</source>
+        <translation>Lib</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Label</source>
+        <translation>Beschriftung</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Name</source>
+        <translation>Name</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>AI</source>
+        <translation>Al</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>AO</source>
+        <translation>AO</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>CI</source>
+        <translation>Cl</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>CO</source>
+        <translation>CO</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>IP</source>
+        <translation>IP</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>id</source>
+        <translation>id</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Maker</source>
+        <translation>Erzeuger</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copyright</source>
+        <translation>Copyright</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Ok</source>
+        <translation>Bestätigen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cancel</source>
+        <translation>Abbrechen</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Mono and Stereo</source>
+        <translation>Mono und Stereo</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Stereo</source>
+        <translation>Stereo</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Mono</source>
+        <translation>Mono</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Show All</source>
+        <translation>Zeige alle</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Select which types of plugins should be visible in the list.&lt;br&gt;Note that using mono plugins on stereo tracks is not a problem, two will be used in parallell.&lt;br&gt;Also beware that the &apos;all&apos; alternative includes plugins that probably not are usable by MusE.</source>
+        <translation>Wählen Sie aus, welche Plugintypen in der Liste sichtbar sein sollen.&lt;br&gt;Das Benutzen von Mono-Plugins auf Stereospuren ist kein Problem, zwei werden parallel benutzt werden.&lt;br&gt;Beachten Sie, dass die &quot;alle&quot;-Alternative Plugings enthält, die wahrscheinlich nicht von MusE benutzt werden können.</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Search in &apos;Label&apos; and &apos;Name&apos;:</source>
+        <translation>Suche in &quot;Beschriftung&quot; und &quot;Name&quot;:</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::PluginGui</name>
+    <message>
+        <location line="+208"/>
+        <source>File Buttons</source>
+        <translation>Datei-Knöpfe</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Load Preset</source>
+        <translation>Vorlage laden</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Save Preset</source>
+        <translation>Speicher Preset</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location line="+3"/>
+        <source>bypass plugin</source>
+        <translation>Signalfluss PlugIn überspringen</translation>
+    </message>
+    <message>
+        <location line="+554"/>
+        <source>MusE: load preset</source>
+        <translation>MusE: Vorlage laden</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Error reading preset. Might not be right type for this plugin</source>
+        <translation>Fehler beim Lesen der Vorlage. Könnte der falsche Typ für dieses Plugin sein</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>MusE: save preset</source>
+        <translation>MusE: Vorlage sichern</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::ProjectCreateImpl</name>
+    <message>
+        <location filename="../../muse/widgets/projectcreateimpl.cpp" line="+83"/>
+        <source>Select directory</source>
+        <translation>Verzeichnis auswählen</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::RoutePopupMenu</name>
+    <message>
+        <location filename="../../muse/widgets/routepopup.cpp" line="+230"/>
+        <location line="+2"/>
+        <location line="+132"/>
         <location line="+78"/>
         <location line="+57"/>
-        <location line="+53"/>
-        <location line="+682"/>
+        <location line="+60"/>
+        <location line="+685"/>
         <location line="+85"/>
         <source>Channel</source>
-        <translation type="unfinished">Kanal</translation>
+        <translation>Kanal</translation>
     </message>
     <message>
-        <location line="-274"/>
-        <location line="+224"/>
+        <location line="-270"/>
+        <location line="+220"/>
         <location line="+85"/>
         <source>Soloing chain</source>
-        <translation type="unfinished"></translation>
+        <translation>Solo-Kette</translation>
     </message>
     <message>
-        <location line="-307"/>
-        <location line="+224"/>
+        <location line="-303"/>
+        <location line="+220"/>
         <source>Audio returns</source>
-        <translation type="unfinished"></translation>
+        <translation>Audio-Rückkanäle</translation>
     </message>
     <message>
-        <location line="-185"/>
-        <source>Warning: No midi input devices!</source>
-        <translation type="unfinished"></translation>
+        <location line="-182"/>
+        <source>Warning: No input devices!</source>
+        <translation>Warnung: Keine Eingangsgeräte!</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Open midi config...</source>
-        <translation type="unfinished"></translation>
+        <translation>Öffne MIDI-Konfig...</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+42"/>
         <location line="+33"/>
         <source>&lt;none&gt;</source>
-        <translation type="unfinished">&lt;kein&gt;</translation>
+        <translation>&lt;kein&gt;</translation>
     </message>
     <message>
         <location line="-19"/>
         <source>Toggle all</source>
-        <translation type="unfinished"></translation>
+        <translation>Alles umwählen</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>More...</source>
-        <translation type="unfinished"></translation>
+        <translation>Mehr...</translation>
     </message>
     <message>
         <location line="+195"/>
         <source>Audio sends</source>
-        <translation type="unfinished"></translation>
+        <translation>Audio-Sender</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Midi port sends</source>
-        <translation type="unfinished"></translation>
+        <translation>Midiport-Sender</translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::ScrollScale</name>
+    <name>MusEGui::ScoreCanvas</name>
+    <message>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="+1313"/>
+        <source>Treble</source>
+        <translation>Violinschlüssel</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Bass</source>
+        <translation>Bassschlüssel</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Grand Staff</source>
+        <translation>Beide Schlüssel</translation>
+    </message>
     <message>
-        <location filename="../../muse/widgets/scrollscale.cpp" line="+316"/>
+        <location line="+3"/>
+        <source>Remove staff</source>
+        <translation>Notenzeile entfernen</translation>
+    </message>
+    <message>
+        <location line="+2471"/>
+        <source>Ambiguous part</source>
+        <translation>Unklarer Part</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There are two or more possible parts you could add the note to, but none matches the selected part. Please select the destination part by clicking on any note belonging to it and try again, or add a new stave containing only the destination part.</source>
+        <translation>Es gibt zwei oder mehr mögliche Parts, zu denen man die Note hinzufügen könnte, aber keiner ist der ausgewählte. Bitte wählen Sie den Ziel-Part aus, indem Sie auf eine beliebige Note, die zu ihm gehört, klicken, und versuchen Sie es erneut, oder fügen Sie eine neue Notenzeile hinzu, die nur den Zielpart enthält.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>No part</source>
+        <translation>Kein Part</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There are no parts you could add the note to.</source>
+        <translation>Es gibt keine Parts, zu denen man die Note hinzufügen könnte.</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::ScoreEdit</name>
+    <message>
+        <location line="-3557"/>
+        <source>Undo/Redo tools</source>
+        <translation>Rückgängig/Wiederholen-Werkzeuge</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Step recording tools</source>
+        <translation>&quot;Taktschlagweise Aufnahme&quot;-Werkzeuge</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Step Record</source>
+        <translation>Aufnahme taktschlagweise</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>panic</source>
+        <translation>Panik</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>transport</source>
+        <translation>Transport</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Note settings</source>
+        <translation>Noteneinstellungen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Note length:</source>
+        <translation>Notenlänge:</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>last</source>
+        <translation>letzte</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <location line="+1"/>
+        <location line="+325"/>
+        <source>Apply to new notes:</source>
+        <translation>Für neue Noten:</translation>
+    </message>
+    <message>
+        <location line="-324"/>
+        <location line="+328"/>
+        <source>Apply to selected notes:</source>
+        <translation>Für markierte Noten:</translation>
+    </message>
+    <message>
+        <location line="-321"/>
+        <source>Velocity:</source>
+        <translation>Dynamik:</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Off-Velocity:</source>
+        <translation>Loslassdynamik:</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Quantisation settings</source>
+        <translation>Quantisierungseinstellungen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Quantisation:</source>
+        <translation>Quantisierung:</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Pixels per whole:</source>
+        <translation>Pixel pro ganze Note:</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>&amp;Edit</source>
+        <translation>&amp;Bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>C&amp;ut</source>
+        <translation>&amp;Ausschneiden</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Copy</source>
+        <translation>&amp;Kopieren</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Copy events in range</source>
+        <translation>Kopiere Events im Bereich</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Paste</source>
+        <translation>&amp;Einfügen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Paste (with dialog)</source>
+        <translation>Einfügen (Dialog zeigen)</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Delete &amp;Events</source>
+        <translation>&amp;Events löschen</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>&amp;Select</source>
+        <translation>&amp;Auswählen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select &amp;All</source>
+        <translation>Alles a&amp;uswählen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Deselect All</source>
+        <translation>Alles ab&amp;wählen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Invert &amp;Selection</source>
+        <translation>Auswa&amp;hl umkehren</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>&amp;Inside Loop</source>
+        <translation>Bereich &amp;innerhalb der Schleife</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Outside Loop</source>
+        <translation>Bereich außerhalb der Schlei&amp;fe</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Fu&amp;nctions</source>
+        <translation>Fu&amp;nktionen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Quantize</source>
+        <translation>&amp;Quantisieren</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Change note &amp;length</source>
+        <translation>Noten&amp;länge verändern</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Change note &amp;velocity</source>
+        <translation>&amp;Anschlagsdynamik verändern</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Crescendo/Decrescendo</source>
+        <translation>Crescendo/Decrescendo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transpose</source>
+        <translation>Transponieren</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Erase Events</source>
+        <translation>Events löschen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Move Notes</source>
+        <translation>Noten verschieben</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Set Fixed Length</source>
+        <translation>Feste Notenlänge setzen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Delete Overlaps</source>
+        <translation>Ãœberlappungen entfernen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Legato</source>
+        <translation>Legato</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Window &amp;Config</source>
+        <translation>Fenster&amp;konfiguration</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Note head &amp;colors</source>
+        <translation>Notenkopf-&amp;Farben</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Black</source>
+        <translation>&amp;Schwarz</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Velocity</source>
+        <translation>Je nach &amp;Dynamik</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Part</source>
+        <translation>Je nach &amp;Part</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Set up &amp;preamble</source>
+        <translation>&amp;Preambel einstellen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Display &amp;key signature</source>
+        <translation>&amp;Vorzeichen anzeigen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Display &amp;time signature</source>
+        <translation>&amp;Takt anzeigen</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Set Score &amp;name</source>
+        <translation>Partitur&amp;name setzen</translation>
+    </message>
+    <message>
+        <location line="+224"/>
+        <location line="+1"/>
+        <source>Enter the new score title</source>
+        <translation>Geben Sie den neuen Titel ein</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Error</source>
+        <translation>Fehler</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Changing score title failed:
+the selected title is not unique</source>
+        <translation>Das Ändern des Titels ist fehl-
+geschlagen: Der eingegebene
+Titel ist nicht einzigartig</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::ScrollScale</name>
+    <message>
+        <location filename="../../muse/widgets/scrollscale.cpp" line="+318"/>
         <source>next page</source>
-        <translation type="unfinished">Nächste Seite</translation>
+        <translation>Nächste Seite</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>previous page</source>
-        <translation type="unfinished">Vorherige Seite</translation>
+        <translation>Vorherige Seite</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>current page number</source>
-        <translation type="unfinished">Aktuelle Seitennummer</translation>
+        <translation>Aktuelle Seitennummer</translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::ShortcutCaptureDialog</name>
+    <name>MusEGui::ShortcutCaptureDialog</name>
     <message>
         <location filename="../../muse/widgets/shortcutcapturedialog.cpp" line="+55"/>
         <source>Ok</source>
-        <translation type="unfinished">Bestätigen</translation>
+        <translation>Bestätigen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Cancel</source>
-        <translation type="unfinished">Abbrechen</translation>
+        <translation>Abbrechen</translation>
     </message>
     <message>
         <location line="+52"/>
-        <source>Shortcut conflicts with </source>
-        <translation type="unfinished"></translation>
+        <source>Shortcut conflicts with %1</source>
+        <translation>Tastenkürzel überschneidet sich mit %1</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Undefined</source>
-        <translation type="unfinished">unbestimmt</translation>
+        <translation>Unbestimmt</translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::SigScale</name>
+    <name>MusEGui::SigScale</name>
     <message>
         <location filename="../../muse/widgets/sigscale.cpp" line="+44"/>
         <source>signature scale</source>
-        <translation type="unfinished">Skala Taktmaß</translation>
+        <translation>Taktmaß-Skala</translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::Toolbar1</name>
+    <name>MusEGui::Strip</name>
     <message>
-        <location filename="../../muse/widgets/tb1.cpp" line="+21"/>
+        <location filename="../../muse/mixer/strip.cpp" line="+314"/>
+        <source>Remove track?</source>
+        <translation>Spur entfernen?</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::TList</name>
+    <message>
+        <location filename="../../muse/arranger/tlist.cpp" line="+374"/>
+        <source>&lt;none&gt;</source>
+        <translation>&lt;kein&gt;</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>visible</source>
+        <translation>sichtbar</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>no clef</source>
+        <translation>kein Notenschlüssel</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Treble</source>
+        <translation>Violinschlüssel</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Bass</source>
+        <translation>Bassschlüssel</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Grand</source>
+        <translation>Beide Schlüssel</translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>MusE: bad trackname</source>
+        <translation>MusE: ungeeigneter Spurname</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>please choose a unique track name</source>
+        <translation>Bitte eindeutigen Spurnamen wählen</translation>
+    </message>
+    <message>
+        <location line="+310"/>
+        <location line="+1161"/>
+        <source>Update drummap?</source>
+        <translation>Drumbelegung aktualisieren?</translation>
+    </message>
+    <message>
+        <location line="-1160"/>
+        <source>Do you want to use same port for all instruments in the drummap?</source>
+        <translation>Möchten Sie für alle Instrumente der Drumbelegung den selben Anschluss verwenden?</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+1161"/>
+        <source>&amp;Yes</source>
+        <translation>&amp;Ja</translation>
+    </message>
+    <message>
+        <location line="-1161"/>
+        <location line="+1161"/>
+        <source>&amp;No</source>
+        <translation>&amp;Nein</translation>
+    </message>
+    <message>
+        <location line="-1086"/>
+        <location line="+55"/>
+        <source>show gui</source>
+        <translation>GUI anzeigen</translation>
+    </message>
+    <message>
+        <location line="-46"/>
+        <location line="+55"/>
+        <source>show native gui</source>
+        <translation>Native GUI anzeigen</translation>
+    </message>
+    <message>
+        <location line="+347"/>
+        <source>Treble clef</source>
+        <translation>Violinschlüssel</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bass clef</source>
+        <translation>Bassschlüssel</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Grand Staff</source>
+        <translation>Beide Schlüssel</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Viewable automation</source>
+        <translation>Sichtbare Automatisierung</translation>
+    </message>
+    <message>
+        <location line="+137"/>
+        <source>Delete Track</source>
+        <translation>Spur löschen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Track Comment</source>
+        <translation>Spur Kommentar</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Insert Track</source>
+        <translation>Spur einfügen</translation>
+    </message>
+    <message>
+        <location line="+450"/>
+        <source>Midi</source>
+        <translation>Midi</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Drum</source>
+        <translation>Schlagzeug</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Do you want to use same port and channel for all instruments in the drummap?</source>
+        <translation>Möchten Sie für alle Instrumente der Drumbelegung den selben Anschluss und Kanal verwenden?</translation>
+    </message>
+    <message>
+        <location line="-1250"/>
+        <source>Unused Devices</source>
+        <translation>Ungenutzte Geräte</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::TempoSig</name>
+    <message>
+        <location filename="../../muse/transport.cpp" line="+149"/>
+        <source>Tempo/Sig</source>
+        <translation>Tempo/Taktmaß</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::Toolbar1</name>
+    <message>
+        <location filename="../../muse/widgets/tb1.cpp" line="+47"/>
+        <location line="+1"/>
+        <location line="+1"/>
+        <source>Off</source>
+        <translation>Aus</translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>Solo</source>
-        <translation type="unfinished">Solo</translation>
+        <translation>Solo</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Cursor</source>
-        <translation type="unfinished"></translation>
+        <translation>Cursor</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Snap</source>
-        <translation type="unfinished">Magnet</translation>
+        <translation>Magnet</translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::TrackComment</name>
+    <name>MusEGui::TopWin</name>
+    <message>
+        <location filename="../../muse/cobject.cpp" line="+64"/>
+        <source>As subwindow</source>
+        <translation>Als Unterfenster</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Shares tools and menu</source>
+        <translation>Teilt sich Toolbar und Menü</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Fullscreen</source>
+        <translation>Vollbild</translation>
+    </message>
+    <message>
+        <location line="+468"/>
+        <source>Piano roll</source>
+        <translation>Pianoroll</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>List editor</source>
+        <translation>Listeneditor</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Drum editor</source>
+        <translation>Schlagzeugeditor</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Master track editor</source>
+        <translation>Masterspur-Editor</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Master track list editor</source>
+        <translation>Masterspur-Listeneditor</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Wave editor</source>
+        <translation>Wave-Editor</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Clip list</source>
+        <translation>Cliplist</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Marker view</source>
+        <translation>Marker-Fenster</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Score editor</source>
+        <translation>Partitureditor</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Arranger</source>
+        <translation>Arrangierer</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&lt;unknown toplevel type&gt;</source>
+        <translation>&lt;unbekannter Fenstertyp&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::TrackComment</name>
     <message>
         <location filename="../../muse/widgets/comment.cpp" line="+58"/>
         <source>MusE: Track Comment</source>
-        <translation type="unfinished">MusE: Spur Kommentar</translation>
+        <translation>MusE: Spur-Kommentar</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Track Comment:</source>
-        <translation type="unfinished">Spur Kommentar:</translation>
+        <translation>Spur-Kommentar:</translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::VisibleTracks</name>
+    <name>MusEGui::Transport</name>
+    <message>
+        <location filename="../../muse/transport.cpp" line="+105"/>
+        <source>Overdub</source>
+        <translation>Ãœberschreiben</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+15"/>
+        <source>Replace</source>
+        <translation>Ersetzen</translation>
+    </message>
+    <message>
+        <location line="-10"/>
+        <source>Rec Mode</source>
+        <translation>Modus &quot;Aufnahme&quot;</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Normal</source>
+        <translation>Normal</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mix</source>
+        <translation>Mischen</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Cycle Rec</source>
+        <translation>Aufnahme in Schleife</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>punchin</source>
+        <translation>Aufnahme am linken Marker beginnen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>loop</source>
+        <translation>Schleife</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>punchout</source>
+        <translation>Aufnahme am rechten Marker beenden</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+3"/>
+        <source>Punch In</source>
+        <translation>Aufnahme am linken Marker beginnen</translation>
+    </message>
+    <message>
+        <location line="-2"/>
+        <location line="+3"/>
+        <source>Loop</source>
+        <translation>Schleife</translation>
+    </message>
+    <message>
+        <location line="-2"/>
+        <location line="+3"/>
+        <source>Punch Out</source>
+        <translation>Aufnahme am rechten Marker beenden</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Left Mark</source>
+        <translation>Linker Marker</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Right Mark</source>
+        <translation>Rechter Marker</translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>rewind to start</source>
+        <translation>Zum Start zurück</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Click this button to rewind to start position</source>
+        <translation>Klicken Sie auf diese Schaltfläche, um zur Startposition zurückzukehren</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>rewind</source>
+        <translation>Einen Taktschlag rückwärts</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Click this button to rewind</source>
+        <translation>Klicken Sie auf diese Schaltfläche, um einen Taktschlag rückwärts zu springen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>forward</source>
+        <translation>Einen Taktschlag vorwärts</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Click this button to forward current play position</source>
+        <translation>Klicken Sie auf diese Schaltfläche, um einen Taktschlag vorwärts zu springen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>stop</source>
+        <translation>Stopp</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Click this button to stop playback</source>
+        <translation>Klicken Sie auf diese Schaltfläche, um die Wiedergabe zu stoppen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>play</source>
+        <translation>Wiedergabe</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Click this button to start playback</source>
+        <translation>Klicken Sie auf diese Schaltfläche, um die Wiedergabe zu starten</translation>
+    </message>
     <message>
-        <location filename="../../muse/widgets/visibletracks.cpp" line="+9"/>
+        <location line="+2"/>
+        <source>record</source>
+        <translation>Aufnahme</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Click this button to enable recording</source>
+        <translation>Klicken Sie auf diese Schaltfläche, um in den Modus &quot;Aufnahme&quot; zu gelangen</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>AC</source>
+        <translation>AC</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>quantize during record</source>
+        <translation>Während Aufnahme quantisieren</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Click</source>
+        <translation>Klick</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>metronom click on/off</source>
+        <translation>Metronom Klick an/aus</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Sync</source>
+        <translation>Sync</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>external sync on/off</source>
+        <translation>Externer Sync an/aus</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Jack</source>
+        <translation>Jack</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Jack transport sync on/off</source>
+        <translation>Jack-Transport-Synchronisation an/aus</translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Master</source>
+        <translation>Master</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>use master track</source>
+        <translation>Masterspur einschalten</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::VisibleTracks</name>
+    <message>
+        <location filename="../../muse/widgets/visibletracks.cpp" line="+36"/>
+        <location line="+9"/>
+        <source>Show wave tracks</source>
+        <translation>Zeige Wave-Spuren</translation>
+    </message>
+    <message>
+        <location line="-8"/>
+        <location line="+9"/>
+        <source>Show group tracks</source>
+        <translation>Zeige Gruppen-Spuren</translation>
+    </message>
+    <message>
+        <location line="-8"/>
+        <location line="+9"/>
+        <source>Show aux tracks</source>
+        <translation>Zeige Aux-Spuren</translation>
+    </message>
+    <message>
+        <location line="-8"/>
+        <location line="+9"/>
+        <source>Show input tracks</source>
+        <translation>Zeige Eingangs-Spuren</translation>
+    </message>
+    <message>
+        <location line="-8"/>
+        <location line="+9"/>
+        <source>Show output tracks</source>
+        <translation>Zeige Ausgangs-Spuren</translation>
+    </message>
+    <message>
+        <location line="-8"/>
+        <location line="+9"/>
+        <source>Show midi tracks</source>
+        <translation>Zeige Midi-Spuren</translation>
+    </message>
+    <message>
+        <location line="-8"/>
+        <location line="+9"/>
+        <source>Show synth tracks</source>
+        <translation>Zeige Synth-Spuren</translation>
+    </message>
+    <message>
+        <location line="+9"/>
         <source>Visible track types</source>
         <translation>Sichtbare Spurtypen</translation>
     </message>
 </context>
 <context>
+    <name>MusEGui::WaveEdit</name>
+    <message>
+        <location filename="../../muse/waveedit/waveedit.cpp" line="+91"/>
+        <source>&amp;Edit</source>
+        <translation>&amp;Bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Func&amp;tions</source>
+        <translation>&amp;Funktionen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Gain</source>
+        <translation>&amp;Verstärkung</translation>
+    </message>
+    <message>
+        <source>200%</source>
+        <translation type="obsolete">200%</translation>
+    </message>
+    <message>
+        <source>150%</source>
+        <translation type="obsolete">150%</translation>
+    </message>
+    <message>
+        <source>75%</source>
+        <translation type="obsolete">75%</translation>
+    </message>
+    <message>
+        <source>50%</source>
+        <translation type="obsolete">50%</translation>
+    </message>
+    <message>
+        <source>25%</source>
+        <translation type="obsolete">25%</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Other</source>
+        <translation>Andere</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>&amp;Copy</source>
+        <translation>&amp;Kopieren</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>C&amp;ut</source>
+        <translation>&amp;Ausschneiden</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Paste</source>
+        <translation>&amp;Einfügen</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Edit in E&amp;xternal Editor</source>
+        <translation>In e&amp;xternem Editor bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Mute Selection</source>
+        <translation>Auswahl stummschalten</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Normalize Selection</source>
+        <translation>Auswahl normalisieren</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Fade In Selection</source>
+        <translation>Auswahl einblenden</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Fade Out Selection</source>
+        <translation>Auswahl ausblenden</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Reverse Selection</source>
+        <translation>Auswahl umkehren</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select</source>
+        <translation>Auswählen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select &amp;All</source>
+        <translation>Alles a&amp;uswählen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Deselect All</source>
+        <translation>Alles ab&amp;wählen</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Window &amp;Config</source>
+        <translation>Fenster&amp;konfiguration</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Wave edit tools</source>
+        <translation>Werkzeuge &quot;Wave-Edit&quot;</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>transport</source>
+        <translation>Transport</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>WaveEdit tools</source>
+        <translation>Werkzeuge &quot;Wave-Edit&quot;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Solo</source>
+        <translation>Solo</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Cursor</source>
+        <translation>Cursor</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::WaveView</name>
+    <message>
+        <location filename="../../muse/waveedit/waveview.cpp" line="+996"/>
+        <source>MusE - external editor failed</source>
+        <translation>MusE - externer Editor fehlgeschlagen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>MusE was unable to launch the external editor
+check if the editor setting in:
+Global Settings-&gt;Audio:External Waveditor
+is set to a valid editor.</source>
+        <translation>MusE konnte den externen Editor nicht starten.
+Überprüfen Sie, ob die Editor-Einstellung in:
+Globale Einstellungen -&gt; Audio:Externer Waveeditor
+stimmt.</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>MusE - file size changed</source>
+        <translation>MusE - Dateigröße geändert</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>When editing in external editor - you should not change the filesize
+since it must fit the selected region.
+
+Missing data is muted</source>
+        <translation>Wenn Sie im externen Editor editieren, sollten Sie die Dateigröße
+nicht verändern, weil die es in den ausgewählten Bereich passen muss.
+
+Fehlende Daten werden stummgeschaltet</translation>
+    </message>
+</context>
+<context>
+    <name>MusEMixer::AudioMixerApp</name>
+    <message>
+        <source>&amp;Create</source>
+        <translation type="obsolete">&amp;Erzeugen</translation>
+    </message>
+    <message>
+        <source>&amp;View</source>
+        <translation type="obsolete">&amp;Zeigen</translation>
+    </message>
+    <message>
+        <source>Routing</source>
+        <translation type="obsolete">Signalfluss</translation>
+    </message>
+    <message>
+        <source>Show Midi Tracks</source>
+        <translation type="obsolete">Zeige Midi-Spuren</translation>
+    </message>
+    <message>
+        <source>Show Drum Tracks</source>
+        <translation type="obsolete">Zeige Schlagzeug-Spuren</translation>
+    </message>
+    <message>
+        <source>Show Wave Tracks</source>
+        <translation type="obsolete">Zeige Wave-Spuren</translation>
+    </message>
+    <message>
+        <source>Show Inputs</source>
+        <translation type="obsolete">Zeige Eingänge</translation>
+    </message>
+    <message>
+        <source>Show Outputs</source>
+        <translation type="obsolete">Zeige Ausgänge</translation>
+    </message>
+    <message>
+        <source>Show Groups</source>
+        <translation type="obsolete">Zeige Gruppen</translation>
+    </message>
+    <message>
+        <source>Show Auxs</source>
+        <translation type="obsolete">Zeige Aux</translation>
+    </message>
+    <message>
+        <source>Show Synthesizers</source>
+        <translation type="obsolete">Zeige Synthesizer</translation>
+    </message>
+</context>
+<context>
+    <name>MusEMixer::AudioStrip</name>
+    <message>
+        <source>panorama</source>
+        <translation type="obsolete">Panorama</translation>
+    </message>
+    <message>
+        <source>aux send level</source>
+        <translation type="obsolete">Aux Send Pegel</translation>
+    </message>
+    <message>
+        <source>Pan</source>
+        <translation type="obsolete">Pan</translation>
+    </message>
+    <message>
+        <source>1/2 channel</source>
+        <translation type="obsolete">1/2 Kanäle</translation>
+    </message>
+    <message>
+        <source>Pre</source>
+        <translation type="obsolete">Pre</translation>
+    </message>
+    <message>
+        <source>pre fader - post fader</source>
+        <translation type="obsolete">Vor Regler - nach Regler</translation>
+    </message>
+    <message>
+        <source>dB</source>
+        <translation type="obsolete">dB</translation>
+    </message>
+    <message>
+        <source>record</source>
+        <translation type="obsolete">Aufnahme</translation>
+    </message>
+    <message>
+        <source>mute</source>
+        <translation type="obsolete">stumm</translation>
+    </message>
+    <message>
+        <source>record downmix</source>
+        <translation type="obsolete">Abmischung aufnehmen</translation>
+    </message>
+    <message>
+        <source>solo mode</source>
+        <translation type="obsolete">Solo Modus</translation>
+    </message>
+    <message>
+        <source>off</source>
+        <translation type="obsolete">Aus</translation>
+    </message>
+    <message>
+        <source>iR</source>
+        <translation type="obsolete">iR</translation>
+    </message>
+    <message>
+        <source>input routing</source>
+        <translation type="obsolete">Eingangs-Signalfluss</translation>
+    </message>
+    <message>
+        <source>oR</source>
+        <translation type="obsolete">oR</translation>
+    </message>
+    <message>
+        <source>output routing</source>
+        <translation type="obsolete">Ausgangs-Signalfluss</translation>
+    </message>
+    <message>
+        <source>Off</source>
+        <translation type="obsolete">Aus</translation>
+    </message>
+    <message>
+        <source>Read</source>
+        <translation type="obsolete">Lesen</translation>
+    </message>
+    <message>
+        <source>Touch</source>
+        <translation type="obsolete">Berühren</translation>
+    </message>
+    <message>
+        <source>Write</source>
+        <translation type="obsolete">Schreiben</translation>
+    </message>
+    <message>
+        <source>automation type</source>
+        <translation type="obsolete">Automatisationstyp</translation>
+    </message>
+</context>
+<context>
+    <name>MusEMixer::EffectRack</name>
+    <message>
+        <source>effect rack</source>
+        <translation type="obsolete">Effekteinschub</translation>
+    </message>
+    <message>
+        <source>new</source>
+        <translation type="obsolete">neu</translation>
+    </message>
+    <message>
+        <source>change</source>
+        <translation type="obsolete">ändern</translation>
+    </message>
+    <message>
+        <source>move up</source>
+        <translation type="obsolete">Nach oben bewegen</translation>
+    </message>
+    <message>
+        <source>move down</source>
+        <translation type="obsolete">Nach unten bewegen</translation>
+    </message>
+    <message>
+        <source>remove</source>
+        <translation type="obsolete">entfernen</translation>
+    </message>
+    <message>
+        <source>bypass</source>
+        <translation type="obsolete">übergehen</translation>
+    </message>
+    <message>
+        <source>show gui</source>
+        <translation type="obsolete">GUI anzeigen</translation>
+    </message>
+    <message>
+        <source>show native gui</source>
+        <translation type="obsolete">Native GUI anzeigen</translation>
+    </message>
+    <message>
+        <source>save preset</source>
+        <translation type="obsolete">Preset speichern</translation>
+    </message>
+    <message>
+        <source>MusE: Save Preset</source>
+        <translation type="obsolete">MusE: Preset speichern</translation>
+    </message>
+    <message>
+        <source>Replace effect</source>
+        <translation type="obsolete">Effekt ersetzen</translation>
+    </message>
+    <message>
+        <source>Do you really want to replace the effect %1?</source>
+        <translation type="obsolete">Möchten Sie wirklich den Effekt %1 ersetzen?</translation>
+    </message>
+</context>
+<context>
+    <name>MusEMixer::MidiStrip</name>
+    <message>
+        <source>VariationSend</source>
+        <translation type="obsolete">VariationSend</translation>
+    </message>
+    <message>
+        <source>Var</source>
+        <translation type="obsolete">Var</translation>
+    </message>
+    <message>
+        <source>ReverbSend</source>
+        <translation type="obsolete">ReverbSend</translation>
+    </message>
+    <message>
+        <source>Rev</source>
+        <translation type="obsolete">Rev</translation>
+    </message>
+    <message>
+        <source>ChorusSend</source>
+        <translation type="obsolete">ChorusSend</translation>
+    </message>
+    <message>
+        <source>Cho</source>
+        <translation type="obsolete">Cho</translation>
+    </message>
+    <message>
+        <source>dB</source>
+        <translation type="obsolete">dB</translation>
+    </message>
+    <message>
+        <source>Pan/Balance</source>
+        <translation type="obsolete">Pan/Balance</translation>
+    </message>
+    <message>
+        <source>record</source>
+        <translation type="obsolete">Aufnahme</translation>
+    </message>
+    <message>
+        <source>mute</source>
+        <translation type="obsolete">still</translation>
+    </message>
+    <message>
+        <source>solo mode</source>
+        <translation type="obsolete">Solo Modus</translation>
+    </message>
+    <message>
+        <source>iR</source>
+        <translation type="obsolete">iR</translation>
+    </message>
+    <message>
+        <source>input routing</source>
+        <translation type="obsolete">Eingangs-Signalfluss</translation>
+    </message>
+    <message>
+        <source>oR</source>
+        <translation type="obsolete">oR</translation>
+    </message>
+    <message>
+        <source>output routing</source>
+        <translation type="obsolete">Ausgangs-Signalfluss</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::BigTime</name>
+    <message>
+        <source>minute</source>
+        <translation type="obsolete">Minute</translation>
+    </message>
+    <message>
+        <source>second</source>
+        <translation type="obsolete">Sekunde</translation>
+    </message>
+    <message>
+        <source>frame</source>
+        <translation type="obsolete">Rahmen</translation>
+    </message>
+    <message>
+        <source>subframe</source>
+        <translation type="obsolete">Subrahmen</translation>
+    </message>
+    <message>
+        <source>MusE: Bigtime</source>
+        <translation type="obsolete">MusE: Zeitanzeige groß</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::EditToolBar</name>
+    <message>
+        <source>Edit Tools</source>
+        <translation type="obsolete">Werkzeuge bearbeiten</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::MidiSyncConfig</name>
+    <message>
+        <source>Port Number</source>
+        <translation type="obsolete">Anschlussnummer</translation>
+    </message>
+    <message>
+        <source>Name of the midi device associated with this port number</source>
+        <translation type="obsolete">Name des Midi Gerätes an dieser Anschlussnummer</translation>
+    </message>
+    <message>
+        <source>Device Name</source>
+        <translation type="obsolete">Gerätename</translation>
+    </message>
+    <message>
+        <source>m</source>
+        <translation type="obsolete">min</translation>
+    </message>
+    <message>
+        <source>MusE</source>
+        <translation type="obsolete">MusE</translation>
+    </message>
+    <message>
+        <source>&amp;Apply</source>
+        <translation type="obsolete">&amp;Anwenden</translation>
+    </message>
+    <message>
+        <source>&amp;No</source>
+        <translation type="obsolete">&amp;Nein</translation>
+    </message>
+    <message>
+        <source>&amp;Abort</source>
+        <translation type="obsolete">&amp;Abbrechen</translation>
+    </message>
+    <message>
+        <source>&lt;none&gt;</source>
+        <translation type="obsolete">&lt;kein&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::MixdownFileDialog</name>
+    <message>
+        <source>Wave Files (*.wav);;All Files (*)</source>
+        <translation type="obsolete">Wave Dateien (*.wav);;Alle Dateien (*)</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::NoteInfo</name>
+    <message>
+        <source>Note Info</source>
+        <translation type="obsolete">Noteninformation</translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="obsolete">Start</translation>
+    </message>
+    <message>
+        <source>Len</source>
+        <translation type="obsolete">Länge</translation>
+    </message>
+    <message>
+        <source>Velo On</source>
+        <translation type="obsolete">Velo an</translation>
+    </message>
+    <message>
+        <source>Velo Off</source>
+        <translation type="obsolete">Velo aus</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::RoutePopupMenu</name>
+    <message>
+        <source>Channel</source>
+        <translation type="obsolete">Kanal</translation>
+    </message>
+    <message>
+        <source>&lt;none&gt;</source>
+        <translation type="obsolete">&lt;kein&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::ScrollScale</name>
+    <message>
+        <source>next page</source>
+        <translation type="obsolete">Nächste Seite</translation>
+    </message>
+    <message>
+        <source>previous page</source>
+        <translation type="obsolete">Vorherige Seite</translation>
+    </message>
+    <message>
+        <source>current page number</source>
+        <translation type="obsolete">Aktuelle Seitennummer</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::ShortcutCaptureDialog</name>
+    <message>
+        <source>Ok</source>
+        <translation type="obsolete">Bestätigen</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="obsolete">Abbrechen</translation>
+    </message>
+    <message>
+        <source>Undefined</source>
+        <translation type="obsolete">unbestimmt</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::SigScale</name>
+    <message>
+        <source>signature scale</source>
+        <translation type="obsolete">Skala Taktmaß</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::Toolbar1</name>
+    <message>
+        <source>Solo</source>
+        <translation type="obsolete">Solo</translation>
+    </message>
+    <message>
+        <source>Snap</source>
+        <translation type="obsolete">Magnet</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::TrackComment</name>
+    <message>
+        <source>MusE: Track Comment</source>
+        <translation type="obsolete">MusE: Spur Kommentar</translation>
+    </message>
+    <message>
+        <source>Track Comment:</source>
+        <translation type="obsolete">Spur Kommentar:</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::VisibleTracks</name>
+    <message>
+        <source>Visible track types</source>
+        <translation type="obsolete">Sichtbare Spurtypen</translation>
+    </message>
+</context>
+<context>
     <name>NoteInfo</name>
     <message>
         <source>Start</source>
@@ -12225,71 +16015,71 @@ Apply sync settings?</source>
     <message>
         <location filename="../../synti/organ/organguibase.ui" line="+20"/>
         <source>MusE: Organ</source>
-        <translation type="unfinished"></translation>
+        <translation>MusE: Orgel</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Drawbars</source>
-        <translation type="unfinished"></translation>
+        <translation>Register</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>16&apos;</source>
-        <translation type="unfinished">16&apos;</translation>
+        <translation>16&apos;</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>4&apos;</source>
-        <translation type="unfinished">4&apos;</translation>
+        <translation>4&apos;</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>2 2/3&apos;</source>
-        <translation type="unfinished">2 2/3&apos;</translation>
+        <translation>2 2/3&apos;</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>2&apos;</source>
-        <translation type="unfinished">2&apos;</translation>
+        <translation>2&apos;</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>5 1/3&apos;</source>
-        <translation type="unfinished">5 1/3&apos;</translation>
+        <translation>5 1/3&apos;</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>8&apos;</source>
-        <translation type="unfinished">8&apos;</translation>
+        <translation>8&apos;</translation>
     </message>
     <message>
         <location line="+232"/>
         <source>Envelope Hi</source>
-        <translation type="unfinished"></translation>
+        <translation>Hüllkurve Hoch</translation>
     </message>
     <message>
         <location line="+12"/>
         <location line="+252"/>
         <source>Release</source>
-        <translation type="unfinished"></translation>
+        <translation>Release</translation>
     </message>
     <message>
         <location line="-242"/>
         <location line="+232"/>
         <source>Sustain</source>
-        <translation type="unfinished"></translation>
+        <translation>Sustain</translation>
     </message>
     <message>
         <location line="-222"/>
         <location line="+212"/>
         <source>Decay</source>
-        <translation type="unfinished"></translation>
+        <translation>Decay</translation>
     </message>
     <message>
         <location line="-196"/>
         <location line="+186"/>
         <source>Attack</source>
-        <translation type="unfinished"></translation>
+        <translation>Attack</translation>
     </message>
     <message>
         <location line="-110"/>
@@ -12299,48 +16089,48 @@ Apply sync settings?</source>
         <location line="+16"/>
         <location line="+38"/>
         <source>ms</source>
-        <translation type="unfinished"></translation>
+        <translation>ms</translation>
     </message>
     <message>
         <location line="-244"/>
         <location line="+222"/>
         <source>cB</source>
-        <translation type="unfinished"></translation>
+        <translation>cB</translation>
     </message>
     <message>
         <location line="-184"/>
         <source>Envelope Lo</source>
-        <translation type="unfinished"></translation>
+        <translation>Hüllkurve Niedrig</translation>
     </message>
     <message>
         <location line="+232"/>
         <source>O-1</source>
-        <translation type="unfinished"></translation>
+        <translation>O-1</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>Oscillator</source>
-        <translation type="unfinished"></translation>
+        <translation>Oszillator</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Brass</source>
-        <translation type="unfinished"></translation>
+        <translation>Blech</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Reed</source>
-        <translation type="unfinished"></translation>
+        <translation>Holz</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Flute</source>
-        <translation type="unfinished"></translation>
+        <translation>Flöte</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Velocity</source>
-        <translation type="unfinished">Velocity</translation>
+        <translation>Dynamik</translation>
     </message>
 </context>
 <context>
@@ -12448,72 +16238,73 @@ Apply sync settings?</source>
     <message>
         <location filename="../../muse/widgets/pastedialogbase.ui" line="+14"/>
         <source>MusE: Paste Parts</source>
-        <translation type="unfinished"></translation>
+        <translation>MusE: Parts einfügen</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Number and raster</source>
-        <translation type="unfinished"></translation>
+        <translation>Anzahl und Raster</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>insert</source>
-        <translation type="unfinished"></translation>
+        <translation>füge</translation>
     </message>
     <message>
         <location line="+7"/>
         <source> times</source>
-        <translation type="unfinished"></translation>
+        <translation> mal ein</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>raster</source>
-        <translation type="unfinished"></translation>
+        <translation>Raster</translation>
     </message>
     <message>
         <location line="+7"/>
         <source> ticks</source>
-        <translation type="unfinished"></translation>
+        <translation> Ticks</translation>
     </message>
     <message>
         <location line="+64"/>
         <source>Move, Merge, Clone</source>
-        <translation type="unfinished"></translation>
+        <translation>Verschieben, Vereinigen, Klonen</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Move everything to the right</source>
-        <translation type="unfinished"></translation>
+        <translation>Alles nach rechts verschieben</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Move only affected parts to the right</source>
-        <translation type="unfinished"></translation>
+        <translation>Nur betroffene Parts nach
+rechts verschieben</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Put everything into a single track</source>
-        <translation type="unfinished"></translation>
+        <translation>Alles in einzelne Spur einfügen</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Merge with existing parts</source>
-        <translation type="unfinished"></translation>
+        <translation>Mit existierenden Parts vereinigen</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Insert as clones (where possible)</source>
-        <translation type="unfinished"></translation>
+        <translation>Als Klone einfügen (wenn möglich)</translation>
     </message>
     <message>
         <location line="+44"/>
         <source>OK</source>
-        <translation type="unfinished">Bestätigen</translation>
+        <translation>Bestätigen</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Cancel</source>
-        <translation type="unfinished">Abbrechen</translation>
+        <translation>Abbrechen</translation>
     </message>
 </context>
 <context>
@@ -12521,69 +16312,70 @@ Apply sync settings?</source>
     <message>
         <location filename="../../muse/widgets/pasteeventsdialogbase.ui" line="+14"/>
         <source>MusE: Paste Events</source>
-        <translation type="unfinished"></translation>
+        <translation>MusE: Events einfügen</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Number and raster</source>
-        <translation type="unfinished"></translation>
+        <translation>Anzahl und Raster</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>insert</source>
-        <translation type="unfinished"></translation>
+        <translation>füge </translation>
     </message>
     <message>
         <location line="+7"/>
         <source> times</source>
-        <translation type="unfinished"></translation>
+        <translation> mal ein</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>raster</source>
-        <translation type="unfinished"></translation>
+        <translation>Raster</translation>
     </message>
     <message>
         <location line="+7"/>
         <location line="+133"/>
         <source> ticks</source>
-        <translation type="unfinished"></translation>
+        <translation> Ticks</translation>
     </message>
     <message>
         <location line="-69"/>
         <source>Paste options</source>
-        <translation type="unfinished"></translation>
+        <translation>Optionen fürs Einfügen</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Always into existing parts</source>
-        <translation type="unfinished"></translation>
+        <translation>Immer in existierende Parts</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Never into existing parts</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie in existierende Parts</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Into existing parts if part has not
 to be expanded by more than </source>
-        <translation type="unfinished"></translation>
+        <translation>In existierende Parts, wenn der Part
+erweitert werden muss um nicht mehr als</translation>
     </message>
     <message>
         <location line="+88"/>
         <source>Put everything into the (selected) part</source>
-        <translation type="unfinished"></translation>
+        <translation>Alles in den (ausgewählten) Part einfügen</translation>
     </message>
     <message>
         <location line="+44"/>
         <source>OK</source>
-        <translation type="unfinished">Bestätigen</translation>
+        <translation>Bestätigen</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Cancel</source>
-        <translation type="unfinished">Abbrechen</translation>
+        <translation>Abbrechen</translation>
     </message>
 </context>
 <context>
@@ -12603,9 +16395,8 @@ to be expanded by more than </source>
 <context>
     <name>PianoRoll</name>
     <message>
-        <location filename="../../muse/midiedit/pianoroll.cpp" line="+97"/>
         <source>&amp;Edit</source>
-        <translation>&amp;Bearbeiten</translation>
+        <translation type="obsolete">&amp;Bearbeiten</translation>
     </message>
     <message>
         <source>Cut</source>
@@ -12644,9 +16435,8 @@ to be expanded by more than </source>
         <translation type="obsolete">Auswahl außerhalb Schleife</translation>
     </message>
     <message>
-        <location line="+34"/>
         <source>&amp;Select</source>
-        <translation>&amp;Auswählen</translation>
+        <translation type="obsolete">&amp;Auswählen</translation>
     </message>
     <message>
         <source>blue</source>
@@ -12693,24 +16483,20 @@ to be expanded by more than </source>
         <translation type="obsolete">Werkzeug &quot;Pianorollen Editor&quot;</translation>
     </message>
     <message>
-        <location line="+137"/>
         <source>Step Record</source>
-        <translation>Aufnahme taktschlagweise</translation>
+        <translation type="obsolete">Aufnahme taktschlagweise</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Midi Input</source>
-        <translation>Midi Eingang</translation>
+        <translation type="obsolete">Midi Eingang</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Play Events</source>
-        <translation>Ereignisse abspielen</translation>
+        <translation type="obsolete">Ereignisse abspielen</translation>
     </message>
     <message>
-        <location line="+41"/>
         <source>Add Controller View</source>
-        <translation>Kontrolleransicht hinzufügen</translation>
+        <translation type="obsolete">Kontrolleransicht hinzufügen</translation>
     </message>
     <message>
         <source>Config Quant...</source>
@@ -12721,18 +16507,16 @@ to be expanded by more than </source>
         <translation type="obsolete">Gate Zeit ändern</translation>
     </message>
     <message>
-        <location line="-138"/>
         <source>Modify Velocity</source>
-        <translation>Velocity ändern</translation>
+        <translation type="obsolete">Velocity ändern</translation>
     </message>
     <message>
         <source>Crescendo</source>
         <translation type="obsolete">Crescendo</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Transpose</source>
-        <translation>Transponieren</translation>
+        <translation type="obsolete">Transponieren</translation>
     </message>
     <message>
         <source>Thin Out</source>
@@ -12767,237 +16551,127 @@ to be expanded by more than </source>
         <translation type="obsolete">Taktmaß erzeugen</translation>
     </message>
     <message>
-        <location line="+126"/>
         <source>ctrl</source>
-        <translation>Ktrl</translation>
+        <translation type="obsolete">Ktrl</translation>
     </message>
     <message>
-        <location line="-214"/>
         <source>C&amp;ut</source>
-        <translation type="unfinished">&amp;Ausschneiden</translation>
+        <translation type="obsolete">&amp;Ausschneiden</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Copy</source>
-        <translation type="unfinished">&amp;Kopieren</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Copy events in range</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>&amp;Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>&amp;Paste (with dialog)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Delete &amp;Events</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&amp;Kopieren</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Select &amp;All</source>
-        <translation type="unfinished">Alles a&amp;uswählen</translation>
+        <translation type="obsolete">Alles a&amp;uswählen</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Deselect All</source>
-        <translation type="unfinished">Alles ab&amp;wählen</translation>
+        <translation type="obsolete">Alles ab&amp;wählen</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Invert &amp;Selection</source>
-        <translation type="unfinished">Auswa&amp;hl umkehren</translation>
+        <translation type="obsolete">Auswa&amp;hl umkehren</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>&amp;Inside Loop</source>
-        <translation type="unfinished">Bereich &amp;innerhalb der Schleife</translation>
+        <translation type="obsolete">Bereich &amp;innerhalb der Schleife</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Outside Loop</source>
-        <translation type="unfinished">Bereich außerhalb der Schlei&amp;fe</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>&amp;Previous Part</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>&amp;Next Part</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Fu&amp;nctions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+54"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>&amp;Event Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>&amp;Blue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>&amp;Pitch colors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>&amp;Velocity colors</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Bereich außerhalb der Schlei&amp;fe</translation>
     </message>
     <message>
-        <location line="-68"/>
         <source>Quantize</source>
-        <translation type="unfinished">Quantisieren</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Modify Note Length</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Quantisieren</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Crescendo/Decrescendo</source>
-        <translation type="unfinished">Crescendo/Decrescendo</translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Erase Events</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Crescendo/Decrescendo</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Move Notes</source>
-        <translation type="unfinished">Noten verschieben</translation>
+        <translation type="obsolete">Noten verschieben</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Set Fixed Length</source>
-        <translation type="unfinished">Länge festlegen</translation>
+        <translation type="obsolete">Länge festlegen</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Delete Overlaps</source>
-        <translation type="unfinished">Ãœberlappungen entfernen</translation>
+        <translation type="obsolete">Ãœberlappungen entfernen</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Legato</source>
-        <translation type="unfinished">Legato</translation>
+        <translation type="obsolete">Legato</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>&amp;Plugins</source>
-        <translation type="unfinished">&amp;Plugins</translation>
-    </message>
-    <message>
-        <location line="+46"/>
-        <source>Pianoroll tools</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&amp;Plugins</translation>
     </message>
     <message>
-        <location line="+26"/>
         <source>panic</source>
-        <translation type="unfinished">Panik</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>transport</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Panik</translation>
     </message>
 </context>
 <context>
     <name>PluginDialog</name>
     <message>
-        <location filename="../../muse/plugin.cpp" line="+3142"/>
         <source>Ok</source>
-        <translation>Bestätigen</translation>
+        <translation type="obsolete">Bestätigen</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Cancel</source>
-        <translation>Abbrechen</translation>
+        <translation type="obsolete">Abbrechen</translation>
     </message>
     <message>
-        <location line="-49"/>
         <source>MusE: select plugin</source>
-        <translation>MusE: PlugIn wählen</translation>
+        <translation type="obsolete">MusE: PlugIn wählen</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Lib</source>
-        <translation>Lib</translation>
+        <translation type="obsolete">Lib</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Label</source>
-        <translation>Beschriftung</translation>
+        <translation type="obsolete">Beschriftung</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Name</source>
-        <translation>Name</translation>
+        <translation type="obsolete">Name</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>AI</source>
-        <translation>Al</translation>
+        <translation type="obsolete">Al</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>AO</source>
-        <translation>AO</translation>
+        <translation type="obsolete">AO</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>CI</source>
-        <translation>Cl</translation>
+        <translation type="obsolete">Cl</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>CO</source>
-        <translation>CO</translation>
+        <translation type="obsolete">CO</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>IP</source>
-        <translation>IP</translation>
+        <translation type="obsolete">IP</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>id</source>
-        <translation>id</translation>
+        <translation type="obsolete">id</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Maker</source>
-        <translation>Erzeuger</translation>
+        <translation type="obsolete">Erzeuger</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Copyright</source>
-        <translation>Copyright</translation>
+        <translation type="obsolete">Copyright</translation>
     </message>
     <message>
         <source>Select which types of plugins should be visible in the list,&lt;br&gt;beware that &apos;all&apos; includes plugins that probably are not usable by MusE.</source>
@@ -13008,77 +16682,39 @@ to be expanded by more than </source>
         <translation type="obsolete">Stereo und Mono</translation>
     </message>
     <message>
-        <location line="+52"/>
         <source>Stereo</source>
-        <translation>Stereo</translation>
+        <translation type="obsolete">Stereo</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Mono</source>
-        <translation>Mono</translation>
+        <translation type="obsolete">Mono</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="obsolete">alle</translation>
     </message>
-    <message>
-        <location line="-10"/>
-        <source>Mono and Stereo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+15"/>
-        <source>Show All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>Select which types of plugins should be visible in the list.&lt;br&gt;Note that using mono plugins on stereo tracks is not a problem, two will be used in parallell.&lt;br&gt;Also beware that the &apos;all&apos; alternative includes plugins that probably not are usable by MusE.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+9"/>
-        <source>Search in &apos;Label&apos; and &apos;Name&apos;:</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>PluginGui</name>
     <message>
-        <location line="+219"/>
-        <location line="+3"/>
         <source>bypass plugin</source>
-        <translation>Signalfluss PlugIn umleiten</translation>
+        <translation type="obsolete">Signalfluss PlugIn umleiten</translation>
     </message>
     <message>
-        <location line="+554"/>
         <source>MusE: load preset</source>
-        <translation>MusE: Vorlage laden</translation>
+        <translation type="obsolete">MusE: Vorlage laden</translation>
     </message>
     <message>
-        <location line="+66"/>
         <source>MusE: save preset</source>
-        <translation>MusE: Vorlage sichern</translation>
+        <translation type="obsolete">MusE: Vorlage sichern</translation>
     </message>
     <message>
-        <location line="-635"/>
         <source>File Buttons</source>
-        <translation>Schaltfläche Datei</translation>
+        <translation type="obsolete">Schaltfläche Datei</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Load Preset</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location line="+4"/>
         <source>Save Preset</source>
-        <translation>Speicher Preset</translation>
-    </message>
-    <message>
-        <location line="+588"/>
-        <source>Error reading preset. Might not be right type for this plugin</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Speicher Preset</translation>
     </message>
 </context>
 <context>
@@ -13086,32 +16722,53 @@ to be expanded by more than </source>
     <message>
         <location filename="../../muse/widgets/projectcreate.ui" line="+14"/>
         <source>Create Project</source>
-        <translation type="unfinished"></translation>
+        <translation>Projekt erzeugen</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+10"/>
+        <source>Projects folder:</source>
+        <translation>Projektverzeichnis:</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <location line="+120"/>
+        <location line="+7"/>
+        <source>...</source>
+        <translation>......</translation>
+    </message>
+    <message>
+        <location line="-109"/>
         <source>Project Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Projekt-Name:</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+10"/>
+        <source>Project is a Template</source>
+        <translation>Projekt ist eine Vorlage</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Project song file type:</source>
+        <translation>Projekt-Lieddatei-Typ:</translation>
+    </message>
+    <message>
+        <location line="+27"/>
         <source>Project Path to song file:</source>
-        <translation type="unfinished"></translation>
+        <translation>Projektpfad zur Lieddatei:</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Create project folder (recommended for audio projects)</source>
-        <translation type="unfinished"></translation>
+        <translation>Erzeuge Projektverzeichnis (empfohlen für Audioprojekte)</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Browse</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Durchsuchen</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+34"/>
         <source>Song information:</source>
-        <translation type="unfinished"></translation>
+        <translation>Lied-Information:</translation>
     </message>
 </context>
 <context>
@@ -13250,28 +16907,27 @@ gegenwärtig nicht benutzt</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../../muse/helper.cpp" line="-49"/>
         <source>Other</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Andere</translation>
     </message>
     <message>
-        <location filename="../../muse/functions.cpp" line="+242"/>
-        <location line="+159"/>
+        <location filename="../../muse/functions.cpp" line="+244"/>
+        <location line="+160"/>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Fehler</translation>
     </message>
     <message>
-        <location line="-159"/>
-        <location line="+159"/>
+        <location line="-160"/>
+        <location line="+160"/>
         <source>Please first select the range for crescendo with the loop markers.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bitte wählen Sie erst den Bereich für das Crescendo mit den Bereichsmarkern aus.</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
-        <location filename="../../muse/instruments/minstrument.cpp" line="+72"/>
-        <location filename="../../muse/liste/editevent.cpp" line="-410"/>
+        <location filename="../../muse/instruments/minstrument.cpp" line="+73"/>
+        <location filename="../../muse/liste/editevent.cpp" line="-418"/>
         <source>Cannot convert sysex string</source>
         <translation>Sysex Kette nicht umwandelbar</translation>
     </message>
@@ -13282,17 +16938,17 @@ gegenwärtig nicht benutzt</translation>
         <translation>Hex Kette ist zu lang (Grenze 2048 Bytes)</translation>
     </message>
     <message>
-        <location filename="../../muse/miditransform.cpp" line="+92"/>
+        <location filename="../../muse/miditransform.cpp" line="-231"/>
         <source>new</source>
         <translation>Neu</translation>
     </message>
     <message>
-        <location filename="../../muse/wave.cpp" line="-677"/>
+        <location filename="../../muse/wave.cpp" line="-1006"/>
         <source>create peakfile for </source>
         <translation>Pegelspitzendatei erzeugen für</translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/filedialog.cpp" line="+80"/>
+        <location filename="../../muse/widgets/filedialog.cpp" line="+81"/>
         <source>MusE: get file name</source>
         <translation>MusE: Dateinamen übermitteln</translation>
     </message>
@@ -13317,7 +16973,18 @@ Erzeugen?</translation>
         <translation type="obsolete">Abbrechen</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+1"/>
+        <source>The directory
+%1
+does not exist.
+Create it?</source>
+        <translation>Das Verzeichnis
+%1
+existiert nicht.
+Erzeugen?</translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>MusE: create directory</source>
         <translation>MusE: Verzeichnis erzeugen</translation>
     </message>
@@ -13327,10 +16994,25 @@ Erzeugen?</translation>
         <translation>Verzeichnis erzeugen schlug fehl</translation>
     </message>
     <message>
-        <location line="+396"/>
+        <location line="+373"/>
+        <source>File
+%1
+exists. Overwrite?</source>
+        <translation>Die Datei
+%1
+existiert. Ãœberschreiben?</translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Open File
+%1
+failed: %2</source>
+        <translation>Die Datei &quot;%1&quot; konnte nicht geöffnet werden: %2</translation>
+    </message>
+    <message>
         <source>File
 </source>
-        <translation>Datei</translation>
+        <translation type="obsolete">Datei</translation>
     </message>
     <message>
         <source>
@@ -13338,7 +17020,7 @@ exists</source>
         <translation type="obsolete">besteht</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="-21"/>
         <source>MusE: write</source>
         <translation>MusE: schreiben</translation>
     </message>
@@ -13351,25 +17033,23 @@ exists</source>
         <translation type="obsolete">Beenden</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Open File
 </source>
-        <translation>Datei öffnen</translation>
+        <translation type="obsolete">Datei öffnen</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>
 failed: </source>
-        <translation>schlug fehl:</translation>
+        <translation type="obsolete">schlug fehl:</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+22"/>
         <source>MusE: Open File</source>
         <translation>MusE: Datei öffnen</translation>
     </message>
     <message>
-        <location filename="../../muse/route.cpp" line="+1041"/>
-        <location line="+37"/>
+        <location filename="../../muse/route.cpp" line="+792"/>
+        <location line="+25"/>
         <source>None</source>
         <translation>Kein</translation>
     </message>
@@ -13379,28 +17059,9 @@ failed: </source>
         <translation>General Midi</translation>
     </message>
     <message>
-        <location filename="../../muse/waveedit/waveview.cpp" line="+632"/>
+        <location filename="../../muse/waveedit/waveview.cpp" line="-374"/>
         <source>No selection. Ignoring</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/widgets/filedialog.cpp" line="-440"/>
-        <source>The directory
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>
-does not exist.
-Create it?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+404"/>
-        <source>
-exists. Overwrite?</source>
-        <translation type="unfinished"></translation>
+        <translation>Keine Auswahl. Ignoriert</translation>
     </message>
 </context>
 <context>
@@ -13408,97 +17069,117 @@ exists. Overwrite?</source>
     <message>
         <location filename="../../muse/widgets/function_dialogs/quantbase.ui" line="+17"/>
         <source>MusE: Quantize</source>
-        <translation type="unfinished"></translation>
+        <translation>MusE: Quantisieren</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Range</source>
-        <translation type="unfinished">Bereich</translation>
+        <translation>Bereich</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>All Events</source>
-        <translation type="unfinished">Alle Ereignisse</translation>
+        <translation>Alle Ereignisse</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Selected Events</source>
-        <translation type="unfinished">Ausgewählte Ereignisse</translation>
+        <translation>Ausgewählte Ereignisse</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Looped Events</source>
-        <translation type="unfinished">Ereignisse innerhalb Schleife</translation>
+        <translation>Ereignisse innerhalb Schleife</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Selected Looped</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausgewählt und innerhalb der Schleife</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Values</source>
-        <translation type="unfinished">Werte</translation>
+        <translation>Werte</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Strength:</source>
-        <translation type="unfinished"></translation>
+        <translation>Stärke:</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>%</source>
-        <translation type="unfinished">%</translation>
+        <translation>%</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Threshold (ticks):</source>
-        <translation type="unfinished"></translation>
+        <translation>Schwellwert (Ticks):</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Quantize Len</source>
-        <translation type="unfinished"></translation>
+        <translation>Länge quantisieren</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Raster</source>
-        <translation type="unfinished"></translation>
+        <translation>Raster</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Whole</source>
-        <translation type="unfinished"></translation>
+        <translation>Ganze</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Half</source>
-        <translation type="unfinished"></translation>
+        <translation>Halbe</translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>Quarter</source>
-        <translation type="unfinished"></translation>
+        <source>4th</source>
+        <translation>Viertel</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>4th Triplet</source>
+        <translation>Triolenviertel</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>8th</source>
-        <translation type="unfinished"></translation>
+        <translation>Achtel</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>8th Triplet</source>
+        <translation>Triolenachtel</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>16th</source>
-        <translation type="unfinished"></translation>
+        <translation>Sechzehntel</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>16th Triplet</source>
+        <translation>Triolensechzehntel</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>32th</source>
-        <translation type="unfinished"></translation>
+        <translation>32tel</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>32th Triplet</source>
+        <translation>Triolen-32tel</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Swing:</source>
-        <translation type="unfinished"></translation>
+        <translation>Swing:</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -13507,17 +17188,20 @@ If swing=0, this is normal
 If swing is 33, you get a 2:1-rhythm.
 If swing is -33, you get a 1:2-rhythm.
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Wenn die Änderung der Position oder der Länge kleiner als Schwelle ist, wird nichts getan.
+Wenn Swing=0, wird normal quantisiert.
+Wenn Swing=33, erhalten Sie einen 2:1-Rhythmus.
+Wenn Swing=-33, erhalten Sie einen 1:2-Rhythmus.</translation>
     </message>
     <message>
         <location line="+51"/>
         <source>OK</source>
-        <translation type="unfinished">Bestätigen</translation>
+        <translation>Bestätigen</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Cancel</source>
-        <translation type="unfinished">Abbrechen</translation>
+        <translation>Abbrechen</translation>
     </message>
 </context>
 <context>
@@ -13548,52 +17232,52 @@ If swing is -33, you get a 1:2-rhythm.
     <message>
         <location filename="../../muse/widgets/function_dialogs/removebase.ui" line="+17"/>
         <source>MusE: Erase Notes</source>
-        <translation type="unfinished"></translation>
+        <translation>MusE: Noten löschen</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Range</source>
-        <translation type="unfinished">Bereich</translation>
+        <translation>Bereich</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>All Events</source>
-        <translation type="unfinished">Alle Ereignisse</translation>
+        <translation>Alle Ereignisse</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Selected Events</source>
-        <translation type="unfinished">Ausgewählte Ereignisse</translation>
+        <translation>Ausgewählte Ereignisse</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Looped Events</source>
-        <translation type="unfinished">Ereignisse innerhalb Schleife</translation>
+        <translation>Ereignisse innerhalb Schleife</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Selected Looped</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausgewählt und innerhalb der Schleife</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Thresholds</source>
-        <translation type="unfinished"></translation>
+        <translation>Schwellenwerte</translation>
     </message>
     <message>
         <location line="+46"/>
         <source> ticks</source>
-        <translation type="unfinished"></translation>
+        <translation> Ticks</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Velocity</source>
-        <translation type="unfinished"></translation>
+        <translation>Dynamik</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Length</source>
-        <translation type="unfinished">Länge</translation>
+        <translation>Länge</translation>
     </message>
     <message>
         <location line="+13"/>
@@ -13604,17 +17288,23 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot; margin-top:0px; margin-bottom:7px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;If nothing is checked, everything is removed.&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:7px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;If velocity is checked, only notes with velo &amp;lt; threshold are removed.&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;If both are checked, notes with velo &amp;lt; threshold OR with length &amp;lt; threshold are removed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:7px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Wenn nichts ausgewählt ist, wird alles gelöscht.&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:7px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Wenn &quot;Dynamik&quot; ausgewählt ist, werden nur Noten mit Dynamik &amp;lt; Schwelle gelöscht.&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Wenn beide ausgewählt sind, werden Noten mit Dynamik &amp;lt; Schwelle ODER Länge &amp;lt; Schwelle gelöscht.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+56"/>
         <source>OK</source>
-        <translation type="unfinished">Bestätigen</translation>
+        <translation>Bestätigen</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Cancel</source>
-        <translation type="unfinished">Abbrechen</translation>
+        <translation>Abbrechen</translation>
     </message>
 </context>
 <context>
@@ -14053,52 +17743,52 @@ Rhythmus Zufallsgenerator noch nicht eingeführt!</translation>
     <message>
         <location filename="../../synti/simpledrums2/sspluginchooserbase.ui" line="+16"/>
         <source>SimpleDrums - Ladspa Plugin Chooser</source>
-        <translation type="unfinished"></translation>
+        <translation>SimpleDrums - Ladspa Plugin Wähler</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Name</source>
-        <translation type="unfinished">Name</translation>
+        <translation>Name</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Label</source>
-        <translation type="unfinished">Beschriftung</translation>
+        <translation>Beschriftung</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Inports</source>
-        <translation type="unfinished"></translation>
+        <translation>Eingangsports</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Outports</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausgangsports</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Creator</source>
-        <translation type="unfinished"></translation>
+        <translation>Ersteller</translation>
     </message>
     <message>
         <location line="+32"/>
         <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Abbrechen</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Alt+C</source>
-        <translation type="unfinished">Alt+C</translation>
+        <translation>Alt+C</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>&amp;OK</source>
-        <translation type="unfinished">&amp;Bestätigen</translation>
+        <translation>&amp;Bestätigen</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Alt+O</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt+O</translation>
     </message>
 </context>
 <context>
@@ -14106,315 +17796,116 @@ Rhythmus Zufallsgenerator noch nicht eingeführt!</translation>
     <message>
         <location filename="../../synti/simpledrums2/ssplugingui.cpp" line="+238"/>
         <source>Clear and unload effect</source>
-        <translation type="unfinished"></translation>
+        <translation>Lösche und entlade den Effekt</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Load effect</source>
-        <translation type="unfinished"></translation>
+        <translation>Lade Effekt</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Toggle display of effect parameters</source>
-        <translation type="unfinished"></translation>
+        <translation>Schalte Anzeige von Effektparametern um</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Turn effect on/off</source>
-        <translation type="unfinished"></translation>
+        <translation>Schalte Effekt an/aus</translation>
     </message>
 </context>
 <context>
     <name>ScoreCanvas</name>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="+1245"/>
         <source>Treble</source>
-        <translation type="unfinished">Violinschlüssel</translation>
+        <translation type="obsolete">Violinschlüssel</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Bass</source>
-        <translation type="unfinished">Bassschlüssel</translation>
+        <translation type="obsolete">Bassschlüssel</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Grand Staff</source>
-        <translation type="unfinished">Beide Schlüssel</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Remove staff</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2467"/>
-        <source>Ambiguous part</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There are two or more possible parts you could add the note to, but none matches the selected part. Please select the destination part by clicking on any note belonging to it and try again, or add a new stave containing only the destination part.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>No part</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There are no parts you could add the note to.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Beide Schlüssel</translation>
     </message>
 </context>
 <context>
     <name>ScoreEdit</name>
     <message>
-        <location line="-3493"/>
         <source>Undo/Redo tools</source>
-        <translation type="unfinished">Rückgängig/Wiederho</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Step recording tools</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Rückgängig/Wiederho</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Step Record</source>
-        <translation type="unfinished">Aufnahme taktschlagweise</translation>
+        <translation type="obsolete">Aufnahme taktschlagweise</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>panic</source>
-        <translation type="unfinished">Panik</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>transport</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Note settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Note length:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>last</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+37"/>
-        <source>Velocity:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Off-Velocity:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>Quantisation settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Quantisation:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>Pixels per whole:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+9"/>
-        <source>&amp;Edit</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Panik</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>C&amp;ut</source>
-        <translation type="unfinished">&amp;Ausschneiden</translation>
+        <translation type="obsolete">&amp;Ausschneiden</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Copy</source>
-        <translation type="unfinished">&amp;Kopieren</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Copy events in range</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>&amp;Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Paste (with dialog)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Delete &amp;Events</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&amp;Kopieren</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>&amp;Select</source>
-        <translation type="unfinished">&amp;Auswählen</translation>
+        <translation type="obsolete">&amp;Auswählen</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Select &amp;All</source>
-        <translation type="unfinished">Alles a&amp;uswählen</translation>
+        <translation type="obsolete">Alles a&amp;uswählen</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Deselect All</source>
-        <translation type="unfinished">Alles ab&amp;wählen</translation>
+        <translation type="obsolete">Alles ab&amp;wählen</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Invert &amp;Selection</source>
-        <translation type="unfinished">Auswa&amp;hl umkehren</translation>
+        <translation type="obsolete">Auswa&amp;hl umkehren</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>&amp;Inside Loop</source>
-        <translation type="unfinished">Bereich &amp;innerhalb der Schleife</translation>
+        <translation type="obsolete">Bereich &amp;innerhalb der Schleife</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Outside Loop</source>
-        <translation type="unfinished">Bereich außerhalb der Schlei&amp;fe</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Fu&amp;nctions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>&amp;Quantize</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Bereich außerhalb der Schlei&amp;fe</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Change note &amp;length</source>
-        <translation type="unfinished">Notenlänge verändern</translation>
+        <translation type="obsolete">Notenlänge verändern</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Change note &amp;velocity</source>
-        <translation type="unfinished">Anschlagsdynamik verändern</translation>
+        <translation type="obsolete">Anschlagsdynamik verändern</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Crescendo/Decrescendo</source>
-        <translation type="unfinished">Crescendo/Decrescendo</translation>
+        <translation type="obsolete">Crescendo/Decrescendo</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Transpose</source>
-        <translation type="unfinished">Transponieren</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Erase Events</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Transponieren</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Move Notes</source>
-        <translation type="unfinished">Noten verschieben</translation>
+        <translation type="obsolete">Noten verschieben</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Set Fixed Length</source>
-        <translation type="unfinished">Länge festlegen</translation>
+        <translation type="obsolete">Länge festlegen</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Delete Overlaps</source>
-        <translation type="unfinished">Ãœberlappungen entfernen</translation>
+        <translation type="obsolete">Ãœberlappungen entfernen</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Legato</source>
-        <translation type="unfinished">Legato</translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Note head &amp;colors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>&amp;Black</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>&amp;Velocity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>&amp;Part</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Set up &amp;preamble</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Display &amp;key signature</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Display &amp;time signature</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Set Score &amp;name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+216"/>
-        <location line="+1"/>
-        <source>Enter the new score title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Changing score title failed:
-the selected title is not unique</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Legato</translation>
     </message>
 </context>
 <context>
@@ -14437,57 +17928,57 @@ the selected title is not unique</source>
     <message>
         <location filename="../../muse/widgets/function_dialogs/setlenbase.ui" line="+14"/>
         <source>MusE: Set Note Length</source>
-        <translation type="unfinished"></translation>
+        <translation>MusE: Feste Notenlänge setzen</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Range</source>
-        <translation type="unfinished">Bereich</translation>
+        <translation>Bereich</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>All Events</source>
-        <translation type="unfinished">Alle Ereignisse</translation>
+        <translation>Alle Ereignisse</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Selected Events</source>
-        <translation type="unfinished">Ausgewählte Ereignisse</translation>
+        <translation>Ausgewählte Ereignisse</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Looped Events</source>
-        <translation type="unfinished">Ereignisse innerhalb Schleife</translation>
+        <translation>Ereignisse innerhalb Schleife</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Selected Looped</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausgewählt und innerhalb der Schleife</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Value</source>
-        <translation type="unfinished">Wert</translation>
+        <translation>Wert</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>New length</source>
-        <translation type="unfinished"></translation>
+        <translation>Neue Länge</translation>
     </message>
     <message>
         <location line="+10"/>
         <source> ticks</source>
-        <translation type="unfinished"></translation>
+        <translation> Ticks</translation>
     </message>
     <message>
         <location line="+53"/>
         <source>OK</source>
-        <translation type="unfinished">Bestätigen</translation>
+        <translation>Bestätigen</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Cancel</source>
-        <translation type="unfinished">Abbrechen</translation>
+        <translation>Abbrechen</translation>
     </message>
 </context>
 <context>
@@ -14552,12 +18043,12 @@ the selected title is not unique</source>
         <translation>Tastenkürzel einstellen</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>Shortcut Category</source>
         <translation>Kategorie Tastenkürzel</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+24"/>
         <source>Description</source>
         <translation>Beschreibung</translation>
     </message>
@@ -14567,7 +18058,7 @@ the selected title is not unique</source>
         <translation>Tastenkürzel</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+35"/>
         <source>&amp;Clear</source>
         <translation>&amp;Löschen</translation>
     </message>
@@ -14609,7 +18100,7 @@ the selected title is not unique</source>
     <message>
         <location filename="../../synti/simpledrums2/simpledrumsguibase.ui" line="+16"/>
         <source>DrumSynth 0.1</source>
-        <translation type="unfinished"></translation>
+        <translation>DrumSynth 0.1</translation>
     </message>
 </context>
 <context>
@@ -14617,113 +18108,24 @@ the selected title is not unique</source>
     <message>
         <location filename="../../synti/simpledrums2/simpledrumsgui.cpp" line="+442"/>
         <source>&amp;Load setup</source>
-        <translation type="unfinished"></translation>
+        <translation>Setup &amp;laden</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>&amp;Save setup</source>
-        <translation type="unfinished"></translation>
+        <translation>Setup &amp;speichern</translation>
     </message>
     <message>
         <location line="+344"/>
         <source>Load sample dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Sample-Laden-Dialog</translation>
     </message>
 </context>
 <context>
     <name>Song</name>
     <message>
-        <location filename="../../muse/song.cpp" line="+2412"/>
-        <source>Jack shutdown!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Jack has detected a performance problem which has lead to
-MusE being disconnected.
-This could happen due to a number of reasons:
-- a performance issue with your particular setup.
-- a bug in MusE (or possibly in another connected software).
-- a random hiccup which might never occur again.
-- jack was voluntary stopped by you or someone else
-- jack crashed
-If there is a persisting problem you are much welcome to discuss it
-on the MusE mailinglist.
-(there is information about joining the mailinglist on the MusE
- homepage which is available through the help menu)
-
-To proceed check the status of Jack and try to restart it and then .
-click on the Restart button.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+198"/>
-        <source>previous event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>next event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <location line="+183"/>
-        <source>set event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-181"/>
-        <location line="+183"/>
-        <source>add event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-179"/>
-        <location line="+184"/>
-        <source>erase event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-180"/>
-        <source>erase range</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>clear automation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+33"/>
-        <source>Clear all controller events?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
         <source>&amp;Ok</source>
-        <translation type="unfinished">&amp;Bestätigen</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1134"/>
-        <source>MusE - external script failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>MusE was unable to launch the script, error message:
- </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-1200"/>
-        <source>Automation:</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&amp;Bestätigen</translation>
     </message>
 </context>
 <context>
@@ -14731,43 +18133,42 @@ click on the Restart button.</source>
     <message>
         <location filename="../../muse/widgets/songinfo.ui" line="+14"/>
         <source>Song Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Lied-Information</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Show on song load</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeige beim Laden</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Abbrechen</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Alt+C</source>
-        <translation type="unfinished">Alt+C</translation>
+        <translation>Alt+C</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>&amp;Ok</source>
-        <translation type="unfinished">&amp;Bestätigen</translation>
+        <translation>&amp;Bestätigen</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Alt+O</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt+O</translation>
     </message>
 </context>
 <context>
     <name>SynthConfigBase</name>
     <message>
-        <location filename="../../muse/widgets/synthconfigbase.ui" line="+14"/>
         <source>MusE: Synth Configuration</source>
-        <translation>MusE: Synth Einstellung</translation>
+        <translation type="obsolete">MusE: Synth Einstellung</translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location filename="../../muse/widgets/synthconfigbase.ui" line="+94"/>
         <source>Soft Synthesizer</source>
         <translation>Software-Synthesizer</translation>
     </message>
@@ -14777,18 +18178,18 @@ click on the Restart button.</source>
         <translation>Datei</translation>
     </message>
     <message>
-        <location line="-115"/>
+        <location line="-120"/>
         <source>Instances</source>
         <translation>Instanzen</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location line="+115"/>
+        <location line="+125"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location line="-17"/>
+        <location line="-22"/>
         <source>list of available software synthesizers</source>
         <translation>Liste verfügbarer Software-Synthesizer</translation>
     </message>
@@ -14808,12 +18209,23 @@ click on the Restart button.</source>
         <translation>Midi Anschluss</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="-26"/>
+        <source>Midi Port and Soft Synth Configuration</source>
+        <translation>MIDI-Port- und SoftSynth-Konfiguration</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location line="+110"/>
+        <source>Type</source>
+        <translation>Typ</translation>
+    </message>
+    <message>
+        <location line="-67"/>
         <source>Midi connections</source>
         <translation>Midi Verbindungen</translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="+72"/>
         <source>Inst</source>
         <translation>Inst</translation>
     </message>
@@ -14918,9 +18330,8 @@ click on the Restart button.</source>
 <context>
     <name>TempoSig</name>
     <message>
-        <location filename="../../muse/transport.cpp" line="+103"/>
         <source>Tempo/Sig</source>
-        <translation>Tempo/Taktmaß</translation>
+        <translation type="obsolete">Tempo/Taktmaß</translation>
     </message>
 </context>
 <context>
@@ -14972,74 +18383,12 @@ click on the Restart button.</source>
 <context>
     <name>TopWin</name>
     <message>
-        <location filename="../../muse/cobject.cpp" line="+61"/>
-        <source>As subwindow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Shares tools and menu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
         <source>Fullscreen</source>
-        <translation type="unfinished">Vollbild</translation>
-    </message>
-    <message>
-        <location line="+418"/>
-        <source>Piano roll</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>List editor</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Vollbild</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Drum editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Master track editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Master track list editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Wave editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Clip list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Marker view</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Score editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
         <source>Arranger</source>
-        <translation type="unfinished">Arrangierer</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>&lt;unknown toplevel type&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Arrangierer</translation>
     </message>
 </context>
 <context>
@@ -15056,158 +18405,116 @@ click on the Restart button.</source>
 <context>
     <name>Transport</name>
     <message>
-        <location filename="../../muse/transport.cpp" line="+150"/>
-        <location line="+3"/>
         <source>Punch In</source>
-        <translation>Aufnahme am linken Marker beginnen</translation>
+        <translation type="obsolete">Aufnahme am linken Marker beginnen</translation>
     </message>
     <message>
-        <location line="-2"/>
-        <location line="+3"/>
         <source>Loop</source>
-        <translation>Schleife</translation>
+        <translation type="obsolete">Schleife</translation>
     </message>
     <message>
-        <location line="-2"/>
-        <location line="+3"/>
         <source>Punch Out</source>
-        <translation>Aufnahme am rechten Marker beenden</translation>
+        <translation type="obsolete">Aufnahme am rechten Marker beenden</translation>
     </message>
     <message>
-        <location line="+33"/>
         <source>Left Mark</source>
-        <translation>Linker Marker</translation>
+        <translation type="obsolete">Linker Marker</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Right Mark</source>
-        <translation>Rechter Marker</translation>
+        <translation type="obsolete">Rechter Marker</translation>
     </message>
     <message>
-        <location line="-95"/>
         <source>Overdub</source>
-        <translation>Ãœberschreiben</translation>
+        <translation type="obsolete">Ãœberschreiben</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+15"/>
         <source>Replace</source>
-        <translation>Ersetzen</translation>
+        <translation type="obsolete">Ersetzen</translation>
     </message>
     <message>
-        <location line="-10"/>
         <source>Rec Mode</source>
-        <translation>Modus &quot;Aufnahme&quot;</translation>
+        <translation type="obsolete">Modus &quot;Aufnahme&quot;</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Normal</source>
-        <translation>Normal</translation>
+        <translation type="obsolete">Normal</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Mix</source>
-        <translation>Mischen</translation>
+        <translation type="obsolete">Mischen</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Cycle Rec</source>
-        <translation>Aufnahme in Schleife</translation>
+        <translation type="obsolete">Aufnahme in Schleife</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>punchin</source>
-        <translation>Aufnahme am linken Marker geginnen</translation>
+        <translation type="obsolete">Aufnahme am linken Marker geginnen</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>loop</source>
-        <translation>Schleife</translation>
+        <translation type="obsolete">Schleife</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>punchout</source>
-        <translation>Aufnahme am rechten Marker beenden</translation>
+        <translation type="obsolete">Aufnahme am rechten Marker beenden</translation>
     </message>
     <message>
-        <location line="+101"/>
         <source>rewind to start</source>
-        <translation>Zum Start zurück</translation>
+        <translation type="obsolete">Zum Start zurück</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>rewind</source>
-        <translation>Einen Taktschlag rückwärts</translation>
+        <translation type="obsolete">Einen Taktschlag rückwärts</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>forward</source>
-        <translation>Einen Taktschlag vorwärts</translation>
+        <translation type="obsolete">Einen Taktschlag vorwärts</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>stop</source>
-        <translation>Stopp</translation>
+        <translation type="obsolete">Stopp</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>play</source>
-        <translation>Wiedergabe</translation>
+        <translation type="obsolete">Wiedergabe</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>record</source>
-        <translation>Aufnahme</translation>
+        <translation type="obsolete">Aufnahme</translation>
     </message>
     <message>
-        <location line="+28"/>
         <source>AC</source>
-        <translation>AC</translation>
+        <translation type="obsolete">AC</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>quantize during record</source>
-        <translation>Während Aufnahme quantisieren</translation>
+        <translation type="obsolete">Während Aufnahme quantisieren</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Click</source>
-        <translation>Klick</translation>
+        <translation type="obsolete">Klick</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>metronom click on/off</source>
-        <translation>Metronom Klick an/aus</translation>
+        <translation type="obsolete">Metronom Klick an/aus</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Sync</source>
-        <translation>Sync</translation>
+        <translation type="obsolete">Sync</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>external sync on/off</source>
-        <translation>Externer Sync an/aus</translation>
+        <translation type="obsolete">Externer Sync an/aus</translation>
     </message>
     <message>
-        <location line="+45"/>
         <source>Master</source>
-        <translation>Master</translation>
+        <translation type="obsolete">Master</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>use master track</source>
-        <translation>Masterspur einschalten</translation>
-    </message>
-    <message>
-        <location line="-43"/>
-        <source>Jack</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Jack transport sync on/off</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Masterspur einschalten</translation>
     </message>
 </context>
 <context>
@@ -15215,52 +18522,52 @@ click on the Restart button.</source>
     <message>
         <location filename="../../muse/widgets/function_dialogs/transposebase.ui" line="+14"/>
         <source>MusE: Transpose</source>
-        <translation type="unfinished"></translation>
+        <translation>MusE: Transponieren</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Range</source>
-        <translation type="unfinished">Bereich</translation>
+        <translation>Bereich</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>All Events</source>
-        <translation type="unfinished">Alle Ereignisse</translation>
+        <translation>Alle Ereignisse</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Selected Events</source>
-        <translation type="unfinished">Ausgewählte Ereignisse</translation>
+        <translation>Ausgewählte Ereignisse</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Looped Events</source>
-        <translation type="unfinished">Ereignisse innerhalb Schleife</translation>
+        <translation>Ereignisse innerhalb Schleife</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Selected Looped</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausgewählt und innerhalb der Schleife</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Value</source>
-        <translation type="unfinished">Wert</translation>
+        <translation>Wert</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Halftone-steps</source>
-        <translation type="unfinished"></translation>
+        <translation>Halbtonschritte</translation>
     </message>
     <message>
         <location line="+69"/>
         <source>OK</source>
-        <translation type="unfinished">Bestätigen</translation>
+        <translation>Bestätigen</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Cancel</source>
-        <translation type="unfinished">Abbrechen</translation>
+        <translation>Abbrechen</translation>
     </message>
 </context>
 <context>
@@ -15311,34 +18618,36 @@ click on the Restart button.</source>
     <message>
         <location filename="../../muse/widgets/unusedwavefiles.ui" line="+14"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Dialog</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>List of unused audio files in current project directory:</source>
-        <translation type="unfinished"></translation>
+        <translation>Liste aller unbenutzen Audiodateien im Projektverzeichnis:</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Current project</source>
-        <translation type="unfinished"></translation>
+        <translation>Momentanes Projekt</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>All .med files
 in current
  directory</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle .med-Dateien
+im momentanen
+Verzeichnis</translation>
     </message>
     <message>
         <location line="+42"/>
         <source>Move files to &apos;unused&apos; subdir</source>
-        <translation type="unfinished"></translation>
+        <translation>Verschiebe Dateien ins &quot;unused&quot;-Unterverzeichnis</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Cancel</source>
-        <translation type="unfinished">Abbrechen</translation>
+        <translation>Abbrechen</translation>
     </message>
 </context>
 <context>
@@ -15346,13 +18655,13 @@ in current
     <message>
         <location filename="../../synti/vam/vamgui.cpp" line="+610"/>
         <source>MusE: Load VAM Presets</source>
-        <translation type="unfinished"></translation>
+        <translation>MusE: VAM-Voreinstellungen laden</translation>
     </message>
     <message>
         <location line="+110"/>
         <location line="+18"/>
         <source>MusE: Save VAM Presets</source>
-        <translation type="unfinished"></translation>
+        <translation>MusE: VAM-Voreinstellungen speichern</translation>
     </message>
 </context>
 <context>
@@ -15360,105 +18669,105 @@ in current
     <message>
         <location filename="../../synti/vam/vamguibase.ui" line="+23"/>
         <source>Virtual Analogue for MusE</source>
-        <translation type="unfinished"></translation>
+        <translation>Virtueller Analoger für MusE</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>LFO</source>
-        <translation type="unfinished"></translation>
+        <translation>LFO</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Freq</source>
-        <translation type="unfinished"></translation>
+        <translation>Freq</translation>
     </message>
     <message>
         <location line="+42"/>
         <location line="+950"/>
         <location line="+177"/>
         <source>Waveform</source>
-        <translation type="unfinished"></translation>
+        <translation>Wellenform</translation>
     </message>
     <message>
         <location line="-1116"/>
         <location line="+956"/>
         <location line="+177"/>
         <source>Sine</source>
-        <translation type="unfinished"></translation>
+        <translation>Sinus</translation>
     </message>
     <message>
         <location line="-1128"/>
         <location line="+956"/>
         <location line="+177"/>
         <source>Pulse</source>
-        <translation type="unfinished"></translation>
+        <translation>Rechteck</translation>
     </message>
     <message>
         <location line="-1128"/>
         <location line="+956"/>
         <location line="+177"/>
         <source>Saw</source>
-        <translation type="unfinished"></translation>
+        <translation>Sägezahn</translation>
     </message>
     <message>
         <location line="-1128"/>
         <location line="+956"/>
         <location line="+177"/>
         <source>Triangle</source>
-        <translation type="unfinished"></translation>
+        <translation>Dreieck</translation>
     </message>
     <message>
         <location line="-1122"/>
         <source>Filter</source>
-        <translation type="unfinished">Filter</translation>
+        <translation>Filter</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>EnvMod</source>
-        <translation type="unfinished"></translation>
+        <translation>EnvMod</translation>
     </message>
     <message>
         <location line="+10"/>
         <location line="+717"/>
         <location line="+427"/>
         <source>Attack</source>
-        <translation type="unfinished"></translation>
+        <translation>Attack</translation>
     </message>
     <message>
         <location line="-1134"/>
         <location line="+645"/>
         <location line="+531"/>
         <source>Decay</source>
-        <translation type="unfinished"></translation>
+        <translation>Decay</translation>
     </message>
     <message>
         <location line="-1166"/>
         <location line="+677"/>
         <location line="+531"/>
         <source>Sustain</source>
-        <translation type="unfinished"></translation>
+        <translation>Sustain</translation>
     </message>
     <message>
         <location line="-1198"/>
         <location line="+677"/>
         <location line="+401"/>
         <source>Release</source>
-        <translation type="unfinished"></translation>
+        <translation>Release</translation>
     </message>
     <message>
         <location line="-972"/>
         <source>Cutoff</source>
-        <translation type="unfinished"></translation>
+        <translation>Filterfrequenz</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Resonance</source>
-        <translation type="unfinished"></translation>
+        <translation>Resonanz</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Invert</source>
-        <translation type="unfinished"></translation>
+        <translation>Invertieren</translation>
     </message>
     <message>
         <location line="+13"/>
@@ -15468,77 +18777,77 @@ in current
     <message>
         <location line="+153"/>
         <source>Presets</source>
-        <translation type="unfinished"></translation>
+        <translation>Voreinstellungen</translation>
     </message>
     <message>
         <location line="+65"/>
         <source>Set</source>
-        <translation type="unfinished"></translation>
+        <translation>Set</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>load preset list</source>
-        <translation type="unfinished"></translation>
+        <translation>Voreinstellungsliste laden</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>save preset list</source>
-        <translation type="unfinished"></translation>
+        <translation>Voreinstellungsliste speichern</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>save preset list to a new file</source>
-        <translation type="unfinished"></translation>
+        <translation>Voreinstellungsliste in einer neuen Datei speichern</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>delete preset</source>
-        <translation type="unfinished">Vorlage löschen</translation>
+        <translation>Voreinstellung löschen</translation>
     </message>
     <message>
         <location line="+41"/>
         <source>DCO 1</source>
-        <translation type="unfinished"></translation>
+        <translation>DCO 1</translation>
     </message>
     <message>
         <location line="+12"/>
         <location line="+538"/>
         <source>Pitch</source>
-        <translation type="unfinished"></translation>
+        <translation>Tonhöhe</translation>
     </message>
     <message>
         <location line="-506"/>
         <location line="+480"/>
         <source>Detune</source>
-        <translation type="unfinished"></translation>
+        <translation>Verstimmung</translation>
     </message>
     <message>
         <location line="-374"/>
         <location line="+473"/>
         <source>PWM</source>
-        <translation type="unfinished"></translation>
+        <translation>PWM</translation>
     </message>
     <message>
         <location line="-391"/>
         <location line="+266"/>
         <source>FM</source>
-        <translation type="unfinished"></translation>
+        <translation>FM</translation>
     </message>
     <message>
         <location line="-240"/>
         <location line="+501"/>
         <source>PW</source>
-        <translation type="unfinished"></translation>
+        <translation>PW</translation>
     </message>
     <message>
         <location line="-314"/>
         <source>DCO 2</source>
-        <translation type="unfinished"></translation>
+        <translation>DCO2</translation>
     </message>
     <message>
         <location line="+324"/>
         <source>On</source>
-        <translation type="unfinished">An</translation>
+        <translation>An</translation>
     </message>
     <message utf8="true">
         <location line="+122"/>
@@ -15551,7 +18860,15 @@ Jotsif Lindman Hörnlund
 Copyright(C) 2005
 Robert Jonsson 
 (rj@spamatica.se)</source>
-        <translation type="unfinished"></translation>
+        <translation>VAM 1.0beta3
+Virtual Analog for MusE
+Veröffentlicht unter der GPL.
+Copyright(C) 2002
+Jotsif Lindman Hörnlund 
+( jotsif@linux.nu )
+Copyright(C) 2005
+Robert Jonsson 
+(rj@spamatica.se)</translation>
     </message>
 </context>
 <context>
@@ -15559,27 +18876,27 @@ Robert Jonsson
     <message>
         <location filename="../../muse/widgets/function_dialogs/velocitybase.ui" line="+14"/>
         <source>MusE: Modify Velocity</source>
-        <translation type="unfinished">MusE: Velocity ändern</translation>
+        <translation>MusE: Anschlagsdynamik ändern</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Range</source>
-        <translation type="unfinished">Bereich</translation>
+        <translation>Bereich</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>All Events</source>
-        <translation type="unfinished">Alle Ereignisse</translation>
+        <translation>Alle Ereignisse</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Selected Events</source>
-        <translation type="unfinished">Ausgewählte Ereignisse</translation>
+        <translation>Ausgewählte Ereignisse</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Looped Events</source>
-        <translation type="unfinished">Ereignisse innerhalb Schleife</translation>
+        <translation>Ereignisse innerhalb Schleife</translation>
     </message>
     <message>
         <source>Selected &amp; Looped</source>
@@ -15588,42 +18905,42 @@ Robert Jonsson
     <message>
         <location line="+17"/>
         <source>Values</source>
-        <translation type="unfinished">Werte</translation>
+        <translation>Werte</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Rate:</source>
-        <translation type="unfinished">Rate:</translation>
+        <translation>Rate:</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Offset:</source>
-        <translation type="unfinished">Zeitversatz:</translation>
+        <translation>Offset:</translation>
     </message>
     <message>
         <location line="-13"/>
         <source>%</source>
-        <translation type="unfinished">%</translation>
+        <translation>%</translation>
     </message>
     <message>
         <location line="-32"/>
         <source>Selected Looped</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausgewählt und innerhalb der Schleife</translation>
     </message>
     <message>
         <location line="+71"/>
         <source>veloNew = (veloOld * rate) + offset</source>
-        <translation type="unfinished"></translation>
+        <translation>dynNeu = (dynAlt * rate) + offset</translation>
     </message>
     <message>
         <location line="+44"/>
         <source>OK</source>
-        <translation type="unfinished">Bestätigen</translation>
+        <translation>Bestätigen</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Cancel</source>
-        <translation type="unfinished">Abbrechen</translation>
+        <translation>Abbrechen</translation>
     </message>
 </context>
 <context>
@@ -15644,14 +18961,12 @@ Robert Jonsson
         <translation type="obsolete">Werkzeug &quot;we&quot;</translation>
     </message>
     <message>
-        <location filename="../../muse/waveedit/waveedit.cpp" line="+196"/>
         <source>Solo</source>
-        <translation>Solo</translation>
+        <translation type="obsolete">Solo</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Cursor</source>
-        <translation>Positionsmarker</translation>
+        <translation type="obsolete">Positionsmarker</translation>
     </message>
     <message>
         <source>&amp;File</source>
@@ -15662,193 +18977,254 @@ Robert Jonsson
         <translation type="obsolete">Funktionen</translation>
     </message>
     <message>
-        <location line="-115"/>
-        <source>&amp;Edit</source>
-        <translation type="unfinished"></translation>
+        <source>200%</source>
+        <translation type="obsolete">200%</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Func&amp;tions</source>
-        <translation type="unfinished"></translation>
+        <source>150%</source>
+        <translation type="obsolete">150%</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>&amp;Gain</source>
-        <translation type="unfinished"></translation>
+        <source>75%</source>
+        <translation type="obsolete">75%</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>200%</source>
-        <translation type="unfinished">200%</translation>
+        <source>50%</source>
+        <translation type="obsolete">50%</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>150%</source>
-        <translation type="unfinished">150%</translation>
+        <source>25%</source>
+        <translation type="obsolete">25%</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>75%</source>
-        <translation type="unfinished">75%</translation>
+        <source>&amp;Copy</source>
+        <translation type="obsolete">&amp;Kopieren</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>50%</source>
-        <translation type="unfinished">50%</translation>
+        <source>C&amp;ut</source>
+        <translation type="obsolete">&amp;Ausschneiden</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>25%</source>
-        <translation type="unfinished">25%</translation>
+        <source>Select</source>
+        <translation type="obsolete">Auswählen</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
+        <source>Select &amp;All</source>
+        <translation type="obsolete">Alles a&amp;uswählen</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>&amp;Copy</source>
-        <translation type="unfinished">&amp;Kopieren</translation>
+        <source>&amp;Deselect All</source>
+        <translation type="obsolete">Alles ab&amp;wählen</translation>
     </message>
+</context>
+<context>
+    <name>WaveTrackInfoBase</name>
     <message>
-        <location line="+4"/>
-        <source>C&amp;ut</source>
-        <translation type="unfinished">&amp;Ausschneiden</translation>
+        <source>MusE: TrackInfo</source>
+        <translation type="obsolete">MusE: Spurinfo</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>&amp;Paste</source>
-        <translation type="unfinished"></translation>
+        <source>Track Info</source>
+        <translation type="obsolete">Spurinfo</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Edit in E&amp;xternal Editor</source>
-        <translation type="unfinished"></translation>
+        <source>Track Name</source>
+        <translation type="obsolete">Spurname</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Mute Selection</source>
-        <translation type="unfinished"></translation>
+        <source>Output Route:</source>
+        <translation type="obsolete">Ausgangssignalfluss:</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Normalize Selection</source>
-        <translation type="unfinished"></translation>
+        <source>Input Route:</source>
+        <translation type="obsolete">Eingangssignalfluss:</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Fade In Selection</source>
-        <translation type="unfinished"></translation>
+        <source>Ports:</source>
+        <translation type="obsolete">Anschlüsse:</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Fade Out Selection</source>
-        <translation type="unfinished"></translation>
+        <source>Mono</source>
+        <translation type="obsolete">Mono</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Reverse Selection</source>
-        <translation type="unfinished"></translation>
+        <source>Stereo</source>
+        <translation type="obsolete">Stereo</translation>
     </message>
+</context>
+<context>
+    <name>file_patterns</name>
     <message>
-        <location line="+4"/>
-        <source>Select</source>
-        <translation type="unfinished">Auswählen</translation>
+        <location filename="../../muse/globals.cpp" line="+120"/>
+        <source>Midi/Kar (*.mid *.MID *.kar *.KAR *.mid.gz *.mid.bz2)</source>
+        <translation>Midi/Kar (*.mid *.MID *.kar *.KAR *.mid.gz *.mid.bz2)</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Select &amp;All</source>
-        <translation type="unfinished">Alles a&amp;uswählen</translation>
+        <location line="+1"/>
+        <source>Midi (*.mid *.MID *.mid.gz *.mid.bz2)</source>
+        <translation>Midi (*.mid *.MID *.mid.gz *.mid.bz2)</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>&amp;Deselect All</source>
-        <translation type="unfinished">Alles ab&amp;wählen</translation>
+        <location line="+1"/>
+        <source>Karaoke (*.kar *.KAR *.kar.gz *.kar.bz2)</source>
+        <translation>Karaoke (*.kar *.KAR *.kar.gz *.kar.bz2)</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <location line="+24"/>
+        <location line="+11"/>
+        <location line="+7"/>
+        <location line="+15"/>
+        <location line="+15"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+8"/>
+        <location line="+6"/>
+        <location line="+8"/>
+        <location line="+8"/>
+        <source>All Files (*)</source>
+        <translation>Alle Dateien (*)</translation>
+    </message>
+    <message>
+        <location line="-101"/>
+        <source>Midi (*.mid)</source>
+        <translation>Midi (*.mid)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Karaoke (*.kar)</source>
+        <translation>Karaoke (*.kar)</translation>
     </message>
     <message>
         <location line="+6"/>
-        <source>Wave edit tools</source>
-        <translation type="unfinished"></translation>
+        <source>all known files (*.med *.med.gz *.med.bz2 *.mid *.midi *.kar)</source>
+        <translation>Alle bekannten Dateien (*.med *.med.gz *.med.bz2 *.mid *.midi *.kar)</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>transport</source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>med Files (*.med *.med.gz *.med.bz2)</source>
+        <translation>med Files (*.med *.med.gz *.med.bz2)</translation>
     </message>
     <message>
+        <location line="+1"/>
         <location line="+8"/>
-        <source>WaveEdit tools</source>
-        <translation type="unfinished"></translation>
+        <location line="+7"/>
+        <source>Uncompressed med Files (*.med)</source>
+        <translation>Unkomprimierte med-Dateien (*.med)</translation>
     </message>
-</context>
-<context>
-    <name>WaveTrackInfoBase</name>
     <message>
-        <source>MusE: TrackInfo</source>
-        <translation type="obsolete">MusE: Spurinfo</translation>
+        <location line="-14"/>
+        <location line="+8"/>
+        <location line="+7"/>
+        <source>gzip compressed med Files (*.med.gz)</source>
+        <translation>Mit gzip komprimierte med-Dateien (*.med.gz)</translation>
     </message>
     <message>
-        <source>Track Info</source>
-        <translation type="obsolete">Spurinfo</translation>
+        <location line="-14"/>
+        <location line="+8"/>
+        <location line="+7"/>
+        <source>bzip2 compressed med Files (*.med.bz2)</source>
+        <translation>Mit bzip2 komprimierte med-Dateien (*.med.bz2)</translation>
     </message>
     <message>
-        <source>Track Name</source>
-        <translation type="obsolete">Spurname</translation>
+        <location line="-14"/>
+        <source>mid Files (*.mid *.midi *.kar *.MID *.MIDI *.KAR)</source>
+        <translation>Midi-Dateien (*.mid *.midi *.kar *.MID *.MIDI *.KAR)</translation>
     </message>
     <message>
-        <source>Output Route:</source>
-        <translation type="obsolete">Ausgangssignalfluss:</translation>
+        <location line="+19"/>
+        <source>(*.jpg *.gif *.png)</source>
+        <translation>(*.jpg *.gif *.png)</translation>
     </message>
     <message>
-        <source>Input Route:</source>
-        <translation type="obsolete">Eingangssignalfluss:</translation>
+        <location line="+1"/>
+        <source>(*.jpg)</source>
+        <translation>(*.jpg)</translation>
     </message>
     <message>
-        <source>Ports:</source>
-        <translation type="obsolete">Anschlüsse:</translation>
+        <location line="+1"/>
+        <source>(*.gif)</source>
+        <translation>(*.gif)</translation>
     </message>
     <message>
-        <source>Mono</source>
-        <translation type="obsolete">Mono</translation>
+        <location line="+1"/>
+        <source>(*.png)</source>
+        <translation>(*.png)</translation>
     </message>
     <message>
-        <source>Stereo</source>
-        <translation type="obsolete">Stereo</translation>
+        <location line="+15"/>
+        <source>part Files (*.mpt *.mpt.gz *.mpt.bz2)</source>
+        <translation>Part-Dateien (*.mpt *.mpt.gz *.mpt.bz2)</translation>
     </message>
-</context>
-<context>
-    <name>WaveView</name>
     <message>
-        <location filename="../../muse/waveedit/waveview.cpp" line="+359"/>
-        <source>MusE - external editor failed</source>
-        <translation type="unfinished"></translation>
+        <location line="+5"/>
+        <source>part Files (*.mpt)</source>
+        <translation>Part-Dateien (*.mpt)</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>MusE was unable to launch the external editor
-check if the editor setting in:
-Global Settings-&gt;Audio:External Waveditor
-is set to a valid editor.</source>
-        <translation type="unfinished"></translation>
+        <source>gzip compressed part Files (*.mpt.gz)</source>
+        <translation>Mit gzip komprimierte Part-Dateien (*.mpt.gz)</translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>MusE - file size changed</source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>bzip2 compressed part Files (*.mpt.bz2)</source>
+        <translation>Mit bzip2 komprimierte Part-Dateien (*.mpt.bz2)</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Presets (*.pre *.pre.gz *.pre.bz2)</source>
+        <translation>Voreinstellungen (*.pre *.pre.gz *.pre.bz2)</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Presets (*.pre)</source>
+        <translation>Voreinstellungen (*.pre)</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>When editing in external editor - you should not change the filesize
-since it must fit the selected region.
-
-Missing data is muted</source>
-        <translation type="unfinished"></translation>
+        <source>gzip compressed presets (*.pre.gz)</source>
+        <translation>mit gzip komprimierte Voreinstellungen (*.pre.gz)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>bzip2 compressed presets (*.pre.bz2)</source>
+        <translation>mit bzip2 komprimierte Voreinstellungen (*.pre.bz2)</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Presets (*.map *.map.gz *.map.bz2)</source>
+        <translation>Schlagzeugbelegungen (*.map *.map.gz *.map.bz2)</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Presets (*.map)</source>
+        <translation>Schlagzeugbelegungen (*.map)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>gzip compressed presets (*.map.gz)</source>
+        <translation>mit gzip komprimierte Schlagzeugbelegungen (*.map.gz)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>bzip2 compressed presets (*.map.bz2)</source>
+        <translation>mit bzip2 komprimierte Schlagzeugbelegungen (*.map.bz2)</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Wave/Binary (*.wav *.ogg *.bin)</source>
+        <translation>Wave/Binär (*.wav *.ogg *.bin)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Wave (*.wav *.ogg)</source>
+        <translation>Wave (*.wav *.ogg)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Binary (*.bin)</source>
+        <translation>Binär (*.bin)</translation>
     </message>
 </context>
 <context>
@@ -15856,158 +19232,162 @@ Missing data is muted</source>
     <message>
         <location filename="../plugins/1050.ui" line="+20"/>
         <source>FreeVerb</source>
-        <translation type="unfinished"></translation>
+        <translation>FreeVerb</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Room Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Raumgröße</translation>
     </message>
     <message>
         <location line="+88"/>
         <source>Damping</source>
-        <translation type="unfinished"></translation>
+        <translation>Dämpfung</translation>
     </message>
     <message>
         <location line="+60"/>
         <source>Wet Level</source>
-        <translation type="unfinished"></translation>
+        <translation>Effektstärke</translation>
     </message>
     <message>
         <location filename="../plugins/2142.ui" line="+26"/>
         <source>Tap-Reverberator</source>
-        <translation type="unfinished"></translation>
+        <translation>Tap-Reverberator</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Decay [ms]</source>
-        <translation type="unfinished"></translation>
+        <translation>Abschwellzeit [ms]</translation>
     </message>
     <message>
         <location line="+59"/>
         <location line="+41"/>
         <source>dB</source>
-        <translation type="unfinished">dB</translation>
+        <translation>dB</translation>
     </message>
     <message>
         <location line="-31"/>
         <source>Dry Level [dB]</source>
-        <translation type="unfinished"></translation>
+        <translation>Lautstärke des
+unmodifizierten
+Signals (Dry Level) [dB]</translation>
     </message>
     <message>
         <location line="+41"/>
         <source>Wet Level [dB]</source>
-        <translation type="unfinished"></translation>
+        <translation>Lautstärke des
+modifizierten
+Signals (Wet Level) [dB]</translation>
     </message>
     <message>
         <location line="+72"/>
         <source>Preset:</source>
-        <translation type="unfinished"></translation>
+        <translation>Vorlage:</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>AfterBurn</source>
-        <translation type="unfinished"></translation>
+        <translation>AfterBurn</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>AfterBurn (Long)</source>
-        <translation type="unfinished"></translation>
+        <translation>AfterBurn (Lang)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Ambience</source>
-        <translation type="unfinished"></translation>
+        <translation>Ambience</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Ambience (Thick)</source>
-        <translation type="unfinished"></translation>
+        <translation>Ambience (Fett)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Ambience (Thick) - HD</source>
-        <translation type="unfinished"></translation>
+        <translation>Ambience (Fett) - HD</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Cathedral</source>
-        <translation type="unfinished"></translation>
+        <translation>Kathedrale</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Cathedral - HD</source>
-        <translation type="unfinished"></translation>
+        <translation>Kathedrale - HD</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Drum Chamber</source>
-        <translation type="unfinished"></translation>
+        <translation>Schlagzeugraum</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Garage</source>
-        <translation type="unfinished"></translation>
+        <translation>Garage</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Garage (Bright)</source>
-        <translation type="unfinished"></translation>
+        <translation>Garage (Hell)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Gymnasium</source>
-        <translation type="unfinished"></translation>
+        <translation>Sporthalle</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Gymnasium (Bright)</source>
-        <translation type="unfinished"></translation>
+        <translation>Sporthalle (Hell)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Gymnasium (Bright) - HD</source>
-        <translation type="unfinished"></translation>
+        <translation>Sporthalle (Hell) -HD</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Hall (Small)</source>
-        <translation type="unfinished"></translation>
+        <translation>Halle (Klein)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Hall (Medium)</source>
-        <translation type="unfinished"></translation>
+        <translation>Halle (Mittel)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Hall (Large)</source>
-        <translation type="unfinished"></translation>
+        <translation>Halle (Groß)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Hall (Large) - HD</source>
-        <translation type="unfinished"></translation>
+        <translation>Halle (Groß) - HD</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Plate (Small)</source>
-        <translation type="unfinished"></translation>
+        <translation>Plate (Klein)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Plate (Medium)</source>
-        <translation type="unfinished"></translation>
+        <translation>Plate (Mittel)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Plate (Large)</source>
-        <translation type="unfinished"></translation>
+        <translation>Plate (Groß)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Plate (Large) - HD</source>
-        <translation type="unfinished"></translation>
+        <translation>Plate (Groß) - HD</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -16037,22 +19417,22 @@ Missing data is muted</source>
     <message>
         <location line="+5"/>
         <source>Room (Small)</source>
-        <translation type="unfinished"></translation>
+        <translation>Raum (Klein)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Room (Medium)</source>
-        <translation type="unfinished"></translation>
+        <translation>Raum (Mittel)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Room (Large)</source>
-        <translation type="unfinished"></translation>
+        <translation>Raum (Groß)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Room (Large) - HD</source>
-        <translation type="unfinished"></translation>
+        <translation>Raum (Groß) - HD</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -16137,7 +19517,881 @@ Missing data is muted</source>
     <message>
         <location line="+7"/>
         <source>Enhanced Stereo</source>
-        <translation type="unfinished"></translation>
+        <translation>Erweitertes Stereo</translation>
+    </message>
+</context>
+<context>
+    <name>shortcuts</name>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="+54"/>
+        <source>Transport: Start playback from current location</source>
+        <translation>Transport: Abspielen ab momentaner Position</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Toggle metronome</source>
+        <translation>Transport: Metronom ein-/ausschalten</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Stop Playback</source>
+        <translation>Transport: Stopp</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Goto Start</source>
+        <translation>Transport: Zum Anfang gehen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Play, Stop, Rewind</source>
+        <translation>Transport: Start, Stopp, Zurückspulen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Goto left marker</source>
+        <translation>Transport: Zum linken Marker gehen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Goto right marker</source>
+        <translation>Transport: zum rechten Marker gehen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Toggle Loop section</source>
+        <translation>Transport: Schleife umschalten</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Toggle Record</source>
+        <translation>Transport: Aufnahme ein-/ausschalten</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Clear all rec enabled tracks</source>
+        <translation>Transport: Alle Aufnahmemarkierungen zurücksetzen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Toggle fullscreen</source>
+        <translation>Vollbild umschalten</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit: Copy</source>
+        <translation>Bearbeiten: Kopieren</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Copy in range</source>
+        <translation>Bearbeiten: Im Bereich kopieren</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Undo</source>
+        <translation>Bearbeiten: Rückgängig</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Redo</source>
+        <translation>Bearbeiten: Wiederholen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Cut</source>
+        <translation>Bearbeiten: Ausschneiden</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Paste</source>
+        <translation>Bearbeiten: Einfügen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Paste (with dialog)</source>
+        <translation>Bearbeiten: Einfügen (Dialog zeigen)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Delete</source>
+        <translation>Bearbeiten: Löschen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>File: New project</source>
+        <translation>Datei: Neues Projekt</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>File: Open from disk</source>
+        <translation>Datei: Öffnen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>File: Save project</source>
+        <translation>Datei: Speichern</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>File: Open recent file</source>
+        <translation>Datei: Letzt Datei öffnen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>File: Save as</source>
+        <translation>Datei: Speichern unter</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>File: Load template</source>
+        <translation>Datei: als Vorlage laden</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>File: Import midi file</source>
+        <translation>Datei: MIDI-Datei importieren</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>File: Export midi file</source>
+        <translation>Datei: MIDI-Datei exportieren</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>File: Import midi part</source>
+        <translation>Datei: Midipart importieren</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>File: Import audio file</source>
+        <translation>Datei: Audiodatei importieren</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>File: Quit MusE</source>
+        <translation>Datei: Beenden</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit: Select parts on track</source>
+        <translation>Bearbeiten: Parts auf der Spur auswählen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Open pianoroll</source>
+        <translation>Piano Roll öffnen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Open drumeditor</source>
+        <translation>Schlagzeugeditor öffnen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Open listeditor</source>
+        <translation>Listeneditor öffnen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Open waveeditor</source>
+        <translation>Wave-Editor öffnen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Open graphical mastertrack editor</source>
+        <translation>Graphischen Masterspureditor öffnen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Open list mastertrack editor</source>
+        <translation>Listen-Masterspureditor öffnen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Open midi transformer</source>
+        <translation>Midi-Transformer öffnen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add midi track</source>
+        <translation>Midispur hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add drum track</source>
+        <translation>Schlagzeugspur hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add wave track</source>
+        <translation>Wavespur hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add audio output</source>
+        <translation>Audioausgang hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add audio group</source>
+        <translation>Audiogruppe hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add audio input</source>
+        <translation>Audioeingang hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add audio aux</source>
+        <translation>Audio Aux hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Structure: Global cut</source>
+        <translation>Struktur: Globaler Schnitt</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Structure: Global insert</source>
+        <translation>Struktur: Globales Einfügen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Structure: Global split</source>
+        <translation>Struktur: Globales Teilen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Structure: Cut events</source>
+        <translation>Struktur: Events ausschneiden</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>View: Open mixer #1 window</source>
+        <translation>Zeigen: Mixerfenster 1 anzeigen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>View: Open mixer #2 window</source>
+        <translation>Zeigen: Mixerfenster 2 anzeigen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>View: Toggle transport window</source>
+        <translation>Zeigen: Transportfenster umschalten</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>View: Toggle bigtime window</source>
+        <translation>Zeigen: Große Zeitanzeige umschalten</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>View: Open marker window</source>
+        <translation>Zeigen: Markerfenster umschalten</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Settings: Follow song by page</source>
+        <translation>Einstellungen: Dem Lied seitenweise folgen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Follow song off</source>
+        <translation>Einstellungen: Dem Lied nicht folgen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Follow song continuous</source>
+        <translation>Einstellungen: Dem Lied ständig folgen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Settings: Global configuration</source>
+        <translation>Einstellungen: Globale Konfiguration</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Configure shortcuts</source>
+        <translation>Einstellungen: Tastenkürzel einstellen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Configure metronome</source>
+        <translation>Einstellungen: Metronom einstellen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Midi sync configuration</source>
+        <translation>Einstellungen: Midi Sync Konfiguration</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Midi file import/export configuration</source>
+        <translation>Einstellungen: Midi Import/Export-Konfiguration</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Appearance settings</source>
+        <translation>Einstellungen: Erscheinungsbild einstellen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Midi ports / Soft Synth</source>
+        <translation>Einstellungen: Midianschlüsse / Software Synthesizer</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Audio subsystem configuration</source>
+        <translation>Einstellungen: Audiosystem einstellen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Midi: Edit midi instruments</source>
+        <translation>Midi: Midiinstrumente bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi: Open midi input transform</source>
+        <translation>Midi: Midi-Eingangstransformation öffnen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi: Open midi input filter</source>
+        <translation>Midi: Midi-Eingangsfilter öffnen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi: Midi input transpose</source>
+        <translation>Midi: Midieingang transponieren</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi: Midi remote control</source>
+        <translation>Midi: Midi-Fernbedienung</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Midi: Random rhythm generator</source>
+        <translation>Midi: Zufälliger-Rhythmus-Generator</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Midi: Reset midi</source>
+        <translation>Midi: Zurücksetzen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi: Init midi</source>
+        <translation>Midi: Initialisieren</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi: Midi local off</source>
+        <translation>Midi: Lokal aus</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Audio: Bounce audio to track</source>
+        <translation>Audio: Auf Spur abmischen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Audio: Bounce audio to file</source>
+        <translation>Audio: In Datei abmischen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Audio: Restart audio</source>
+        <translation>Audio: Neustarten</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Automation: Mixer automation</source>
+        <translation>Automatisierung: Mixerautomatisierung</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Automation: Take mixer snapshot</source>
+        <translation>Automatisierung: Mixer-Schnappschuss aufnehmen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Automation: Clear mixer automation</source>
+        <translation>Automatisierung: Mixerautomatisierung löschen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Help: Open Manual</source>
+        <translation>Hilfe: Handbuch öffnen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Help: Toggle whatsthis mode</source>
+        <translation>Hilfe: &quot;Was ist das?&quot;</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit: Edit selected part</source>
+        <translation>Bearbeiten: Markierten Part bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select nearest part on track above</source>
+        <translation>Bearbeiten: Nächsten Part auf vorheriger Spur markieren</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Add nearest part on track above</source>
+        <translation>Bearbeiten: Nächsten Part auf vorheriger Spur hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select nearest part on track below</source>
+        <translation>Bearbeiten: Nächsten Part auf nächster Spur markieren</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Add nearest part on track below</source>
+        <translation>Bearbeiten: Nächsten Part auf nächster Spur hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit: Insert empty measure</source>
+        <translation>Bearbeiten: Leeren Takt einfügen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit: Paste as clones</source>
+        <translation>Bearbeiten: Als Klone einfügen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Paste as clones (with dialog)</source>
+        <translation>Bearbeiten: Als Klone einfügen (Dialog zeigen)</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select track above</source>
+        <translation>Vorherige Spur auswählen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Select track below</source>
+        <translation>Nächste Spur auswählen</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Midi: Transpose</source>
+        <translation>Midi: Transponieren</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit: Select all</source>
+        <translation>Bearbeiten: Alles auswählen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select none</source>
+        <translation>Bearbeiten: Nichts auswählen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Invert Selection</source>
+        <translation>Bearbeiten: Auswahl invertieren</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select events/parts inside locators</source>
+        <translation>Bearbeiten: Alles im Bereich auswählen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select events/parts outside locators</source>
+        <translation>Bearbeiten: Alles außerhalb des Bereichs auswählen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select previous part</source>
+        <translation>Bearbeiten: Vorherigen Part auswählen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select next part</source>
+        <translation>Bearbeiten: Nächsten Part auswählen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select nearest part/event to the left or move cursor</source>
+        <translation>Bearbeiten: Nächsten Part / nächstes Event links auswählen, oder Cursor verschieben</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Add nearest part/event to the left to selection</source>
+        <translation>Bearbeiten: Nächsten Part / nächstes Event links zur Auswahl hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select nearest part/event to the right or move cursor</source>
+        <translation>Bearbeiten: Nächsten Part / nächstes Event rechts auswählen, oder Cursor verschieben</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Add nearest part/event to the right to selection</source>
+        <translation>Bearbeiten: Nächsten Part / nächstes Event rechts zur Auswahl hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Set locators to selection</source>
+        <translation>Bearbeiten: Bereich von Auswahl setzen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Increase pitch</source>
+        <translation>Bearbeiten: Tonhöhe erhöhen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Decrease pitch</source>
+        <translation>Bearbeiten: Tonhöhe erniedrigen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Increase event position</source>
+        <translation>Bearbeiten: Eventposition erhöhen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Decrease event position</source>
+        <translation>Bearbeiten: Eventposition erniedrigen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>View: Zoom in</source>
+        <translation>Zeigen: Hereinzoomen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>View: Zoom out</source>
+        <translation>Zeigen: Herauszoomen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>View: Goto Current Position</source>
+        <translation>Zeigen: Zur momentanen Position gehen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+1"/>
+        <source>View: Scroll left</source>
+        <translation>Zeigen: Nach links scrollen</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Edit: Set Fixed Length on Midi Events</source>
+        <translation>Bearbeiten: feste Länge für Midi-Events setzen</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Quantize</source>
+        <translation>Quantisieren</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Modify Note Length</source>
+        <translation>Notenlänge verändern</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Modify Velocity</source>
+        <translation>Anschlagsdynamik ändern</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Crescendo</source>
+        <translation>Bearbeiten: Crescendo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Thin Out</source>
+        <translation>Bearbeiten: Ausdünnen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Erase Event</source>
+        <translation>Bearbeiten: Event löschen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Delete Overlaps</source>
+        <translation>Bearbeiten: Ãœberlappende Noten entfernen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Note Shift</source>
+        <translation>Bearbeiten: Noten verschieben</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Move Clock</source>
+        <translation>Bearbeiten: Uhr verschieben</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Copy Measure</source>
+        <translation>Bearbeiten: Takt kopieren</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Erase Measure</source>
+        <translation>Bearbeiten: Takt löschen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Delete Measure</source>
+        <translation>Bearbeiten: Takt löschen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Create Measure</source>
+        <translation>Bearbeiten: Takt erstellen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Change Event Color</source>
+        <translation>Bearbeiten: Eventfarbe ändern</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool: Pointer</source>
+        <translation>Werkzeug: Zeiger</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tool: Pencil</source>
+        <translation>Werkzeug: Stift</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tool: Eraser</source>
+        <translation>Werkzeug: Radierer</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Tool: Line Draw</source>
+        <translation>Werkzeug: Linie</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Tool: Cursor</source>
+        <translation>Werkzeug: Cursor</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add note velocity 1</source>
+        <translation>Note mit Anschlagsdynamik 1 hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add note velocity 2</source>
+        <translation>Note mit Anschlagsdynamik 2 hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add note velocity 3</source>
+        <translation>Note mit Anschlagsdynamik 3 hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add note velocity 4</source>
+        <translation>Note mit Anschlagsdynamik 4 hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cursor step size: larger</source>
+        <translation>Cursorschrittweite: größer</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cursor step size: smaller</source>
+        <translation>Cursorschrittweite: kleiner</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Instrument/Cursor up</source>
+        <translation>Instrument/Cursor nach oben</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Instrument/Cursor down</source>
+        <translation>Instrument/Cursor nach unten</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Tool: Scissor</source>
+        <translation>Werkzeug: Schere</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tool: Glue</source>
+        <translation>Werkzeug: Kleber</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tool: Mute</source>
+        <translation>Werkzeug: Stummschalten</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Transport: Increase current position</source>
+        <translation>Transport: Momentane Position erhöhen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Decrease current position</source>
+        <translation>Transport: Momentane Position erniedrigen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Transport: Increase current position, no snap</source>
+        <translation>Transport: Momentane Position erhöhen, kein Einrasten</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Decrease current position, no snap</source>
+        <translation>Transport: Momentane Position erniedrigen, kein Einrasten</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Quantize: Set quantize to 1/1 note</source>
+        <translation>Quantisieren: Ganze Noten</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantize: Set quantize to 1/2 note</source>
+        <translation>Quantisieren: Halbe Noten</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantize: Set quantize to 1/4 note</source>
+        <translation>Quantisieren: Viertelnoten</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantize: Set quantize to 1/8 note</source>
+        <translation>Quantisieren: Achtelnoten</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantize: Set quantize to 1/16 note</source>
+        <translation>Quantisieren: 16telnoten</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantize: Set quantize to 1/32 note</source>
+        <translation>Quantisieren: 32telnoten</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantize: Set quantize to 1/64 note</source>
+        <translation>Quantisieren: 64telnoten</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Quantize: Toggle triol quantization</source>
+        <translation>Quantisieren: Triolenquantisierung umschalten</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantize: Toggle punctuation quantization</source>
+        <translation>Quantisieren: punktierte Quantisierung umschalten</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantize: Toggle punctuation quantization (2)</source>
+        <translation>Quantisieren: punktierte Quantisierung umschalten (2)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Insert at location</source>
+        <translation>Bearbeiten: Bei Position einfügen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit: Increase length</source>
+        <translation>Bearbeiten: Länge erhöhen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Decrease length</source>
+        <translation>Bearbeiten: Länge erniedrigen</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Insert Note</source>
+        <translation>Note einfügen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert SysEx</source>
+        <translation>SysEx einfügen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert Ctrl</source>
+        <translation>Ctrl einfügen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert Meta</source>
+        <translation>Meta einfügen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert Channel Aftertouch</source>
+        <translation>Channel Aftertouch einfügen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert Key Aftertouch</source>
+        <translation>Key Aftertouch einfügen</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Insert Tempo</source>
+        <translation>Tempo einfügen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert Signature</source>
+        <translation>Taktmaß einfügen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Change Event Position</source>
+        <translation>Eventposition verändern</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit Event Value</source>
+        <translation>Eventwert bearbeiten</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert Key</source>
+        <translation>Tonart einfügen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Goto Next Marker</source>
+        <translation>Zum nächsten Marker gehen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Goto Prev Marker</source>
+        <translation>Zum vorherigen Marker gehen</translation>
     </message>
 </context>
 </TS>
diff --git a/muse2/share/locale/muse_en.ts b/muse2/share/locale/muse_en.ts
index e01374b1..867761ce 100644
--- a/muse2/share/locale/muse_en.ts
+++ b/muse2/share/locale/muse_en.ts
@@ -4,459 +4,85 @@
 <context>
     <name>@default</name>
     <message>
-        <location filename="../../muse/app.cpp" line="89"/>
-        <source>Click this button to open a &lt;em&gt;new song&lt;/em&gt;.&lt;br&gt;You can also select the &lt;b&gt;Open command&lt;/b&gt; from the File menu.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/app.cpp" line="92"/>
-        <source>Click this button to save the song you are editing.  You will be prompted for a file name.
-You can also select the Save command from the File menu.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/app.cpp" line="95"/>
-        <source>Create New Song</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/app.cpp" line="97"/>
-        <source>loop between left mark and right mark</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/app.cpp" line="98"/>
-        <source>record starts at left mark</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/app.cpp" line="99"/>
-        <source>record stops at right mark</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/app.cpp" line="100"/>
-        <source>rewind to start position</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/app.cpp" line="101"/>
-        <source>rewind current position</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/app.cpp" line="102"/>
-        <source>move current position</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/app.cpp" line="103"/>
-        <source>stop sequencer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/app.cpp" line="104"/>
-        <source>start sequencer play</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/app.cpp" line="105"/>
-        <source>to record press record and then play</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/app.cpp" line="106"/>
-        <source>send note off to all midi channels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="155"/>
-        <location filename="../../muse/master/masteredit.cpp" line="155"/>
-        <location filename="../../muse/widgets/comboQuant.cpp" line="40"/>
-        <location filename="../../muse/widgets/comboQuant.cpp" line="41"/>
-        <location filename="../../muse/widgets/comboQuant.cpp" line="42"/>
-        <location filename="../../muse/widgets/tb1.cpp" line="48"/>
-        <location filename="../../muse/widgets/tb1.cpp" line="49"/>
-        <location filename="../../muse/widgets/tb1.cpp" line="50"/>
-        <source>Off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="155"/>
-        <source>Bar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/helper.cpp" line="242"/>
-        <source>MESS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/helper.cpp" line="250"/>
-        <source>DSSI</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/helper.cpp" line="259"/>
-        <source>FST</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/helper.cpp" line="285"/>
+        <location filename="../../muse/helper.cpp" line="185"/>
         <source>Add Midi Track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/helper.cpp" line="289"/>
+        <location filename="../../muse/helper.cpp" line="191"/>
         <source>Add Drum Track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/helper.cpp" line="293"/>
+        <location filename="../../muse/helper.cpp" line="197"/>
         <source>Add Wave Track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/helper.cpp" line="297"/>
+        <location filename="../../muse/helper.cpp" line="204"/>
         <source>Add Audio Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/helper.cpp" line="301"/>
+        <location filename="../../muse/helper.cpp" line="211"/>
         <source>Add Audio Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/helper.cpp" line="305"/>
+        <location filename="../../muse/helper.cpp" line="218"/>
         <source>Add Audio Input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/helper.cpp" line="309"/>
+        <location filename="../../muse/helper.cpp" line="225"/>
         <source>Add Aux Send</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/helper.cpp" line="316"/>
+        <location filename="../../muse/helper.cpp" line="234"/>
         <source>Add Synth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/confmport.cpp" line="729"/>
-        <source> Jack</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="775"/>
-        <source>ALSA:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="801"/>
-        <source>SYNTH:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="827"/>
-        <source>JACK:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/driver/alsamidi.cpp" line="209"/>
-        <location filename="../../muse/driver/jackmidi.cpp" line="290"/>
-        <location filename="../../muse/midiport.cpp" line="1138"/>
-        <location filename="../../muse/track.cpp" line="799"/>
-        <location filename="../../muse/track.cpp" line="815"/>
-        <location filename="../../muse/track.cpp" line="845"/>
+        <location filename="../../muse/midiport.cpp" line="1190"/>
         <source>Route</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/driver/alsamidi.cpp" line="211"/>
-        <location filename="../../muse/driver/jackmidi.cpp" line="292"/>
-        <location filename="../../muse/track.cpp" line="817"/>
-        <location filename="../../muse/track.cpp" line="854"/>
-        <source> channel=&quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/driver/alsamidi.cpp" line="214"/>
-        <location filename="../../muse/driver/jackmidi.cpp" line="295"/>
-        <location filename="../../muse/midiport.cpp" line="1145"/>
-        <location filename="../../muse/track.cpp" line="806"/>
-        <location filename="../../muse/track.cpp" line="866"/>
+        <location filename="../../muse/midiport.cpp" line="1197"/>
         <source>dest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/driver/alsamidi.cpp" line="216"/>
-        <location filename="../../muse/driver/jackmidi.cpp" line="297"/>
-        <source> devtype=&quot;%1&quot;</source>
+        <location filename="../../muse/midiport.cpp" line="1198"/>
+        <source> name=&quot;%1&quot;/</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/driver/alsamidi.cpp" line="219"/>
-        <location filename="../../muse/driver/jackmidi.cpp" line="277"/>
-        <location filename="../../muse/driver/jackmidi.cpp" line="300"/>
-        <location filename="../../muse/track.cpp" line="824"/>
-        <location filename="../../muse/track.cpp" line="872"/>
-        <source> type=&quot;%1&quot;</source>
+        <location filename="../../muse/midiport.cpp" line="341"/>
+        <source>Warning: No output devices!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/driver/alsamidi.cpp" line="220"/>
-        <location filename="../../muse/driver/jackmidi.cpp" line="278"/>
-        <location filename="../../muse/driver/jackmidi.cpp" line="301"/>
-        <location filename="../../muse/midiport.cpp" line="1146"/>
-        <location filename="../../muse/track.cpp" line="807"/>
-        <location filename="../../muse/track.cpp" line="825"/>
-        <location filename="../../muse/track.cpp" line="878"/>
-        <source> name=&quot;%1&quot;/</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/driver/jackmidi.cpp" line="275"/>
-        <location filename="../../muse/track.cpp" line="822"/>
-        <source>source</source>
+        <location filename="../../muse/midiport.cpp" line="346"/>
+        <source>Open midi config...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midictrl.cpp" line="242"/>
-        <source>Velocity</source>
+        <location filename="../../muse/midiport.cpp" line="369"/>
+        <source>Empty ports</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiport.cpp" line="339"/>
+        <location filename="../../muse/midiport.cpp" line="391"/>
         <source>&lt;none&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiport.cpp" line="1140"/>
-        <location filename="../../muse/track.cpp" line="801"/>
-        <location filename="../../muse/track.cpp" line="849"/>
+        <location filename="../../muse/midiport.cpp" line="1192"/>
         <source> channelMask=&quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../../muse/osc.cpp" line="1320"/>
-        <source>dssi_synth</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/osc.cpp" line="1407"/>
-        <source>ladspa_efx</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/track.cpp" line="857"/>
-        <source> channels=&quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/track.cpp" line="859"/>
-        <source> remch=&quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/track.cpp" line="876"/>
-        <source> mport=&quot;%1&quot;/</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/transport.cpp" line="46"/>
-        <source>Click this button to enable recording</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/transport.cpp" line="47"/>
-        <source>Click this button to stop playback</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/transport.cpp" line="48"/>
-        <source>Click this button to start playback</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/transport.cpp" line="49"/>
-        <source>Click this button to rewind to start position</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/transport.cpp" line="50"/>
-        <source>Click this button to rewind</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/transport.cpp" line="51"/>
-        <source>Click this button to forward current play position</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/widgets/tools.cpp" line="33"/>
-        <source>select Pointer Tool:
-with the pointer tool you can:
-  select parts
-  move parts
-  copy parts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/widgets/tools.cpp" line="38"/>
-        <source>select Pencil Tool:
-with the pencil tool you can:
-  create new parts
-  modify length of parts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/widgets/tools.cpp" line="42"/>
-        <source>select Delete Tool:
-with the delete tool you can delete parts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/widgets/tools.cpp" line="44"/>
-        <source>select Cut Tool:
-with the cut tool you can split a part</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/widgets/tools.cpp" line="46"/>
-        <source>select Glue Tool:
-with the glue tool you can glue two parts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/widgets/tools.cpp" line="48"/>
-        <source>select Score Tool:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/widgets/tools.cpp" line="49"/>
-        <source>select Quantize Tool:
-insert display quantize event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/widgets/tools.cpp" line="51"/>
-        <source>select Drawing Tool</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/widgets/tools.cpp" line="52"/>
-        <source>select Muting Tool:
-click on part to mute/unmute</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/widgets/tools.cpp" line="54"/>
-        <source>Manipulate automation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/widgets/tools.cpp" line="55"/>
-        <source>Cursor tool</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/widgets/tools.cpp" line="58"/>
-        <source>pointer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/widgets/tools.cpp" line="59"/>
-        <source>pencil</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/widgets/tools.cpp" line="60"/>
-        <source>eraser</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/widgets/tools.cpp" line="61"/>
-        <source>cutter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/widgets/tools.cpp" line="62"/>
-        <source>score</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/widgets/tools.cpp" line="63"/>
-        <source>glue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/widgets/tools.cpp" line="64"/>
-        <source>quantize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/widgets/tools.cpp" line="65"/>
-        <source>draw</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/widgets/tools.cpp" line="66"/>
-        <source>mute parts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/widgets/tools.cpp" line="67"/>
-        <source>edit automation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/widgets/tools.cpp" line="68"/>
-        <source>cursor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/widgets/visibletracks.cpp" line="35"/>
-        <location filename="../../muse/widgets/visibletracks.cpp" line="44"/>
-        <source>Show wave tracks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/widgets/visibletracks.cpp" line="36"/>
-        <location filename="../../muse/widgets/visibletracks.cpp" line="45"/>
-        <source>Show group tracks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/widgets/visibletracks.cpp" line="37"/>
-        <location filename="../../muse/widgets/visibletracks.cpp" line="46"/>
-        <source>Show aux tracks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/widgets/visibletracks.cpp" line="38"/>
-        <location filename="../../muse/widgets/visibletracks.cpp" line="47"/>
-        <source>Show input tracks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/widgets/visibletracks.cpp" line="39"/>
-        <location filename="../../muse/widgets/visibletracks.cpp" line="48"/>
-        <source>Show output tracks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/widgets/visibletracks.cpp" line="40"/>
-        <location filename="../../muse/widgets/visibletracks.cpp" line="49"/>
-        <source>Show midi tracks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/widgets/visibletracks.cpp" line="41"/>
-        <location filename="../../muse/widgets/visibletracks.cpp" line="50"/>
-        <source>Show synth tracks</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>AboutBox</name>
@@ -491,84 +117,6 @@ Published under the GNU Public License</source>
     </message>
 </context>
 <context>
-    <name>Appearance</name>
-    <message>
-        <location filename="../../muse/appearance.cpp" line="130"/>
-        <source>Main application font, and default font for any
- controls not defined here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/appearance.cpp" line="131"/>
-        <source>For small controls like mixer strips.
-Also timescale small numbers, arranger part name overlay,
- and effects rack.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/appearance.cpp" line="132"/>
-        <source>Midi track info panel. Transport controls.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/appearance.cpp" line="133"/>
-        <source>Controller graph and S/X buttons. Large numbers for time
- and tempo scale, and time signature.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/appearance.cpp" line="134"/>
-        <source>Time scale markers.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/appearance.cpp" line="135"/>
-        <source>List editor: meta event edit dialog multi-line edit box.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/appearance.cpp" line="136"/>
-        <source>Mixer label font. Auto-font-sizing up to chosen font size.
-Word-breaking but only with spaces.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/appearance.cpp" line="137"/>
-        <source>Maximum mixer label auto-font-sizing font size.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/appearance.cpp" line="139"/>
-        <source>Global opacity (opposite of transparency).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/appearance.cpp" line="143"/>
-        <source>Standard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/appearance.cpp" line="145"/>
-        <source>Custom</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/appearance.cpp" line="769"/>
-        <source>MusE: load image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/appearance.cpp" line="1103"/>
-        <source>Select style sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/appearance.cpp" line="1103"/>
-        <source>Qt style sheets (*.qss)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>AppearanceDialogBase</name>
     <message>
         <location filename="../../muse/widgets/appearancebase.ui" line="14"/>
@@ -908,34 +456,6 @@ Word-breaking but only with spaces.</source>
     </message>
 </context>
 <context>
-    <name>ClipListEdit</name>
-    <message>
-        <location filename="../../muse/cliplist/cliplist.cpp" line="127"/>
-        <source>MusE: Clip List Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/cliplist/cliplist.cpp" line="135"/>
-        <source>Undo/Redo tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/cliplist/cliplist.cpp" line="140"/>
-        <source>panic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/cliplist/cliplist.cpp" line="144"/>
-        <source>transport</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/cliplist/cliplist.cpp" line="148"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>ClipListEditorBase</name>
     <message>
         <location filename="../../muse/widgets/cliplisteditorbase.ui" line="17"/>
@@ -1004,107 +524,112 @@ Word-breaking but only with spaces.</source>
 <context>
     <name>ConfigMidiFileBase</name>
     <message>
-        <location filename="../../muse/widgets/configmidifilebase.ui" line="17"/>
+        <location filename="../../muse/widgets/configmidifilebase.ui" line="14"/>
         <source>MusE: Config Midi File Import/Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/configmidifilebase.ui" line="34"/>
+        <location filename="../../muse/widgets/configmidifilebase.ui" line="29"/>
         <source>Import:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/configmidifilebase.ui" line="40"/>
+        <location filename="../../muse/widgets/configmidifilebase.ui" line="38"/>
         <source>Split tracks into &amp;parts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/configmidifilebase.ui" line="43"/>
+        <location filename="../../muse/widgets/configmidifilebase.ui" line="41"/>
         <source>Alt+P</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/configmidifilebase.ui" line="46"/>
+        <location filename="../../muse/widgets/configmidifilebase.ui" line="35"/>
         <source>Split tracks into parts, or one single part</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/configmidifilebase.ui" line="64"/>
+        <location filename="../../muse/widgets/configmidifilebase.ui" line="57"/>
         <source>Export:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/configmidifilebase.ui" line="74"/>
+        <location filename="../../muse/widgets/configmidifilebase.ui" line="67"/>
         <source>96</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/configmidifilebase.ui" line="79"/>
+        <location filename="../../muse/widgets/configmidifilebase.ui" line="72"/>
         <source>192</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/configmidifilebase.ui" line="84"/>
+        <location filename="../../muse/widgets/configmidifilebase.ui" line="77"/>
         <source>384</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/configmidifilebase.ui" line="95"/>
+        <location filename="../../muse/widgets/configmidifilebase.ui" line="88"/>
         <source>Enable extended smf format (currently not implemented)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/configmidifilebase.ui" line="102"/>
+        <location filename="../../muse/widgets/configmidifilebase.ui" line="95"/>
         <source>Use &amp;2-byte time signatures instead of standard 4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/configmidifilebase.ui" line="105"/>
+        <location filename="../../muse/widgets/configmidifilebase.ui" line="98"/>
         <source>Alt+2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/configmidifilebase.ui" line="112"/>
+        <location filename="../../muse/widgets/configmidifilebase.ui" line="105"/>
         <source>Copyright:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/configmidifilebase.ui" line="122"/>
+        <location filename="../../muse/widgets/configmidifilebase.ui" line="115"/>
         <source>Format:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/configmidifilebase.ui" line="132"/>
+        <location filename="../../muse/widgets/configmidifilebase.ui" line="131"/>
+        <source>Note: Format 0 uses the FIRST midi track&apos;s name/comment in the arranger</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/configmidifilebase.ui" line="141"/>
         <source>Division:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/configmidifilebase.ui" line="142"/>
+        <location filename="../../muse/widgets/configmidifilebase.ui" line="151"/>
         <source>Save space by replacing note-offs with &amp;zero velocity note-ons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/configmidifilebase.ui" line="145"/>
+        <location filename="../../muse/widgets/configmidifilebase.ui" line="154"/>
         <source>Alt+Z</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/configmidifilebase.ui" line="153"/>
+        <location filename="../../muse/widgets/configmidifilebase.ui" line="162"/>
         <source>0 (single track)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/configmidifilebase.ui" line="158"/>
+        <location filename="../../muse/widgets/configmidifilebase.ui" line="167"/>
         <source>1 (multiple tracks)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/configmidifilebase.ui" line="193"/>
+        <location filename="../../muse/widgets/configmidifilebase.ui" line="202"/>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/configmidifilebase.ui" line="209"/>
+        <location filename="../../muse/widgets/configmidifilebase.ui" line="218"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1174,396 +699,320 @@ Word-breaking but only with spaces.</source>
     </message>
 </context>
 <context>
-    <name>CtrlPanel</name>
-    <message>
-        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="89"/>
-        <source>S</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="94"/>
-        <source>select controller</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="99"/>
-        <source>X</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="104"/>
-        <source>remove panel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="117"/>
-        <source>manual adjust</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="126"/>
-        <source>double click on/off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="127"/>
-        <source>off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="567"/>
-        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="803"/>
-        <source>Velocity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="617"/>
-        <source>add new ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="780"/>
-        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="838"/>
-        <source>Instrument-defined</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="795"/>
-        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="816"/>
-        <source>Add ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="799"/>
-        <source>Others</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="864"/>
-        <source>Edit instrument ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="910"/>
-        <source>Common Controls</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>DeicsOnzeGui</name>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="538"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="540"/>
         <source>Save configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="579"/>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="586"/>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1771"/>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1778"/>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1996"/>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2003"/>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2163"/>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2170"/>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2335"/>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2342"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="581"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="588"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1773"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1780"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1998"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2005"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2165"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2172"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2337"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2344"/>
         <source>Critical Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="580"/>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1772"/>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1997"/>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2164"/>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2336"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="582"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1774"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1999"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2166"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2338"/>
         <source>Cannot open file %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="587"/>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1779"/>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2004"/>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2171"/>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2343"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="589"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1781"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2006"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2173"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2345"/>
         <source>Parsing error for file %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="621"/>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1985"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="623"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1987"/>
         <source>Load category dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1759"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1761"/>
         <source>Load set dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1826"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1828"/>
         <source>Save set dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1850"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1852"/>
         <source>New category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1852"/>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1953"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1854"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1955"/>
         <source>Delete category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1854"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1856"/>
         <source>Load category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1856"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1858"/>
         <source>Save category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1863"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1865"/>
         <source>Load set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1865"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1867"/>
         <source>Save set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1867"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1869"/>
         <source>Delete set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1876"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1878"/>
         <source>New subcategory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1879"/>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2122"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1881"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2124"/>
         <source>Delete subcategory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1882"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1884"/>
         <source>Load subcategory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1885"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1887"/>
         <source>Save subcategory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1902"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1904"/>
         <source>New preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1904"/>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2293"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1906"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2295"/>
         <source>Delete preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1906"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1908"/>
         <source>Load preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1908"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1910"/>
         <source>Save preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1930"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1932"/>
         <source>No more category supported</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1931"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1933"/>
         <source>You can not add more categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1954"/>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2123"/>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2294"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1956"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2125"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2296"/>
         <source>Do you really want to delete %1 ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1956"/>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2126"/>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2296"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1958"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2128"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2298"/>
         <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1956"/>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2126"/>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2296"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1958"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2128"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2298"/>
         <source>&amp;No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1973"/>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2083"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1975"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2085"/>
         <source>No category selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1974"/>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2084"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="1976"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2086"/>
         <source>You must first select a category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2023"/>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2190"/>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2362"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2025"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2192"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2364"/>
         <source>Replace or add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2024"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2026"/>
         <source>%1 is supposed to be affected to the hbank number %2, but there is already one on this slot.
  Do you want to replace it or to add it in the next free slot ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2027"/>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2195"/>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2366"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2029"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2197"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2368"/>
         <source>&amp;Replace</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2027"/>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2195"/>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2366"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2029"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2197"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2368"/>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2037"/>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2204"/>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2375"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2039"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2206"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2377"/>
         <source>Download error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2038"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2040"/>
         <source>There is no more free category slot.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2066"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2068"/>
         <source>Save category dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2096"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2098"/>
         <source>No more subcategory supported</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2097"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2099"/>
         <source>You can not add more subcategories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2139"/>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2252"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2141"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2254"/>
         <source>No subcategory selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2140"/>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2253"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2142"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2255"/>
         <source>You must first select a subcategory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2152"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2154"/>
         <source>Load subcategory dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2191"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2193"/>
         <source>%1 is supposed to be affected to the lbank number %2, but there is already one on this slot.
  Do you want to replace it or to add it in the next free slot ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2205"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2207"/>
         <source>There is no more free subcategory slot.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2234"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2236"/>
         <source>Save subcategory dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2267"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2269"/>
         <source>No more preset supported</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2268"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2270"/>
         <source>You can not add more presets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2307"/>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2310"/>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2421"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2309"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2312"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2423"/>
         <source>No preset selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2308"/>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2311"/>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2422"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2310"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2313"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2424"/>
         <source>You must first select a preset.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2324"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2326"/>
         <source>Load preset dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2363"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2365"/>
         <source>%1 is supposed to be affected to the prog number %2, but there is already one on this slot.
  Do you want to replace it or to add it in the next free slot ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2376"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2378"/>
         <source>There is no more free preset slot.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2405"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2407"/>
         <source>Save preset dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2529"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2531"/>
         <source>Browse set dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2568"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="2570"/>
         <source>Browse image dialog</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3009,399 +2458,6 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
     </message>
 </context>
 <context>
-    <name>DrumEdit</name>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="111"/>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="132"/>
-        <source>mute instrument</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="112"/>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="133"/>
-        <source>sound name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="113"/>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="134"/>
-        <source>volume percent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="114"/>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="135"/>
-        <source>quantisation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="115"/>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="136"/>
-        <source>this input note triggers the sound</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="116"/>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="137"/>
-        <source>note length</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="117"/>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="138"/>
-        <source>this is the note which is played</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="118"/>
-        <source>output channel (hold ctl to affect all rows)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="119"/>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="140"/>
-        <source>output port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="120"/>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="141"/>
-        <source>shift + control key: draw velocity level 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="121"/>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="142"/>
-        <source>control key: draw velocity level 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="122"/>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="143"/>
-        <source>shift key: draw velocity level 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="123"/>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="144"/>
-        <source>draw velocity level 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="139"/>
-        <source>output channel (ctl: affect all rows)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="181"/>
-        <source>&amp;File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="183"/>
-        <source>Load Map</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="184"/>
-        <source>Save Map</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="185"/>
-        <source>Reset GM Map</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="195"/>
-        <source>&amp;Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="199"/>
-        <source>Cut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="200"/>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="201"/>
-        <source>Copy events in range</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="202"/>
-        <source>Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="203"/>
-        <source>Paste (with Dialog)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="205"/>
-        <source>Delete Events</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="221"/>
-        <source>&amp;Select</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="223"/>
-        <source>Select All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="224"/>
-        <source>Select None</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="225"/>
-        <source>Invert</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="227"/>
-        <source>Inside Loop</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="228"/>
-        <source>Outside Loop</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="232"/>
-        <source>Previous Part</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="233"/>
-        <source>Next Part</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="252"/>
-        <source>Fu&amp;nctions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="256"/>
-        <source>Re-order list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="258"/>
-        <source>Set Fixed Length</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="259"/>
-        <source>Modify Velocity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="260"/>
-        <source>Crescendo/Decrescendo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="261"/>
-        <source>Quantize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="262"/>
-        <source>Erase Event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="263"/>
-        <source>Move Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="264"/>
-        <source>Delete Overlaps</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="284"/>
-        <source>&amp;Plugins</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="287"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="298"/>
-        <source>Drum tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="302"/>
-        <source>Load Drummap</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="308"/>
-        <source>Store Drummap</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="320"/>
-        <source>Step Record</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="326"/>
-        <source>Midi Input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="335"/>
-        <source>cursor tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="340"/>
-        <source>Set step size for cursor edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="354"/>
-        <source>panic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="358"/>
-        <source>transport</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="376"/>
-        <source>ctrl</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="383"/>
-        <source>Add Controller View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="440"/>
-        <source>M</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="441"/>
-        <source>Sound</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="442"/>
-        <source>Vol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="443"/>
-        <source>QNT</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="444"/>
-        <source>E-Note</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="445"/>
-        <source>Len</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="446"/>
-        <source>A-Note</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="447"/>
-        <source>Ch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="448"/>
-        <source>Port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="449"/>
-        <source>LV1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="450"/>
-        <source>LV2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="451"/>
-        <source>LV3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="452"/>
-        <source>LV4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="825"/>
-        <source>Muse: Load Drum Map</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="878"/>
-        <source>MusE: Store Drum Map</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="903"/>
-        <source>Drum map</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="904"/>
-        <source>Reset the drum map with GM defaults?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>EditCAfterDialog</name>
-    <message>
-        <location filename="../../muse/liste/editevent.cpp" line="443"/>
-        <source>MusE: Enter Channel Aftertouch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/liste/editevent.cpp" line="445"/>
-        <source>Time Position</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/liste/editevent.cpp" line="449"/>
-        <source>Pressure</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>EditCtrlBase</name>
     <message>
         <location filename="../../muse/liste/editctrlbase.ui" line="14"/>
@@ -3476,19 +2532,6 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
     </message>
 </context>
 <context>
-    <name>EditEventDialog</name>
-    <message>
-        <location filename="../../muse/liste/editevent.cpp" line="188"/>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/liste/editevent.cpp" line="190"/>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>EditGainBase</name>
     <message>
         <location filename="../../muse/waveedit/editgainbase.ui" line="14"/>
@@ -3547,185 +2590,6 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
     </message>
 </context>
 <context>
-    <name>EditInstrument</name>
-    <message>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="311"/>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="345"/>
-        <source>MusE: Create file failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="378"/>
-        <source>MusE: Write File failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="410"/>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="422"/>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="702"/>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="714"/>
-        <source>MusE:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="411"/>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="703"/>
-        <source>The user instrument directory
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="411"/>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="703"/>
-        <source>
-does not exist yet. Create it now?
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="412"/>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="704"/>
-        <source>(You can change the user instruments directory at Settings-&gt;Global Settings-&gt;Midi)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="422"/>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="714"/>
-        <source>Unable to create user instrument directory
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="470"/>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="736"/>
-        <source>MusE: Save Instrument Definition</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="471"/>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="737"/>
-        <source>Instrument Definition (*.idf)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="583"/>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="612"/>
-        <source>MusE: Save instrument as</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="583"/>
-        <source>Enter a new unique instrument name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="613"/>
-        <source>The user instrument:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="613"/>
-        <source>
-already exists. This will overwrite its .idf instrument file.
-Are you sure?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="1138"/>
-        <source>MusE: Bad instrument name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="1139"/>
-        <source>Please choose a unique instrument name.
-(The name might be used by a hidden instrument.)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="1275"/>
-        <source>MusE: Bad patch name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="1276"/>
-        <source>Please choose a unique patch name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="1298"/>
-        <source>MusE: Bad patchgroup name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="1299"/>
-        <source>Please choose a unique patchgroup name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="1825"/>
-        <source>MusE: Bad controller name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="1826"/>
-        <source>Please choose a unique controller name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="3113"/>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="3125"/>
-        <source>MusE: Cannot add common controller</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="3114"/>
-        <source>A controller named </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="3114"/>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="3126"/>
-        <source> already exists.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="3126"/>
-        <source>A controller number </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="3409"/>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="3414"/>
-        <source>MusE</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="3410"/>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="3415"/>
-        <source>The current Instrument contains unsaved data
-Save Current Instrument?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="3412"/>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="3417"/>
-        <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="3412"/>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="3417"/>
-        <source>&amp;Nosave</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="3412"/>
-        <source>&amp;Abort</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>EditInstrumentBase</name>
     <message>
         <location filename="../../muse/instruments/editinstrumentbase.ui" line="20"/>
@@ -4390,29 +3254,6 @@ Typically, set to 127/127, or an unused
     </message>
 </context>
 <context>
-    <name>EditMetaDialog</name>
-    <message>
-        <location filename="../../muse/liste/editevent.cpp" line="308"/>
-        <source>MusE: Enter Meta Event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/liste/editevent.cpp" line="310"/>
-        <source>Time Position</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/liste/editevent.cpp" line="314"/>
-        <source>Meta Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/liste/editevent.cpp" line="326"/>
-        <source>Enter Hex</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>EditNoteDialogBase</name>
     <message>
         <location filename="../../muse/widgets/editnotedialogbase.ui" line="14"/>
@@ -4456,29 +3297,6 @@ Typically, set to 127/127, or an unused
     </message>
 </context>
 <context>
-    <name>EditPAfterDialog</name>
-    <message>
-        <location filename="../../muse/liste/editevent.cpp" line="502"/>
-        <source>MusE: Enter Poly Aftertouch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/liste/editevent.cpp" line="504"/>
-        <source>Time Position</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/liste/editevent.cpp" line="508"/>
-        <source>Pitch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/liste/editevent.cpp" line="510"/>
-        <source>Pressure</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>EditSysexDialogBase</name>
     <message>
         <location filename="../../muse/widgets/editsysexdialogbase.ui" line="14"/>
@@ -5223,7 +4041,7 @@ Adjusts responsiveness of audio controls and
     </message>
     <message>
         <location filename="../../muse/widgets/gensetbase.ui" line="1226"/>
-        <source>GUI</source>
+        <source>GUI Behaviour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5262,187 +4080,82 @@ Adjusts responsiveness of audio controls and
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/gensetbase.ui" line="1349"/>
+        <location filename="../../muse/widgets/gensetbase.ui" line="1355"/>
         <source>Allows some popup menus to stay open.
 Otherwise, hold Ctrl to keep them open.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/gensetbase.ui" line="1363"/>
-        <source>MDI-subwindowness and sharing menus</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/widgets/gensetbase.ui" line="1374"/>
-        <source>Presets:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/widgets/gensetbase.ui" line="1381"/>
-        <source>traditional MusE SDI</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/widgets/gensetbase.ui" line="1388"/>
-        <source>Cakewalk-like MDI</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/widgets/gensetbase.ui" line="1395"/>
-        <source>Borland-/Mac-like MDI</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/widgets/gensetbase.ui" line="1451"/>
-        <source>&amp;Apply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/widgets/gensetbase.ui" line="1458"/>
-        <source>&amp;Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/widgets/gensetbase.ui" line="1468"/>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LMaster</name>
-    <message>
-        <location filename="../../muse/master/lmaster.cpp" line="147"/>
-        <source>MusE: Mastertrack</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/master/lmaster.cpp" line="160"/>
-        <source>&amp;Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/master/lmaster.cpp" line="164"/>
-        <source>Insert Tempo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/master/lmaster.cpp" line="165"/>
-        <source>Insert Signature</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/master/lmaster.cpp" line="166"/>
-        <source>Insert Key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/master/lmaster.cpp" line="167"/>
-        <source>Edit Positon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/master/lmaster.cpp" line="168"/>
-        <source>Edit Value</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/master/lmaster.cpp" line="169"/>
-        <source>Delete Event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/master/lmaster.cpp" line="172"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/master/lmaster.cpp" line="195"/>
-        <source>Undo/Redo tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/master/lmaster.cpp" line="199"/>
-        <source>Edit tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/master/lmaster.cpp" line="204"/>
-        <source>Tempo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/master/lmaster.cpp" line="205"/>
-        <source>Timesig</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/master/lmaster.cpp" line="206"/>
-        <source>Key</source>
+        <location filename="../../muse/widgets/gensetbase.ui" line="1366"/>
+        <source>In some areas, the middle mouse button decreases
+values, while the right button increases. Users without a
+middle mouse button can select this option to make the
+left button behave like the middle button in such areas.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/master/lmaster.cpp" line="207"/>
-        <source>new tempo</source>
+        <location filename="../../muse/widgets/gensetbase.ui" line="1372"/>
+        <source>Use left mouse button for decreasing values</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/master/lmaster.cpp" line="208"/>
-        <source>new signature</source>
+        <location filename="../../muse/widgets/gensetbase.ui" line="1405"/>
+        <source>Shift + Right click sets left range marker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/master/lmaster.cpp" line="209"/>
-        <source>new key</source>
+        <location filename="../../muse/widgets/gensetbase.ui" line="1432"/>
+        <source>Allow adding hidden tracks in track list menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/master/lmaster.cpp" line="214"/>
-        <source>panic</source>
+        <location filename="../../muse/widgets/gensetbase.ui" line="1439"/>
+        <source>Unhide tracks when adding hidden tracks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/master/lmaster.cpp" line="218"/>
-        <source>transport</source>
+        <location filename="../../muse/widgets/gensetbase.ui" line="1457"/>
+        <source>GUI Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/master/lmaster.cpp" line="234"/>
-        <source>Meter</source>
+        <location filename="../../muse/widgets/gensetbase.ui" line="1463"/>
+        <source>MDI-subwindowness and sharing menus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/master/lmaster.cpp" line="235"/>
-        <source>Time</source>
+        <location filename="../../muse/widgets/gensetbase.ui" line="1474"/>
+        <source>Presets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/master/lmaster.cpp" line="236"/>
-        <source>Type</source>
+        <location filename="../../muse/widgets/gensetbase.ui" line="1481"/>
+        <source>traditional MusE SDI</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/master/lmaster.cpp" line="237"/>
-        <source>Value</source>
+        <location filename="../../muse/widgets/gensetbase.ui" line="1488"/>
+        <source>Cakewalk-like MDI</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/master/lmaster.cpp" line="626"/>
-        <source>Reposition of the initial tempo and signature events is not allowed</source>
+        <location filename="../../muse/widgets/gensetbase.ui" line="1495"/>
+        <source>Borland-/Mac-like MDI</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/master/lmaster.cpp" line="680"/>
-        <source>MusE: List Editor</source>
+        <location filename="../../muse/widgets/gensetbase.ui" line="1551"/>
+        <source>&amp;Apply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/master/lmaster.cpp" line="681"/>
-        <source>Input error, conversion not OK or value out of range</source>
+        <location filename="../../muse/widgets/gensetbase.ui" line="1558"/>
+        <source>&amp;Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/master/lmaster.cpp" line="694"/>
-        <source>Reposition of tempo and signature events to start position is not allowed!</source>
+        <location filename="../../muse/widgets/gensetbase.ui" line="1568"/>
+        <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -5510,134 +4223,6 @@ Otherwise, hold Ctrl to keep them open.</source>
     </message>
 </context>
 <context>
-    <name>ListEdit</name>
-    <message>
-        <location filename="../../muse/liste/listedit.cpp" line="468"/>
-        <source>insert Note</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/liste/listedit.cpp" line="469"/>
-        <source>insert SysEx</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/liste/listedit.cpp" line="470"/>
-        <source>insert Ctrl</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/liste/listedit.cpp" line="471"/>
-        <source>insert Meta</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/liste/listedit.cpp" line="472"/>
-        <source>insert Channel Aftertouch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/liste/listedit.cpp" line="473"/>
-        <source>insert Poly Aftertouch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/liste/listedit.cpp" line="486"/>
-        <source>&amp;Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/liste/listedit.cpp" line="491"/>
-        <source>Cut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/liste/listedit.cpp" line="495"/>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/liste/listedit.cpp" line="499"/>
-        <source>Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/liste/listedit.cpp" line="505"/>
-        <source>Delete Events</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/liste/listedit.cpp" line="515"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/liste/listedit.cpp" line="522"/>
-        <source>Undo/Redo tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/liste/listedit.cpp" line="526"/>
-        <source>Insert tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/liste/listedit.cpp" line="530"/>
-        <source>panic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/liste/listedit.cpp" line="534"/>
-        <source>transport</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/liste/listedit.cpp" line="556"/>
-        <source>Tick</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/liste/listedit.cpp" line="557"/>
-        <source>Bar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/liste/listedit.cpp" line="558"/>
-        <source>Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/liste/listedit.cpp" line="559"/>
-        <source>Ch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/liste/listedit.cpp" line="560"/>
-        <source>Val A</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/liste/listedit.cpp" line="561"/>
-        <source>Val B</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/liste/listedit.cpp" line="562"/>
-        <source>Val C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/liste/listedit.cpp" line="563"/>
-        <source>Len</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/liste/listedit.cpp" line="564"/>
-        <source>Comment</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>MITTransposeBase</name>
     <message>
         <location filename="../../muse/widgets/mittransposebase.ui" line="14"/>
@@ -5666,270 +4251,6 @@ Otherwise, hold Ctrl to keep them open.</source>
     </message>
 </context>
 <context>
-    <name>MPConfig</name>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="97"/>
-        <location filename="../../muse/confmport.cpp" line="273"/>
-        <source>Default input connections</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="98"/>
-        <location filename="../../muse/confmport.cpp" line="164"/>
-        <source>Are you sure you want to apply to all existing midi tracks now?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="163"/>
-        <location filename="../../muse/confmport.cpp" line="311"/>
-        <source>Default output connections</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="274"/>
-        <location filename="../../muse/confmport.cpp" line="312"/>
-        <source>Setting will apply to new midi tracks.
-Do you want to apply to all existing midi tracks now?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="351"/>
-        <source>MusE: bad device name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="352"/>
-        <source>please choose a unique device name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="424"/>
-        <location filename="../../muse/confmport.cpp" line="1284"/>
-        <source>in</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="447"/>
-        <location filename="../../muse/confmport.cpp" line="1275"/>
-        <source>out</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="503"/>
-        <source>Show first aliases</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="509"/>
-        <source>Show second aliases</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="639"/>
-        <location filename="../../muse/confmport.cpp" line="681"/>
-        <source>Toggle all</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="643"/>
-        <location filename="../../muse/confmport.cpp" line="686"/>
-        <source>Change all tracks now</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="729"/>
-        <source>Create</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="729"/>
-        <source> device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="958"/>
-        <location filename="../../muse/confmport.cpp" line="987"/>
-        <source>Port Number</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="959"/>
-        <source>Enable gui</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="960"/>
-        <source>Enable reading</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="961"/>
-        <source>Enable writing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="962"/>
-        <source>Port instrument</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="963"/>
-        <source>Midi device name. Click to edit (Jack)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="965"/>
-        <source>Connections from Jack Midi outputs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="966"/>
-        <source>Connections to Jack Midi inputs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="967"/>
-        <source>Auto-connect these channels to new midi tracks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="970"/>
-        <source>Auto-connect new midi tracks to these channels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="972"/>
-        <source>Auto-connect new midi tracks to this channel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="974"/>
-        <source>Device state</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="989"/>
-        <source>Enable gui for device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="991"/>
-        <source>Enable reading from device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="993"/>
-        <source>Enable writing to device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="995"/>
-        <source>Name of the midi device associated with this port number. Click to edit Jack midi name.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="998"/>
-        <source>Instrument connected to port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="1002"/>
-        <source>Connections from Jack Midi output ports</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="1004"/>
-        <source>Connections to Jack Midi input ports</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="1013"/>
-        <source>Auto-connect these channels, on this port, to new midi tracks.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="1017"/>
-        <source>Connect new midi tracks to these channels, on this port.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="1019"/>
-        <source>Connect new midi tracks to this channel, on this port.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="1022"/>
-        <source>State: result of opening the device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="1063"/>
-        <source>Port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="1064"/>
-        <source>GUI</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="1065"/>
-        <source>I</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="1066"/>
-        <source>O</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="1067"/>
-        <source>Instrument</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="1068"/>
-        <source>Device Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="1069"/>
-        <source>In routes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="1070"/>
-        <source>Out routes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="1071"/>
-        <source>Def in ch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="1072"/>
-        <source>Def out ch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="1073"/>
-        <source>State</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="1158"/>
-        <source>&lt;unknown&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="1245"/>
-        <location filename="../../muse/confmport.cpp" line="1319"/>
-        <source>&lt;none&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>MRConfigBase</name>
     <message>
         <location filename="../../muse/mplugins/mrconfigbase.ui" line="14"/>
@@ -5978,162 +4299,6 @@ Do you want to apply to all existing midi tracks now?</source>
     </message>
 </context>
 <context>
-    <name>MarkerView</name>
-    <message>
-        <location filename="../../muse/marker/markerview.cpp" line="173"/>
-        <source>MusE: Marker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/marker/markerview.cpp" line="175"/>
-        <source>add marker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/marker/markerview.cpp" line="178"/>
-        <source>delete marker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/marker/markerview.cpp" line="186"/>
-        <source>&amp;Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/marker/markerview.cpp" line="192"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/marker/markerview.cpp" line="199"/>
-        <source>Undo/Redo tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/marker/markerview.cpp" line="203"/>
-        <source>edit tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/marker/markerview.cpp" line="208"/>
-        <source>panic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/marker/markerview.cpp" line="212"/>
-        <source>transport</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/marker/markerview.cpp" line="229"/>
-        <source>Bar:Beat:Tick</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/marker/markerview.cpp" line="230"/>
-        <source>Hr:Mn:Sc:Fr:Sf</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/marker/markerview.cpp" line="231"/>
-        <source>Lock</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/marker/markerview.cpp" line="232"/>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/marker/markerview.cpp" line="243"/>
-        <source>Marker Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MasterEdit</name>
-    <message>
-        <location filename="../../muse/master/masteredit.cpp" line="99"/>
-        <source>MusE: Mastertrack</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/master/masteredit.cpp" line="106"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/master/masteredit.cpp" line="112"/>
-        <source>Undo/Redo tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/master/masteredit.cpp" line="117"/>
-        <source>panic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/master/masteredit.cpp" line="121"/>
-        <source>transport</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/master/masteredit.cpp" line="128"/>
-        <source>Enable master</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/master/masteredit.cpp" line="132"/>
-        <source>Enable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/master/masteredit.cpp" line="133"/>
-        <source>Enable usage of master track</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/master/masteredit.cpp" line="138"/>
-        <source>Info</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/master/masteredit.cpp" line="140"/>
-        <source>Cursor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/master/masteredit.cpp" line="147"/>
-        <source>time at cursor position</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/master/masteredit.cpp" line="151"/>
-        <source>tempo at cursor position</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/master/masteredit.cpp" line="157"/>
-        <source>Snap</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/master/masteredit.cpp" line="166"/>
-        <source>CurPos </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/master/masteredit.cpp" line="170"/>
-        <source>tempo at current position</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/master/masteredit.cpp" line="171"/>
-        <source>time signature at current position</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>MdiSettingsBase</name>
     <message>
         <location filename="../../muse/widgets/mdisettings_base.ui" line="14"/>
@@ -6455,15 +4620,6 @@ Do you want to apply to all existing midi tracks now?</source>
     </message>
 </context>
 <context>
-    <name>MidiInputTransformDialog</name>
-    <message>
-        <location filename="../../muse/mplugins/midiitransform.cpp" line="718"/>
-        <location filename="../../muse/mplugins/midiitransform.cpp" line="720"/>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>MidiInputTransformDialogBase</name>
     <message>
         <location filename="../../muse/widgets/itransformbase.ui" line="14"/>
@@ -6983,6 +5139,11 @@ Enabled inputs in the list will
         <source>Send sync delay</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../muse/widgets/midisync.ui" line="394"/>
+        <source>Note: Sync delay and MTC sync currently not fully implemeted</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MidiTrackInfoBase</name>
@@ -7544,15 +5705,6 @@ Enabled inputs in the list will
     </message>
 </context>
 <context>
-    <name>MidiTransformerDialog</name>
-    <message>
-        <location filename="../../muse/miditransform.cpp" line="263"/>
-        <location filename="../../muse/miditransform.cpp" line="265"/>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>MixdownFileDialogBase</name>
     <message>
         <location filename="../../muse/widgets/mixdowndialogbase.ui" line="14"/>
@@ -7674,1697 +5826,1843 @@ Enabled inputs in the list will
     </message>
 </context>
 <context>
-    <name>MusEApp::MusE</name>
+    <name>MusECore::Song</name>
     <message>
-        <location filename="../../muse/app.cpp" line="152"/>
-        <location filename="../../muse/app.cpp" line="168"/>
-        <source>Failed to start audio!</source>
+        <location filename="../../muse/song.cpp" line="2233"/>
+        <source>Jack shutdown!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="153"/>
-        <source>Was not able to start audio, check if jack is running.
-</source>
+        <location filename="../../muse/song.cpp" line="2234"/>
+        <source>Jack has detected a performance problem which has lead to
+MusE being disconnected.
+This could happen due to a number of reasons:
+- a performance issue with your particular setup.
+- a bug in MusE (or possibly in another connected software).
+- a random hiccup which might never occur again.
+- jack was voluntary stopped by you or someone else
+- jack crashed
+If there is a persisting problem you are much welcome to discuss it
+on the MusE mailinglist.
+(there is information about joining the mailinglist on the MusE
+ homepage which is available through the help menu)
+
+To proceed check the status of Jack and try to restart it and then .
+click on the Restart button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="169"/>
-        <source>Timeout waiting for audio to run. Check if jack is running.
-</source>
+        <location filename="../../muse/song.cpp" line="2420"/>
+        <location filename="../../muse/song.cpp" line="2599"/>
+        <source>Automation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="388"/>
-        <source>Und&amp;o</source>
+        <location filename="../../muse/song.cpp" line="2422"/>
+        <source>previous event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="390"/>
-        <source>Re&amp;do</source>
+        <location filename="../../muse/song.cpp" line="2426"/>
+        <source>next event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="393"/>
-        <source>undo last change to song</source>
+        <location filename="../../muse/song.cpp" line="2435"/>
+        <location filename="../../muse/song.cpp" line="2604"/>
+        <source>set event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="394"/>
-        <source>redo last undo</source>
+        <location filename="../../muse/song.cpp" line="2437"/>
+        <location filename="../../muse/song.cpp" line="2606"/>
+        <source>add event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="408"/>
-        <source>Loop</source>
+        <location filename="../../muse/song.cpp" line="2441"/>
+        <location filename="../../muse/song.cpp" line="2611"/>
+        <source>erase event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="415"/>
-        <source>Punchin</source>
+        <location filename="../../muse/song.cpp" line="2445"/>
+        <source>erase range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="422"/>
-        <source>Punchout</source>
+        <location filename="../../muse/song.cpp" line="2449"/>
+        <source>clear automation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="433"/>
-        <source>Start</source>
+        <location filename="../../muse/song.cpp" line="2482"/>
+        <source>Clear all controller events?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="439"/>
-        <source>Rewind</source>
+        <location filename="../../muse/song.cpp" line="2482"/>
+        <source>&amp;Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="445"/>
-        <source>Forward</source>
+        <location filename="../../muse/song.cpp" line="2482"/>
+        <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="451"/>
-        <source>Stop</source>
+        <location filename="../../muse/song.cpp" line="3360"/>
+        <source>MusE - external script failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="459"/>
-        <source>Play</source>
+        <location filename="../../muse/song.cpp" line="3361"/>
+        <source>MusE was unable to launch the script, error message:
+%1</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MusEDialog::PasteDialog</name>
+    <message numerus="yes">
+        <source>%n quarter(s)</source>
+        <translation type="obsolete">
+            <numerusform>%n quarter</numerusform>
+            <numerusform>%n quarters</numerusform>
+        </translation>
+    </message>
     <message>
-        <location filename="../../muse/app.cpp" line="467"/>
-        <source>Record</source>
+        <source>quarter</source>
+        <translation type="obsolete">quarter</translation>
+    </message>
+    <message>
+        <source>quarters</source>
+        <translation type="obsolete">quarters</translation>
+    </message>
+</context>
+<context>
+    <name>MusEDialog::PasteEventsDialog</name>
+    <message numerus="yes">
+        <source>%n quarter(s)</source>
+        <translation type="obsolete">
+            <numerusform>%n quarter</numerusform>
+            <numerusform>%n quarters</numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>quarter</source>
+        <translation type="obsolete">quarter</translation>
+    </message>
+    <message>
+        <source>quarters</source>
+        <translation type="obsolete">quarters</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::Appearance</name>
+    <message>
+        <location filename="../../muse/appearance.cpp" line="132"/>
+        <source>Main application font, and default font for any
+ controls not defined here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="473"/>
-        <location filename="../../muse/app.cpp" line="705"/>
-        <source>Panic</source>
+        <location filename="../../muse/appearance.cpp" line="133"/>
+        <source>For small controls like mixer strips.
+Also timescale small numbers, arranger part name overlay,
+ and effects rack.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="485"/>
-        <source>&amp;New</source>
+        <location filename="../../muse/appearance.cpp" line="134"/>
+        <source>Midi track info panel. Transport controls.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="489"/>
-        <source>&amp;Open</source>
+        <location filename="../../muse/appearance.cpp" line="135"/>
+        <source>Controller graph and S/X buttons. Large numbers for time
+ and tempo scale, and time signature.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="494"/>
-        <source>Open &amp;Recent</source>
+        <location filename="../../muse/appearance.cpp" line="136"/>
+        <source>Time scale markers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="496"/>
-        <location filename="../../muse/app.cpp" line="1501"/>
-        <location filename="../../muse/app.cpp" line="2708"/>
-        <source>&amp;Save</source>
+        <location filename="../../muse/appearance.cpp" line="137"/>
+        <source>List editor: meta event edit dialog multi-line edit box.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="501"/>
-        <source>Save &amp;As</source>
+        <location filename="../../muse/appearance.cpp" line="138"/>
+        <source>Mixer label font. Auto-font-sizing up to chosen font size.
+Word-breaking but only with spaces.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="503"/>
-        <source>Import Midifile</source>
+        <location filename="../../muse/appearance.cpp" line="139"/>
+        <source>Maximum mixer label auto-font-sizing font size.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="504"/>
-        <source>Export Midifile</source>
+        <location filename="../../muse/appearance.cpp" line="141"/>
+        <source>Global opacity (opposite of transparency).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="505"/>
-        <source>Import Part</source>
+        <location filename="../../muse/appearance.cpp" line="145"/>
+        <source>Standard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="507"/>
-        <location filename="../../muse/wave.cpp" line="827"/>
-        <source>Import Wave File</source>
+        <location filename="../../muse/appearance.cpp" line="147"/>
+        <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="508"/>
-        <source>Find unused wave files</source>
+        <location filename="../../muse/appearance.cpp" line="771"/>
+        <source>MusE: load image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="510"/>
-        <source>&amp;Quit</source>
+        <location filename="../../muse/appearance.cpp" line="1105"/>
+        <source>Select style sheet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="512"/>
-        <source>Song Info</source>
+        <location filename="../../muse/appearance.cpp" line="1105"/>
+        <source>Qt style sheets (*.qss)</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::Arranger</name>
     <message>
-        <location filename="../../muse/app.cpp" line="515"/>
-        <source>Transport Panel</source>
+        <location filename="../../muse/arranger/arranger.cpp" line="81"/>
+        <source>Enable Recording</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="517"/>
-        <source>Bigtime Window</source>
+        <location filename="../../muse/arranger/arranger.cpp" line="82"/>
+        <source>Mute/Off Indicator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="519"/>
-        <source>Mixer A</source>
+        <location filename="../../muse/arranger/arranger.cpp" line="83"/>
+        <source>Solo Indicator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="521"/>
-        <source>Mixer B</source>
+        <location filename="../../muse/arranger/arranger.cpp" line="84"/>
+        <source>Track Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="523"/>
-        <source>Cliplist</source>
+        <location filename="../../muse/arranger/arranger.cpp" line="85"/>
+        <source>Track Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="525"/>
-        <source>Marker View</source>
+        <location filename="../../muse/arranger/arranger.cpp" line="86"/>
+        <source>Midi output channel number or audio channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="527"/>
-        <source>Arranger View</source>
+        <location filename="../../muse/arranger/arranger.cpp" line="87"/>
+        <source>Midi output port or synth midi port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="529"/>
-        <source>Fullscreen</source>
+        <location filename="../../muse/arranger/arranger.cpp" line="88"/>
+        <source>Time Lock</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="534"/>
-        <source>&amp;Plugins</source>
+        <location filename="../../muse/arranger/arranger.cpp" line="89"/>
+        <source>Automation parameter selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="535"/>
-        <source>Edit Instrument</source>
+        <location filename="../../muse/arranger/arranger.cpp" line="90"/>
+        <source>Notation clef</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="536"/>
-        <source>Input Plugins</source>
+        <location filename="../../muse/arranger/arranger.cpp" line="101"/>
+        <source>Enable recording. Click to toggle.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="538"/>
-        <source>Transpose</source>
+        <location filename="../../muse/arranger/arranger.cpp" line="102"/>
+        <source>Mute indicator. Click to toggle.
+Right-click to toggle track on/off.
+Mute is designed for rapid, repeated action.
+On/Off is not!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="539"/>
-        <source>Midi Input Transform</source>
+        <location filename="../../muse/arranger/arranger.cpp" line="103"/>
+        <source>Solo indicator. Click to toggle.
+Connected tracks are also &apos;phantom&apos; soloed,
+ indicated by a dark square.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="540"/>
-        <source>Midi Input Filter</source>
+        <location filename="../../muse/arranger/arranger.cpp" line="104"/>
+        <source>Track type. Right-click to change
+ midi and drum track types.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="541"/>
-        <source>Midi Remote Control</source>
+        <location filename="../../muse/arranger/arranger.cpp" line="105"/>
+        <source>Track name. Double-click to edit.
+Right-click for more options.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="543"/>
-        <source>Rhythm Generator</source>
+        <location filename="../../muse/arranger/arranger.cpp" line="106"/>
+        <source>Midi/drum track: Output channel number.
+Audio track: Channels.
+Mid/right-click to change.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="545"/>
-        <source>Reset Instr.</source>
+        <location filename="../../muse/arranger/arranger.cpp" line="107"/>
+        <source>Midi/drum track: Output port.
+Synth track: Assigned midi port.
+Left-click to change.
+Right-click to show GUI.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="546"/>
-        <source>Init Instr.</source>
+        <location filename="../../muse/arranger/arranger.cpp" line="108"/>
+        <source>Time lock</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="547"/>
-        <source>Local Off</source>
+        <location filename="../../muse/arranger/arranger.cpp" line="109"/>
+        <source>Notation clef. Select this tracks notation clef.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="550"/>
-        <source>Bounce to Track</source>
+        <location filename="../../muse/arranger/arranger.cpp" line="142"/>
+        <source>Arranger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="551"/>
-        <source>Bounce to File</source>
+        <location filename="../../muse/arranger/arranger.cpp" line="145"/>
+        <source>Cursor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="552"/>
-        <source>Restart Audio</source>
+        <location filename="../../muse/arranger/arranger.cpp" line="155"/>
+        <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="555"/>
-        <source>Mixer Automation</source>
+        <location filename="../../muse/arranger/arranger.cpp" line="155"/>
+        <source>Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="557"/>
-        <source>Take Snapshot</source>
+        <location filename="../../muse/arranger/arranger.cpp" line="157"/>
+        <source>Snap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="558"/>
-        <source>Clear Automation Data</source>
+        <location filename="../../muse/arranger/arranger.cpp" line="173"/>
+        <source>Len</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="563"/>
-        <source>Cascade</source>
+        <location filename="../../muse/arranger/arranger.cpp" line="183"/>
+        <location filename="../../muse/arranger/arranger.cpp" line="184"/>
+        <source>song length - bars</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="564"/>
-        <source>Tile</source>
+        <location filename="../../muse/arranger/arranger.cpp" line="188"/>
+        <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="565"/>
-        <source>In rows</source>
+        <location filename="../../muse/arranger/arranger.cpp" line="189"/>
+        <source>NO</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="566"/>
-        <source>In columns</source>
+        <location filename="../../muse/arranger/arranger.cpp" line="190"/>
+        <source>GM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="570"/>
-        <source>Global Settings</source>
+        <location filename="../../muse/arranger/arranger.cpp" line="191"/>
+        <source>GS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="571"/>
-        <source>Configure Shortcuts</source>
+        <location filename="../../muse/arranger/arranger.cpp" line="192"/>
+        <source>XG</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="572"/>
-        <source>Follow Song</source>
+        <location filename="../../muse/arranger/arranger.cpp" line="194"/>
+        <location filename="../../muse/arranger/arranger.cpp" line="195"/>
+        <source>midi song type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="573"/>
-        <source>Don&apos;t Follow Song</source>
+        <location filename="../../muse/arranger/arranger.cpp" line="201"/>
+        <source>Pitch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="575"/>
-        <source>Follow Page</source>
+        <location filename="../../muse/arranger/arranger.cpp" line="208"/>
+        <source>midi pitch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="578"/>
-        <source>Follow Continuous</source>
+        <location filename="../../muse/arranger/arranger.cpp" line="209"/>
+        <source>global midi pitch shift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="581"/>
-        <source>Metronome</source>
+        <location filename="../../muse/arranger/arranger.cpp" line="213"/>
+        <source>Tempo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="582"/>
-        <source>Midi Sync</source>
+        <location filename="../../muse/arranger/arranger.cpp" line="221"/>
+        <location filename="../../muse/arranger/arranger.cpp" line="222"/>
+        <source>midi tempo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="583"/>
-        <source>Midi File Import/Export</source>
+        <location filename="../../muse/arranger/arranger.cpp" line="232"/>
+        <source>N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="584"/>
-        <source>Appearance Settings</source>
+        <location filename="../../muse/arranger/arranger.cpp" line="292"/>
+        <source>TrackInfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="585"/>
-        <source>Midi Ports / Soft Synth</source>
+        <location filename="../../muse/arranger/arranger.cpp" line="305"/>
+        <source>R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="588"/>
-        <source>&amp;Manual</source>
+        <location filename="../../muse/arranger/arranger.cpp" line="306"/>
+        <source>M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="589"/>
-        <source>&amp;MusE Homepage</source>
+        <location filename="../../muse/arranger/arranger.cpp" line="307"/>
+        <source>S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="590"/>
-        <source>&amp;Report Bug...</source>
+        <location filename="../../muse/arranger/arranger.cpp" line="308"/>
+        <source>C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="591"/>
-        <source>&amp;About MusE</source>
+        <location filename="../../muse/arranger/arranger.cpp" line="309"/>
+        <source>Track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="690"/>
-        <source>File Buttons</source>
+        <location filename="../../muse/arranger/arranger.cpp" line="310"/>
+        <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="697"/>
-        <source>Undo/Redo</source>
+        <location filename="../../muse/arranger/arranger.cpp" line="311"/>
+        <source>Ch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="701"/>
-        <source>Transport</source>
+        <location filename="../../muse/arranger/arranger.cpp" line="312"/>
+        <source>T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="756"/>
-        <source>&amp;File</source>
+        <location filename="../../muse/arranger/arranger.cpp" line="313"/>
+        <source>Automation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="785"/>
-        <source>&amp;View</source>
+        <location filename="../../muse/arranger/arranger.cpp" line="314"/>
+        <source>Clef</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::ArrangerView</name>
     <message>
-        <location filename="../../muse/app.cpp" line="804"/>
-        <source>&amp;Midi</source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="83"/>
+        <source>MusE: Arranger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="833"/>
-        <source>&amp;Audio</source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="100"/>
+        <source>Undo/Redo tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="847"/>
-        <source>A&amp;utomation</source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="105"/>
+        <source>panic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="860"/>
-        <source>&amp;Windows</source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="109"/>
+        <source>transport</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="873"/>
-        <source>MusE Se&amp;ttings</source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="140"/>
+        <source>C&amp;ut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="896"/>
-        <source>&amp;Help</source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="141"/>
+        <source>&amp;Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="1164"/>
-        <source>Cannot read template</source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="142"/>
+        <source>Copy in range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="1195"/>
-        <source>File open error</source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="143"/>
+        <source>&amp;Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="1208"/>
-        <source>File read error</source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="144"/>
+        <source>Paste (show dialog)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="1221"/>
-        <source>Unknown File Format: </source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="145"/>
+        <source>Paste c&amp;lone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="1351"/>
-        <location filename="../../muse/app.cpp" line="1759"/>
-        <location filename="../../muse/app.cpp" line="2654"/>
-        <source>MusE: Song: </source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="146"/>
+        <source>Paste clone (show dialog)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="1385"/>
-        <source>MusE: load project</source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="147"/>
+        <source>&amp;Insert Empty Measure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="1399"/>
-        <source>MusE: load template</source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="148"/>
+        <source>Delete Selected Tracks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="1461"/>
-        <source>MusE: Write File failed</source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="150"/>
+        <source>Shrink selected parts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="1499"/>
-        <source>The current Project contains unsaved data
-Save Current Project?</source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="151"/>
+        <source>Expand selected parts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="1501"/>
-        <location filename="../../muse/app.cpp" line="2708"/>
-        <source>S&amp;kip</source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="152"/>
+        <source>Clean selected parts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="1501"/>
-        <source>&amp;Cancel</source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="155"/>
+        <source>Add Track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="1737"/>
-        <location filename="../../muse/app.cpp" line="1750"/>
-        <source>MusE: Save As</source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="157"/>
+        <source>Select</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="1807"/>
-        <location filename="../../muse/app.cpp" line="1968"/>
-        <source>Nothing to edit</source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="160"/>
+        <source>Select &amp;All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="2442"/>
-        <location filename="../../muse/app.cpp" line="2452"/>
-        <location filename="../../muse/app.cpp" line="2483"/>
-        <location filename="../../muse/app.cpp" line="2517"/>
-        <location filename="../../muse/app.cpp" line="2525"/>
-        <source>MusE: Bounce to Track</source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="161"/>
+        <source>&amp;Deselect All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="2443"/>
-        <source>No wave tracks found</source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="162"/>
+        <source>Invert &amp;Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="2453"/>
-        <location filename="../../muse/app.cpp" line="2558"/>
-        <source>No audio output tracks found</source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="163"/>
+        <source>&amp;Inside Loop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="2484"/>
-        <source>Select one audio output track,
-and one target wave track</source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="164"/>
+        <source>&amp;Outside Loop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="2518"/>
-        <source>Select one target wave track</source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="165"/>
+        <source>All &amp;Parts on Track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="2526"/>
-        <source>Select one target wave track,
-and one audio output track</source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="168"/>
+        <source>Score</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="2557"/>
-        <location filename="../../muse/app.cpp" line="2582"/>
-        <source>MusE: Bounce to File</source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="171"/>
+        <source>all tracks in one staff</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="2583"/>
-        <source>Select one audio output track</source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="172"/>
+        <source>one staff per track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="2622"/>
-        <source>MusE: Bounce</source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="178"/>
+        <source>New score window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="2623"/>
-        <source>set left/right marker for bounce range</source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="179"/>
+        <source>Pianoroll</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="2705"/>
-        <source>The current Project contains unsaved data
-Load overwrites current Project:
-Save Current Project?</source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="180"/>
+        <source>Drums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="2708"/>
-        <location filename="../../muse/importmidi.cpp" line="86"/>
-        <source>&amp;Abort</source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="181"/>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="187"/>
+        <source>List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/exportmidi.cpp" line="143"/>
-        <source>MusE: Export Midi</source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="182"/>
+        <source>Wave</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/help.cpp" line="50"/>
-        <source>no help found at: </source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="184"/>
+        <source>Mastertrack</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/help.cpp" line="52"/>
-        <source>MusE: Open Help</source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="186"/>
+        <source>Graphic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/help.cpp" line="105"/>
-        <source>Unable to launch help</source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="189"/>
+        <source>Midi &amp;Transform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/help.cpp" line="106"/>
-        <source>For some reason MusE has to launch the default
-browser on your machine.</source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="193"/>
+        <source>Global Cut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/importmidi.cpp" line="74"/>
-        <source>MusE: Import Midi</source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="194"/>
+        <source>Global Insert</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/importmidi.cpp" line="83"/>
-        <source>Add midi file to current project?
-</source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="195"/>
+        <source>Global Split</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/importmidi.cpp" line="84"/>
-        <source>&amp;Add to Project</source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="197"/>
+        <source>Global Cut - selected tracks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/importmidi.cpp" line="85"/>
-        <source>&amp;Replace</source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="198"/>
+        <source>Global Insert - selected tracks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/importmidi.cpp" line="116"/>
-        <source>reading midifile
-  </source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="199"/>
+        <source>Global Split - selected tracks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/importmidi.cpp" line="118"/>
-        <source>
-failed: </source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="207"/>
+        <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/importmidi.cpp" line="474"/>
-        <source>Import part is only valid for midi and wave tracks!</source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="250"/>
+        <source>&amp;Structure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/importmidi.cpp" line="482"/>
-        <source>MusE: load part</source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="261"/>
+        <source>Functions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/importmidi.cpp" line="500"/>
-        <source>No track selected for import</source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="262"/>
+        <source>&amp;Quantize Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/importmidi.cpp" line="621"/>
-        <source> out of </source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="263"/>
+        <source>Change note &amp;length</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/importmidi.cpp" line="622"/>
-        <source> parts</source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="264"/>
+        <source>Change note &amp;velocity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/importmidi.cpp" line="622"/>
-        <source> part</source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="265"/>
+        <source>Crescendo/Decrescendo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/importmidi.cpp" line="623"/>
-        <source> could not be imported.
-Likely the track is the wrong type.</source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="266"/>
+        <source>Transpose</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/wave.cpp" line="821"/>
-        <source>to import an audio file you have first to selecta wave track</source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="267"/>
+        <source>Erase Events (Not Parts)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/wave.cpp" line="851"/>
-        <source>Import Wavefile</source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="268"/>
+        <source>Move Events (Not Parts)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/wave.cpp" line="852"/>
-        <source>This wave file has a samplerate of %1,
-as opposed to current setting %2.
-Do you still want to import it?</source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="269"/>
+        <source>Set Fixed Note Length</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/wave.cpp" line="855"/>
-        <source>&amp;Yes</source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="270"/>
+        <source>Delete Overlapping Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/wave.cpp" line="855"/>
-        <source>&amp;No</source>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="271"/>
+        <source>Legato</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="285"/>
+        <source>Window &amp;Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="599"/>
+        <location filename="../../muse/arranger/arrangerview.cpp" line="605"/>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MusEArranger::Arranger</name>
+    <name>MusEGui::AudioMixerApp</name>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="81"/>
-        <source>Enable Recording</source>
+        <location filename="../../muse/mixer/amixer.cpp" line="171"/>
+        <source>&amp;Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="82"/>
-        <source>Mute/Off Indicator</source>
+        <location filename="../../muse/mixer/amixer.cpp" line="175"/>
+        <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="83"/>
-        <source>Solo Indicator</source>
+        <location filename="../../muse/mixer/amixer.cpp" line="176"/>
+        <source>Routing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="84"/>
-        <source>Track Type</source>
+        <location filename="../../muse/mixer/amixer.cpp" line="184"/>
+        <source>Show Midi Tracks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="85"/>
-        <source>Track Name</source>
+        <location filename="../../muse/mixer/amixer.cpp" line="185"/>
+        <source>Show Drum Tracks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="86"/>
-        <source>Midi output channel number or audio channels</source>
+        <location filename="../../muse/mixer/amixer.cpp" line="186"/>
+        <source>Show Wave Tracks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="87"/>
-        <source>Midi output port or synth midi port</source>
+        <location filename="../../muse/mixer/amixer.cpp" line="192"/>
+        <source>Show Inputs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="88"/>
-        <source>Time Lock</source>
+        <location filename="../../muse/mixer/amixer.cpp" line="193"/>
+        <source>Show Outputs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="89"/>
-        <source>Automation parameter selection</source>
+        <location filename="../../muse/mixer/amixer.cpp" line="194"/>
+        <source>Show Groups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="90"/>
-        <source>Notation clef</source>
+        <location filename="../../muse/mixer/amixer.cpp" line="195"/>
+        <source>Show Auxs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="101"/>
-        <source>Enable recording. Click to toggle.</source>
+        <location filename="../../muse/mixer/amixer.cpp" line="196"/>
+        <source>Show Synthesizers</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::AudioStrip</name>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="102"/>
-        <source>Mute indicator. Click to toggle.
-Right-click to toggle track on/off.
-Mute is designed for rapid, repeated action.
-On/Off is not!</source>
+        <location filename="../../muse/mixer/astrip.cpp" line="667"/>
+        <source>panorama</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="103"/>
-        <source>Solo indicator. Click to toggle.
-Connected tracks are also &apos;phantom&apos; soloed,
- indicated by a dark square.</source>
+        <location filename="../../muse/mixer/astrip.cpp" line="669"/>
+        <source>aux send level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="104"/>
-        <source>Track type. Right-click to change
- midi and drum track types.</source>
+        <location filename="../../muse/mixer/astrip.cpp" line="692"/>
+        <source>Pan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="105"/>
-        <source>Track name. Double-click to edit.
-Right-click for more options.</source>
+        <location filename="../../muse/mixer/astrip.cpp" line="779"/>
+        <source>1/2 channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="106"/>
-        <source>Midi/drum track: Output channel number.
-Audio track: Channels.
-Mid/right-click to change.</source>
+        <location filename="../../muse/mixer/astrip.cpp" line="793"/>
+        <source>Pre</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="107"/>
-        <source>Midi/drum track: Output port.
-Synth track: Assigned midi port.
-Left-click to change.
-Right-click to show GUI.</source>
+        <location filename="../../muse/mixer/astrip.cpp" line="794"/>
+        <source>pre fader - post fader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="108"/>
-        <source>Time lock</source>
+        <location filename="../../muse/mixer/astrip.cpp" line="864"/>
+        <source>dB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="109"/>
-        <source>Notation clef. Select this tracks notation clef.</source>
+        <location filename="../../muse/mixer/astrip.cpp" line="895"/>
+        <source>record</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="142"/>
-        <source>Arranger</source>
+        <location filename="../../muse/mixer/astrip.cpp" line="906"/>
+        <source>mute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="145"/>
-        <source>Cursor</source>
+        <location filename="../../muse/mixer/astrip.cpp" line="925"/>
+        <source>record downmix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="157"/>
-        <source>Snap</source>
+        <location filename="../../muse/mixer/astrip.cpp" line="927"/>
+        <location filename="../../muse/mixer/astrip.cpp" line="931"/>
+        <source>solo mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="173"/>
-        <source>Len</source>
+        <location filename="../../muse/mixer/astrip.cpp" line="938"/>
+        <source>off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="183"/>
-        <location filename="../../muse/arranger/arranger.cpp" line="184"/>
-        <source>song length - bars</source>
+        <location filename="../../muse/mixer/astrip.cpp" line="959"/>
+        <source>iR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="188"/>
-        <source>Type</source>
+        <location filename="../../muse/mixer/astrip.cpp" line="961"/>
+        <source>input routing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="189"/>
-        <source>NO</source>
+        <location filename="../../muse/mixer/astrip.cpp" line="969"/>
+        <source>oR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="190"/>
-        <source>GM</source>
+        <location filename="../../muse/mixer/astrip.cpp" line="971"/>
+        <source>output routing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="191"/>
-        <source>GS</source>
+        <location filename="../../muse/mixer/astrip.cpp" line="984"/>
+        <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="192"/>
-        <source>XG</source>
+        <location filename="../../muse/mixer/astrip.cpp" line="985"/>
+        <source>Read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="194"/>
-        <location filename="../../muse/arranger/arranger.cpp" line="195"/>
-        <source>midi song type</source>
+        <location filename="../../muse/mixer/astrip.cpp" line="986"/>
+        <source>Touch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="201"/>
-        <source>Pitch</source>
+        <location filename="../../muse/mixer/astrip.cpp" line="987"/>
+        <source>Write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="208"/>
-        <source>midi pitch</source>
+        <location filename="../../muse/mixer/astrip.cpp" line="1030"/>
+        <source>automation type</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::BigTime</name>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="209"/>
-        <source>global midi pitch shift</source>
+        <location filename="../../muse/widgets/bigtime.cpp" line="62"/>
+        <source>format display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="213"/>
-        <source>Tempo</source>
+        <location filename="../../muse/widgets/bigtime.cpp" line="79"/>
+        <source>bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="221"/>
-        <location filename="../../muse/arranger/arranger.cpp" line="222"/>
-        <source>midi tempo</source>
+        <location filename="../../muse/widgets/bigtime.cpp" line="80"/>
+        <source>beat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="232"/>
-        <source>N</source>
+        <location filename="../../muse/widgets/bigtime.cpp" line="81"/>
+        <location filename="../../muse/widgets/bigtime.cpp" line="87"/>
+        <source>tick</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="292"/>
-        <source>TrackInfo</source>
+        <location filename="../../muse/widgets/bigtime.cpp" line="83"/>
+        <source>minute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="305"/>
-        <source>R</source>
+        <location filename="../../muse/widgets/bigtime.cpp" line="84"/>
+        <source>second</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="306"/>
-        <source>M</source>
+        <location filename="../../muse/widgets/bigtime.cpp" line="85"/>
+        <location filename="../../muse/widgets/bigtime.cpp" line="88"/>
+        <source>frame</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="307"/>
-        <source>S</source>
+        <location filename="../../muse/widgets/bigtime.cpp" line="86"/>
+        <source>subframe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="308"/>
-        <source>C</source>
+        <location filename="../../muse/widgets/bigtime.cpp" line="104"/>
+        <source>MusE: Bigtime</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::ClipListEdit</name>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="309"/>
-        <source>Track</source>
+        <location filename="../../muse/cliplist/cliplist.cpp" line="130"/>
+        <source>MusE: Clip List Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="310"/>
-        <source>Port</source>
+        <location filename="../../muse/cliplist/cliplist.cpp" line="138"/>
+        <source>Undo/Redo tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="311"/>
-        <source>Ch</source>
+        <location filename="../../muse/cliplist/cliplist.cpp" line="143"/>
+        <source>panic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="312"/>
-        <source>T</source>
+        <location filename="../../muse/cliplist/cliplist.cpp" line="147"/>
+        <source>transport</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="313"/>
-        <source>Automation</source>
+        <location filename="../../muse/cliplist/cliplist.cpp" line="151"/>
+        <source>Window &amp;Config</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::ComboQuant</name>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="314"/>
-        <source>Clef</source>
+        <location filename="../../muse/widgets/comboQuant.cpp" line="40"/>
+        <location filename="../../muse/widgets/comboQuant.cpp" line="41"/>
+        <location filename="../../muse/widgets/comboQuant.cpp" line="42"/>
+        <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MusEArranger::ArrangerView</name>
+    <name>MusEGui::CtrlPanel</name>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="83"/>
-        <source>MusE: Arranger</source>
+        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="91"/>
+        <source>S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="100"/>
-        <source>Undo/Redo tools</source>
+        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="96"/>
+        <source>select controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="105"/>
-        <source>panic</source>
+        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="101"/>
+        <source>X</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="109"/>
-        <source>transport</source>
+        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="106"/>
+        <source>remove panel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="139"/>
-        <source>C&amp;ut</source>
+        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="119"/>
+        <source>manual adjust</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="140"/>
-        <source>&amp;Copy</source>
+        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="128"/>
+        <source>double click on/off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="141"/>
-        <source>Copy in range</source>
+        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="129"/>
+        <source>off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="142"/>
-        <source>&amp;Paste</source>
+        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="572"/>
+        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="808"/>
+        <source>Velocity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="143"/>
-        <source>Paste (show dialog)</source>
+        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="622"/>
+        <source>add new ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="144"/>
-        <source>Paste c&amp;lone</source>
+        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="785"/>
+        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="843"/>
+        <source>Instrument-defined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="145"/>
-        <source>Paste clone (show dialog)</source>
+        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="800"/>
+        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="821"/>
+        <source>Add ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="146"/>
-        <source>&amp;Insert Empty Measure</source>
+        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="804"/>
+        <source>Others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="147"/>
-        <source>Delete Selected Tracks</source>
+        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="869"/>
+        <source>Edit instrument ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="149"/>
-        <source>Shrink selected parts</source>
+        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="915"/>
+        <source>Common Controls</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::DrumEdit</name>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="150"/>
-        <source>Expand selected parts</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="114"/>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="135"/>
+        <source>mute instrument</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="151"/>
-        <source>Clean selected parts</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="115"/>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="136"/>
+        <source>sound name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="154"/>
-        <source>Add Track</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="116"/>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="137"/>
+        <source>volume percent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="156"/>
-        <source>Select</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="117"/>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="138"/>
+        <source>quantisation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="159"/>
-        <source>Select &amp;All</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="118"/>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="139"/>
+        <source>this input note triggers the sound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="160"/>
-        <source>&amp;Deselect All</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="119"/>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="140"/>
+        <source>note length</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="161"/>
-        <source>Invert &amp;Selection</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="120"/>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="141"/>
+        <source>this is the note which is played</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="162"/>
-        <source>&amp;Inside Loop</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="121"/>
+        <source>output channel (hold ctl to affect all rows)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="163"/>
-        <source>&amp;Outside Loop</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="122"/>
+        <source>output port (hold ctl to affect all rows)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="164"/>
-        <source>All &amp;Parts on Track</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="123"/>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="144"/>
+        <source>shift + control key: draw velocity level 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="167"/>
-        <source>Score</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="124"/>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="145"/>
+        <source>control key: draw velocity level 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="170"/>
-        <source>all parts in one staff</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="125"/>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="146"/>
+        <source>shift key: draw velocity level 3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="171"/>
-        <source>one staff per part</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="126"/>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="147"/>
+        <source>draw velocity level 4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="177"/>
-        <source>New score window</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="142"/>
+        <source>output channel (ctl: affect all rows)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="178"/>
-        <source>Pianoroll</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="143"/>
+        <source>output port (ctl: affect all rows)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="179"/>
-        <source>Drums</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="186"/>
+        <source>&amp;File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="180"/>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="186"/>
-        <source>List</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="188"/>
+        <source>Load Map</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="181"/>
-        <source>Wave</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="189"/>
+        <source>Save Map</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="183"/>
-        <source>Mastertrack</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="190"/>
+        <source>Reset GM Map</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="185"/>
-        <source>Graphic</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="200"/>
+        <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="188"/>
-        <source>Midi &amp;Transform</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="204"/>
+        <source>Cut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="192"/>
-        <source>Global Cut</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="205"/>
+        <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="193"/>
-        <source>Global Insert</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="206"/>
+        <source>Copy events in range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="194"/>
-        <source>Global Split</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="207"/>
+        <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="202"/>
-        <source>&amp;Edit</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="208"/>
+        <source>Paste (with Dialog)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="245"/>
-        <source>&amp;Structure</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="210"/>
+        <source>Delete Events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="252"/>
-        <source>Functions</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="226"/>
+        <source>&amp;Select</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="253"/>
-        <source>&amp;Quantize Notes</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="228"/>
+        <source>Select All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="254"/>
-        <source>Change note &amp;length</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="229"/>
+        <source>Select None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="255"/>
-        <source>Change note &amp;velocity</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="230"/>
+        <source>Invert</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="256"/>
-        <source>Crescendo/Decrescendo</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="232"/>
+        <source>Inside Loop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="257"/>
-        <source>Transpose</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="233"/>
+        <source>Outside Loop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="258"/>
-        <source>Erase Events (Not Parts)</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="237"/>
+        <source>Previous Part</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="259"/>
-        <source>Move Events (Not Parts)</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="238"/>
+        <source>Next Part</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="260"/>
-        <source>Set Fixed Note Length</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="257"/>
+        <source>Fu&amp;nctions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="261"/>
-        <source>Delete Overlapping Notes</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="261"/>
+        <source>Re-order list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="262"/>
-        <source>Legato</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="263"/>
+        <source>Set Fixed Length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="264"/>
+        <source>Modify Velocity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="265"/>
+        <source>Crescendo/Decrescendo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="276"/>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="266"/>
+        <source>Quantize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="267"/>
+        <source>Erase Event</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="268"/>
+        <source>Move Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="269"/>
+        <source>Delete Overlaps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="289"/>
+        <source>&amp;Plugins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="292"/>
         <source>Window &amp;Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="584"/>
-        <location filename="../../muse/arranger/arrangerview.cpp" line="590"/>
-        <source>New</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="303"/>
+        <source>Drum tools</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MusEArranger::PartCanvas</name>
     <message>
-        <location filename="../../muse/arranger/pcanvas.cpp" line="346"/>
-        <source>Cannot copy/move/clone to different Track-Type</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="307"/>
+        <source>Load Drummap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/pcanvas.cpp" line="607"/>
-        <source>C&amp;ut</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="313"/>
+        <source>Store Drummap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/pcanvas.cpp" line="611"/>
-        <source>&amp;Copy</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="325"/>
+        <source>Step Record</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/pcanvas.cpp" line="617"/>
-        <source>s&amp;elect </source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="331"/>
+        <source>Midi Input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/pcanvas.cpp" line="620"/>
-        <source>clones</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="340"/>
+        <source>cursor tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/pcanvas.cpp" line="625"/>
-        <source>rename</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="345"/>
+        <source>Set step size for cursor edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/pcanvas.cpp" line="628"/>
-        <source>color</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="359"/>
+        <source>panic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/pcanvas.cpp" line="636"/>
-        <source>delete</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="363"/>
+        <source>transport</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/pcanvas.cpp" line="638"/>
-        <source>split</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="381"/>
+        <source>ctrl</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/pcanvas.cpp" line="640"/>
-        <source>glue</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="388"/>
+        <source>Add Controller View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/pcanvas.cpp" line="642"/>
-        <source>de-clone</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="445"/>
+        <source>M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/pcanvas.cpp" line="652"/>
-        <location filename="../../muse/arranger/pcanvas.cpp" line="659"/>
-        <location filename="../../muse/arranger/pcanvas.cpp" line="666"/>
-        <source>save part to disk</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="446"/>
+        <source>Sound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/pcanvas.cpp" line="664"/>
-        <source>wave edit</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="447"/>
+        <source>Vol</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/pcanvas.cpp" line="668"/>
-        <source>file info</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="448"/>
+        <source>QNT</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/pcanvas.cpp" line="756"/>
-        <source>MusE: save part</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="449"/>
+        <source>E-Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/pcanvas.cpp" line="774"/>
-        <source>Part name</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="450"/>
+        <source>Len</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/pcanvas.cpp" line="774"/>
-        <source>Files</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="451"/>
+        <source>A-Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/pcanvas.cpp" line="2864"/>
-        <source> out of </source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="452"/>
+        <source>Ch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/pcanvas.cpp" line="2865"/>
-        <source> parts</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="453"/>
+        <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/pcanvas.cpp" line="2865"/>
-        <source> part</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="454"/>
+        <source>LV1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/pcanvas.cpp" line="2866"/>
-        <source> could not be pasted.
-Likely the selected track is the wrong type.</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="455"/>
+        <source>LV2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/pcanvas.cpp" line="2891"/>
-        <source>Cannot paste: multiple tracks selected</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="456"/>
+        <source>LV3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/pcanvas.cpp" line="2900"/>
-        <source>Cannot paste: no track selected</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="457"/>
+        <source>LV4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/pcanvas.cpp" line="2920"/>
-        <source>Can only paste to midi/drum track</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="834"/>
+        <source>Muse: Load Drum Map</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/pcanvas.cpp" line="2931"/>
-        <source>Can only paste to wave track</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="887"/>
+        <source>MusE: Store Drum Map</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/pcanvas.cpp" line="2942"/>
-        <source>Can only paste to midi or wave track</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="912"/>
+        <source>Drum map</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/pcanvas.cpp" line="2950"/>
-        <source>Cannot paste: wrong data type</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="913"/>
+        <source>Reset the drum map with GM defaults?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MusEArranger::TList</name>
+    <name>MusEGui::EditCAfterDialog</name>
     <message>
-        <location filename="../../muse/arranger/tlist.cpp" line="362"/>
-        <source>&lt;none&gt;</source>
+        <location filename="../../muse/liste/editevent.cpp" line="445"/>
+        <source>MusE: Enter Channel Aftertouch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/tlist.cpp" line="393"/>
-        <source>no clef</source>
+        <location filename="../../muse/liste/editevent.cpp" line="447"/>
+        <source>Time Position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/tlist.cpp" line="395"/>
-        <source>Treble</source>
+        <location filename="../../muse/liste/editevent.cpp" line="451"/>
+        <source>Pressure</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::EditEventDialog</name>
     <message>
-        <location filename="../../muse/arranger/tlist.cpp" line="397"/>
-        <source>Bass</source>
+        <location filename="../../muse/liste/editevent.cpp" line="190"/>
+        <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/tlist.cpp" line="399"/>
-        <source>Grand</source>
+        <location filename="../../muse/liste/editevent.cpp" line="192"/>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::EditInstrument</name>
     <message>
-        <location filename="../../muse/arranger/tlist.cpp" line="446"/>
-        <source>MusE: bad trackname</source>
+        <location filename="../../muse/instruments/editinstrument.cpp" line="312"/>
+        <location filename="../../muse/instruments/editinstrument.cpp" line="346"/>
+        <source>MusE: Create file failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/tlist.cpp" line="447"/>
-        <source>please choose a unique track name</source>
+        <location filename="../../muse/instruments/editinstrument.cpp" line="379"/>
+        <source>MusE: Write File failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/tlist.cpp" line="604"/>
-        <location filename="../../muse/arranger/tlist.cpp" line="1747"/>
-        <source>Update drummap?</source>
+        <location filename="../../muse/instruments/editinstrument.cpp" line="411"/>
+        <location filename="../../muse/instruments/editinstrument.cpp" line="423"/>
+        <location filename="../../muse/instruments/editinstrument.cpp" line="703"/>
+        <location filename="../../muse/instruments/editinstrument.cpp" line="715"/>
+        <source>MusE:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/tlist.cpp" line="605"/>
-        <source>Do you want to use same port for all instruments in the drummap?</source>
+        <location filename="../../muse/instruments/editinstrument.cpp" line="412"/>
+        <location filename="../../muse/instruments/editinstrument.cpp" line="704"/>
+        <source>The user instrument directory
+%1
+does not exist yet. Create it now?
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/tlist.cpp" line="606"/>
-        <location filename="../../muse/arranger/tlist.cpp" line="1749"/>
-        <source>&amp;Yes</source>
+        <location filename="../../muse/instruments/editinstrument.cpp" line="413"/>
+        <location filename="../../muse/instruments/editinstrument.cpp" line="705"/>
+        <source>(You can change the user instruments directory at Settings-&gt;Global Settings-&gt;Midi)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/tlist.cpp" line="606"/>
-        <location filename="../../muse/arranger/tlist.cpp" line="1749"/>
-        <source>&amp;No</source>
+        <location filename="../../muse/instruments/editinstrument.cpp" line="423"/>
+        <location filename="../../muse/instruments/editinstrument.cpp" line="715"/>
+        <source>Unable to create user instrument directory &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/tlist.cpp" line="683"/>
-        <location filename="../../muse/arranger/tlist.cpp" line="738"/>
-        <source>show gui</source>
+        <location filename="../../muse/instruments/editinstrument.cpp" line="471"/>
+        <location filename="../../muse/instruments/editinstrument.cpp" line="737"/>
+        <source>MusE: Save Instrument Definition</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/tlist.cpp" line="692"/>
-        <location filename="../../muse/arranger/tlist.cpp" line="747"/>
-        <source>show native gui</source>
+        <location filename="../../muse/instruments/editinstrument.cpp" line="472"/>
+        <location filename="../../muse/instruments/editinstrument.cpp" line="738"/>
+        <source>Instrument Definition (*.idf)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/tlist.cpp" line="1085"/>
-        <source>Treble clef</source>
+        <location filename="../../muse/instruments/editinstrument.cpp" line="584"/>
+        <location filename="../../muse/instruments/editinstrument.cpp" line="613"/>
+        <source>MusE: Save instrument as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/tlist.cpp" line="1086"/>
-        <source>Bass clef</source>
+        <location filename="../../muse/instruments/editinstrument.cpp" line="584"/>
+        <source>Enter a new unique instrument name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/tlist.cpp" line="1087"/>
-        <source>Grand Staff</source>
+        <location filename="../../muse/instruments/editinstrument.cpp" line="614"/>
+        <source>The user instrument &apos;%1&apos; already exists. This will overwrite its .idf instrument file.
+Are you sure?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/tlist.cpp" line="1117"/>
-        <source>Viewable automation</source>
+        <location filename="../../muse/instruments/editinstrument.cpp" line="1140"/>
+        <source>MusE: Bad instrument name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/tlist.cpp" line="1248"/>
-        <source>Delete Track</source>
+        <location filename="../../muse/instruments/editinstrument.cpp" line="1141"/>
+        <source>Please choose a unique instrument name.
+(The name might be used by a hidden instrument.)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/tlist.cpp" line="1249"/>
-        <source>Track Comment</source>
+        <location filename="../../muse/instruments/editinstrument.cpp" line="1277"/>
+        <source>MusE: Bad patch name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/tlist.cpp" line="1252"/>
-        <source>Insert Track</source>
+        <location filename="../../muse/instruments/editinstrument.cpp" line="1278"/>
+        <source>Please choose a unique patch name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/tlist.cpp" line="1697"/>
-        <source>Midi</source>
+        <location filename="../../muse/instruments/editinstrument.cpp" line="1300"/>
+        <source>MusE: Bad patchgroup name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/tlist.cpp" line="1698"/>
-        <source>Drum</source>
+        <location filename="../../muse/instruments/editinstrument.cpp" line="1301"/>
+        <source>Please choose a unique patchgroup name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/tlist.cpp" line="1748"/>
-        <source>Do you want to use same port and channel for all instruments in the drummap?</source>
+        <location filename="../../muse/instruments/editinstrument.cpp" line="1827"/>
+        <source>MusE: Bad controller name</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MusEDialog::PasteDialog</name>
-    <message numerus="yes">
-        <location filename="../../muse/widgets/pastedialog.cpp" line="81"/>
-        <source>%n quarter(s)</source>
-        <translation type="unfinished">
-            <numerusform>%n quarter</numerusform>
-            <numerusform>%n quarters</numerusform>
-        </translation>
+    <message>
+        <location filename="../../muse/instruments/editinstrument.cpp" line="1828"/>
+        <source>Please choose a unique controller name</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/pastedialog.cpp" line="88"/>
-        <source>quarter</source>
-        <translation type="unfinished">quarter</translation>
+        <location filename="../../muse/instruments/editinstrument.cpp" line="3115"/>
+        <location filename="../../muse/instruments/editinstrument.cpp" line="3127"/>
+        <source>MusE: Cannot add common controller</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/pastedialog.cpp" line="90"/>
-        <source>quarters</source>
-        <translation type="unfinished">quarters</translation>
+        <location filename="../../muse/instruments/editinstrument.cpp" line="3116"/>
+        <source>A controller named &apos;%1&apos; already exists.</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MusEDialog::PasteEventsDialog</name>
-    <message numerus="yes">
-        <location filename="../../muse/widgets/pasteeventsdialog.cpp" line="95"/>
-        <source>%n quarter(s)</source>
-        <translation type="unfinished">
-            <numerusform>%n quarter</numerusform>
-            <numerusform>%n quarters</numerusform>
-        </translation>
+    <message>
+        <location filename="../../muse/instruments/editinstrument.cpp" line="3128"/>
+        <source>A controller number %1 already exists.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/pasteeventsdialog.cpp" line="102"/>
-        <source>quarter</source>
-        <translation type="unfinished">quarter</translation>
+        <location filename="../../muse/instruments/editinstrument.cpp" line="3411"/>
+        <location filename="../../muse/instruments/editinstrument.cpp" line="3416"/>
+        <source>MusE</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/pasteeventsdialog.cpp" line="104"/>
-        <source>quarters</source>
-        <translation type="unfinished">quarters</translation>
+        <location filename="../../muse/instruments/editinstrument.cpp" line="3412"/>
+        <location filename="../../muse/instruments/editinstrument.cpp" line="3417"/>
+        <source>The current Instrument contains unsaved data
+Save Current Instrument?</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MusEMixer::AudioMixerApp</name>
     <message>
-        <location filename="../../muse/mixer/amixer.cpp" line="171"/>
-        <source>&amp;Create</source>
+        <location filename="../../muse/instruments/editinstrument.cpp" line="3414"/>
+        <location filename="../../muse/instruments/editinstrument.cpp" line="3419"/>
+        <source>&amp;Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/amixer.cpp" line="175"/>
-        <source>&amp;View</source>
+        <location filename="../../muse/instruments/editinstrument.cpp" line="3414"/>
+        <location filename="../../muse/instruments/editinstrument.cpp" line="3419"/>
+        <source>&amp;Nosave</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/amixer.cpp" line="176"/>
-        <source>Routing</source>
+        <location filename="../../muse/instruments/editinstrument.cpp" line="3414"/>
+        <source>&amp;Abort</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::EditMetaDialog</name>
     <message>
-        <location filename="../../muse/mixer/amixer.cpp" line="184"/>
-        <source>Show Midi Tracks</source>
+        <location filename="../../muse/liste/editevent.cpp" line="310"/>
+        <source>MusE: Enter Meta Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/amixer.cpp" line="185"/>
-        <source>Show Drum Tracks</source>
+        <location filename="../../muse/liste/editevent.cpp" line="312"/>
+        <source>Time Position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/amixer.cpp" line="186"/>
-        <source>Show Wave Tracks</source>
+        <location filename="../../muse/liste/editevent.cpp" line="316"/>
+        <source>Meta Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/amixer.cpp" line="192"/>
-        <source>Show Inputs</source>
+        <location filename="../../muse/liste/editevent.cpp" line="328"/>
+        <source>Enter Hex</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::EditPAfterDialog</name>
     <message>
-        <location filename="../../muse/mixer/amixer.cpp" line="193"/>
-        <source>Show Outputs</source>
+        <location filename="../../muse/liste/editevent.cpp" line="504"/>
+        <source>MusE: Enter Poly Aftertouch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/amixer.cpp" line="194"/>
-        <source>Show Groups</source>
+        <location filename="../../muse/liste/editevent.cpp" line="506"/>
+        <source>Time Position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/amixer.cpp" line="195"/>
-        <source>Show Auxs</source>
+        <location filename="../../muse/liste/editevent.cpp" line="510"/>
+        <source>Pitch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/amixer.cpp" line="196"/>
-        <source>Show Synthesizers</source>
+        <location filename="../../muse/liste/editevent.cpp" line="512"/>
+        <source>Pressure</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MusEMixer::AudioStrip</name>
+    <name>MusEGui::EditToolBar</name>
     <message>
-        <location filename="../../muse/mixer/astrip.cpp" line="645"/>
-        <source>panorama</source>
+        <location filename="../../muse/widgets/tools.cpp" line="33"/>
+        <source>select Pointer Tool:
+with the pointer tool you can:
+  select parts
+  move parts
+  copy parts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/astrip.cpp" line="647"/>
-        <source>aux send level</source>
+        <location filename="../../muse/widgets/tools.cpp" line="38"/>
+        <source>select Pencil Tool:
+with the pencil tool you can:
+  create new parts
+  modify length of parts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/astrip.cpp" line="670"/>
-        <source>Pan</source>
+        <location filename="../../muse/widgets/tools.cpp" line="42"/>
+        <source>select Delete Tool:
+with the delete tool you can delete parts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/astrip.cpp" line="763"/>
-        <source>1/2 channel</source>
+        <location filename="../../muse/widgets/tools.cpp" line="44"/>
+        <source>select Cut Tool:
+with the cut tool you can split a part</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/astrip.cpp" line="775"/>
-        <source>Pre</source>
+        <location filename="../../muse/widgets/tools.cpp" line="46"/>
+        <source>select Glue Tool:
+with the glue tool you can glue two parts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/astrip.cpp" line="776"/>
-        <source>pre fader - post fader</source>
+        <location filename="../../muse/widgets/tools.cpp" line="48"/>
+        <source>select Score Tool:
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/astrip.cpp" line="840"/>
-        <source>dB</source>
+        <location filename="../../muse/widgets/tools.cpp" line="49"/>
+        <source>select Quantize Tool:
+insert display quantize event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/astrip.cpp" line="876"/>
-        <source>record</source>
+        <location filename="../../muse/widgets/tools.cpp" line="51"/>
+        <source>select Drawing Tool</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/astrip.cpp" line="890"/>
-        <source>mute</source>
+        <location filename="../../muse/widgets/tools.cpp" line="52"/>
+        <source>select Muting Tool:
+click on part to mute/unmute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/astrip.cpp" line="915"/>
-        <source>record downmix</source>
+        <location filename="../../muse/widgets/tools.cpp" line="54"/>
+        <source>Manipulate automation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/astrip.cpp" line="917"/>
-        <location filename="../../muse/mixer/astrip.cpp" line="921"/>
-        <source>solo mode</source>
+        <location filename="../../muse/widgets/tools.cpp" line="55"/>
+        <source>Cursor tool</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/astrip.cpp" line="933"/>
-        <source>off</source>
+        <location filename="../../muse/widgets/tools.cpp" line="58"/>
+        <source>pointer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/astrip.cpp" line="952"/>
-        <source>iR</source>
+        <location filename="../../muse/widgets/tools.cpp" line="59"/>
+        <source>pencil</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/astrip.cpp" line="954"/>
-        <source>input routing</source>
+        <location filename="../../muse/widgets/tools.cpp" line="60"/>
+        <source>eraser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/astrip.cpp" line="962"/>
-        <source>oR</source>
+        <location filename="../../muse/widgets/tools.cpp" line="61"/>
+        <source>cutter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/astrip.cpp" line="964"/>
-        <source>output routing</source>
+        <location filename="../../muse/widgets/tools.cpp" line="62"/>
+        <source>score</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/astrip.cpp" line="976"/>
-        <source>Off</source>
+        <location filename="../../muse/widgets/tools.cpp" line="63"/>
+        <source>glue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/astrip.cpp" line="977"/>
-        <source>Read</source>
+        <location filename="../../muse/widgets/tools.cpp" line="64"/>
+        <source>quantize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/astrip.cpp" line="978"/>
-        <source>Touch</source>
+        <location filename="../../muse/widgets/tools.cpp" line="65"/>
+        <source>draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/astrip.cpp" line="979"/>
-        <source>Write</source>
+        <location filename="../../muse/widgets/tools.cpp" line="66"/>
+        <source>mute parts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/astrip.cpp" line="1012"/>
-        <source>automation type</source>
+        <location filename="../../muse/widgets/tools.cpp" line="67"/>
+        <source>edit automation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/tools.cpp" line="68"/>
+        <source>cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/tools.cpp" line="77"/>
+        <source>Edit Tools</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MusEMixer::EffectRack</name>
+    <name>MusEGui::EffectRack</name>
     <message>
         <location filename="../../muse/mixer/rack.cpp" line="193"/>
         <source>effect rack</source>
@@ -9432,177 +7730,548 @@ Likely the selected track is the wrong type.</source>
     </message>
 </context>
 <context>
-    <name>MusEMixer::MidiStrip</name>
+    <name>MusEGui::GlobalSettingsConfig</name>
     <message>
-        <location filename="../../muse/mixer/mstrip.cpp" line="109"/>
-        <location filename="../../muse/mixer/mstrip.cpp" line="230"/>
-        <location filename="../../muse/mixer/mstrip.cpp" line="388"/>
-        <source>off</source>
+        <location filename="../../muse/widgets/genset.cpp" line="561"/>
+        <source>Selects instruments directory</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::Header</name>
     <message>
-        <location filename="../../muse/mixer/mstrip.cpp" line="110"/>
-        <location filename="../../muse/mixer/mstrip.cpp" line="232"/>
-        <source>double click on/off</source>
+        <location filename="../../muse/widgets/header.cpp" line="164"/>
+        <source>Track Info Columns</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::LMaster</name>
     <message>
-        <location filename="../../muse/mixer/mstrip.cpp" line="190"/>
-        <source>VariationSend</source>
+        <location filename="../../muse/master/lmaster.cpp" line="158"/>
+        <source>MusE: Mastertrack</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/mstrip.cpp" line="190"/>
-        <source>Var</source>
+        <location filename="../../muse/master/lmaster.cpp" line="171"/>
+        <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/mstrip.cpp" line="191"/>
-        <source>ReverbSend</source>
+        <location filename="../../muse/master/lmaster.cpp" line="175"/>
+        <source>Insert Tempo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/mstrip.cpp" line="191"/>
-        <source>Rev</source>
+        <location filename="../../muse/master/lmaster.cpp" line="176"/>
+        <source>Insert Signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/mstrip.cpp" line="192"/>
-        <source>ChorusSend</source>
+        <location filename="../../muse/master/lmaster.cpp" line="177"/>
+        <source>Insert Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/mstrip.cpp" line="192"/>
-        <source>Cho</source>
+        <location filename="../../muse/master/lmaster.cpp" line="178"/>
+        <source>Edit Positon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/mstrip.cpp" line="231"/>
-        <source>dB</source>
+        <location filename="../../muse/master/lmaster.cpp" line="179"/>
+        <source>Edit Value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/mstrip.cpp" line="285"/>
-        <source>Pan/Balance</source>
+        <location filename="../../muse/master/lmaster.cpp" line="180"/>
+        <source>Delete Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/mstrip.cpp" line="285"/>
-        <source>Pan</source>
+        <location filename="../../muse/master/lmaster.cpp" line="183"/>
+        <source>Window &amp;Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/mstrip.cpp" line="305"/>
-        <source>record</source>
+        <location filename="../../muse/master/lmaster.cpp" line="206"/>
+        <source>Undo/Redo tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/mstrip.cpp" line="316"/>
-        <source>mute</source>
+        <location filename="../../muse/master/lmaster.cpp" line="210"/>
+        <source>Edit tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/mstrip.cpp" line="337"/>
-        <source>solo mode</source>
+        <location filename="../../muse/master/lmaster.cpp" line="215"/>
+        <source>Tempo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/mstrip.cpp" line="404"/>
-        <source>iR</source>
+        <location filename="../../muse/master/lmaster.cpp" line="216"/>
+        <source>Timesig</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/mstrip.cpp" line="406"/>
-        <source>input routing</source>
+        <location filename="../../muse/master/lmaster.cpp" line="217"/>
+        <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/mstrip.cpp" line="412"/>
-        <source>oR</source>
+        <location filename="../../muse/master/lmaster.cpp" line="218"/>
+        <source>new tempo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/mstrip.cpp" line="417"/>
-        <source>output routing</source>
+        <location filename="../../muse/master/lmaster.cpp" line="219"/>
+        <source>new signature</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MusEWidget::BigTime</name>
     <message>
-        <location filename="../../muse/widgets/bigtime.cpp" line="60"/>
-        <source>format display</source>
+        <location filename="../../muse/master/lmaster.cpp" line="220"/>
+        <source>new key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/bigtime.cpp" line="77"/>
-        <source>bar</source>
+        <location filename="../../muse/master/lmaster.cpp" line="225"/>
+        <source>panic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/bigtime.cpp" line="78"/>
-        <source>beat</source>
+        <location filename="../../muse/master/lmaster.cpp" line="229"/>
+        <source>transport</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/bigtime.cpp" line="79"/>
-        <location filename="../../muse/widgets/bigtime.cpp" line="85"/>
-        <source>tick</source>
+        <location filename="../../muse/master/lmaster.cpp" line="245"/>
+        <source>Meter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/bigtime.cpp" line="81"/>
-        <source>minute</source>
+        <location filename="../../muse/master/lmaster.cpp" line="246"/>
+        <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/bigtime.cpp" line="82"/>
-        <source>second</source>
+        <location filename="../../muse/master/lmaster.cpp" line="247"/>
+        <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/bigtime.cpp" line="83"/>
-        <location filename="../../muse/widgets/bigtime.cpp" line="86"/>
-        <source>frame</source>
+        <location filename="../../muse/master/lmaster.cpp" line="248"/>
+        <source>Value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/bigtime.cpp" line="84"/>
-        <source>subframe</source>
+        <location filename="../../muse/master/lmaster.cpp" line="639"/>
+        <source>Reposition of the initial tempo and signature events is not allowed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/bigtime.cpp" line="102"/>
-        <source>MusE: Bigtime</source>
+        <location filename="../../muse/master/lmaster.cpp" line="693"/>
+        <source>MusE: List Editor</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MusEWidget::EditToolBar</name>
     <message>
-        <location filename="../../muse/widgets/tools.cpp" line="77"/>
-        <source>Edit Tools</source>
+        <location filename="../../muse/master/lmaster.cpp" line="694"/>
+        <source>Input error, conversion not OK or value out of range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/master/lmaster.cpp" line="707"/>
+        <source>Reposition of tempo and signature events to start position is not allowed!</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::GlobalSettingsConfig</name>
+    <name>MusEGui::ListEdit</name>
     <message>
-        <location filename="../../muse/widgets/genset.cpp" line="546"/>
-        <source>Selects instruments directory</source>
+        <location filename="../../muse/liste/listedit.cpp" line="477"/>
+        <source>insert Note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/liste/listedit.cpp" line="478"/>
+        <source>insert SysEx</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/liste/listedit.cpp" line="479"/>
+        <source>insert Ctrl</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/liste/listedit.cpp" line="480"/>
+        <source>insert Meta</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/liste/listedit.cpp" line="481"/>
+        <source>insert Channel Aftertouch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/liste/listedit.cpp" line="482"/>
+        <source>insert Poly Aftertouch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/liste/listedit.cpp" line="495"/>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/liste/listedit.cpp" line="500"/>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/liste/listedit.cpp" line="504"/>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/liste/listedit.cpp" line="508"/>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/liste/listedit.cpp" line="514"/>
+        <source>Delete Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/liste/listedit.cpp" line="524"/>
+        <source>Window &amp;Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/liste/listedit.cpp" line="531"/>
+        <source>Undo/Redo tools</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/liste/listedit.cpp" line="535"/>
+        <source>Insert tools</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/liste/listedit.cpp" line="539"/>
+        <source>panic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/liste/listedit.cpp" line="543"/>
+        <source>transport</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/liste/listedit.cpp" line="565"/>
+        <source>Tick</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/liste/listedit.cpp" line="566"/>
+        <source>Bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/liste/listedit.cpp" line="567"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/liste/listedit.cpp" line="568"/>
+        <source>Ch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/liste/listedit.cpp" line="569"/>
+        <source>Val A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/liste/listedit.cpp" line="570"/>
+        <source>Val B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/liste/listedit.cpp" line="571"/>
+        <source>Val C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/liste/listedit.cpp" line="572"/>
+        <source>Len</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/liste/listedit.cpp" line="573"/>
+        <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::Header</name>
+    <name>MusEGui::MPConfig</name>
     <message>
-        <location filename="../../muse/widgets/header.cpp" line="164"/>
-        <source>Track Info Columns</source>
+        <location filename="../../muse/confmport.cpp" line="101"/>
+        <location filename="../../muse/confmport.cpp" line="277"/>
+        <source>Default input connections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="102"/>
+        <location filename="../../muse/confmport.cpp" line="168"/>
+        <source>Are you sure you want to apply to all existing midi tracks now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="167"/>
+        <location filename="../../muse/confmport.cpp" line="315"/>
+        <source>Default output connections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="278"/>
+        <location filename="../../muse/confmport.cpp" line="316"/>
+        <source>Setting will apply to new midi tracks.
+Do you want to apply to all existing midi tracks now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="355"/>
+        <source>MusE: bad device name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="356"/>
+        <source>please choose a unique device name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="428"/>
+        <location filename="../../muse/confmport.cpp" line="1287"/>
+        <source>in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="451"/>
+        <location filename="../../muse/confmport.cpp" line="1278"/>
+        <source>out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="507"/>
+        <source>Show first aliases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="513"/>
+        <source>Show second aliases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="643"/>
+        <location filename="../../muse/confmport.cpp" line="685"/>
+        <source>Toggle all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="647"/>
+        <location filename="../../muse/confmport.cpp" line="690"/>
+        <source>Change all tracks now</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="733"/>
+        <source>Create Jack device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="962"/>
+        <location filename="../../muse/confmport.cpp" line="991"/>
+        <source>Port Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="963"/>
+        <source>Enable gui</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="964"/>
+        <source>Enable reading</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="965"/>
+        <source>Enable writing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="966"/>
+        <source>Port instrument</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="967"/>
+        <source>Midi device name. Click to edit (Jack)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="969"/>
+        <source>Connections from Jack Midi outputs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="970"/>
+        <source>Connections to Jack Midi inputs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="971"/>
+        <source>Auto-connect these channels to new midi tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="974"/>
+        <source>Auto-connect new midi tracks to these channels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="976"/>
+        <source>Auto-connect new midi tracks to this channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="978"/>
+        <source>Device state</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="993"/>
+        <source>Enable gui for device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="995"/>
+        <source>Enable reading from device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="997"/>
+        <source>Enable writing to device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="999"/>
+        <source>Name of the midi device associated with this port number. Click to edit Jack midi name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="1002"/>
+        <source>Instrument connected to port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="1006"/>
+        <source>Connections from Jack Midi output ports</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="1008"/>
+        <source>Connections to Jack Midi input ports</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="1017"/>
+        <source>Auto-connect these channels, on this port, to new midi tracks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="1021"/>
+        <source>Connect new midi tracks to these channels, on this port.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="1023"/>
+        <source>Connect new midi tracks to this channel, on this port.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="1026"/>
+        <source>State: result of opening the device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="1067"/>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="1068"/>
+        <source>GUI</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="1069"/>
+        <source>I</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="1070"/>
+        <source>O</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="1071"/>
+        <source>Instrument</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="1072"/>
+        <source>Device Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="1073"/>
+        <source>In routes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="1074"/>
+        <source>Out routes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="1075"/>
+        <source>Def in ch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="1076"/>
+        <source>Def out ch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="1077"/>
+        <source>State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="1161"/>
+        <source>&lt;unknown&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="1248"/>
+        <location filename="../../muse/confmport.cpp" line="1319"/>
+        <source>&lt;none&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::MTScale</name>
+    <name>MusEGui::MTScale</name>
     <message>
         <location filename="../../muse/widgets/mtscale.cpp" line="44"/>
         <source>bar scale</source>
@@ -9610,7 +8279,7 @@ Likely the selected track is the wrong type.</source>
     </message>
 </context>
 <context>
-    <name>MusEWidget::MTScaleFlo</name>
+    <name>MusEGui::MTScaleFlo</name>
     <message>
         <location filename="../../muse/widgets/mtscale_flo.cpp" line="44"/>
         <source>bar scale</source>
@@ -9618,7 +8287,278 @@ Likely the selected track is the wrong type.</source>
     </message>
 </context>
 <context>
-    <name>MusEWidget::MidiSyncConfig</name>
+    <name>MusEGui::MarkerView</name>
+    <message>
+        <location filename="../../muse/marker/markerview.cpp" line="175"/>
+        <source>MusE: Marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/marker/markerview.cpp" line="177"/>
+        <source>add marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/marker/markerview.cpp" line="180"/>
+        <source>delete marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/marker/markerview.cpp" line="188"/>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/marker/markerview.cpp" line="194"/>
+        <source>Window &amp;Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/marker/markerview.cpp" line="201"/>
+        <source>Undo/Redo tools</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/marker/markerview.cpp" line="205"/>
+        <source>edit tools</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/marker/markerview.cpp" line="210"/>
+        <source>panic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/marker/markerview.cpp" line="214"/>
+        <source>transport</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/marker/markerview.cpp" line="231"/>
+        <source>Bar:Beat:Tick</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/marker/markerview.cpp" line="232"/>
+        <source>Hr:Mn:Sc:Fr:Sf</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/marker/markerview.cpp" line="233"/>
+        <source>Lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/marker/markerview.cpp" line="234"/>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/marker/markerview.cpp" line="245"/>
+        <source>Marker Properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::MasterEdit</name>
+    <message>
+        <location filename="../../muse/master/masteredit.cpp" line="107"/>
+        <source>MusE: Mastertrack</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/master/masteredit.cpp" line="114"/>
+        <source>Window &amp;Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/master/masteredit.cpp" line="120"/>
+        <source>Undo/Redo tools</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/master/masteredit.cpp" line="125"/>
+        <source>panic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/master/masteredit.cpp" line="129"/>
+        <source>transport</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/master/masteredit.cpp" line="136"/>
+        <source>Enable master</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/master/masteredit.cpp" line="140"/>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/master/masteredit.cpp" line="141"/>
+        <source>Enable usage of master track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/master/masteredit.cpp" line="146"/>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/master/masteredit.cpp" line="148"/>
+        <source>Cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/master/masteredit.cpp" line="155"/>
+        <source>time at cursor position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/master/masteredit.cpp" line="159"/>
+        <source>tempo at cursor position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/master/masteredit.cpp" line="163"/>
+        <source>Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/master/masteredit.cpp" line="163"/>
+        <source>Bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/master/masteredit.cpp" line="165"/>
+        <source>Snap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/master/masteredit.cpp" line="174"/>
+        <source>CurPos </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/master/masteredit.cpp" line="178"/>
+        <source>tempo at current position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/master/masteredit.cpp" line="179"/>
+        <source>time signature at current position</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::MidiInputTransformDialog</name>
+    <message>
+        <location filename="../../muse/mplugins/midiitransform.cpp" line="953"/>
+        <location filename="../../muse/mplugins/midiitransform.cpp" line="955"/>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::MidiStrip</name>
+    <message>
+        <location filename="../../muse/mixer/mstrip.cpp" line="110"/>
+        <location filename="../../muse/mixer/mstrip.cpp" line="231"/>
+        <location filename="../../muse/mixer/mstrip.cpp" line="368"/>
+        <source>off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/mixer/mstrip.cpp" line="111"/>
+        <location filename="../../muse/mixer/mstrip.cpp" line="233"/>
+        <source>double click on/off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/mixer/mstrip.cpp" line="191"/>
+        <source>VariationSend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/mixer/mstrip.cpp" line="191"/>
+        <source>Var</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/mixer/mstrip.cpp" line="192"/>
+        <source>ReverbSend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/mixer/mstrip.cpp" line="192"/>
+        <source>Rev</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/mixer/mstrip.cpp" line="193"/>
+        <source>ChorusSend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/mixer/mstrip.cpp" line="193"/>
+        <source>Cho</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/mixer/mstrip.cpp" line="232"/>
+        <source>dB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/mixer/mstrip.cpp" line="286"/>
+        <source>Pan/Balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/mixer/mstrip.cpp" line="286"/>
+        <source>Pan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/mixer/mstrip.cpp" line="300"/>
+        <source>record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/mixer/mstrip.cpp" line="308"/>
+        <source>mute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/mixer/mstrip.cpp" line="317"/>
+        <source>solo mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/mixer/mstrip.cpp" line="386"/>
+        <source>iR</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/mixer/mstrip.cpp" line="388"/>
+        <source>input routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/mixer/mstrip.cpp" line="394"/>
+        <source>oR</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/mixer/mstrip.cpp" line="399"/>
+        <source>output routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::MidiSyncConfig</name>
     <message>
         <location filename="../../muse/widgets/midisyncimpl.cpp" line="58"/>
         <location filename="../../muse/widgets/midisyncimpl.cpp" line="87"/>
@@ -9942,2219 +8882,3451 @@ Apply sync settings?</source>
     </message>
 </context>
 <context>
-    <name>MusEWidget::MidiTrackInfo</name>
+    <name>MusEGui::MidiTrackInfo</name>
     <message>
-        <location filename="../../muse/widgets/mtrackinfo.cpp" line="319"/>
-        <location filename="../../muse/widgets/mtrackinfo.cpp" line="1365"/>
+        <location filename="../../muse/widgets/mtrackinfo.cpp" line="335"/>
+        <location filename="../../muse/widgets/mtrackinfo.cpp" line="1403"/>
         <source>&lt;unknown&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::MixdownFileDialog</name>
+    <name>MusEGui::MidiTransformerDialog</name>
+    <message>
+        <location filename="../../muse/miditransform.cpp" line="464"/>
+        <location filename="../../muse/miditransform.cpp" line="466"/>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::MixdownFileDialog</name>
     <message>
-        <location filename="../../muse/widgets/mixdowndialog.cpp" line="118"/>
+        <location filename="../../muse/widgets/mixdowndialog.cpp" line="122"/>
         <source>Wave Files (*.wav);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::NoteInfo</name>
+    <name>MusEGui::MusE</name>
     <message>
-        <location filename="../../muse/widgets/noteinfo.cpp" line="44"/>
-        <source>Note Info</source>
+        <location filename="../../muse/app.cpp" line="137"/>
+        <location filename="../../muse/app.cpp" line="153"/>
+        <source>Failed to start audio!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/noteinfo.cpp" line="50"/>
+        <location filename="../../muse/app.cpp" line="138"/>
+        <source>Was not able to start audio, check if jack is running.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="154"/>
+        <source>Timeout waiting for audio to run. Check if jack is running.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="374"/>
+        <source>Und&amp;o</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="376"/>
+        <source>Re&amp;do</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="379"/>
+        <source>undo last change to song</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="380"/>
+        <source>redo last undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="394"/>
+        <source>Loop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="397"/>
+        <source>loop between left mark and right mark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="401"/>
+        <source>Punchin</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="404"/>
+        <source>record starts at left mark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="408"/>
+        <source>Punchout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="411"/>
+        <source>record stops at right mark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="419"/>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/noteinfo.cpp" line="63"/>
-        <source>Len</source>
+        <location filename="../../muse/app.cpp" line="421"/>
+        <source>rewind to start position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/noteinfo.cpp" line="74"/>
-        <source>Pitch</source>
+        <location filename="../../muse/app.cpp" line="425"/>
+        <source>Rewind</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/noteinfo.cpp" line="83"/>
-        <source>Velo On</source>
+        <location filename="../../muse/app.cpp" line="427"/>
+        <source>rewind current position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/noteinfo.cpp" line="94"/>
-        <source>Velo Off</source>
+        <location filename="../../muse/app.cpp" line="431"/>
+        <source>Forward</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MusEWidget::RoutePopupMenu</name>
-    <message>
-        <location filename="../../muse/widgets/routepopup.cpp" line="223"/>
-        <location filename="../../muse/widgets/routepopup.cpp" line="225"/>
-        <location filename="../../muse/widgets/routepopup.cpp" line="350"/>
-        <location filename="../../muse/widgets/routepopup.cpp" line="428"/>
-        <location filename="../../muse/widgets/routepopup.cpp" line="485"/>
-        <location filename="../../muse/widgets/routepopup.cpp" line="538"/>
-        <location filename="../../muse/widgets/routepopup.cpp" line="1220"/>
-        <location filename="../../muse/widgets/routepopup.cpp" line="1305"/>
-        <source>Channel</source>
+    <message>
+        <location filename="../../muse/app.cpp" line="433"/>
+        <source>move current position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/routepopup.cpp" line="1031"/>
-        <location filename="../../muse/widgets/routepopup.cpp" line="1255"/>
-        <location filename="../../muse/widgets/routepopup.cpp" line="1340"/>
-        <source>Soloing chain</source>
+        <location filename="../../muse/app.cpp" line="437"/>
+        <source>Stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/routepopup.cpp" line="1033"/>
-        <location filename="../../muse/widgets/routepopup.cpp" line="1257"/>
-        <source>Audio returns</source>
+        <location filename="../../muse/app.cpp" line="440"/>
+        <source>stop sequencer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/routepopup.cpp" line="1072"/>
-        <source>Warning: No midi input devices!</source>
+        <location filename="../../muse/app.cpp" line="445"/>
+        <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/routepopup.cpp" line="1077"/>
-        <source>Open midi config...</source>
+        <location filename="../../muse/app.cpp" line="448"/>
+        <source>start sequencer play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/routepopup.cpp" line="1122"/>
-        <location filename="../../muse/widgets/routepopup.cpp" line="1155"/>
-        <source>&lt;none&gt;</source>
+        <location filename="../../muse/app.cpp" line="453"/>
+        <source>Record</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/routepopup.cpp" line="1136"/>
-        <source>Toggle all</source>
+        <location filename="../../muse/app.cpp" line="455"/>
+        <source>to record press record and then play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/routepopup.cpp" line="1147"/>
-        <source>More...</source>
+        <location filename="../../muse/app.cpp" line="459"/>
+        <location filename="../../muse/app.cpp" line="697"/>
+        <source>Panic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/routepopup.cpp" line="1342"/>
-        <source>Audio sends</source>
+        <location filename="../../muse/app.cpp" line="461"/>
+        <source>send note off to all midi channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/routepopup.cpp" line="1346"/>
-        <source>Midi port sends</source>
+        <location filename="../../muse/app.cpp" line="471"/>
+        <source>&amp;New</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MusEWidget::ScrollScale</name>
     <message>
-        <location filename="../../muse/widgets/scrollscale.cpp" line="316"/>
-        <source>next page</source>
+        <location filename="../../muse/app.cpp" line="472"/>
+        <location filename="../../muse/app.cpp" line="473"/>
+        <source>Create New Song</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/scrollscale.cpp" line="317"/>
-        <source>previous page</source>
+        <location filename="../../muse/app.cpp" line="475"/>
+        <source>&amp;Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/scrollscale.cpp" line="318"/>
-        <source>current page number</source>
+        <location filename="../../muse/app.cpp" line="477"/>
+        <location filename="../../muse/app.cpp" line="479"/>
+        <source>Click this button to open a &lt;em&gt;new song&lt;/em&gt;.&lt;br&gt;You can also select the &lt;b&gt;Open command&lt;/b&gt; from the File menu.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MusEWidget::ShortcutCaptureDialog</name>
     <message>
-        <location filename="../../muse/widgets/shortcutcapturedialog.cpp" line="55"/>
-        <source>Ok</source>
+        <location filename="../../muse/app.cpp" line="482"/>
+        <source>Open &amp;Recent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/shortcutcapturedialog.cpp" line="56"/>
-        <source>Cancel</source>
+        <location filename="../../muse/app.cpp" line="484"/>
+        <location filename="../../muse/app.cpp" line="1514"/>
+        <location filename="../../muse/app.cpp" line="2769"/>
+        <source>&amp;Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/shortcutcapturedialog.cpp" line="108"/>
-        <source>Shortcut conflicts with </source>
+        <location filename="../../muse/app.cpp" line="486"/>
+        <location filename="../../muse/app.cpp" line="489"/>
+        <source>Click this button to save the song you are editing.  You will be prompted for a file name.
+You can also select the Save command from the File menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/shortcutcapturedialog.cpp" line="117"/>
-        <source>Undefined</source>
+        <location filename="../../muse/app.cpp" line="493"/>
+        <source>Save &amp;As</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MusEWidget::SigScale</name>
     <message>
-        <location filename="../../muse/widgets/sigscale.cpp" line="44"/>
-        <source>signature scale</source>
+        <location filename="../../muse/app.cpp" line="495"/>
+        <source>Import Midifile</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MusEWidget::Toolbar1</name>
     <message>
-        <location filename="../../muse/widgets/tb1.cpp" line="71"/>
-        <source>Solo</source>
+        <location filename="../../muse/app.cpp" line="496"/>
+        <source>Export Midifile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/tb1.cpp" line="79"/>
-        <source>Cursor</source>
+        <location filename="../../muse/app.cpp" line="497"/>
+        <source>Import Part</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/tb1.cpp" line="97"/>
-        <source>Snap</source>
+        <location filename="../../muse/app.cpp" line="499"/>
+        <location filename="../../muse/wave.cpp" line="1158"/>
+        <source>Import Wave File</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MusEWidget::TrackComment</name>
     <message>
-        <location filename="../../muse/widgets/comment.cpp" line="58"/>
-        <source>MusE: Track Comment</source>
+        <location filename="../../muse/app.cpp" line="500"/>
+        <source>Find unused wave files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/comment.cpp" line="64"/>
-        <source>Track Comment:</source>
+        <location filename="../../muse/app.cpp" line="502"/>
+        <source>&amp;Quit</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MusEWidget::VisibleTracks</name>
     <message>
-        <location filename="../../muse/widgets/visibletracks.cpp" line="59"/>
-        <source>Visible track types</source>
+        <location filename="../../muse/app.cpp" line="504"/>
+        <source>Song Info</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>OrganGuiBase</name>
     <message>
-        <location filename="../../synti/organ/organguibase.ui" line="20"/>
-        <source>MusE: Organ</source>
+        <location filename="../../muse/app.cpp" line="507"/>
+        <source>Transport Panel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/organ/organguibase.ui" line="38"/>
-        <source>Drawbars</source>
+        <location filename="../../muse/app.cpp" line="509"/>
+        <source>Bigtime Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/organ/organguibase.ui" line="50"/>
-        <source>16&apos;</source>
+        <location filename="../../muse/app.cpp" line="511"/>
+        <source>Mixer A</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/organ/organguibase.ui" line="60"/>
-        <source>4&apos;</source>
+        <location filename="../../muse/app.cpp" line="513"/>
+        <source>Mixer B</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/organ/organguibase.ui" line="70"/>
-        <source>2 2/3&apos;</source>
+        <location filename="../../muse/app.cpp" line="515"/>
+        <source>Cliplist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/organ/organguibase.ui" line="80"/>
-        <source>2&apos;</source>
+        <location filename="../../muse/app.cpp" line="517"/>
+        <source>Marker View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/organ/organguibase.ui" line="90"/>
-        <source>5 1/3&apos;</source>
+        <location filename="../../muse/app.cpp" line="519"/>
+        <source>Arranger View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/organ/organguibase.ui" line="100"/>
-        <source>8&apos;</source>
+        <location filename="../../muse/app.cpp" line="521"/>
+        <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/organ/organguibase.ui" line="332"/>
-        <source>Envelope Hi</source>
+        <location filename="../../muse/app.cpp" line="526"/>
+        <source>&amp;Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/organ/organguibase.ui" line="344"/>
-        <location filename="../../synti/organ/organguibase.ui" line="596"/>
-        <source>Release</source>
+        <location filename="../../muse/app.cpp" line="527"/>
+        <source>Edit Instrument</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/organ/organguibase.ui" line="354"/>
-        <location filename="../../synti/organ/organguibase.ui" line="586"/>
-        <source>Sustain</source>
+        <location filename="../../muse/app.cpp" line="528"/>
+        <source>Input Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/organ/organguibase.ui" line="364"/>
-        <location filename="../../synti/organ/organguibase.ui" line="576"/>
-        <source>Decay</source>
+        <location filename="../../muse/app.cpp" line="530"/>
+        <source>Transpose</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/organ/organguibase.ui" line="380"/>
-        <location filename="../../synti/organ/organguibase.ui" line="566"/>
-        <source>Attack</source>
+        <location filename="../../muse/app.cpp" line="531"/>
+        <source>Midi Input Transform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/organ/organguibase.ui" line="456"/>
-        <location filename="../../synti/organ/organguibase.ui" line="497"/>
-        <location filename="../../synti/organ/organguibase.ui" line="532"/>
-        <location filename="../../synti/organ/organguibase.ui" line="703"/>
-        <location filename="../../synti/organ/organguibase.ui" line="719"/>
-        <location filename="../../synti/organ/organguibase.ui" line="757"/>
-        <source>ms</source>
+        <location filename="../../muse/app.cpp" line="532"/>
+        <source>Midi Input Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/organ/organguibase.ui" line="513"/>
-        <location filename="../../synti/organ/organguibase.ui" line="735"/>
-        <source>cB</source>
+        <location filename="../../muse/app.cpp" line="533"/>
+        <source>Midi Remote Control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/organ/organguibase.ui" line="551"/>
-        <source>Envelope Lo</source>
+        <location filename="../../muse/app.cpp" line="535"/>
+        <source>Rhythm Generator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/organ/organguibase.ui" line="783"/>
-        <source>O-1</source>
+        <location filename="../../muse/app.cpp" line="537"/>
+        <source>Reset Instr.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/organ/organguibase.ui" line="802"/>
-        <source>Oscillator</source>
+        <location filename="../../muse/app.cpp" line="538"/>
+        <source>Init Instr.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/organ/organguibase.ui" line="820"/>
-        <source>Brass</source>
+        <location filename="../../muse/app.cpp" line="539"/>
+        <source>Local Off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/organ/organguibase.ui" line="833"/>
-        <source>Reed</source>
+        <location filename="../../muse/app.cpp" line="542"/>
+        <source>Bounce to Track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/organ/organguibase.ui" line="846"/>
-        <source>Flute</source>
+        <location filename="../../muse/app.cpp" line="543"/>
+        <source>Bounce to File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/organ/organguibase.ui" line="869"/>
-        <source>Velocity</source>
+        <location filename="../../muse/app.cpp" line="544"/>
+        <source>Restart Audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="547"/>
+        <source>Mixer Automation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="549"/>
+        <source>Take Snapshot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="550"/>
+        <source>Clear Automation Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="555"/>
+        <source>Cascade</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="556"/>
+        <source>Tile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="557"/>
+        <source>In rows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="558"/>
+        <source>In columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="562"/>
+        <source>Global Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="563"/>
+        <source>Configure Shortcuts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="564"/>
+        <source>Follow Song</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="565"/>
+        <source>Don&apos;t Follow Song</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="567"/>
+        <source>Follow Page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="570"/>
+        <source>Follow Continuous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="573"/>
+        <source>Metronome</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="574"/>
+        <source>Midi Sync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="575"/>
+        <source>Midi File Import/Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="576"/>
+        <source>Appearance Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="577"/>
+        <source>Midi Ports / Soft Synth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="580"/>
+        <source>&amp;Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="581"/>
+        <source>&amp;MusE Homepage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="582"/>
+        <source>&amp;Report Bug...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="583"/>
+        <source>&amp;About MusE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="682"/>
+        <source>File Buttons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="689"/>
+        <source>Undo/Redo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="693"/>
+        <source>Transport</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="748"/>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="777"/>
+        <source>&amp;View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="796"/>
+        <source>&amp;Midi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="825"/>
+        <source>&amp;Audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="839"/>
+        <source>A&amp;utomation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="852"/>
+        <source>&amp;Windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="865"/>
+        <source>MusE Se&amp;ttings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="888"/>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="1177"/>
+        <source>Cannot read template</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="1208"/>
+        <source>File open error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="1221"/>
+        <source>File read error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="1234"/>
+        <source>Unknown File Format: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="1364"/>
+        <location filename="../../muse/app.cpp" line="1801"/>
+        <location filename="../../muse/app.cpp" line="2715"/>
+        <source>MusE: Song: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="1398"/>
+        <source>MusE: load project</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="1412"/>
+        <source>MusE: load template</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="1474"/>
+        <source>MusE: Write File failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="1512"/>
+        <source>The current Project contains unsaved data
+Save Current Project?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="1514"/>
+        <location filename="../../muse/app.cpp" line="2769"/>
+        <source>S&amp;kip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="1514"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="1779"/>
+        <location filename="../../muse/app.cpp" line="1792"/>
+        <source>MusE: Save As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="1849"/>
+        <location filename="../../muse/app.cpp" line="2009"/>
+        <source>Nothing to edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="2503"/>
+        <location filename="../../muse/app.cpp" line="2513"/>
+        <location filename="../../muse/app.cpp" line="2544"/>
+        <location filename="../../muse/app.cpp" line="2578"/>
+        <location filename="../../muse/app.cpp" line="2586"/>
+        <source>MusE: Bounce to Track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="2504"/>
+        <source>No wave tracks found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="2514"/>
+        <location filename="../../muse/app.cpp" line="2619"/>
+        <source>No audio output tracks found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="2545"/>
+        <source>Select one audio output track,
+and one target wave track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="2579"/>
+        <source>Select one target wave track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="2587"/>
+        <source>Select one target wave track,
+and one audio output track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="2618"/>
+        <location filename="../../muse/app.cpp" line="2643"/>
+        <source>MusE: Bounce to File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="2644"/>
+        <source>Select one audio output track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="2683"/>
+        <source>MusE: Bounce</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="2684"/>
+        <source>set left/right marker for bounce range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="2766"/>
+        <source>The current Project contains unsaved data
+Load overwrites current Project:
+Save Current Project?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/app.cpp" line="2769"/>
+        <location filename="../../muse/importmidi.cpp" line="85"/>
+        <source>&amp;Abort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/exportmidi.cpp" line="147"/>
+        <source>MusE: Export Midi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/help.cpp" line="50"/>
+        <source>no help found at: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/help.cpp" line="52"/>
+        <source>MusE: Open Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/help.cpp" line="105"/>
+        <source>Unable to launch help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/help.cpp" line="106"/>
+        <source>For some reason MusE has to launch the default
+browser on your machine.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/importmidi.cpp" line="73"/>
+        <source>MusE: Import Midi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/importmidi.cpp" line="82"/>
+        <source>Add midi file to current project?
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/importmidi.cpp" line="83"/>
+        <source>&amp;Add to Project</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/importmidi.cpp" line="84"/>
+        <source>&amp;Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/importmidi.cpp" line="115"/>
+        <source>reading midifile
+  </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/importmidi.cpp" line="117"/>
+        <source>
+failed: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/importmidi.cpp" line="474"/>
+        <source>Import part is only valid for midi and wave tracks!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/importmidi.cpp" line="482"/>
+        <source>MusE: load part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/importmidi.cpp" line="500"/>
+        <source>No track selected for import</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PasteDialog</name>
     <message numerus="yes">
-        <source>%n quarter(s)</source>
-        <translation type="obsolete">
-            <numerusform>%n quarter</numerusform>
-            <numerusform>%n quarters</numerusform>
+        <location filename="../../muse/importmidi.cpp" line="621"/>
+        <source>%n part(s) out of %1 could not be imported.
+Likely the selected track is the wrong type.</source>
+        <translation>
+            <numerusform>%n part out of %1 could not be imported.
+Likely the selected track is the wrong type.</numerusform>
+            <numerusform>%n parts out of %1 could not be imported.
+Likely the selected track is the wrong type.</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../../muse/importmidi.cpp" line="622"/>
+        <source>%n part(s) could not be imported.
+Likely the selected track is the wrong type.</source>
+        <translation>
+            <numerusform>%n part could not be imported.
+Likely the selected track is the wrong type.</numerusform>
+            <numerusform>%n parts could not be imported.
+Likely the selected track is the wrong type.</numerusform>
         </translation>
     </message>
     <message>
-        <source>quarter</source>
-        <translation type="obsolete">quarter</translation>
+        <location filename="../../muse/wave.cpp" line="1152"/>
+        <source>to import an audio file you have first to selecta wave track</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>quarters</source>
-        <translation type="obsolete">quarters</translation>
+        <location filename="../../muse/wave.cpp" line="1182"/>
+        <source>Import Wavefile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/wave.cpp" line="1183"/>
+        <source>This wave file has a samplerate of %1,
+as opposed to current setting %2.
+Do you still want to import it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/wave.cpp" line="1186"/>
+        <source>&amp;Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/wave.cpp" line="1186"/>
+        <source>&amp;No</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>PasteDialogBase</name>
+    <name>MusEGui::NoteInfo</name>
     <message>
-        <location filename="../../muse/widgets/pastedialogbase.ui" line="14"/>
-        <source>MusE: Paste Parts</source>
+        <location filename="../../muse/widgets/noteinfo.cpp" line="44"/>
+        <source>Note Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/pastedialogbase.ui" line="26"/>
-        <source>Number and raster</source>
+        <location filename="../../muse/widgets/noteinfo.cpp" line="50"/>
+        <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/pastedialogbase.ui" line="34"/>
-        <source>insert</source>
+        <location filename="../../muse/widgets/noteinfo.cpp" line="63"/>
+        <source>Len</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/pastedialogbase.ui" line="41"/>
-        <source> times</source>
+        <location filename="../../muse/widgets/noteinfo.cpp" line="74"/>
+        <source>Pitch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/pastedialogbase.ui" line="54"/>
-        <source>raster</source>
+        <location filename="../../muse/widgets/noteinfo.cpp" line="83"/>
+        <source>Velo On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/pastedialogbase.ui" line="61"/>
-        <source> ticks</source>
+        <location filename="../../muse/widgets/noteinfo.cpp" line="94"/>
+        <source>Velo Off</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::PartCanvas</name>
     <message>
-        <location filename="../../muse/widgets/pastedialogbase.ui" line="125"/>
-        <source>Move, Merge, Clone</source>
+        <location filename="../../muse/arranger/pcanvas.cpp" line="355"/>
+        <source>Cannot copy/move/clone to different Track-Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/pastedialogbase.ui" line="143"/>
-        <source>Move everything to the right</source>
+        <location filename="../../muse/arranger/pcanvas.cpp" line="635"/>
+        <source>C&amp;ut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/pastedialogbase.ui" line="150"/>
-        <source>Move only affected parts to the right</source>
+        <location filename="../../muse/arranger/pcanvas.cpp" line="639"/>
+        <source>&amp;Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/pastedialogbase.ui" line="170"/>
-        <source>Put everything into a single track</source>
+        <location filename="../../muse/arranger/pcanvas.cpp" line="645"/>
+        <source>s&amp;elect </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/pastedialogbase.ui" line="177"/>
-        <source>Merge with existing parts</source>
+        <location filename="../../muse/arranger/pcanvas.cpp" line="648"/>
+        <source>clones</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/pastedialogbase.ui" line="190"/>
-        <source>Insert as clones (where possible)</source>
+        <location filename="../../muse/arranger/pcanvas.cpp" line="653"/>
+        <source>rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/pastedialogbase.ui" line="234"/>
-        <source>OK</source>
+        <location filename="../../muse/arranger/pcanvas.cpp" line="656"/>
+        <source>color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/pastedialogbase.ui" line="247"/>
-        <source>Cancel</source>
+        <location filename="../../muse/arranger/pcanvas.cpp" line="664"/>
+        <source>delete</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PasteEventsDialogBase</name>
     <message>
-        <location filename="../../muse/widgets/pasteeventsdialogbase.ui" line="14"/>
-        <source>MusE: Paste Events</source>
+        <location filename="../../muse/arranger/pcanvas.cpp" line="666"/>
+        <source>split</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/pasteeventsdialogbase.ui" line="26"/>
-        <source>Number and raster</source>
+        <location filename="../../muse/arranger/pcanvas.cpp" line="668"/>
+        <source>glue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/pasteeventsdialogbase.ui" line="34"/>
-        <source>insert</source>
+        <location filename="../../muse/arranger/pcanvas.cpp" line="670"/>
+        <source>de-clone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/pasteeventsdialogbase.ui" line="41"/>
-        <source> times</source>
+        <location filename="../../muse/arranger/pcanvas.cpp" line="680"/>
+        <location filename="../../muse/arranger/pcanvas.cpp" line="687"/>
+        <location filename="../../muse/arranger/pcanvas.cpp" line="694"/>
+        <source>save part to disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/pasteeventsdialogbase.ui" line="54"/>
-        <source>raster</source>
+        <location filename="../../muse/arranger/pcanvas.cpp" line="692"/>
+        <source>wave edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/pasteeventsdialogbase.ui" line="61"/>
-        <location filename="../../muse/widgets/pasteeventsdialogbase.ui" line="194"/>
-        <source> ticks</source>
+        <location filename="../../muse/arranger/pcanvas.cpp" line="696"/>
+        <source>file info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/pasteeventsdialogbase.ui" line="125"/>
-        <source>Paste options</source>
+        <location filename="../../muse/arranger/pcanvas.cpp" line="784"/>
+        <source>MusE: save part</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/pasteeventsdialogbase.ui" line="137"/>
-        <source>Always into existing parts</source>
+        <location filename="../../muse/arranger/pcanvas.cpp" line="802"/>
+        <source>Part name: %1
+Files:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message numerus="yes">
+        <location filename="../../muse/arranger/pcanvas.cpp" line="2938"/>
+        <source>%n part(s) out of %1 could not be pasted.
+Likely the selected track is the wrong type.</source>
+        <translation>
+            <numerusform>%n part out of %1 could not be pasted.
+Likely the selected track is the wrong type.</numerusform>
+            <numerusform>%n parts out of %1 could not be pasted.
+Likely the selected track is the wrong type.</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../../muse/arranger/pcanvas.cpp" line="2939"/>
+        <source>%n part(s) could not be pasted.
+Likely the selected track is the wrong type.</source>
+        <translation>
+            <numerusform>%n part could not be pasted.
+Likely the selected track is the wrong type.</numerusform>
+            <numerusform>%n parts could not be pasted.
+Likely the selected track is the wrong type.</numerusform>
+        </translation>
+    </message>
     <message>
-        <location filename="../../muse/widgets/pasteeventsdialogbase.ui" line="150"/>
-        <source>Never into existing parts</source>
+        <location filename="../../muse/arranger/pcanvas.cpp" line="2964"/>
+        <source>Cannot paste: multiple tracks selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/pasteeventsdialogbase.ui" line="162"/>
-        <source>Into existing parts if part has not
-to be expanded by more than </source>
+        <location filename="../../muse/arranger/pcanvas.cpp" line="2973"/>
+        <source>Cannot paste: no track selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/pasteeventsdialogbase.ui" line="250"/>
-        <source>Put everything into the (selected) part</source>
+        <location filename="../../muse/arranger/pcanvas.cpp" line="2993"/>
+        <source>Can only paste to midi/drum track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/pasteeventsdialogbase.ui" line="294"/>
-        <source>OK</source>
+        <location filename="../../muse/arranger/pcanvas.cpp" line="3004"/>
+        <source>Can only paste to wave track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/pasteeventsdialogbase.ui" line="307"/>
-        <source>Cancel</source>
+        <location filename="../../muse/arranger/pcanvas.cpp" line="3015"/>
+        <source>Can only paste to midi or wave track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/arranger/pcanvas.cpp" line="3023"/>
+        <source>Cannot paste: wrong data type</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::PasteDialog</name>
+    <message numerus="yes">
+        <location filename="../../muse/widgets/pastedialog.cpp" line="81"/>
+        <source>%n quarter(s)</source>
+        <translation>
+            <numerusform>%n quarter</numerusform>
+            <numerusform>%n quarters</numerusform>
+        </translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/pastedialog.cpp" line="88"/>
+        <source>%1 quarter</source>
+        <comment>for floating-point arguments like 1.5</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/pastedialog.cpp" line="90"/>
+        <source>%1 quarters</source>
+        <comment>for floating-point arguments like 1.5</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::PasteEventsDialog</name>
+    <message numerus="yes">
+        <location filename="../../muse/widgets/pasteeventsdialog.cpp" line="95"/>
+        <source>%n quarter(s)</source>
+        <translation>
+            <numerusform>%n quarter</numerusform>
+            <numerusform>%n quarters</numerusform>
+        </translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/pasteeventsdialog.cpp" line="102"/>
+        <source>%1 quarter</source>
+        <comment>for floating-point arguments like 1.5</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/pasteeventsdialog.cpp" line="104"/>
+        <source>%1 quarters</source>
+        <comment>for floating-point arguments like 1.5</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>PianoRoll</name>
+    <name>MusEGui::PianoRoll</name>
     <message>
-        <location filename="../../muse/midiedit/pianoroll.cpp" line="97"/>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="100"/>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/pianoroll.cpp" line="103"/>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="106"/>
         <source>C&amp;ut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/pianoroll.cpp" line="107"/>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="110"/>
         <source>&amp;Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/pianoroll.cpp" line="111"/>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="114"/>
         <source>Copy events in range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/pianoroll.cpp" line="115"/>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="118"/>
         <source>&amp;Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/pianoroll.cpp" line="119"/>
-        <source>&amp;Paste (with dialog)</source>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="122"/>
+        <source>Paste (with dialog)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/pianoroll.cpp" line="125"/>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="128"/>
         <source>Delete &amp;Events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/pianoroll.cpp" line="131"/>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="134"/>
         <source>&amp;Select</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/pianoroll.cpp" line="133"/>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="136"/>
         <source>Select &amp;All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/pianoroll.cpp" line="137"/>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="140"/>
         <source>&amp;Deselect All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/pianoroll.cpp" line="141"/>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="144"/>
         <source>Invert &amp;Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/pianoroll.cpp" line="147"/>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="150"/>
         <source>&amp;Inside Loop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/pianoroll.cpp" line="151"/>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="154"/>
         <source>&amp;Outside Loop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/pianoroll.cpp" line="158"/>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="161"/>
         <source>&amp;Previous Part</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/pianoroll.cpp" line="163"/>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="166"/>
         <source>&amp;Next Part</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/pianoroll.cpp" line="171"/>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="174"/>
         <source>Fu&amp;nctions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/pianoroll.cpp" line="175"/>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="178"/>
         <source>Quantize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/pianoroll.cpp" line="179"/>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="182"/>
         <source>Modify Note Length</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/pianoroll.cpp" line="183"/>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="186"/>
         <source>Modify Velocity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/pianoroll.cpp" line="187"/>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="190"/>
         <source>Crescendo/Decrescendo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/pianoroll.cpp" line="191"/>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="194"/>
         <source>Transpose</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/pianoroll.cpp" line="195"/>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="198"/>
         <source>Erase Events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/pianoroll.cpp" line="199"/>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="202"/>
         <source>Move Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/pianoroll.cpp" line="203"/>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="206"/>
         <source>Set Fixed Length</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/pianoroll.cpp" line="207"/>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="210"/>
         <source>Delete Overlaps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/pianoroll.cpp" line="211"/>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="214"/>
         <source>Legato</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/pianoroll.cpp" line="216"/>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="219"/>
         <source>&amp;Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/pianoroll.cpp" line="225"/>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="228"/>
         <source>Window &amp;Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/pianoroll.cpp" line="227"/>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="230"/>
         <source>&amp;Event Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/pianoroll.cpp" line="233"/>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="236"/>
         <source>&amp;Blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/pianoroll.cpp" line="238"/>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="241"/>
         <source>&amp;Pitch colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/pianoroll.cpp" line="243"/>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="246"/>
         <source>&amp;Velocity colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/pianoroll.cpp" line="262"/>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="265"/>
         <source>Pianoroll tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/pianoroll.cpp" line="268"/>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="271"/>
         <source>Step Record</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/pianoroll.cpp" line="274"/>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="277"/>
         <source>Midi Input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/pianoroll.cpp" line="280"/>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="283"/>
         <source>Play Events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/pianoroll.cpp" line="288"/>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="291"/>
         <source>panic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/pianoroll.cpp" line="294"/>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="297"/>
         <source>transport</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/pianoroll.cpp" line="317"/>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="320"/>
         <source>ctrl</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/pianoroll.cpp" line="321"/>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="324"/>
         <source>Add Controller View</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>PluginDialog</name>
+    <name>MusEGui::PluginDialog</name>
     <message>
-        <location filename="../../muse/plugin.cpp" line="3095"/>
+        <location filename="../../muse/plugin.cpp" line="3137"/>
         <source>MusE: select plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/plugin.cpp" line="3102"/>
+        <location filename="../../muse/plugin.cpp" line="3144"/>
         <source>Lib</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/plugin.cpp" line="3103"/>
+        <location filename="../../muse/plugin.cpp" line="3145"/>
         <source>Label</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/plugin.cpp" line="3104"/>
+        <location filename="../../muse/plugin.cpp" line="3146"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/plugin.cpp" line="3105"/>
+        <location filename="../../muse/plugin.cpp" line="3147"/>
         <source>AI</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/plugin.cpp" line="3106"/>
+        <location filename="../../muse/plugin.cpp" line="3148"/>
         <source>AO</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/plugin.cpp" line="3107"/>
+        <location filename="../../muse/plugin.cpp" line="3149"/>
         <source>CI</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/plugin.cpp" line="3108"/>
+        <location filename="../../muse/plugin.cpp" line="3150"/>
         <source>CO</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/plugin.cpp" line="3109"/>
+        <location filename="../../muse/plugin.cpp" line="3151"/>
         <source>IP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/plugin.cpp" line="3110"/>
+        <location filename="../../muse/plugin.cpp" line="3152"/>
         <source>id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/plugin.cpp" line="3111"/>
+        <location filename="../../muse/plugin.cpp" line="3153"/>
         <source>Maker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/plugin.cpp" line="3112"/>
+        <location filename="../../muse/plugin.cpp" line="3154"/>
         <source>Copyright</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/plugin.cpp" line="3142"/>
+        <location filename="../../muse/plugin.cpp" line="3184"/>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/plugin.cpp" line="3144"/>
+        <location filename="../../muse/plugin.cpp" line="3186"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/plugin.cpp" line="3159"/>
+        <location filename="../../muse/plugin.cpp" line="3201"/>
         <source>Mono and Stereo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/plugin.cpp" line="3164"/>
+        <location filename="../../muse/plugin.cpp" line="3206"/>
         <source>Stereo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/plugin.cpp" line="3169"/>
+        <location filename="../../muse/plugin.cpp" line="3211"/>
         <source>Mono</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/plugin.cpp" line="3174"/>
+        <location filename="../../muse/plugin.cpp" line="3216"/>
         <source>Show All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/plugin.cpp" line="3187"/>
+        <location filename="../../muse/plugin.cpp" line="3229"/>
         <source>Select which types of plugins should be visible in the list.&lt;br&gt;Note that using mono plugins on stereo tracks is not a problem, two will be used in parallell.&lt;br&gt;Also beware that the &apos;all&apos; alternative includes plugins that probably not are usable by MusE.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/plugin.cpp" line="3196"/>
+        <location filename="../../muse/plugin.cpp" line="3238"/>
         <source>Search in &apos;Label&apos; and &apos;Name&apos;:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>PluginGui</name>
+    <name>MusEGui::PluginGui</name>
     <message>
-        <location filename="../../muse/plugin.cpp" line="3403"/>
+        <location filename="../../muse/plugin.cpp" line="3445"/>
         <source>File Buttons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/plugin.cpp" line="3405"/>
+        <location filename="../../muse/plugin.cpp" line="3447"/>
         <source>Load Preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/plugin.cpp" line="3409"/>
+        <location filename="../../muse/plugin.cpp" line="3451"/>
         <source>Save Preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/plugin.cpp" line="3415"/>
-        <location filename="../../muse/plugin.cpp" line="3418"/>
+        <location filename="../../muse/plugin.cpp" line="3457"/>
+        <location filename="../../muse/plugin.cpp" line="3460"/>
         <source>bypass plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/plugin.cpp" line="3972"/>
+        <location filename="../../muse/plugin.cpp" line="4014"/>
         <source>MusE: load preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/plugin.cpp" line="3997"/>
+        <location filename="../../muse/plugin.cpp" line="4039"/>
         <source>Error reading preset. Might not be right type for this plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/plugin.cpp" line="4038"/>
+        <location filename="../../muse/plugin.cpp" line="4080"/>
         <source>MusE: save preset</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>ProjectCreate</name>
+    <name>MusEGui::RoutePopupMenu</name>
+    <message>
+        <location filename="../../muse/widgets/routepopup.cpp" line="230"/>
+        <location filename="../../muse/widgets/routepopup.cpp" line="232"/>
+        <location filename="../../muse/widgets/routepopup.cpp" line="364"/>
+        <location filename="../../muse/widgets/routepopup.cpp" line="442"/>
+        <location filename="../../muse/widgets/routepopup.cpp" line="499"/>
+        <location filename="../../muse/widgets/routepopup.cpp" line="559"/>
+        <location filename="../../muse/widgets/routepopup.cpp" line="1244"/>
+        <location filename="../../muse/widgets/routepopup.cpp" line="1329"/>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <location filename="../../muse/widgets/projectcreate.ui" line="14"/>
-        <source>Create Project</source>
+        <location filename="../../muse/widgets/routepopup.cpp" line="1059"/>
+        <location filename="../../muse/widgets/routepopup.cpp" line="1279"/>
+        <location filename="../../muse/widgets/routepopup.cpp" line="1364"/>
+        <source>Soloing chain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/projectcreate.ui" line="22"/>
-        <source>Project Name:</source>
+        <location filename="../../muse/widgets/routepopup.cpp" line="1061"/>
+        <location filename="../../muse/widgets/routepopup.cpp" line="1281"/>
+        <source>Audio returns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/projectcreate.ui" line="54"/>
-        <source>Project Path to song file:</source>
+        <location filename="../../muse/widgets/routepopup.cpp" line="1099"/>
+        <source>Warning: No input devices!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/projectcreate.ui" line="74"/>
-        <source>Create project folder (recommended for audio projects)</source>
+        <location filename="../../muse/widgets/routepopup.cpp" line="1104"/>
+        <source>Open midi config...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/projectcreate.ui" line="92"/>
-        <source>Browse</source>
+        <location filename="../../muse/widgets/routepopup.cpp" line="1146"/>
+        <location filename="../../muse/widgets/routepopup.cpp" line="1179"/>
+        <source>&lt;none&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/projectcreate.ui" line="101"/>
-        <source>Song information:</source>
+        <location filename="../../muse/widgets/routepopup.cpp" line="1160"/>
+        <source>Toggle all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/routepopup.cpp" line="1171"/>
+        <source>More...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/routepopup.cpp" line="1366"/>
+        <source>Audio sends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/routepopup.cpp" line="1370"/>
+        <source>Midi port sends</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QObject</name>
+    <name>MusEGui::ScoreCanvas</name>
     <message>
-        <location filename="../../muse/helper.cpp" line="267"/>
-        <source>Other</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="1313"/>
+        <source>Treble</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/functions.cpp" line="242"/>
-        <location filename="../../muse/functions.cpp" line="401"/>
-        <source>Error</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="1316"/>
+        <source>Bass</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/functions.cpp" line="242"/>
-        <location filename="../../muse/functions.cpp" line="401"/>
-        <source>Please first select the range for crescendo with the loop markers.</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="1319"/>
+        <source>Grand Staff</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="1322"/>
+        <source>Remove staff</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="3793"/>
+        <source>Ambiguous part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="3793"/>
+        <source>There are two or more possible parts you could add the note to, but none matches the selected part. Please select the destination part by clicking on any note belonging to it and try again, or add a new stave containing only the destination part.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="3797"/>
+        <source>No part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="3797"/>
+        <source>There are no parts you could add the note to.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QWidget</name>
+    <name>MusEGui::ScoreEdit</name>
     <message>
-        <location filename="../../muse/instruments/minstrument.cpp" line="72"/>
-        <location filename="../../muse/liste/editevent.cpp" line="92"/>
-        <source>Cannot convert sysex string</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="240"/>
+        <source>Undo/Redo tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/instruments/minstrument.cpp" line="80"/>
-        <location filename="../../muse/liste/editevent.cpp" line="100"/>
-        <source>Hex String too long (2048 bytes limit)</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="245"/>
+        <source>Step recording tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/instruments/minstrument.cpp" line="269"/>
-        <source>generic midi</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="248"/>
+        <source>Step Record</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/miditransform.cpp" line="357"/>
-        <source>new</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="261"/>
+        <source>panic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/route.cpp" line="1041"/>
-        <location filename="../../muse/route.cpp" line="1078"/>
-        <source>None</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="265"/>
+        <source>transport</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/wave.cpp" line="178"/>
-        <source>create peakfile for </source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="271"/>
+        <source>Note settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/waveedit/waveview.cpp" line="632"/>
-        <source>No selection. Ignoring</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="274"/>
+        <source>Note length:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/filedialog.cpp" line="80"/>
-        <source>MusE: get file name</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="282"/>
+        <source>last</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/filedialog.cpp" line="81"/>
-        <source>The directory
-</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="324"/>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="325"/>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="650"/>
+        <source>Apply to new notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/filedialog.cpp" line="82"/>
-        <source>
-does not exist.
-Create it?</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="326"/>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="654"/>
+        <source>Apply to selected notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/filedialog.cpp" line="89"/>
-        <source>MusE: create directory</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="333"/>
+        <source>Velocity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/filedialog.cpp" line="90"/>
-        <source>creating dir failed</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="344"/>
+        <source>Off-Velocity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/filedialog.cpp" line="486"/>
-        <source>File
-</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="357"/>
+        <source>Quantisation settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/filedialog.cpp" line="486"/>
-        <source>
-exists. Overwrite?</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="359"/>
+        <source>Quantisation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/filedialog.cpp" line="500"/>
-        <source>MusE: write</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="375"/>
+        <source>Pixels per whole:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/filedialog.cpp" line="519"/>
-        <source>Open File
-</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="384"/>
+        <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/filedialog.cpp" line="519"/>
-        <source>
-failed: </source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="389"/>
+        <source>C&amp;ut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/filedialog.cpp" line="521"/>
-        <source>MusE: Open File</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="393"/>
+        <source>&amp;Copy</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QuantBase</name>
     <message>
-        <location filename="../../muse/widgets/function_dialogs/quantbase.ui" line="17"/>
-        <source>MusE: Quantize</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="397"/>
+        <source>Copy events in range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/function_dialogs/quantbase.ui" line="29"/>
-        <source>Range</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="401"/>
+        <source>&amp;Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/function_dialogs/quantbase.ui" line="41"/>
-        <source>All Events</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="405"/>
+        <source>Paste (with dialog)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/function_dialogs/quantbase.ui" line="48"/>
-        <source>Selected Events</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="411"/>
+        <source>Delete &amp;Events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/function_dialogs/quantbase.ui" line="58"/>
-        <source>Looped Events</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="417"/>
+        <source>&amp;Select</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/function_dialogs/quantbase.ui" line="65"/>
-        <source>Selected Looped</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="419"/>
+        <source>Select &amp;All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/function_dialogs/quantbase.ui" line="75"/>
-        <source>Values</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="423"/>
+        <source>&amp;Deselect All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/function_dialogs/quantbase.ui" line="87"/>
-        <source>Strength:</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="427"/>
+        <source>Invert &amp;Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/function_dialogs/quantbase.ui" line="97"/>
-        <source>%</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="433"/>
+        <source>&amp;Inside Loop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/function_dialogs/quantbase.ui" line="110"/>
-        <source>Threshold (ticks):</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="437"/>
+        <source>&amp;Outside Loop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/function_dialogs/quantbase.ui" line="133"/>
-        <source>Quantize Len</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="442"/>
+        <source>Fu&amp;nctions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/function_dialogs/quantbase.ui" line="150"/>
-        <source>Raster</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="444"/>
+        <source>&amp;Quantize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/function_dialogs/quantbase.ui" line="167"/>
-        <source>Whole</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="445"/>
+        <source>Change note &amp;length</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/function_dialogs/quantbase.ui" line="172"/>
-        <source>Half</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="446"/>
+        <source>Change note &amp;velocity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/function_dialogs/quantbase.ui" line="177"/>
-        <source>Quarter</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="447"/>
+        <source>Crescendo/Decrescendo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/function_dialogs/quantbase.ui" line="182"/>
-        <source>8th</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="448"/>
+        <source>Transpose</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/function_dialogs/quantbase.ui" line="187"/>
-        <source>16th</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="449"/>
+        <source>Erase Events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/function_dialogs/quantbase.ui" line="192"/>
-        <source>32th</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="450"/>
+        <source>Move Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/function_dialogs/quantbase.ui" line="200"/>
-        <source>Swing:</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="451"/>
+        <source>Set Fixed Length</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/function_dialogs/quantbase.ui" line="220"/>
-        <source>If the proposed change in tick or length is smaller than threshold, nothing is done.
-If swing=0, this is normal
-If swing is 33, you get a 2:1-rhythm.
-If swing is -33, you get a 1:2-rhythm.
-</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="452"/>
+        <source>Delete Overlaps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/function_dialogs/quantbase.ui" line="271"/>
-        <source>OK</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="453"/>
+        <source>Legato</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/function_dialogs/quantbase.ui" line="284"/>
-        <source>Cancel</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="466"/>
+        <source>Window &amp;Config</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>RemoveBase</name>
     <message>
-        <location filename="../../muse/widgets/function_dialogs/removebase.ui" line="17"/>
-        <source>MusE: Erase Notes</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="468"/>
+        <source>Note head &amp;colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/function_dialogs/removebase.ui" line="29"/>
-        <source>Range</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="470"/>
+        <source>&amp;Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/function_dialogs/removebase.ui" line="41"/>
-        <source>All Events</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="471"/>
+        <source>&amp;Velocity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/function_dialogs/removebase.ui" line="48"/>
-        <source>Selected Events</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="472"/>
+        <source>&amp;Part</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/function_dialogs/removebase.ui" line="58"/>
-        <source>Looped Events</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="496"/>
+        <source>Set up &amp;preamble</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/function_dialogs/removebase.ui" line="65"/>
-        <source>Selected Looped</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="497"/>
+        <source>Display &amp;key signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/function_dialogs/removebase.ui" line="75"/>
-        <source>Thresholds</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="498"/>
+        <source>Display &amp;time signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/function_dialogs/removebase.ui" line="121"/>
-        <source> ticks</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="508"/>
+        <source>Set Score &amp;name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/function_dialogs/removebase.ui" line="134"/>
-        <source>Velocity</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="732"/>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="733"/>
+        <source>Enter the new score title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/function_dialogs/removebase.ui" line="141"/>
-        <source>Length</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="738"/>
+        <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/function_dialogs/removebase.ui" line="154"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:7px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;If nothing is checked, everything is removed.&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:7px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;If velocity is checked, only notes with velo &amp;lt; threshold are removed.&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;If both are checked, notes with velo &amp;lt; threshold OR with length &amp;lt; threshold are removed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="738"/>
+        <source>Changing score title failed:
+the selected title is not unique</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::ScrollScale</name>
     <message>
-        <location filename="../../muse/widgets/function_dialogs/removebase.ui" line="210"/>
-        <source>OK</source>
+        <location filename="../../muse/widgets/scrollscale.cpp" line="318"/>
+        <source>next page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/function_dialogs/removebase.ui" line="223"/>
+        <location filename="../../muse/widgets/scrollscale.cpp" line="319"/>
+        <source>previous page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/scrollscale.cpp" line="320"/>
+        <source>current page number</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::ShortcutCaptureDialog</name>
+    <message>
+        <location filename="../../muse/widgets/shortcutcapturedialog.cpp" line="55"/>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/shortcutcapturedialog.cpp" line="56"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../muse/widgets/shortcutcapturedialog.cpp" line="108"/>
+        <source>Shortcut conflicts with %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/shortcutcapturedialog.cpp" line="117"/>
+        <source>Undefined</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
-    <name>RouteDialogBase</name>
+    <name>MusEGui::SigScale</name>
     <message>
-        <location filename="../../muse/mixer/routedialogbase.ui" line="20"/>
-        <source>MusE: Routing</source>
+        <location filename="../../muse/widgets/sigscale.cpp" line="44"/>
+        <source>signature scale</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::Strip</name>
     <message>
-        <location filename="../../muse/mixer/routedialogbase.ui" line="32"/>
-        <source>Add Route</source>
+        <location filename="../../muse/mixer/strip.cpp" line="314"/>
+        <source>Remove track?</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::TList</name>
     <message>
-        <location filename="../../muse/mixer/routedialogbase.ui" line="52"/>
-        <source>Source:</source>
+        <location filename="../../muse/arranger/tlist.cpp" line="373"/>
+        <source>&lt;none&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/routedialogbase.ui" line="76"/>
-        <source>Destination:</source>
+        <location filename="../../muse/arranger/tlist.cpp" line="404"/>
+        <source>no clef</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/routedialogbase.ui" line="102"/>
-        <source>connect source to destination</source>
+        <location filename="../../muse/arranger/tlist.cpp" line="406"/>
+        <source>Treble</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/routedialogbase.ui" line="105"/>
-        <source>Connect</source>
+        <location filename="../../muse/arranger/tlist.cpp" line="408"/>
+        <source>Bass</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/routedialogbase.ui" line="115"/>
-        <source>Current Routes</source>
+        <location filename="../../muse/arranger/tlist.cpp" line="410"/>
+        <source>Grand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/routedialogbase.ui" line="128"/>
-        <source>Source</source>
+        <location filename="../../muse/arranger/tlist.cpp" line="457"/>
+        <source>MusE: bad trackname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/routedialogbase.ui" line="139"/>
-        <source>Destination</source>
+        <location filename="../../muse/arranger/tlist.cpp" line="458"/>
+        <source>please choose a unique track name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/routedialogbase.ui" line="159"/>
-        <source>remove selected route</source>
+        <location filename="../../muse/arranger/tlist.cpp" line="630"/>
+        <location filename="../../muse/arranger/tlist.cpp" line="1779"/>
+        <source>Update drummap?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/mixer/routedialogbase.ui" line="162"/>
-        <source>Remove</source>
+        <location filename="../../muse/arranger/tlist.cpp" line="631"/>
+        <source>Do you want to use same port for all instruments in the drummap?</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>SS_PluginChooserBase</name>
     <message>
-        <location filename="../../synti/simpledrums2/sspluginchooserbase.ui" line="16"/>
-        <source>SimpleDrums - Ladspa Plugin Chooser</source>
+        <location filename="../../muse/arranger/tlist.cpp" line="632"/>
+        <location filename="../../muse/arranger/tlist.cpp" line="1781"/>
+        <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/simpledrums2/sspluginchooserbase.ui" line="29"/>
-        <source>Name</source>
+        <location filename="../../muse/arranger/tlist.cpp" line="632"/>
+        <location filename="../../muse/arranger/tlist.cpp" line="1781"/>
+        <source>&amp;No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/simpledrums2/sspluginchooserbase.ui" line="34"/>
-        <source>Label</source>
+        <location filename="../../muse/arranger/tlist.cpp" line="707"/>
+        <location filename="../../muse/arranger/tlist.cpp" line="762"/>
+        <source>show gui</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/simpledrums2/sspluginchooserbase.ui" line="39"/>
-        <source>Inports</source>
+        <location filename="../../muse/arranger/tlist.cpp" line="716"/>
+        <location filename="../../muse/arranger/tlist.cpp" line="771"/>
+        <source>show native gui</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/simpledrums2/sspluginchooserbase.ui" line="44"/>
-        <source>Outports</source>
+        <location filename="../../muse/arranger/tlist.cpp" line="1117"/>
+        <source>Treble clef</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/simpledrums2/sspluginchooserbase.ui" line="49"/>
-        <source>Creator</source>
+        <location filename="../../muse/arranger/tlist.cpp" line="1118"/>
+        <source>Bass clef</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/simpledrums2/sspluginchooserbase.ui" line="81"/>
-        <source>&amp;Cancel</source>
+        <location filename="../../muse/arranger/tlist.cpp" line="1119"/>
+        <source>Grand Staff</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/simpledrums2/sspluginchooserbase.ui" line="84"/>
-        <source>Alt+C</source>
+        <location filename="../../muse/arranger/tlist.cpp" line="1149"/>
+        <source>Viewable automation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/simpledrums2/sspluginchooserbase.ui" line="91"/>
-        <source>&amp;OK</source>
+        <location filename="../../muse/arranger/tlist.cpp" line="1280"/>
+        <source>Delete Track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/simpledrums2/sspluginchooserbase.ui" line="94"/>
-        <source>Alt+O</source>
+        <location filename="../../muse/arranger/tlist.cpp" line="1281"/>
+        <source>Track Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/arranger/tlist.cpp" line="1284"/>
+        <source>Insert Track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/arranger/tlist.cpp" line="1729"/>
+        <source>Midi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/arranger/tlist.cpp" line="1730"/>
+        <source>Drum</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/arranger/tlist.cpp" line="1780"/>
+        <source>Do you want to use same port and channel for all instruments in the drummap?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SS_PluginFront</name>
+    <name>MusEGui::TempoSig</name>
     <message>
-        <location filename="../../synti/simpledrums2/ssplugingui.cpp" line="238"/>
-        <source>Clear and unload effect</source>
+        <location filename="../../muse/transport.cpp" line="149"/>
+        <source>Tempo/Sig</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::Toolbar1</name>
     <message>
-        <location filename="../../synti/simpledrums2/ssplugingui.cpp" line="239"/>
-        <source>Load effect</source>
+        <location filename="../../muse/widgets/tb1.cpp" line="47"/>
+        <location filename="../../muse/widgets/tb1.cpp" line="48"/>
+        <location filename="../../muse/widgets/tb1.cpp" line="49"/>
+        <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/simpledrums2/ssplugingui.cpp" line="240"/>
-        <source>Toggle display of effect parameters</source>
+        <location filename="../../muse/widgets/tb1.cpp" line="70"/>
+        <source>Solo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/simpledrums2/ssplugingui.cpp" line="241"/>
-        <source>Turn effect on/off</source>
+        <location filename="../../muse/widgets/tb1.cpp" line="78"/>
+        <source>Cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/tb1.cpp" line="96"/>
+        <source>Snap</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>ScoreCanvas</name>
+    <name>MusEGui::TopWin</name>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="1245"/>
-        <source>Treble</source>
+        <location filename="../../muse/cobject.cpp" line="64"/>
+        <source>As subwindow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="1248"/>
-        <source>Bass</source>
+        <location filename="../../muse/cobject.cpp" line="68"/>
+        <source>Shares tools and menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="1251"/>
-        <source>Grand Staff</source>
+        <location filename="../../muse/cobject.cpp" line="72"/>
+        <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="1254"/>
-        <source>Remove staff</source>
+        <location filename="../../muse/cobject.cpp" line="540"/>
+        <source>Piano roll</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="3721"/>
-        <source>Ambiguous part</source>
+        <location filename="../../muse/cobject.cpp" line="541"/>
+        <source>List editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="3721"/>
-        <source>There are two or more possible parts you could add the note to, but none matches the selected part. Please select the destination part by clicking on any note belonging to it and try again, or add a new stave containing only the destination part.</source>
+        <location filename="../../muse/cobject.cpp" line="542"/>
+        <source>Drum editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="3725"/>
-        <source>No part</source>
+        <location filename="../../muse/cobject.cpp" line="543"/>
+        <source>Master track editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="3725"/>
-        <source>There are no parts you could add the note to.</source>
+        <location filename="../../muse/cobject.cpp" line="544"/>
+        <source>Master track list editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/cobject.cpp" line="545"/>
+        <source>Wave editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/cobject.cpp" line="546"/>
+        <source>Clip list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/cobject.cpp" line="547"/>
+        <source>Marker view</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/cobject.cpp" line="548"/>
+        <source>Score editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/cobject.cpp" line="549"/>
+        <source>Arranger</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/cobject.cpp" line="550"/>
+        <source>&lt;unknown toplevel type&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>ScoreEdit</name>
+    <name>MusEGui::TrackComment</name>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="232"/>
-        <source>Undo/Redo tools</source>
+        <location filename="../../muse/widgets/comment.cpp" line="58"/>
+        <source>MusE: Track Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="237"/>
-        <source>Step recording tools</source>
+        <location filename="../../muse/widgets/comment.cpp" line="64"/>
+        <source>Track Comment:</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::Transport</name>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="240"/>
-        <source>Step Record</source>
+        <location filename="../../muse/transport.cpp" line="254"/>
+        <source>Overdub</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="253"/>
-        <source>panic</source>
+        <location filename="../../muse/transport.cpp" line="255"/>
+        <location filename="../../muse/transport.cpp" line="270"/>
+        <source>Replace</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="257"/>
-        <source>transport</source>
+        <location filename="../../muse/transport.cpp" line="260"/>
+        <source>Rec Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="263"/>
-        <source>Note settings</source>
+        <location filename="../../muse/transport.cpp" line="268"/>
+        <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="266"/>
-        <source>Note length:</source>
+        <location filename="../../muse/transport.cpp" line="269"/>
+        <source>Mix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="274"/>
-        <source>last</source>
+        <location filename="../../muse/transport.cpp" line="275"/>
+        <source>Cycle Rec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="311"/>
-        <source>Velocity:</source>
+        <location filename="../../muse/transport.cpp" line="291"/>
+        <source>punchin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="322"/>
-        <source>Off-Velocity:</source>
+        <location filename="../../muse/transport.cpp" line="292"/>
+        <source>loop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="335"/>
-        <source>Quantisation settings</source>
+        <location filename="../../muse/transport.cpp" line="295"/>
+        <source>punchout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="337"/>
-        <source>Quantisation:</source>
+        <location filename="../../muse/transport.cpp" line="299"/>
+        <location filename="../../muse/transport.cpp" line="302"/>
+        <source>Punch In</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="350"/>
-        <source>Pixels per whole:</source>
+        <location filename="../../muse/transport.cpp" line="300"/>
+        <location filename="../../muse/transport.cpp" line="303"/>
+        <source>Loop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="359"/>
+        <location filename="../../muse/transport.cpp" line="301"/>
+        <location filename="../../muse/transport.cpp" line="304"/>
+        <source>Punch Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/transport.cpp" line="337"/>
+        <source>Left Mark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/transport.cpp" line="349"/>
+        <source>Right Mark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/transport.cpp" line="396"/>
+        <source>rewind to start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/transport.cpp" line="397"/>
+        <source>Click this button to rewind to start position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/transport.cpp" line="399"/>
+        <source>rewind</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/transport.cpp" line="401"/>
+        <source>Click this button to rewind</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/transport.cpp" line="403"/>
+        <source>forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/transport.cpp" line="405"/>
+        <source>Click this button to forward current play position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/transport.cpp" line="407"/>
+        <source>stop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/transport.cpp" line="409"/>
+        <source>Click this button to stop playback</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/transport.cpp" line="411"/>
+        <source>play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/transport.cpp" line="412"/>
+        <source>Click this button to start playback</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/transport.cpp" line="414"/>
+        <source>record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/transport.cpp" line="415"/>
+        <source>Click this button to enable recording</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/transport.cpp" line="442"/>
+        <source>AC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/transport.cpp" line="442"/>
+        <source>quantize during record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/transport.cpp" line="444"/>
+        <source>Click</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/transport.cpp" line="444"/>
+        <source>metronom click on/off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/transport.cpp" line="447"/>
+        <source>Sync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/transport.cpp" line="447"/>
+        <source>external sync on/off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/transport.cpp" line="449"/>
+        <source>Jack</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/transport.cpp" line="449"/>
+        <source>Jack transport sync on/off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/transport.cpp" line="492"/>
+        <source>Master</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/transport.cpp" line="492"/>
+        <source>use master track</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::VisibleTracks</name>
+    <message>
+        <location filename="../../muse/widgets/visibletracks.cpp" line="36"/>
+        <location filename="../../muse/widgets/visibletracks.cpp" line="45"/>
+        <source>Show wave tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/visibletracks.cpp" line="37"/>
+        <location filename="../../muse/widgets/visibletracks.cpp" line="46"/>
+        <source>Show group tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/visibletracks.cpp" line="38"/>
+        <location filename="../../muse/widgets/visibletracks.cpp" line="47"/>
+        <source>Show aux tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/visibletracks.cpp" line="39"/>
+        <location filename="../../muse/widgets/visibletracks.cpp" line="48"/>
+        <source>Show input tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/visibletracks.cpp" line="40"/>
+        <location filename="../../muse/widgets/visibletracks.cpp" line="49"/>
+        <source>Show output tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/visibletracks.cpp" line="41"/>
+        <location filename="../../muse/widgets/visibletracks.cpp" line="50"/>
+        <source>Show midi tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/visibletracks.cpp" line="42"/>
+        <location filename="../../muse/widgets/visibletracks.cpp" line="51"/>
+        <source>Show synth tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/visibletracks.cpp" line="60"/>
+        <source>Visible track types</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::WaveEdit</name>
+    <message>
+        <location filename="../../muse/waveedit/waveedit.cpp" line="91"/>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="364"/>
-        <source>C&amp;ut</source>
+        <location filename="../../muse/waveedit/waveedit.cpp" line="93"/>
+        <source>Func&amp;tions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/waveedit/waveedit.cpp" line="95"/>
+        <source>&amp;Gain</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/waveedit/waveedit.cpp" line="117"/>
+        <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="368"/>
+        <location filename="../../muse/waveedit/waveedit.cpp" line="125"/>
         <source>&amp;Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="372"/>
-        <source>Copy events in range</source>
+        <location filename="../../muse/waveedit/waveedit.cpp" line="129"/>
+        <source>C&amp;ut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="376"/>
+        <location filename="../../muse/waveedit/waveedit.cpp" line="133"/>
         <source>&amp;Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="380"/>
-        <source>Paste (with dialog)</source>
+        <location filename="../../muse/waveedit/waveedit.cpp" line="138"/>
+        <source>Edit in E&amp;xternal Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="386"/>
-        <source>Delete &amp;Events</source>
+        <location filename="../../muse/waveedit/waveedit.cpp" line="142"/>
+        <source>Mute Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="392"/>
-        <source>&amp;Select</source>
+        <location filename="../../muse/waveedit/waveedit.cpp" line="146"/>
+        <source>Normalize Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/waveedit/waveedit.cpp" line="150"/>
+        <source>Fade In Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/waveedit/waveedit.cpp" line="154"/>
+        <source>Fade Out Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/waveedit/waveedit.cpp" line="158"/>
+        <source>Reverse Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/waveedit/waveedit.cpp" line="162"/>
+        <source>Select</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="394"/>
+        <location filename="../../muse/waveedit/waveedit.cpp" line="164"/>
         <source>Select &amp;All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="398"/>
+        <location filename="../../muse/waveedit/waveedit.cpp" line="168"/>
         <source>&amp;Deselect All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="402"/>
-        <source>Invert &amp;Selection</source>
+        <location filename="../../muse/waveedit/waveedit.cpp" line="173"/>
+        <source>Window &amp;Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="408"/>
-        <source>&amp;Inside Loop</source>
+        <location filename="../../muse/waveedit/waveedit.cpp" line="179"/>
+        <source>Wave edit tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="412"/>
-        <source>&amp;Outside Loop</source>
+        <location filename="../../muse/waveedit/waveedit.cpp" line="188"/>
+        <source>transport</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="417"/>
-        <source>Fu&amp;nctions</source>
+        <location filename="../../muse/waveedit/waveedit.cpp" line="196"/>
+        <source>WaveEdit tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="419"/>
-        <source>&amp;Quantize</source>
+        <location filename="../../muse/waveedit/waveedit.cpp" line="201"/>
+        <source>Solo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="420"/>
-        <source>Change note &amp;length</source>
+        <location filename="../../muse/waveedit/waveedit.cpp" line="206"/>
+        <source>Cursor</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::WaveView</name>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="421"/>
-        <source>Change note &amp;velocity</source>
+        <location filename="../../muse/waveedit/waveview.cpp" line="996"/>
+        <source>MusE - external editor failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="422"/>
-        <source>Crescendo/Decrescendo</source>
+        <location filename="../../muse/waveedit/waveview.cpp" line="997"/>
+        <source>MusE was unable to launch the external editor
+check if the editor setting in:
+Global Settings-&gt;Audio:External Waveditor
+is set to a valid editor.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="423"/>
-        <source>Transpose</source>
+        <location filename="../../muse/waveedit/waveview.cpp" line="1010"/>
+        <source>MusE - file size changed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="424"/>
-        <source>Erase Events</source>
+        <location filename="../../muse/waveedit/waveview.cpp" line="1011"/>
+        <source>When editing in external editor - you should not change the filesize
+since it must fit the selected region.
+
+Missing data is muted</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>OrganGuiBase</name>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="425"/>
-        <source>Move Notes</source>
+        <location filename="../../synti/organ/organguibase.ui" line="20"/>
+        <source>MusE: Organ</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="426"/>
-        <source>Set Fixed Length</source>
+        <location filename="../../synti/organ/organguibase.ui" line="38"/>
+        <source>Drawbars</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="427"/>
-        <source>Delete Overlaps</source>
+        <location filename="../../synti/organ/organguibase.ui" line="50"/>
+        <source>16&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="428"/>
-        <source>Legato</source>
+        <location filename="../../synti/organ/organguibase.ui" line="60"/>
+        <source>4&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="441"/>
-        <source>Window &amp;Config</source>
+        <location filename="../../synti/organ/organguibase.ui" line="70"/>
+        <source>2 2/3&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="443"/>
-        <source>Note head &amp;colors</source>
+        <location filename="../../synti/organ/organguibase.ui" line="80"/>
+        <source>2&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="445"/>
-        <source>&amp;Black</source>
+        <location filename="../../synti/organ/organguibase.ui" line="90"/>
+        <source>5 1/3&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="446"/>
-        <source>&amp;Velocity</source>
+        <location filename="../../synti/organ/organguibase.ui" line="100"/>
+        <source>8&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="447"/>
-        <source>&amp;Part</source>
+        <location filename="../../synti/organ/organguibase.ui" line="332"/>
+        <source>Envelope Hi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="461"/>
-        <source>Set up &amp;preamble</source>
+        <location filename="../../synti/organ/organguibase.ui" line="344"/>
+        <location filename="../../synti/organ/organguibase.ui" line="596"/>
+        <source>Release</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="462"/>
-        <source>Display &amp;key signature</source>
+        <location filename="../../synti/organ/organguibase.ui" line="354"/>
+        <location filename="../../synti/organ/organguibase.ui" line="586"/>
+        <source>Sustain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="463"/>
-        <source>Display &amp;time signature</source>
+        <location filename="../../synti/organ/organguibase.ui" line="364"/>
+        <location filename="../../synti/organ/organguibase.ui" line="576"/>
+        <source>Decay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="473"/>
-        <source>Set Score &amp;name</source>
+        <location filename="../../synti/organ/organguibase.ui" line="380"/>
+        <location filename="../../synti/organ/organguibase.ui" line="566"/>
+        <source>Attack</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="689"/>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="690"/>
-        <source>Enter the new score title</source>
+        <location filename="../../synti/organ/organguibase.ui" line="456"/>
+        <location filename="../../synti/organ/organguibase.ui" line="497"/>
+        <location filename="../../synti/organ/organguibase.ui" line="532"/>
+        <location filename="../../synti/organ/organguibase.ui" line="703"/>
+        <location filename="../../synti/organ/organguibase.ui" line="719"/>
+        <location filename="../../synti/organ/organguibase.ui" line="757"/>
+        <source>ms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="695"/>
-        <source>Error</source>
+        <location filename="../../synti/organ/organguibase.ui" line="513"/>
+        <location filename="../../synti/organ/organguibase.ui" line="735"/>
+        <source>cB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="695"/>
-        <source>Changing score title failed:
-the selected title is not unique</source>
+        <location filename="../../synti/organ/organguibase.ui" line="551"/>
+        <source>Envelope Lo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../synti/organ/organguibase.ui" line="783"/>
+        <source>O-1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../synti/organ/organguibase.ui" line="802"/>
+        <source>Oscillator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../synti/organ/organguibase.ui" line="820"/>
+        <source>Brass</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../synti/organ/organguibase.ui" line="833"/>
+        <source>Reed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../synti/organ/organguibase.ui" line="846"/>
+        <source>Flute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../synti/organ/organguibase.ui" line="869"/>
+        <source>Velocity</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SetlenBase</name>
+    <name>PasteDialog</name>
+    <message numerus="yes">
+        <source>%n quarter(s)</source>
+        <translation type="obsolete">
+            <numerusform>%n quarter</numerusform>
+            <numerusform>%n quarters</numerusform>
+        </translation>
+    </message>
     <message>
-        <location filename="../../muse/widgets/function_dialogs/setlenbase.ui" line="14"/>
-        <source>MusE: Set Note Length</source>
+        <source>quarter</source>
+        <translation type="obsolete">quarter</translation>
+    </message>
+    <message>
+        <source>quarters</source>
+        <translation type="obsolete">quarters</translation>
+    </message>
+</context>
+<context>
+    <name>PasteDialogBase</name>
+    <message>
+        <location filename="../../muse/widgets/pastedialogbase.ui" line="14"/>
+        <source>MusE: Paste Parts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/function_dialogs/setlenbase.ui" line="26"/>
-        <source>Range</source>
+        <location filename="../../muse/widgets/pastedialogbase.ui" line="26"/>
+        <source>Number and raster</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/function_dialogs/setlenbase.ui" line="38"/>
-        <source>All Events</source>
+        <location filename="../../muse/widgets/pastedialogbase.ui" line="34"/>
+        <source>insert</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/function_dialogs/setlenbase.ui" line="45"/>
-        <source>Selected Events</source>
+        <location filename="../../muse/widgets/pastedialogbase.ui" line="41"/>
+        <source> times</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/function_dialogs/setlenbase.ui" line="55"/>
-        <source>Looped Events</source>
+        <location filename="../../muse/widgets/pastedialogbase.ui" line="54"/>
+        <source>raster</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/function_dialogs/setlenbase.ui" line="62"/>
-        <source>Selected Looped</source>
+        <location filename="../../muse/widgets/pastedialogbase.ui" line="61"/>
+        <source> ticks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/function_dialogs/setlenbase.ui" line="72"/>
-        <source>Value</source>
+        <location filename="../../muse/widgets/pastedialogbase.ui" line="125"/>
+        <source>Move, Merge, Clone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/function_dialogs/setlenbase.ui" line="90"/>
-        <source>New length</source>
+        <location filename="../../muse/widgets/pastedialogbase.ui" line="143"/>
+        <source>Move everything to the right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/function_dialogs/setlenbase.ui" line="100"/>
-        <source> ticks</source>
+        <location filename="../../muse/widgets/pastedialogbase.ui" line="150"/>
+        <source>Move only affected parts to the right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/function_dialogs/setlenbase.ui" line="153"/>
+        <location filename="../../muse/widgets/pastedialogbase.ui" line="170"/>
+        <source>Put everything into a single track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/pastedialogbase.ui" line="177"/>
+        <source>Merge with existing parts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/pastedialogbase.ui" line="190"/>
+        <source>Insert as clones (where possible)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/pastedialogbase.ui" line="234"/>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/function_dialogs/setlenbase.ui" line="166"/>
+        <location filename="../../muse/widgets/pastedialogbase.ui" line="247"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>ShortcutCaptureDialogBase</name>
+    <name>PasteEventsDialogBase</name>
     <message>
-        <location filename="../../muse/widgets/shortcutcapturedialogbase.ui" line="14"/>
-        <source>Enter shortcut sequence</source>
+        <location filename="../../muse/widgets/pasteeventsdialogbase.ui" line="14"/>
+        <source>MusE: Paste Events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/shortcutcapturedialogbase.ui" line="23"/>
-        <source>Press keys to enter shortcut sequence!</source>
+        <location filename="../../muse/widgets/pasteeventsdialogbase.ui" line="26"/>
+        <source>Number and raster</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/shortcutcapturedialogbase.ui" line="48"/>
-        <source>Old shortcut:</source>
+        <location filename="../../muse/widgets/pasteeventsdialogbase.ui" line="34"/>
+        <source>insert</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/shortcutcapturedialogbase.ui" line="58"/>
-        <location filename="../../muse/widgets/shortcutcapturedialogbase.ui" line="82"/>
-        <source>Undefined</source>
+        <location filename="../../muse/widgets/pasteeventsdialogbase.ui" line="41"/>
+        <source> times</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/shortcutcapturedialogbase.ui" line="72"/>
-        <source>New shortcut:</source>
+        <location filename="../../muse/widgets/pasteeventsdialogbase.ui" line="54"/>
+        <source>raster</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/shortcutcapturedialogbase.ui" line="99"/>
-        <source>OK</source>
+        <location filename="../../muse/widgets/pasteeventsdialogbase.ui" line="61"/>
+        <location filename="../../muse/widgets/pasteeventsdialogbase.ui" line="194"/>
+        <source> ticks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/shortcutcapturedialogbase.ui" line="109"/>
-        <source>Cancel</source>
+        <location filename="../../muse/widgets/pasteeventsdialogbase.ui" line="125"/>
+        <source>Paste options</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ShortcutConfigBase</name>
     <message>
-        <location filename="../../muse/widgets/shortcutconfigbase.ui" line="14"/>
-        <source>Configure Keyboard Shortcuts</source>
+        <location filename="../../muse/widgets/pasteeventsdialogbase.ui" line="137"/>
+        <source>Always into existing parts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/shortcutconfigbase.ui" line="48"/>
-        <source>Shortcut Category</source>
+        <location filename="../../muse/widgets/pasteeventsdialogbase.ui" line="150"/>
+        <source>Never into existing parts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/shortcutconfigbase.ui" line="69"/>
-        <source>Shortcut</source>
+        <location filename="../../muse/widgets/pasteeventsdialogbase.ui" line="162"/>
+        <source>Into existing parts if part has not
+to be expanded by more than </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/shortcutconfigbase.ui" line="74"/>
-        <source>Description</source>
+        <location filename="../../muse/widgets/pasteeventsdialogbase.ui" line="250"/>
+        <source>Put everything into the (selected) part</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/shortcutconfigbase.ui" line="106"/>
-        <source>&amp;Clear</source>
+        <location filename="../../muse/widgets/pasteeventsdialogbase.ui" line="294"/>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/shortcutconfigbase.ui" line="109"/>
-        <source>Alt+C</source>
+        <location filename="../../muse/widgets/pasteeventsdialogbase.ui" line="307"/>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>ProjectCreate</name>
     <message>
-        <location filename="../../muse/widgets/shortcutconfigbase.ui" line="119"/>
-        <source>&amp;Define</source>
+        <location filename="../../muse/widgets/projectcreate.ui" line="14"/>
+        <source>Create Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/shortcutconfigbase.ui" line="122"/>
-        <source>Alt+D</source>
+        <location filename="../../muse/widgets/projectcreate.ui" line="22"/>
+        <source>Project Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/shortcutconfigbase.ui" line="145"/>
-        <source>&amp;Apply</source>
+        <location filename="../../muse/widgets/projectcreate.ui" line="54"/>
+        <source>Project Path to song file:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/shortcutconfigbase.ui" line="148"/>
-        <source>Alt+A</source>
+        <location filename="../../muse/widgets/projectcreate.ui" line="74"/>
+        <source>Create project folder (recommended for audio projects)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/projectcreate.ui" line="92"/>
+        <source>Browse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/projectcreate.ui" line="101"/>
+        <source>Song information:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SimpleDrumsGuiBase</name>
+    <name>QObject</name>
     <message>
-        <location filename="../../synti/simpledrums2/simpledrumsguibase.ui" line="16"/>
-        <source>DrumSynth 0.1</source>
+        <location filename="../../muse/functions.cpp" line="244"/>
+        <location filename="../../muse/functions.cpp" line="404"/>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/functions.cpp" line="244"/>
+        <location filename="../../muse/functions.cpp" line="404"/>
+        <source>Please first select the range for crescendo with the loop markers.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SimpleSynthGui</name>
+    <name>QWidget</name>
     <message>
-        <location filename="../../synti/simpledrums2/simpledrumsgui.cpp" line="442"/>
-        <source>&amp;Load setup</source>
+        <location filename="../../muse/instruments/minstrument.cpp" line="73"/>
+        <location filename="../../muse/liste/editevent.cpp" line="94"/>
+        <source>Cannot convert sysex string</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/simpledrums2/simpledrumsgui.cpp" line="444"/>
-        <source>&amp;Save setup</source>
+        <location filename="../../muse/instruments/minstrument.cpp" line="81"/>
+        <location filename="../../muse/liste/editevent.cpp" line="102"/>
+        <source>Hex String too long (2048 bytes limit)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../synti/simpledrums2/simpledrumsgui.cpp" line="788"/>
-        <source>Load sample dialog</source>
+        <location filename="../../muse/instruments/minstrument.cpp" line="270"/>
+        <source>generic midi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/miditransform.cpp" line="235"/>
+        <source>new</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/route.cpp" line="792"/>
+        <location filename="../../muse/route.cpp" line="817"/>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/wave.cpp" line="180"/>
+        <source>create peakfile for </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/waveedit/waveview.cpp" line="637"/>
+        <source>No selection. Ignoring</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/filedialog.cpp" line="81"/>
+        <source>MusE: get file name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/filedialog.cpp" line="82"/>
+        <source>The directory
+%1
+does not exist.
+Create it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/filedialog.cpp" line="89"/>
+        <source>MusE: create directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/filedialog.cpp" line="90"/>
+        <source>creating dir failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/filedialog.cpp" line="489"/>
+        <source>File
+%1
+exists. Overwrite?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/filedialog.cpp" line="522"/>
+        <source>Open File
+%1
+failed: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/filedialog.cpp" line="503"/>
+        <source>MusE: write</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/filedialog.cpp" line="523"/>
+        <source>MusE: Open File</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Song</name>
+    <name>QuantBase</name>
     <message>
-        <location filename="../../muse/song.cpp" line="2412"/>
-        <source>Jack shutdown!</source>
+        <location filename="../../muse/widgets/function_dialogs/quantbase.ui" line="17"/>
+        <source>MusE: Quantize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/song.cpp" line="2413"/>
-        <source>Jack has detected a performance problem which has lead to
-MusE being disconnected.
-This could happen due to a number of reasons:
-- a performance issue with your particular setup.
-- a bug in MusE (or possibly in another connected software).
-- a random hiccup which might never occur again.
-- jack was voluntary stopped by you or someone else
-- jack crashed
-If there is a persisting problem you are much welcome to discuss it
-on the MusE mailinglist.
-(there is information about joining the mailinglist on the MusE
- homepage which is available through the help menu)
-
-To proceed check the status of Jack and try to restart it and then .
-click on the Restart button.</source>
+        <location filename="../../muse/widgets/function_dialogs/quantbase.ui" line="29"/>
+        <source>Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/song.cpp" line="2607"/>
-        <source>Automation:</source>
+        <location filename="../../muse/widgets/function_dialogs/quantbase.ui" line="41"/>
+        <source>All Events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/song.cpp" line="2611"/>
-        <source>previous event</source>
+        <location filename="../../muse/widgets/function_dialogs/quantbase.ui" line="48"/>
+        <source>Selected Events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/song.cpp" line="2615"/>
-        <source>next event</source>
+        <location filename="../../muse/widgets/function_dialogs/quantbase.ui" line="58"/>
+        <source>Looped Events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/song.cpp" line="2625"/>
-        <location filename="../../muse/song.cpp" line="2808"/>
-        <source>set event</source>
+        <location filename="../../muse/widgets/function_dialogs/quantbase.ui" line="65"/>
+        <source>Selected Looped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/song.cpp" line="2627"/>
-        <location filename="../../muse/song.cpp" line="2810"/>
-        <source>add event</source>
+        <location filename="../../muse/widgets/function_dialogs/quantbase.ui" line="75"/>
+        <source>Values</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/song.cpp" line="2631"/>
-        <location filename="../../muse/song.cpp" line="2815"/>
-        <source>erase event</source>
+        <location filename="../../muse/widgets/function_dialogs/quantbase.ui" line="87"/>
+        <source>Strength:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/song.cpp" line="2635"/>
-        <source>erase range</source>
+        <location filename="../../muse/widgets/function_dialogs/quantbase.ui" line="97"/>
+        <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/song.cpp" line="2639"/>
-        <source>clear automation</source>
+        <location filename="../../muse/widgets/function_dialogs/quantbase.ui" line="110"/>
+        <source>Threshold (ticks):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/song.cpp" line="2672"/>
-        <source>Clear all controller events?</source>
+        <location filename="../../muse/widgets/function_dialogs/quantbase.ui" line="133"/>
+        <source>Quantize Len</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/song.cpp" line="2672"/>
-        <source>&amp;Ok</source>
+        <location filename="../../muse/widgets/function_dialogs/quantbase.ui" line="150"/>
+        <source>Raster</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/song.cpp" line="2672"/>
-        <source>&amp;Cancel</source>
+        <location filename="../../muse/widgets/function_dialogs/quantbase.ui" line="167"/>
+        <source>Whole</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/song.cpp" line="3806"/>
-        <source>MusE - external script failed</source>
+        <location filename="../../muse/widgets/function_dialogs/quantbase.ui" line="172"/>
+        <source>Half</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/song.cpp" line="3807"/>
-        <source>MusE was unable to launch the script, error message:
- </source>
+        <location filename="../../muse/widgets/function_dialogs/quantbase.ui" line="177"/>
+        <source>4th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/function_dialogs/quantbase.ui" line="182"/>
+        <source>4th Triplet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/function_dialogs/quantbase.ui" line="187"/>
+        <source>8th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/function_dialogs/quantbase.ui" line="192"/>
+        <source>8th Triplet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/function_dialogs/quantbase.ui" line="197"/>
+        <source>16th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/function_dialogs/quantbase.ui" line="202"/>
+        <source>16th Triplet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/function_dialogs/quantbase.ui" line="207"/>
+        <source>32th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/function_dialogs/quantbase.ui" line="212"/>
+        <source>32th Triplet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/function_dialogs/quantbase.ui" line="220"/>
+        <source>Swing:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/function_dialogs/quantbase.ui" line="240"/>
+        <source>If the proposed change in tick or length is smaller than threshold, nothing is done.
+If swing=0, this is normal
+If swing is 33, you get a 2:1-rhythm.
+If swing is -33, you get a 1:2-rhythm.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/function_dialogs/quantbase.ui" line="291"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/function_dialogs/quantbase.ui" line="304"/>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SongInfo</name>
+    <name>RemoveBase</name>
     <message>
-        <location filename="../../muse/widgets/songinfo.ui" line="14"/>
-        <source>Song Information</source>
+        <location filename="../../muse/widgets/function_dialogs/removebase.ui" line="17"/>
+        <source>MusE: Erase Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/songinfo.ui" line="30"/>
-        <source>Show on song load</source>
+        <location filename="../../muse/widgets/function_dialogs/removebase.ui" line="29"/>
+        <source>Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/songinfo.ui" line="53"/>
-        <source>&amp;Cancel</source>
+        <location filename="../../muse/widgets/function_dialogs/removebase.ui" line="41"/>
+        <source>All Events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/songinfo.ui" line="56"/>
-        <source>Alt+C</source>
+        <location filename="../../muse/widgets/function_dialogs/removebase.ui" line="48"/>
+        <source>Selected Events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/songinfo.ui" line="63"/>
-        <source>&amp;Ok</source>
+        <location filename="../../muse/widgets/function_dialogs/removebase.ui" line="58"/>
+        <source>Looped Events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/songinfo.ui" line="66"/>
-        <source>Alt+O</source>
+        <location filename="../../muse/widgets/function_dialogs/removebase.ui" line="65"/>
+        <source>Selected Looped</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/function_dialogs/removebase.ui" line="75"/>
+        <source>Thresholds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/function_dialogs/removebase.ui" line="121"/>
+        <source> ticks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/function_dialogs/removebase.ui" line="134"/>
+        <source>Velocity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/function_dialogs/removebase.ui" line="141"/>
+        <source>Length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/function_dialogs/removebase.ui" line="154"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:7px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;If nothing is checked, everything is removed.&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:7px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;If velocity is checked, only notes with velo &amp;lt; threshold are removed.&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;If both are checked, notes with velo &amp;lt; threshold OR with length &amp;lt; threshold are removed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/function_dialogs/removebase.ui" line="210"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/function_dialogs/removebase.ui" line="223"/>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SynthConfigBase</name>
+    <name>RouteDialogBase</name>
     <message>
-        <location filename="../../muse/widgets/synthconfigbase.ui" line="14"/>
-        <source>MusE: Synth Configuration</source>
+        <location filename="../../muse/mixer/routedialogbase.ui" line="20"/>
+        <source>MusE: Routing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/synthconfigbase.ui" line="20"/>
-        <source>Instances</source>
+        <location filename="../../muse/mixer/routedialogbase.ui" line="32"/>
+        <source>Add Route</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/synthconfigbase.ui" line="30"/>
-        <location filename="../../muse/widgets/synthconfigbase.ui" line="145"/>
-        <source>Name</source>
+        <location filename="../../muse/mixer/routedialogbase.ui" line="52"/>
+        <source>Source:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/synthconfigbase.ui" line="35"/>
-        <source>Midi Port</source>
+        <location filename="../../muse/mixer/routedialogbase.ui" line="76"/>
+        <source>Destination:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/synthconfigbase.ui" line="45"/>
-        <source>Remove Instance</source>
+        <location filename="../../muse/mixer/routedialogbase.ui" line="102"/>
+        <source>connect source to destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/synthconfigbase.ui" line="73"/>
-        <source>Midi connections</source>
+        <location filename="../../muse/mixer/routedialogbase.ui" line="105"/>
+        <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/synthconfigbase.ui" line="89"/>
-        <source>Soft Synthesizer</source>
+        <location filename="../../muse/mixer/routedialogbase.ui" line="115"/>
+        <source>Current Routes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/synthconfigbase.ui" line="103"/>
-        <source>Add Instance</source>
+        <location filename="../../muse/mixer/routedialogbase.ui" line="128"/>
+        <source>Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/synthconfigbase.ui" line="128"/>
-        <source>list of available software synthesizers</source>
+        <location filename="../../muse/mixer/routedialogbase.ui" line="139"/>
+        <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/synthconfigbase.ui" line="135"/>
-        <source>File</source>
+        <location filename="../../muse/mixer/routedialogbase.ui" line="159"/>
+        <source>remove selected route</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/synthconfigbase.ui" line="140"/>
-        <source>Inst</source>
+        <location filename="../../muse/mixer/routedialogbase.ui" line="162"/>
+        <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SS_PluginChooserBase</name>
     <message>
-        <location filename="../../muse/widgets/synthconfigbase.ui" line="150"/>
-        <source>Version</source>
+        <location filename="../../synti/simpledrums2/sspluginchooserbase.ui" line="16"/>
+        <source>SimpleDrums - Ladspa Plugin Chooser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/synthconfigbase.ui" line="155"/>
-        <source>Description</source>
+        <location filename="../../synti/simpledrums2/sspluginchooserbase.ui" line="29"/>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../synti/simpledrums2/sspluginchooserbase.ui" line="34"/>
+        <source>Label</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../synti/simpledrums2/sspluginchooserbase.ui" line="39"/>
+        <source>Inports</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../synti/simpledrums2/sspluginchooserbase.ui" line="44"/>
+        <source>Outports</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../synti/simpledrums2/sspluginchooserbase.ui" line="49"/>
+        <source>Creator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../synti/simpledrums2/sspluginchooserbase.ui" line="81"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../synti/simpledrums2/sspluginchooserbase.ui" line="84"/>
+        <source>Alt+C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../synti/simpledrums2/sspluginchooserbase.ui" line="91"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../synti/simpledrums2/sspluginchooserbase.ui" line="94"/>
+        <source>Alt+O</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TempoSig</name>
+    <name>SS_PluginFront</name>
     <message>
-        <location filename="../../muse/transport.cpp" line="154"/>
-        <source>Tempo/Sig</source>
+        <location filename="../../synti/simpledrums2/ssplugingui.cpp" line="238"/>
+        <source>Clear and unload effect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../synti/simpledrums2/ssplugingui.cpp" line="239"/>
+        <source>Load effect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../synti/simpledrums2/ssplugingui.cpp" line="240"/>
+        <source>Toggle display of effect parameters</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../synti/simpledrums2/ssplugingui.cpp" line="241"/>
+        <source>Turn effect on/off</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TopWin</name>
+    <name>SetlenBase</name>
     <message>
-        <location filename="../../muse/cobject.cpp" line="61"/>
-        <source>As subwindow</source>
+        <location filename="../../muse/widgets/function_dialogs/setlenbase.ui" line="14"/>
+        <source>MusE: Set Note Length</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/cobject.cpp" line="65"/>
-        <source>Shares tools and menu</source>
+        <location filename="../../muse/widgets/function_dialogs/setlenbase.ui" line="26"/>
+        <source>Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/cobject.cpp" line="69"/>
-        <source>Fullscreen</source>
+        <location filename="../../muse/widgets/function_dialogs/setlenbase.ui" line="38"/>
+        <source>All Events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/cobject.cpp" line="487"/>
-        <source>Piano roll</source>
+        <location filename="../../muse/widgets/function_dialogs/setlenbase.ui" line="45"/>
+        <source>Selected Events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/cobject.cpp" line="488"/>
-        <source>List editor</source>
+        <location filename="../../muse/widgets/function_dialogs/setlenbase.ui" line="55"/>
+        <source>Looped Events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/cobject.cpp" line="489"/>
-        <source>Drum editor</source>
+        <location filename="../../muse/widgets/function_dialogs/setlenbase.ui" line="62"/>
+        <source>Selected Looped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/cobject.cpp" line="490"/>
-        <source>Master track editor</source>
+        <location filename="../../muse/widgets/function_dialogs/setlenbase.ui" line="72"/>
+        <source>Value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/cobject.cpp" line="491"/>
-        <source>Master track list editor</source>
+        <location filename="../../muse/widgets/function_dialogs/setlenbase.ui" line="90"/>
+        <source>New length</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/cobject.cpp" line="492"/>
-        <source>Wave editor</source>
+        <location filename="../../muse/widgets/function_dialogs/setlenbase.ui" line="100"/>
+        <source> ticks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/cobject.cpp" line="493"/>
-        <source>Clip list</source>
+        <location filename="../../muse/widgets/function_dialogs/setlenbase.ui" line="153"/>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/cobject.cpp" line="494"/>
-        <source>Marker view</source>
+        <location filename="../../muse/widgets/function_dialogs/setlenbase.ui" line="166"/>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>ShortcutCaptureDialogBase</name>
     <message>
-        <location filename="../../muse/cobject.cpp" line="495"/>
-        <source>Score editor</source>
+        <location filename="../../muse/widgets/shortcutcapturedialogbase.ui" line="14"/>
+        <source>Enter shortcut sequence</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/cobject.cpp" line="496"/>
-        <source>Arranger</source>
+        <location filename="../../muse/widgets/shortcutcapturedialogbase.ui" line="23"/>
+        <source>Press keys to enter shortcut sequence!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/cobject.cpp" line="497"/>
-        <source>&lt;unknown toplevel type&gt;</source>
+        <location filename="../../muse/widgets/shortcutcapturedialogbase.ui" line="48"/>
+        <source>Old shortcut:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/shortcutcapturedialogbase.ui" line="58"/>
+        <location filename="../../muse/widgets/shortcutcapturedialogbase.ui" line="82"/>
+        <source>Undefined</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/shortcutcapturedialogbase.ui" line="72"/>
+        <source>New shortcut:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/shortcutcapturedialogbase.ui" line="99"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/shortcutcapturedialogbase.ui" line="109"/>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Transport</name>
+    <name>ShortcutConfigBase</name>
     <message>
-        <location filename="../../muse/transport.cpp" line="259"/>
-        <source>Overdub</source>
+        <location filename="../../muse/widgets/shortcutconfigbase.ui" line="14"/>
+        <source>Configure Keyboard Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/transport.cpp" line="260"/>
-        <location filename="../../muse/transport.cpp" line="275"/>
-        <source>Replace</source>
+        <location filename="../../muse/widgets/shortcutconfigbase.ui" line="49"/>
+        <source>Shortcut Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/transport.cpp" line="265"/>
-        <source>Rec Mode</source>
+        <location filename="../../muse/widgets/shortcutconfigbase.ui" line="68"/>
+        <source>Shortcut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/transport.cpp" line="273"/>
-        <source>Normal</source>
+        <location filename="../../muse/widgets/shortcutconfigbase.ui" line="73"/>
+        <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/transport.cpp" line="274"/>
-        <source>Mix</source>
+        <location filename="../../muse/widgets/shortcutconfigbase.ui" line="103"/>
+        <source>&amp;Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/transport.cpp" line="280"/>
-        <source>Cycle Rec</source>
+        <location filename="../../muse/widgets/shortcutconfigbase.ui" line="106"/>
+        <source>Alt+C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/transport.cpp" line="296"/>
-        <source>punchin</source>
+        <location filename="../../muse/widgets/shortcutconfigbase.ui" line="116"/>
+        <source>&amp;Define</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/transport.cpp" line="297"/>
-        <source>loop</source>
+        <location filename="../../muse/widgets/shortcutconfigbase.ui" line="119"/>
+        <source>Alt+D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/transport.cpp" line="300"/>
-        <source>punchout</source>
+        <location filename="../../muse/widgets/shortcutconfigbase.ui" line="142"/>
+        <source>&amp;Apply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/transport.cpp" line="304"/>
-        <location filename="../../muse/transport.cpp" line="307"/>
-        <source>Punch In</source>
+        <location filename="../../muse/widgets/shortcutconfigbase.ui" line="145"/>
+        <source>Alt+A</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SimpleDrumsGuiBase</name>
     <message>
-        <location filename="../../muse/transport.cpp" line="305"/>
-        <location filename="../../muse/transport.cpp" line="308"/>
-        <source>Loop</source>
+        <location filename="../../synti/simpledrums2/simpledrumsguibase.ui" line="16"/>
+        <source>DrumSynth 0.1</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SimpleSynthGui</name>
     <message>
-        <location filename="../../muse/transport.cpp" line="306"/>
-        <location filename="../../muse/transport.cpp" line="309"/>
-        <source>Punch Out</source>
+        <location filename="../../synti/simpledrums2/simpledrumsgui.cpp" line="442"/>
+        <source>&amp;Load setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/transport.cpp" line="342"/>
-        <source>Left Mark</source>
+        <location filename="../../synti/simpledrums2/simpledrumsgui.cpp" line="444"/>
+        <source>&amp;Save setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/transport.cpp" line="354"/>
-        <source>Right Mark</source>
+        <location filename="../../synti/simpledrums2/simpledrumsgui.cpp" line="788"/>
+        <source>Load sample dialog</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SongInfo</name>
     <message>
-        <location filename="../../muse/transport.cpp" line="401"/>
-        <source>rewind to start</source>
+        <location filename="../../muse/widgets/songinfo.ui" line="14"/>
+        <source>Song Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/transport.cpp" line="404"/>
-        <source>rewind</source>
+        <location filename="../../muse/widgets/songinfo.ui" line="30"/>
+        <source>Show on song load</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/transport.cpp" line="408"/>
-        <source>forward</source>
+        <location filename="../../muse/widgets/songinfo.ui" line="53"/>
+        <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/transport.cpp" line="412"/>
-        <source>stop</source>
+        <location filename="../../muse/widgets/songinfo.ui" line="56"/>
+        <source>Alt+C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/transport.cpp" line="416"/>
-        <source>play</source>
+        <location filename="../../muse/widgets/songinfo.ui" line="63"/>
+        <source>&amp;Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/transport.cpp" line="419"/>
-        <source>record</source>
+        <location filename="../../muse/widgets/songinfo.ui" line="66"/>
+        <source>Alt+O</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SynthConfigBase</name>
     <message>
-        <location filename="../../muse/transport.cpp" line="447"/>
-        <source>AC</source>
+        <location filename="../../muse/widgets/synthconfigbase.ui" line="14"/>
+        <source>Midi Port and Soft Synth Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/transport.cpp" line="447"/>
-        <source>quantize during record</source>
+        <location filename="../../muse/widgets/synthconfigbase.ui" line="20"/>
+        <source>Instances</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/transport.cpp" line="449"/>
-        <source>Click</source>
+        <location filename="../../muse/widgets/synthconfigbase.ui" line="30"/>
+        <location filename="../../muse/widgets/synthconfigbase.ui" line="155"/>
+        <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/transport.cpp" line="449"/>
-        <source>metronom click on/off</source>
+        <location filename="../../muse/widgets/synthconfigbase.ui" line="35"/>
+        <location filename="../../muse/widgets/synthconfigbase.ui" line="145"/>
+        <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/transport.cpp" line="452"/>
-        <source>Sync</source>
+        <location filename="../../muse/widgets/synthconfigbase.ui" line="40"/>
+        <source>Midi Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/transport.cpp" line="452"/>
-        <source>external sync on/off</source>
+        <location filename="../../muse/widgets/synthconfigbase.ui" line="50"/>
+        <source>Remove Instance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/transport.cpp" line="454"/>
-        <source>Jack</source>
+        <location filename="../../muse/widgets/synthconfigbase.ui" line="78"/>
+        <source>Midi connections</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/transport.cpp" line="454"/>
-        <source>Jack transport sync on/off</source>
+        <location filename="../../muse/widgets/synthconfigbase.ui" line="94"/>
+        <source>Soft Synthesizer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/transport.cpp" line="497"/>
-        <source>Master</source>
+        <location filename="../../muse/widgets/synthconfigbase.ui" line="108"/>
+        <source>Add Instance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/transport.cpp" line="497"/>
-        <source>use master track</source>
+        <location filename="../../muse/widgets/synthconfigbase.ui" line="133"/>
+        <source>list of available software synthesizers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/synthconfigbase.ui" line="140"/>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/synthconfigbase.ui" line="150"/>
+        <source>Inst</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/synthconfigbase.ui" line="160"/>
+        <source>Version</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/widgets/synthconfigbase.ui" line="165"/>
+        <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -12528,169 +12700,174 @@ Robert Jonsson
     </message>
 </context>
 <context>
-    <name>WaveEdit</name>
+    <name>file_patterns</name>
     <message>
-        <location filename="../../muse/waveedit/waveedit.cpp" line="86"/>
-        <source>&amp;Edit</source>
+        <location filename="../../muse/globals.cpp" line="120"/>
+        <source>Midi/Kar (*.mid *.MID *.kar *.KAR *.mid.gz *.mid.bz2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/waveedit/waveedit.cpp" line="88"/>
-        <source>Func&amp;tions</source>
+        <location filename="../../muse/globals.cpp" line="121"/>
+        <source>Midi (*.mid *.MID *.mid.gz *.mid.bz2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/waveedit/waveedit.cpp" line="90"/>
-        <source>&amp;Gain</source>
+        <location filename="../../muse/globals.cpp" line="122"/>
+        <source>Karaoke (*.kar *.KAR *.kar.gz *.kar.bz2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/waveedit/waveedit.cpp" line="92"/>
-        <source>200%</source>
+        <location filename="../../muse/globals.cpp" line="123"/>
+        <location filename="../../muse/globals.cpp" line="147"/>
+        <location filename="../../muse/globals.cpp" line="158"/>
+        <location filename="../../muse/globals.cpp" line="165"/>
+        <location filename="../../muse/globals.cpp" line="174"/>
+        <location filename="../../muse/globals.cpp" line="189"/>
+        <location filename="../../muse/globals.cpp" line="196"/>
+        <location filename="../../muse/globals.cpp" line="210"/>
+        <location filename="../../muse/globals.cpp" line="218"/>
+        <location filename="../../muse/globals.cpp" line="224"/>
+        <location filename="../../muse/globals.cpp" line="232"/>
+        <location filename="../../muse/globals.cpp" line="240"/>
+        <source>All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/waveedit/waveedit.cpp" line="96"/>
-        <source>150%</source>
+        <location filename="../../muse/globals.cpp" line="145"/>
+        <source>Midi (*.mid)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/waveedit/waveedit.cpp" line="100"/>
-        <source>75%</source>
+        <location filename="../../muse/globals.cpp" line="146"/>
+        <source>Karaoke (*.kar)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/waveedit/waveedit.cpp" line="104"/>
-        <source>50%</source>
+        <location filename="../../muse/globals.cpp" line="152"/>
+        <source>all known files (*.med *.med.gz *.med.bz2 *.mid *.midi *.kar)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/waveedit/waveedit.cpp" line="108"/>
-        <source>25%</source>
+        <location filename="../../muse/globals.cpp" line="153"/>
+        <source>med Files (*.med *.med.gz *.med.bz2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/waveedit/waveedit.cpp" line="112"/>
-        <source>Other</source>
+        <location filename="../../muse/globals.cpp" line="154"/>
+        <location filename="../../muse/globals.cpp" line="162"/>
+        <source>Uncompressed med Files (*.med)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/waveedit/waveedit.cpp" line="120"/>
-        <source>&amp;Copy</source>
+        <location filename="../../muse/globals.cpp" line="155"/>
+        <location filename="../../muse/globals.cpp" line="163"/>
+        <source>gzip compressed med Files (*.med.gz)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/waveedit/waveedit.cpp" line="124"/>
-        <source>C&amp;ut</source>
+        <location filename="../../muse/globals.cpp" line="156"/>
+        <location filename="../../muse/globals.cpp" line="164"/>
+        <source>bzip2 compressed med Files (*.med.bz2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/waveedit/waveedit.cpp" line="128"/>
-        <source>&amp;Paste</source>
+        <location filename="../../muse/globals.cpp" line="157"/>
+        <source>mid Files (*.mid *.midi *.kar *.MID *.MIDI *.KAR)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/waveedit/waveedit.cpp" line="133"/>
-        <source>Edit in E&amp;xternal Editor</source>
+        <location filename="../../muse/globals.cpp" line="170"/>
+        <source>(*.jpg *.gif *.png)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/waveedit/waveedit.cpp" line="137"/>
-        <source>Mute Selection</source>
+        <location filename="../../muse/globals.cpp" line="171"/>
+        <source>(*.jpg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/waveedit/waveedit.cpp" line="141"/>
-        <source>Normalize Selection</source>
+        <location filename="../../muse/globals.cpp" line="172"/>
+        <source>(*.gif)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/waveedit/waveedit.cpp" line="145"/>
-        <source>Fade In Selection</source>
+        <location filename="../../muse/globals.cpp" line="173"/>
+        <source>(*.png)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/waveedit/waveedit.cpp" line="149"/>
-        <source>Fade Out Selection</source>
+        <location filename="../../muse/globals.cpp" line="188"/>
+        <source>part Files (*.mpt *.mpt.gz *.mpt.bz2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/waveedit/waveedit.cpp" line="153"/>
-        <source>Reverse Selection</source>
+        <location filename="../../muse/globals.cpp" line="193"/>
+        <source>part Files (*.mpt)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/waveedit/waveedit.cpp" line="157"/>
-        <source>Select</source>
+        <location filename="../../muse/globals.cpp" line="194"/>
+        <source>gzip compressed part Files (*.mpt.gz)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/waveedit/waveedit.cpp" line="159"/>
-        <source>Select &amp;All</source>
+        <location filename="../../muse/globals.cpp" line="195"/>
+        <source>bzip2 compressed part Files (*.mpt.bz2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/waveedit/waveedit.cpp" line="163"/>
-        <source>&amp;Deselect All</source>
+        <location filename="../../muse/globals.cpp" line="209"/>
+        <source>Presets (*.pre *.pre.gz *.pre.bz2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/waveedit/waveedit.cpp" line="168"/>
-        <source>Window &amp;Config</source>
+        <location filename="../../muse/globals.cpp" line="215"/>
+        <source>Presets (*.pre)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/waveedit/waveedit.cpp" line="174"/>
-        <source>Wave edit tools</source>
+        <location filename="../../muse/globals.cpp" line="216"/>
+        <source>gzip compressed presets (*.pre.gz)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/waveedit/waveedit.cpp" line="183"/>
-        <source>transport</source>
+        <location filename="../../muse/globals.cpp" line="217"/>
+        <source>bzip2 compressed presets (*.pre.bz2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/waveedit/waveedit.cpp" line="191"/>
-        <source>WaveEdit tools</source>
+        <location filename="../../muse/globals.cpp" line="223"/>
+        <source>Presets (*.map *.map.gz *.map.bz2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/waveedit/waveedit.cpp" line="196"/>
-        <source>Solo</source>
+        <location filename="../../muse/globals.cpp" line="229"/>
+        <source>Presets (*.map)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/waveedit/waveedit.cpp" line="201"/>
-        <source>Cursor</source>
+        <location filename="../../muse/globals.cpp" line="230"/>
+        <source>gzip compressed presets (*.map.gz)</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WaveView</name>
     <message>
-        <location filename="../../muse/waveedit/waveview.cpp" line="991"/>
-        <source>MusE - external editor failed</source>
+        <location filename="../../muse/globals.cpp" line="231"/>
+        <source>bzip2 compressed presets (*.map.bz2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/waveedit/waveview.cpp" line="992"/>
-        <source>MusE was unable to launch the external editor
-check if the editor setting in:
-Global Settings-&gt;Audio:External Waveditor
-is set to a valid editor.</source>
+        <location filename="../../muse/globals.cpp" line="237"/>
+        <source>Wave/Binary (*.wav *.ogg *.bin)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/waveedit/waveview.cpp" line="1005"/>
-        <source>MusE - file size changed</source>
+        <location filename="../../muse/globals.cpp" line="238"/>
+        <source>Wave (*.wav *.ogg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/waveedit/waveview.cpp" line="1006"/>
-        <source>When editing in external editor - you should not change the filesize
-since it must fit the selected region.
-
-Missing data is muted</source>
+        <location filename="../../muse/globals.cpp" line="239"/>
+        <source>Binary (*.bin)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -12983,4 +13160,878 @@ Missing data is muted</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>shortcuts</name>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="54"/>
+        <source>Transport: Start playback from current location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="55"/>
+        <source>Transport: Toggle metronome</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="56"/>
+        <source>Transport: Stop Playback</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="57"/>
+        <source>Transport: Goto Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="58"/>
+        <source>Transport: Play, Stop, Rewind</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="59"/>
+        <source>Transport: Goto left marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="60"/>
+        <source>Transport: Goto right marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="61"/>
+        <source>Transport: Toggle Loop section</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="62"/>
+        <source>Transport: Toggle Record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="63"/>
+        <source>Transport: Clear all rec enabled tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="64"/>
+        <source>Toggle fullscreen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="66"/>
+        <source>Edit: Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="67"/>
+        <source>Edit: Copy in range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="68"/>
+        <source>Edit: Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="69"/>
+        <source>Edit: Redo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="70"/>
+        <source>Edit: Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="71"/>
+        <source>Edit: Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="72"/>
+        <source>Edit: Paste (with dialog)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="73"/>
+        <source>Edit: Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="77"/>
+        <source>File: New project</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="78"/>
+        <source>File: Open from disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="79"/>
+        <source>File: Save project</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="82"/>
+        <source>File: Open recent file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="83"/>
+        <source>File: Save as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="84"/>
+        <source>File: Load template</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="86"/>
+        <source>File: Import midi file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="87"/>
+        <source>File: Export midi file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="88"/>
+        <source>File: Import midi part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="89"/>
+        <source>File: Import audio file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="90"/>
+        <source>File: Quit MusE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="92"/>
+        <source>Edit: Select parts on track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="93"/>
+        <source>Open pianoroll</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="94"/>
+        <source>Open drumeditor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="95"/>
+        <source>Open listeditor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="96"/>
+        <source>Open waveeditor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="97"/>
+        <source>Open graphical mastertrack editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="98"/>
+        <source>Open list mastertrack editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="99"/>
+        <source>Open midi transformer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="100"/>
+        <source>Add midi track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="101"/>
+        <source>Add drum track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="102"/>
+        <source>Add wave track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="103"/>
+        <source>Add audio output</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="104"/>
+        <source>Add audio group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="105"/>
+        <source>Add audio input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="106"/>
+        <source>Add audio aux</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="107"/>
+        <source>Structure: Global cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="108"/>
+        <source>Structure: Global insert</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="109"/>
+        <source>Structure: Global split</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="110"/>
+        <source>Structure: Cut events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="112"/>
+        <source>View: Open mixer #1 window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="113"/>
+        <source>View: Open mixer #2 window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="114"/>
+        <source>View: Toggle transport window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="115"/>
+        <source>View: Toggle bigtime window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="116"/>
+        <source>View: Open marker window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="118"/>
+        <source>Settings: Follow song by page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="119"/>
+        <source>Settings: Follow song off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="120"/>
+        <source>Settings: Follow song continuous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="122"/>
+        <source>Settings: Global configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="123"/>
+        <source>Settings: Configure shortcuts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="124"/>
+        <source>Settings: Configure metronome</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="125"/>
+        <source>Settings: Midi sync configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="126"/>
+        <source>Settings: Midi file import/export configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="127"/>
+        <source>Settings: Appearance settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="128"/>
+        <source>Settings: Midi ports / Soft Synth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="129"/>
+        <source>Settings: Audio subsystem configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="132"/>
+        <source>Midi: Edit midi instruments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="133"/>
+        <source>Midi: Open midi input transform</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="134"/>
+        <source>Midi: Open midi input filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="135"/>
+        <source>Midi: Midi input transpose</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="136"/>
+        <source>Midi: Midi remote control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="138"/>
+        <source>Midi: Random rhythm generator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="140"/>
+        <source>Midi: Reset midi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="141"/>
+        <source>Midi: Init midi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="142"/>
+        <source>Midi: Midi local off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="144"/>
+        <source>Audio: Bounce audio to track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="145"/>
+        <source>Audio: Bounce audio to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="146"/>
+        <source>Audio: Restart audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="148"/>
+        <source>Automation: Mixer automation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="149"/>
+        <source>Automation: Take mixer snapshot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="150"/>
+        <source>Automation: Clear mixer automation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="153"/>
+        <source>Help: Open Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="154"/>
+        <source>Help: Toggle whatsthis mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="156"/>
+        <source>Edit: Edit selected part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="157"/>
+        <source>Edit: Select nearest part on track above</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="158"/>
+        <source>Edit: Add nearest part on track above</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="159"/>
+        <source>Edit: Select nearest part on track below</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="160"/>
+        <source>Edit: Add nearest part on track below</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="162"/>
+        <source>Edit: Insert empty measure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="164"/>
+        <source>Edit: Paste as clones</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="165"/>
+        <source>Edit: Paste as clones (with dialog)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="167"/>
+        <source>Select track above</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="168"/>
+        <source>Select track below</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="172"/>
+        <source>Midi: Transpose</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="176"/>
+        <source>Edit: Select all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="177"/>
+        <source>Edit: Select none</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="178"/>
+        <source>Edit: Invert Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="179"/>
+        <source>Edit: Select events/parts inside locators</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="180"/>
+        <source>Edit: Select events/parts outside locators</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="181"/>
+        <source>Edit: Select previous part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="182"/>
+        <source>Edit: Select next part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="183"/>
+        <source>Edit: Select nearest part/event to the left or move cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="184"/>
+        <source>Edit: Add nearest part/event to the left to selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="185"/>
+        <source>Edit: Select nearest part/event to the right or move cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="186"/>
+        <source>Edit: Add nearest part/event to the right to selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="187"/>
+        <source>Edit: Set locators to selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="188"/>
+        <source>Edit: Increase pitch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="189"/>
+        <source>Edit: Decrease pitch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="190"/>
+        <source>Edit: Increase event position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="191"/>
+        <source>Edit: Decrease event position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="192"/>
+        <source>View: Zoom in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="193"/>
+        <source>View: Zoom out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="194"/>
+        <source>View: Goto Current Position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="195"/>
+        <location filename="../../muse/shortcuts.cpp" line="196"/>
+        <source>View: Scroll left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="202"/>
+        <source>Edit: Set Fixed Length on Midi Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="208"/>
+        <source>Quantize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="209"/>
+        <source>Modify Note Length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="210"/>
+        <source>Modify Velocity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="211"/>
+        <source>Edit: Crescendo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="212"/>
+        <source>Edit: Thin Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="213"/>
+        <source>Edit: Erase Event</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="214"/>
+        <source>Edit: Delete Overlaps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="215"/>
+        <source>Edit: Note Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="216"/>
+        <source>Edit: Move Clock</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="217"/>
+        <source>Edit: Copy Measure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="218"/>
+        <source>Edit: Erase Measure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="219"/>
+        <source>Edit: Delete Measure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="220"/>
+        <source>Edit: Create Measure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="221"/>
+        <source>Edit: Change Event Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="226"/>
+        <source>Tool: Pointer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="227"/>
+        <source>Tool: Pencil</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="228"/>
+        <source>Tool: Eraser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="230"/>
+        <source>Tool: Line Draw</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="233"/>
+        <source>Tool: Cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="234"/>
+        <source>Add note velocity 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="235"/>
+        <source>Add note velocity 2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="236"/>
+        <source>Add note velocity 3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="237"/>
+        <source>Add note velocity 4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="239"/>
+        <source>Cursor step size: larger</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="240"/>
+        <source>Cursor step size: smaller</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="241"/>
+        <source>Instrument/Cursor up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="242"/>
+        <source>Instrument/Cursor down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="245"/>
+        <source>Tool: Scissor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="246"/>
+        <source>Tool: Glue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="247"/>
+        <source>Tool: Mute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="251"/>
+        <source>Transport: Increase current position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="252"/>
+        <source>Transport: Decrease current position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="254"/>
+        <source>Transport: Increase current position, no snap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="255"/>
+        <source>Transport: Decrease current position, no snap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="288"/>
+        <source>Quantize: Set quantize to 1/1 note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="289"/>
+        <source>Quantize: Set quantize to 1/2 note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="290"/>
+        <source>Quantize: Set quantize to 1/4 note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="291"/>
+        <source>Quantize: Set quantize to 1/8 note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="292"/>
+        <source>Quantize: Set quantize to 1/16 note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="293"/>
+        <source>Quantize: Set quantize to 1/32 note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="294"/>
+        <source>Quantize: Set quantize to 1/64 note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="296"/>
+        <source>Quantize: Toggle triol quantization</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="297"/>
+        <source>Quantize: Toggle punctuation quantization</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="298"/>
+        <source>Quantize: Toggle punctuation quantization (2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="299"/>
+        <source>Edit: Insert at location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="301"/>
+        <source>Edit: Increase length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="302"/>
+        <source>Edit: Decrease length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="308"/>
+        <source>Insert Note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="309"/>
+        <source>Insert SysEx</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="310"/>
+        <source>Insert Ctrl</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="311"/>
+        <source>Insert Meta</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="312"/>
+        <source>Insert Channel Aftertouch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="313"/>
+        <source>Insert Key Aftertouch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="318"/>
+        <source>Insert Tempo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="319"/>
+        <source>Insert Signature</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="320"/>
+        <source>Change Event Position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="321"/>
+        <source>Edit Event Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="322"/>
+        <source>Insert Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="324"/>
+        <source>Goto Next Marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="325"/>
+        <source>Goto Prev Marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/muse2/share/locale/muse_es.ts b/muse2/share/locale/muse_es.ts
index 38e5954d..7a380e3f 100644
--- a/muse2/share/locale/muse_es.ts
+++ b/muse2/share/locale/muse_es.ts
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0">
+<TS version="2.0" language="es_ES">
 <context>
     <name>@default</name>
     <message>
-        <location filename="../../muse/transport.cpp" line="+46"/>
         <source>Click this button to enable recording</source>
-        <translation type="unfinished">Pulsa este botón para habilitar la captura</translation>
+        <translation type="obsolete">Pulsa este botón para habilitar la captura</translation>
     </message>
     <message>
         <source>sets amount of quantization:
@@ -17,59 +16,50 @@
 100 - sobrecuantizado</translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/tools.cpp" line="+33"/>
         <source>select Pointer Tool:
 with the pointer tool you can:
   select parts
   move parts
   copy parts</source>
-        <translation type="unfinished">selecciona la Herramienta de Puntero:
+        <translation type="obsolete">selecciona la Herramienta de Puntero:
 con la herramienta de puntero puedes:
   seleccionar partes
   mover partes
   copiar partes</translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="+89"/>
         <source>Click this button to open a &lt;em&gt;new song&lt;/em&gt;.&lt;br&gt;You can also select the &lt;b&gt;Open command&lt;/b&gt; from the File menu.</source>
-        <translation type="unfinished">Pulsa este botón para abrir una &lt;em&gt;nueva canción&lt;/em&gt;Puedes usar también el comando &lt;b&gt;Abrir&lt;/b&gt; del me de archivo</translation>
+        <translation type="obsolete">Pulsa este botón para abrir una &lt;em&gt;nueva canción&lt;/em&gt;Puedes usar también el comando &lt;b&gt;Abrir&lt;/b&gt; del me de archivo</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Click this button to save the song you are editing.  You will be prompted for a file name.
 You can also select the Save command from the File menu.</source>
-        <translation type="unfinished">Pulsa este botón para guardar la canción que está editando. Se te preguntará por un nombre de archivo.
+        <translation type="obsolete">Pulsa este botón para guardar la canción que está editando. Se te preguntará por un nombre de archivo.
 Puedes seleccionar también el comando Guardar del men de Archivo</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Create New Song</source>
-        <translation type="unfinished">Crea una nueva canción</translation>
+        <translation type="obsolete">Crea una nueva canción</translation>
     </message>
     <message>
-        <location filename="../../muse/transport.cpp" line="+1"/>
         <source>Click this button to stop playback</source>
-        <translation type="unfinished">Pulsa este botón para detener la reproducción</translation>
+        <translation type="obsolete">Pulsa este botón para detener la reproducción</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Click this button to start playback</source>
-        <translation type="unfinished">Pulsa este botón para iniciar la reproducción</translation>
+        <translation type="obsolete">Pulsa este botón para iniciar la reproducción</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Click this button to rewind to start position</source>
-        <translation type="unfinished">Pulsa este botón para regresar al principio</translation>
+        <translation type="obsolete">Pulsa este botón para regresar al principio</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Click this button to rewind</source>
-        <translation type="unfinished">Pulsa este botón para ir hacia atrás</translation>
+        <translation type="obsolete">Pulsa este botón para ir hacia atrás</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Click this button to forward current play position</source>
-        <translation type="unfinished">Pulsa este botón para adelantar la posición de reproducción</translation>
+        <translation type="obsolete">Pulsa este botón para adelantar la posición de reproducción</translation>
     </message>
     <message>
         <source>don&apos;t quantize notes above this tick limit</source>
@@ -80,188 +70,134 @@ Puedes seleccionar también el comando Guardar del men de Archivo</translation>
         <translation type="obsolete">cuantiza también la longitud de la nota al valor por defecto</translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="+2"/>
         <source>loop between left mark and right mark</source>
-        <translation type="unfinished">hace un bucle entre las marcas de izquierda y derecha</translation>
+        <translation type="obsolete">hace un bucle entre las marcas de izquierda y derecha</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>record starts at left mark</source>
-        <translation type="unfinished">la captura comienza en la marca izquierda</translation>
+        <translation type="obsolete">la captura comienza en la marca izquierda</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>record stops at right mark</source>
-        <translation type="unfinished">la captura termina en la merca derecha</translation>
+        <translation type="obsolete">la captura termina en la merca derecha</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>rewind to start position</source>
-        <translation type="unfinished">retrocede a la posición de inicio</translation>
+        <translation type="obsolete">retrocede a la posición de inicio</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>rewind current position</source>
-        <translation type="unfinished">retrasa la posición actual</translation>
+        <translation type="obsolete">retrasa la posición actual</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>move current position</source>
-        <translation type="unfinished">mueve la posición actual</translation>
+        <translation type="obsolete">mueve la posición actual</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>stop sequencer</source>
-        <translation type="unfinished">para el secuenciador</translation>
+        <translation type="obsolete">para el secuenciador</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>start sequencer play</source>
-        <translation type="unfinished">inicia el secuenciador</translation>
+        <translation type="obsolete">inicia el secuenciador</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>to record press record and then play</source>
-        <translation type="unfinished">para grabar pulsa grabar y después reproducir</translation>
+        <translation type="obsolete">para grabar pulsa grabar y después reproducir</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>send note off to all midi channels</source>
-        <translation type="unfinished">envia un apagado de nota (note off) a todos los canales midi</translation>
+        <translation type="obsolete">envia un apagado de nota (note off) a todos los canales midi</translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/tools.cpp" line="+5"/>
         <source>select Pencil Tool:
 with the pencil tool you can:
   create new parts
   modify length of parts</source>
-        <translation type="unfinished">selecciona la Herramienta de Lápiz:
+        <translation type="obsolete">selecciona la Herramienta de Lápiz:
 con la herramienta de lápiz puedes:
   crear nuevas partes
   modificar la longitud de las partes</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>select Delete Tool:
 with the delete tool you can delete parts</source>
-        <translation type="unfinished">selecciona la Herramienta de Borrado:
+        <translation type="obsolete">selecciona la Herramienta de Borrado:
 con la herramienta de borrado puedes borrar partes</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>select Cut Tool:
 with the cut tool you can split a part</source>
-        <translation type="unfinished">selecciona la Herramienta de Corte:
+        <translation type="obsolete">selecciona la Herramienta de Corte:
 con la herramienta de core puedes partir una parte</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>select Glue Tool:
 with the glue tool you can glue two parts</source>
-        <translation type="unfinished">selecciona la Herramienta de Pegado:
+        <translation type="obsolete">selecciona la Herramienta de Pegado:
 con la herramienta de pegado puedes unir dos partes</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>select Score Tool:
 </source>
-        <translation type="unfinished">selecciona la Herramienta de Partitura:
+        <translation type="obsolete">selecciona la Herramienta de Partitura:
 </translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>select Quantize Tool:
 insert display quantize event</source>
-        <translation type="unfinished">selecciona la Herramianta de Cuantización:
+        <translation type="obsolete">selecciona la Herramianta de Cuantización:
 inserta un evento de cuantización de visualización</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>select Drawing Tool</source>
-        <translation type="unfinished">selecciona la Herramienta de Dibujo</translation>
+        <translation type="obsolete">selecciona la Herramienta de Dibujo</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>select Muting Tool:
 click on part to mute/unmute</source>
-        <translation type="unfinished">selecciona la Herramienta de Silenciar:
+        <translation type="obsolete">selecciona la Herramienta de Silenciar:
 haz click en una parte para silenciar/des-silenciar</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Manipulate automation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Cursor tool</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>pointer</source>
-        <translation type="unfinished">puntero</translation>
+        <translation type="obsolete">puntero</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>pencil</source>
-        <translation type="unfinished">lápiz</translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>edit automation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>cursor</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">lápiz</translation>
     </message>
     <message>
         <source>rubber</source>
         <translation type="obsolete">goma</translation>
     </message>
     <message>
-        <location line="-7"/>
         <source>cutter</source>
-        <translation type="unfinished">cortador</translation>
+        <translation type="obsolete">cortador</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>score</source>
-        <translation type="unfinished">partitura</translation>
+        <translation type="obsolete">partitura</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>glue</source>
-        <translation type="unfinished">pegamento</translation>
+        <translation type="obsolete">pegamento</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>quantize</source>
-        <translation type="unfinished">cuantizador</translation>
+        <translation type="obsolete">cuantizador</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>draw</source>
-        <translation type="unfinished">dibujar</translation>
+        <translation type="obsolete">dibujar</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>mute parts</source>
-        <translation type="unfinished">silenciar partes</translation>
+        <translation type="obsolete">silenciar partes</translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="+155"/>
-        <location filename="../../muse/master/masteredit.cpp" line="+155"/>
-        <location filename="../../muse/widgets/comboQuant.cpp" line="+40"/>
-        <location line="+1"/>
-        <location line="+1"/>
-        <location filename="../../muse/widgets/tb1.cpp" line="+48"/>
-        <location line="+1"/>
-        <location line="+1"/>
         <source>Off</source>
-        <translation type="unfinished">Apagar</translation>
+        <translation type="obsolete">Apagar</translation>
     </message>
     <message>
         <source>presets (*.pre *.pre.gz *.pre.bz2)</source>
@@ -272,232 +208,88 @@ haz click en una parte para silenciar/des-silenciar</translation>
         <translation type="obsolete">Todos los archivos (*)</translation>
     </message>
     <message>
-        <location filename="../../muse/helper.cpp" line="+242"/>
-        <source>MESS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>DSSI</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+9"/>
-        <source>FST</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
+        <location filename="../../muse/helper.cpp" line="+295"/>
         <source>Add Midi Track</source>
-        <translation type="unfinished">Agregar pista MIDI</translation>
+        <translation>Agregar pista MIDI</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Add Drum Track</source>
-        <translation type="unfinished">Agregar pista de percusión</translation>
+        <translation>Agregar pista de percusión</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Add Wave Track</source>
-        <translation type="unfinished">Agregar pista de audio</translation>
+        <translation>Agregar pista de audio</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>Add Audio Output</source>
-        <translation type="unfinished"></translation>
+        <translation>Agregar salida de audio</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+7"/>
         <source>Add Audio Group</source>
-        <translation type="unfinished"></translation>
+        <translation>Agregar grupo de audio</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+7"/>
         <source>Add Audio Input</source>
-        <translation type="unfinished"></translation>
+        <translation>Agregar entrada de audio</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+7"/>
         <source>Add Aux Send</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/widgets/tools.cpp" line="-6"/>
-        <source>eraser</source>
-        <translation type="unfinished"></translation>
+        <translation>Agregar envio auxiliar</translation>
     </message>
     <message>
-        <location filename="../../muse/helper.cpp" line="+7"/>
+        <location line="+8"/>
         <source>Add Synth</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="+0"/>
-        <source>Bar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="+729"/>
-        <source> Jack</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+46"/>
-        <source>ALSA:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
-        <source>SYNTH:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
-        <source>JACK:</source>
-        <translation type="unfinished"></translation>
+        <translation>Agregar sintetizador</translation>
     </message>
     <message>
-        <location filename="../../muse/driver/alsamidi.cpp" line="+209"/>
-        <location filename="../../muse/driver/jackmidi.cpp" line="+290"/>
-        <location filename="../../muse/midiport.cpp" line="+1138"/>
-        <location filename="../../muse/track.cpp" line="+799"/>
-        <location line="+16"/>
-        <location line="+30"/>
+        <location filename="../../muse/midiport.cpp" line="+1190"/>
         <source>Route</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <location filename="../../muse/driver/jackmidi.cpp" line="+2"/>
-        <location filename="../../muse/track.cpp" line="-28"/>
-        <location line="+37"/>
-        <source> channel=&quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>Ruta</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location filename="../../muse/driver/jackmidi.cpp" line="+3"/>
-        <location filename="../../muse/midiport.cpp" line="+7"/>
-        <location filename="../../muse/track.cpp" line="-48"/>
-        <location line="+60"/>
+        <location line="+7"/>
         <source>dest</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <location filename="../../muse/driver/jackmidi.cpp" line="+2"/>
-        <source> devtype=&quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <location filename="../../muse/driver/jackmidi.cpp" line="-20"/>
-        <location line="+23"/>
-        <location filename="../../muse/track.cpp" line="-42"/>
-        <location line="+48"/>
-        <source> type=&quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>dest</translation>
     </message>
     <message>
         <location line="+1"/>
-        <location filename="../../muse/driver/jackmidi.cpp" line="-22"/>
-        <location line="+23"/>
-        <location filename="../../muse/midiport.cpp" line="+1"/>
-        <location filename="../../muse/track.cpp" line="-65"/>
-        <location line="+18"/>
-        <location line="+53"/>
         <source> name=&quot;%1&quot;/</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/driver/jackmidi.cpp" line="-26"/>
-        <location filename="../../muse/track.cpp" line="-56"/>
-        <source>source</source>
-        <translation type="unfinished"></translation>
+        <translation> nombre=&quot;%1&quot;/</translation>
     </message>
     <message>
-        <location filename="../../muse/midictrl.cpp" line="+242"/>
         <source>Velocity</source>
-        <translation type="unfinished">Velocidad</translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiport.cpp" line="-807"/>
-        <source>&lt;none&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+801"/>
-        <location filename="../../muse/track.cpp" line="-21"/>
-        <location line="+48"/>
-        <source> channelMask=&quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/osc.cpp" line="+1320"/>
-        <source>dssi_synth</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+87"/>
-        <source>ladspa_efx</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/track.cpp" line="+8"/>
-        <source> channels=&quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source> remch=&quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+17"/>
-        <source> mport=&quot;%1&quot;/</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/widgets/visibletracks.cpp" line="+35"/>
-        <location line="+9"/>
-        <source>Show wave tracks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-8"/>
-        <location line="+9"/>
-        <source>Show group tracks</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Velocidad</translation>
     </message>
     <message>
-        <location line="-8"/>
-        <location line="+9"/>
-        <source>Show aux tracks</source>
-        <translation type="unfinished"></translation>
+        <location line="-857"/>
+        <source>Warning: No output devices!</source>
+        <translation>Atencion: No hay salidas disponibles</translation>
     </message>
     <message>
-        <location line="-8"/>
-        <location line="+9"/>
-        <source>Show input tracks</source>
-        <translation type="unfinished"></translation>
+        <location line="+5"/>
+        <source>Open midi config...</source>
+        <translation>Configurar MIDI...</translation>
     </message>
     <message>
-        <location line="-8"/>
-        <location line="+9"/>
-        <source>Show output tracks</source>
-        <translation type="unfinished"></translation>
+        <location line="+23"/>
+        <source>Empty ports</source>
+        <translation>Puertos no asignados</translation>
     </message>
     <message>
-        <location line="-8"/>
-        <location line="+9"/>
-        <source>Show midi tracks</source>
-        <translation type="unfinished"></translation>
+        <location line="+22"/>
+        <source>&lt;none&gt;</source>
+        <translation>&lt;ninguno&gt;</translation>
     </message>
     <message>
-        <location line="-8"/>
-        <location line="+9"/>
-        <source>Show synth tracks</source>
-        <translation type="unfinished"></translation>
+        <location line="+801"/>
+        <source> channelMask=&quot;%1&quot;</source>
+        <translation> channelMask=&quot;%1&quot;</translation>
     </message>
 </context>
 <context>
@@ -505,12 +297,12 @@ haz click en una parte para silenciar/des-silenciar</translation>
     <message>
         <location filename="../../muse/widgets/aboutbox.ui" line="+14"/>
         <source>AboutBox</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+37"/>
         <source>Version 2 pre-alpha</source>
-        <translation type="unfinished"></translation>
+        <translation>MusE 2.0 pre-alfa</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -519,25 +311,26 @@ See http://www.muse-sequencer.org for new versions and
 more information.
 
 Published under the GNU Public License</source>
-        <translation type="unfinished"></translation>
+        <translation>(C) Derechos de autor 1999-2010 Werner Schweer y otros.
+Ver http://www.muse-sequencer.org por nuevas versiones
+y mas información.</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>&amp;Keep On Rocking!</source>
-        <translation type="unfinished"></translation>
+        <translation>Volver a la sesión</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Alt+K</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt+K</translation>
     </message>
 </context>
 <context>
     <name>Appearance</name>
     <message>
-        <location filename="../../muse/appearance.cpp" line="+769"/>
         <source>MusE: load image</source>
-        <translation type="unfinished">MusE: carga imagen</translation>
+        <translation type="obsolete">MusE: carga imagen</translation>
     </message>
     <message>
         <source>handle of transport window</source>
@@ -559,76 +352,6 @@ Published under the GNU Public License</source>
         <source>waveedit background color</source>
         <translation type="obsolete">color de fondo de edición de onda</translation>
     </message>
-    <message>
-        <location line="-639"/>
-        <source>Main application font, and default font for any
- controls not defined here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>For small controls like mixer strips.
-Also timescale small numbers, arranger part name overlay,
- and effects rack.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Midi track info panel. Transport controls.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Controller graph and S/X buttons. Large numbers for time
- and tempo scale, and time signature.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Time scale markers.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>List editor: meta event edit dialog multi-line edit box.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Mixer label font. Auto-font-sizing up to chosen font size.
-Word-breaking but only with spaces.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Maximum mixer label auto-font-sizing font size.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Global opacity (opposite of transparency).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Standard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Custom</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+958"/>
-        <source>Select style sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Qt style sheets (*.qss)</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>AppearanceDialogBase</name>
@@ -639,27 +362,27 @@ Word-breaking but only with spaces.</source>
     <message>
         <location filename="../../muse/widgets/appearancebase.ui" line="+1681"/>
         <source>Apply</source>
-        <translation type="unfinished">Aplicar</translation>
+        <translation>Aplicar</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Ok</source>
-        <translation type="unfinished">Aceptar</translation>
+        <translation>Aceptar</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Cancel</source>
-        <translation type="unfinished">Cancelar</translation>
+        <translation>Cancelar</translation>
     </message>
     <message>
         <location line="-1668"/>
         <source>Arranger</source>
-        <translation type="unfinished">Arreglador</translation>
+        <translation>Arreglador</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Parts</source>
-        <translation type="unfinished">Partes</translation>
+        <translation>Regiones</translation>
     </message>
     <message>
         <source>show frames</source>
@@ -668,67 +391,67 @@ Word-breaking but only with spaces.</source>
     <message>
         <location line="+12"/>
         <source>show names</source>
-        <translation type="unfinished">mostrar nombres</translation>
+        <translation>mostrar nombres</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>show events</source>
-        <translation type="unfinished">mostrar eventos</translation>
+        <translation>mostrar eventos</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>show Cakewalk Style</source>
-        <translation type="unfinished">mostrar al estilo de Cakewalk</translation>
+        <translation>mostrar al estilo de Cakewalk</translation>
     </message>
     <message>
         <location line="+28"/>
         <source>y-stretch</source>
-        <translation type="unfinished"></translation>
+        <translation>Periodo Y</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Events</source>
-        <translation type="unfinished">Eventos</translation>
+        <translation>Eventos</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>note on</source>
-        <translation type="unfinished">nota on</translation>
+        <translation>nota on</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>poly pressure</source>
-        <translation type="unfinished">presión polifónica</translation>
+        <translation>presión polifónica</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>controller</source>
-        <translation type="unfinished">controlador</translation>
+        <translation>controlador</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>aftertouch</source>
-        <translation type="unfinished">aftertouch</translation>
+        <translation>aftertouch</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>pitch bend</source>
-        <translation type="unfinished">pitch bend</translation>
+        <translation>pitch bend</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>program change</source>
-        <translation type="unfinished">cambio de programa</translation>
+        <translation>cambio de programa</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>special</source>
-        <translation type="unfinished">especial</translation>
+        <translation>especial</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Background picture</source>
-        <translation type="unfinished">Imagen de fondo</translation>
+        <translation>Imagen de fondo</translation>
     </message>
     <message>
         <source>bg</source>
@@ -741,17 +464,17 @@ Word-breaking but only with spaces.</source>
     <message>
         <location line="+58"/>
         <source>show snap grid</source>
-        <translation type="unfinished">muestra la rejilla de captura</translation>
+        <translation>muestra la rejilla de captura</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Colors</source>
-        <translation type="unfinished">Colores</translation>
+        <translation>Colores</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Items</source>
-        <translation type="unfinished">Objetos</translation>
+        <translation>Objetos</translation>
     </message>
     <message>
         <source>selected</source>
@@ -772,87 +495,87 @@ Word-breaking but only with spaces.</source>
     <message>
         <location line="+824"/>
         <source>Style/Fonts</source>
-        <translation type="unfinished">Estilo/Tipografía</translation>
+        <translation>Estilo/Tipografía</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>QT Theme</source>
-        <translation type="unfinished">tema QT</translation>
+        <translation>tema QT</translation>
     </message>
     <message>
         <location line="+21"/>
         <source>Windows</source>
-        <translation type="unfinished">Ventanas</translation>
+        <translation>Ventanas</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>MusE</source>
-        <translation type="unfinished">MusE</translation>
+        <translation>MusE</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Metal</source>
-        <translation type="unfinished">Metal</translation>
+        <translation>Metal</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Norwegian Wood</source>
-        <translation type="unfinished">Madera Noruega</translation>
+        <translation>Madera Noruega</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Platinum</source>
-        <translation type="unfinished">Platino</translation>
+        <translation>Platino</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>CDE</source>
-        <translation type="unfinished">CDE</translation>
+        <translation>CDE</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Motif</source>
-        <translation type="unfinished">Motif</translation>
+        <translation>Motif</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Motif Plus</source>
-        <translation type="unfinished">Motif Plus</translation>
+        <translation>Motif Plus</translation>
     </message>
     <message>
         <location line="+73"/>
         <source>Fonts</source>
-        <translation type="unfinished">Tipografía</translation>
+        <translation>Tipografía</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Family</source>
-        <translation type="unfinished">Familia</translation>
+        <translation>Familia</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Size</source>
-        <translation type="unfinished">Tamaño</translation>
+        <translation>Tamaño</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Font 1</source>
-        <translation type="unfinished">Tipografía 1</translation>
+        <translation>Tipografía 1</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Font 2</source>
-        <translation type="unfinished">Tipografía 2</translation>
+        <translation>Tipografía 2</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Font 3</source>
-        <translation type="unfinished">Tipografía 3</translation>
+        <translation>Tipografía 3</translation>
     </message>
     <message>
         <location line="+50"/>
         <source>Font 0</source>
-        <translation type="unfinished">Tipografía 0</translation>
+        <translation>Tipografía 0</translation>
     </message>
     <message>
         <location line="+50"/>
@@ -863,7 +586,7 @@ Word-breaking but only with spaces.</source>
         <location line="+47"/>
         <location line="+7"/>
         <source>Bold</source>
-        <translation type="unfinished">Negrita</translation>
+        <translation>Negrita</translation>
     </message>
     <message>
         <location line="-204"/>
@@ -874,7 +597,7 @@ Word-breaking but only with spaces.</source>
         <location line="+54"/>
         <location line="+7"/>
         <source>Italic</source>
-        <translation type="unfinished">Cursiva</translation>
+        <translation>Cursiva</translation>
     </message>
     <message>
         <location line="-433"/>
@@ -887,97 +610,97 @@ Word-breaking but only with spaces.</source>
         <location line="+61"/>
         <location line="+13"/>
         <source>...</source>
-        <translation type="unfinished">...</translation>
+        <translation>...</translation>
     </message>
     <message>
         <location line="-633"/>
         <source>Color name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nombre de color</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Global opacity</source>
-        <translation type="unfinished"></translation>
+        <translation>Opacidad global</translation>
     </message>
     <message>
         <location line="+449"/>
         <source>Font 4</source>
-        <translation type="unfinished">Tipografía 4</translation>
+        <translation>Tipografía 4</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Font 5</source>
-        <translation type="unfinished">Tipografía 5</translation>
+        <translation>Tipografía 5</translation>
     </message>
     <message>
         <location line="-1228"/>
         <source>Palette</source>
-        <translation type="unfinished"></translation>
+        <translation>Paleta</translation>
     </message>
     <message>
         <location line="-257"/>
         <source>MusE: Appearance settings</source>
-        <translation type="unfinished"></translation>
+        <translation>MusE: Configuración de apariencia</translation>
     </message>
     <message>
         <location line="+193"/>
         <source>add</source>
-        <translation type="unfinished">Agregar</translation>
+        <translation>Agregar</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>remove</source>
-        <translation type="unfinished">quitar</translation>
+        <translation>quitar</translation>
     </message>
     <message>
         <location line="+586"/>
         <source>add to palette</source>
-        <translation type="unfinished"></translation>
+        <translation>Agregar a la paleta</translation>
     </message>
     <message>
         <location line="+28"/>
         <source>B</source>
-        <translation type="unfinished"></translation>
+        <translation>Azul</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>S</source>
-        <translation type="unfinished">S</translation>
+        <translation>Saturación</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>H</source>
-        <translation type="unfinished"></translation>
+        <translation>Matíz</translation>
     </message>
     <message>
         <location line="+30"/>
         <source>V</source>
-        <translation type="unfinished"></translation>
+        <translation>Brillo</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>G</source>
-        <translation type="unfinished"></translation>
+        <translation>Verde</translation>
     </message>
     <message>
         <location line="+96"/>
         <source>R</source>
-        <translation type="unfinished">R</translation>
+        <translation>Rojo</translation>
     </message>
     <message>
         <location line="-772"/>
         <source>clear</source>
-        <translation type="unfinished"></translation>
+        <translation>Limpiar</translation>
     </message>
     <message>
         <location line="+953"/>
         <source>Style Sheet:</source>
-        <translation type="unfinished"></translation>
+        <translation>Hoja de estilo</translation>
     </message>
     <message>
         <location line="+345"/>
         <source>Font 6</source>
-        <translation type="unfinished"></translation>
+        <translation>Tipografía 6</translation>
     </message>
 </context>
 <context>
@@ -1508,12 +1231,12 @@ Word-breaking but only with spaces.</source>
     <message>
         <location filename="../../awl/midivolentry.cpp" line="+37"/>
         <source>off</source>
-        <translation type="unfinished">apagado</translation>
+        <translation>apagado</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>db</source>
-        <translation type="unfinished"></translation>
+        <translation>dB</translation>
     </message>
 </context>
 <context>
@@ -1521,7 +1244,7 @@ Word-breaking but only with spaces.</source>
     <message>
         <location filename="../../awl/volentry.cpp" line="+34"/>
         <source>off</source>
-        <translation type="unfinished">apagado</translation>
+        <translation>Apagar</translation>
     </message>
 </context>
 <context>
@@ -1550,29 +1273,12 @@ Word-breaking but only with spaces.</source>
 <context>
     <name>ClipListEdit</name>
     <message>
-        <location filename="../../muse/cliplist/cliplist.cpp" line="+127"/>
         <source>MusE: Clip List Editor</source>
-        <translation type="unfinished">MusE: Editor de lista de clips</translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Undo/Redo tools</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">MusE: Editor de lista de clips</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>panic</source>
-        <translation type="unfinished">pánico</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>transport</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">pánico</translation>
     </message>
 </context>
 <context>
@@ -1580,47 +1286,47 @@ Word-breaking but only with spaces.</source>
     <message>
         <location filename="../../muse/widgets/cliplisteditorbase.ui" line="+17"/>
         <source>MusE: ClipList</source>
-        <translation type="unfinished">MusE: Lista de Clips</translation>
+        <translation>MusE: Lista de archivos de audio</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>Name</source>
-        <translation type="unfinished">Nombre</translation>
+        <translation>Nombre</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Refs</source>
-        <translation type="unfinished">Referencias</translation>
+        <translation>Referencias</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Start</source>
-        <translation type="unfinished">Inicio</translation>
+        <translation>Inicio</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Len</source>
-        <translation type="unfinished">Longitud</translation>
+        <translation>Duración</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Data</source>
-        <translation type="unfinished">Datos</translation>
+        <translation>Datos</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Clip Properties</source>
-        <translation type="unfinished">Propiedades del Clip</translation>
+        <translation>Propiedades del Clip</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Pos:</source>
-        <translation type="unfinished">Posición:</translation>
+        <translation>Posición:</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Len:</source>
-        <translation type="unfinished">Longitud:</translation>
+        <translation>Duración:</translation>
     </message>
 </context>
 <context>
@@ -1628,129 +1334,134 @@ Word-breaking but only with spaces.</source>
     <message>
         <location filename="../../muse/widgets/commentbase.ui" line="+14"/>
         <source>Form1</source>
-        <translation type="unfinished">Form1</translation>
+        <translation>Form1</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>Track Comment</source>
-        <translation type="unfinished">Comentario de la pista</translation>
+        <translation>Comentario de la pista</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>Track 1</source>
-        <translation type="unfinished">Pista 1</translation>
+        <translation>Pista 1</translation>
     </message>
 </context>
 <context>
     <name>ConfigMidiFileBase</name>
     <message>
-        <location filename="../../muse/widgets/configmidifilebase.ui" line="+193"/>
+        <location filename="../../muse/widgets/configmidifilebase.ui" line="+202"/>
         <source>&amp;OK</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;OK</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>&amp;Cancel</source>
-        <translation type="unfinished">&amp;Cancelar</translation>
+        <translation>&amp;Cancelar</translation>
     </message>
     <message>
         <location line="-56"/>
         <source>0 (single track)</source>
-        <translation type="unfinished"></translation>
+        <translation>0 (una sola pista)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>1 (multiple tracks)</source>
-        <translation type="unfinished"></translation>
+        <translation>1 (Pistas multiples)</translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-52"/>
         <source>Format:</source>
-        <translation type="unfinished"></translation>
+        <translation>Formato:</translation>
     </message>
     <message>
         <location line="-48"/>
         <source>96</source>
-        <translation type="unfinished">96</translation>
+        <translation>96</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>192</source>
-        <translation type="unfinished">192</translation>
+        <translation>192</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>384</source>
-        <translation type="unfinished">384</translation>
+        <translation>384</translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+64"/>
         <source>Division:</source>
-        <translation type="unfinished"></translation>
+        <translation>División:</translation>
     </message>
     <message>
-        <location line="-20"/>
+        <location line="-36"/>
         <source>Copyright:</source>
-        <translation type="unfinished"></translation>
+        <translation>Derecho de autor</translation>
     </message>
     <message>
         <source>Enable extended smf format</source>
         <translation type="obsolete">Habilita el formato extendido de smf</translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-91"/>
         <source>MusE: Config Midi File Import/Export</source>
-        <translation type="unfinished"></translation>
+        <translation>MusE: Configuración de la importacion/exportación MIDI</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+15"/>
         <source>Import:</source>
-        <translation type="unfinished"></translation>
+        <translation>Importado</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+9"/>
         <source>Split tracks into &amp;parts</source>
-        <translation type="unfinished"></translation>
+        <translation>Dividir en pistas y regiones</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Alt+P</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt+P</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-6"/>
         <source>Split tracks into parts, or one single part</source>
-        <translation type="unfinished"></translation>
+        <translation>Dividir  en pistas y regiones o una sola región.</translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+22"/>
         <source>Export:</source>
-        <translation type="unfinished"></translation>
+        <translation>Exportado:</translation>
     </message>
     <message>
         <location line="+31"/>
         <source>Enable extended smf format (currently not implemented)</source>
-        <translation type="unfinished"></translation>
+        <translation>Habilitar formato extendido smf (no implementado)</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Use &amp;2-byte time signatures instead of standard 4</source>
-        <translation type="unfinished"></translation>
+        <translation>Compás de 2 bytes</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Alt+2</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt+2</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+33"/>
+        <source>Note: Format 0 uses the FIRST midi track&apos;s name/comment in the arranger</source>
+        <translation>Nota: Formato 0 utiliza el nombre de la primera pista midi como comentario en el arreglista</translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Save space by replacing note-offs with &amp;zero velocity note-ons</source>
-        <translation type="unfinished"></translation>
+        <translation>Ahorro de espacio por la sustitución de &quot;note-off&quot; con cero y la velocidad de &quot;note-on&quot;</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Alt+Z</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt+Z</translation>
     </message>
 </context>
 <context>
@@ -1758,76 +1469,74 @@ Word-breaking but only with spaces.</source>
     <message>
         <location filename="../../muse/widgets/function_dialogs/crescendobase.ui" line="+14"/>
         <source>MusE: Crescendo/Decrescendo</source>
-        <translation type="unfinished"></translation>
+        <translation>MusE: Crescendo/Decrescendo</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Range</source>
-        <translation type="unfinished">Rango</translation>
+        <translation>Rango</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Looped Events</source>
-        <translation type="unfinished"></translation>
+        <translation>Eventos en bucle</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Selected Looped</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionar bucles</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Values</source>
-        <translation type="unfinished">Valores</translation>
+        <translation>Valores</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Start velocity</source>
-        <translation type="unfinished"></translation>
+        <translation>Velocidad al inicio</translation>
     </message>
     <message>
         <location line="+10"/>
         <location line="+43"/>
         <source> %</source>
-        <translation type="unfinished"></translation>
+        <translation> %</translation>
     </message>
     <message>
         <location line="-27"/>
         <source>End velocity</source>
-        <translation type="unfinished"></translation>
+        <translation>Velocidad al final</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Absolute</source>
-        <translation type="unfinished"></translation>
+        <translation>Absoluto</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Relative</source>
-        <translation type="unfinished"></translation>
+        <translation>Relativo</translation>
     </message>
     <message>
         <location line="+60"/>
         <source>OK</source>
-        <translation type="unfinished">Aceptar</translation>
+        <translation>Aceptar</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Cancel</source>
-        <translation type="unfinished">Cancelar</translation>
+        <translation>Cancelar</translation>
     </message>
 </context>
 <context>
     <name>CtrlPanel</name>
     <message>
-        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="+94"/>
         <source>select controller</source>
-        <translation type="unfinished">selecciona controlador</translation>
+        <translation type="obsolete">selecciona controlador</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>remove panel</source>
-        <translation type="unfinished">quitar panel</translation>
+        <translation type="obsolete">quitar panel</translation>
     </message>
     <message>
         <source>other ...</source>
@@ -1842,79 +1551,28 @@ Word-breaking but only with spaces.</source>
         <translation type="obsolete">x</translation>
     </message>
     <message>
-        <location line="+463"/>
-        <location line="+236"/>
         <source>Velocity</source>
-        <translation type="unfinished">Velocidad</translation>
+        <translation type="obsolete">Velocidad</translation>
     </message>
     <message>
         <source>Pitch</source>
         <translation type="obsolete">Tono</translation>
     </message>
     <message>
-        <location line="-186"/>
-        <source>add new ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-528"/>
         <source>S</source>
-        <translation type="unfinished">S</translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>X</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>manual adjust</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+9"/>
-        <source>double click on/off</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">S</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>off</source>
-        <translation type="unfinished">apagado</translation>
-    </message>
-    <message>
-        <location line="+653"/>
-        <location line="+58"/>
-        <source>Instrument-defined</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-43"/>
-        <location line="+21"/>
-        <source>Add ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-17"/>
-        <source>Others</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+65"/>
-        <source>Edit instrument ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+46"/>
-        <source>Common Controls</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">apagado</translation>
     </message>
 </context>
 <context>
     <name>DeicsOnzeGui</name>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="+538"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="+540"/>
         <source>Save configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>Guardar configuración</translation>
     </message>
     <message>
         <location line="+41"/>
@@ -1928,7 +1586,7 @@ Word-breaking but only with spaces.</source>
         <location line="+165"/>
         <location line="+7"/>
         <source>Critical Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Error critico</translation>
     </message>
     <message>
         <location line="-1762"/>
@@ -1937,7 +1595,7 @@ Word-breaking but only with spaces.</source>
         <location line="+167"/>
         <location line="+172"/>
         <source>Cannot open file %1</source>
-        <translation type="unfinished"></translation>
+        <translation>No se puede abrir el archivo %1</translation>
     </message>
     <message>
         <location line="-1749"/>
@@ -1946,286 +1604,289 @@ Word-breaking but only with spaces.</source>
         <location line="+167"/>
         <location line="+172"/>
         <source>Parsing error for file %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Error de análisis del archivo %1</translation>
     </message>
     <message>
         <location line="-1722"/>
         <location line="+1364"/>
         <source>Load category dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Cargar diálogo de la categoría</translation>
     </message>
     <message>
         <location line="-226"/>
         <source>Load set dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Cargar grupo de diálogos</translation>
     </message>
     <message>
         <location line="+67"/>
         <source>Save set dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Guardar grupo de diálogos</translation>
     </message>
     <message>
         <location line="+24"/>
         <source>New category</source>
-        <translation type="unfinished"></translation>
+        <translation>Nueva categoria</translation>
     </message>
     <message>
         <location line="+2"/>
         <location line="+101"/>
         <source>Delete category</source>
-        <translation type="unfinished"></translation>
+        <translation>Borrar categoria</translation>
     </message>
     <message>
         <location line="-99"/>
         <source>Load category</source>
-        <translation type="unfinished"></translation>
+        <translation>Cargar categoria</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Save category</source>
-        <translation type="unfinished"></translation>
+        <translation>Guardar categoria</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Load set</source>
-        <translation type="unfinished"></translation>
+        <translation>Cargar grupo</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Save set</source>
-        <translation type="unfinished"></translation>
+        <translation>Guardar grupo</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Delete set</source>
-        <translation type="unfinished"></translation>
+        <translation>Borrar grupo</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>New subcategory</source>
-        <translation type="unfinished"></translation>
+        <translation>Nueva subcategoria</translation>
     </message>
     <message>
         <location line="+3"/>
         <location line="+243"/>
         <source>Delete subcategory</source>
-        <translation type="unfinished"></translation>
+        <translation>Borrar sub categoria</translation>
     </message>
     <message>
         <location line="-240"/>
         <source>Load subcategory</source>
-        <translation type="unfinished"></translation>
+        <translation>Crgar subcategoria</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Save subcategory</source>
-        <translation type="unfinished"></translation>
+        <translation>Guardar subcategoria</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>New preset</source>
-        <translation type="unfinished"></translation>
+        <translation>Nuevo preseteo</translation>
     </message>
     <message>
         <location line="+2"/>
         <location line="+389"/>
         <source>Delete preset</source>
-        <translation type="unfinished"></translation>
+        <translation>Borrar preseteo</translation>
     </message>
     <message>
         <location line="-387"/>
         <source>Load preset</source>
-        <translation type="unfinished"></translation>
+        <translation>Cargar preseteo</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Save preset</source>
-        <translation type="unfinished"></translation>
+        <translation>Guardar preseteo</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>No more category supported</source>
-        <translation type="unfinished"></translation>
+        <translation>No se soportan mas categorías</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>You can not add more categories</source>
-        <translation type="unfinished"></translation>
+        <translation>No se pueden agregar mas categorias</translation>
     </message>
     <message>
         <location line="+23"/>
         <location line="+169"/>
         <location line="+171"/>
         <source>Do you really want to delete %1 ?</source>
-        <translation type="unfinished"></translation>
+        <translation>¿Seguro desea borrar %1 ?</translation>
     </message>
     <message>
         <location line="-338"/>
         <location line="+170"/>
         <location line="+170"/>
         <source>&amp;Yes</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Si</translation>
     </message>
     <message>
         <location line="-340"/>
         <location line="+170"/>
         <location line="+170"/>
         <source>&amp;No</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;No</translation>
     </message>
     <message>
         <location line="-323"/>
         <location line="+110"/>
         <source>No category selected</source>
-        <translation type="unfinished"></translation>
+        <translation>No hay categoria seleccionada</translation>
     </message>
     <message>
         <location line="-109"/>
         <location line="+110"/>
         <source>You must first select a category.</source>
-        <translation type="unfinished"></translation>
+        <translation>Primero debe seleccionar una categoria</translation>
     </message>
     <message>
         <location line="-61"/>
         <location line="+167"/>
         <location line="+172"/>
         <source>Replace or add</source>
-        <translation type="unfinished"></translation>
+        <translation>Reemplazar o agregar</translation>
     </message>
     <message>
         <location line="-338"/>
         <source>%1 is supposed to be affected to the hbank number %2, but there is already one on this slot.
  Do you want to replace it or to add it in the next free slot ?</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 Se supone que es el número de banco superior afectado %2, pero ya hay uno en esta ranura.
+  ¿Quiere reemplazarlo o añadir una  ranura libre después?</translation>
     </message>
     <message>
         <location line="+3"/>
         <location line="+168"/>
         <location line="+171"/>
         <source>&amp;Replace</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Reemplazar</translation>
     </message>
     <message>
         <location line="-339"/>
         <location line="+168"/>
         <location line="+171"/>
         <source>&amp;Add</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Agregar</translation>
     </message>
     <message>
         <location line="-329"/>
         <location line="+167"/>
         <location line="+171"/>
         <source>Download error</source>
-        <translation type="unfinished"></translation>
+        <translation>Error de descarga</translation>
     </message>
     <message>
         <location line="-337"/>
         <source>There is no more free category slot.</source>
-        <translation type="unfinished"></translation>
+        <translation>No hay mas lugar para categorías.</translation>
     </message>
     <message>
         <location line="+28"/>
         <source>Save category dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Guardar dialogo de categoria</translation>
     </message>
     <message>
         <location line="+30"/>
         <source>No more subcategory supported</source>
-        <translation type="unfinished"></translation>
+        <translation>No se soportan mas sub categorías</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>You can not add more subcategories</source>
-        <translation type="unfinished"></translation>
+        <translation>No se pueden agregar mas sub categorias</translation>
     </message>
     <message>
         <location line="+42"/>
         <location line="+113"/>
         <source>No subcategory selected</source>
-        <translation type="unfinished"></translation>
+        <translation>No hay subcategoria seleccionada</translation>
     </message>
     <message>
         <location line="-112"/>
         <location line="+113"/>
         <source>You must first select a subcategory.</source>
-        <translation type="unfinished"></translation>
+        <translation>Primero debe seleccionar una sub categoria</translation>
     </message>
     <message>
         <location line="-101"/>
         <source>Load subcategory dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Cargar dialogo de subcategoria</translation>
     </message>
     <message>
         <location line="+39"/>
         <source>%1 is supposed to be affected to the lbank number %2, but there is already one on this slot.
  Do you want to replace it or to add it in the next free slot ?</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 Se supone que es el número de banco inferior afectado %2, pero ya hay uno en esta ranura.
+  ¿Quiere reemplazarlo o añadir una ranura libre después?</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>There is no more free subcategory slot.</source>
-        <translation type="unfinished"></translation>
+        <translation>No hay mas lugar para sub categorías.</translation>
     </message>
     <message>
         <location line="+29"/>
         <source>Save subcategory dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Guardar dialogo de subcategoria</translation>
     </message>
     <message>
         <location line="+33"/>
         <source>No more preset supported</source>
-        <translation type="unfinished"></translation>
+        <translation>No se soportan mas preseteos</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>You can not add more presets</source>
-        <translation type="unfinished"></translation>
+        <translation>No se pueden agregar mas preseteos</translation>
     </message>
     <message>
         <location line="+39"/>
         <location line="+3"/>
         <location line="+111"/>
         <source>No preset selected</source>
-        <translation type="unfinished"></translation>
+        <translation>No hay preseteos seleccionados</translation>
     </message>
     <message>
         <location line="-113"/>
         <location line="+3"/>
         <location line="+111"/>
         <source>You must first select a preset.</source>
-        <translation type="unfinished"></translation>
+        <translation>Primero selecciones un preseteo.</translation>
     </message>
     <message>
         <location line="-98"/>
         <source>Load preset dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Cargar dialogo de preseteo</translation>
     </message>
     <message>
         <location line="+39"/>
         <source>%1 is supposed to be affected to the prog number %2, but there is already one on this slot.
  Do you want to replace it or to add it in the next free slot ?</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 Se supone que es afectada el número del programa %2,pero ya hay uno en esta ranura.
+  ¿Quieres reemplazarlo o añadir una ranura libre después?</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>There is no more free preset slot.</source>
-        <translation type="unfinished"></translation>
+        <translation>No hay mas lugar para preseteos.</translation>
     </message>
     <message>
         <location line="+29"/>
         <source>Save preset dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Guardar dialogo de preseteo</translation>
     </message>
     <message>
         <location line="+124"/>
         <source>Browse set dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Buscar ajustes de diálogo</translation>
     </message>
     <message>
         <location line="+39"/>
         <source>Browse image dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Buscar imagen de dialogo</translation>
     </message>
 </context>
 <context>
@@ -2233,109 +1894,109 @@ Word-breaking but only with spaces.</source>
     <message>
         <location filename="../../synti/deicsonze/deicsonzegui.ui" line="+15"/>
         <source>DeicsOnze</source>
-        <translation type="unfinished"></translation>
+        <translation>DeicsOnze</translation>
     </message>
     <message>
         <location line="+40"/>
         <source>&amp;Preset</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Preseteos</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Program numerous</source>
-        <translation type="unfinished"></translation>
+        <translation>Numero de programa</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>INITVOICE</source>
-        <translation type="unfinished"></translation>
+        <translation>InitVoice</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>LBank</source>
-        <translation type="unfinished"></translation>
+        <translation>Banco inferior</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Subcategory</source>
-        <translation type="unfinished"></translation>
+        <translation>Subcategoria</translation>
     </message>
     <message>
         <location line="+11"/>
         <location line="+42"/>
         <source>Bank numerous</source>
-        <translation type="unfinished"></translation>
+        <translation>Numero de banco</translation>
     </message>
     <message>
         <location line="-26"/>
         <location line="+13"/>
         <source>NONE</source>
-        <translation type="unfinished"></translation>
+        <translation>Ninguno</translation>
     </message>
     <message>
         <location line="+57"/>
         <source>HBank</source>
-        <translation type="unfinished"></translation>
+        <translation>Banco superior</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Category</source>
-        <translation type="unfinished"></translation>
+        <translation>Categoria</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Prog</source>
-        <translation type="unfinished"></translation>
+        <translation>Programa</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Preset</source>
-        <translation type="unfinished">Preselección</translation>
+        <translation>Preselección</translation>
     </message>
     <message>
         <location line="+25"/>
         <source>DeicsOnze v0.5.5 Copyright (c) 2004-2006 Nil Geisweiller. Published under GPL licence.</source>
-        <translation type="unfinished"></translation>
+        <translation>DeicsOnze v0.5.5 Derechos Reservados(c) 2004-2006 Nil Geisweiller. Publicado bajo licencia GPL.</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>&amp;Global</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Global</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Pitch Envelope</source>
-        <translation type="unfinished"></translation>
+        <translation>Envolvente de afinación</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>PL3</source>
-        <translation type="unfinished"></translation>
+        <translation>PL3</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>PL2</source>
-        <translation type="unfinished"></translation>
+        <translation>PL2</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>PL1</source>
-        <translation type="unfinished"></translation>
+        <translation>PL1</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>PR1</source>
-        <translation type="unfinished"></translation>
+        <translation>PR1</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>PR2</source>
-        <translation type="unfinished"></translation>
+        <translation>PR2</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>PR3</source>
-        <translation type="unfinished"></translation>
+        <translation>PR3</translation>
     </message>
     <message>
         <location line="+23"/>
@@ -2346,109 +2007,109 @@ Word-breaking but only with spaces.</source>
         <location line="+16"/>
         <location line="+125"/>
         <source>Pitch modulation depth</source>
-        <translation type="unfinished"></translation>
+        <translation>Profundidad de modulación de tono</translation>
     </message>
     <message>
         <location line="-106"/>
         <source>LFO</source>
-        <translation type="unfinished">LFO</translation>
+        <translation>LFO</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>LFO Sync</source>
-        <translation type="unfinished"></translation>
+        <translation>LFO Sync</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Pitch modulation sensitivity</source>
-        <translation type="unfinished"></translation>
+        <translation>Pitch modulation sensitivity</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Pitch Modulation Sensitivity</source>
-        <translation type="unfinished"></translation>
+        <translation>Pitch Modulation Sensitivity</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>LFO Delay</source>
-        <translation type="unfinished"></translation>
+        <translation>LFO Delay</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>LFO delay</source>
-        <translation type="unfinished"></translation>
+        <translation>LFO delay</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>LFO speed</source>
-        <translation type="unfinished"></translation>
+        <translation>LFO speed</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Amplitude modulation depth</source>
-        <translation type="unfinished"></translation>
+        <translation>Amplitude modulation depth</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Amplitude modulation sensitivity</source>
-        <translation type="unfinished"></translation>
+        <translation>Amplitude modulation sensitivity</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Amplitude Modulation Sensitivity</source>
-        <translation type="unfinished"></translation>
+        <translation>Amplitude Modulation Sensitivity</translation>
     </message>
     <message>
         <location line="+25"/>
         <source>AMS</source>
-        <translation type="unfinished"></translation>
+        <translation>AMS</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>LFO Waveform</source>
-        <translation type="unfinished"></translation>
+        <translation>LFO Waveform</translation>
     </message>
     <message>
         <location line="+52"/>
         <location line="+57"/>
         <source>Pitch Modulation Depth</source>
-        <translation type="unfinished"></translation>
+        <translation>Pitch Modulation Depth</translation>
     </message>
     <message>
         <location line="-32"/>
         <source>PMD</source>
-        <translation type="unfinished"></translation>
+        <translation>PMD</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>LFO Speed</source>
-        <translation type="unfinished"></translation>
+        <translation>LFO Speed</translation>
     </message>
     <message>
         <location line="+47"/>
         <source>AMD</source>
-        <translation type="unfinished"></translation>
+        <translation>AMD</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Speed</source>
-        <translation type="unfinished">Velocidad</translation>
+        <translation>Velocidad</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Delay</source>
-        <translation type="unfinished">Delay</translation>
+        <translation>Delay</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>PMS</source>
-        <translation type="unfinished"></translation>
+        <translation>PMS</translation>
     </message>
     <message>
         <location line="+13"/>
         <location line="+15"/>
         <source>Modulation Matrix</source>
-        <translation type="unfinished"></translation>
+        <translation>Modulation Matrix</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -2460,45 +2121,52 @@ Word-breaking but only with spaces.</source>
 &lt;b&gt;Algorithm 6&lt;/b&gt; : addition of the three &lt;i&gt;Op 1, 2, 3&lt;/i&gt; all modulated by &lt;i&gt;Op 4&lt;/i&gt;&lt;br&gt;
 &lt;b&gt;Algorithm 7&lt;/b&gt; : addition of the three &lt;i&gt;Op 1, 2, 3&lt;/i&gt; with &lt;i&gt;Op 3&lt;/i&gt; modulated by &lt;i&gt;Op 4&lt;/i&gt;&lt;br&gt;
 &lt;b&gt;Algorithm 8&lt;/b&gt; : addition of the four &lt;i&gt;Op 1, 2, 3, 4&lt;/i&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Algorithm 1&lt;/b&gt; : &lt;i&gt;Op 1&lt;/i&gt; modulated by &lt;i&gt;Op 2&lt;/i&gt; modulated by &lt;i&gt;Op 3&lt;/i&gt; modulated by &lt;i&gt;Op 4&lt;/i&gt;&lt;br&gt;
+&lt;b&gt;Algorithm 2&lt;/b&gt; : &lt;i&gt;Op 1&lt;/i&gt; modulated by &lt;i&gt;Op 2&lt;/i&gt; modulated by both &lt;i&gt;Op 3&lt;/i&gt; and &lt;i&gt;Op 4&lt;/i&gt;&lt;br&gt;
+&lt;b&gt;Algorithm 3&lt;/b&gt; : &lt;i&gt;Op 1&lt;/i&gt; modulated by both &lt;i&gt;Op 4&lt;/i&gt; and &lt;i&gt;Op 2&lt;/i&gt; modulated by &lt;i&gt;Op 3&lt;/i&gt;&lt;br&gt;
+&lt;b&gt;Algorithm 4&lt;/b&gt; : &lt;i&gt;Op 1&lt;/i&gt; modulated by both &lt;i&gt;Op 2&lt;/i&gt; and &lt;i&gt;Op 3&lt;/i&gt; modulated by &lt;i&gt;Op 4&lt;/i&gt;&lt;br&gt;
+&lt;b&gt;Algorithm 5&lt;/b&gt; : (&lt;i&gt;Op 1&lt;/i&gt; modulated by &lt;i&gt;Op 2&lt;/i&gt;) add to (&lt;i&gt;Op 3&lt;/i&gt; modulated by &lt;i&gt;Op 4&lt;/i&gt;) &lt;br&gt;
+&lt;b&gt;Algorithm 6&lt;/b&gt; : addition of the three &lt;i&gt;Op 1, 2, 3&lt;/i&gt; all modulated by &lt;i&gt;Op 4&lt;/i&gt;&lt;br&gt;
+&lt;b&gt;Algorithm 7&lt;/b&gt; : addition of the three &lt;i&gt;Op 1, 2, 3&lt;/i&gt; with &lt;i&gt;Op 3&lt;/i&gt; modulated by &lt;i&gt;Op 4&lt;/i&gt;&lt;br&gt;
+&lt;b&gt;Algorithm 8&lt;/b&gt; : addition of the four &lt;i&gt;Op 1, 2, 3, 4&lt;/i&gt;</translation>
     </message>
     <message>
         <location line="+98"/>
         <source>Op4 Feedback</source>
-        <translation type="unfinished"></translation>
+        <translation>Op4 Feedback</translation>
     </message>
     <message>
         <location line="+15"/>
         <location line="+19"/>
         <source>Feedback level of the operator 4</source>
-        <translation type="unfinished"></translation>
+        <translation>Feedback level of the operator 4</translation>
     </message>
     <message>
         <location line="+13"/>
         <location line="+15"/>
         <location line="+19"/>
         <source>Transpose</source>
-        <translation type="unfinished">Transponer</translation>
+        <translation>Transponer</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Op &amp;1</source>
-        <translation type="unfinished"></translation>
+        <translation>Op &amp;1</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Scaling 1</source>
-        <translation type="unfinished"></translation>
+        <translation>Scaling 1</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>LS1</source>
-        <translation type="unfinished"></translation>
+        <translation>LS1</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>RS1</source>
-        <translation type="unfinished"></translation>
+        <translation>RS1</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -2510,7 +2178,7 @@ Word-breaking but only with spaces.</source>
         <location line="+809"/>
         <location line="+32"/>
         <source>Rate Scaling</source>
-        <translation type="unfinished"></translation>
+        <translation>Rate Scaling</translation>
     </message>
     <message>
         <location line="-2544"/>
@@ -2526,7 +2194,7 @@ Word-breaking but only with spaces.</source>
         <location line="+25"/>
         <location line="+136"/>
         <source>Attack Rate of the operator 1</source>
-        <translation type="unfinished"></translation>
+        <translation>Attack Rate of the operator 1</translation>
     </message>
     <message>
         <location line="-2626"/>
@@ -2538,32 +2206,32 @@ Word-breaking but only with spaces.</source>
         <location line="+794"/>
         <location line="+47"/>
         <source>Level Scaling</source>
-        <translation type="unfinished"></translation>
+        <translation>Level Scaling</translation>
     </message>
     <message>
         <location line="-2461"/>
         <source>Amplitude Envelope 1</source>
-        <translation type="unfinished"></translation>
+        <translation>Amplitude Envelope 1</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>RR1</source>
-        <translation type="unfinished"></translation>
+        <translation>RR1</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>D1R1</source>
-        <translation type="unfinished"></translation>
+        <translation>D1R1</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>D1L1</source>
-        <translation type="unfinished"></translation>
+        <translation>D1L1</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>D2R1</source>
-        <translation type="unfinished"></translation>
+        <translation>D2R1</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -2571,7 +2239,7 @@ Word-breaking but only with spaces.</source>
         <location line="+741"/>
         <location line="+744"/>
         <source>Release Rate</source>
-        <translation type="unfinished"></translation>
+        <translation>Release Rate</translation>
     </message>
     <message utf8="true">
         <location line="-2137"/>
@@ -2579,7 +2247,7 @@ Word-breaking but only with spaces.</source>
         <location line="+741"/>
         <location line="+744"/>
         <source>2° Decay Rate</source>
-        <translation type="unfinished"></translation>
+        <translation>2° Decay Rate</translation>
     </message>
     <message utf8="true">
         <location line="-2137"/>
@@ -2587,7 +2255,7 @@ Word-breaking but only with spaces.</source>
         <location line="+741"/>
         <location line="+744"/>
         <source>1° Decay Level</source>
-        <translation type="unfinished"></translation>
+        <translation>1° Decay Level</translation>
     </message>
     <message utf8="true">
         <location line="-2137"/>
@@ -2595,7 +2263,7 @@ Word-breaking but only with spaces.</source>
         <location line="+741"/>
         <location line="+744"/>
         <source>1° Decay Rate</source>
-        <translation type="unfinished"></translation>
+        <translation>1° Decay Rate</translation>
     </message>
     <message>
         <location line="-2137"/>
@@ -2603,22 +2271,22 @@ Word-breaking but only with spaces.</source>
         <location line="+741"/>
         <location line="+744"/>
         <source>Attack Rate</source>
-        <translation type="unfinished"></translation>
+        <translation>Attack Rate</translation>
     </message>
     <message>
         <location line="-2016"/>
         <source>AR1</source>
-        <translation type="unfinished"></translation>
+        <translation>AR1</translation>
     </message>
     <message>
         <location line="+32"/>
         <source>Detune, OSCWave, EGShift 1</source>
-        <translation type="unfinished"></translation>
+        <translation>Detune, OSCWave, EGShift 1</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>DET1</source>
-        <translation type="unfinished"></translation>
+        <translation>DET1</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -2631,7 +2299,7 @@ Word-breaking but only with spaces.</source>
         <location line="+16"/>
         <location line="+3414"/>
         <source>Detune</source>
-        <translation type="unfinished">Desafinación</translation>
+        <translation>Detune</translation>
     </message>
     <message>
         <location line="-5762"/>
@@ -2639,7 +2307,7 @@ Word-breaking but only with spaces.</source>
         <location line="+744"/>
         <location line="+738"/>
         <source>EG Shift</source>
-        <translation type="unfinished"></translation>
+        <translation>EG Shift</translation>
     </message>
     <message>
         <location line="-2375"/>
@@ -2647,7 +2315,7 @@ Word-breaking but only with spaces.</source>
         <location line="+744"/>
         <location line="+738"/>
         <source>96dB</source>
-        <translation type="unfinished"></translation>
+        <translation>96dB</translation>
     </message>
     <message>
         <location line="-2374"/>
@@ -2655,7 +2323,7 @@ Word-breaking but only with spaces.</source>
         <location line="+744"/>
         <location line="+738"/>
         <source>48dB</source>
-        <translation type="unfinished"></translation>
+        <translation>48dB</translation>
     </message>
     <message>
         <location line="-2374"/>
@@ -2663,7 +2331,7 @@ Word-breaking but only with spaces.</source>
         <location line="+744"/>
         <location line="+738"/>
         <source>24dB</source>
-        <translation type="unfinished"></translation>
+        <translation>24dB</translation>
     </message>
     <message>
         <location line="-2374"/>
@@ -2671,7 +2339,7 @@ Word-breaking but only with spaces.</source>
         <location line="+744"/>
         <location line="+738"/>
         <source>12dB</source>
-        <translation type="unfinished"></translation>
+        <translation>12dB</translation>
     </message>
     <message>
         <location line="-2368"/>
@@ -2679,7 +2347,7 @@ Word-breaking but only with spaces.</source>
         <location line="+744"/>
         <location line="+738"/>
         <source>Wave form</source>
-        <translation type="unfinished"></translation>
+        <translation>Wave form</translation>
     </message>
     <message>
         <location line="-2376"/>
@@ -2694,17 +2362,24 @@ Wave form 5 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
 Wave form 6 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t&lt;/b&gt;)*abs(sin(2*&lt;b&gt;t&lt;/b&gt;)) else 0&lt;/i&gt;&lt;br&gt;
 Wave form 7 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then abs(sin(2*&lt;b&gt;t&lt;/b&gt;)) else 0&lt;/i&gt;&lt;br&gt;
 Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t&lt;/b&gt;)*sin(2*&lt;b&gt;t&lt;/b&gt;) else 0&lt;/i&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>Wave form 1 = &lt;i&gt;sin(&lt;b&gt;t&lt;/b&gt;)&lt;/i&gt;&lt;br&gt;
+Wave form 2 = &lt;i&gt;sin(&lt;b&gt;t&lt;/b&gt;)*abs(sin(&lt;b&gt;t&lt;/b&gt;))&lt;/i&gt;&lt;br&gt;
+Wave form 3 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(&lt;b&gt;t&lt;/b&gt;) else 0&lt;/i&gt;&lt;br&gt;
+Wave form 4 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(&lt;b&gt;t&lt;/b&gt;)*abs(sin(&lt;b&gt;t&lt;/b&gt;)) else 0&lt;/i&gt;&lt;br&gt;
+Wave form 5 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t&lt;/b&gt;) else 0&lt;/i&gt;&lt;br&gt;
+Wave form 6 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t&lt;/b&gt;)*abs(sin(2*&lt;b&gt;t&lt;/b&gt;)) else 0&lt;/i&gt;&lt;br&gt;
+Wave form 7 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then abs(sin(2*&lt;b&gt;t&lt;/b&gt;)) else 0&lt;/i&gt;&lt;br&gt;
+Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t&lt;/b&gt;)*sin(2*&lt;b&gt;t&lt;/b&gt;) else 0&lt;/i&gt;</translation>
     </message>
     <message>
         <location line="-2284"/>
         <source>Sensitivity 1</source>
-        <translation type="unfinished"></translation>
+        <translation>Sensitivity 1</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>KVS1</source>
-        <translation type="unfinished"></translation>
+        <translation>KVS1</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -2712,12 +2387,12 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
         <location line="+744"/>
         <location line="+738"/>
         <source>Amplitude Modulation Enable</source>
-        <translation type="unfinished"></translation>
+        <translation>Amplitude Modulation Enable</translation>
     </message>
     <message>
         <location line="-2389"/>
         <source>AME1</source>
-        <translation type="unfinished"></translation>
+        <translation>AME1</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -2725,7 +2400,7 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
         <location line="+744"/>
         <location line="+738"/>
         <source>Keyboard Velocity Sensitivity</source>
-        <translation type="unfinished"></translation>
+        <translation>Keyboard Velocity Sensitivity</translation>
     </message>
     <message>
         <location line="-2398"/>
@@ -2733,12 +2408,12 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
         <location line="+744"/>
         <location line="+738"/>
         <source>Key Velocity Sensitivity</source>
-        <translation type="unfinished"></translation>
+        <translation>Key Velocity Sensitivity</translation>
     </message>
     <message>
         <location line="-2357"/>
         <source>EBS1</source>
-        <translation type="unfinished"></translation>
+        <translation>EBS1</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -2746,7 +2421,7 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
         <location line="+744"/>
         <location line="+738"/>
         <source>EG Bias Sensitivity</source>
-        <translation type="unfinished"></translation>
+        <translation>EG Bias Sensitivity</translation>
     </message>
     <message>
         <location line="-2357"/>
@@ -2754,17 +2429,17 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
         <location line="+744"/>
         <location line="+738"/>
         <source>Eg Bias Sensitivity</source>
-        <translation type="unfinished"></translation>
+        <translation>Eg Bias Sensitivity</translation>
     </message>
     <message>
         <location line="-2360"/>
         <source>Frequency 1</source>
-        <translation type="unfinished"></translation>
+        <translation>Frequency 1</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Coarse 1</source>
-        <translation type="unfinished"></translation>
+        <translation>Coarse 1</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -2772,12 +2447,12 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
         <location line="+905"/>
         <location line="+580"/>
         <source>Coarse Ratio</source>
-        <translation type="unfinished"></translation>
+        <translation>Coarse Ratio</translation>
     </message>
     <message>
         <location line="-1787"/>
         <source>Fine 1</source>
-        <translation type="unfinished"></translation>
+        <translation>Fine 1</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -2785,12 +2460,12 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
         <location line="+908"/>
         <location line="+577"/>
         <source>Fine Ratio</source>
-        <translation type="unfinished"></translation>
+        <translation>Fine Ratio</translation>
     </message>
     <message>
         <location line="-1787"/>
         <source>Freq 1</source>
-        <translation type="unfinished"></translation>
+        <translation>Freq 1</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -2798,7 +2473,7 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
         <location line="+908"/>
         <location line="+577"/>
         <source>Fixed Frequency</source>
-        <translation type="unfinished"></translation>
+        <translation>Fixed Frequency</translation>
     </message>
     <message>
         <location line="-1784"/>
@@ -2806,7 +2481,7 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
         <location line="+908"/>
         <location line="+577"/>
         <source>Toggle Fix Frequency</source>
-        <translation type="unfinished"></translation>
+        <translation>Toggle Fix Frequency</translation>
     </message>
     <message>
         <location line="-1797"/>
@@ -2814,12 +2489,12 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
         <location line="+908"/>
         <location line="+577"/>
         <source>FIX</source>
-        <translation type="unfinished"></translation>
+        <translation>FIX</translation>
     </message>
     <message>
         <location line="-1790"/>
         <source>OUT 1</source>
-        <translation type="unfinished"></translation>
+        <translation>OUT 1</translation>
     </message>
     <message>
         <location line="+12"/>
@@ -2827,7 +2502,7 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
         <location line="+641"/>
         <location line="+841"/>
         <source>Output Volume</source>
-        <translation type="unfinished"></translation>
+        <translation>Output Volume</translation>
     </message>
     <message>
         <location line="-1898"/>
@@ -2837,381 +2512,381 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
         <location line="+803"/>
         <location line="+2768"/>
         <source>Volume</source>
-        <translation type="unfinished">Volumen</translation>
+        <translation>Volume</translation>
     </message>
     <message>
         <location line="-5453"/>
         <source>Op &amp;2</source>
-        <translation type="unfinished"></translation>
+        <translation>Op &amp;2</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Amplitude Envelope 2</source>
-        <translation type="unfinished"></translation>
+        <translation>Amplitude Envelope 2</translation>
     </message>
     <message>
         <location line="+28"/>
         <source>D1R2</source>
-        <translation type="unfinished"></translation>
+        <translation>D1R2</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>D1L2</source>
-        <translation type="unfinished"></translation>
+        <translation>D1L2</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>D2R2</source>
-        <translation type="unfinished"></translation>
+        <translation>D2R2</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>RR2</source>
-        <translation type="unfinished"></translation>
+        <translation>RR2</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>AR2</source>
-        <translation type="unfinished"></translation>
+        <translation>AR2</translation>
     </message>
     <message>
         <location line="+72"/>
         <source>Frequency 2</source>
-        <translation type="unfinished"></translation>
+        <translation>Frequency 2</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Coarse 2</source>
-        <translation type="unfinished"></translation>
+        <translation>Coarse 2</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Fine 2</source>
-        <translation type="unfinished"></translation>
+        <translation>Fine 2</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Freq 2</source>
-        <translation type="unfinished"></translation>
+        <translation>Freq 2</translation>
     </message>
     <message>
         <location line="+39"/>
         <source>Scaling 2</source>
-        <translation type="unfinished"></translation>
+        <translation>Scaling 2</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>LS2</source>
-        <translation type="unfinished"></translation>
+        <translation>LS2</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>RS2</source>
-        <translation type="unfinished"></translation>
+        <translation>RS2</translation>
     </message>
     <message>
         <location line="+83"/>
         <source>OUT 2</source>
-        <translation type="unfinished"></translation>
+        <translation>OUT 2</translation>
     </message>
     <message>
         <location line="+50"/>
         <source>Detune, OSCWave, EGShift 2</source>
-        <translation type="unfinished"></translation>
+        <translation>Detune, OSCWave, EGShift 2</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>DET2</source>
-        <translation type="unfinished"></translation>
+        <translation>DET2</translation>
     </message>
     <message>
         <location line="+182"/>
         <source>Sensitivity 2</source>
-        <translation type="unfinished"></translation>
+        <translation>Sensitivity 2</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>EBS2</source>
-        <translation type="unfinished"></translation>
+        <translation>EBS2</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>KVS2</source>
-        <translation type="unfinished"></translation>
+        <translation>KVS2</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>AME2</source>
-        <translation type="unfinished"></translation>
+        <translation>AME2</translation>
     </message>
     <message>
         <location line="+72"/>
         <source>Op &amp;3</source>
-        <translation type="unfinished"></translation>
+        <translation>Op &amp;3</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Amplitude Envelope 3</source>
-        <translation type="unfinished"></translation>
+        <translation>Amplitude Envelope 3</translation>
     </message>
     <message>
         <location line="+28"/>
         <source>D1R3</source>
-        <translation type="unfinished"></translation>
+        <translation>D1R3</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>D1L3</source>
-        <translation type="unfinished"></translation>
+        <translation>D1L3</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>D2R3</source>
-        <translation type="unfinished"></translation>
+        <translation>D2R3</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>RR3</source>
-        <translation type="unfinished"></translation>
+        <translation>RR3</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>AR3</source>
-        <translation type="unfinished"></translation>
+        <translation>AR3</translation>
     </message>
     <message>
         <location line="+72"/>
         <source>Scaling 3</source>
-        <translation type="unfinished"></translation>
+        <translation>Scaling 3</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>LS3</source>
-        <translation type="unfinished"></translation>
+        <translation>LS3</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>RS3</source>
-        <translation type="unfinished"></translation>
+        <translation>RS3</translation>
     </message>
     <message>
         <location line="+80"/>
         <source>OUT 3</source>
-        <translation type="unfinished"></translation>
+        <translation>OUT 3</translation>
     </message>
     <message>
         <location line="+50"/>
         <source>Frequency 3</source>
-        <translation type="unfinished"></translation>
+        <translation>Frequency 3</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Coarse 3</source>
-        <translation type="unfinished"></translation>
+        <translation>Coarse 3</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Fine 3</source>
-        <translation type="unfinished"></translation>
+        <translation>Fine 3</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Freq 3</source>
-        <translation type="unfinished"></translation>
+        <translation>Freq 3</translation>
     </message>
     <message>
         <location line="+39"/>
         <source>Detune, OSCWave, EGShift 3</source>
-        <translation type="unfinished"></translation>
+        <translation>Detune, OSCWave, EGShift 3</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>DET3</source>
-        <translation type="unfinished"></translation>
+        <translation>DET3</translation>
     </message>
     <message>
         <location line="+182"/>
         <source>Sensitivity 3</source>
-        <translation type="unfinished"></translation>
+        <translation>Sensitivity 3</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>EBS3</source>
-        <translation type="unfinished"></translation>
+        <translation>EBS3</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>KVS3</source>
-        <translation type="unfinished"></translation>
+        <translation>KVS3</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>AME3</source>
-        <translation type="unfinished"></translation>
+        <translation>AME3</translation>
     </message>
     <message>
         <location line="+72"/>
         <source>Op &amp;4</source>
-        <translation type="unfinished"></translation>
+        <translation>Op &amp;4</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>amplitude Envelope 4</source>
-        <translation type="unfinished"></translation>
+        <translation>amplitude Envelope 4</translation>
     </message>
     <message>
         <location line="+28"/>
         <source>AR4</source>
-        <translation type="unfinished"></translation>
+        <translation>AR4</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>D1R4</source>
-        <translation type="unfinished"></translation>
+        <translation>D1R4</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>D1L4</source>
-        <translation type="unfinished"></translation>
+        <translation>D1L4</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>D2R4</source>
-        <translation type="unfinished"></translation>
+        <translation>D2R4</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>RR4</source>
-        <translation type="unfinished"></translation>
+        <translation>RR4</translation>
     </message>
     <message>
         <location line="+72"/>
         <source>Frequency 4</source>
-        <translation type="unfinished"></translation>
+        <translation>Frequency 4</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Coarse 4</source>
-        <translation type="unfinished"></translation>
+        <translation>Coarse 4</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Fine 4</source>
-        <translation type="unfinished"></translation>
+        <translation>Fine 4</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Freq 4</source>
-        <translation type="unfinished"></translation>
+        <translation>Freq 4</translation>
     </message>
     <message>
         <location line="+39"/>
         <source>Scaling 4</source>
-        <translation type="unfinished"></translation>
+        <translation>Scaling 4</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>LS4</source>
-        <translation type="unfinished"></translation>
+        <translation>LS4</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>RS4</source>
-        <translation type="unfinished"></translation>
+        <translation>RS4</translation>
     </message>
     <message>
         <location line="+80"/>
         <source>OUT 4</source>
-        <translation type="unfinished"></translation>
+        <translation>OUT 4</translation>
     </message>
     <message>
         <location line="+50"/>
         <source>Detune, OSCWave, EGShift 4</source>
-        <translation type="unfinished"></translation>
+        <translation>Detune, OSCWave, EGShift 4</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>DET4</source>
-        <translation type="unfinished"></translation>
+        <translation>DET4</translation>
     </message>
     <message>
         <location line="+182"/>
         <source>Sensitivity 4</source>
-        <translation type="unfinished"></translation>
+        <translation>Sensitivity 4</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>EBS4</source>
-        <translation type="unfinished"></translation>
+        <translation>EBS4</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>KVS4</source>
-        <translation type="unfinished"></translation>
+        <translation>KVS4</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>AME4</source>
-        <translation type="unfinished"></translation>
+        <translation>AME4</translation>
     </message>
     <message>
         <location line="+72"/>
         <source>&amp;Func</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Func</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Delay Pan Depth</source>
-        <translation type="unfinished"></translation>
+        <translation>Delay Pan Depth</translation>
     </message>
     <message>
         <location line="+34"/>
         <source>Delay Pan LFO Freq</source>
-        <translation type="unfinished"></translation>
+        <translation>Delay Pan LFO Freq</translation>
     </message>
     <message>
         <location line="+53"/>
         <source>Delay Ch Send Level </source>
-        <translation type="unfinished"></translation>
+        <translation>Delay Ch Send Level </translation>
     </message>
     <message>
         <location line="+22"/>
         <location line="+1123"/>
         <location line="+215"/>
         <source>Channel Chorus</source>
-        <translation type="unfinished"></translation>
+        <translation>Channel Chorus</translation>
     </message>
     <message>
         <location line="-1316"/>
         <source>Delay Feedback</source>
-        <translation type="unfinished"></translation>
+        <translation>Delay Feedback</translation>
     </message>
     <message>
         <location line="+44"/>
         <source>Delay On/Off, Return Level</source>
-        <translation type="unfinished"></translation>
+        <translation>Delay On/Off, Return Level</translation>
     </message>
     <message>
         <location line="+15"/>
         <location line="+1079"/>
         <location line="+92"/>
         <source>On</source>
-        <translation type="unfinished">Encendido</translation>
+        <translation>On</translation>
     </message>
     <message>
         <location line="-1142"/>
         <source>Delay Beat Ratio</source>
-        <translation type="unfinished"></translation>
+        <translation>Delay Beat Ratio</translation>
     </message>
     <message>
         <location line="+50"/>
         <source>Delay BPM</source>
-        <translation type="unfinished"></translation>
+        <translation>Delay BPM</translation>
     </message>
     <message>
         <location line="+51"/>
         <source>Foot Control</source>
-        <translation type="unfinished"></translation>
+        <translation>Foot Control</translation>
     </message>
     <message>
         <location line="+12"/>
@@ -3244,7 +2919,7 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
         <location line="+15"/>
         <location line="+22"/>
         <source>Pitch Bend Range</source>
-        <translation type="unfinished"></translation>
+        <translation>Pitch Bend Range</translation>
     </message>
     <message>
         <location line="-703"/>
@@ -3252,7 +2927,7 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
         <location line="+91"/>
         <location line="+140"/>
         <source>Pitch</source>
-        <translation type="unfinished">Tono</translation>
+        <translation>Pitch</translation>
     </message>
     <message>
         <location line="-378"/>
@@ -3260,346 +2935,346 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
         <location line="+143"/>
         <location line="+217"/>
         <source>Amplitude</source>
-        <translation type="unfinished"></translation>
+        <translation>Amplitude</translation>
     </message>
     <message>
         <location line="-448"/>
         <source>Modulation Wheel</source>
-        <translation type="unfinished"></translation>
+        <translation>Modulation Wheel</translation>
     </message>
     <message>
         <location line="+109"/>
         <source>Breath Control</source>
-        <translation type="unfinished"></translation>
+        <translation>Breath Control</translation>
     </message>
     <message>
         <location line="+96"/>
         <location line="+230"/>
         <source>Pitch Bias</source>
-        <translation type="unfinished"></translation>
+        <translation>Pitch Bias</translation>
     </message>
     <message>
         <location line="-217"/>
         <location line="+243"/>
         <source>Envelope Bias</source>
-        <translation type="unfinished"></translation>
+        <translation>Envelope Bias</translation>
     </message>
     <message>
         <location line="-147"/>
         <source>After Touch</source>
-        <translation type="unfinished">After Touch</translation>
+        <translation>After Touch</translation>
     </message>
     <message>
         <location line="+208"/>
         <source>Phony Mode</source>
-        <translation type="unfinished"></translation>
+        <translation>Phony Mode</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>POLY</source>
-        <translation type="unfinished"></translation>
+        <translation>POLY</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>MONO</source>
-        <translation type="unfinished"></translation>
+        <translation>MONO</translation>
     </message>
     <message>
         <location line="+61"/>
         <source>Potamento</source>
-        <translation type="unfinished"></translation>
+        <translation>Portamento</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Portamento Mode</source>
-        <translation type="unfinished"></translation>
+        <translation>Portamento Mode</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>FINGER</source>
-        <translation type="unfinished"></translation>
+        <translation>FINGER</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>FULL</source>
-        <translation type="unfinished"></translation>
+        <translation>FULL</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>PT</source>
-        <translation type="unfinished"></translation>
+        <translation>PT</translation>
     </message>
     <message>
         <location line="+13"/>
         <location line="+25"/>
         <source>Portamento Time</source>
-        <translation type="unfinished"></translation>
+        <translation>Portamento Time</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>C&amp;horus</source>
-        <translation type="unfinished"></translation>
+        <translation>C&amp;horus</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Chorus Parameters</source>
-        <translation type="unfinished"></translation>
+        <translation>Chorus Parameters</translation>
     </message>
     <message>
         <location line="+21"/>
         <location line="+215"/>
         <source>Channel send level</source>
-        <translation type="unfinished"></translation>
+        <translation>Channel send level</translation>
     </message>
     <message>
         <location line="-171"/>
         <location line="+92"/>
         <source>On/Off and Return level</source>
-        <translation type="unfinished"></translation>
+        <translation>On/Off and Return level</translation>
     </message>
     <message>
         <location line="-48"/>
         <location line="+92"/>
         <source>Select LADSPA plugin</source>
-        <translation type="unfinished"></translation>
+        <translation>Select LADSPA plugin</translation>
     </message>
     <message>
         <location line="-80"/>
         <location line="+92"/>
         <source>Change plugin</source>
-        <translation type="unfinished"></translation>
+        <translation>Cambiar efecto</translation>
     </message>
     <message>
         <location line="-74"/>
         <source>&amp;Reverb</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Reverb</translation>
     </message>
     <message>
         <location line="+135"/>
         <source>Reverb Parameters</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+8"/>
         <source>&amp;Config</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Configuración</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Font Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Tamaño de fuente</translation>
     </message>
     <message>
         <location line="+28"/>
         <source>Quality</source>
-        <translation type="unfinished"></translation>
+        <translation>Calidad</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>High</source>
-        <translation type="unfinished"></translation>
+        <translation>Alta</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Middle</source>
-        <translation type="unfinished"></translation>
+        <translation>Media</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Low</source>
-        <translation type="unfinished"></translation>
+        <translation>Baja</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Ultra low</source>
-        <translation type="unfinished"></translation>
+        <translation>Muy baja</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Filter</source>
-        <translation type="unfinished"></translation>
+        <translation>Filtro</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Save Mode (into the song)</source>
-        <translation type="unfinished"></translation>
+        <translation>Guardar modo (en la sesión)</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Save only the used presets</source>
-        <translation type="unfinished"></translation>
+        <translation>Guardar solo el preseteo</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Save the entire set</source>
-        <translation type="unfinished"></translation>
+        <translation>Guardar todas las configuraciones</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Save the configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>Guardar configuración</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Configuration File</source>
-        <translation type="unfinished"></translation>
+        <translation>Archivo de configuración</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Save...</source>
-        <translation type="unfinished"></translation>
+        <translation>Guardar...</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Load...</source>
-        <translation type="unfinished"></translation>
+        <translation>Abrir...</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Save as default</source>
-        <translation type="unfinished"></translation>
+        <translation>Guardar por defecto</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Colors</source>
-        <translation type="unfinished">Colores</translation>
+        <translation>Colores</translation>
     </message>
     <message>
         <location line="+38"/>
         <source>Text</source>
-        <translation type="unfinished">Texto</translation>
+        <translation>Texto</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Background</source>
-        <translation type="unfinished"></translation>
+        <translation>Fondo</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Edit Text</source>
-        <translation type="unfinished"></translation>
+        <translation>Editar texro</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Edit Background</source>
-        <translation type="unfinished"></translation>
+        <translation>Editar fondo</translation>
     </message>
     <message>
         <location line="+8"/>
         <location line="+45"/>
         <location line="+71"/>
         <source>Red</source>
-        <translation type="unfinished"></translation>
+        <translation>Rojo</translation>
     </message>
     <message>
         <location line="-103"/>
         <location line="+51"/>
         <location line="+26"/>
         <source>Blue</source>
-        <translation type="unfinished"></translation>
+        <translation>Azúl</translation>
     </message>
     <message>
         <location line="-61"/>
         <location line="+45"/>
         <location line="+29"/>
         <source>Green</source>
-        <translation type="unfinished"></translation>
+        <translation>Verde</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Set Path</source>
-        <translation type="unfinished"></translation>
+        <translation>Ajustes de la ruta</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Image in the background :</source>
-        <translation type="unfinished"></translation>
+        <translation>Imagen de fondo:</translation>
     </message>
     <message>
         <location line="+20"/>
         <location line="+14"/>
         <source>Browse...</source>
-        <translation type="unfinished"></translation>
+        <translation>Buscar...</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Load the set at the initialization :</source>
-        <translation type="unfinished"></translation>
+        <translation>Cargar al iniciar</translation>
     </message>
     <message>
         <location line="+503"/>
         <source>Set Brightness, Detune, Attack and Release of the current channel to default</source>
-        <translation type="unfinished"></translation>
+        <translation>Ajustes de Brightness, Detune, Attack y Release del canal actual por defecto</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Res. Ctrl</source>
-        <translation type="unfinished"></translation>
+        <translation>Reestablecer</translation>
     </message>
     <message>
         <location line="+493"/>
         <source>Cut all notes off</source>
-        <translation type="unfinished"></translation>
+        <translation>Apaga todas las notas</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Panic!</source>
-        <translation type="unfinished"></translation>
+        <translation>Pánico!</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Number of Voices</source>
-        <translation type="unfinished"></translation>
+        <translation>Número de voces</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>Number of voices</source>
-        <translation type="unfinished"></translation>
+        <translation>Número de voces</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Enable</source>
-        <translation type="unfinished"></translation>
+        <translation>Habilitado</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Channel</source>
-        <translation type="unfinished">Canal</translation>
+        <translation>Canal</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Vol</source>
-        <translation type="unfinished"></translation>
+        <translation>Volumen</translation>
     </message>
     <message>
         <location line="+44"/>
         <source>Channel Ctrl</source>
-        <translation type="unfinished"></translation>
+        <translation> Controlador de canal </translation>
     </message>
     <message>
         <location line="+37"/>
         <source>Release</source>
-        <translation type="unfinished">Relajación</translation>
+        <translation>Release</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>Attack</source>
-        <translation type="unfinished">Ataque</translation>
+        <translation>Ataque</translation>
     </message>
     <message>
         <location line="+52"/>
         <source>Brightness</source>
-        <translation type="unfinished"></translation>
+        <translation>Brillo</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>Modulation</source>
-        <translation type="unfinished"></translation>
+        <translation>Modulación</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>Pan</source>
-        <translation type="unfinished"></translation>
+        <translation>Panorámica</translation>
     </message>
 </context>
 <context>
@@ -3607,42 +3282,42 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
     <message>
         <location filename="../../muse/widgets/function_dialogs/deloverlapsbase.ui" line="+17"/>
         <source>MusE: Delete Overlaps</source>
-        <translation type="unfinished"></translation>
+        <translation>MusE: Borrar superpuestos</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Range</source>
-        <translation type="unfinished">Rango</translation>
+        <translation>Rango</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>All Events</source>
-        <translation type="unfinished">Todos los eventos</translation>
+        <translation>Todos los eventos</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Selected Events</source>
-        <translation type="unfinished">Eventos seleccionados</translation>
+        <translation>Eventos seleccionados</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Looped Events</source>
-        <translation type="unfinished"></translation>
+        <translation>Bucle de eventos</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Selected Looped</source>
-        <translation type="unfinished"></translation>
+        <translation>Selecionar bucle</translation>
     </message>
     <message>
         <location line="+44"/>
         <source>OK</source>
-        <translation type="unfinished">Aceptar</translation>
+        <translation>Aceptar</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Cancel</source>
-        <translation type="unfinished">Cancelar</translation>
+        <translation>Cancelar</translation>
     </message>
 </context>
 <context>
@@ -3650,423 +3325,216 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
     <message>
         <location filename="../../muse/widgets/didyouknow.ui" line="+14"/>
         <source>Did you know?</source>
-        <translation type="unfinished"></translation>
+        <translation>¿Sabia usted que?</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Don&apos;t show on startup</source>
-        <translation type="unfinished"></translation>
+        <translation>No volver a mostrar</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Next tip</source>
-        <translation type="unfinished"></translation>
+        <translation>Siguiente sugerencia</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Close</source>
-        <translation type="unfinished">Cerrar</translation>
+        <translation>Cerrar</translation>
     </message>
 </context>
 <context>
     <name>DrumEdit</name>
     <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="+183"/>
         <source>Load Map</source>
-        <translation type="unfinished">Carga Mapa</translation>
+        <translation type="obsolete">Carga Mapa</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Save Map</source>
-        <translation type="unfinished">Guarda Mapa</translation>
+        <translation type="obsolete">Guarda Mapa</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>&amp;Edit</source>
-        <translation type="unfinished">&amp;Editar</translation>
+        <translation type="obsolete">&amp;Editar</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Cut</source>
-        <translation type="unfinished">Cortar</translation>
+        <translation type="obsolete">Cortar</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Copy</source>
-        <translation type="unfinished">Copiar</translation>
+        <translation type="obsolete">Copiar</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Paste</source>
-        <translation type="unfinished">Pegar</translation>
+        <translation type="obsolete">Pegar</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Delete Events</source>
-        <translation type="unfinished">Borrar Eventos</translation>
+        <translation type="obsolete">Borrar Eventos</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Select All</source>
-        <translation type="unfinished">Seleccionar todo</translation>
+        <translation type="obsolete">Seleccionar todo</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Select None</source>
-        <translation type="unfinished">Deseleccionar</translation>
+        <translation type="obsolete">Deseleccionar</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Invert</source>
-        <translation type="unfinished">Invertir</translation>
+        <translation type="obsolete">Invertir</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Inside Loop</source>
-        <translation type="unfinished">Bucle interior</translation>
+        <translation type="obsolete">Bucle interior</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Outside Loop</source>
-        <translation type="unfinished">Bucle exterior</translation>
+        <translation type="obsolete">Bucle exterior</translation>
     </message>
     <message>
-        <location line="-7"/>
         <source>&amp;Select</source>
-        <translation type="unfinished">&amp;Seleccionar</translation>
+        <translation type="obsolete">&amp;Seleccionar</translation>
     </message>
     <message>
-        <location line="+99"/>
         <source>Step Record</source>
-        <translation type="unfinished">Parar captura</translation>
+        <translation type="obsolete">Parar captura</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Midi Input</source>
-        <translation type="unfinished">Entrada MIDI</translation>
+        <translation type="obsolete">Entrada MIDI</translation>
     </message>
     <message>
-        <location line="+57"/>
         <source>Add Controller View</source>
-        <translation type="unfinished">Agregar Controlador</translation>
+        <translation type="obsolete">Agregar Controlador</translation>
     </message>
     <message>
-        <location line="+57"/>
         <source>M</source>
-        <translation type="unfinished">M</translation>
+        <translation type="obsolete">M</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Sound</source>
-        <translation type="unfinished">Sonido</translation>
+        <translation type="obsolete">Sonido</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>QNT</source>
-        <translation type="unfinished">QNT</translation>
+        <translation type="obsolete">QNT</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>E-Note</source>
-        <translation type="unfinished">Nota-E</translation>
+        <translation type="obsolete">Nota-E</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Len</source>
-        <translation type="unfinished">Longitud</translation>
+        <translation type="obsolete">Longitud</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A-Note</source>
-        <translation type="unfinished">Nota-A</translation>
+        <translation type="obsolete">Nota-A</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Ch</source>
-        <translation type="unfinished">Ch</translation>
+        <translation type="obsolete">Ch</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Port</source>
-        <translation type="unfinished">Puerto</translation>
+        <translation type="obsolete">Puerto</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>LV1</source>
-        <translation type="unfinished">VL1</translation>
+        <translation type="obsolete">VL1</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>LV2</source>
-        <translation type="unfinished">VL2</translation>
+        <translation type="obsolete">VL2</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>LV3</source>
-        <translation type="unfinished">VL3</translation>
+        <translation type="obsolete">VL3</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>LV4</source>
-        <translation type="unfinished">VL4</translation>
+        <translation type="obsolete">VL4</translation>
     </message>
     <message>
-        <location line="-271"/>
         <source>&amp;File</source>
-        <translation type="unfinished">&amp;Fichero</translation>
+        <translation type="obsolete">&amp;Fichero</translation>
     </message>
     <message>
-        <location line="+121"/>
         <source>Load Drummap</source>
-        <translation type="unfinished">Cargar mapa de percusión</translation>
+        <translation type="obsolete">Cargar mapa de percusión</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Store Drummap</source>
-        <translation type="unfinished">Guardar mapa de percusión</translation>
+        <translation type="obsolete">Guardar mapa de percusión</translation>
     </message>
     <message>
-        <location line="+68"/>
         <source>ctrl</source>
-        <translation type="unfinished">control</translation>
+        <translation type="obsolete">control</translation>
     </message>
     <message>
         <source>drummaps</source>
         <translation type="obsolete">mapas de percusión</translation>
     </message>
     <message>
-        <location line="+449"/>
         <source>Muse: Load Drum Map</source>
-        <translation type="unfinished">MusE: Cargar mapa de percusión</translation>
+        <translation type="obsolete">MusE: Cargar mapa de percusión</translation>
     </message>
     <message>
-        <location line="+53"/>
         <source>MusE: Store Drum Map</source>
-        <translation type="unfinished">MusE: Guardar mapa de percusión</translation>
+        <translation type="obsolete">MusE: Guardar mapa de percusión</translation>
     </message>
     <message>
         <source>&amp;Functions</source>
         <translation type="obsolete">&amp;Funciones</translation>
     </message>
     <message>
-        <location line="-619"/>
-        <source>Modify Velocity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-148"/>
-        <location line="+21"/>
         <source>mute instrument</source>
-        <translation type="unfinished">silenciar instrumento</translation>
+        <translation type="obsolete">silenciar instrumento</translation>
     </message>
     <message>
-        <location line="-20"/>
-        <location line="+21"/>
         <source>sound name</source>
-        <translation type="unfinished">nombre del sonido</translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <location line="+21"/>
-        <source>volume percent</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">nombre del sonido</translation>
     </message>
     <message>
-        <location line="-20"/>
-        <location line="+21"/>
         <source>quantisation</source>
-        <translation type="unfinished">cuantización</translation>
+        <translation type="obsolete">cuantización</translation>
     </message>
     <message>
-        <location line="-20"/>
-        <location line="+21"/>
         <source>this input note triggers the sound</source>
-        <translation type="unfinished">ensta nota de entrada dispara el sonido</translation>
+        <translation type="obsolete">ensta nota de entrada dispara el sonido</translation>
     </message>
     <message>
-        <location line="-20"/>
-        <location line="+21"/>
         <source>note length</source>
-        <translation type="unfinished">longitud de nota</translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <location line="+21"/>
-        <source>this is the note which is played</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <source>output channel (hold ctl to affect all rows)</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">longitud de nota</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+21"/>
         <source>output port</source>
-        <translation type="unfinished">puerto de salida</translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <location line="+21"/>
-        <source>shift + control key: draw velocity level 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <location line="+21"/>
-        <source>control key: draw velocity level 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <location line="+21"/>
-        <source>shift key: draw velocity level 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <location line="+21"/>
-        <source>draw velocity level 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-5"/>
-        <source>output channel (ctl: affect all rows)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+46"/>
-        <source>Reset GM Map</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <source>Copy events in range</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Paste (with Dialog)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+29"/>
-        <source>Previous Part</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Next Part</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
-        <source>Fu&amp;nctions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Re-order list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Set Fixed Length</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Crescendo/Decrescendo</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">puerto de salida</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Quantize</source>
-        <translation type="unfinished">Cuantizar</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Erase Event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Move Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Delete Overlaps</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>&amp;Plugins</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Drum tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+37"/>
-        <source>cursor tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Set step size for cursor edit</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Cuantizar</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>panic</source>
-        <translation type="unfinished">pánico</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>transport</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+84"/>
-        <source>Vol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+461"/>
-        <source>Drum map</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Reset the drum map with GM defaults?</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">pánico</translation>
     </message>
 </context>
 <context>
     <name>EditCAfterDialog</name>
     <message>
-        <location filename="../../muse/liste/editevent.cpp" line="+445"/>
         <source>Time Position</source>
-        <translation type="unfinished">Posición de tiempo</translation>
+        <translation type="obsolete">Posición de tiempo</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Pressure</source>
-        <translation type="unfinished">Presión</translation>
+        <translation type="obsolete">Presión</translation>
     </message>
     <message>
-        <location line="-6"/>
         <source>MusE: Enter Channel Aftertouch</source>
-        <translation type="unfinished">MusE: Introduce el AfterTouch del canal</translation>
+        <translation type="obsolete">MusE: Introduce el AfterTouch del canal</translation>
     </message>
 </context>
 <context>
@@ -4147,86 +3615,84 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
     <message>
         <location filename="../../muse/liste/editctrlbase.ui" line="+14"/>
         <source>MusE: Edit Controller Event</source>
-        <translation type="unfinished"></translation>
+        <translation>MusE:-Editar eventos de control</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Time Position</source>
-        <translation type="unfinished">Posición de tiempo</translation>
+        <translation>Posición de tiempo</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Available Controller:</source>
-        <translation type="unfinished"></translation>
+        <translation>Control disponible</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Create New Controller</source>
-        <translation type="unfinished"></translation>
+        <translation>Crear nuevo control</translation>
     </message>
     <message>
         <location line="+486"/>
         <source>textLabel3</source>
-        <translation type="unfinished"></translation>
+        <translation>textLabel3</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Value</source>
-        <translation type="unfinished">Valor</translation>
+        <translation>Valor</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Controller</source>
-        <translation type="unfinished">Controlador</translation>
+        <translation>Controlador</translation>
     </message>
     <message>
         <location line="+45"/>
         <source>H-Bank</source>
-        <translation type="unfinished">Banco-H</translation>
+        <translation>Banco-H</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>L-Bank</source>
-        <translation type="unfinished">Banco-L</translation>
+        <translation>Banco-L</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Program</source>
-        <translation type="unfinished"></translation>
+        <translation>Programa</translation>
     </message>
     <message>
         <location line="+10"/>
         <location line="+16"/>
         <source>off</source>
-        <translation type="unfinished">apagado</translation>
+        <translation>apagado</translation>
     </message>
     <message>
         <location line="+42"/>
         <source>pushButton4</source>
-        <translation type="unfinished"></translation>
+        <translation>pushButton4</translation>
     </message>
     <message>
         <location line="+35"/>
         <source>&amp;OK</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Aceptar</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>&amp;Cancel</source>
-        <translation type="unfinished">&amp;Cancelar</translation>
+        <translation>&amp;Cancelar</translation>
     </message>
 </context>
 <context>
     <name>EditEventDialog</name>
     <message>
-        <location filename="../../muse/liste/editevent.cpp" line="-255"/>
         <source>Ok</source>
-        <translation type="unfinished">Aceptar</translation>
+        <translation type="obsolete">Aceptar</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Cancel</source>
-        <translation type="unfinished">Cancelar</translation>
+        <translation type="obsolete">Cancelar</translation>
     </message>
 </context>
 <context>
@@ -4234,236 +3700,80 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
     <message>
         <location filename="../../muse/waveedit/editgainbase.ui" line="+14"/>
         <source>MusE: Modify gain</source>
-        <translation type="unfinished"></translation>
+        <translation>MusE:-Modificar ganancia</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Gain</source>
-        <translation type="unfinished">Ganancia</translation>
+        <translation>Ganancia</translation>
     </message>
     <message>
         <location line="+51"/>
         <source>200%</source>
-        <translation type="unfinished">5 1/3&apos; {200%?}</translation>
+        <translation>200%</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>100%</source>
-        <translation type="unfinished">5 1/3&apos; {100%?}</translation>
+        <translation>100%</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>0%</source>
-        <translation type="unfinished">5 1/3&apos; {0%?}</translation>
+        <translation>0%</translation>
     </message>
     <message>
         <location line="+51"/>
         <source>&amp;Reset</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Resetear</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Alt+R</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt+R</translation>
     </message>
     <message>
         <location line="+39"/>
         <source>&amp;Apply</source>
-        <translation type="unfinished">&amp;Aplicar</translation>
+        <translation>&amp;Aplicar</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Alt+A</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt+A</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>&amp;Cancel</source>
-        <translation type="unfinished">&amp;Cancelar</translation>
+        <translation>&amp;Cancelar</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Alt+C</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt+C</translation>
     </message>
 </context>
 <context>
     <name>EditInstrument</name>
     <message>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="+311"/>
-        <location line="+34"/>
-        <source>MusE: Create file failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+33"/>
         <source>MusE: Write File failed</source>
-        <translation type="unfinished">MusE: La captura del archivo ha fallado</translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <location line="+12"/>
-        <location line="+280"/>
-        <location line="+12"/>
-        <source>MusE:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-303"/>
-        <location line="+292"/>
-        <source>The user instrument directory
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-292"/>
-        <location line="+292"/>
-        <source>
-does not exist yet. Create it now?
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-291"/>
-        <location line="+292"/>
-        <source>(You can change the user instruments directory at Settings-&gt;Global Settings-&gt;Midi)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-282"/>
-        <location line="+292"/>
-        <source>Unable to create user instrument directory
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-244"/>
-        <location line="+266"/>
-        <source>MusE: Save Instrument Definition</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-265"/>
-        <location line="+266"/>
-        <source>Instrument Definition (*.idf)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-154"/>
-        <location line="+29"/>
-        <source>MusE: Save instrument as</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-29"/>
-        <source>Enter a new unique instrument name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+30"/>
-        <source>The user instrument:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>
-already exists. This will overwrite its .idf instrument file.
-Are you sure?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+525"/>
-        <source>MusE: Bad instrument name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Please choose a unique instrument name.
-(The name might be used by a hidden instrument.)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+136"/>
-        <source>MusE: Bad patch name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Please choose a unique patch name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
-        <source>MusE: Bad patchgroup name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Please choose a unique patchgroup name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+526"/>
-        <source>MusE: Bad controller name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Please choose a unique controller name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1287"/>
-        <location line="+12"/>
-        <source>MusE: Cannot add common controller</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-11"/>
-        <source>A controller named </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <location line="+12"/>
-        <source> already exists.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>A controller number </source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">MusE: La captura del archivo ha fallado</translation>
     </message>
     <message>
-        <location line="+283"/>
-        <location line="+5"/>
         <source>MusE</source>
-        <translation type="unfinished">MusE</translation>
-    </message>
-    <message>
-        <location line="-4"/>
-        <location line="+5"/>
-        <source>The current Instrument contains unsaved data
-Save Current Instrument?</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">MusE</translation>
     </message>
     <message>
-        <location line="-3"/>
-        <location line="+5"/>
         <source>&amp;Save</source>
-        <translation type="unfinished">&amp;Guardar</translation>
+        <translation type="obsolete">&amp;Guardar</translation>
     </message>
     <message>
-        <location line="-5"/>
-        <location line="+5"/>
         <source>&amp;Nosave</source>
-        <translation type="unfinished">&amp;No Guardar</translation>
+        <translation type="obsolete">&amp;No Guardar</translation>
     </message>
     <message>
-        <location line="-5"/>
         <source>&amp;Abort</source>
-        <translation type="unfinished">&amp;Abortar</translation>
+        <translation type="obsolete">&amp;Abortar</translation>
     </message>
 </context>
 <context>
@@ -4471,56 +3781,56 @@ Save Current Instrument?</source>
     <message>
         <location filename="../../muse/instruments/editinstrumentbase.ui" line="+20"/>
         <source>MusE: Instrument Editor</source>
-        <translation type="unfinished"></translation>
+        <translation>MusE: Editro de Instrumento</translation>
     </message>
     <message>
         <location line="+119"/>
         <source>High Bank:</source>
-        <translation type="unfinished"></translation>
+        <translation>Banco superior:</translation>
     </message>
     <message>
         <location line="+52"/>
         <source>Low Bank:</source>
-        <translation type="unfinished"></translation>
+        <translation>Banco inferior:</translation>
     </message>
     <message>
         <location line="+52"/>
         <source>Program:</source>
-        <translation type="unfinished"></translation>
+        <translation>Programa:</translation>
     </message>
     <message>
         <location line="+141"/>
         <location line="+747"/>
         <location line="+201"/>
         <source>&amp;Delete</source>
-        <translation type="unfinished">&amp;Borrar</translation>
+        <translation>&amp;Borrar</translation>
     </message>
     <message>
         <location line="-945"/>
         <location line="+747"/>
         <location line="+201"/>
         <source>Alt+D</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt+D</translation>
     </message>
     <message>
         <location line="-1035"/>
         <source>Drum</source>
-        <translation type="unfinished">Percusión</translation>
+        <translation>Percusión</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>GM</source>
-        <translation type="unfinished">GM</translation>
+        <translation>GM</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>GS</source>
-        <translation type="unfinished">GS</translation>
+        <translation>GS</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>XG</source>
-        <translation type="unfinished">XG</translation>
+        <translation>XG</translation>
     </message>
     <message>
         <source>Controller</source>
@@ -4531,13 +3841,15 @@ Save Current Instrument?</source>
         <source>This is a list of commonly used midi controllers.
 Note that in MusE pitch and program changes are
 handled like normal controllers.</source>
-        <translation type="unfinished"></translation>
+        <translation>Lista de controladores MIDI de uso común
+Tenga en cuenta que en Muse cambios de tono
+y el programa se manejan como los controladores normales.</translation>
     </message>
     <message>
         <location line="-368"/>
         <location line="+441"/>
         <source>Properties</source>
-        <translation type="unfinished">Propiedades</translation>
+        <translation>Propiedades</translation>
     </message>
     <message>
         <source>Name</source>
@@ -4550,64 +3862,64 @@ handled like normal controllers.</source>
     <message>
         <location line="+49"/>
         <source>Control7</source>
-        <translation type="unfinished">Control7 :-?</translation>
+        <translation>Control7</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Control14</source>
-        <translation type="unfinished">Control14</translation>
+        <translation>Control14</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>RPN</source>
-        <translation type="unfinished">RPN</translation>
+        <translation>RPN</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>NRPN</source>
-        <translation type="unfinished">NRPN</translation>
+        <translation>NRPN</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Pitch</source>
-        <translation type="unfinished">Tono</translation>
+        <translation>Tono</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Program</source>
-        <translation type="unfinished"></translation>
+        <translation>Programa</translation>
     </message>
     <message>
         <location line="-118"/>
         <location line="+142"/>
         <source>H-Ctrl</source>
-        <translation type="unfinished">Control-H</translation>
+        <translation>Control-H</translation>
     </message>
     <message>
         <location line="-137"/>
         <location line="+191"/>
         <source>L-Ctrl</source>
-        <translation type="unfinished">Control-L</translation>
+        <translation>Control-L</translation>
     </message>
     <message>
         <location line="+79"/>
         <source>Min</source>
-        <translation type="unfinished"></translation>
+        <translation>Minimo</translation>
     </message>
     <message>
         <location line="+72"/>
         <source>Max</source>
-        <translation type="unfinished"></translation>
+        <translation>Máximo</translation>
     </message>
     <message>
         <location line="-357"/>
         <source>Name                  </source>
-        <translation type="unfinished">Nombre                  </translation>
+        <translation>Nombre                  </translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Type       </source>
-        <translation type="unfinished">Tipo                 </translation>
+        <translation>Tipo                 </translation>
     </message>
     <message>
         <source>SysEx</source>
@@ -4616,309 +3928,309 @@ handled like normal controllers.</source>
     <message>
         <location line="+802"/>
         <source>Hex Entry:</source>
-        <translation type="unfinished"></translation>
+        <translation>Hexadecimal:</translation>
     </message>
     <message>
         <location line="+90"/>
         <source>&amp;File</source>
-        <translation type="unfinished"></translation>
+        <translation>Archivo</translation>
     </message>
     <message>
         <location line="-27"/>
         <source>Tools</source>
-        <translation type="unfinished">Herramientas</translation>
+        <translation>Herramientas</translation>
     </message>
     <message>
         <location line="+49"/>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation>Nuevo</translation>
     </message>
     <message>
         <location line="-3"/>
         <source>&amp;New</source>
-        <translation type="unfinished">&amp;Nuevo</translation>
+        <translation>&amp;Nuevo</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Ctrl+N</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+N</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Open</source>
-        <translation type="unfinished">Abrir</translation>
+        <translation>Abrir</translation>
     </message>
     <message>
         <location line="-3"/>
         <source>&amp;Open...</source>
-        <translation type="unfinished">&amp;Abrir...</translation>
+        <translation>&amp;Abrir...</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Ctrl+O</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+O</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Save</source>
-        <translation type="unfinished">Guardar</translation>
+        <translation>Guardar</translation>
     </message>
     <message>
         <location line="-3"/>
         <source>&amp;Save</source>
-        <translation type="unfinished">&amp;Guardar</translation>
+        <translation>&amp;Guardar</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Ctrl+S</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+S</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Save As</source>
-        <translation type="unfinished">Guardar como</translation>
+        <translation>Guardar como</translation>
     </message>
     <message>
         <location line="-3"/>
         <source>Save &amp;As...</source>
-        <translation type="unfinished">Guardar &amp;Como...</translation>
+        <translation>Guardar &amp;Como...</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Exit</source>
-        <translation type="unfinished">Salir</translation>
+        <translation>Salir</translation>
     </message>
     <message>
         <location line="-3"/>
         <source>E&amp;xit</source>
-        <translation type="unfinished">&amp;Salir</translation>
+        <translation>&amp;Salir</translation>
     </message>
     <message>
         <location line="-1448"/>
         <source>Instrument Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nombre de instrumento:</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Selected instrument name.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionar nombre de instrumento</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>List of defined instruments.</source>
-        <translation type="unfinished"></translation>
+        <translation>Lista de instrumentos definidos</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Pa&amp;tches</source>
-        <translation type="unfinished"></translation>
+        <translation>Grupos</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>List of groups and patches.</source>
-        <translation type="unfinished"></translation>
+        <translation>Lista de grupos</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Group/Patch</source>
-        <translation type="unfinished"></translation>
+        <translation>Grupos</translation>
     </message>
     <message>
         <location line="+15"/>
         <location line="+443"/>
         <location line="+742"/>
         <source>Name:</source>
-        <translation type="unfinished">Nombre:</translation>
+        <translation>Nombre:</translation>
     </message>
     <message>
         <location line="-1175"/>
         <location line="+3"/>
         <source>Group or patch name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nombre de grupo o sección</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>Patch high bank number</source>
-        <translation type="unfinished"></translation>
+        <translation>Número de grupo de banco superior</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Patch high bank number. --- means don&apos;t care.</source>
-        <translation type="unfinished"></translation>
+        <translation>Número de grupo de banco superior. </translation>
     </message>
     <message>
         <location line="+3"/>
         <source>---</source>
         <comment>dont care</comment>
-        <translation type="unfinished"></translation>
+        <translation>no importa</translation>
     </message>
     <message>
         <location line="+46"/>
         <source>Patch low bank number</source>
-        <translation type="unfinished"></translation>
+        <translation>Número de grupo de banco inferior</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Patch low bank number. --- means don&apos;t care.</source>
-        <translation type="unfinished"></translation>
+        <translation>Número de grupo de banco inferior. </translation>
     </message>
     <message>
         <location line="+3"/>
         <source>---</source>
-        <translation type="unfinished"></translation>
+        <translation>    </translation>
     </message>
     <message>
         <location line="+46"/>
         <location line="+3"/>
         <source>Patch program number</source>
-        <translation type="unfinished"></translation>
+        <translation>Número de parte de programa</translation>
     </message>
     <message>
         <location line="+36"/>
         <source>Drum patch</source>
-        <translation type="unfinished"></translation>
+        <translation>Parte de percusiòn</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>If set, the patch is available only for drum channels.</source>
-        <translation type="unfinished"></translation>
+        <translation>Si se establece, el grupo estará disponible únicamente para los canales de percusión.</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>GM patch</source>
-        <translation type="unfinished"></translation>
+        <translation>Grupo GM</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>If set, the patch is available in a &apos;GM&apos; or &apos;NO&apos; midi song type.</source>
-        <translation type="unfinished"></translation>
+        <translation>Si se establece, estará disponible el grupo &quot;GM&quot; para la sesión.</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>GS patch</source>
-        <translation type="unfinished"></translation>
+        <translation>Grupo GS</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>If set, the patch is available in a &apos;GS&apos; or &apos;NO&apos; midi song type.</source>
-        <translation type="unfinished"></translation>
+        <translation>Si se establece, estará disponible el grupo &quot;GS&quot; para la sesión.</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>XG patch</source>
-        <translation type="unfinished"></translation>
+        <translation>Grupo XG</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>If set, the patch is available in an &apos;XG&apos; or &apos;NO&apos; midi song type.</source>
-        <translation type="unfinished"></translation>
+        <translation>Si se establece, estará disponible el grupo &quot;XG&quot; para la sesión.</translation>
     </message>
     <message>
         <location line="+39"/>
         <source>Delete group or patch</source>
-        <translation type="unfinished"></translation>
+        <translation>Borrar grupo</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>New patch</source>
-        <translation type="unfinished"></translation>
+        <translation>Nueva grupo</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>New &amp;Patch</source>
-        <translation type="unfinished"></translation>
+        <translation>Nueva gru&amp;po</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Alt+P</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt+P</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>New group</source>
-        <translation type="unfinished"></translation>
+        <translation>Nuevo grupo</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>New &amp;Group</source>
-        <translation type="unfinished"></translation>
+        <translation>Nuevo &amp;Grupo</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Alt+G</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt+G</translation>
     </message>
     <message>
         <location line="+30"/>
         <source>Contro&amp;ller</source>
-        <translation type="unfinished"></translation>
+        <translation>Contro&amp;lador</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>Common:</source>
-        <translation type="unfinished"></translation>
+        <translation>Comunes:</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>List of defined controllers</source>
-        <translation type="unfinished"></translation>
+        <translation>Lista de controladores definidos</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>List of defined controllers.</source>
-        <translation type="unfinished"></translation>
+        <translation>Lista de controladores definidos.</translation>
     </message>
     <message>
         <location line="+33"/>
         <source>Min  </source>
-        <translation type="unfinished"></translation>
+        <translation>Mínimo</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Max  </source>
-        <translation type="unfinished"></translation>
+        <translation>Máximo</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Def  </source>
-        <translation type="unfinished"></translation>
+        <translation>Def  </translation>
     </message>
     <message>
         <location line="+35"/>
         <source>Midi controller name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nombre de controlador MIDI</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Type:</source>
-        <translation type="unfinished">Tipo:</translation>
+        <translation>Tipo:</translation>
     </message>
     <message>
         <location line="+10"/>
         <location line="+3"/>
         <source>Midi controller type</source>
-        <translation type="unfinished"></translation>
+        <translation>Tipo de controlador MIDI</translation>
     </message>
     <message>
         <location line="+24"/>
         <source>RPN14</source>
-        <translation type="unfinished"></translation>
+        <translation>RPN14</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>NRPN14</source>
-        <translation type="unfinished"></translation>
+        <translation>NRPN14</translation>
     </message>
     <message>
         <location line="+53"/>
         <location line="+3"/>
         <source>Midi controller number high byte</source>
-        <translation type="unfinished"></translation>
+        <translation>Controlar número alto del byte MIDI</translation>
     </message>
     <message>
         <location line="+51"/>
         <source>Midi controller number low byte (* means drum controller)</source>
-        <translation type="unfinished"></translation>
+        <translation>Controlador MIDI byte bajo  (* significa que  controla la percusión)</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -4931,23 +4243,26 @@ Allows controllers for each instrument in
  replaced by the &apos;ANote&apos; in the drum map.
 Examples: The GS and XG instruments&apos; 
  Drum controllers.</source>
-        <translation type="unfinished"></translation>
+        <translation>Controlador MIDI byte  bajo.
+ Byte bajo es * el controlador 
+  regulador de percusión,-para las pistas de batería e
+  instrumentos GS / XG.</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>*</source>
         <comment>wild card</comment>
-        <translation type="unfinished"></translation>
+        <translation>*</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Range:</source>
-        <translation type="unfinished"></translation>
+        <translation>Rango:</translation>
     </message>
     <message>
         <location line="+48"/>
         <source>Minimum value. If negative, auto-translate.</source>
-        <translation type="unfinished"></translation>
+        <translation>Valor mínimo. Si es negativo,se traduce automaticamente.</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -4970,23 +4285,34 @@ Type &apos;Pitch&apos; is the exception. It is biased
  at zero, even with a negative minimum:
 &apos;Pitch&apos;: Min: -8192 Max: 8191
 True range: Min: -8192 Max: 8191 (bias 0)</source>
-        <translation type="unfinished"></translation>
+        <translation>Valor mínimo. Si el valor mínimo
+  es negativo, el rango automáticamente
+  se traduce en un rango positivo.
+
+El valor es determinado por el tipo de controlador
+7-bit Controller7 / RPN: Bias = 64 
+14-bit Controller14 / RPN14: Bias = 8192
+
+&apos;Pitch&apos; es la excepción. Está fijada
+  a cero, incluso con un mínimo negativo
+&apos;Pitch&apos;: Min: -8192 Max: 8191
+True range: Min: -8192 Max: 8191 (bias 0)</translation>
     </message>
     <message>
         <location line="+69"/>
         <location line="+3"/>
         <source>Maximum value</source>
-        <translation type="unfinished"></translation>
+        <translation>Valor máximo</translation>
     </message>
     <message>
         <location line="+36"/>
         <source>Default:</source>
-        <translation type="unfinished"></translation>
+        <translation>Por defecto:</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>L-Bank</source>
-        <translation type="unfinished">Banco-L</translation>
+        <translation>Banco-L</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -4995,27 +4321,27 @@ True range: Min: -8192 Max: 8191 (bias 0)</source>
         <location line="+198"/>
         <location line="+53"/>
         <source>off</source>
-        <translation type="unfinished">apagado</translation>
+        <translation>apagado</translation>
     </message>
     <message>
         <location line="-261"/>
         <source>Progr.</source>
-        <translation type="unfinished">Progr.</translation>
+        <translation>Programa</translation>
     </message>
     <message>
         <location line="+35"/>
         <source>???</source>
-        <translation type="unfinished">???</translation>
+        <translation>???</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>H-Bank</source>
-        <translation type="unfinished">Banco-H</translation>
+        <translation>Banco-H</translation>
     </message>
     <message>
         <location line="+44"/>
         <source>Default value. Off: No default.</source>
-        <translation type="unfinished"></translation>
+        <translation>El valor por defecto. Apagado: No hay valor por defecto.</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -5034,58 +4360,66 @@ Caution! Watch out for controllers such as
  values. You should probably turn &apos;off&apos; their 
  default (in piano roll or drum edit, and 
  instrument editor).</source>
-        <translation type="unfinished"></translation>
+        <translation>Valor por defecto (inicial) . Apagado, no tiene valor predeterminado.
+
+Si se elije un valor por defecto , el valor será enviado
+  cuando el controlador se añada en la sesión
+  (en el editor de matríz o editor de lista). cuando
+  si la sesión se vuelve a cargar, el valor se vuelve a enviar.
+De lo contrario el controlador permanece en su último valor.
+Los controladores también se añaden automáticamente a una
+  sesión a la recepción de un evento de controlador midi.</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>off</source>
         <comment>dont care</comment>
-        <translation type="unfinished">apagado</translation>
+        <translation>apagado</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Add common controller</source>
-        <translation type="unfinished"></translation>
+        <translation>Agregar controlador común</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>&amp;Add</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Agregar</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Alt+A</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt+A</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Delete controller</source>
-        <translation type="unfinished"></translation>
+        <translation>Borrar controlador</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Create a new controller</source>
-        <translation type="unfinished"></translation>
+        <translation>Crear un nuevo controlador</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>New &amp;Controller</source>
-        <translation type="unfinished"></translation>
+        <translation>Nuevo</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Alt+C</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt+C</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Null Param Hi:</source>
-        <translation type="unfinished"></translation>
+        <translation>Byte alto no válido:</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Null parameter number High byte</source>
-        <translation type="unfinished"></translation>
+        <translation>El número de byte alto no es válido.</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -5096,77 +4430,78 @@ This prevents subsequent &apos;data&apos; events
  from corrupting the RPN/NRPN controller.
 Typically, set to 127/127, or an unused
  RPN/NRPN controller number.</source>
-        <translation type="unfinished"></translation>
+        <translation>Si se establece, &apos;nulo&apos; el número de parámetro
+  será enviados después de cada evento RPN / NRPN.
+Esto evita que los acontecimientos posteriores de &quot;datos&quot;
+  corrompan el controlador  RPN / NRPN.
+Por lo general, establezca a 127/127, o usar el
+  número de controlador RPN / NRPN.</translation>
     </message>
     <message>
         <location line="-13"/>
         <source> Lo:</source>
-        <translation type="unfinished"></translation>
+        <translation>Inferior:</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Null parameter number Low byte</source>
-        <translation type="unfinished"></translation>
+        <translation>El parametro inferior es nulo</translation>
     </message>
     <message>
         <location line="+34"/>
         <source>S&amp;ysEx</source>
-        <translation type="unfinished"></translation>
+        <translation>S&amp;ysEx</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>SysEx List:</source>
-        <translation type="unfinished"></translation>
+        <translation>Lista se Sistema exclusivo (SysEx)</translation>
     </message>
     <message>
         <location line="+62"/>
         <source>New SysE&amp;x</source>
-        <translation type="unfinished"></translation>
+        <translation>Nuevo SysE&amp;x</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Alt+X</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt+X</translation>
     </message>
     <message>
         <location line="+73"/>
         <source>&amp;Help</source>
-        <translation type="unfinished">A&amp;yuda</translation>
+        <translation>A&amp;yuda</translation>
     </message>
     <message>
         <location line="+84"/>
         <location line="+3"/>
         <source>new item</source>
-        <translation type="unfinished"></translation>
+        <translation>Nuevo ítem</translation>
     </message>
     <message>
         <location line="+8"/>
         <location line="+3"/>
         <source>What&apos;s this?</source>
-        <translation type="unfinished"></translation>
+        <translation>¿Que es esto?</translation>
     </message>
 </context>
 <context>
     <name>EditMetaDialog</name>
     <message>
-        <location filename="../../muse/liste/editevent.cpp" line="+120"/>
         <source>Time Position</source>
-        <translation type="unfinished">Posición de tiempo</translation>
+        <translation type="obsolete">Posición de tiempo</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Meta Type</source>
-        <translation type="unfinished">Tipo de Meta</translation>
+        <translation type="obsolete">Tipo de Meta</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Enter Hex</source>
-        <translation type="unfinished">Introduzca en Hexadecimal</translation>
+        <translation type="obsolete">Introduzca en Hexadecimal</translation>
     </message>
     <message>
-        <location line="-18"/>
         <source>MusE: Enter Meta Event</source>
-        <translation type="unfinished">MusE: Introduzca evento Meta</translation>
+        <translation type="obsolete">MusE: Introduzca evento Meta</translation>
     </message>
 </context>
 <context>
@@ -5205,65 +4540,61 @@ Typically, set to 127/127, or an unused
     <message>
         <location filename="../../muse/widgets/editnotedialogbase.ui" line="+14"/>
         <source>MusE: Enter Note</source>
-        <translation type="unfinished">MusE: Escribe Nota</translation>
+        <translation>MusE: Escribe Nota</translation>
     </message>
     <message>
         <location line="+39"/>
         <source>OK</source>
-        <translation type="unfinished">Aceptar</translation>
+        <translation>Aceptar</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Cancel</source>
-        <translation type="unfinished">Cancelar</translation>
+        <translation>Cancelar</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Length:</source>
-        <translation type="unfinished">Longitud:</translation>
+        <translation>Duración:</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Time Position:</source>
-        <translation type="unfinished">Posición de tiempo</translation>
+        <translation>Posición de tiempo:</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Pitch:</source>
-        <translation type="unfinished">Tono:</translation>
+        <translation>Tono:</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Velocity On:</source>
-        <translation type="unfinished">Velocidad On:</translation>
+        <translation>Velocidad On:</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Velocity Off:</source>
-        <translation type="unfinished">Velocidad Off:</translation>
+        <translation>Velocidad Off:</translation>
     </message>
 </context>
 <context>
     <name>EditPAfterDialog</name>
     <message>
-        <location filename="../../muse/liste/editevent.cpp" line="+196"/>
         <source>Time Position</source>
-        <translation type="unfinished">Posición de tiempo</translation>
+        <translation type="obsolete">Posición de tiempo</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Pitch</source>
-        <translation type="unfinished">Tono</translation>
+        <translation type="obsolete">Tono</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Pressure</source>
-        <translation type="unfinished">Presión</translation>
+        <translation type="obsolete">Presión</translation>
     </message>
     <message>
-        <location line="-8"/>
         <source>MusE: Enter Poly Aftertouch</source>
-        <translation type="unfinished">Muse: Escribe el aftertouch polifónico</translation>
+        <translation type="obsolete">Muse: Escribe el aftertouch polifónico</translation>
     </message>
 </context>
 <context>
@@ -5286,27 +4617,27 @@ Typically, set to 127/127, or an unused
     <message>
         <location filename="../../muse/widgets/editsysexdialogbase.ui" line="+14"/>
         <source>MusE: Enter SysEx</source>
-        <translation type="unfinished">MusE: Introduce el sistema exclusivo</translation>
+        <translation>MusE: Introducir sistema exclusivo</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>TimePosition:</source>
-        <translation type="unfinished">Posición de tiempo:</translation>
+        <translation>Posición de tiempo:</translation>
     </message>
     <message>
         <location line="+48"/>
         <source>Comment:</source>
-        <translation type="unfinished">Comentario:</translation>
+        <translation>Comentario:</translation>
     </message>
     <message>
         <location line="+37"/>
         <source>OK</source>
-        <translation type="unfinished">Aceptar</translation>
+        <translation>Aceptar</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Cancel</source>
-        <translation type="unfinished">Cancelar</translation>
+        <translation>Cancelar</translation>
     </message>
 </context>
 <context>
@@ -5356,7 +4687,7 @@ Typically, set to 127/127, or an unused
     <message>
         <location filename="../../synti/fluid/fluidgui.cpp" line="+77"/>
         <source>FLUID: open Soundfile</source>
-        <translation type="unfinished"></translation>
+        <translation>FLUID: Archivo de sonido abierto</translation>
     </message>
 </context>
 <context>
@@ -5364,17 +4695,17 @@ Typically, set to 127/127, or an unused
     <message>
         <location filename="../../synti/fluid/fluidguibase.ui" line="+14"/>
         <source>Form1</source>
-        <translation type="unfinished">Formulario1</translation>
+        <translation>Formulario1</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Soundfont</source>
-        <translation type="unfinished">Fuente de sonido</translation>
+        <translation>Fuente de sonido</translation>
     </message>
     <message>
         <location line="+52"/>
         <source>Load</source>
-        <translation type="unfinished">Cargar</translation>
+        <translation>Cargar</translation>
     </message>
 </context>
 <context>
@@ -5382,123 +4713,123 @@ Typically, set to 127/127, or an unused
     <message>
         <location filename="../../synti/fluidsynth/fluidsynthguibase.ui" line="+14"/>
         <source>FLUID Synth</source>
-        <translation type="unfinished"></translation>
+        <translation>Fluid Synth</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Load</source>
-        <translation type="unfinished">Cargar</translation>
+        <translation>Cargar</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Delete</source>
-        <translation type="unfinished">Borrar</translation>
+        <translation>Borrar</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Dump Info</source>
-        <translation type="unfinished"></translation>
+        <translation>Volcar información</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>ID</source>
-        <translation type="unfinished"></translation>
+        <translation>ID</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Fontname</source>
-        <translation type="unfinished"></translation>
+        <translation>Nombre de fuente</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Chnl</source>
-        <translation type="unfinished"></translation>
+        <translation>Canal</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Soundfont</source>
-        <translation type="unfinished">Fuente de sonido</translation>
+        <translation>Fuente de sonido</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Drum Chnl</source>
-        <translation type="unfinished"></translation>
+        <translation>Canal de percusión</translation>
     </message>
     <message>
         <location line="+108"/>
         <location line="+235"/>
         <source>Level</source>
-        <translation type="unfinished">Nivel</translation>
+        <translation>Nivel</translation>
     </message>
     <message>
         <location line="-222"/>
         <source>Width</source>
-        <translation type="unfinished">Anchura</translation>
+        <translation>Anchura</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Damping</source>
-        <translation type="unfinished">Amortiguamiento</translation>
+        <translation>Amortiguamiento</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Room Size</source>
-        <translation type="unfinished">Tamaño sala</translation>
+        <translation>Tamaño sala</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Reverb</source>
-        <translation type="unfinished">Reverberación</translation>
+        <translation>Reverberación</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>CHANNEL SETUP</source>
-        <translation type="unfinished"></translation>
+        <translation>CONFIGURACIÓN DE CANAL</translation>
     </message>
     <message>
         <location line="+29"/>
         <source>Sine</source>
-        <translation type="unfinished">Seno</translation>
+        <translation>Seno</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Triangle</source>
-        <translation type="unfinished">Triángulo</translation>
+        <translation>Triángulo</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Type</source>
-        <translation type="unfinished">Tipo</translation>
+        <translation>Tipo</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Number</source>
-        <translation type="unfinished">Número</translation>
+        <translation>Número</translation>
     </message>
     <message>
         <location line="+35"/>
         <source>Speed</source>
-        <translation type="unfinished">Velocidad</translation>
+        <translation>Velocidad</translation>
     </message>
     <message>
         <location line="+35"/>
         <source>Depth</source>
-        <translation type="unfinished">Profundidad</translation>
+        <translation>Profundidad</translation>
     </message>
     <message>
         <location line="+48"/>
         <source>Chorus</source>
-        <translation type="unfinished">Coro ;-)</translation>
+        <translation>Coro ;-)</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Gain</source>
-        <translation type="unfinished">Ganancia</translation>
+        <translation>Ganancia</translation>
     </message>
     <message>
         <location line="+50"/>
         <source>LOADED SOUNDFONTS</source>
-        <translation type="unfinished"></translation>
+        <translation>SOUNDFONTS CARGADOS</translation>
     </message>
 </context>
 <context>
@@ -5510,34 +4841,36 @@ Typically, set to 127/127, or an unused
     <message>
         <location filename="../../muse/widgets/fdialogbuttons.ui" line="+38"/>
         <source>Global</source>
-        <translation type="unfinished">Global</translation>
+        <translation>Global</translation>
     </message>
     <message>
         <location line="+25"/>
         <source>User</source>
-        <translation type="unfinished">Usuario</translation>
+        <translation>Usuario</translation>
     </message>
     <message>
         <location line="+25"/>
         <source>Project</source>
-        <translation type="unfinished">Proyecto</translation>
+        <translation>Sesión</translation>
     </message>
     <message>
         <location line="+55"/>
         <source>only
 Songdata</source>
-        <translation type="unfinished"></translation>
+        <translation>Solo
+Datos de sesión</translation>
     </message>
     <message>
         <location line="-129"/>
         <source>fdialogbuttons</source>
-        <translation type="unfinished"></translation>
+        <translation>Dialogo de botones</translation>
     </message>
     <message>
         <location line="+121"/>
         <source>Songdata +
 Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>Datos de sesión +
+Configuración</translation>
     </message>
 </context>
 <context>
@@ -5545,7 +4878,7 @@ Configuration</source>
     <message>
         <location filename="../../synti/fluidsynth/fluidsynthgui.cpp" line="+188"/>
         <source>Choose soundfont</source>
-        <translation type="unfinished"></translation>
+        <translation>Elegir soundfont</translation>
     </message>
 </context>
 <context>
@@ -5564,22 +4897,22 @@ Configuration</source>
     <message>
         <location filename="../../muse/widgets/function_dialogs/gatetimebase.ui" line="+26"/>
         <source>Range</source>
-        <translation type="unfinished">Rango</translation>
+        <translation>Rango</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>All Events</source>
-        <translation type="unfinished">Todos los eventos</translation>
+        <translation>Todos los eventos</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Selected Events</source>
-        <translation type="unfinished">Eventos seleccionados</translation>
+        <translation>Eventos seleccionados</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Looped Events</source>
-        <translation type="unfinished">Eventos en bucle</translation>
+        <translation>Eventos en bucle</translation>
     </message>
     <message>
         <source>Selected &amp; Looped</source>
@@ -5588,47 +4921,47 @@ Configuration</source>
     <message>
         <location line="-41"/>
         <source>MusE: Modify Note Length</source>
-        <translation type="unfinished"></translation>
+        <translation>MusE: Cambiar duración de notas</translation>
     </message>
     <message>
         <location line="+48"/>
         <source>Selected Looped</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionar bucles</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Values</source>
-        <translation type="unfinished">Valores</translation>
+        <translation>Valores</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Rate:</source>
-        <translation type="unfinished">Velocidad:</translation>
+        <translation>Velocidad:</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Offset:</source>
-        <translation type="unfinished">Desplazamiento:</translation>
+        <translation>Desplazamiento:</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>%</source>
-        <translation type="unfinished">%</translation>
+        <translation>%</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>lenNew = (lenOld * rate) + offset</source>
-        <translation type="unfinished"></translation>
+        <translation>lenNew = (lenOld * rate) + offset</translation>
     </message>
     <message>
         <location line="+47"/>
         <source>OK</source>
-        <translation type="unfinished">Aceptar</translation>
+        <translation>Aceptar</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Cancel</source>
-        <translation type="unfinished">Cancelar</translation>
+        <translation>Cancelar</translation>
     </message>
 </context>
 <context>
@@ -5636,28 +4969,28 @@ Configuration</source>
     <message>
         <location filename="../../muse/widgets/gensetbase.ui" line="+14"/>
         <source>MusE: Global Settings</source>
-        <translation type="unfinished">MusE: Valores globales</translation>
+        <translation>MusE: Configuración global globales</translation>
     </message>
     <message>
         <location line="+530"/>
         <source>Audio</source>
-        <translation type="unfinished">Audio</translation>
+        <translation>Audio</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Mixer</source>
-        <translation type="unfinished">Mezclador</translation>
+        <translation>Mezclador</translation>
     </message>
     <message>
         <location line="+21"/>
         <location line="+39"/>
         <source>dB</source>
-        <translation type="unfinished">dB</translation>
+        <translation>dB</translation>
     </message>
     <message>
         <location line="-20"/>
         <source>min. Meter Value</source>
-        <translation type="unfinished">valor mínimo del vumeter</translation>
+        <translation>Valor mínimo del vúmetro</translation>
     </message>
     <message>
         <source>min.Slider Val</source>
@@ -5666,31 +4999,31 @@ Configuration</source>
     <message>
         <location line="+406"/>
         <source>Midi</source>
-        <translation type="unfinished">MIDI</translation>
+        <translation>MIDI</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Ticks</source>
-        <translation type="unfinished">Ticks</translation>
+        <translation>Tics</translation>
     </message>
     <message>
         <location line="-223"/>
         <location line="+194"/>
         <location line="+47"/>
         <source>1024</source>
-        <translation type="unfinished">1024</translation>
+        <translation>1024</translation>
     </message>
     <message>
         <location line="-236"/>
         <location line="+194"/>
         <location line="+47"/>
         <source>2048</source>
-        <translation type="unfinished">2048</translation>
+        <translation>2048</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>4096</source>
-        <translation type="unfinished">4096</translation>
+        <translation>4096</translation>
     </message>
     <message>
         <source>8172</source>
@@ -5700,174 +5033,197 @@ Configuration</source>
         <location line="+86"/>
         <source>Displayed Resolution
 (Ticks/Quarternote)</source>
-        <translation type="unfinished">Resolución mostrada
-(ticks/negra)</translation>
+        <translation>Resolución mostrada
+(tics/negra)</translation>
     </message>
     <message>
         <location line="-48"/>
         <location line="+63"/>
         <source>48</source>
-        <translation type="unfinished">48</translation>
+        <translation>48</translation>
     </message>
     <message>
         <location line="-58"/>
         <location line="+63"/>
         <source>96</source>
-        <translation type="unfinished">96</translation>
+        <translation>96</translation>
     </message>
     <message>
         <location line="-58"/>
         <location line="+63"/>
         <source>192</source>
-        <translation type="unfinished">192</translation>
+        <translation>192</translation>
     </message>
     <message>
         <location line="-58"/>
         <location line="+63"/>
         <source>384</source>
-        <translation type="unfinished">384</translation>
+        <translation>384</translation>
     </message>
     <message>
         <location line="-58"/>
         <location line="+63"/>
         <source>768</source>
-        <translation type="unfinished">768</translation>
+        <translation>768</translation>
     </message>
     <message>
         <location line="-58"/>
         <location line="+63"/>
         <source>1536</source>
-        <translation type="unfinished">1536</translation>
+        <translation>1536</translation>
     </message>
     <message>
         <location line="-58"/>
         <location line="+63"/>
         <source>3072</source>
-        <translation type="unfinished">3072</translation>
+        <translation>3072</translation>
     </message>
     <message>
         <location line="-58"/>
         <location line="+63"/>
         <source>6144</source>
-        <translation type="unfinished">6144</translation>
+        <translation>6144</translation>
     </message>
     <message>
         <location line="-58"/>
         <location line="+63"/>
         <source>12288</source>
-        <translation type="unfinished">12288</translation>
+        <translation>12288</translation>
     </message>
     <message>
         <location line="-163"/>
         <source>RTC Resolution
 (Ticks/Sec)</source>
-        <translation type="unfinished">Resolución del reloj
-(Ticks/segundo)</translation>
+        <translation>Resolución del reloj
+(Tics/segundo)</translation>
     </message>
     <message>
         <location line="+212"/>
         <source>GUI</source>
-        <translation type="unfinished">GUI</translation>
+        <translation>GUI</translation>
     </message>
     <message>
         <location line="+28"/>
         <source>/sec</source>
-        <translation type="unfinished">/seg</translation>
+        <translation>/seg</translation>
     </message>
     <message>
         <location line="-10"/>
         <source>GUI Refresh Rate</source>
-        <translation type="unfinished">Velocidad de refresco del GUI</translation>
+        <translation>Velocidad de refresco de la interfáz</translation>
     </message>
     <message>
         <location line="+72"/>
         <source>Use project save dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Usar diálogo de guardado</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>Some popup menus stay open (else hold Ctrl)</source>
-        <translation type="unfinished"></translation>
+        <translation>Menús emergentes (si no mantenga presionado Ctrl)</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+13"/>
         <source>Allows some popup menus to stay open.
 Otherwise, hold Ctrl to keep them open.</source>
-        <translation type="unfinished"></translation>
+        <translation>Permite tener abiertos algunos menús emengentes.
+De lo contrario, mantenga la tecla Ctrl para mantenerlos abiertos.</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+11"/>
+        <source>In some areas, the middle mouse button decreases
+values, while the right button increases. Users without a
+middle mouse button can select this option to make the
+left button behave like the middle button in such areas.</source>
+        <translation>En algunas zonas, el botón central del ratón disminuye el 
+valor, mientras que el botón derecho lo aumenta. Los usuarios 
+sin un botón central del ratón, puede seleccionar esta opción 
+para hacer que el botón de la izquierda se comporte como 
+el botón del medio.</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Use left mouse button for decreasing values</source>
+        <translation>Botón izquierdo del ratón reduce el valor</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Shift + Right click sets left range marker</source>
+        <translation>Ctrl + clic derecho establece marcador de  la izquierda.</translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>MDI-subwindowness and sharing menus</source>
-        <translation type="unfinished"></translation>
+        <translation>MDI Sub ventanas y posición de menús</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Presets:</source>
-        <translation type="unfinished"></translation>
+        <translation>Preseteos:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>traditional MusE SDI</source>
-        <translation type="unfinished"></translation>
+        <translation>Comportamiento tradicional de MusE</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Cakewalk-like MDI</source>
-        <translation type="unfinished"></translation>
+        <translation>Comportamiento similar a Cakewalk</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Borland-/Mac-like MDI</source>
-        <translation type="unfinished"></translation>
+        <translation>Comportamiento similar a Borland/Mac</translation>
     </message>
     <message>
         <location line="+56"/>
         <source>&amp;Apply</source>
-        <translation type="unfinished">&amp;Aplicar</translation>
+        <translation>&amp;Aplicar</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>&amp;Ok</source>
-        <translation type="unfinished">Ac&amp;eptar</translation>
+        <translation>Ac&amp;eptar</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>&amp;Cancel</source>
-        <translation type="unfinished">&amp;Cancelar</translation>
+        <translation>&amp;Cancelar</translation>
     </message>
     <message>
         <source>Help Browser:</source>
         <translation type="obsolete">Navegador de ayuda:</translation>
     </message>
     <message>
-        <location line="-1438"/>
+        <location line="-1490"/>
         <source>Application</source>
-        <translation type="unfinished"></translation>
+        <translation>Aplicación</translation>
     </message>
     <message>
         <location line="+389"/>
         <source>Start Muse</source>
-        <translation type="unfinished"></translation>
+        <translation>Inicio de MusE</translation>
     </message>
     <message>
         <location line="+47"/>
         <source>start with last song</source>
-        <translation type="unfinished"></translation>
+        <translation>Abrir la última sesión</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>start with song</source>
-        <translation type="unfinished"></translation>
+        <translation>Abrir la sesión</translation>
     </message>
     <message>
         <location line="-47"/>
         <source>start song:</source>
-        <translation type="unfinished"></translation>
+        <translation>Iniciar sesión:</translation>
     </message>
     <message>
         <location line="-403"/>
         <source>Views</source>
-        <translation type="unfinished"></translation>
+        <translation>Vistas</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -5876,7 +5232,7 @@ Otherwise, hold Ctrl to keep them open.</source>
         <location line="+144"/>
         <location line="+56"/>
         <source>y-pos</source>
-        <translation type="unfinished"></translation>
+        <translation>pos. Y</translation>
     </message>
     <message>
         <location line="-274"/>
@@ -5884,7 +5240,7 @@ Otherwise, hold Ctrl to keep them open.</source>
         <location line="+47"/>
         <location line="+7"/>
         <source>show</source>
-        <translation type="unfinished"></translation>
+        <translation>Ver</translation>
     </message>
     <message>
         <location line="-104"/>
@@ -5893,7 +5249,7 @@ Otherwise, hold Ctrl to keep them open.</source>
         <location line="+164"/>
         <location line="+56"/>
         <source>x-pos</source>
-        <translation type="unfinished"></translation>
+        <translation>Pos. X</translation>
     </message>
     <message>
         <location line="-267"/>
@@ -5901,7 +5257,7 @@ Otherwise, hold Ctrl to keep them open.</source>
         <location line="+104"/>
         <location line="+56"/>
         <source>height</source>
-        <translation type="unfinished"></translation>
+        <translation>Ancho</translation>
     </message>
     <message>
         <location line="-227"/>
@@ -5909,12 +5265,12 @@ Otherwise, hold Ctrl to keep them open.</source>
         <location line="+124"/>
         <location line="+56"/>
         <source>width</source>
-        <translation type="unfinished"></translation>
+        <translation>Altura</translation>
     </message>
     <message>
         <location line="-108"/>
         <source>Big Time</source>
-        <translation type="unfinished"></translation>
+        <translation>Ventana de tiempo</translation>
     </message>
     <message>
         <source>Arranger</source>
@@ -5923,7 +5279,7 @@ Otherwise, hold Ctrl to keep them open.</source>
     <message>
         <location line="+32"/>
         <source>Transport</source>
-        <translation type="unfinished">Transporte</translation>
+        <translation>Transporte</translation>
     </message>
     <message>
         <location line="+59"/>
@@ -5932,7 +5288,7 @@ Otherwise, hold Ctrl to keep them open.</source>
         <location line="+16"/>
         <location line="+16"/>
         <source>Cur</source>
-        <translation type="unfinished"></translation>
+        <translation>Actual</translation>
     </message>
     <message>
         <location line="-107"/>
@@ -5941,119 +5297,120 @@ Otherwise, hold Ctrl to keep them open.</source>
         <location line="+16"/>
         <location line="+16"/>
         <source>set current values</source>
-        <translation type="unfinished"></translation>
+        <translation>Establecer valores actuales</translation>
     </message>
     <message>
         <location line="+76"/>
         <source>start with template: default.med</source>
-        <translation type="unfinished"></translation>
+        <translation>Abrir la plantilla: default.med</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>show splash screen</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar pantalla de inicio</translation>
     </message>
     <message>
         <location line="-326"/>
         <source>Mixer A</source>
-        <translation type="unfinished"></translation>
+        <translation>Mezcaldora A</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Mixer B</source>
-        <translation type="unfinished"></translation>
+        <translation>Mezcladora B</translation>
     </message>
     <message>
         <location line="+317"/>
         <source>show &quot;Did you know?&quot; dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Ver dialogo ¿Sabia usted que?</translation>
     </message>
     <message>
         <location line="-55"/>
         <source>Start song</source>
-        <translation type="unfinished"></translation>
+        <translation>Iniciar Sesión</translation>
     </message>
     <message>
         <location line="+140"/>
         <source>min. Slider Val</source>
-        <translation type="unfinished"></translation>
+        <translation>Valor mínimo del potensiómetro</translation>
     </message>
     <message>
         <location line="+60"/>
         <source>Enable denormal protection</source>
-        <translation type="unfinished"></translation>
+        <translation>Habilitar proteccion</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Enable output limiter</source>
-        <translation type="unfinished"></translation>
+        <translation>Habilitar limitación de salida</translation>
     </message>
     <message>
         <location line="+131"/>
         <source>External Waveditor</source>
-        <translation type="unfinished"></translation>
+        <translation>Editor de audio externo</translation>
     </message>
     <message>
         <location line="+25"/>
         <source>External Waveditor command</source>
-        <translation type="unfinished"></translation>
+        <translation>Editor de audio externo (comando)</translation>
     </message>
     <message>
         <location line="+44"/>
         <source>Note: External editor opened from the internal editor.</source>
-        <translation type="unfinished"></translation>
+        <translation>Note: El editor externo se abre desde adentro</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Dummy Audio Driver (settings require restart)</source>
-        <translation type="unfinished"></translation>
+        <translation>Controlador de audio en vacío (El cambio requiere reinicio)</translation>
     </message>
     <message>
         <location line="+31"/>
         <source>Hz</source>
-        <translation type="unfinished"></translation>
+        <translation>Hz</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>Period size (Frames per period):</source>
-        <translation type="unfinished"></translation>
+        <translation>Tamaño del período (Cuadros por período)</translation>
     </message>
     <message>
         <location line="-180"/>
         <location line="+194"/>
         <source>16</source>
-        <translation type="unfinished">16</translation>
+        <translation>16</translation>
     </message>
     <message>
         <location line="-719"/>
         <source>Main Window</source>
-        <translation type="unfinished"></translation>
+        <translation>Ventana principal</translation>
     </message>
     <message>
         <location line="+399"/>
         <source>Try to use Jack Freewheel</source>
-        <translation type="unfinished"></translation>
+        <translation>Habilitar Jack para juego libre</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Speeds bounce operations</source>
-        <translation type="unfinished"></translation>
+        <translation>Velocidad de las operaciones de rebote</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Use Jack Freewheel mode if possible.
 This dramatically speeds bounce operations.</source>
-        <translation type="unfinished"></translation>
+        <translation>Usar juego libre para Jack si es posible
+Reduce dramaticamente el tiempo de rebote.</translation>
     </message>
     <message>
         <location line="+38"/>
         <source>VST in-place</source>
-        <translation type="unfinished"></translation>
+        <translation>VST emplazado</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Enable VST in-place processing (restart required)</source>
-        <translation type="unfinished"></translation>
+        <translation>Activar VST en el prosesamiento (Requiere reiniciar)</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -6061,18 +5418,19 @@ This dramatically speeds bounce operations.</source>
  VST Ladspa effect rack plugins do not work or 
  feedback loudly, even if they are supposed to 
  be in-place capable. Setting requires a restart.</source>
-        <translation type="unfinished"></translation>
+        <translation>Activar VST en el procesamiento. Desactive esta opción si
+ Rack de efectos Ladspa VST no está instalado (Requiere reiniciar)</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Minimum control period</source>
-        <translation type="unfinished"></translation>
+        <translation>Periodo mínimo de control</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Minimum audio controller process period (samples).
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Período mínimo del control de proceso de audio (muestras)</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -6081,113 +5439,119 @@ Adjusts responsiveness of audio controls and
  controller graphs. Set a low value for fast, smooth 
  control. If it causes performance problems, set a 
  higher value. </source>
-        <translation type="unfinished"></translation>
+        <translation>Período mínimo del control de proceso de audio (muestras)
+Ajusta la sensibilidad de los controles de audio y
+  gráficos de control. Establecer un valor bajo para un control rápido
+  y suave.
+ Si le causa problemas de rendimiento, establezca un
+  valor mayor.</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>1</source>
-        <translation type="unfinished">1</translation>
+        <translation>1</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>2</source>
-        <translation type="unfinished">2</translation>
+        <translation>2</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>4</source>
-        <translation type="unfinished">4</translation>
+        <translation>4</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>8</source>
-        <translation type="unfinished">8</translation>
+        <translation>8</translation>
     </message>
     <message>
         <location line="+10"/>
         <location line="+194"/>
         <source>32</source>
-        <translation type="unfinished">32</translation>
+        <translation>32</translation>
     </message>
     <message>
         <location line="-189"/>
         <location line="+194"/>
         <source>64</source>
-        <translation type="unfinished">64</translation>
+        <translation>64</translation>
     </message>
     <message>
         <location line="-189"/>
         <location line="+194"/>
         <source>128</source>
-        <translation type="unfinished">128</translation>
+        <translation>128</translation>
     </message>
     <message>
         <location line="-189"/>
         <location line="+194"/>
         <source>256</source>
-        <translation type="unfinished">256</translation>
+        <translation>256</translation>
     </message>
     <message>
         <location line="-189"/>
         <location line="+194"/>
         <source>512</source>
-        <translation type="unfinished">512</translation>
+        <translation>512</translation>
     </message>
     <message>
         <location line="-68"/>
         <source>Sample rate</source>
-        <translation type="unfinished"></translation>
+        <translation>Frecuencia de muestreo</translation>
     </message>
     <message>
         <location line="+39"/>
         <source>Shorter periods give better midi playback resolution.</source>
-        <translation type="unfinished"></translation>
+        <translation>Períodos más cortos dan una mejor resolución de la reproducción midi.</translation>
     </message>
     <message>
         <location line="+96"/>
         <source>8192</source>
-        <translation type="unfinished">5 1/3&apos; {8192?}</translation>
+        <translation>5 1/3&apos; {8192?}</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>16384</source>
-        <translation type="unfinished">5 1/3&apos; {16384?}</translation>
+        <translation>5 1/3&apos; {16384?}</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>32768</source>
-        <translation type="unfinished">5 1/3&apos; {32768?}</translation>
+        <translation>5 1/3&apos; {32768?}</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Midi Resolution
 (Ticks/Quarternote)</source>
-        <translation type="unfinished"></translation>
+        <translation>Resolución MIDI
+(Tics/Negra)</translation>
     </message>
     <message>
         <location line="+126"/>
         <source>Instruments Directory</source>
-        <translation type="unfinished"></translation>
+        <translation>Carpeta de instrumentos</translation>
     </message>
     <message>
         <location line="+85"/>
         <source>Use old-style stop shortcut:</source>
-        <translation type="unfinished"></translation>
+        <translation>Atajo antiguo para detener</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Move single armed track with selection</source>
-        <translation type="unfinished"></translation>
+        <translation>Armar la pista con la selección (Grabar)</translation>
     </message>
     <message>
         <location line="-791"/>
         <source>On Launch</source>
-        <translation type="unfinished"></translation>
+        <translation>Lanzar al inicio</translation>
     </message>
     <message>
         <location line="+736"/>
         <source>Behavior</source>
-        <translation type="unfinished"></translation>
+        <translation>Comportamiento</translation>
     </message>
 </context>
 <context>
@@ -6291,139 +5655,48 @@ Adjusts responsiveness of audio controls and
 <context>
     <name>LMaster</name>
     <message>
-        <location filename="../../muse/master/lmaster.cpp" line="+207"/>
         <source>new tempo</source>
-        <translation type="unfinished">nuevo tempo</translation>
+        <translation type="obsolete">nuevo tempo</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>new signature</source>
-        <translation type="unfinished">nuevo compás</translation>
+        <translation type="obsolete">nuevo compás</translation>
     </message>
     <message>
-        <location line="+26"/>
         <source>Meter</source>
-        <translation type="unfinished">Metrónomo</translation>
+        <translation type="obsolete">Metrónomo</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Time</source>
-        <translation type="unfinished">Tiempo</translation>
+        <translation type="obsolete">Tiempo</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Type</source>
-        <translation type="unfinished">Tipo</translation>
+        <translation type="obsolete">Tipo</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Value</source>
-        <translation type="unfinished">Valor</translation>
+        <translation type="obsolete">Valor</translation>
     </message>
     <message>
-        <location line="-90"/>
         <source>MusE: Mastertrack</source>
-        <translation type="unfinished">MusE: Pista maestra</translation>
-    </message>
-    <message>
-        <location line="+25"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">MusE: Pista maestra</translation>
     </message>
     <message>
-        <location line="+23"/>
-        <source>Undo/Redo tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+9"/>
         <source>Tempo</source>
-        <translation type="unfinished">Tempo</translation>
+        <translation type="obsolete">Tempo</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Timesig</source>
-        <translation type="unfinished">compás</translation>
+        <translation type="obsolete">compás</translation>
     </message>
     <message>
-        <location line="-45"/>
         <source>&amp;Edit</source>
-        <translation type="unfinished">&amp;Editar</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Insert Tempo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Insert Signature</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Insert Key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Edit Positon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Edit Value</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Delete Event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+30"/>
-        <source>Edit tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>new key</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&amp;Editar</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>panic</source>
-        <translation type="unfinished">pánico</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>transport</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+408"/>
-        <source>Reposition of the initial tempo and signature events is not allowed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+54"/>
-        <source>MusE: List Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Input error, conversion not OK or value out of range</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>Reposition of tempo and signature events to start position is not allowed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">pánico</translation>
     </message>
 </context>
 <context>
@@ -6431,85 +5704,81 @@ Adjusts responsiveness of audio controls and
     <message>
         <location filename="../../muse/widgets/function_dialogs/legatobase.ui" line="+17"/>
         <source>MusE: Legato</source>
-        <translation type="unfinished"></translation>
+        <translation>MusE: Legato</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Range</source>
-        <translation type="unfinished">Rango</translation>
+        <translation>Rango</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>All Events</source>
-        <translation type="unfinished">Todos los eventos</translation>
+        <translation>Todos los eventos</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Selected Events</source>
-        <translation type="unfinished">Eventos seleccionados</translation>
+        <translation>Eventos seleccionados</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Looped Events</source>
-        <translation type="unfinished"></translation>
+        <translation>Eventos del bucle</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Selected Looped</source>
-        <translation type="unfinished"></translation>
+        <translation>Bucle seleccionado</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Configuración</translation>
     </message>
     <message>
         <location line="+24"/>
         <source> ticks</source>
-        <translation type="unfinished"></translation>
+        <translation> Tics</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>Minimum Length</source>
-        <translation type="unfinished"></translation>
+        <translation>Duración minima:</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Allow shortening notes</source>
-        <translation type="unfinished"></translation>
+        <translation>Permitir notas cortas</translation>
     </message>
     <message>
         <location line="+56"/>
         <source>OK</source>
-        <translation type="unfinished">Aceptar</translation>
+        <translation>Aceptar</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Cancel</source>
-        <translation type="unfinished">Cancelar</translation>
+        <translation>Cancelar</translation>
     </message>
 </context>
 <context>
     <name>ListEdit</name>
     <message>
-        <location filename="../../muse/liste/listedit.cpp" line="+486"/>
         <source>&amp;Edit</source>
-        <translation type="unfinished">&amp;Editar</translation>
+        <translation type="obsolete">&amp;Editar</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Cut</source>
-        <translation type="unfinished">Cortar</translation>
+        <translation type="obsolete">Cortar</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Copy</source>
-        <translation type="unfinished">Copiar</translation>
+        <translation type="obsolete">Copiar</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Paste</source>
-        <translation type="unfinished">Pegar</translation>
+        <translation type="obsolete">Pegar</translation>
     </message>
     <message>
         <source>List Tools</source>
@@ -6520,45 +5789,40 @@ Adjusts responsiveness of audio controls and
         <translation type="obsolete">Insertar herramientas</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Delete Events</source>
-        <translation type="unfinished">Borrar eventos</translation>
+        <translation type="obsolete">Borrar eventos</translation>
     </message>
     <message>
         <source>Insert Note</source>
         <translation type="obsolete">Insertar nota</translation>
     </message>
     <message>
-        <location line="-37"/>
         <source>insert Note</source>
-        <translation type="unfinished">insertar Nota</translation>
+        <translation type="obsolete">insertar Nota</translation>
     </message>
     <message>
         <source>Insert SysEx</source>
         <translation type="obsolete">Insertar sistema exclusivo</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>insert SysEx</source>
-        <translation type="unfinished">insertar sistema exclusivo</translation>
+        <translation type="obsolete">insertar sistema exclusivo</translation>
     </message>
     <message>
         <source>Insert Ctrl</source>
         <translation type="obsolete">Insertar controlador</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>insert Ctrl</source>
-        <translation type="unfinished">insertar controlador</translation>
+        <translation type="obsolete">insertar controlador</translation>
     </message>
     <message>
         <source>Insert Meta</source>
         <translation type="obsolete">Insertar Meta</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>insert Meta</source>
-        <translation type="unfinished">insertar Meta</translation>
+        <translation type="obsolete">insertar Meta</translation>
     </message>
     <message>
         <source>Insert Pitch</source>
@@ -6573,92 +5837,60 @@ Adjusts responsiveness of audio controls and
         <translation type="obsolete">Insertar AfterTouch de canal</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>insert Channel Aftertouch</source>
-        <translation type="unfinished">insertar AfterTouch de canal</translation>
+        <translation type="obsolete">insertar AfterTouch de canal</translation>
     </message>
     <message>
         <source>Insert Key Aftertouch</source>
         <translation type="obsolete">Insertar AfterTouch de tecla</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>insert Poly Aftertouch</source>
-        <translation type="unfinished">insertar AfterTouch Polifónico</translation>
+        <translation type="obsolete">insertar AfterTouch Polifónico</translation>
     </message>
     <message>
-        <location line="+42"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Undo/Redo tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
         <source>panic</source>
-        <translation type="unfinished">pánico</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>transport</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">pánico</translation>
     </message>
     <message>
-        <location line="+22"/>
         <source>Tick</source>
-        <translation type="unfinished">Tick</translation>
+        <translation type="obsolete">Tick</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Bar</source>
-        <translation type="unfinished">Compás</translation>
+        <translation type="obsolete">Compás</translation>
     </message>
     <message>
         <source>Typ</source>
         <translation type="obsolete">Tip</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Ch</source>
-        <translation type="unfinished">Cn</translation>
+        <translation type="obsolete">Cn</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Val A</source>
-        <translation type="unfinished">Val A</translation>
+        <translation type="obsolete">Val A</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Val B</source>
-        <translation type="unfinished">Val B</translation>
+        <translation type="obsolete">Val B</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Val C</source>
-        <translation type="unfinished">Val C</translation>
+        <translation type="obsolete">Val C</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Len</source>
-        <translation type="unfinished">Lon</translation>
+        <translation type="obsolete">Lon</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Comment</source>
-        <translation type="unfinished">Comentario</translation>
-    </message>
-    <message>
-        <location line="-38"/>
-        <source>Insert tools</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Comentario</translation>
     </message>
     <message>
-        <location line="+32"/>
         <source>Type</source>
-        <translation type="unfinished">Tipo</translation>
+        <translation type="obsolete">Tipo</translation>
     </message>
 </context>
 <context>
@@ -6666,27 +5898,27 @@ Adjusts responsiveness of audio controls and
     <message>
         <location filename="../../muse/widgets/mittransposebase.ui" line="+14"/>
         <source>MusE: Midi Input Plugin: Transpose</source>
-        <translation type="unfinished">MusE: Plugin de entrada MIDI : Transposición</translation>
+        <translation>MusE: Plugin de entrada MIDI : Transposición</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>On</source>
-        <translation type="unfinished">Encendido</translation>
+        <translation>Encendido</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>TriggerKey</source>
-        <translation type="unfinished">Tecla de salto</translation>
+        <translation>Tecla de salto</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>Transpose:</source>
-        <translation type="unfinished">Trasponer:</translation>
+        <translation>Trasponer:</translation>
     </message>
     <message>
         <location line="+31"/>
         <source>+0</source>
-        <translation type="unfinished">+0</translation>
+        <translation>+0</translation>
     </message>
 </context>
 <context>
@@ -6704,273 +5936,44 @@ Adjusts responsiveness of audio controls and
         <translation type="obsolete">MusE: Tabla de puertos MIDI</translation>
     </message>
     <message>
-        <location filename="../../muse/confmport.cpp" line="+236"/>
         <source>Port</source>
-        <translation type="unfinished">Puerto</translation>
+        <translation type="obsolete">Puerto</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>GUI</source>
-        <translation type="unfinished">GUI</translation>
+        <translation type="obsolete">GUI</translation>
     </message>
     <message>
         <source>Rec</source>
         <translation type="obsolete">Grabar</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Instrument</source>
-        <translation type="unfinished">Instrumento</translation>
+        <translation type="obsolete">Instrumento</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Device Name</source>
-        <translation type="unfinished">Nombre de dispositivo</translation>
+        <translation type="obsolete">Nombre de dispositivo</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>State</source>
-        <translation type="unfinished">Estado</translation>
+        <translation type="obsolete">Estado</translation>
     </message>
     <message>
         <source>unknown</source>
         <translation type="obsolete">desconocido</translation>
     </message>
     <message>
-        <location line="-8"/>
-        <source>I</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>O</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-715"/>
-        <source>MusE: bad device name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-254"/>
-        <location line="+176"/>
-        <source>Default input connections</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-175"/>
-        <location line="+66"/>
-        <source>Are you sure you want to apply to all existing midi tracks now?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-1"/>
-        <location line="+148"/>
-        <source>Default output connections</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-37"/>
-        <location line="+38"/>
-        <source>Setting will apply to new midi tracks.
-Do you want to apply to all existing midi tracks now?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+40"/>
-        <source>please choose a unique device name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+72"/>
-        <location line="+860"/>
-        <source>in</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-837"/>
-        <location line="+828"/>
-        <source>out</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-772"/>
-        <source>Show first aliases</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Show second aliases</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+130"/>
-        <location line="+42"/>
-        <source>Toggle all</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-38"/>
-        <location line="+43"/>
-        <source>Change all tracks now</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+43"/>
-        <source>Create</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source> device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+229"/>
-        <location line="+29"/>
         <source>Port Number</source>
-        <translation type="unfinished">Número de puerto</translation>
-    </message>
-    <message>
-        <location line="-28"/>
-        <source>Enable gui</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Enable reading</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Enable writing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Port instrument</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Midi device name. Click to edit (Jack)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Connections from Jack Midi outputs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Connections to Jack Midi inputs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Auto-connect these channels to new midi tracks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Auto-connect new midi tracks to these channels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Auto-connect new midi tracks to this channel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>Auto-connect these channels, on this port, to new midi tracks.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Connect new midi tracks to these channels, on this port.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Connect new midi tracks to this channel, on this port.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-45"/>
-        <source>Device state</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+15"/>
-        <source>Enable gui for device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Enable reading from device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Enable writing to device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Name of the midi device associated with this port number. Click to edit Jack midi name.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Número de puerto</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Instrument connected to port</source>
-        <translation type="unfinished">Instrumento conectado al puerto</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Connections from Jack Midi output ports</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Connections to Jack Midi input ports</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Instrumento conectado al puerto</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>State: result of opening the device</source>
-        <translation type="unfinished">Estado: resultado de abrir el puerto</translation>
-    </message>
-    <message>
-        <location line="+47"/>
-        <source>In routes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Out routes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Def in ch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Def out ch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+86"/>
-        <source>&lt;unknown&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+87"/>
-        <location line="+74"/>
-        <source>&lt;none&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Estado: resultado de abrir el puerto</translation>
     </message>
 </context>
 <context>
@@ -6978,47 +5981,47 @@ Do you want to apply to all existing midi tracks now?</source>
     <message>
         <location filename="../../muse/mplugins/mrconfigbase.ui" line="+14"/>
         <source>MusE: Midi Input Plugin: Remote Control</source>
-        <translation type="unfinished">MusE: Pluginde entrada MIDI : Control remoto</translation>
+        <translation>MusE: Pluginde entrada MIDI : Control remoto</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Activate</source>
-        <translation type="unfinished">Activar</translation>
+        <translation>Activar</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>On</source>
-        <translation type="unfinished">Encendido</translation>
+        <translation>Encendido</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Actions</source>
-        <translation type="unfinished">Acciones</translation>
+        <translation>Acciones</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Stop</source>
-        <translation type="unfinished">Parar</translation>
+        <translation>Parar</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Record</source>
-        <translation type="unfinished">Grabar</translation>
+        <translation>Grabar</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Goto Left Mark</source>
-        <translation type="unfinished">Ir ala marca izquierda</translation>
+        <translation>Ir a marca izquierda</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Play</source>
-        <translation type="unfinished">Reproducir</translation>
+        <translation>Reproducir</translation>
     </message>
     <message>
         <location line="+25"/>
         <source>Insert rest (step rec) </source>
-        <translation type="unfinished"></translation>
+        <translation>Insertar el resto</translation>
     </message>
 </context>
 <context>
@@ -7038,68 +6041,44 @@ Do you want to apply to all existing midi tracks now?</source>
 <context>
     <name>MarkerView</name>
     <message>
-        <location filename="../../muse/marker/markerview.cpp" line="+192"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Undo/Redo tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+9"/>
         <source>panic</source>
-        <translation type="unfinished">pánico</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>transport</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">pánico</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Bar:Beat:Tick</source>
-        <translation type="unfinished">Barra:Golpe:Tick</translation>
+        <translation type="obsolete">Barra:Golpe:Tick</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Hr:Mn:Sc:Fr:Sf</source>
-        <translation type="unfinished">Hr:Mn:Sg:Fr:Sf</translation>
+        <translation type="obsolete">Hr:Mn:Sg:Fr:Sf</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Lock</source>
-        <translation type="unfinished">Bloquear</translation>
+        <translation type="obsolete">Bloquear</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Text</source>
-        <translation type="unfinished">Texto</translation>
+        <translation type="obsolete">Texto</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Marker Properties</source>
-        <translation type="unfinished">Propiedades del marcador</translation>
+        <translation type="obsolete">Propiedades del marcador</translation>
     </message>
     <message>
-        <location line="-70"/>
         <source>MusE: Marker</source>
-        <translation type="unfinished">MusE: Marcador</translation>
+        <translation type="obsolete">MusE: Marcador</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>add marker</source>
-        <translation type="unfinished">Agregar marcador</translation>
+        <translation type="obsolete">Agregar marcador</translation>
     </message>
     <message>
         <source>Add Marker</source>
         <translation type="obsolete">Agregar marcador</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>delete marker</source>
-        <translation type="unfinished">borrar marcador</translation>
+        <translation type="obsolete">borrar marcador</translation>
     </message>
     <message>
         <source>Delete Marker</source>
@@ -7110,81 +6089,55 @@ Do you want to apply to all existing midi tracks now?</source>
         <translation type="obsolete">&amp;Archivo</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>&amp;Edit</source>
-        <translation type="unfinished">&amp;Editar</translation>
+        <translation type="obsolete">&amp;Editar</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>edit tools</source>
-        <translation type="unfinished">editar herramientas</translation>
+        <translation type="obsolete">editar herramientas</translation>
     </message>
 </context>
 <context>
     <name>MasterEdit</name>
     <message>
-        <location filename="../../muse/master/masteredit.cpp" line="-15"/>
         <source>Cursor</source>
-        <translation type="unfinished">Cursor</translation>
+        <translation type="obsolete">Cursor</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Snap</source>
-        <translation type="unfinished">Snap</translation>
+        <translation type="obsolete">Snap</translation>
     </message>
     <message>
-        <location line="-10"/>
         <source>time at cursor position</source>
-        <translation type="unfinished">tiempo en la posición del cursor</translation>
+        <translation type="obsolete">tiempo en la posición del cursor</translation>
     </message>
     <message>
-        <location line="-41"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Undo/Redo tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
         <source>panic</source>
-        <translation type="unfinished">pánico</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>transport</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">pánico</translation>
     </message>
     <message>
-        <location line="+30"/>
         <source>tempo at cursor position</source>
-        <translation type="unfinished">tempo en la posición del cursor</translation>
+        <translation type="obsolete">tempo en la posición del cursor</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>CurPos </source>
-        <translation type="unfinished">Posición del cursor </translation>
+        <translation type="obsolete">Posición del cursor </translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>tempo at current position</source>
-        <translation type="unfinished">tempo en la posición actual</translation>
+        <translation type="obsolete">tempo en la posición actual</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>time signature at current position</source>
-        <translation type="unfinished">compás en la posición actual</translation>
+        <translation type="obsolete">compás en la posición actual</translation>
     </message>
     <message>
         <source>Master</source>
         <translation type="obsolete">Maestro</translation>
     </message>
     <message>
-        <location line="-72"/>
         <source>MusE: Mastertrack</source>
-        <translation type="unfinished">Muse: Pista Maestra</translation>
+        <translation type="obsolete">Muse: Pista Maestra</translation>
     </message>
     <message>
         <source>edit tools</source>
@@ -7199,56 +6152,40 @@ Do you want to apply to all existing midi tracks now?</source>
         <translation type="obsolete">usar pista maestra</translation>
     </message>
     <message>
-        <location line="+39"/>
         <source>Info</source>
-        <translation type="unfinished">Info</translation>
+        <translation type="obsolete">Info</translation>
     </message>
     <message>
         <source>Off</source>
         <translation type="obsolete">Apagado</translation>
     </message>
-    <message>
-        <location line="-6"/>
-        <source>Enable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Enable usage of master track</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-5"/>
-        <source>Enable master</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>MdiSettingsBase</name>
     <message>
         <location filename="../../muse/widgets/mdisettings_base.ui" line="+14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Forma</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>GroupBox</source>
-        <translation type="unfinished"></translation>
+        <translation>Grupos</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>MDI subwin</source>
-        <translation type="unfinished"></translation>
+        <translation>MDI sub ventana</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Shares menu when subwin</source>
-        <translation type="unfinished"></translation>
+        <translation>Acciones de menú cuando es sub ventana</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Shares menu when free</source>
-        <translation type="unfinished"></translation>
+        <translation>Acciones de menú cuando es ventana libre</translation>
     </message>
 </context>
 <context>
@@ -7256,142 +6193,142 @@ Do you want to apply to all existing midi tracks now?</source>
     <message>
         <location filename="../../muse/widgets/metronomebase.ui" line="+14"/>
         <source>MusE: Metronome Config</source>
-        <translation type="unfinished">MusE: Configuración del metrónomo</translation>
+        <translation>MusE: Configuración del metrónomo</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Metronome</source>
-        <translation type="unfinished">Metrónomo</translation>
+        <translation>Metrónomo</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Audio Beep</source>
-        <translation type="unfinished">Bip de audio</translation>
+        <translation>Bip de audio</translation>
     </message>
     <message>
         <location line="+65"/>
         <source>MIDI Click</source>
-        <translation type="unfinished">Click MIDI</translation>
+        <translation>Clic MIDI</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>Midi Channel</source>
-        <translation type="unfinished">Canal MIDI</translation>
+        <translation>Canal MIDI</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Measure Note</source>
-        <translation type="unfinished">Nota de compás</translation>
+        <translation>Nota de compás</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Measure Velocity</source>
-        <translation type="unfinished">Velocidad de compás</translation>
+        <translation>Velocidad de compás</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Beat Velocity</source>
-        <translation type="unfinished">Velocidad de barra</translation>
+        <translation>Velocidad de barra</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Beat Note</source>
-        <translation type="unfinished">Nota de barra</translation>
+        <translation>Nota de barra</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Midi Port</source>
-        <translation type="unfinished">Puerto MIDI</translation>
+        <translation>Puerto MIDI</translation>
     </message>
     <message>
         <location line="+42"/>
         <source>Precount</source>
-        <translation type="unfinished">Cuenta atrás</translation>
+        <translation>Cuenta atrás</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>enable</source>
-        <translation type="unfinished">habilitada</translation>
+        <translation>habilitada</translation>
     </message>
     <message>
         <location line="+34"/>
         <source>Bars</source>
-        <translation type="unfinished">Compases</translation>
+        <translation>Compases</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>From Mastertrack</source>
-        <translation type="unfinished">desde la pista Mestra</translation>
+        <translation>desde la pista Mestra</translation>
     </message>
     <message>
         <location line="+34"/>
         <source>/</source>
-        <translation type="unfinished">/</translation>
+        <translation>/</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>Signature</source>
-        <translation type="unfinished">compás</translation>
+        <translation>Compás</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Prerecord</source>
-        <translation type="unfinished">pre-captura</translation>
+        <translation>Pre-captura</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Preroll</source>
-        <translation type="unfinished">pre-escucha</translation>
+        <translation>Pre-escucha</translation>
     </message>
     <message>
         <location line="+38"/>
         <source>&amp;Apply</source>
-        <translation type="unfinished">&amp;Aplicar</translation>
+        <translation>&amp;Aplicar</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>&amp;OK</source>
-        <translation type="unfinished">Ac&amp;eptar</translation>
+        <translation>Ac&amp;eptar</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>&amp;Cancel</source>
-        <translation type="unfinished">&amp;Cancelar</translation>
+        <translation>&amp;Cancelar</translation>
     </message>
     <message>
         <location line="-425"/>
         <source>Choose outputs...</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionar salidas...</translation>
     </message>
     <message>
         <location line="+36"/>
         <source>50</source>
-        <translation type="unfinished">5 1/3&apos; {50?}</translation>
+        <translation>50</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>% Audio volume</source>
-        <translation type="unfinished"></translation>
+        <translation>% De volúmen de audio</translation>
     </message>
     <message>
         <location line="+324"/>
         <source>Hint: Enable metronome in Transportpanel</source>
-        <translation type="unfinished"></translation>
+        <translation>Habilitar metrónomo en el panel de transporte</translation>
     </message>
     <message>
         <location line="+29"/>
         <source>Alt+A</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt+A</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Alt+O</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt+O</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Alt+C</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt+C</translation>
     </message>
 </context>
 <context>
@@ -7577,158 +6514,156 @@ clase de controladores en la lista de MusE.</translation>
     <message>
         <location filename="../../muse/mplugins/midifilter.ui" line="+20"/>
         <source>MusE:  Midi Input Filter</source>
-        <translation type="unfinished">MusE:  Filtro de entrada MIDI</translation>
+        <translation>MusE:  Filtro de entrada MIDI</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Record Filter</source>
-        <translation type="unfinished">Filtro de captura</translation>
+        <translation>Filtro de captura</translation>
     </message>
     <message>
         <location line="+18"/>
         <location line="+112"/>
         <source>Note On</source>
-        <translation type="unfinished">Nota on</translation>
+        <translation>Nota on</translation>
     </message>
     <message>
         <location line="-99"/>
         <location line="+112"/>
         <source>Poly Pressure</source>
-        <translation type="unfinished">Presión polifónica</translation>
+        <translation>Presión polifónica</translation>
     </message>
     <message>
         <location line="-99"/>
         <location line="+112"/>
         <source>Controller</source>
-        <translation type="unfinished">Caontrolador</translation>
+        <translation>Controlador</translation>
     </message>
     <message>
         <location line="-99"/>
         <location line="+112"/>
         <source>Program Change</source>
-        <translation type="unfinished">Cambio de programa</translation>
+        <translation>Cambio de programa</translation>
     </message>
     <message>
         <location line="-99"/>
         <location line="+112"/>
         <source>After Touch</source>
-        <translation type="unfinished">After Touch</translation>
+        <translation>After Touch</translation>
     </message>
     <message>
         <location line="-99"/>
         <location line="+112"/>
         <source>Pitch Bend</source>
-        <translation type="unfinished">Rueda de bend</translation>
+        <translation>Rueda de afinación</translation>
     </message>
     <message>
         <location line="-99"/>
         <location line="+112"/>
         <source>Sysex</source>
-        <translation type="unfinished">Sistema exclusivo</translation>
+        <translation>Sistema exclusivo</translation>
     </message>
     <message>
         <location line="-96"/>
         <source>Thru Filter</source>
-        <translation type="unfinished">Filtro Thru</translation>
+        <translation>Filtro Thru</translation>
     </message>
     <message>
         <location line="+112"/>
         <source>Controller Filter</source>
-        <translation type="unfinished">Filtrar controlador</translation>
+        <translation>Filtrar controlador</translation>
     </message>
     <message>
         <location line="+33"/>
         <source>Channel Filter</source>
-        <translation type="unfinished">Filtro de canal</translation>
+        <translation>Filtro de canal</translation>
     </message>
     <message>
         <location line="+24"/>
         <source>14</source>
-        <translation type="unfinished">14</translation>
+        <translation>14</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>10</source>
-        <translation type="unfinished">10</translation>
+        <translation>10</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>6</source>
-        <translation type="unfinished">6</translation>
+        <translation>6</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>12</source>
-        <translation type="unfinished">12</translation>
+        <translation>12</translation>
     </message>
     <message>
         <location line="+28"/>
         <source>4</source>
-        <translation type="unfinished">4</translation>
+        <translation>4</translation>
     </message>
     <message>
         <location line="+28"/>
         <source>2</source>
-        <translation type="unfinished">2</translation>
+        <translation>2</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>9</source>
-        <translation type="unfinished">9</translation>
+        <translation>9</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>8</source>
-        <translation type="unfinished">8</translation>
+        <translation>8</translation>
     </message>
     <message>
         <location line="+28"/>
         <source>3</source>
-        <translation type="unfinished">3</translation>
+        <translation>3</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>13</source>
-        <translation type="unfinished">13</translation>
+        <translation>13</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>15</source>
-        <translation type="unfinished">15</translation>
+        <translation>15</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>16</source>
-        <translation type="unfinished">16</translation>
+        <translation>16</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>7</source>
-        <translation type="unfinished">7</translation>
+        <translation>7</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>11</source>
-        <translation type="unfinished">11</translation>
+        <translation>11</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>5</source>
-        <translation type="unfinished">5</translation>
+        <translation>5</translation>
     </message>
     <message>
         <location line="+28"/>
         <source>1</source>
-        <translation type="unfinished">1</translation>
+        <translation>1</translation>
     </message>
 </context>
 <context>
     <name>MidiInputTransformDialog</name>
     <message>
-        <location filename="../../muse/mplugins/midiitransform.cpp" line="+718"/>
-        <location line="+2"/>
         <source>New</source>
-        <translation type="unfinished">Nueva</translation>
+        <translation type="obsolete">Nueva</translation>
     </message>
 </context>
 <context>
@@ -7736,17 +6671,17 @@ clase de controladores en la lista de MusE.</translation>
     <message>
         <location filename="../../muse/widgets/itransformbase.ui" line="+14"/>
         <source>MusE: Midi Input Transformator</source>
-        <translation type="unfinished">MusE: Transformador de entrada MIDI</translation>
+        <translation>MusE: Transformador de entrada MIDI</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Filter</source>
-        <translation type="unfinished">Filtrar</translation>
+        <translation>Filtro</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>All</source>
-        <translation type="unfinished">Todo</translation>
+        <translation>Todo</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -7755,7 +6690,7 @@ clase de controladores en la lista de MusE.</translation>
         <location line="+39"/>
         <location line="+39"/>
         <source>Equal</source>
-        <translation type="unfinished">Igual</translation>
+        <translation>Igual</translation>
     </message>
     <message>
         <location line="-224"/>
@@ -7764,55 +6699,55 @@ clase de controladores en la lista de MusE.</translation>
         <location line="+39"/>
         <location line="+39"/>
         <source>Unequal</source>
-        <translation type="unfinished">Diferente</translation>
+        <translation>Diferente</translation>
     </message>
     <message>
         <location line="-217"/>
         <source>Note</source>
-        <translation type="unfinished">Nota</translation>
+        <translation>Nota</translation>
     </message>
     <message>
         <location line="+5"/>
         <location line="+338"/>
         <source>Poly Pressure</source>
-        <translation type="unfinished">Presión polifóica</translation>
+        <translation>Presión polifóica</translation>
     </message>
     <message>
         <location line="-333"/>
         <location line="+338"/>
         <source>Control Change</source>
-        <translation type="unfinished">Cambio de control</translation>
+        <translation>Cambio de control</translation>
     </message>
     <message>
         <location line="-333"/>
         <location line="+338"/>
         <source>Aftertouch</source>
-        <translation type="unfinished">AfterTouch</translation>
+        <translation>AfterTouch</translation>
     </message>
     <message>
         <location line="-333"/>
         <location line="+338"/>
         <source>Pitch Bend</source>
-        <translation type="unfinished">Rueda de modulación</translation>
+        <translation>Rueda de modulación</translation>
     </message>
     <message>
         <location line="-333"/>
         <location line="+338"/>
         <source>NRPN</source>
-        <translation type="unfinished">NRPN</translation>
+        <translation>NRPN</translation>
     </message>
     <message>
         <location line="-333"/>
         <location line="+338"/>
         <source>RPN</source>
-        <translation type="unfinished">RPN</translation>
+        <translation>RPN</translation>
     </message>
     <message>
         <location line="-330"/>
         <location line="+369"/>
         <location line="+43"/>
         <source>Value 2</source>
-        <translation type="unfinished">Valor 2</translation>
+        <translation>Valor 2</translation>
     </message>
     <message>
         <location line="-402"/>
@@ -7821,13 +6756,13 @@ clase de controladores en la lista de MusE.</translation>
         <location line="+54"/>
         <location line="+54"/>
         <source>Value 1</source>
-        <translation type="unfinished">Valor 1</translation>
+        <translation>Valor 1</translation>
     </message>
     <message>
         <location line="-586"/>
         <location line="+257"/>
         <source>Event Type</source>
-        <translation type="unfinished">Tipo de Evento</translation>
+        <translation>Tipo de Evento</translation>
     </message>
     <message>
         <location line="-246"/>
@@ -7835,7 +6770,7 @@ clase de controladores en la lista de MusE.</translation>
         <location line="+39"/>
         <location line="+39"/>
         <source>Ignore</source>
-        <translation type="unfinished">Ignorar</translation>
+        <translation>Ignorar</translation>
     </message>
     <message>
         <location line="-123"/>
@@ -7843,7 +6778,7 @@ clase de controladores en la lista de MusE.</translation>
         <location line="+39"/>
         <location line="+39"/>
         <source>Higher</source>
-        <translation type="unfinished">Mayor</translation>
+        <translation>Mayor</translation>
     </message>
     <message>
         <location line="-133"/>
@@ -7851,7 +6786,7 @@ clase de controladores en la lista de MusE.</translation>
         <location line="+39"/>
         <location line="+39"/>
         <source>Lower</source>
-        <translation type="unfinished">Menor</translation>
+        <translation>Menor</translation>
     </message>
     <message>
         <location line="-133"/>
@@ -7859,7 +6794,7 @@ clase de controladores en la lista de MusE.</translation>
         <location line="+39"/>
         <location line="+39"/>
         <source>Inside</source>
-        <translation type="unfinished">Entre</translation>
+        <translation>Entre</translation>
     </message>
     <message>
         <location line="-133"/>
@@ -7867,24 +6802,24 @@ clase de controladores en la lista de MusE.</translation>
         <location line="+39"/>
         <location line="+39"/>
         <source>Outside</source>
-        <translation type="unfinished">Fuera</translation>
+        <translation>Fuera</translation>
     </message>
     <message>
         <location line="+8"/>
         <location line="+422"/>
         <source>Channel</source>
-        <translation type="unfinished">Canal</translation>
+        <translation>Canal</translation>
     </message>
     <message>
         <location line="-412"/>
         <location line="+240"/>
         <source>Port</source>
-        <translation type="unfinished">Puerto</translation>
+        <translation>Puerto</translation>
     </message>
     <message>
         <location line="-192"/>
         <source>Processing</source>
-        <translation type="unfinished">Procesando</translation>
+        <translation>Procesando</translation>
     </message>
     <message>
         <location line="+23"/>
@@ -7893,7 +6828,7 @@ clase de controladores en la lista de MusE.</translation>
         <location line="+54"/>
         <location line="+54"/>
         <source>Keep</source>
-        <translation type="unfinished">Mantener</translation>
+        <translation>Mantener</translation>
     </message>
     <message>
         <location line="-283"/>
@@ -7902,7 +6837,7 @@ clase de controladores en la lista de MusE.</translation>
         <location line="+54"/>
         <location line="+54"/>
         <source>Fix</source>
-        <translation type="unfinished">Arreglar</translation>
+        <translation>Arreglar</translation>
     </message>
     <message>
         <location line="-257"/>
@@ -7910,7 +6845,7 @@ clase de controladores en la lista de MusE.</translation>
         <location line="+54"/>
         <location line="+54"/>
         <source>Plus</source>
-        <translation type="unfinished">Más</translation>
+        <translation>Más</translation>
     </message>
     <message>
         <location line="-232"/>
@@ -7918,7 +6853,7 @@ clase de controladores en la lista de MusE.</translation>
         <location line="+54"/>
         <location line="+54"/>
         <source>Minus</source>
-        <translation type="unfinished">Menos</translation>
+        <translation>Menos</translation>
     </message>
     <message>
         <location line="-232"/>
@@ -7926,7 +6861,7 @@ clase de controladores en la lista de MusE.</translation>
         <location line="+54"/>
         <location line="+54"/>
         <source>Multiply</source>
-        <translation type="unfinished">Multiplicar</translation>
+        <translation>Multiplicar</translation>
     </message>
     <message>
         <location line="-232"/>
@@ -7934,7 +6869,7 @@ clase de controladores en la lista de MusE.</translation>
         <location line="+54"/>
         <location line="+54"/>
         <source>Divide</source>
-        <translation type="unfinished">Dividir</translation>
+        <translation>Dividir</translation>
     </message>
     <message>
         <location line="-222"/>
@@ -7942,17 +6877,17 @@ clase de controladores en la lista de MusE.</translation>
         <location line="+54"/>
         <location line="+54"/>
         <source>Invert</source>
-        <translation type="unfinished">Invertir</translation>
+        <translation>Invertir</translation>
     </message>
     <message>
         <location line="-232"/>
         <source>ScaleMap</source>
-        <translation type="unfinished">Mapa de escalado</translation>
+        <translation>Mapa de escalado</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Flip</source>
-        <translation type="unfinished">cambiar</translation>
+        <translation>cambiar</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -7960,7 +6895,7 @@ clase de controladores en la lista de MusE.</translation>
         <location line="+54"/>
         <location line="+54"/>
         <source>Dyn</source>
-        <translation type="unfinished">Dinámico</translation>
+        <translation>Dinámico</translation>
     </message>
     <message>
         <location line="-222"/>
@@ -7968,102 +6903,102 @@ clase de controladores en la lista de MusE.</translation>
         <location line="+54"/>
         <location line="+54"/>
         <source>Random</source>
-        <translation type="unfinished">Aleatorio</translation>
+        <translation>Aleatorio</translation>
     </message>
     <message>
         <location line="+48"/>
         <source>Modules</source>
-        <translation type="unfinished">Módulos</translation>
+        <translation>Módulos</translation>
     </message>
     <message>
         <location line="+33"/>
         <source>1</source>
-        <translation type="unfinished">1</translation>
+        <translation>1</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>2</source>
-        <translation type="unfinished">2</translation>
+        <translation>2</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>3</source>
-        <translation type="unfinished">3</translation>
+        <translation>3</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>4</source>
-        <translation type="unfinished">4</translation>
+        <translation>4</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>enable modul 1</source>
-        <translation type="unfinished">habilitar módulo 1</translation>
+        <translation>habilitar módulo 1</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>enable modul 2</source>
-        <translation type="unfinished">habilitar módulo 2</translation>
+        <translation>habilitar módulo 2</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>enable modul 3</source>
-        <translation type="unfinished">habilitar módulo 3</translation>
+        <translation>habilitar módulo 3</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>enable modul 4</source>
-        <translation type="unfinished">habilitar módulo 4</translation>
+        <translation>habilitar módulo 4</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>Preset</source>
-        <translation type="unfinished">Preselección</translation>
+        <translation>Preselección</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Name:</source>
-        <translation type="unfinished">Nombre:</translation>
+        <translation>Nombre:</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Comment:</source>
-        <translation type="unfinished">Comentario:</translation>
+        <translation>Comentario:</translation>
     </message>
     <message>
         <location line="+29"/>
         <source>Function</source>
-        <translation type="unfinished">Función</translation>
+        <translation>Función</translation>
     </message>
     <message>
         <location line="+29"/>
         <source>&amp;New</source>
-        <translation type="unfinished">&amp;Nueva</translation>
+        <translation>&amp;Nueva</translation>
     </message>
     <message>
         <location line="-3"/>
         <source>create new preset</source>
-        <translation type="unfinished">crea nueva preselección</translation>
+        <translation>crea nueva preselección</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>&amp;Delete</source>
-        <translation type="unfinished">&amp;Borrar</translation>
+        <translation>&amp;Borrar</translation>
     </message>
     <message>
         <location line="-3"/>
         <source>delete preset</source>
-        <translation type="unfinished">borra la preselección</translation>
+        <translation>borra la preselección</translation>
     </message>
     <message>
         <location line="+29"/>
         <source>&amp;Dismiss</source>
-        <translation type="unfinished">&amp;Ocultar</translation>
+        <translation>&amp;Ocultar</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>PresetList</source>
-        <translation type="unfinished">Lista de Preselecciones</translation>
+        <translation>Lista de Preselecciones</translation>
     </message>
 </context>
 <context>
@@ -8251,87 +7186,87 @@ clase de controladores en la lista de MusE.</translation>
     <message>
         <location filename="../../muse/widgets/midisync.ui" line="+17"/>
         <source>MusE: Midi Sync</source>
-        <translation type="unfinished">MusE: Sincronización MIDI</translation>
+        <translation>MusE: Sincronización MIDI</translation>
     </message>
     <message>
         <location line="+30"/>
         <source>Apply</source>
-        <translation type="unfinished">Aplicar</translation>
+        <translation>Aplicar</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Ok</source>
-        <translation type="unfinished">Aceptar</translation>
+        <translation>Aceptar</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Cancel</source>
-        <translation type="unfinished">Cancelar</translation>
+        <translation>Cancelar</translation>
     </message>
     <message>
         <location line="+99"/>
         <source>hour</source>
-        <translation type="unfinished">hora</translation>
+        <translation>hora</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>h</source>
-        <translation type="unfinished">h</translation>
+        <translation>h</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>minute</source>
-        <translation type="unfinished">minuto</translation>
+        <translation>minuto</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>m</source>
-        <translation type="unfinished">m</translation>
+        <translation>m</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>second</source>
-        <translation type="unfinished">segundo</translation>
+        <translation>segundo</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>s</source>
-        <translation type="unfinished">s</translation>
+        <translation>s</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>frame</source>
-        <translation type="unfinished">frame</translation>
+        <translation>frame</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>f</source>
-        <translation type="unfinished">f</translation>
+        <translation>f</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>subframe</source>
-        <translation type="unfinished">sub-frame</translation>
+        <translation>sub-frame</translation>
     </message>
     <message>
         <location line="-148"/>
         <source>24</source>
-        <translation type="unfinished">24</translation>
+        <translation>24</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>25</source>
-        <translation type="unfinished">25</translation>
+        <translation>25</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>30D</source>
-        <translation type="unfinished">30D</translation>
+        <translation>30D</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>30N</source>
-        <translation type="unfinished">30N</translation>
+        <translation>30N</translation>
     </message>
     <message>
         <source>Id:</source>
@@ -8400,43 +7335,43 @@ clase de controladores en la lista de MusE.</translation>
     <message>
         <location line="-46"/>
         <source>MTC</source>
-        <translation type="unfinished">MTC</translation>
+        <translation>MTC</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Type:</source>
-        <translation type="unfinished">Tipo:</translation>
+        <translation>Tipo:</translation>
     </message>
     <message>
         <location line="+60"/>
         <source>Offset:</source>
-        <translation type="unfinished">Desplazamiento:</translation>
+        <translation>Desplazamiento:</translation>
     </message>
     <message>
         <location line="+117"/>
         <source>Sync receiving and sending</source>
-        <translation type="unfinished"></translation>
+        <translation>Sincronizar la recepción y envío</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Send and receive Jack transport</source>
-        <translation type="unfinished"></translation>
+        <translation>Recepción y envío del transporte de Jack</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Send and receive Jack transport information,
  including stop, start and position.</source>
-        <translation type="unfinished"></translation>
+        <translation>Información de la recepción y envío del transporte de Jack, incluye detener, iniciar y posición.</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Use Jack transport</source>
-        <translation type="unfinished"></translation>
+        <translation>Usar transporte de Jack</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Make MusE the Jack transport Timebase Master</source>
-        <translation type="unfinished"></translation>
+        <translation>Hacer de MusE el transporte de base de tiempo principal para Jack</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -8446,17 +7381,22 @@ Allows Jack to show time as
 MusE will try to become master, but other 
  Jack clients can also take over later.
 You can always click here again for Master.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hacer de MusE el transporte de base de tiempo principal para Jack
+Permite a Jack para mostrar el tiempo como
+  Compases de MusE , pulso, e inserciones.
+MusE tratará de convertirse en maestro, pero otros
+  clientes de Jack también pueden hacerlo más adelante.
+Siempre puede hacer clic aquí de nuevo para definir como maestro.</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Jack transport Timebase Master</source>
-        <translation type="unfinished"></translation>
+        <translation>Usar Jack como transporte maestro</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Control MusE timing by external midi clock or MTC sync</source>
-        <translation type="unfinished"></translation>
+        <translation>Control de tiempo de MusE por el reloj MIDI externo o sincronización MTC</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -8465,17 +7405,21 @@ You can always click here again for Master.</source>
 MusE can sync to midi clock, or MTC quarter frame sync. 
 Enabled inputs in the list will
  be in effect (RMC, RMMC, RMTC).</source>
-        <translation type="unfinished"></translation>
+        <translation>Cuando está en modo esclavo, el tempo es
+  controlado externamente.
+Muse se sincroniza con el reloj midi, o sincronización MTC 
+Entradas habilitadas en la lista
+  que rigen (RMC, RMMC, CRFM).</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Slave to external sync</source>
-        <translation type="unfinished"></translation>
+        <translation>Esclavo de sincronía externa</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Send start to first clock delay</source>
-        <translation type="unfinished"></translation>
+        <translation>Retraso del envío de empezar el primer reloj.</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -8483,17 +7427,19 @@ Enabled inputs in the list will
  to synchronize to MusE. This value is the
  delay from sending start to sending
  the first clock.</source>
-        <translation type="unfinished"></translation>
+        <translation>Permite &quot;sincronización lenta&quot; para dispositivos
+  sincronizar con Muse. Este valor es el
+  retraso del envío de empezar  el primer reloj.</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>ms</source>
-        <translation type="unfinished"></translation>
+        <translation>ms</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>Send sync delay</source>
-        <translation type="unfinished"></translation>
+        <translation>Enviar retraso de sincronización</translation>
     </message>
 </context>
 <context>
@@ -8501,12 +7447,12 @@ Enabled inputs in the list will
     <message>
         <location filename="../../muse/widgets/mtrackinfobase.ui" line="+38"/>
         <source>MusE: TrackInfo</source>
-        <translation type="unfinished">MusE: Información de pista</translation>
+        <translation>MusE: Información de pista</translation>
     </message>
     <message>
         <location line="+59"/>
         <source>output channel</source>
-        <translation type="unfinished">canal de salida</translation>
+        <translation>canal de salida</translation>
     </message>
     <message>
         <source>all midi events are send to this output channel</source>
@@ -8520,7 +7466,7 @@ Enabled inputs in the list will
         <location line="+249"/>
         <location line="+91"/>
         <source>%</source>
-        <translation type="unfinished">%</translation>
+        <translation>%</translation>
     </message>
     <message>
         <source>Track Name</source>
@@ -8529,12 +7475,12 @@ Enabled inputs in the list will
     <message>
         <location line="-353"/>
         <source>output port</source>
-        <translation type="unfinished">puerto de salida</translation>
+        <translation>puerto de salida</translation>
     </message>
     <message>
         <location line="+68"/>
         <source>iR</source>
-        <translation type="unfinished"></translation>
+        <translation>ER</translation>
     </message>
     <message>
         <location line="+109"/>
@@ -8545,7 +7491,7 @@ Enabled inputs in the list will
         <location line="+67"/>
         <location line="+70"/>
         <source>off</source>
-        <translation type="unfinished">apagado</translation>
+        <translation>apagado</translation>
     </message>
     <message>
         <source>change stereo position</source>
@@ -8570,7 +7516,7 @@ Enabled inputs in the list will
     <message>
         <location line="-552"/>
         <source>Transp.</source>
-        <translation type="unfinished">Transposición</translation>
+        <translation>Transporte</translation>
     </message>
     <message>
         <source>Volume</source>
@@ -8579,47 +7525,47 @@ Enabled inputs in the list will
     <message>
         <location line="+210"/>
         <source>Channel Info</source>
-        <translation type="unfinished">Información de Canal</translation>
+        <translation>Información de Canal</translation>
     </message>
     <message>
         <location line="+35"/>
         <source>Rec:</source>
-        <translation type="unfinished"></translation>
+        <translation>Grabar </translation>
     </message>
     <message>
         <location line="+200"/>
         <source>Prog</source>
-        <translation type="unfinished"></translation>
+        <translation>Programa </translation>
     </message>
     <message>
         <location line="+67"/>
         <source>Vol</source>
-        <translation type="unfinished"></translation>
+        <translation> Volumen </translation>
     </message>
     <message>
         <location line="+70"/>
         <source>Pan</source>
-        <translation type="unfinished">Balance</translation>
+        <translation>Panorama</translation>
     </message>
     <message>
         <location line="-541"/>
         <source>Delay</source>
-        <translation type="unfinished">Delay</translation>
+        <translation>Retardo</translation>
     </message>
     <message>
         <location line="+293"/>
         <source>H-Bank</source>
-        <translation type="unfinished">Banco-H</translation>
+        <translation>Banco-superior</translation>
     </message>
     <message>
         <location line="-155"/>
         <source>Compr.</source>
-        <translation type="unfinished">Compr.</translation>
+        <translation>Compresión</translation>
     </message>
     <message>
         <location line="+208"/>
         <source>L-Bank</source>
-        <translation type="unfinished">Banco-L</translation>
+        <translation>Banco-inferior</translation>
     </message>
     <message>
         <source>Progr.</source>
@@ -8628,12 +7574,12 @@ Enabled inputs in the list will
     <message>
         <location line="-255"/>
         <source>Velocity</source>
-        <translation type="unfinished">Velocidad</translation>
+        <translation> Velocidad</translation>
     </message>
     <message>
         <location line="-47"/>
         <source>Length</source>
-        <translation type="unfinished">Longitud</translation>
+        <translation>Duración</translation>
     </message>
     <message>
         <source>input ports</source>
@@ -8669,17 +7615,17 @@ Puedes especificar más de un canal para grabar:
     <message>
         <location line="-268"/>
         <source>all midi events are sent to this output channel</source>
-        <translation type="unfinished"></translation>
+        <translation>Todos los eventos MIDI se envían a este canal de salida</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Out ch</source>
-        <translation type="unfinished"></translation>
+        <translation>Canal de salida</translation>
     </message>
     <message>
         <location line="+27"/>
         <source>input routing</source>
-        <translation type="unfinished"></translation>
+        <translation>Ruteo de entrada</translation>
     </message>
     <message>
         <source>Inputs</source>
@@ -8688,100 +7634,103 @@ Puedes especificar más de un canal para grabar:
     <message>
         <location line="+16"/>
         <source>output routing</source>
-        <translation type="unfinished">ruteado de entrada</translation>
+        <translation>ruteado de entrada</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>oR</source>
-        <translation type="unfinished"></translation>
+        <translation>SR</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>input detect</source>
-        <translation type="unfinished"></translation>
+        <translation>Detectar entrada</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Input detect indicator. Detects all note on-off, controller, aftertouch, 
                   program change, and pitchbend (but not sysex or realtime) events 
                   on the selected channels, on the selected midi ports.</source>
-        <translation type="unfinished"></translation>
+        <translation>Indicador de entrada. Detecta todas las notas de encendido y apagado, eventos ,
+                   de control, aftertouch, cambio de programa, y pitchbend en los
+                   canales seleccionados, en los puertos MIDI seleccionados.
+                   (No detecta envios SysEx o tiempo real)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>W</source>
-        <translation type="unfinished"></translation>
+        <translation>W</translation>
     </message>
     <message>
         <location line="+25"/>
         <source>Midi thru</source>
-        <translation type="unfinished"></translation>
+        <translation>MIDI thru</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Pass input events through (&apos;thru&apos;) to output.</source>
-        <translation type="unfinished"></translation>
+        <translation>Pasar los eventos de entrada a la salida (Thru).</translation>
     </message>
     <message>
         <location line="+288"/>
         <source>Select instrument patch</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccione el instrumento</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>&lt;unknown&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;desconocido&gt;</translation>
     </message>
     <message>
         <location line="+37"/>
         <source>Add all settings to song</source>
-        <translation type="unfinished"></translation>
+        <translation>Agregar todos los ajustes a la sesión</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>All</source>
-        <translation type="unfinished">Todo</translation>
+        <translation>Todo</translation>
     </message>
     <message>
         <location line="+31"/>
         <source>Bank Select MSB. Double-click on/off.</source>
-        <translation type="unfinished"></translation>
+        <translation>Banco superior. Doble clic enciende/apaga</translation>
     </message>
     <message>
         <location line="+53"/>
         <source>Bank Select LSB. Double-click on/off.</source>
-        <translation type="unfinished"></translation>
+        <translation>Banco inferior. Doble clic enciende/apaga</translation>
     </message>
     <message>
         <location line="+53"/>
         <source>Program. Double-click on/off.</source>
-        <translation type="unfinished"></translation>
+        <translation>Programa. Doble clic enciende/apaga</translation>
     </message>
     <message>
         <location line="+33"/>
         <source>Add bank + prog settings to song</source>
-        <translation type="unfinished"></translation>
+        <translation>Agregar ajustes de banco y programa a la sesión</translation>
     </message>
     <message>
         <location line="+34"/>
         <source>Volume. Double-click on/off.</source>
-        <translation type="unfinished"></translation>
+        <translation>Volumen. Doble click Enciende/Apaga</translation>
     </message>
     <message>
         <location line="+33"/>
         <source>Add vol setting to song</source>
-        <translation type="unfinished"></translation>
+        <translation>Agregar ajustes de volumen a la sesión</translation>
     </message>
     <message>
         <location line="+34"/>
         <location line="+3"/>
         <source>Change stereo position. Double-click on/off.</source>
-        <translation type="unfinished"></translation>
+        <translation>Cambiar la panorámica del estéreo. Doble clic enciende/apaga</translation>
     </message>
     <message>
         <location line="+33"/>
         <source>Add pan setting to song</source>
-        <translation type="unfinished"></translation>
+        <translation>Agregar ajuste de panorámica a la sesión</translation>
     </message>
 </context>
 <context>
@@ -8789,48 +7738,48 @@ Puedes especificar más de un canal para grabar:
     <message>
         <location filename="../../muse/widgets/transformbase.ui" line="+14"/>
         <source>MusE: Midi Transformator</source>
-        <translation type="unfinished">MusE: Transformador MIDI</translation>
+        <translation>MusE: Transformador MIDI</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>&amp;New</source>
-        <translation type="unfinished">&amp;Nueva</translation>
+        <translation>&amp;Nueva</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>&amp;Delete</source>
-        <translation type="unfinished">&amp;Borrar</translation>
+        <translation>&amp;Borrar</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>&amp;Apply</source>
-        <translation type="unfinished">&amp;Aplicar</translation>
+        <translation>&amp;Aplicar</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>&amp;OK</source>
-        <translation type="unfinished">Ac&amp;eptar</translation>
+        <translation>Ac&amp;eptar</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>&amp;Cancel</source>
-        <translation type="unfinished">&amp;Cancelar</translation>
+        <translation>&amp;Cancelar</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>PresetList</source>
-        <translation type="unfinished">Lista de preselecciones</translation>
+        <translation>Lista de preselecciones</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Processing</source>
-        <translation type="unfinished">Procesando</translation>
+        <translation>Procesando</translation>
     </message>
     <message>
         <location line="+12"/>
         <location line="+425"/>
         <source>Event Type</source>
-        <translation type="unfinished">Tipo de evento</translation>
+        <translation>Tipo de evento</translation>
     </message>
     <message>
         <location line="-414"/>
@@ -8839,7 +7788,7 @@ Puedes especificar más de un canal para grabar:
         <location line="+54"/>
         <location line="+55"/>
         <source>Keep</source>
-        <translation type="unfinished">Mantener</translation>
+        <translation>Mantener</translation>
     </message>
     <message>
         <location line="-264"/>
@@ -8847,49 +7796,49 @@ Puedes especificar más de un canal para grabar:
         <location line="+104"/>
         <location line="+54"/>
         <source>Fix</source>
-        <translation type="unfinished">Arreglar</translation>
+        <translation>Arreglar</translation>
     </message>
     <message>
         <location line="-222"/>
         <location line="+339"/>
         <source>Note</source>
-        <translation type="unfinished">Nota</translation>
+        <translation>Nota</translation>
     </message>
     <message>
         <location line="-334"/>
         <location line="+339"/>
         <source>Poly Pressure</source>
-        <translation type="unfinished">Presión polifónica</translation>
+        <translation>Presión polifónica</translation>
     </message>
     <message>
         <location line="-334"/>
         <location line="+339"/>
         <source>Control Change</source>
-        <translation type="unfinished">Cambio de control</translation>
+        <translation>Cambio de control</translation>
     </message>
     <message>
         <location line="-334"/>
         <location line="+339"/>
         <source>Aftertouch</source>
-        <translation type="unfinished">AfterTouch</translation>
+        <translation>AfterTouch</translation>
     </message>
     <message>
         <location line="-334"/>
         <location line="+339"/>
         <source>Pitch Bend</source>
-        <translation type="unfinished">Rueda de modulación</translation>
+        <translation>Rueda de modulación</translation>
     </message>
     <message>
         <location line="-334"/>
         <location line="+339"/>
         <source>NRPN</source>
-        <translation type="unfinished">NRPN</translation>
+        <translation>NRPN</translation>
     </message>
     <message>
         <location line="-334"/>
         <location line="+339"/>
         <source>RPN</source>
-        <translation type="unfinished">RPN</translation>
+        <translation>RPN</translation>
     </message>
     <message>
         <location line="-325"/>
@@ -8897,7 +7846,7 @@ Puedes especificar más de un canal para grabar:
         <location line="+54"/>
         <location line="+55"/>
         <source>Plus</source>
-        <translation type="unfinished">Más</translation>
+        <translation>Más</translation>
     </message>
     <message>
         <location line="-208"/>
@@ -8905,7 +7854,7 @@ Puedes especificar más de un canal para grabar:
         <location line="+54"/>
         <location line="+55"/>
         <source>Minus</source>
-        <translation type="unfinished">Menos</translation>
+        <translation>Menos</translation>
     </message>
     <message>
         <location line="-208"/>
@@ -8913,7 +7862,7 @@ Puedes especificar más de un canal para grabar:
         <location line="+54"/>
         <location line="+55"/>
         <source>Multiply</source>
-        <translation type="unfinished">Multiplicar</translation>
+        <translation>Multiplicar</translation>
     </message>
     <message>
         <location line="-208"/>
@@ -8921,70 +7870,70 @@ Puedes especificar más de un canal para grabar:
         <location line="+54"/>
         <location line="+55"/>
         <source>Divide</source>
-        <translation type="unfinished">Dividir</translation>
+        <translation>Dividir</translation>
     </message>
     <message>
         <location line="-203"/>
         <location line="+43"/>
         <location line="+265"/>
         <source>Value 2</source>
-        <translation type="unfinished">Valor 2</translation>
+        <translation>Valor 2</translation>
     </message>
     <message>
         <location line="-303"/>
         <location line="+104"/>
         <source>Invert</source>
-        <translation type="unfinished">Invertir</translation>
+        <translation>Invertir</translation>
     </message>
     <message>
         <location line="-99"/>
         <source>ScaleMap</source>
-        <translation type="unfinished">Escalado de mapa</translation>
+        <translation>Escalado de mapa</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Flip</source>
-        <translation type="unfinished">Cambiar</translation>
+        <translation>Cambiar</translation>
     </message>
     <message>
         <location line="+5"/>
         <location line="+94"/>
         <source>Dyn</source>
-        <translation type="unfinished">Dyn</translation>
+        <translation>Dyn</translation>
     </message>
     <message>
         <location line="-89"/>
         <location line="+94"/>
         <source>Random</source>
-        <translation type="unfinished">Aleatorio</translation>
+        <translation>Aleatorio</translation>
     </message>
     <message>
         <location line="-86"/>
         <location line="+71"/>
         <location line="+214"/>
         <source>Value 1</source>
-        <translation type="unfinished">Valor 1</translation>
+        <translation>Valor 1</translation>
     </message>
     <message>
         <location line="-265"/>
         <location line="+324"/>
         <source>Length</source>
-        <translation type="unfinished">Longitud</translation>
+        <translation>Duración</translation>
     </message>
     <message>
         <location line="-314"/>
         <source>Position</source>
-        <translation type="unfinished">Posición</translation>
+        <translation>Posición</translation>
     </message>
     <message>
         <location line="+172"/>
         <source>Filter</source>
-        <translation type="unfinished">Filtro</translation>
+        <translation>Filtro</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>All</source>
-        <translation type="unfinished">Todo</translation>
+        <translation>Todo</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -8993,7 +7942,7 @@ Puedes especificar más de un canal para grabar:
         <location line="+39"/>
         <location line="+39"/>
         <source>Equal</source>
-        <translation type="unfinished">Igual</translation>
+        <translation>Igual</translation>
     </message>
     <message>
         <location line="-223"/>
@@ -9002,7 +7951,7 @@ Puedes especificar más de un canal para grabar:
         <location line="+39"/>
         <location line="+39"/>
         <source>Unequal</source>
-        <translation type="unfinished">Diferente</translation>
+        <translation>Diferente</translation>
     </message>
     <message>
         <location line="-147"/>
@@ -9010,7 +7959,7 @@ Puedes especificar más de un canal para grabar:
         <location line="+39"/>
         <location line="+39"/>
         <source>Ignore</source>
-        <translation type="unfinished">Ignora</translation>
+        <translation>Ignora</translation>
     </message>
     <message>
         <location line="-122"/>
@@ -9018,7 +7967,7 @@ Puedes especificar más de un canal para grabar:
         <location line="+39"/>
         <location line="+39"/>
         <source>Higher</source>
-        <translation type="unfinished">Mayor</translation>
+        <translation>Mayor</translation>
     </message>
     <message>
         <location line="-132"/>
@@ -9026,7 +7975,7 @@ Puedes especificar más de un canal para grabar:
         <location line="+39"/>
         <location line="+39"/>
         <source>Lower</source>
-        <translation type="unfinished">Menor</translation>
+        <translation>Menor</translation>
     </message>
     <message>
         <location line="-132"/>
@@ -9034,7 +7983,7 @@ Puedes especificar más de un canal para grabar:
         <location line="+39"/>
         <location line="+39"/>
         <source>Inside</source>
-        <translation type="unfinished">Entre</translation>
+        <translation>Entre</translation>
     </message>
     <message>
         <location line="-132"/>
@@ -9042,101 +7991,99 @@ Puedes especificar más de un canal para grabar:
         <location line="+39"/>
         <location line="+39"/>
         <source>Outside</source>
-        <translation type="unfinished">Fuera</translation>
+        <translation>Fuera</translation>
     </message>
     <message>
         <location line="-119"/>
         <source>Bar Range</source>
-        <translation type="unfinished">Rango de compases</translation>
+        <translation>Rango de compases</translation>
     </message>
     <message>
         <location line="+197"/>
         <source>Preset</source>
-        <translation type="unfinished">Preselección</translation>
+        <translation>Preselección</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Name:</source>
-        <translation type="unfinished">Nombre:</translation>
+        <translation>Nombre:</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Comment:</source>
-        <translation type="unfinished">Comentario:</translation>
+        <translation>Comentario:</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Range</source>
-        <translation type="unfinished">Rango</translation>
+        <translation>Rango</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>process all events</source>
-        <translation type="unfinished">procesar todos los eventos</translation>
+        <translation>procesar todos los eventos</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>selected tracks</source>
-        <translation type="unfinished">seleccionar pistas</translation>
+        <translation>seleccionar pistas</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>inside loop</source>
-        <translation type="unfinished">dentro de bucle</translation>
+        <translation>dentro de bucle</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Function</source>
-        <translation type="unfinished">Función</translation>
+        <translation>Función</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Select</source>
-        <translation type="unfinished">Seleccionar</translation>
+        <translation>Seleccionar</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Quantize</source>
-        <translation type="unfinished">Cuantizar</translation>
+        <translation>Cuantizar</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Delete</source>
-        <translation type="unfinished">Borrar</translation>
+        <translation>Borrar</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Transform</source>
-        <translation type="unfinished">Transformar</translation>
+        <translation>Transformar</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Insert</source>
-        <translation type="unfinished">Insertar</translation>
+        <translation>Insertar</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Copy</source>
-        <translation type="unfinished">Copiar</translation>
+        <translation>Copiar</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Extract</source>
-        <translation type="unfinished">Extraer</translation>
+        <translation>Extraer</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Quantize Value</source>
-        <translation type="unfinished">Cuantizar valor</translation>
+        <translation>Cuantizar valor</translation>
     </message>
 </context>
 <context>
     <name>MidiTransformerDialog</name>
     <message>
-        <location filename="../../muse/miditransform.cpp" line="+263"/>
-        <location line="+2"/>
         <source>New</source>
-        <translation type="unfinished">Nueva</translation>
+        <translation type="obsolete">Nueva</translation>
     </message>
 </context>
 <context>
@@ -9151,62 +8098,62 @@ Puedes especificar más de un canal para grabar:
     <message>
         <location filename="../../muse/widgets/mixdowndialogbase.ui" line="+14"/>
         <source>MusE: Set Mixdown Wavefile</source>
-        <translation type="unfinished">MusE: Selecciona el archivo de Masterización</translation>
+        <translation>MusE: Selecciona el archivo de Masterización</translation>
     </message>
     <message>
         <location line="+39"/>
         <source>&amp;OK</source>
-        <translation type="unfinished">&amp;Aceptar</translation>
+        <translation>&amp;Aceptar</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>&amp;Cancel</source>
-        <translation type="unfinished">&amp;Cancelar</translation>
+        <translation>&amp;Cancelar</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>File Path</source>
-        <translation type="unfinished">Directorio del archivo</translation>
+        <translation>Directorio del archivo</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Channel</source>
-        <translation type="unfinished">Canal</translation>
+        <translation>Canal</translation>
     </message>
     <message>
         <location line="+31"/>
         <source>Stereo</source>
-        <translation type="unfinished">Estéreo</translation>
+        <translation>Estéreo</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Mono</source>
-        <translation type="unfinished">Mono</translation>
+        <translation>Mono</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>5.1</source>
-        <translation type="unfinished">5.1</translation>
+        <translation>5.1</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>wav,16 Bit</source>
-        <translation type="unfinished">wav, 16 bits</translation>
+        <translation>wav, 16 bits</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>wav, 24 Bit</source>
-        <translation type="unfinished">wav, 24 bits</translation>
+        <translation>wav, 24 bits</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>wav, 32 Bit (float)</source>
-        <translation type="unfinished">wav, 32 bits</translation>
+        <translation>wav, 32 bits</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Format</source>
-        <translation type="unfinished">Formato</translation>
+        <translation>Formato</translation>
     </message>
 </context>
 <context>
@@ -9249,57 +8196,57 @@ Puedes especificar más de un canal para grabar:
     <message>
         <location filename="../../muse/widgets/function_dialogs/movebase.ui" line="+14"/>
         <source>MusE: Move Notes</source>
-        <translation type="unfinished"></translation>
+        <translation>MusE: mover notas</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Range</source>
-        <translation type="unfinished">Rango</translation>
+        <translation>Rango</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>All Events</source>
-        <translation type="unfinished">Todos los eventos</translation>
+        <translation>Todos los eventos</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Selected Events</source>
-        <translation type="unfinished">Eventos seleccionados</translation>
+        <translation>Eventos seleccionados</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Looped Events</source>
-        <translation type="unfinished"></translation>
+        <translation>Eventos del bucle</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Selected Looped</source>
-        <translation type="unfinished"></translation>
+        <translation>Bucle seleccionado</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Value</source>
-        <translation type="unfinished">Valor</translation>
+        <translation>Valor</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Move by</source>
-        <translation type="unfinished"></translation>
+        <translation>Mover</translation>
     </message>
     <message>
         <location line="+13"/>
         <source> ticks</source>
-        <translation type="unfinished"></translation>
+        <translation> Tics</translation>
     </message>
     <message>
         <location line="+56"/>
         <source>OK</source>
-        <translation type="unfinished">Aceptar</translation>
+        <translation>Aceptar</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Cancel</source>
-        <translation type="unfinished">Cancelar</translation>
+        <translation>Cancelar</translation>
     </message>
 </context>
 <context>
@@ -9946,758 +8893,797 @@ falló </translation>
 <context>
     <name>MusEApp::MusE</name>
     <message>
-        <location filename="../../muse/app.cpp" line="+46"/>
-        <location line="+16"/>
-        <source>Failed to start audio!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-15"/>
-        <source>Was not able to start audio, check if jack is running.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <source>Timeout waiting for audio to run. Check if jack is running.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+219"/>
         <source>Und&amp;o</source>
-        <translation type="unfinished">&amp;Deshacer</translation>
+        <translation type="obsolete">&amp;Deshacer</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Re&amp;do</source>
-        <translation type="unfinished">&amp;Rehacer</translation>
+        <translation type="obsolete">&amp;Rehacer</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>undo last change to song</source>
-        <translation type="unfinished">deshace el ltimo cambio en la canción</translation>
+        <translation type="obsolete">deshace el ltimo cambio en la canción</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>redo last undo</source>
-        <translation type="unfinished">rehace el ltimo deshacer</translation>
+        <translation type="obsolete">rehace el ltimo deshacer</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Loop</source>
-        <translation type="unfinished">Bucle</translation>
+        <translation type="obsolete">Bucle</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Punchin</source>
-        <translation type="unfinished">Pinchar</translation>
+        <translation type="obsolete">Pinchar</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Punchout</source>
-        <translation type="unfinished">Fin pinchado</translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Start</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Fin pinchado</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Rewind</source>
-        <translation type="unfinished">Retroceder</translation>
+        <translation type="obsolete">Retroceder</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Forward</source>
-        <translation type="unfinished">Avanzar</translation>
+        <translation type="obsolete">Avanzar</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Stop</source>
-        <translation type="unfinished">Parar</translation>
+        <translation type="obsolete">Parar</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Play</source>
-        <translation type="unfinished">Reproducir</translation>
+        <translation type="obsolete">Reproducir</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Record</source>
-        <translation type="unfinished">Grabar</translation>
+        <translation type="obsolete">Grabar</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <location line="+232"/>
         <source>Panic</source>
-        <translation type="unfinished">Pánico</translation>
-    </message>
-    <message>
-        <location line="-220"/>
-        <source>&amp;New</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Pánico</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Open</source>
-        <translation type="unfinished">&amp;Abrir</translation>
+        <translation type="obsolete">&amp;Abrir</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Open &amp;Recent</source>
-        <translation type="unfinished">Abrir &amp;Recientes</translation>
+        <translation type="obsolete">Abrir &amp;Recientes</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location line="+1005"/>
-        <location line="+1207"/>
         <source>&amp;Save</source>
-        <translation type="unfinished">&amp;Guardar</translation>
+        <translation type="obsolete">&amp;Guardar</translation>
     </message>
     <message>
-        <location line="-2207"/>
         <source>Save &amp;As</source>
-        <translation type="unfinished">Guardar c&amp;omo</translation>
+        <translation type="obsolete">Guardar c&amp;omo</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Import Midifile</source>
-        <translation type="unfinished">Importar archivo MIDI</translation>
+        <translation type="obsolete">Importar archivo MIDI</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Export Midifile</source>
-        <translation type="unfinished">Exportar archivo MIDI</translation>
+        <translation type="obsolete">Exportar archivo MIDI</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Import Part</source>
-        <translation type="unfinished"></translation>
+        <source>Import Wave File</source>
+        <translation type="obsolete">Importar archivo de audio</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location filename="../../muse/wave.cpp" line="+827"/>
-        <source>Import Wave File</source>
-        <translation type="unfinished">Importar archivo de audio</translation>
+        <source>&amp;Quit</source>
+        <translation type="obsolete">&amp;Salir</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Find unused wave files</source>
-        <translation type="unfinished"></translation>
+        <source>Transport Panel</source>
+        <translation type="obsolete">Panel de transporte</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>&amp;Quit</source>
-        <translation type="unfinished">&amp;Salir</translation>
+        <source>Cliplist</source>
+        <translation type="obsolete">Lista de Clips</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Song Info</source>
-        <translation type="unfinished"></translation>
+        <source>Input Plugins</source>
+        <translation type="obsolete">Plugins e entrada</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Transport Panel</source>
-        <translation type="unfinished">Panel de transporte</translation>
+        <source>Transpose</source>
+        <translation type="obsolete">Transponer</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Bigtime Window</source>
-        <translation type="unfinished"></translation>
+        <source>Midi Input Transform</source>
+        <translation type="obsolete">Transformación de entrada MIDI</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Mixer A</source>
-        <translation type="unfinished"></translation>
+        <source>Midi Input Filter</source>
+        <translation type="obsolete">Filtrado de entrada MIDI</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Mixer B</source>
-        <translation type="unfinished"></translation>
+        <source>Midi Remote Control</source>
+        <translation type="obsolete">Control remoto MIDI</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Cliplist</source>
-        <translation type="unfinished">Lista de Clips</translation>
+        <source>Reset Instr.</source>
+        <translation type="obsolete">Reinicializa Instrumento</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Marker View</source>
-        <translation type="unfinished"></translation>
+        <source>Init Instr.</source>
+        <translation type="obsolete">Inicializa Instruemnto</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Arranger View</source>
-        <translation type="unfinished"></translation>
+        <source>Bounce to Track</source>
+        <translation type="obsolete">Rebotar a pista</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Fullscreen</source>
-        <translation type="unfinished"></translation>
+        <source>Bounce to File</source>
+        <translation type="obsolete">Rebotar a Archivo</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>&amp;Plugins</source>
-        <translation type="unfinished"></translation>
+        <source>Global Settings</source>
+        <translation type="obsolete">Selecciones Globales</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Edit Instrument</source>
-        <translation type="unfinished"></translation>
+        <source>Follow Song</source>
+        <translation type="obsolete">seguir canción</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Input Plugins</source>
-        <translation type="unfinished">Plugins e entrada</translation>
+        <source>Don&apos;t Follow Song</source>
+        <translation type="obsolete">no sigas la canción</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Transpose</source>
-        <translation type="unfinished">Transponer</translation>
+        <source>Follow Page</source>
+        <translation type="obsolete">sigue la página</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Midi Input Transform</source>
-        <translation type="unfinished">Transformación de entrada MIDI</translation>
+        <source>Follow Continuous</source>
+        <translation type="obsolete">sigue contínuamente</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Midi Input Filter</source>
-        <translation type="unfinished">Filtrado de entrada MIDI</translation>
+        <source>Metronome</source>
+        <translation type="obsolete">Metrónomo</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Midi Remote Control</source>
-        <translation type="unfinished">Control remoto MIDI</translation>
+        <source>Midi Sync</source>
+        <translation type="obsolete">Sincronización MIDI</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Rhythm Generator</source>
-        <translation type="unfinished"></translation>
+        <source>Appearance Settings</source>
+        <translation type="obsolete">Selecciones de apariencia</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Reset Instr.</source>
-        <translation type="unfinished">Reinicializa Instrumento</translation>
+        <source>Transport</source>
+        <translation type="obsolete">Transporte</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Init Instr.</source>
-        <translation type="unfinished">Inicializa Instruemnto</translation>
+        <source>&amp;Midi</source>
+        <translation type="obsolete">&amp;MIDI</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Local Off</source>
-        <translation type="unfinished"></translation>
+        <source>&amp;Audio</source>
+        <translation type="obsolete">&amp;Audio</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Bounce to Track</source>
-        <translation type="unfinished">Rebotar a pista</translation>
+        <source>&amp;Help</source>
+        <translation type="obsolete">A&amp;yuda</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Bounce to File</source>
-        <translation type="unfinished">Rebotar a Archivo</translation>
+        <source>MusE: Song: </source>
+        <translation type="obsolete">MusE: Canción: </translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Restart Audio</source>
-        <translation type="unfinished"></translation>
+        <source>MusE: load project</source>
+        <translation type="obsolete">MusE: Carga proyecto</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Mixer Automation</source>
-        <translation type="unfinished"></translation>
+        <source>MusE: Write File failed</source>
+        <translation type="obsolete">MusE: La captura del archivo ha fallado</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Take Snapshot</source>
-        <translation type="unfinished"></translation>
+        <source>The current Project contains unsaved data
+Save Current Project?</source>
+        <translation type="obsolete">El proyecto actual contiene datos no guardados
+Guardamos el proyecto actual?</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Clear Automation Data</source>
-        <translation type="unfinished"></translation>
+        <source>&amp;Cancel</source>
+        <translation type="obsolete">&amp;Cancelar</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Cascade</source>
-        <translation type="unfinished"></translation>
+        <source>MusE: Save As</source>
+        <translation type="obsolete">MusE: Guardar como</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Tile</source>
-        <translation type="unfinished"></translation>
+        <source>Nothing to edit</source>
+        <translation type="obsolete">Nada para editar</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>In rows</source>
-        <translation type="unfinished"></translation>
+        <source>MusE: Bounce to Track</source>
+        <translation type="obsolete">MusE: Rebotar a la pista</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>In columns</source>
-        <translation type="unfinished"></translation>
+        <source>The current Project contains unsaved data
+Load overwrites current Project:
+Save Current Project?</source>
+        <translation type="obsolete">El proyecto actual contine datos no guardados
+Cargar sobreescribe el proyecto actual:
+Guardar el proyecto actual?</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Global Settings</source>
-        <translation type="unfinished">Selecciones Globales</translation>
+        <source>&amp;Abort</source>
+        <translation type="obsolete">&amp;Abortar</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Configure Shortcuts</source>
-        <translation type="unfinished"></translation>
+        <source>MusE: Export Midi</source>
+        <translation type="obsolete">MusE: Exportar MIDI</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Follow Song</source>
-        <translation type="unfinished">seguir canción</translation>
+        <source>no help found at: </source>
+        <translation type="obsolete">no se ha encontrado ayuda en: </translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Don&apos;t Follow Song</source>
-        <translation type="unfinished">no sigas la canción</translation>
+        <source>MusE: Open Help</source>
+        <translation type="obsolete">MusE: Abre ayuda</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Follow Page</source>
-        <translation type="unfinished">sigue la página</translation>
+        <source>MusE: Import Midi</source>
+        <translation type="obsolete">MusE: Importar MIDI</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Follow Continuous</source>
-        <translation type="unfinished">sigue contínuamente</translation>
+        <source>reading midifile
+  </source>
+        <translation type="obsolete">leyendo archivo midi
+  </translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Metronome</source>
-        <translation type="unfinished">Metrónomo</translation>
+        <source>
+failed: </source>
+        <translation type="obsolete">
+falló </translation>
     </message>
+</context>
+<context>
+    <name>MusEArranger::Arranger</name>
     <message>
-        <location line="+1"/>
-        <source>Midi Sync</source>
-        <translation type="unfinished">Sincronización MIDI</translation>
+        <source>Enable Recording</source>
+        <translation type="obsolete">Habilita captura</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Midi File Import/Export</source>
-        <translation type="unfinished"></translation>
+        <source>Solo Indicator</source>
+        <translation type="obsolete">Indicador de solo</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Appearance Settings</source>
-        <translation type="unfinished">Selecciones de apariencia</translation>
+        <source>Track Type</source>
+        <translation type="obsolete">Tipo de pista</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Midi Ports / Soft Synth</source>
-        <translation type="unfinished"></translation>
+        <source>Time Lock</source>
+        <translation type="obsolete">Bloqueo de tiempo</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>&amp;Manual</source>
-        <translation type="unfinished"></translation>
+        <source>Arranger</source>
+        <translation type="obsolete">Arreglador</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>&amp;MusE Homepage</source>
-        <translation type="unfinished"></translation>
+        <source>Cursor</source>
+        <translation type="obsolete">Cursor</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>&amp;Report Bug...</source>
-        <translation type="unfinished"></translation>
+        <source>Snap</source>
+        <translation type="obsolete">Snap</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>&amp;About MusE</source>
-        <translation type="unfinished"></translation>
+        <source>Type</source>
+        <translation type="obsolete">Tipo</translation>
     </message>
     <message>
-        <location line="+99"/>
-        <source>File Buttons</source>
-        <translation type="unfinished"></translation>
+        <source>NO</source>
+        <translation type="obsolete">No</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Undo/Redo</source>
-        <translation type="unfinished"></translation>
+        <source>GM</source>
+        <translation type="obsolete">GM</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Transport</source>
-        <translation type="unfinished">Transporte</translation>
+        <source>GS</source>
+        <translation type="obsolete">GS</translation>
     </message>
     <message>
-        <location line="+55"/>
-        <source>&amp;File</source>
-        <translation type="unfinished"></translation>
+        <source>XG</source>
+        <translation type="obsolete">XG</translation>
     </message>
     <message>
-        <location line="+29"/>
-        <source>&amp;View</source>
-        <translation type="unfinished"></translation>
+        <source>midi song type</source>
+        <translation type="obsolete">tipo de canción midi</translation>
     </message>
     <message>
-        <location line="+19"/>
-        <source>&amp;Midi</source>
-        <translation type="unfinished">&amp;MIDI</translation>
+        <source>Pitch</source>
+        <translation type="obsolete">Tono</translation>
     </message>
     <message>
-        <location line="+29"/>
-        <source>&amp;Audio</source>
-        <translation type="unfinished">&amp;Audio</translation>
+        <source>midi pitch</source>
+        <translation type="obsolete">tono midi</translation>
     </message>
     <message>
-        <location line="+14"/>
-        <source>A&amp;utomation</source>
-        <translation type="unfinished"></translation>
+        <source>global midi pitch shift</source>
+        <translation type="obsolete">desplazamiento de tono midi</translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>&amp;Windows</source>
-        <translation type="unfinished"></translation>
+        <source>Tempo</source>
+        <translation type="obsolete">Tempo</translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>MusE Se&amp;ttings</source>
-        <translation type="unfinished"></translation>
+        <source>midi tempo</source>
+        <translation type="obsolete">tempo midi</translation>
     </message>
     <message>
-        <location line="+23"/>
-        <source>&amp;Help</source>
-        <translation type="unfinished">A&amp;yuda</translation>
+        <source>N</source>
+        <translation type="obsolete">N</translation>
     </message>
     <message>
-        <location line="+268"/>
-        <source>Cannot read template</source>
-        <translation type="unfinished"></translation>
+        <source>TrackInfo</source>
+        <translation type="obsolete">Información de pista</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <source>File open error</source>
-        <translation type="unfinished"></translation>
+        <source>R</source>
+        <translation type="obsolete">R</translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>File read error</source>
-        <translation type="unfinished"></translation>
+        <source>M</source>
+        <translation type="obsolete">M</translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>Unknown File Format: </source>
-        <translation type="unfinished"></translation>
+        <source>S</source>
+        <translation type="obsolete">S</translation>
     </message>
     <message>
-        <location line="+130"/>
-        <location line="+408"/>
-        <location line="+895"/>
-        <source>MusE: Song: </source>
-        <translation type="unfinished">MusE: Canción: </translation>
+        <source>C</source>
+        <translation type="obsolete">C</translation>
     </message>
     <message>
-        <location line="-1269"/>
-        <source>MusE: load project</source>
-        <translation type="unfinished">MusE: Carga proyecto</translation>
+        <source>Track</source>
+        <translation type="obsolete">Pista</translation>
     </message>
     <message>
-        <location line="+14"/>
-        <source>MusE: load template</source>
-        <translation type="unfinished"></translation>
+        <source>Port</source>
+        <translation type="obsolete">Puerto</translation>
     </message>
     <message>
-        <location line="+62"/>
-        <source>MusE: Write File failed</source>
-        <translation type="unfinished">MusE: La captura del archivo ha fallado</translation>
+        <source>T</source>
+        <translation type="obsolete">T</translation>
     </message>
+</context>
+<context>
+    <name>MusEArranger::ArrangerView</name>
     <message>
-        <location line="+38"/>
-        <source>The current Project contains unsaved data
-Save Current Project?</source>
-        <translation type="unfinished">El proyecto actual contiene datos no guardados
-Guardamos el proyecto actual?</translation>
+        <source>panic</source>
+        <translation type="obsolete">pánico</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location line="+1207"/>
-        <source>S&amp;kip</source>
-        <translation type="unfinished"></translation>
+        <source>C&amp;ut</source>
+        <translation type="obsolete">C&amp;ortar</translation>
     </message>
     <message>
-        <location line="-1207"/>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished">&amp;Cancelar</translation>
+        <source>&amp;Copy</source>
+        <translation type="obsolete">&amp;Copiar</translation>
     </message>
     <message>
-        <location line="+236"/>
-        <location line="+13"/>
-        <source>MusE: Save As</source>
-        <translation type="unfinished">MusE: Guardar como</translation>
+        <source>&amp;Paste</source>
+        <translation type="obsolete">&amp;Pegar</translation>
     </message>
     <message>
-        <location line="+57"/>
-        <location line="+161"/>
-        <source>Nothing to edit</source>
-        <translation type="unfinished">Nada para editar</translation>
+        <source>Add Track</source>
+        <translation type="obsolete">Agregar Pista</translation>
     </message>
     <message>
-        <location line="+474"/>
-        <location line="+10"/>
-        <location line="+31"/>
-        <location line="+34"/>
-        <location line="+8"/>
-        <source>MusE: Bounce to Track</source>
-        <translation type="unfinished">MusE: Rebotar a la pista</translation>
+        <source>Select</source>
+        <translation type="obsolete">Seleccionar</translation>
     </message>
     <message>
-        <location line="-82"/>
-        <source>No wave tracks found</source>
-        <translation type="unfinished"></translation>
+        <source>Select &amp;All</source>
+        <translation type="obsolete">Seleccion&amp;ar Todo</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location line="+105"/>
-        <source>No audio output tracks found</source>
-        <translation type="unfinished"></translation>
+        <source>&amp;Deselect All</source>
+        <translation type="obsolete">&amp;Deseleccionar Todo</translation>
     </message>
     <message>
-        <location line="-74"/>
-        <source>Select one audio output track,
-and one target wave track</source>
-        <translation type="unfinished"></translation>
+        <source>Invert &amp;Selection</source>
+        <translation type="obsolete">Invertir &amp;Selección</translation>
     </message>
     <message>
-        <location line="+34"/>
-        <source>Select one target wave track</source>
-        <translation type="unfinished"></translation>
+        <source>&amp;Inside Loop</source>
+        <translation type="obsolete">&amp;Interior de bucle</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Select one target wave track,
-and one audio output track</source>
-        <translation type="unfinished"></translation>
+        <source>&amp;Outside Loop</source>
+        <translation type="obsolete">&amp;Exterior de Bucle</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location line="+25"/>
-        <source>MusE: Bounce to File</source>
-        <translation type="unfinished"></translation>
+        <source>All &amp;Parts on Track</source>
+        <translation type="obsolete">Todas las &amp;Partes de la pista</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Select one audio output track</source>
-        <translation type="unfinished"></translation>
+        <source>Score</source>
+        <translation type="obsolete">Partitura</translation>
     </message>
     <message>
-        <location line="+39"/>
-        <source>MusE: Bounce</source>
-        <translation type="unfinished"></translation>
+        <source>Pianoroll</source>
+        <translation type="obsolete">Pianola</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>set left/right marker for bounce range</source>
-        <translation type="unfinished"></translation>
+        <source>Drums</source>
+        <translation type="obsolete">Percusión</translation>
     </message>
     <message>
-        <location line="+82"/>
-        <source>The current Project contains unsaved data
-Load overwrites current Project:
-Save Current Project?</source>
-        <translation type="unfinished">El proyecto actual contine datos no guardados
-Cargar sobreescribe el proyecto actual:
-Guardar el proyecto actual?</translation>
+        <source>List</source>
+        <translation type="obsolete">Lista</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location filename="../../muse/importmidi.cpp" line="+86"/>
-        <source>&amp;Abort</source>
-        <translation type="unfinished">&amp;Abortar</translation>
+        <source>Wave</source>
+        <translation type="obsolete">Audio</translation>
     </message>
     <message>
-        <location filename="../../muse/exportmidi.cpp" line="+143"/>
-        <source>MusE: Export Midi</source>
-        <translation type="unfinished">MusE: Exportar MIDI</translation>
+        <source>Mastertrack</source>
+        <translation type="obsolete">Pista Maestra</translation>
     </message>
     <message>
-        <location filename="../../muse/help.cpp" line="+50"/>
-        <source>no help found at: </source>
-        <translation type="unfinished">no se ha encontrado ayuda en: </translation>
+        <source>Graphic</source>
+        <translation type="obsolete">Gráfico</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>MusE: Open Help</source>
-        <translation type="unfinished">MusE: Abre ayuda</translation>
+        <source>Midi &amp;Transform</source>
+        <translation type="obsolete">&amp;Transformación MIDI</translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Unable to launch help</source>
-        <translation type="unfinished"></translation>
+        <source>Global Cut</source>
+        <translation type="obsolete">Corte global</translation>
+    </message>
+    <message>
+        <source>Global Insert</source>
+        <translation type="obsolete">Inserción Global</translation>
+    </message>
+    <message>
+        <source>Global Split</source>
+        <translation type="obsolete">Partición Global</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="obsolete">&amp;Editar</translation>
+    </message>
+    <message>
+        <source>&amp;Structure</source>
+        <translation type="obsolete">E&amp;structura</translation>
+    </message>
+    <message>
+        <source>Functions</source>
+        <translation type="obsolete">Funciones</translation>
+    </message>
+    <message>
+        <source>Transpose</source>
+        <translation type="obsolete">Transponer</translation>
+    </message>
+</context>
+<context>
+    <name>MusEArranger::PartCanvas</name>
+    <message>
+        <source>Cannot copy/move/clone to different Track-Type</source>
+        <translation type="obsolete">No puedo copiar/mover/clonar a un tipo diferente de pista</translation>
+    </message>
+    <message>
+        <source>C&amp;ut</source>
+        <translation type="obsolete">C&amp;ortar</translation>
+    </message>
+    <message>
+        <source>&amp;Copy</source>
+        <translation type="obsolete">&amp;Copiar</translation>
+    </message>
+    <message>
+        <source>rename</source>
+        <translation type="obsolete">renombrar</translation>
+    </message>
+    <message>
+        <source>color</source>
+        <translation type="obsolete">color</translation>
+    </message>
+    <message>
+        <source>delete</source>
+        <translation type="obsolete">borrar</translation>
+    </message>
+    <message>
+        <source>split</source>
+        <translation type="obsolete">partir</translation>
+    </message>
+    <message>
+        <source>de-clone</source>
+        <translation type="obsolete">des-clonar</translation>
+    </message>
+    <message>
+        <source>wave edit</source>
+        <translation type="obsolete">editar onda</translation>
+    </message>
+    <message>
+        <source>Cannot paste: multiple tracks selected</source>
+        <translation type="obsolete">No puedo pegar: mtilpes pistas seleccionadas</translation>
+    </message>
+    <message>
+        <source>Cannot paste: no track selected</source>
+        <translation type="obsolete">No puedo pegar: No hay pista seleccionada</translation>
+    </message>
+    <message>
+        <source>Cannot paste: wrong data type</source>
+        <translation type="obsolete">No puedo pegar: Tipo de datos equivocado</translation>
+    </message>
+</context>
+<context>
+    <name>MusEArranger::TList</name>
+    <message>
+        <source>show gui</source>
+        <translation type="obsolete">mostrar gui</translation>
+    </message>
+    <message>
+        <source>Delete Track</source>
+        <translation type="obsolete">Borrar pista</translation>
+    </message>
+    <message>
+        <source>Midi</source>
+        <translation type="obsolete">MIDI</translation>
+    </message>
+    <message>
+        <source>Drum</source>
+        <translation type="obsolete">Percusión</translation>
+    </message>
+</context>
+<context>
+    <name>MusECore::Song</name>
+    <message>
+        <location filename="../../muse/song.cpp" line="+2205"/>
+        <source>Jack shutdown!</source>
+        <translation>Detener Jack</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>For some reason MusE has to launch the default
-browser on your machine.</source>
-        <translation type="unfinished"></translation>
+        <source>Jack has detected a performance problem which has lead to
+MusE being disconnected.
+This could happen due to a number of reasons:
+- a performance issue with your particular setup.
+- a bug in MusE (or possibly in another connected software).
+- a random hiccup which might never occur again.
+- jack was voluntary stopped by you or someone else
+- jack crashed
+If there is a persisting problem you are much welcome to discuss it
+on the MusE mailinglist.
+(there is information about joining the mailinglist on the MusE
+ homepage which is available through the help menu)
+
+To proceed check the status of Jack and try to restart it and then .
+click on the Restart button.</source>
+        <translation>Jack ha detectado un problema de rendimiento y MusE lo ha 
+desconectado
+Esto podría suceder debido a varias razones:
+- Un problema de rendimiento con su configuración particular.
+- Un fallo en Muse u otro software de conexión.
+--Un error al azar que tal vez nunca vuelva a ocurrir.
+- Jack fue detenido por usted u otra persona
+- Jack se estrelló
+Si el problema persiste estaremos dispuesto a analizarlo
+La lista de correos de MusE ee encuentra disponible a través 
+del menú de ayuda.
+
+Para  comprobar el estado de Jack y reiniciar el servidor.
+haga clic en el botón Reiniciar.</translation>
     </message>
     <message>
-        <location filename="../../muse/importmidi.cpp" line="-12"/>
-        <source>MusE: Import Midi</source>
-        <translation type="unfinished">MusE: Importar MIDI</translation>
+        <location line="+186"/>
+        <location line="+179"/>
+        <source>Automation:</source>
+        <translation>Automatización</translation>
+    </message>
+    <message>
+        <location line="-177"/>
+        <source>previous event</source>
+        <translation>evento anterior</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>next event</source>
+        <translation>evento siguiente</translation>
     </message>
     <message>
         <location line="+9"/>
-        <source>Add midi file to current project?
-</source>
-        <translation type="unfinished"></translation>
+        <location line="+169"/>
+        <source>set event</source>
+        <translation></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>&amp;Add to Project</source>
-        <translation type="unfinished"></translation>
+        <location line="-167"/>
+        <location line="+169"/>
+        <source>add event</source>
+        <translation>agregar evento</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>&amp;Replace</source>
-        <translation type="unfinished"></translation>
+        <location line="-165"/>
+        <location line="+170"/>
+        <source>erase event</source>
+        <translation>borrar evento</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <source>reading midifile
-  </source>
-        <translation type="unfinished">leyendo archivo midi
-  </translation>
+        <location line="-166"/>
+        <source>erase range</source>
+        <translation>borrar rango</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>
-failed: </source>
-        <translation type="unfinished">
-falló </translation>
+        <location line="+4"/>
+        <source>clear automation</source>
+        <translation>limpiar automatizacion</translation>
     </message>
     <message>
-        <location line="+356"/>
-        <source>Import part is only valid for midi and wave tracks!</source>
-        <translation type="unfinished"></translation>
+        <location line="+33"/>
+        <source>Clear all controller events?</source>
+        <translation>Limpiar todos los eventos de control</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>MusE: load part</source>
-        <translation type="unfinished"></translation>
+        <location line="+0"/>
+        <source>&amp;Ok</source>
+        <translation>Ac&amp;eptar</translation>
     </message>
     <message>
-        <location line="+18"/>
-        <source>No track selected for import</source>
-        <translation type="unfinished"></translation>
+        <location line="+0"/>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Cancelar</translation>
     </message>
     <message>
-        <location line="+121"/>
-        <source> out of </source>
-        <translation type="unfinished"></translation>
+        <location line="+843"/>
+        <source>MusE - external script failed</source>
+        <translation>MusE - fallo de orden externa</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source> parts</source>
-        <translation type="unfinished"></translation>
+        <source>MusE was unable to launch the script, error message:
+%1</source>
+        <translation></translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::Appearance</name>
     <message>
-        <location line="+0"/>
-        <source> part</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../muse/appearance.cpp" line="+132"/>
+        <source>Main application font, and default font for any
+ controls not defined here.</source>
+        <translation>Fuente principal de la aplicación y la fuente por 
+defecto para los controles no estan definidas.</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source> could not be imported.
-Likely the track is the wrong type.</source>
-        <translation type="unfinished"></translation>
+        <source>For small controls like mixer strips.
+Also timescale small numbers, arranger part name overlay,
+ and effects rack.</source>
+        <translation>Para los controles pequeños, como: bandas de mezclador.
+escala de tiempo, superposición de nombre en la región,
+y rack de efectos.</translation>
     </message>
     <message>
-        <location filename="../../muse/wave.cpp" line="-6"/>
-        <source>to import an audio file you have first to selecta wave track</source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>Midi track info panel. Transport controls.</source>
+        <translation>Panel de información de la pista MIDI - Control del transporte</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <source>Import Wavefile</source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>Controller graph and S/X buttons. Large numbers for time
+ and tempo scale, and time signature.</source>
+        <translation>Controlador de gráficos y botones S / X. Una gran cantidad 
+de eventos de tempo y el tempo de la escala y compás.</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>This wave file has a samplerate of %1,
-as opposed to current setting %2.
-Do you still want to import it?</source>
-        <translation type="unfinished"></translation>
+        <source>Time scale markers.</source>
+        <translation>Marcas de la escala de tiempo</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>&amp;Yes</source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>List editor: meta event edit dialog multi-line edit box.</source>
+        <translation>Editor de la lista: Editar meta evento de diálogo multi-línea</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mixer label font. Auto-font-sizing up to chosen font size.
+Word-breaking but only with spaces.</source>
+        <translation>Fuente de la etiqueta del mezclador. Auto dimensionado del tamaño de la fuente elegida.
+La separación de palabras, pero sólo con espacios.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Maximum mixer label auto-font-sizing font size.</source>
+        <translation>Tamaño máximo de la fuente para etiqueta del mezclador.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Global opacity (opposite of transparency).</source>
+        <translation>Opacidad global</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Standard</source>
+        <translation>Estandar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Custom</source>
+        <translation>Personalizado</translation>
+    </message>
+    <message>
+        <location line="+624"/>
+        <source>MusE: load image</source>
+        <translation>MusE: carga imagen</translation>
+    </message>
+    <message>
+        <location line="+334"/>
+        <source>Select style sheet</source>
+        <translation>Seleccionar hoja de estilo</translation>
     </message>
     <message>
         <location line="+0"/>
-        <source>&amp;No</source>
-        <translation type="unfinished"></translation>
+        <source>Qt style sheets (*.qss)</source>
+        <translation>Hoja de estilo QT (*.qss)</translation>
     </message>
 </context>
 <context>
-    <name>MusEArranger::Arranger</name>
+    <name>MusEGui::Arranger</name>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="-74"/>
+        <location filename="../../muse/arranger/arranger.cpp" line="+81"/>
         <source>Enable Recording</source>
-        <translation type="unfinished">Habilita captura</translation>
+        <translation>Habilita captura</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Mute/Off Indicator</source>
-        <translation type="unfinished"></translation>
+        <translation>Indicador de Desconexion/Apagado</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Solo Indicator</source>
-        <translation type="unfinished">Indicador de solo</translation>
+        <translation>Indicador de solo</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Track Type</source>
-        <translation type="unfinished">Tipo de pista</translation>
+        <translation>Tipo de pista</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Track Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nombre de pista</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Midi output channel number or audio channels</source>
-        <translation type="unfinished"></translation>
+        <translation>Numero de canal de salida MIDI o canales de audio</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Midi output port or synth midi port</source>
-        <translation type="unfinished"></translation>
+        <translation>Puerto de salida MIDI o puerto de sintetizador</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Time Lock</source>
-        <translation type="unfinished">Bloqueo de tiempo</translation>
+        <translation>Bloqueo de tiempo</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Automation parameter selection</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccion de parametros de automatizacion</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Notation clef</source>
-        <translation type="unfinished"></translation>
+        <translation>Clave de la notación</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Enable recording. Click to toggle.</source>
-        <translation type="unfinished"></translation>
+        <translation>Habilitar captura: Clic en el botón.</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -10705,33 +9691,41 @@ Do you still want to import it?</source>
 Right-click to toggle track on/off.
 Mute is designed for rapid, repeated action.
 On/Off is not!</source>
-        <translation type="unfinished"></translation>
+        <translation>Indicador de silenciado: click para silenciar
+Clic con el boton derecho del ratón 
+para Apagar/Encender</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Solo indicator. Click to toggle.
 Connected tracks are also &apos;phantom&apos; soloed,
  indicated by a dark square.</source>
-        <translation type="unfinished"></translation>
+        <translation>Indicador de Solo, clic en el botón.
+Pistas &quot;fantasmas&quot; en solo,
+  seran indicadas por un cuadrado negro.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Track type. Right-click to change
  midi and drum track types.</source>
-        <translation type="unfinished"></translation>
+        <translation>Tipo de pista: Clic derecho alterna entre tipo MIDI/Percusión</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Track name. Double-click to edit.
 Right-click for more options.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nombre de pista: Doble clic para editar
+Click derecho para mas opciones.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Midi/drum track: Output channel number.
 Audio track: Channels.
 Mid/right-click to change.</source>
-        <translation type="unfinished"></translation>
+        <translation>Pista MIDI/Percusión: Numero de canal de salida
+Pista de audio: Canales.
+Clic con el botón del medio 
+o el derecho para cambiar.</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -10739,1293 +9733,2581 @@ Mid/right-click to change.</source>
 Synth track: Assigned midi port.
 Left-click to change.
 Right-click to show GUI.</source>
-        <translation type="unfinished"></translation>
+        <translation>Pista de MIDI/Percusión: Puerto de salida.
+Pista de sintetizador: Asigna el puerto MIDI
+Clic de ratón para cambiar
+Clic derecho para ver la interfaz</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Time lock</source>
-        <translation type="unfinished"></translation>
+        <translation>Bloqueo de tiempo</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Notation clef. Select this tracks notation clef.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clave de la notación. Seleccione esta clave de la notación de las pistas.</translation>
     </message>
     <message>
         <location line="+33"/>
         <source>Arranger</source>
-        <translation type="unfinished">Arreglador</translation>
+        <translation>Arreglador</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Cursor</source>
-        <translation type="unfinished">Cursor</translation>
+        <translation>Cursor</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+10"/>
+        <source>Off</source>
+        <translation>Apagado</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Bar</source>
+        <translation>Compás</translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Snap</source>
-        <translation type="unfinished">Snap</translation>
+        <translation>Snap</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Len</source>
-        <translation type="unfinished"></translation>
+        <translation>Len</translation>
     </message>
     <message>
         <location line="+10"/>
         <location line="+1"/>
         <source>song length - bars</source>
-        <translation type="unfinished"></translation>
+        <translation>Duración de compás</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Type</source>
-        <translation type="unfinished">Tipo</translation>
+        <translation>Tipo</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>NO</source>
-        <translation type="unfinished">No</translation>
+        <translation>No</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>GM</source>
-        <translation type="unfinished">GM</translation>
+        <translation>GM</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>GS</source>
-        <translation type="unfinished">GS</translation>
+        <translation>GS</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>XG</source>
-        <translation type="unfinished">XG</translation>
+        <translation>XG</translation>
     </message>
     <message>
         <location line="+2"/>
         <location line="+1"/>
         <source>midi song type</source>
-        <translation type="unfinished">tipo de canción midi</translation>
+        <translation>tipo de canción midi</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Pitch</source>
-        <translation type="unfinished">Tono</translation>
+        <translation>Tono</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>midi pitch</source>
-        <translation type="unfinished">tono midi</translation>
+        <translation>tono midi</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>global midi pitch shift</source>
-        <translation type="unfinished">desplazamiento de tono midi</translation>
+        <translation>desplazamiento de tono midi</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Tempo</source>
-        <translation type="unfinished">Tempo</translation>
+        <translation>Tempo</translation>
     </message>
     <message>
         <location line="+8"/>
         <location line="+1"/>
         <source>midi tempo</source>
-        <translation type="unfinished">tempo midi</translation>
+        <translation>tempo midi</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>N</source>
-        <translation type="unfinished">N</translation>
+        <translation>N</translation>
     </message>
     <message>
         <location line="+60"/>
         <source>TrackInfo</source>
-        <translation type="unfinished">Información de pista</translation>
+        <translation>Información de pista</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>R</source>
-        <translation type="unfinished">R</translation>
+        <translation>R</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>M</source>
-        <translation type="unfinished">M</translation>
+        <translation>M</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>S</source>
-        <translation type="unfinished">S</translation>
+        <translation>S</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>C</source>
-        <translation type="unfinished">C</translation>
+        <translation>C</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Track</source>
-        <translation type="unfinished">Pista</translation>
+        <translation>Pista</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Port</source>
-        <translation type="unfinished">Puerto</translation>
+        <translation>Puerto</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Ch</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>T</source>
-        <translation type="unfinished">T</translation>
+        <translation>T</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Automation</source>
-        <translation type="unfinished"></translation>
+        <translation>Automatizacion</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Clef</source>
-        <translation type="unfinished"></translation>
+        <translation>Clave</translation>
     </message>
 </context>
 <context>
-    <name>MusEArranger::ArrangerView</name>
+    <name>MusEGui::ArrangerView</name>
     <message>
         <location filename="../../muse/arranger/arrangerview.cpp" line="+83"/>
         <source>MusE: Arranger</source>
-        <translation type="unfinished"></translation>
+        <translation>Ordenar</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Undo/Redo tools</source>
-        <translation type="unfinished"></translation>
+        <translation>Herramientas de Deshacer/Rehacer</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>panic</source>
-        <translation type="unfinished">pánico</translation>
+        <translation>pánico</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>transport</source>
-        <translation type="unfinished"></translation>
+        <translation>transporte</translation>
     </message>
     <message>
         <location line="+30"/>
         <source>C&amp;ut</source>
-        <translation type="unfinished">C&amp;ortar</translation>
+        <translation>C&amp;ortar</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>&amp;Copy</source>
-        <translation type="unfinished">&amp;Copiar</translation>
+        <translation>&amp;Copiar</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Copy in range</source>
-        <translation type="unfinished"></translation>
+        <translation>Copiar interior del rango</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>&amp;Paste</source>
-        <translation type="unfinished">&amp;Pegar</translation>
+        <translation>&amp;Pegar</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Paste (show dialog)</source>
-        <translation type="unfinished"></translation>
+        <translation>Pegar (ver dialogo)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Paste c&amp;lone</source>
-        <translation type="unfinished"></translation>
+        <translation>Pegar c&amp;lon</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Paste clone (show dialog)</source>
-        <translation type="unfinished"></translation>
+        <translation>Pergar clon (ver dialogo)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>&amp;Insert Empty Measure</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Insertar compás vacío</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Delete Selected Tracks</source>
-        <translation type="unfinished"></translation>
+        <translation>Borrar pistas seleccionadas</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Shrink selected parts</source>
-        <translation type="unfinished"></translation>
+        <translation>Encojer regiones seleccionadas</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Expand selected parts</source>
-        <translation type="unfinished"></translation>
+        <translation>Expander regiones seleccionadas</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Clean selected parts</source>
-        <translation type="unfinished"></translation>
+        <translation>Limpiar regiones seleccionadas</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Add Track</source>
-        <translation type="unfinished">Agregar Pista</translation>
+        <translation>Agregar pista</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Select</source>
-        <translation type="unfinished">Seleccionar</translation>
+        <translation>Seleccionar</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Select &amp;All</source>
-        <translation type="unfinished">Seleccion&amp;ar Todo</translation>
+        <translation>Seleccion&amp;ar todo</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>&amp;Deselect All</source>
-        <translation type="unfinished">&amp;Deseleccionar Todo</translation>
+        <translation>&amp;Deseleccionar todo</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Invert &amp;Selection</source>
-        <translation type="unfinished">Invertir &amp;Selección</translation>
+        <translation>Invertir &amp;selección</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>&amp;Inside Loop</source>
-        <translation type="unfinished">&amp;Interior de bucle</translation>
+        <translation>&amp;Interior del bucle</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>&amp;Outside Loop</source>
-        <translation type="unfinished">&amp;Exterior de Bucle</translation>
+        <translation>&amp;Exterior del bucle</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>All &amp;Parts on Track</source>
-        <translation type="unfinished">Todas las &amp;Partes de la pista</translation>
+        <translation>Todas las regiones de la &amp;pista</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Score</source>
-        <translation type="unfinished">Partitura</translation>
+        <translation>Editor de partitura</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>all parts in one staff</source>
-        <translation type="unfinished"></translation>
+        <translation>Todas las regiones en un solo pentagrama</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>one staff per part</source>
-        <translation type="unfinished"></translation>
+        <translation>Un pentagrama por región.</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>New score window</source>
-        <translation type="unfinished"></translation>
+        <translation>Nueva ventana de partitura</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Pianoroll</source>
-        <translation type="unfinished">Pianola</translation>
+        <translation>Editor de matriz</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Drums</source>
-        <translation type="unfinished">Percusión</translation>
+        <translation>Editor de percusión</translation>
     </message>
     <message>
         <location line="+1"/>
         <location line="+6"/>
         <source>List</source>
-        <translation type="unfinished">Lista</translation>
+        <translation>Editor de lista</translation>
     </message>
     <message>
         <location line="-5"/>
         <source>Wave</source>
-        <translation type="unfinished">Audio</translation>
+        <translation>Editor de audio</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Mastertrack</source>
-        <translation type="unfinished">Pista Maestra</translation>
+        <translation>Pista maestra.</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Graphic</source>
-        <translation type="unfinished">Gráfico</translation>
+        <translation>Editor gráfico</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Midi &amp;Transform</source>
-        <translation type="unfinished">&amp;Transformación MIDI</translation>
+        <translation>&amp;Transformación MIDI</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Global Cut</source>
-        <translation type="unfinished">Corte global</translation>
+        <translation>Corte global</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Global Insert</source>
-        <translation type="unfinished">Inserción Global</translation>
+        <translation>Inserción global</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Global Split</source>
-        <translation type="unfinished">Partición Global</translation>
+        <translation>División global</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>&amp;Edit</source>
-        <translation type="unfinished">&amp;Editar</translation>
+        <translation>&amp;Editar</translation>
     </message>
     <message>
         <location line="+43"/>
         <source>&amp;Structure</source>
-        <translation type="unfinished">E&amp;structura</translation>
+        <translation>E&amp;structura</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Functions</source>
-        <translation type="unfinished">Funciones</translation>
+        <translation>Funciones</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>&amp;Quantize Notes</source>
-        <translation type="unfinished"></translation>
+        <translation>Cuantizado de notas</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Change note &amp;length</source>
-        <translation type="unfinished"></translation>
+        <translation>Cambiar duración de notas</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Change note &amp;velocity</source>
-        <translation type="unfinished"></translation>
+        <translation>Cambiar velocidad de notas</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Crescendo/Decrescendo</source>
-        <translation type="unfinished"></translation>
+        <translation>Crescendo/Decrescendo</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Transpose</source>
-        <translation type="unfinished">Transponer</translation>
+        <translation>Transponer</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Erase Events (Not Parts)</source>
-        <translation type="unfinished"></translation>
+        <translation>Borrar eventos (no regiones)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Move Events (Not Parts)</source>
-        <translation type="unfinished"></translation>
+        <translation>Mover eventos (no regiones)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Set Fixed Note Length</source>
-        <translation type="unfinished"></translation>
+        <translation>Igualar duración de notas</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Delete Overlapping Notes</source>
-        <translation type="unfinished"></translation>
+        <translation>Borrar notas superpuestas</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Legato</source>
-        <translation type="unfinished"></translation>
+        <translation>Legato</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
+        <translation>Comportamiento de ventana</translation>
     </message>
     <message>
-        <location line="+308"/>
+        <location line="+311"/>
         <location line="+6"/>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation>Nuevo</translation>
     </message>
 </context>
 <context>
-    <name>MusEArranger::PartCanvas</name>
+    <name>MusEGui::AudioMixerApp</name>
     <message>
-        <location filename="../../muse/arranger/pcanvas.cpp" line="+346"/>
-        <source>Cannot copy/move/clone to different Track-Type</source>
-        <translation type="unfinished">No puedo copiar/mover/clonar a un tipo diferente de pista</translation>
+        <location filename="../../muse/mixer/amixer.cpp" line="+171"/>
+        <source>&amp;Create</source>
+        <translation>&amp;Crear</translation>
     </message>
     <message>
-        <location line="+261"/>
-        <source>C&amp;ut</source>
-        <translation type="unfinished">C&amp;ortar</translation>
+        <location line="+4"/>
+        <source>&amp;View</source>
+        <translation>&amp;Ver</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>&amp;Copy</source>
-        <translation type="unfinished">&amp;Copiar</translation>
+        <location line="+1"/>
+        <source>Routing</source>
+        <translation>Ruteado</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Show Midi Tracks</source>
+        <translation>Ver pistas MIDI</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show Drum Tracks</source>
+        <translation>Ver pistas de percision</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show Wave Tracks</source>
+        <translation>Ver pistas de audio</translation>
     </message>
     <message>
         <location line="+6"/>
-        <source>s&amp;elect </source>
-        <translation type="unfinished"></translation>
+        <source>Show Inputs</source>
+        <translation>Ver entradas de audio</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>clones</source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>Show Outputs</source>
+        <translation>Ver salidas de audio</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>rename</source>
-        <translation type="unfinished">renombrar</translation>
+        <location line="+1"/>
+        <source>Show Groups</source>
+        <translation>Ver grupos de audio</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>color</source>
-        <translation type="unfinished">color</translation>
+        <location line="+1"/>
+        <source>Show Auxs</source>
+        <translation>Ver envios auxiliares</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>delete</source>
-        <translation type="unfinished">borrar</translation>
+        <location line="+1"/>
+        <source>Show Synthesizers</source>
+        <translation>Ver sintetizadores</translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::AudioStrip</name>
     <message>
-        <location line="+2"/>
-        <source>split</source>
-        <translation type="unfinished">partir</translation>
+        <location filename="../../muse/mixer/astrip.cpp" line="+653"/>
+        <source>panorama</source>
+        <translation>panorama</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>glue</source>
-        <translation type="unfinished"></translation>
+        <source>aux send level</source>
+        <translation>volumen de envio auxiliar</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Pan</source>
+        <translation>Paneo</translation>
+    </message>
+    <message>
+        <location line="+87"/>
+        <source>1/2 channel</source>
+        <translation>Canales 1/2</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Pre</source>
+        <translation>Pre</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>pre fader - post fader</source>
+        <translation>pre fader - port fader</translation>
+    </message>
+    <message>
+        <location line="+64"/>
+        <source>dB</source>
+        <translation>dB</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>record</source>
+        <translation>grabar</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>mute</source>
+        <translation>silencio</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>record downmix</source>
+        <translation>downmix de captura</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>de-clone</source>
-        <translation type="unfinished">des-clonar</translation>
+        <location line="+4"/>
+        <source>solo mode</source>
+        <translation>Modo solo</translation>
     </message>
     <message>
-        <location line="+10"/>
         <location line="+7"/>
-        <location line="+7"/>
-        <source>save part to disk</source>
-        <translation type="unfinished"></translation>
+        <source>off</source>
+        <translation>apagado</translation>
     </message>
     <message>
-        <location line="-2"/>
-        <source>wave edit</source>
-        <translation type="unfinished">editar onda</translation>
+        <location line="+21"/>
+        <source>iR</source>
+        <translation>ER</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>file info</source>
-        <translation type="unfinished"></translation>
+        <location line="+2"/>
+        <source>input routing</source>
+        <translation>Ruteado de entrada</translation>
     </message>
     <message>
-        <location line="+88"/>
-        <source>MusE: save part</source>
-        <translation type="unfinished"></translation>
+        <location line="+8"/>
+        <source>oR</source>
+        <translation>SR</translation>
     </message>
     <message>
-        <location line="+18"/>
-        <source>Part name</source>
-        <translation type="unfinished"></translation>
+        <location line="+2"/>
+        <source>output routing</source>
+        <translation>ruteado de salida</translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Files</source>
-        <translation type="unfinished"></translation>
+        <location line="+13"/>
+        <source>Off</source>
+        <translation>Apagado</translation>
     </message>
     <message>
-        <location line="+2090"/>
-        <source> out of </source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>Read</source>
+        <translation>Lectura</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source> parts</source>
-        <translation type="unfinished"></translation>
+        <source>Touch</source>
+        <translation>Tocar</translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source> part</source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>Write</source>
+        <translation>Escritura</translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>automation type</source>
+        <translation>Tipo de automatizacion</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::BigTime</name>
+    <message>
+        <location filename="../../muse/widgets/bigtime.cpp" line="+62"/>
+        <source>format display</source>
+        <translation>Formato de vista</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>bar</source>
+        <translation>compaa</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source> could not be pasted.
-Likely the selected track is the wrong type.</source>
-        <translation type="unfinished"></translation>
+        <source>beat</source>
+        <translation>Pulso</translation>
     </message>
     <message>
-        <location line="+25"/>
-        <source>Cannot paste: multiple tracks selected</source>
-        <translation type="unfinished">No puedo pegar: mtilpes pistas seleccionadas</translation>
+        <location line="+1"/>
+        <location line="+6"/>
+        <source>tick</source>
+        <translation>Tic</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Cannot paste: no track selected</source>
-        <translation type="unfinished">No puedo pegar: No hay pista seleccionada</translation>
+        <location line="-4"/>
+        <source>minute</source>
+        <translation>minuto</translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Can only paste to midi/drum track</source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>second</source>
+        <translation>segundo</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>Can only paste to wave track</source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <location line="+3"/>
+        <source>frame</source>
+        <translation>frame</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>Can only paste to midi or wave track</source>
-        <translation type="unfinished"></translation>
+        <location line="-2"/>
+        <source>subframe</source>
+        <translation>sub-frame</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>MusE: Bigtime</source>
+        <translation>MusE: Big Time</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::ClipListEdit</name>
+    <message>
+        <location filename="../../muse/cliplist/cliplist.cpp" line="+129"/>
+        <source>MusE: Clip List Editor</source>
+        <translation>MusE: Editor de lista de archivos de audio</translation>
     </message>
     <message>
         <location line="+8"/>
-        <source>Cannot paste: wrong data type</source>
-        <translation type="unfinished">No puedo pegar: Tipo de datos equivocado</translation>
+        <source>Undo/Redo tools</source>
+        <translation>Herramientas Deshacer/Rehacer</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>panic</source>
+        <translation>pánico</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>transport</source>
+        <translation>Transporte</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Window &amp;Config</source>
+        <translation>Comportamiento de ventana</translation>
     </message>
 </context>
 <context>
-    <name>MusEArranger::TList</name>
+    <name>MusEGui::ComboQuant</name>
     <message>
-        <location filename="../../muse/arranger/tlist.cpp" line="+362"/>
-        <source>&lt;none&gt;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../muse/widgets/comboQuant.cpp" line="+40"/>
+        <location line="+1"/>
+        <location line="+1"/>
+        <source>Off</source>
+        <translation>Apagado</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::CtrlPanel</name>
+    <message>
+        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="+91"/>
+        <source>S</source>
+        <translation>S</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <source>no clef</source>
-        <translation type="unfinished"></translation>
+        <location line="+5"/>
+        <source>select controller</source>
+        <translation>Seleccionar controlador</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>X</source>
+        <translation>X</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>remove panel</source>
+        <translation>Quitar el panel</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>manual adjust</source>
+        <translation>Ajuste manual</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>double click on/off</source>
+        <translation>doble click encendido/apagado</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>off</source>
+        <translation>apagado</translation>
+    </message>
+    <message>
+        <location line="+443"/>
+        <location line="+236"/>
+        <source>Velocity</source>
+        <translation>Velocidad</translation>
+    </message>
+    <message>
+        <location line="-186"/>
+        <source>add new ...</source>
+        <translation>Agregar nuevo...</translation>
+    </message>
+    <message>
+        <location line="+163"/>
+        <location line="+58"/>
+        <source>Instrument-defined</source>
+        <translation>Definición de instrumento</translation>
+    </message>
+    <message>
+        <location line="-43"/>
+        <location line="+21"/>
+        <source>Add ...</source>
+        <translation>Agregar...</translation>
+    </message>
+    <message>
+        <location line="-17"/>
+        <source>Others</source>
+        <translation>Otros</translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Edit instrument ...</source>
+        <translation>Editar instrumento...</translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Common Controls</source>
+        <translation>Controles comunes</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::DrumEdit</name>
+    <message>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="+113"/>
+        <location line="+21"/>
+        <source>mute instrument</source>
+        <translation>silenciar instrumento</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>sound name</source>
+        <translation>nombre del sonido</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>volume percent</source>
+        <translation>Porcentaje de volumen</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>quantisation</source>
+        <translation>cuantización</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>this input note triggers the sound</source>
+        <translation>ensta nota de entrada dispara el sonido</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>note length</source>
+        <translation>Duración de nota</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>this is the note which is played</source>
+        <translation>Esta es la nota que se toca</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <source>output channel (hold ctl to affect all rows)</source>
+        <translation>canal de salida (mantener presionado Ctrl a afectar a todas las pistas)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>output port (hold ctl to affect all rows)</source>
+        <translation>Puerto de salida (Mantener presionado  CTRL a afecta todas las pistas)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+21"/>
+        <source>shift + control key: draw velocity level 1</source>
+        <translation>Shift + CTRL: Dibuja la velocidad 1</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>control key: draw velocity level 2</source>
+        <translation>CTRL: Dibuja la velocidad 2</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>shift key: draw velocity level 3</source>
+        <translation>Shift: Dibuja la velocidad 3</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>draw velocity level 4</source>
+        <translation>Dibuja la velocidad 4</translation>
+    </message>
+    <message>
+        <location line="-5"/>
+        <source>output channel (ctl: affect all rows)</source>
+        <translation>Canal de salida. (CTRL afecta todas las pistas)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>output port (ctl: affect all rows)</source>
+        <translation>Puerto de salida (CTRL afecta todas las pistas)</translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>&amp;File</source>
+        <translation>Archivo</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>Treble</source>
-        <translation type="unfinished"></translation>
+        <source>Load Map</source>
+        <translation>Cargar Mapa</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Save Map</source>
+        <translation>Guarda Mapa</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reset GM Map</source>
+        <translation>Resetear mapa GM</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>&amp;Edit</source>
+        <translation>&amp;Editar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Cut</source>
+        <translation>Cortar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy</source>
+        <translation>Copiar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy events in range</source>
+        <translation>Copiar eventos del rango</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Paste</source>
+        <translation>Pegar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Paste (with Dialog)</source>
+        <translation>Pegar (con dialogo)</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>Bass</source>
-        <translation type="unfinished"></translation>
+        <source>Delete Events</source>
+        <translation>Borrar eventos</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>&amp;Select</source>
+        <translation>&amp;Seleccionar</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>Grand</source>
-        <translation type="unfinished"></translation>
+        <source>Select All</source>
+        <translation>Seleccionar todo</translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>MusE: bad trackname</source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>Select None</source>
+        <translation>No seleccionar nada</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>please choose a unique track name</source>
-        <translation type="unfinished"></translation>
+        <source>Invert</source>
+        <translation>Invertir</translation>
     </message>
     <message>
-        <location line="+157"/>
-        <location line="+1143"/>
-        <source>Update drummap?</source>
-        <translation type="unfinished"></translation>
+        <location line="+2"/>
+        <source>Inside Loop</source>
+        <translation>Interior del bucle</translation>
     </message>
     <message>
-        <location line="-1142"/>
-        <source>Do you want to use same port for all instruments in the drummap?</source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>Outside Loop</source>
+        <translation>Exterior del bucle</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Previous Part</source>
+        <translation>Región  anterior</translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+1143"/>
-        <source>&amp;Yes</source>
-        <translation type="unfinished"></translation>
+        <source>Next Part</source>
+        <translation>Región siguiente</translation>
     </message>
     <message>
-        <location line="-1143"/>
-        <location line="+1143"/>
-        <source>&amp;No</source>
-        <translation type="unfinished"></translation>
+        <location line="+19"/>
+        <source>Fu&amp;nctions</source>
+        <translation>Funciones</translation>
     </message>
     <message>
-        <location line="-1066"/>
-        <location line="+55"/>
-        <source>show gui</source>
-        <translation type="unfinished">mostrar gui</translation>
+        <location line="+4"/>
+        <source>Re-order list</source>
+        <translation>Reordenar la lista</translation>
     </message>
     <message>
-        <location line="-46"/>
-        <location line="+55"/>
-        <source>show native gui</source>
-        <translation type="unfinished"></translation>
+        <location line="+2"/>
+        <source>Set Fixed Length</source>
+        <translation>Fijar duración</translation>
     </message>
     <message>
-        <location line="+338"/>
-        <source>Treble clef</source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>Modify Velocity</source>
+        <translation>Modificar la velocidad.</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Bass clef</source>
-        <translation type="unfinished"></translation>
+        <source>Crescendo/Decrescendo</source>
+        <translation>Crescendo/Decrescendo</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Grand Staff</source>
-        <translation type="unfinished"></translation>
+        <source>Quantize</source>
+        <translation>Cuantizar</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <source>Viewable automation</source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>Erase Event</source>
+        <translation>Borrar evento</translation>
     </message>
     <message>
-        <location line="+131"/>
-        <source>Delete Track</source>
-        <translation type="unfinished">Borrar pista</translation>
+        <location line="+1"/>
+        <source>Move Notes</source>
+        <translation>Mover notas</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Track Comment</source>
-        <translation type="unfinished"></translation>
+        <source>Delete Overlaps</source>
+        <translation>Eliminar superpuestos</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>&amp;Plugins</source>
+        <translation>Efectos</translation>
     </message>
     <message>
         <location line="+3"/>
-        <source>Insert Track</source>
-        <translation type="unfinished"></translation>
+        <source>Window &amp;Config</source>
+        <translation></translation>
     </message>
     <message>
-        <location line="+445"/>
-        <source>Midi</source>
-        <translation type="unfinished">MIDI</translation>
+        <location line="+11"/>
+        <source>Drum tools</source>
+        <translation>Herramientas de percusión</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Drum</source>
-        <translation type="unfinished">Percusión</translation>
+        <location line="+4"/>
+        <source>Load Drummap</source>
+        <translation>Cargar mapa de percusión</translation>
     </message>
     <message>
-        <location line="+50"/>
-        <source>Do you want to use same port and channel for all instruments in the drummap?</source>
-        <translation type="unfinished"></translation>
+        <location line="+6"/>
+        <source>Store Drummap</source>
+        <translation>Guardar mapa de percusión</translation>
     </message>
-</context>
-<context>
-    <name>MusEDialog::PasteDialog</name>
-    <message numerus="yes">
-        <location filename="../../muse/widgets/pastedialog.cpp" line="+81"/>
-        <source>%n quarter(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-        </translation>
+    <message>
+        <location line="+12"/>
+        <source>Step Record</source>
+        <translation>Grabación por pasos</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>quarter</source>
-        <translation type="unfinished"></translation>
+        <location line="+6"/>
+        <source>Midi Input</source>
+        <translation>Entrada MIDI</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>quarters</source>
-        <translation type="unfinished"></translation>
+        <location line="+9"/>
+        <source>cursor tools</source>
+        <translation>Herramientas de cursor</translation>
     </message>
-</context>
-<context>
-    <name>MusEDialog::PasteEventsDialog</name>
-    <message numerus="yes">
-        <location filename="../../muse/widgets/pasteeventsdialog.cpp" line="+95"/>
-        <source>%n quarter(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-        </translation>
+    <message>
+        <location line="+5"/>
+        <source>Set step size for cursor edit</source>
+        <translation>Establecer el tamaño del paso para modificar el cursor</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>panic</source>
+        <translation>pánico</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>transport</source>
+        <translation>Transporte</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>ctrl</source>
+        <translation>control</translation>
     </message>
     <message>
         <location line="+7"/>
-        <source>quarter</source>
-        <translation type="unfinished"></translation>
+        <source>Add Controller View</source>
+        <translation>Agregar vista de controlador</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>quarters</source>
-        <translation type="unfinished"></translation>
+        <location line="+57"/>
+        <source>M</source>
+        <translation>M</translation>
     </message>
-</context>
-<context>
-    <name>MusEMixer::AudioMixerApp</name>
     <message>
-        <location filename="../../muse/mixer/amixer.cpp" line="+171"/>
-        <source>&amp;Create</source>
-        <translation type="unfinished">&amp;Crear</translation>
+        <location line="+1"/>
+        <source>Sound</source>
+        <translation>Sonido</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>&amp;View</source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>Vol</source>
+        <translation>Volumen</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Routing</source>
-        <translation type="unfinished"></translation>
+        <source>QNT</source>
+        <translation>QNT</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Show Midi Tracks</source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>E-Note</source>
+        <translation>Nota-E</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Show Drum Tracks</source>
-        <translation type="unfinished"></translation>
+        <source>Len</source>
+        <translation>Duraciòn</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Show Wave Tracks</source>
-        <translation type="unfinished"></translation>
+        <source>A-Note</source>
+        <translation>Nota-A</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Show Inputs</source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>Ch</source>
+        <translation>Canal</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Show Outputs</source>
-        <translation type="unfinished"></translation>
+        <source>Port</source>
+        <translation>Puerto</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Show Groups</source>
-        <translation type="unfinished"></translation>
+        <source>LV1</source>
+        <translation>VL1</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Show Auxs</source>
-        <translation type="unfinished"></translation>
+        <source>LV2</source>
+        <translation>VL2</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Show Synthesizers</source>
-        <translation type="unfinished"></translation>
+        <source>LV3</source>
+        <translation>VL3</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>LV4</source>
+        <translation>VL4</translation>
+    </message>
+    <message>
+        <location line="+376"/>
+        <source>Muse: Load Drum Map</source>
+        <translation>MusE: Cargar mapa de percusión</translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>MusE: Store Drum Map</source>
+        <translation>MusE: Guardar mapa de percusión</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Drum map</source>
+        <translation>Mapa de percusiòn</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reset the drum map with GM defaults?</source>
+        <translation>¿Resetear en mapa de percusión con el banco GM?</translation>
     </message>
 </context>
 <context>
-    <name>MusEMixer::AudioStrip</name>
+    <name>MusEGui::EditCAfterDialog</name>
     <message>
-        <location filename="../../muse/mixer/astrip.cpp" line="+645"/>
-        <source>panorama</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../muse/liste/editevent.cpp" line="+445"/>
+        <source>MusE: Enter Channel Aftertouch</source>
+        <translation>MusE: Introduzca el AfterTouch del canal</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>aux send level</source>
-        <translation type="unfinished"></translation>
+        <source>Time Position</source>
+        <translation>Posición de tiempo</translation>
     </message>
     <message>
-        <location line="+23"/>
-        <source>Pan</source>
-        <translation type="unfinished"></translation>
+        <location line="+4"/>
+        <source>Pressure</source>
+        <translation>Presión</translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::EditEventDialog</name>
     <message>
-        <location line="+93"/>
-        <source>1/2 channel</source>
-        <translation type="unfinished">Canales 1/2</translation>
+        <location line="-261"/>
+        <source>Ok</source>
+        <translation>Aceptar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cancel</source>
+        <translation>Cancelar</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::EditInstrument</name>
+    <message>
+        <location filename="../../muse/instruments/editinstrument.cpp" line="+312"/>
+        <location line="+34"/>
+        <source>MusE: Create file failed</source>
+        <translation>MusE: Fallo la creacion del archivo</translation>
     </message>
     <message>
+        <location line="+33"/>
+        <source>MusE: Write File failed</source>
+        <translation>MusE: La captura del archivo ha fallado</translation>
+    </message>
+    <message>
+        <location line="+32"/>
         <location line="+12"/>
-        <source>Pre</source>
-        <translation type="unfinished">Pre</translation>
+        <location line="+280"/>
+        <location line="+12"/>
+        <source>MusE:</source>
+        <translation>MusE:</translation>
+    </message>
+    <message>
+        <location line="-303"/>
+        <location line="+292"/>
+        <source>The user instrument directory
+%1
+does not exist yet. Create it now?
+</source>
+        <translation>El instrumento no existe en la carpeta
+%1
+¿Desea crearlo ahora?
+</translation>
+    </message>
+    <message>
+        <location line="-291"/>
+        <location line="+292"/>
+        <source>(You can change the user instruments directory at Settings-&gt;Global Settings-&gt;Midi)</source>
+        <translation>(Usted puede cambiar la carpeta del instrumento desde Ajustes-&gt;Configuración global-&gt;MIDI)</translation>
+    </message>
+    <message>
+        <location line="-282"/>
+        <location line="+292"/>
+        <source>Unable to create user instrument directory &apos;%1&apos;</source>
+        <translation>No es posible crear el instrumento en la carpeta &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <location line="-244"/>
+        <location line="+266"/>
+        <source>MusE: Save Instrument Definition</source>
+        <translation>MusE: Guardar definicion de instrumento</translation>
+    </message>
+    <message>
+        <location line="-265"/>
+        <location line="+266"/>
+        <source>Instrument Definition (*.idf)</source>
+        <translation>Definicion de instrumento (*.idf)</translation>
+    </message>
+    <message>
+        <location line="-154"/>
+        <location line="+29"/>
+        <source>MusE: Save instrument as</source>
+        <translation>MusE: Guardar instrumento como</translation>
+    </message>
+    <message>
+        <location line="-29"/>
+        <source>Enter a new unique instrument name:</source>
+        <translation>Ingrese un nuevo nombre unico de instrumento</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>The user instrument &apos;%1&apos; already exists. This will overwrite its .idf instrument file.
+Are you sure?</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location line="+526"/>
+        <source>MusE: Bad instrument name</source>
+        <translation>MusE: Nombre de instrumento invalido</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>pre fader - post fader</source>
-        <translation type="unfinished">pre fader - port fader</translation>
+        <source>Please choose a unique instrument name.
+(The name might be used by a hidden instrument.)</source>
+        <translation>Selecciones un nombre único al instrumento
+(El nombre puede estar siendo utilizado por un instrumento oculto.)</translation>
     </message>
     <message>
-        <location line="+64"/>
-        <source>dB</source>
-        <translation type="unfinished">dB</translation>
+        <location line="+136"/>
+        <source>MusE: Bad patch name</source>
+        <translation>MusE: Nombre de programa invalido</translation>
     </message>
     <message>
-        <location line="+36"/>
-        <source>record</source>
-        <translation type="unfinished">grabar</translation>
+        <location line="+1"/>
+        <source>Please choose a unique patch name</source>
+        <translation>Por favor elija nombre unico de programa</translation>
     </message>
     <message>
-        <location line="+14"/>
-        <source>mute</source>
-        <translation type="unfinished">silencio</translation>
+        <location line="+22"/>
+        <source>MusE: Bad patchgroup name</source>
+        <translation>MusE: Nombre de grupo erroneo.</translation>
     </message>
     <message>
-        <location line="+25"/>
-        <source>record downmix</source>
-        <translation type="unfinished">downmix de captura</translation>
+        <location line="+1"/>
+        <source>Please choose a unique patchgroup name</source>
+        <translation>Seleccione un nombre único al grupo</translation>
+    </message>
+    <message>
+        <location line="+526"/>
+        <source>MusE: Bad controller name</source>
+        <translation>MusE: Nombre del controlador no válido.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Please choose a unique controller name</source>
+        <translation>El nombre del controlador ya existe</translation>
+    </message>
+    <message>
+        <location line="+1287"/>
+        <location line="+12"/>
+        <source>MusE: Cannot add common controller</source>
+        <translation>MusE: No se puede agregar un controlador comun.</translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <source>A controller named &apos;%1&apos; already exists.</source>
+        <translation>El nombre de controlador &apos;%1&apos; ya existe.</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>A controller number %1 already exists.</source>
+        <translation>El número de controlador %1 ya existe.</translation>
+    </message>
+    <message>
+        <location line="+283"/>
+        <location line="+5"/>
+        <source>MusE</source>
+        <translation>MusE</translation>
+    </message>
+    <message>
+        <location line="-4"/>
+        <location line="+5"/>
+        <source>The current Instrument contains unsaved data
+Save Current Instrument?</source>
+        <translation>El instrumento actual contiene datos sin guardar.
+¿Desea guardarlos ahora?</translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <location line="+5"/>
+        <source>&amp;Save</source>
+        <translation>&amp;Guardar</translation>
+    </message>
+    <message>
+        <location line="-5"/>
+        <location line="+5"/>
+        <source>&amp;Nosave</source>
+        <translation>&amp;No Guardar</translation>
+    </message>
+    <message>
+        <location line="-5"/>
+        <source>&amp;Abort</source>
+        <translation>&amp;Abortar</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::EditMetaDialog</name>
+    <message>
+        <location filename="../../muse/liste/editevent.cpp" line="+118"/>
+        <source>MusE: Enter Meta Event</source>
+        <translation>MusE: Introduzca evento Meta</translation>
     </message>
     <message>
         <location line="+2"/>
+        <source>Time Position</source>
+        <translation>Posición de tiempo</translation>
+    </message>
+    <message>
         <location line="+4"/>
-        <source>solo mode</source>
-        <translation type="unfinished"></translation>
+        <source>Meta Type</source>
+        <translation>Tipo de Meta</translation>
     </message>
     <message>
         <location line="+12"/>
-        <source>off</source>
-        <translation type="unfinished">apagado</translation>
+        <source>Enter Hex</source>
+        <translation>Ingrese Hex</translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::EditPAfterDialog</name>
     <message>
-        <location line="+19"/>
-        <source>iR</source>
-        <translation type="unfinished"></translation>
+        <location line="+176"/>
+        <source>MusE: Enter Poly Aftertouch</source>
+        <translation>Muse: Escribe el aftertouch polifónico</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>input routing</source>
-        <translation type="unfinished"></translation>
+        <source>Time Position</source>
+        <translation>Posición de tiempo</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>oR</source>
-        <translation type="unfinished"></translation>
+        <location line="+4"/>
+        <source>Pitch</source>
+        <translation>Tono</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>output routing</source>
-        <translation type="unfinished">ruteado de entrada</translation>
+        <source>Pressure</source>
+        <translation>Presión</translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::EditToolBar</name>
     <message>
-        <location line="+12"/>
-        <source>Off</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../muse/widgets/tools.cpp" line="+33"/>
+        <source>select Pointer Tool:
+with the pointer tool you can:
+  select parts
+  move parts
+  copy parts</source>
+        <translation>Selecciona la herramienta Puntero:
+con la herramienta de puntero puede:
+  seleccionar regiones
+  mover regiones
+  copiar regiones.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>select Pencil Tool:
+with the pencil tool you can:
+  create new parts
+  modify length of parts</source>
+        <translation>Selecciona la Herramienta de Lápiz:
+con la herramienta de Lápiz puede:
+  crear nuevas regiones
+  modificar la duración de las regiones.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>select Delete Tool:
+with the delete tool you can delete parts</source>
+        <translation>selecciona la Herramienta de Borrar:
+con la herramienta de Borrar puedes borrar regiones.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>select Cut Tool:
+with the cut tool you can split a part</source>
+        <translation>selecciona la Herramienta de Corte:
+con la herramienta de Corte puede dividir una región</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>select Glue Tool:
+with the glue tool you can glue two parts</source>
+        <translation>selecciona la Herramienta de Unir:
+con la herramienta de Unir puedes unir dos regiones.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>select Score Tool:
+</source>
+        <translation>selecciona la Herramienta de Partitura:
+</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Read</source>
-        <translation type="unfinished"></translation>
+        <source>select Quantize Tool:
+insert display quantize event</source>
+        <translation>selecciona la Herramianta de Cuantización:
+inserta un evento de cuantización de visualización</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>select Drawing Tool</source>
+        <translation>selecciona la Herramienta de Dibujo</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Touch</source>
-        <translation type="unfinished"></translation>
+        <source>select Muting Tool:
+click on part to mute/unmute</source>
+        <translation>selecciona la Herramienta de Silenciar:
+haz click en una región para silenciar/des-silenciar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Manipulate automation</source>
+        <translation>Manipular automatización</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Write</source>
-        <translation type="unfinished"></translation>
+        <source>Cursor tool</source>
+        <translation>Herramientas de cursor</translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>automation type</source>
-        <translation type="unfinished"></translation>
+        <location line="+3"/>
+        <source>pointer</source>
+        <translation>puntero</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>pencil</source>
+        <translation>lápiz</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>eraser</source>
+        <translation>Borrador</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>cutter</source>
+        <translation>cortador</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>score</source>
+        <translation>partitura</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>glue</source>
+        <translation>Pegador</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>quantize</source>
+        <translation>cuantizador</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>draw</source>
+        <translation>dibujar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>mute parts</source>
+        <translation>silenciar regiones</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>edit automation</source>
+        <translation>Editar automatización</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>cursor</source>
+        <translation>Cursor</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Edit Tools</source>
+        <translation>Editar herramientas</translation>
     </message>
 </context>
 <context>
-    <name>MusEMixer::EffectRack</name>
+    <name>MusEGui::EffectRack</name>
     <message>
         <location filename="../../muse/mixer/rack.cpp" line="+193"/>
         <source>effect rack</source>
-        <translation type="unfinished">rack de efectos</translation>
+        <translation>rack de efectos</translation>
     </message>
     <message>
         <location line="+83"/>
         <source>new</source>
-        <translation type="unfinished">nuevo</translation>
+        <translation>nuevo</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>change</source>
-        <translation type="unfinished">cambiar</translation>
+        <translation>cambiar</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>move up</source>
-        <translation type="unfinished">subir</translation>
+        <translation>subir</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>move down</source>
-        <translation type="unfinished">bajar</translation>
+        <translation>bajar</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>remove</source>
-        <translation type="unfinished">quitar</translation>
+        <translation>quitar</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>bypass</source>
-        <translation type="unfinished">saltar</translation>
+        <translation>saltar</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>show gui</source>
-        <translation type="unfinished">mostrar gui</translation>
+        <translation>mostrar gui</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>show native gui</source>
-        <translation type="unfinished"></translation>
+        <translation>Ver interfaz nativa</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>save preset</source>
-        <translation type="unfinished"></translation>
+        <translation>Guardar preseteo</translation>
     </message>
     <message>
         <location line="+138"/>
         <source>MusE: Save Preset</source>
-        <translation type="unfinished"></translation>
+        <translation>MusE: Guardar preseteo</translation>
     </message>
     <message>
         <location line="+143"/>
         <source>Replace effect</source>
-        <translation type="unfinished"></translation>
+        <translation>Reemplazar efecto</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Do you really want to replace the effect %1?</source>
-        <translation type="unfinished"></translation>
+        <translation>¿Desea reemplazar el efecto %1?</translation>
     </message>
 </context>
 <context>
-    <name>MusEMixer::MidiStrip</name>
+    <name>MusEGui::GlobalSettingsConfig</name>
     <message>
-        <location filename="../../muse/mixer/mstrip.cpp" line="+109"/>
-        <location line="+121"/>
-        <location line="+158"/>
-        <source>off</source>
-        <translation type="unfinished">apagado</translation>
+        <location filename="../../muse/widgets/genset.cpp" line="+552"/>
+        <source>Selects instruments directory</source>
+        <translation>Seleccionar carpeta de instrumentos</translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::Header</name>
     <message>
-        <location line="-278"/>
-        <location line="+122"/>
-        <source>double click on/off</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../muse/widgets/header.cpp" line="+164"/>
+        <source>Track Info Columns</source>
+        <translation>Colunna de informaciòn de pistas</translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::LMaster</name>
     <message>
-        <location line="-42"/>
-        <source>VariationSend</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../muse/master/lmaster.cpp" line="+157"/>
+        <source>MusE: Mastertrack</source>
+        <translation>MusE: pista maestra</translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Var</source>
-        <translation type="unfinished">Var</translation>
+        <location line="+13"/>
+        <source>&amp;Edit</source>
+        <translation>&amp;Editar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Insert Tempo</source>
+        <translation>Insertar tiempo</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>ReverbSend</source>
-        <translation type="unfinished"></translation>
+        <source>Insert Signature</source>
+        <translation>Insertar signatura</translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Rev</source>
-        <translation type="unfinished">Rev</translation>
+        <location line="+1"/>
+        <source>Insert Key</source>
+        <translation>Insertar clave</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>ChorusSend</source>
-        <translation type="unfinished"></translation>
+        <source>Edit Positon</source>
+        <translation>Editar posición</translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Cho</source>
-        <translation type="unfinished">Cho</translation>
+        <location line="+1"/>
+        <source>Edit Value</source>
+        <translation>Editar valor</translation>
     </message>
     <message>
-        <location line="+39"/>
-        <source>dB</source>
-        <translation type="unfinished">dB</translation>
+        <location line="+1"/>
+        <source>Delete Event</source>
+        <translation>Borrar evento</translation>
     </message>
     <message>
-        <location line="+54"/>
-        <source>Pan/Balance</source>
-        <translation type="unfinished"></translation>
+        <location line="+3"/>
+        <source>Window &amp;Config</source>
+        <translation>&amp;Configuraciòn de la ventana</translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Pan</source>
-        <translation type="unfinished"></translation>
+        <location line="+23"/>
+        <source>Undo/Redo tools</source>
+        <translation>Herramientas de Deshacer/rehacer</translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>record</source>
-        <translation type="unfinished">grabar</translation>
+        <location line="+4"/>
+        <source>Edit tools</source>
+        <translation>Editar herramientas</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>mute</source>
-        <translation type="unfinished">silencio</translation>
+        <location line="+5"/>
+        <source>Tempo</source>
+        <translation>Timpo</translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>solo mode</source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>Timesig</source>
+        <translation>compás</translation>
     </message>
     <message>
-        <location line="+67"/>
-        <source>iR</source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>Key</source>
+        <translation>Clave</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>input routing</source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>new tempo</source>
+        <translation>nuevo tempo</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>oR</source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>new signature</source>
+        <translation>nuevo compás</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>new key</source>
+        <translation>Nueva clave</translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>output routing</source>
-        <translation type="unfinished">ruteado de entrada</translation>
+        <source>panic</source>
+        <translation>Pánico</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>transport</source>
+        <translation>Transporte</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Meter</source>
+        <translation>Metrónomo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Time</source>
+        <translation>Tiempo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Type</source>
+        <translation>Tipo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Value</source>
+        <translation>Valor</translation>
+    </message>
+    <message>
+        <location line="+390"/>
+        <source>Reposition of the initial tempo and signature events is not allowed</source>
+        <translation>Reposición del tempo inicial y la firma de eventos, no está permitido</translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>MusE: List Editor</source>
+        <translation>MusE: Editor de lista</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Input error, conversion not OK or value out of range</source>
+        <translation>Error de entrada,la conversión no escorrecta o valor está fuera de rango.</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Reposition of tempo and signature events to start position is not allowed!</source>
+        <translation>Reposición de los eventos de tempo y la firma a la posición inicial no está permitida!</translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::BigTime</name>
+    <name>MusEGui::ListEdit</name>
     <message>
-        <location filename="../../muse/widgets/bigtime.cpp" line="+60"/>
-        <source>format display</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../muse/liste/listedit.cpp" line="+476"/>
+        <source>insert Note</source>
+        <translation>insertar Nota</translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>bar</source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>insert SysEx</source>
+        <translation>insertar sistema exclusivo</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>beat</source>
-        <translation type="unfinished"></translation>
+        <source>insert Ctrl</source>
+        <translation>insertar controlador</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>insert Meta</source>
+        <translation>insertar Meta</translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>insert Channel Aftertouch</source>
+        <translation>insertar AfterTouch de canal</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>insert Poly Aftertouch</source>
+        <translation>insertar AfterTouch Polifónico</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&amp;Edit</source>
+        <translation>&amp;Editar</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Cut</source>
+        <translation>Cortar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Copy</source>
+        <translation>Copiar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Paste</source>
+        <translation>Pegar</translation>
+    </message>
+    <message>
         <location line="+6"/>
-        <source>tick</source>
-        <translation type="unfinished"></translation>
+        <source>Delete Events</source>
+        <translation>Borrar eventos</translation>
     </message>
     <message>
-        <location line="-4"/>
-        <source>minute</source>
-        <translation type="unfinished">minuto</translation>
+        <location line="+10"/>
+        <source>Window &amp;Config</source>
+        <translation>&amp;Configuraciòn de la ventana</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Undo/Redo tools</source>
+        <translation>Herramientas de Deshacer/Rehacer</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Insert tools</source>
+        <translation>Insertar herramientas</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>panic</source>
+        <translation>pánico</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>transport</source>
+        <translation>Transporte</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Tick</source>
+        <translation>Tic</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>second</source>
-        <translation type="unfinished">segundo</translation>
+        <source>Bar</source>
+        <translation>Compàz</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Type</source>
+        <translation>Tipo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ch</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Val A</source>
+        <translation>Val A</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Val B</source>
+        <translation>Val B</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Val C</source>
+        <translation>Val C</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Len</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Comment</source>
+        <translation>Comentario</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::MPConfig</name>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="+101"/>
+        <location line="+176"/>
+        <source>Default input connections</source>
+        <translation>Conexión de entrada predeterminada</translation>
+    </message>
+    <message>
+        <location line="-175"/>
+        <location line="+66"/>
+        <source>Are you sure you want to apply to all existing midi tracks now?</source>
+        <translation>¿Seguro que desea aplicar a todas las pistas MIDI existentes?</translation>
+    </message>
+    <message>
+        <location line="-1"/>
+        <location line="+148"/>
+        <source>Default output connections</source>
+        <translation>Conexión de salida predeterminada</translation>
+    </message>
+    <message>
+        <location line="-37"/>
+        <location line="+38"/>
+        <source>Setting will apply to new midi tracks.
+Do you want to apply to all existing midi tracks now?</source>
+        <translation>El sjuste se aplicará a las nuevas pistas MIDI.
+¿Usted desea aplicar a todas las pistas MIDI existentes?</translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>MusE: bad device name</source>
+        <translation>MusE: Nombre del dispositivo incorrecto</translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>please choose a unique device name</source>
+        <translation>El nombre del dispositivo ya existe</translation>
+    </message>
+    <message>
+        <location line="+72"/>
+        <location line="+860"/>
+        <source>in</source>
+        <translation>Entrada</translation>
+    </message>
+    <message>
+        <location line="-837"/>
+        <location line="+828"/>
+        <source>out</source>
+        <translation>Salida</translation>
+    </message>
+    <message>
+        <location line="-772"/>
+        <source>Show first aliases</source>
+        <translation>Mostrar primero los álias</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Show second aliases</source>
+        <translation>Mostrsr después los álias</translation>
+    </message>
+    <message>
+        <location line="+130"/>
+        <location line="+42"/>
+        <source>Toggle all</source>
+        <translation>Cambiar todos</translation>
+    </message>
+    <message>
+        <location line="-38"/>
+        <location line="+43"/>
+        <source>Change all tracks now</source>
+        <translation>Cambiar todas las pistas ahora</translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Create Jack device</source>
+        <translation>Crear conexión Jack</translation>
+    </message>
+    <message>
+        <location line="+229"/>
+        <location line="+29"/>
+        <source>Port Number</source>
+        <translation>Número de puerto</translation>
+    </message>
+    <message>
+        <location line="-28"/>
+        <source>Enable gui</source>
+        <translation>Habilitar visualización</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable reading</source>
+        <translation>Habilitar lectura</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable writing</source>
+        <translation>Habilitar escritura</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Port instrument</source>
+        <translation>Puerto de instrumento</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi device name. Click to edit (Jack)</source>
+        <translation>Nombre del dispositivo MIDI, Clic para editar (Jack)</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Connections from Jack Midi outputs</source>
+        <translation>Conexiones de salidas MIDI de Jack</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Connections to Jack Midi inputs</source>
+        <translation>Conexiones de entrada MIDI de Jack</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Auto-connect these channels to new midi tracks</source>
+        <translation>Conectar automaticamente a estos canales las nuevas pistas midi</translation>
+    </message>
+    <message>
         <location line="+3"/>
-        <source>frame</source>
-        <translation type="unfinished">frame</translation>
+        <source>Auto-connect new midi tracks to these channels</source>
+        <translation>Conectar nuevas pistas MIDI a estos canales</translation>
     </message>
     <message>
-        <location line="-2"/>
-        <source>subframe</source>
-        <translation type="unfinished">sub-frame</translation>
+        <location line="+2"/>
+        <source>Auto-connect new midi tracks to this channel</source>
+        <translation>Autoconectar  las nuevas pistas MIDI a este canal</translation>
     </message>
     <message>
-        <location line="+18"/>
-        <source>MusE: Bigtime</source>
-        <translation type="unfinished">MusE: Big Time</translation>
+        <location line="+2"/>
+        <source>Device state</source>
+        <translation>Estado del dispositivo</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Enable gui for device</source>
+        <translation>Habilitar visualización para el dispositivo</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Enable reading from device</source>
+        <translation>Habilitar la lectura desde el dispositivo</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Enable writing to device</source>
+        <translation>Habilitar la escritura en el dispositivo</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Name of the midi device associated with this port number. Click to edit Jack midi name.</source>
+        <translation>Nombre del dispositivo MIDI asociado con este puerto. Haga clic para cambiar el nombre del dispositivo MIDI de Jack.</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Instrument connected to port</source>
+        <translation>Instrumento conectado al puerto</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Connections from Jack Midi output ports</source>
+        <translation>Conexiones de los puertos de salida MIDI de Jack</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Connections to Jack Midi input ports</source>
+        <translation>Conexiones de los puertos de entrada MIDI de Jack</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Auto-connect these channels, on this port, to new midi tracks.</source>
+        <translation>Conexión automática de estos canales, en este puerto, a las nuevas pistas MIDI.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Connect new midi tracks to these channels, on this port.</source>
+        <translation>Conecte las nuevas pistas MIDI a estos canales, en este puerto.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Connect new midi tracks to this channel, on this port.</source>
+        <translation>Conecte las nuevas pistas MIDI a este canal, en este puerto.</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>State: result of opening the device</source>
+        <translation>Estado: resultado de abrir el puerto</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Port</source>
+        <translation>Puerto</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>GUI</source>
+        <translation>GUI</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>I</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>O</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Instrument</source>
+        <translation>Instrumento</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Device Name</source>
+        <translation>Nombre de dispositivo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>In routes</source>
+        <translation>Rutas de entrada</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Out routes</source>
+        <translation>Rutas de salida</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Def in ch</source>
+        <translation>Definir canales de entrada</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Def out ch</source>
+        <translation>Definir canales de salida</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>State</source>
+        <translation>Estado</translation>
+    </message>
+    <message>
+        <location line="+85"/>
+        <source>&lt;unknown&gt;</source>
+        <translation>&lt;desconocido&gt;</translation>
+    </message>
+    <message>
+        <location line="+87"/>
+        <location line="+74"/>
+        <source>&lt;none&gt;</source>
+        <translation>&lt;ningúno&gt;</translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::EditToolBar</name>
+    <name>MusEGui::MTScale</name>
     <message>
-        <location filename="../../muse/widgets/tools.cpp" line="+17"/>
-        <source>Edit Tools</source>
-        <translation type="unfinished">Editar herramientas</translation>
+        <location filename="../../muse/widgets/mtscale.cpp" line="+44"/>
+        <source>bar scale</source>
+        <translation>escala de compases</translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::GlobalSettingsConfig</name>
+    <name>MusEGui::MTScaleFlo</name>
     <message>
-        <location filename="../../muse/widgets/genset.cpp" line="+546"/>
-        <source>Selects instruments directory</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../muse/widgets/mtscale_flo.cpp" line="+44"/>
+        <source>bar scale</source>
+        <translation>escala de compases</translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::Header</name>
+    <name>MusEGui::MarkerView</name>
     <message>
-        <location filename="../../muse/widgets/header.cpp" line="+164"/>
-        <source>Track Info Columns</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../muse/marker/markerview.cpp" line="+174"/>
+        <source>MusE: Marker</source>
+        <translation>MusE: Marcador</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>add marker</source>
+        <translation>Agregar marcador</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>delete marker</source>
+        <translation>borrar marcador</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>&amp;Edit</source>
+        <translation>&amp;Editar</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Window &amp;Config</source>
+        <translation>&amp;Comportamiento de ventana</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Undo/Redo tools</source>
+        <translation>Herramientas de Deshacer/Rehacer</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>edit tools</source>
+        <translation>editar herramientas</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>panic</source>
+        <translation>pánico</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>transport</source>
+        <translation>Transporte</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Bar:Beat:Tick</source>
+        <translation>Compás:Golpe:Tic</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hr:Mn:Sc:Fr:Sf</source>
+        <translation>Hr:Mn:Sg:Fr:Sf</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lock</source>
+        <translation>Bloquear</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Text</source>
+        <translation>Texto</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Marker Properties</source>
+        <translation>Propiedades del marcador</translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::MTScale</name>
+    <name>MusEGui::MasterEdit</name>
     <message>
-        <location filename="../../muse/widgets/mtscale.cpp" line="+44"/>
-        <source>bar scale</source>
-        <translation type="unfinished">escala de compases</translation>
+        <location filename="../../muse/master/masteredit.cpp" line="+106"/>
+        <source>MusE: Mastertrack</source>
+        <translation>MusE: Pista maestra</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Window &amp;Config</source>
+        <translation>&amp;Configuraciones de la ventana</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Undo/Redo tools</source>
+        <translation>Herramientas de Deshacer/Rehacer</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>panic</source>
+        <translation>pánico</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>transport</source>
+        <translation>Transporte</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Enable master</source>
+        <translation>Habilitar maestro</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Enable</source>
+        <translation>Habilitado</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable usage of master track</source>
+        <translation>Habilitar el uso de la pista maestra</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Info</source>
+        <translation>Info</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cursor</source>
+        <translation>Cursor</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>time at cursor position</source>
+        <translation>tiempo en la posición del cursor</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>tempo at cursor position</source>
+        <translation>tempo en la posición del cursor</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Off</source>
+        <translation>Apagado</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Bar</source>
+        <translation>Compás</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Snap</source>
+        <translation>Snap</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>CurPos </source>
+        <translation>Posición del cursor </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>tempo at current position</source>
+        <translation>tempo en la posición actual</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>time signature at current position</source>
+        <translation>compás en la posición actual</translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::MTScaleFlo</name>
+    <name>MusEGui::MidiInputTransformDialog</name>
     <message>
-        <location filename="../../muse/widgets/mtscale_flo.cpp" line="+44"/>
-        <source>bar scale</source>
-        <translation type="unfinished">escala de compases</translation>
+        <location filename="../../muse/mplugins/midiitransform.cpp" line="+953"/>
+        <location line="+2"/>
+        <source>New</source>
+        <translation>Nuevo</translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::MidiSyncConfig</name>
+    <name>MusEGui::MidiStrip</name>
+    <message>
+        <location filename="../../muse/mixer/mstrip.cpp" line="+110"/>
+        <location line="+121"/>
+        <location line="+137"/>
+        <source>off</source>
+        <translation>apagado</translation>
+    </message>
+    <message>
+        <location line="-257"/>
+        <location line="+122"/>
+        <source>double click on/off</source>
+        <translation>Docle click Enciende/Apaga</translation>
+    </message>
+    <message>
+        <location line="-42"/>
+        <source>VariationSend</source>
+        <translation>Variación del envío</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Var</source>
+        <translation>Var</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>ReverbSend</source>
+        <translation>Envio de reverberancia</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Rev</source>
+        <translation>Rev</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>ChorusSend</source>
+        <translation>Envio de corolizador</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Cho</source>
+        <translation>Cho</translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>dB</source>
+        <translation>dB</translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Pan/Balance</source>
+        <translation>Panorama/Balance</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Pan</source>
+        <translation>Panorama</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>record</source>
+        <translation>grabar</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>mute</source>
+        <translation>silencio</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>solo mode</source>
+        <translation>modo solo</translation>
+    </message>
+    <message>
+        <location line="+69"/>
+        <source>iR</source>
+        <translation>ER</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>input routing</source>
+        <translation>Ruteado de entrada</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>oR</source>
+        <translation>SR</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>output routing</source>
+        <translation>ruteado de entrada</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::MidiSyncConfig</name>
     <message>
         <location filename="../../muse/widgets/midisyncimpl.cpp" line="+58"/>
         <location line="+29"/>
         <source>Port Number</source>
-        <translation type="unfinished">Número de puerto</translation>
+        <translation>Número de puerto</translation>
     </message>
     <message>
         <location line="-28"/>
         <location line="+29"/>
         <source>Name of the midi device associated with this port number</source>
-        <translation type="unfinished">Nombre del dispositivo MIDI asociado con este número de puerto</translation>
+        <translation>Nombre del dispositivo MIDI asociado con este número de puerto</translation>
     </message>
     <message>
         <location line="-27"/>
         <source>Midi clock input detected</source>
-        <translation type="unfinished"></translation>
+        <translation>Midi clock input detectado</translation>
     </message>
     <message>
         <location line="+1"/>
         <location line="+29"/>
         <source>Midi tick input detected</source>
-        <translation type="unfinished"></translation>
+        <translation>Midi tick input detectado</translation>
     </message>
     <message>
         <location line="-28"/>
         <source>Midi real time input detected</source>
-        <translation type="unfinished"></translation>
+        <translation>Midi real time input detectado</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>MMC input detected</source>
-        <translation type="unfinished"></translation>
+        <translation>MMC input detectado</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>MTC input detected</source>
-        <translation type="unfinished"></translation>
+        <translation>MTC input detectado</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Detected SMPTE format</source>
-        <translation type="unfinished"></translation>
+        <translation>Formato SMPTE detectado</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Receive id number. 127 = Global. Double click to edit.</source>
-        <translation type="unfinished"></translation>
+        <translation>Recibido id number, 127 = global, Doble clic para editar</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Accept midi clock input</source>
-        <translation type="unfinished"></translation>
+        <translation>MIDI clock input aceptado</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Accept midi real time input</source>
-        <translation type="unfinished"></translation>
+        <translation>MIDI real time input aceptado</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Accept MMC input</source>
-        <translation type="unfinished"></translation>
+        <translation>MMC input aceptado</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Accept MTC input</source>
-        <translation type="unfinished"></translation>
+        <translation>MTC input aceptado</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Receive start rewinds before playing</source>
-        <translation type="unfinished"></translation>
+        <translation>Iniciando rebobinado antes de reproducir</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Transmit id number. 127 = Global. Double click to edit.</source>
-        <translation type="unfinished"></translation>
+        <translation>Transmitiendo id number 127 = global, Doble clic para editar</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Send midi clock output</source>
-        <translation type="unfinished"></translation>
+        <translation>Enviar MIDI clock output</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Send midi realtime output</source>
-        <translation type="unfinished"></translation>
+        <translation>Enviar MIDI realtime output</translation>
     </message>
     <message>
         <location line="+1"/>
         <location line="+49"/>
         <source>Send MMC output</source>
-        <translation type="unfinished"></translation>
+        <translation>Enviar MMC output</translation>
     </message>
     <message>
         <location line="-48"/>
         <location line="+49"/>
         <source>Send MTC output</source>
-        <translation type="unfinished"></translation>
+        <translation>Enviar MTC output</translation>
     </message>
     <message>
         <location line="-37"/>
         <source>Midi clock input detected.
 Current port actually used is red.
 Click to force a port to be used.</source>
-        <translation type="unfinished"></translation>
+        <translation>Entrada de MIDI clock input detectado.
+El puerto utilizado es de color rojo.
+Haga clic para obligar a un puerto a utilizarlo.</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Midi realtime input detected, including
  start/stop/continue, and song position.</source>
-        <translation type="unfinished"></translation>
+        <translation>MIDI realtime input detectado, incluye
+ Reproducir, Detener, Continuar y Posición 
+en la canción.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>MMC input detected, including stop/play/deferred play, and locate.</source>
-        <translation type="unfinished"></translation>
+        <translation>MMC input detectado, incluye
+ Reproducir, Detener, Continuar y Posición 
+en la canción.</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>MTC input detected, including forward quarter-frame sync and full-frame locate.
 Current port actually used is red. Click to force a port to be current.</source>
-        <translation type="unfinished"></translation>
+        <translation>De entrada MTC detectadas, así como avanzar de cuartos de la sincronía y localizar fotograma completo.
+El puerto actual utilizado es de color rojo. Haga clic para obligar a un puerto a actualizar.</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Detected SMPTE format: 24fps, 25fps, 30fps drop frame, or 30fps non-drop
 Detects format of MTC quarter and full frame, and MMC locate.</source>
-        <translation type="unfinished"></translation>
+        <translation>Formato SMPTE detectado: 24fps, 25fps, 30fps drop frame, or 30fps non-drop
+Detecta el formato de cuarto de MTC y de fotograma completo, y localiza MMC.</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Receive id number. 127 = global receive all, even if not global.</source>
-        <translation type="unfinished"></translation>
+        <translation>Recibe número de identificación. 127 = Globales reciben de todo, incluso si no  es global.</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -12035,7 +12317,12 @@ Auto-acquire: If two or more port realtime inputs are enabled,
  then another can take over. Best if each turns off its clock
  at stop, so MusE can re-acquire the clock from another port.
 Click on detect indicator to force another.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aceptar la entrada del reloj MIDI. Sólo una entrada se utiliza para el reloj.
+Auto-adquisición: Si dos o más entradas en tiempo real del puerto están habilitadas,
+  el reloj detecta por primera vez se utiliza, hasta que el reloj se ha perdido,
+  luego otro se haga cargo. Mejor si cada uno se apaga el reloj
+  en la parada, por lo que Muse puede volver a adquirir el reloj de otro puerto.
+Haga clic en la detección de indicadores de forzar a otro.</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -12046,36 +12333,47 @@ Non-clock events (start,stop etc) are
 This means you may have several master
  devices connected, and muse will accept
  input from them.</source>
-        <translation type="unfinished"></translation>
+        <translation>Acepta la entrada de MIDI en tiempo real, incluyendo
+  iniciar / detener / continuar, y posición de la canción.
+los eventos (start, stop, etc) son
+  aceptado por todos los puertos habilitados.
+Esto significa que usted puede tener varios maestros
+  con los dispositivos conectados, y MusE aceptará la voluntad de
+  éstos.</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Accept MMC input, including stop/play/deferred play, and locate.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aceptar la entrada de MMC, incluida la parada / reproducción / reproducción diferida, y localización.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Accept MTC input, including forward quarter-frame sync and full-frame locate.
 See &apos;rc&apos; column for more help.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aceptar la entrada del MTC, incluso delante de cuartos de la sincronía y localizar de fotograma completo.
+Ver columna &quot;rc&quot; para obtener más ayuda.</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>When start is received, rewind before playing.
 Note: It may be impossible to rewind fast
  enough to synchronize with the external device.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aceptar la entrada de MIDI en tiempo real, incluyendo
+  recibir al inicio, rebobinar antes de reproducir.
+Nota: Puede ser imposible para un rebobinado rápido
+  lo suficiente como para sincronizar con el dispositivo externo.</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Transmit id number. 127 = global transmit to all.</source>
-        <translation type="unfinished"></translation>
+        <translation>Transmitir id number. 127 = global transmitir a todos.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Send midi clock output. If &apos;Slave to External Sync&apos; is chosen,
  muse can re-transmit clock to any other chosen ports.</source>
-        <translation type="unfinished"></translation>
+        <translation>Enviar la salida de reloj MIDI. al &apos;Esclavo de sincronización externa &quot; que elija,
+  MusE puede volver a transmitir el reloj a cualquier otro puerto elegido.</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -12085,187 +12383,1504 @@ Note: It may be impossible to rewind fast
  other chosen ports. This means you may have several slave
  devices connected, and muse can re-send realtime messages
  to any or all of them.</source>
-        <translation type="unfinished"></translation>
+        <translation>Enviar salida MIDI en tiempo real, incluyendo el arranque / parada / continuación,
+  y de posición de canción. al &apos;Esclavo de sincronización externa &quot;que se elija,
+  MusE puede volver a transmitir mensajes MIDI de entrada en tiempo real a cualquier
+  otros puertos elegidos. Esto significa que usted puede tener varios esclavos
+  los dispositivos conectados, y MusE puede volver a enviar mensajes en tiempo real
+  a cualquiera o todos ellos.</translation>
     </message>
     <message>
         <location line="+142"/>
         <source>Port</source>
-        <translation type="unfinished">Puerto</translation>
+        <translation>Puerto</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Device Name</source>
-        <translation type="unfinished">Nombre de dispositivo</translation>
+        <translation>Nombre de dispositivo</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>c</source>
-        <translation type="unfinished"></translation>
+        <translation>c</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>k</source>
-        <translation type="unfinished"></translation>
+        <translation>k</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>r</source>
-        <translation type="unfinished"></translation>
+        <translation>r</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>m</source>
-        <translation type="unfinished">m</translation>
+        <translation>m</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>t</source>
-        <translation type="unfinished"></translation>
+        <translation>t</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>type</source>
-        <translation type="unfinished"></translation>
+        <translation>Tipo</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>rid</source>
-        <translation type="unfinished"></translation>
+        <translation>rid</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>rc</source>
-        <translation type="unfinished"></translation>
+        <translation>rc</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>rr</source>
-        <translation type="unfinished"></translation>
+        <translation>rr</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>rm</source>
-        <translation type="unfinished"></translation>
+        <translation>rm</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>rt</source>
-        <translation type="unfinished"></translation>
+        <translation>rt</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>rw</source>
-        <translation type="unfinished"></translation>
+        <translation>rw</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>tid</source>
-        <translation type="unfinished"></translation>
+        <translation>tid</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>tc</source>
-        <translation type="unfinished"></translation>
+        <translation>tc</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>tr</source>
-        <translation type="unfinished"></translation>
+        <translation>tr</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>tm</source>
-        <translation type="unfinished"></translation>
+        <translation>tm</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>tt</source>
-        <translation type="unfinished"></translation>
+        <translation>tt</translation>
     </message>
     <message>
         <location line="+399"/>
         <source>MusE</source>
-        <translation type="unfinished">MusE</translation>
+        <translation>MusE</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Settings have changed
 Apply sync settings?</source>
-        <translation type="unfinished"></translation>
+        <translation>La configuración ha cambiado
+¿Desea aplicar la nueva configuración de sincronización?</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>&amp;Apply</source>
-        <translation type="unfinished">&amp;Aplicar</translation>
+        <translation>&amp;Aplicar</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>&amp;No</source>
-        <translation type="unfinished"></translation>
+        <translation>Ca&amp;ncelar</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>&amp;Abort</source>
-        <translation type="unfinished">&amp;Abortar</translation>
+        <translation>&amp;Abortar</translation>
     </message>
     <message>
         <location line="+123"/>
         <source>&lt;none&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;ninguno&gt;</translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::MidiTrackInfo</name>
+    <name>MusEGui::MidiTrackInfo</name>
     <message>
-        <location filename="../../muse/widgets/mtrackinfo.cpp" line="+319"/>
-        <location line="+1046"/>
+        <location filename="../../muse/widgets/mtrackinfo.cpp" line="+335"/>
+        <location line="+1070"/>
         <source>&lt;unknown&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;desconocido&gt;</translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::MixdownFileDialog</name>
+    <name>MusEGui::MidiTransformerDialog</name>
     <message>
-        <location filename="../../muse/widgets/mixdowndialog.cpp" line="+118"/>
+        <location filename="../../muse/miditransform.cpp" line="+464"/>
+        <location line="+2"/>
+        <source>New</source>
+        <translation>Nuevo</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::MixdownFileDialog</name>
+    <message>
+        <location filename="../../muse/widgets/mixdowndialog.cpp" line="+122"/>
         <source>Wave Files (*.wav);;All Files (*)</source>
-        <translation type="unfinished">Archivos de onda (*.wav);;Todos los archivos(*)</translation>
+        <translation>Archivos de onda (*.wav);;Todos los archivos(*)</translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::NoteInfo</name>
+    <name>MusEGui::MusE</name>
+    <message>
+        <location filename="../../muse/app.cpp" line="+137"/>
+        <location line="+16"/>
+        <source>Failed to start audio!</source>
+        <translation>Fallo al iniciar el audio</translation>
+    </message>
+    <message>
+        <location line="-15"/>
+        <source>Was not able to start audio, check if jack is running.
+</source>
+        <translation>No se puede iniciar el audio, verifique el estado de Jack</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Timeout waiting for audio to run. Check if jack is running.
+</source>
+        <translation>Sa agotó el tiempo de espera. 
+Comprobar si Jack está en ejecución</translation>
+    </message>
+    <message>
+        <location line="+219"/>
+        <source>Und&amp;o</source>
+        <translation>Deshacer</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Re&amp;do</source>
+        <translation>&amp;Rehacer</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>undo last change to song</source>
+        <translation>deshace el ltimo cambio en la canción</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>redo last undo</source>
+        <translation>rehace el ltimo deshacer</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Loop</source>
+        <translation>Bucle</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>loop between left mark and right mark</source>
+        <translation>hace un bucle entre las marcas de izquierda y derecha</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Punchin</source>
+        <translation>Pinchar</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>record starts at left mark</source>
+        <translation>la captura comienza en la marca izquierda</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Punchout</source>
+        <translation>Fin pinchado</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>record stops at right mark</source>
+        <translation>la captura termina en la merca derecha</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Start</source>
+        <translation>Iniciar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>rewind to start position</source>
+        <translation>retrocede a la posición de inicio</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Rewind</source>
+        <translation>Retroceder</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>rewind current position</source>
+        <translation>retrasa la posición actual</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Forward</source>
+        <translation>Avanzar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>move current position</source>
+        <translation>mueve la posición actual</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Stop</source>
+        <translation>Parar</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop sequencer</source>
+        <translation>para el secuenciador</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Play</source>
+        <translation>Reproducir</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>start sequencer play</source>
+        <translation>inicia el secuenciador</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Record</source>
+        <translation>Grabar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>to record press record and then play</source>
+        <translation>para grabar pulsa grabar y después reproducir</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+238"/>
+        <source>Panic</source>
+        <translation>Pánico</translation>
+    </message>
+    <message>
+        <location line="-236"/>
+        <source>send note off to all midi channels</source>
+        <translation>envia un apagado de nota (note off) a todos los canales midi</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>&amp;New</source>
+        <translation>&amp;Nueva sesión</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+1"/>
+        <source>Create New Song</source>
+        <translation>Crea una nueva canción</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Open</source>
+        <translation>&amp;Abrir sesión</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+2"/>
+        <source>Click this button to open a &lt;em&gt;new song&lt;/em&gt;.&lt;br&gt;You can also select the &lt;b&gt;Open command&lt;/b&gt; from the File menu.</source>
+        <translation>Pulsa este botón para abrir una &lt;em&gt;nueva canción&lt;/em&gt;Puedes usar también el comando &lt;b&gt;Abrir&lt;/b&gt; del me de archivo.</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Open &amp;Recent</source>
+        <translation>Abrir &amp;Recientes</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+1009"/>
+        <location line="+1211"/>
+        <source>&amp;Save</source>
+        <translation>&amp;Guardar</translation>
+    </message>
+    <message>
+        <location line="-2218"/>
+        <location line="+3"/>
+        <source>Click this button to save the song you are editing.  You will be prompted for a file name.
+You can also select the Save command from the File menu.</source>
+        <translation>Pulsa este botón para guardar la canción que está editando. Se te preguntará por un nombre de archivo.
+Puedes seleccionar también el comando Guardar del men de Archivo.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Save &amp;As</source>
+        <translation>Guardar c&amp;omo</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Import Midifile</source>
+        <translation>Importar archivo MIDI</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Export Midifile</source>
+        <translation>Exportar archivo MIDI</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Import Part</source>
+        <translation>Importar región.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../../muse/wave.cpp" line="+1142"/>
+        <source>Import Wave File</source>
+        <translation>Importar archivo de audio</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Find unused wave files</source>
+        <translation>Buscar archivos de audio sin uso</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Quit</source>
+        <translation>&amp;Salir</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Song Info</source>
+        <translation>Comentarios de la sesión</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Transport Panel</source>
+        <translation>Panel de transporte</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Bigtime Window</source>
+        <translation>Ventana de reloj</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Mixer A</source>
+        <translation>Mezcladora A</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Mixer B</source>
+        <translation>Mezcladora B</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cliplist</source>
+        <translation>Lista de archivos de audio</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Marker View</source>
+        <translation>Editor de marcadores</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Arranger View</source>
+        <translation>Ordenar vistas</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Fullscreen</source>
+        <translation>Pantalla completa</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Plugins</source>
+        <translation>Efectos</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit Instrument</source>
+        <translation>Editar instrumento</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Input Plugins</source>
+        <translation>Efectos de entrada</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Transpose</source>
+        <translation>Transponer</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi Input Transform</source>
+        <translation>Transformación de entrada MIDI</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi Input Filter</source>
+        <translation>Filtrado de entrada MIDI</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi Remote Control</source>
+        <translation>Control remoto MIDI</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Rhythm Generator</source>
+        <translation>Generador de ritmo</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Reset Instr.</source>
+        <translation>Resetear instrumento</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Init Instr.</source>
+        <translation>Inicializar instruemnto</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Local Off</source>
+        <translation>Apagado local</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Bounce to Track</source>
+        <translation>Rebotar a pista</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bounce to File</source>
+        <translation>Rebotar a Archivo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Restart Audio</source>
+        <translation>Reiniciar audio</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Mixer Automation</source>
+        <translation>Mezcla de automatización</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Take Snapshot</source>
+        <translation>Obtener instantanea</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Clear Automation Data</source>
+        <translation>Limpiar datos de automatización</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Cascade</source>
+        <translation>Cascada</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tile</source>
+        <translation>Titulo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>In rows</source>
+        <translation>Filas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>In columns</source>
+        <translation>Columnas</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Global Settings</source>
+        <translation>Configuración global</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Configure Shortcuts</source>
+        <translation>Configurar atajos</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Follow Song</source>
+        <translation>Seguir canción</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Don&apos;t Follow Song</source>
+        <translation>No seguir canción</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Follow Page</source>
+        <translation>Seguir la página</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Follow Continuous</source>
+        <translation>Seguir contínuamente</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Metronome</source>
+        <translation>Metrónomo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi Sync</source>
+        <translation>Sincronización MIDI</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi File Import/Export</source>
+        <translation>Importar/Exportar archivo MIDI</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Appearance Settings</source>
+        <translation>Opciones de apariencia</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi Ports / Soft Synth</source>
+        <translation>Puertos MIDI / Sintetizadores</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>&amp;Manual</source>
+        <translation>&amp;Manual</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;MusE Homepage</source>
+        <translation>Página del proyecto &amp;MusE</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Report Bug...</source>
+        <translation>&amp;Reportar un fallo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;About MusE</source>
+        <translation>&amp;Acerca de MusE</translation>
+    </message>
+    <message>
+        <location line="+99"/>
+        <source>File Buttons</source>
+        <translation>Columna de botones</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Undo/Redo</source>
+        <translation>Deshacer/Rehacer</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Transport</source>
+        <translation>Transporte</translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>&amp;File</source>
+        <translation>Sesión</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>&amp;View</source>
+        <translation>&amp;Ver</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>&amp;Midi</source>
+        <translation>&amp;MIDI</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>&amp;Audio</source>
+        <translation>&amp;Audio</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>A&amp;utomation</source>
+        <translation>A&amp;utomatización</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&amp;Windows</source>
+        <translation>Ventanas</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>MusE Se&amp;ttings</source>
+        <translation>Configuraciones</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>&amp;Help</source>
+        <translation>A&amp;yuda</translation>
+    </message>
+    <message>
+        <location line="+268"/>
+        <source>Cannot read template</source>
+        <translation>No se puede leer la plantilla</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>File open error</source>
+        <translation>Error al abrir el archivo</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>File read error</source>
+        <translation>Error al leer el archivo</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Unknown File Format: %1</source>
+        <translation>Formato de archivo desconocido: %1</translation>
+    </message>
+    <message>
+        <location line="+130"/>
+        <location line="+409"/>
+        <location line="+898"/>
+        <source>MusE: Song: %1</source>
+        <translation>Sesión de MusE: %1</translation>
+    </message>
+    <message>
+        <location line="-1273"/>
+        <source>MusE: load project</source>
+        <translation>MusE: Carga sesión</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>MusE: load template</source>
+        <translation>MusE: cargar plantilla</translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>MusE: Write File failed</source>
+        <translation>MusE: La captura del archivo ha fallado</translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>The current Project contains unsaved data
+Save Current Project?</source>
+        <translation>La sesión actual contiene datos sin guardar
+Guardar la sesión actual?</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+1211"/>
+        <source>S&amp;kip</source>
+        <translation>Ignorar</translation>
+    </message>
+    <message>
+        <location line="-1211"/>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Cancelar</translation>
+    </message>
+    <message>
+        <location line="+237"/>
+        <location line="+13"/>
+        <source>MusE: Save As</source>
+        <translation>MusE: Guardar como</translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <location line="+160"/>
+        <source>Nothing to edit</source>
+        <translation>Nada para editar</translation>
+    </message>
+    <message>
+        <location line="+478"/>
+        <location line="+10"/>
+        <location line="+31"/>
+        <location line="+34"/>
+        <location line="+8"/>
+        <source>MusE: Bounce to Track</source>
+        <translation>MusE: Rebotar a la pista</translation>
+    </message>
+    <message>
+        <location line="-82"/>
+        <source>No wave tracks found</source>
+        <translation>No existe el archivo de audio</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+105"/>
+        <source>No audio output tracks found</source>
+        <translation>No hay salidas de audio</translation>
+    </message>
+    <message>
+        <location line="-74"/>
+        <source>Select one audio output track,
+and one target wave track</source>
+        <translation>Seleccione una salida de salida de audio,
+y una pista de audio.</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <source>Select one target wave track</source>
+        <translation>Seleccione una pista de audio de destino</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Select one target wave track,
+and one audio output track</source>
+        <translation>Selecciones una pista de audio,
+y una salida de audio.</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <location line="+25"/>
+        <source>MusE: Bounce to File</source>
+        <translation>Rebotar a archivo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Select one audio output track</source>
+        <translation>Seleccionar salida de audio</translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>MusE: Bounce</source>
+        <translation>MusE: Rebotar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>set left/right marker for bounce range</source>
+        <translation>Fije marcadores derecho e izquierdo para el rango de rebote.</translation>
+    </message>
+    <message>
+        <location line="+82"/>
+        <source>The current Project contains unsaved data
+Load overwrites current Project:
+Save Current Project?</source>
+        <translation>El proyecto actual contine datos no guardados
+Cargar sobreescribe el proyecto actual:
+Guardar el proyecto actual?</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location filename="../../muse/importmidi.cpp" line="+86"/>
+        <source>&amp;Abort</source>
+        <translation>&amp;Abortar</translation>
+    </message>
+    <message>
+        <location filename="../../muse/exportmidi.cpp" line="+147"/>
+        <source>MusE: Export Midi</source>
+        <translation>MusE: Exportar MIDI</translation>
+    </message>
+    <message>
+        <location filename="../../muse/help.cpp" line="+50"/>
+        <source>no help found at: </source>
+        <translation>no se ha encontrado ayuda en: </translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>MusE: Open Help</source>
+        <translation>MusE: Abre ayuda</translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>Unable to launch help</source>
+        <translation>No es posible enlazar la ayuda.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>For some reason MusE has to launch the default
+browser on your machine.</source>
+        <translation>Por alguna razón, MusE tiene que lanzar 
+el navegador por defecto</translation>
+    </message>
+    <message>
+        <location filename="../../muse/importmidi.cpp" line="-12"/>
+        <source>MusE: Import Midi</source>
+        <translation>MusE: Importar MIDI</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Add midi file to current project?
+</source>
+        <translation>¿Agregar archivo MIDI a la sesión?</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Add to Project</source>
+        <translation>Agregar a la sesión</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Replace</source>
+        <translation>&amp;Reemplazar</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>reading midifile
+  </source>
+        <translation>leyendo archivo midi
+  </translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>
+failed: </source>
+        <translation>
+falló: </translation>
+    </message>
+    <message>
+        <location line="+356"/>
+        <source>Import part is only valid for midi and wave tracks!</source>
+        <translation>Importar regiones es solo para pistas MIDI o de audio</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>MusE: load part</source>
+        <translation>MusE: Cargar región.</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>No track selected for import</source>
+        <translation>No hay pistas seleccionadas para la importaciòn</translation>
+    </message>
+    <message numerus="yes">
+        <location line="+121"/>
+        <source>%n part(s) out of %1 could not be imported.
+Likely the selected track is the wrong type.</source>
+        <translation>
+            <numerusform>%n Región(es) fuera de %1 no puede ser importada.
+Probablemente la pista seleccionada es del tipo incorrecto.</numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location line="+1"/>
+        <source>%n part(s) could not be imported.
+Likely the selected track is the wrong type.</source>
+        <translation>
+            <numerusform>%n Región(es) no puede ser importada.
+Probablemente la pista seleccionada es del tipo incorrecto.</numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <location filename="../../muse/wave.cpp" line="-6"/>
+        <source>to import an audio file you have first to selecta wave track</source>
+        <translation>Para importar un archivo de audio seleccione la pista de audio</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Import Wavefile</source>
+        <translation>Importar archivo de audio</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>This wave file has a samplerate of %1,
+as opposed to current setting %2.
+Do you still want to import it?</source>
+        <translation>Este archivo tiene una frecuencia de muestreo de %1,
+El valor actual de la sesión es %2.
+¿Desea importarlo de todos modos?</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>&amp;Yes</source>
+        <translation>Aceptar</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>&amp;No</source>
+        <translation>Ca&amp;ncelar</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::NoteInfo</name>
     <message>
         <location filename="../../muse/widgets/noteinfo.cpp" line="+44"/>
         <source>Note Info</source>
-        <translation type="unfinished">Información de nota</translation>
+        <translation>Información de nota</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Start</source>
-        <translation type="unfinished"></translation>
+        <translation>Iniciar</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Len</source>
-        <translation type="unfinished"></translation>
+        <translation>Duración</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Pitch</source>
-        <translation type="unfinished">Tono</translation>
+        <translation>Tono</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Velo On</source>
-        <translation type="unfinished">Velocidad On</translation>
+        <translation>Velocidad On</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Velo Off</source>
-        <translation type="unfinished">Velocidad Off</translation>
+        <translation>Velocidad Off</translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::RoutePopupMenu</name>
+    <name>MusEGui::PartCanvas</name>
+    <message>
+        <location filename="../../muse/arranger/pcanvas.cpp" line="+355"/>
+        <source>Cannot copy/move/clone to different Track-Type</source>
+        <translation>No se puede copiar/mover/clonar a un tipo diferente de pista</translation>
+    </message>
+    <message>
+        <location line="+270"/>
+        <source>C&amp;ut</source>
+        <translation>C&amp;ortar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Copy</source>
+        <translation>&amp;Copiar</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>s&amp;elect </source>
+        <translation>S&amp;eleccionar</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>clones</source>
+        <translation>Clonar</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>rename</source>
+        <translation>renombrar</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>color</source>
+        <translation>color</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>delete</source>
+        <translation>borrar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>split</source>
+        <translation>partir</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>glue</source>
+        <translation>Unir</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>de-clone</source>
+        <translation>des-clonar</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <source>save part to disk</source>
+        <translation>Guardar región en el disco.</translation>
+    </message>
+    <message>
+        <location line="-2"/>
+        <source>wave edit</source>
+        <translation>editar onda</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>file info</source>
+        <translation>Información de archivo</translation>
+    </message>
+    <message>
+        <location line="+88"/>
+        <source>MusE: save part</source>
+        <translation>MusE: Guardar región.</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>Part name: %1
+Files:</source>
+        <translation>Nombre de región: %1
+Archivos:</translation>
+    </message>
+    <message numerus="yes">
+        <location line="+2128"/>
+        <source>%n part(s) out of %1 could not be pasted.
+Likely the selected track is the wrong type.</source>
+        <translation>
+            <numerusform>%n Región(es) fuera de %1 no pueden ser pegadas.
+Probablemente la pista seleccionada es del tipo incorrecto.</numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location line="+1"/>
+        <source>%n part(s) could not be pasted.
+Likely the selected track is the wrong type.</source>
+        <translation>
+            <numerusform>%n Región(es) no puede ser pegada.
+Probablemente la pista seleccionada es del tipo incorrecto.</numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Cannot paste: multiple tracks selected</source>
+        <translation>No puedo pegar: mtilpes pistas seleccionadas</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Cannot paste: no track selected</source>
+        <translation>No puedo pegar: No hay pista seleccionada</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Can only paste to midi/drum track</source>
+        <translation>Solo se puede insertar pistas MIDI/Percusión</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Can only paste to wave track</source>
+        <translation>Solo se pueden insertar pistas de audio</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Can only paste to midi or wave track</source>
+        <translation>Solo se pueden insertar pistas de MIDI o audio</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Cannot paste: wrong data type</source>
+        <translation>No válido: Tipo de datos equivocado</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::PasteDialog</name>
+    <message numerus="yes">
+        <location filename="../../muse/widgets/pastedialog.cpp" line="+81"/>
+        <source>%n quarter(s)</source>
+        <translation>
+            <numerusform>%n Negra(s)</numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>%1 quarter</source>
+        <comment>for floating-point arguments like 1.5</comment>
+        <translation>%1 Negra</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>%1 quarters</source>
+        <comment>for floating-point arguments like 1.5</comment>
+        <translation>%1 Negras</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::PasteEventsDialog</name>
+    <message numerus="yes">
+        <location filename="../../muse/widgets/pasteeventsdialog.cpp" line="+95"/>
+        <source>%n quarter(s)</source>
+        <translation>
+            <numerusform>%n Negra(s)</numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>%1 quarter</source>
+        <comment>for floating-point arguments like 1.5</comment>
+        <translation>%1 Negra</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>%1 quarters</source>
+        <comment>for floating-point arguments like 1.5</comment>
+        <translation>%1 Negras</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::PianoRoll</name>
+    <message>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="+99"/>
+        <source>&amp;Edit</source>
+        <translation>&amp;Editar</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>C&amp;ut</source>
+        <translation>C&amp;ortar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Copy</source>
+        <translation>&amp;Copiar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Copy events in range</source>
+        <translation>Copiar eventos del rango</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Paste</source>
+        <translation>&amp;Pegar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Paste (with dialog)</source>
+        <translation>Pegar (con dialogo)</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Delete &amp;Events</source>
+        <translation>Borrar eventos</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>&amp;Select</source>
+        <translation>&amp;Seleccionar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select &amp;All</source>
+        <translation>Seleccion&amp;ar todo</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Deselect All</source>
+        <translation>&amp;Deseleccionar todo</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Invert &amp;Selection</source>
+        <translation>Invertir &amp;selección</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>&amp;Inside Loop</source>
+        <translation>&amp;Interior del bucle</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Outside Loop</source>
+        <translation>&amp;Exterior del bucle</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&amp;Previous Part</source>
+        <translation>Región previa</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Next Part</source>
+        <translation>Siguiente región</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Fu&amp;nctions</source>
+        <translation>Fu&amp;nciones</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Quantize</source>
+        <translation>Cuantizar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Modify Note Length</source>
+        <translation>Modificar duraciòn de la nota</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Modify Velocity</source>
+        <translation>Modificar la velocidad.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Crescendo/Decrescendo</source>
+        <translation>Crescendo/Decrescendo</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Transpose</source>
+        <translation>Transponer</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Erase Events</source>
+        <translation>Borrar eventos</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Move Notes</source>
+        <translation>Mover notas</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Set Fixed Length</source>
+        <translation>Fijar ajustes de duración</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Delete Overlaps</source>
+        <translation>Borrar superpuestos</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Legato</source>
+        <translation>Legato</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Plugins</source>
+        <translation>Efectos</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Window &amp;Config</source>
+        <translation>&amp;Configuraciòn de ventanas</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Event Color</source>
+        <translation>Color de eventos</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>&amp;Blue</source>
+        <translation>Azul</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Pitch colors</source>
+        <translation>Color por afinación</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Velocity colors</source>
+        <translation>Color por velocidad</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Pianoroll tools</source>
+        <translation>Herramientas del editor de matríz</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Step Record</source>
+        <translation>Grabación por pasos</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Midi Input</source>
+        <translation>Entrada MIDI</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Play Events</source>
+        <translation>Reproducir eventos</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>panic</source>
+        <translation>pánico</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>transport</source>
+        <translation>Transportar</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>ctrl</source>
+        <translation>control</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Add Controller View</source>
+        <translation>Agregar visor de controladores</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::PluginDialog</name>
+    <message>
+        <location filename="../../muse/plugin.cpp" line="+3141"/>
+        <source>MusE: select plugin</source>
+        <translation>MusE: Selecciona el plugin</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Lib</source>
+        <translation>Lib</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Label</source>
+        <translation>Etiqueta</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Name</source>
+        <translation>Nombre</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>AI</source>
+        <translation>AI</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>AO</source>
+        <translation>AO</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>CI</source>
+        <translation>CI</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>CO</source>
+        <translation>CO</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>IP</source>
+        <translation>IP</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>id</source>
+        <translation>id</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Maker</source>
+        <translation>Fabricante</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copyright</source>
+        <translation>Copyright</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Ok</source>
+        <translation>Aceptar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cancel</source>
+        <translation>Cancelar</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Mono and Stereo</source>
+        <translation>Mono y estereo</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Stereo</source>
+        <translation>Estéreo</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Mono</source>
+        <translation>Mono</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Show All</source>
+        <translation>Ver todo</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Select which types of plugins should be visible in the list.&lt;br&gt;Note that using mono plugins on stereo tracks is not a problem, two will be used in parallell.&lt;br&gt;Also beware that the &apos;all&apos; alternative includes plugins that probably not are usable by MusE.</source>
+        <translation>Los tipos de efectos seleccionados deben ser visibles en la lista. Tenga en cuenta que el uso de Efectos &lt;br&gt; mono en pistas  estéreo no es un problema, los dos canales serán utilizados en paralelo. &lt;br&gt; Tenga cuidado de que no &quot;todos&quot; los efectos son utilizables por Muse.</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Search in &apos;Label&apos; and &apos;Name&apos;:</source>
+        <translation>Buscar en nombre y etiqueta</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::PluginGui</name>
+    <message>
+        <location line="+207"/>
+        <source>File Buttons</source>
+        <translation>Botón de archivos</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Load Preset</source>
+        <translation>Cargar plantilla</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Save Preset</source>
+        <translation>Guardar plantilla</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location line="+3"/>
+        <source>bypass plugin</source>
+        <translation>saltar plugin</translation>
+    </message>
+    <message>
+        <location line="+554"/>
+        <source>MusE: load preset</source>
+        <translation>MusE: Cargar plantilla</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Error reading preset. Might not be right type for this plugin</source>
+        <translation>Preseteo dañado o no corresponde al efecto</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>MusE: save preset</source>
+        <translation>MusE: Guardar plantilla</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::RoutePopupMenu</name>
     <message>
         <location filename="../../muse/widgets/routepopup.cpp" line="+223"/>
         <location line="+2"/>
@@ -12276,144 +13891,1346 @@ Apply sync settings?</source>
         <location line="+682"/>
         <location line="+85"/>
         <source>Channel</source>
-        <translation type="unfinished">Canal</translation>
+        <translation>Canal</translation>
     </message>
     <message>
         <location line="-274"/>
         <location line="+224"/>
         <location line="+85"/>
         <source>Soloing chain</source>
-        <translation type="unfinished"></translation>
+        <translation>Cadena de solos</translation>
     </message>
     <message>
         <location line="-307"/>
         <location line="+224"/>
         <source>Audio returns</source>
-        <translation type="unfinished"></translation>
+        <translation>Retornos de audio</translation>
     </message>
     <message>
         <location line="-185"/>
-        <source>Warning: No midi input devices!</source>
-        <translation type="unfinished"></translation>
+        <source>Warning: No input devices!</source>
+        <translation>Atención: no hay entradas</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Open midi config...</source>
-        <translation type="unfinished"></translation>
+        <translation>Abrir la configuraciòn MIDI</translation>
     </message>
     <message>
         <location line="+45"/>
         <location line="+33"/>
         <source>&lt;none&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;ningúno&gt;</translation>
     </message>
     <message>
         <location line="-19"/>
         <source>Toggle all</source>
-        <translation type="unfinished"></translation>
+        <translation>Cambiar todos</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>More...</source>
-        <translation type="unfinished"></translation>
+        <translation>Mas...</translation>
     </message>
     <message>
         <location line="+195"/>
         <source>Audio sends</source>
-        <translation type="unfinished"></translation>
+        <translation>Envios de audio</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Midi port sends</source>
-        <translation type="unfinished"></translation>
+        <translation>Puertos de envio MIDI</translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::ScrollScale</name>
+    <name>MusEGui::ScoreCanvas</name>
+    <message>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="+1247"/>
+        <source>Treble</source>
+        <translation>Agudos</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Bass</source>
+        <translation>Bajos</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Grand Staff</source>
+        <translation>Doble</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove staff</source>
+        <translation>Remover partitura</translation>
+    </message>
+    <message>
+        <location line="+2470"/>
+        <source>Ambiguous part</source>
+        <translation>Parte ambígua</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There are two or more possible parts you could add the note to, but none matches the selected part. Please select the destination part by clicking on any note belonging to it and try again, or add a new stave containing only the destination part.</source>
+        <translation>Hay dos o más partes posibles que podría añadir la nota, pero ninguno coincide con la parte seleccionada. Por favor, seleccione la parte de destino haciendo clic en cualquier nota que le pertenecen y vuelva a intentarlo, evite agregar una nota nueva que existe la parte destino.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>No part</source>
+        <translation>No hay partitura</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There are no parts you could add the note to.</source>
+        <translation>No hay piezas en las que se pueda añadir la nota.</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::ScoreEdit</name>
+    <message>
+        <location line="-3501"/>
+        <source>Undo/Redo tools</source>
+        <translation>Herramientas Deshacer/Rehacer</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Step recording tools</source>
+        <translation>Herramienta de grabación por pasos</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Step Record</source>
+        <translation>Grabación por pasos</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>panic</source>
+        <translation>Pánico</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>transport</source>
+        <translation>Transporte</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Note settings</source>
+        <translation>Propiedades de la nota</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Note length:</source>
+        <translation>Duración de nota:</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>last</source>
+        <translation>Pasado</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <location line="+1"/>
+        <location line="+311"/>
+        <source>Apply to new notes:</source>
+        <translation>Se aplica a nuevas notas</translation>
+    </message>
+    <message>
+        <location line="-310"/>
+        <location line="+314"/>
+        <source>Apply to selected notes:</source>
+        <translation>Aplicar a las notas seleccionadas</translation>
+    </message>
+    <message>
+        <location line="-307"/>
+        <source>Velocity:</source>
+        <translation>Velocidad:</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Off-Velocity:</source>
+        <translation>Off-Velocity:</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Quantisation settings</source>
+        <translation>Ajustes del cuantizado</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Quantisation:</source>
+        <translation>Cuantizado:</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Pixels per whole:</source>
+        <translation>Pixeles por entero:</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>&amp;Edit</source>
+        <translation>&amp;Editar</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>C&amp;ut</source>
+        <translation>C&amp;ortar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Copy</source>
+        <translation>&amp;Copiar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Copy events in range</source>
+        <translation>Copiar eventos del rango</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Paste</source>
+        <translation>&amp;Pegar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Paste (with dialog)</source>
+        <translation>Pegar (con diálogo)</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Delete &amp;Events</source>
+        <translation>Borrar &amp;eventos</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>&amp;Select</source>
+        <translation>&amp;Seleccionar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select &amp;All</source>
+        <translation>Seleccion&amp;ar todo</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Deselect All</source>
+        <translation>&amp;Deseleccionar todo</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Invert &amp;Selection</source>
+        <translation>Invertir &amp;selección</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>&amp;Inside Loop</source>
+        <translation>&amp;Interior de bucle</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Outside Loop</source>
+        <translation>&amp;Exterior del bucle</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Fu&amp;nctions</source>
+        <translation>Fu&amp;nciones</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Quantize</source>
+        <translation>Cuantizar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Change note &amp;length</source>
+        <translation>Cambiar duración de notas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Change note &amp;velocity</source>
+        <translation>Cambiar velocidad de las notas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Crescendo/Decrescendo</source>
+        <translation>Crescendo/Decrescendo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transpose</source>
+        <translation>Transponer</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Erase Events</source>
+        <translation>Borrar eventos</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Move Notes</source>
+        <translation>Mover notas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Set Fixed Length</source>
+        <translation>Cambiar duración de notas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Delete Overlaps</source>
+        <translation>Borrar notas duplicadas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Legato</source>
+        <translation>Legato</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Window &amp;Config</source>
+        <translation>Comportamiento de ventana</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Note head &amp;colors</source>
+        <translation>Color de las notas</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Black</source>
+        <translation>Negro</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Velocity</source>
+        <translation>Velocidad</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Part</source>
+        <translation>Región</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Set up &amp;preamble</source>
+        <translation>Establecer encabezado</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Display &amp;key signature</source>
+        <translation>Ver armadura de clave</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Display &amp;time signature</source>
+        <translation>Ver signatura de tiempo</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Set Score &amp;name</source>
+        <translation>Ajuste de nombre del pentagrama</translation>
+    </message>
+    <message>
+        <location line="+221"/>
+        <location line="+1"/>
+        <source>Enter the new score title</source>
+        <translation>Ingrese el título de la nueva partitura</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Error</source>
+        <translation>Error</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Changing score title failed:
+the selected title is not unique</source>
+        <translation>Error al cambiar el título a la partitura:
+El título seleccionado ya existe.</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::ScrollScale</name>
     <message>
-        <location filename="../../muse/widgets/scrollscale.cpp" line="+316"/>
+        <location filename="../../muse/widgets/scrollscale.cpp" line="+318"/>
         <source>next page</source>
-        <translation type="unfinished">página siguiente</translation>
+        <translation>página siguiente</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>previous page</source>
-        <translation type="unfinished">página anterior</translation>
+        <translation>página anterior</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>current page number</source>
-        <translation type="unfinished">nuúmero de página actual</translation>
+        <translation>nuúmero de página actual</translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::ShortcutCaptureDialog</name>
+    <name>MusEGui::ShortcutCaptureDialog</name>
     <message>
         <location filename="../../muse/widgets/shortcutcapturedialog.cpp" line="+55"/>
         <source>Ok</source>
-        <translation type="unfinished">Aceptar</translation>
+        <translation>Aceptar</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Cancel</source>
-        <translation type="unfinished">Cancelar</translation>
+        <translation>Cancelar</translation>
     </message>
     <message>
         <location line="+52"/>
-        <source>Shortcut conflicts with </source>
-        <translation type="unfinished"></translation>
+        <source>Shortcut conflicts with %1</source>
+        <translation>Conflicto en el atajo con</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Undefined</source>
-        <translation type="unfinished"></translation>
+        <translation>Sin definir</translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::SigScale</name>
+    <name>MusEGui::SigScale</name>
     <message>
         <location filename="../../muse/widgets/sigscale.cpp" line="+44"/>
         <source>signature scale</source>
-        <translation type="unfinished">Armadura de la escala</translation>
+        <translation>Armadura de la escala</translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::Toolbar1</name>
+    <name>MusEGui::TList</name>
+    <message>
+        <location filename="../../muse/arranger/tlist.cpp" line="+373"/>
+        <source>&lt;none&gt;</source>
+        <translation>&lt;ningúno&gt;</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>no clef</source>
+        <translation>No hay clave</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Treble</source>
+        <translation>Agudo</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Bass</source>
+        <translation>Bajo</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Grand</source>
+        <translation>Doble</translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>MusE: bad trackname</source>
+        <translation>MusE: Nombre de pista erroneo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>please choose a unique track name</source>
+        <translation>Error: El nombre de pista ya existe</translation>
+    </message>
+    <message>
+        <location line="+172"/>
+        <location line="+1149"/>
+        <source>Update drummap?</source>
+        <translation>¿Actualizár mapa de percusión?</translation>
+    </message>
+    <message>
+        <location line="-1148"/>
+        <source>Do you want to use same port for all instruments in the drummap?</source>
+        <translation>¿Desea utilizar el mismo puerto para todos los instrumentos en el mapa de percusión?</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+1149"/>
+        <source>&amp;Yes</source>
+        <translation>Aceptar</translation>
+    </message>
+    <message>
+        <location line="-1149"/>
+        <location line="+1149"/>
+        <source>&amp;No</source>
+        <translation>Cancelar</translation>
+    </message>
+    <message>
+        <location line="-1074"/>
+        <location line="+55"/>
+        <source>show gui</source>
+        <translation>Ver interfáz</translation>
+    </message>
+    <message>
+        <location line="-46"/>
+        <location line="+55"/>
+        <source>show native gui</source>
+        <translation>Ver interfáz nativa</translation>
+    </message>
+    <message>
+        <location line="+346"/>
+        <source>Treble clef</source>
+        <translation>Partitura de agudos</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bass clef</source>
+        <translation>Partitura de Bajos</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Grand Staff</source>
+        <translation>Partitura doble</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Viewable automation</source>
+        <translation>Automatización visible</translation>
+    </message>
+    <message>
+        <location line="+131"/>
+        <source>Delete Track</source>
+        <translation>Borrar pista</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Track Comment</source>
+        <translation>Comentario de la pista</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Insert Track</source>
+        <translation>Insertar pista</translation>
+    </message>
+    <message>
+        <location line="+445"/>
+        <source>Midi</source>
+        <translation>MIDI</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Drum</source>
+        <translation>Percusión</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Do you want to use same port and channel for all instruments in the drummap?</source>
+        <translation>¿Desea utilizar el mismo puerto y canal para todos los instrumentos del mapa de percusión?</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::TempoSig</name>
+    <message>
+        <location filename="../../muse/transport.cpp" line="+149"/>
+        <source>Tempo/Sig</source>
+        <translation>tempo/firma</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::Toolbar1</name>
     <message>
-        <location filename="../../muse/widgets/tb1.cpp" line="+21"/>
+        <location filename="../../muse/widgets/tb1.cpp" line="+48"/>
+        <location line="+1"/>
+        <location line="+1"/>
+        <source>Off</source>
+        <translation>Apagado</translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>Solo</source>
-        <translation type="unfinished">Solo</translation>
+        <translation>Solo</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Cursor</source>
-        <translation type="unfinished">Cursor</translation>
+        <translation>Cursor</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Snap</source>
-        <translation type="unfinished">Snap</translation>
+        <translation>Chasquido</translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::TrackComment</name>
+    <name>MusEGui::TopWin</name>
+    <message>
+        <location filename="../../muse/cobject.cpp" line="+64"/>
+        <source>As subwindow</source>
+        <translation>Como sub ventana</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Shares tools and menu</source>
+        <translation>Herramientas y menús</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Fullscreen</source>
+        <translation>Pantalla completa</translation>
+    </message>
+    <message>
+        <location line="+428"/>
+        <source>Piano roll</source>
+        <translation>Editor de matríz</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>List editor</source>
+        <translation>Editor de lista</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Drum editor</source>
+        <translation>Editro de percusión</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Master track editor</source>
+        <translation>Editor de pista maestra</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Master track list editor</source>
+        <translation>Editor de lista de pista maestra</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Wave editor</source>
+        <translation>Editro de audio</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Clip list</source>
+        <translation>Lista de audios</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Marker view</source>
+        <translation>Ver marcadores</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Score editor</source>
+        <translation>Editor de partituras</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Arranger</source>
+        <translation>Arreglador</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&lt;unknown toplevel type&gt;</source>
+        <translation>&lt;Tipo de nivel superior desconocido&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::TrackComment</name>
     <message>
         <location filename="../../muse/widgets/comment.cpp" line="+58"/>
         <source>MusE: Track Comment</source>
-        <translation type="unfinished">MusE: Comentario de la pista</translation>
+        <translation>MusE: Comentario de la pista</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Track Comment:</source>
-        <translation type="unfinished">Comentario de la pista:</translation>
+        <translation>Comentario de la pista:</translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::VisibleTracks</name>
+    <name>MusEGui::Transport</name>
+    <message>
+        <location filename="../../muse/transport.cpp" line="+105"/>
+        <source>Overdub</source>
+        <translation>Agregar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+15"/>
+        <source>Replace</source>
+        <translation>Reemplazar</translation>
+    </message>
     <message>
-        <location filename="../../muse/widgets/visibletracks.cpp" line="+9"/>
+        <location line="-10"/>
+        <source>Rec Mode</source>
+        <translation>Modo de captura</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Normal</source>
+        <translation>Normal</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mix</source>
+        <translation>Mezcla</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Cycle Rec</source>
+        <translation>Ciclar captura</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>punchin</source>
+        <translation>pinchar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>loop</source>
+        <translation>bucle</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>punchout</source>
+        <translation>fin pinchado</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+3"/>
+        <source>Punch In</source>
+        <translation>Pinchar</translation>
+    </message>
+    <message>
+        <location line="-2"/>
+        <location line="+3"/>
+        <source>Loop</source>
+        <translation>Bucle</translation>
+    </message>
+    <message>
+        <location line="-2"/>
+        <location line="+3"/>
+        <source>Punch Out</source>
+        <translation>Fin pinchado</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Left Mark</source>
+        <translation>Marca izquierda</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Right Mark</source>
+        <translation>Marca derecha</translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>rewind to start</source>
+        <translation>retroceder al inicio</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Click this button to rewind to start position</source>
+        <translation>Pulsa este botón para regresar al principio</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>rewind</source>
+        <translation>retroceder</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Click this button to rewind</source>
+        <translation>Pulsa este botón para ir hacia atrás</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>forward</source>
+        <translation>avanzar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Click this button to forward current play position</source>
+        <translation>Pulsa este botón para adelantar la posición de reproducción</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>stop</source>
+        <translation>parar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Click this button to stop playback</source>
+        <translation>Pulsa este botón para detener la reproducción</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>play</source>
+        <translation>reproducir</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Click this button to start playback</source>
+        <translation>Pulsa este botón para iniciar la reproducción</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>record</source>
+        <translation>grabar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Click this button to enable recording</source>
+        <translation>Pulsa este botón para habilitar la captura</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>AC</source>
+        <translation>AC</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>quantize during record</source>
+        <translation>cuantizar durante la captura</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Click</source>
+        <translation>Click</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>metronom click on/off</source>
+        <translation>Click del metrónomo encendido/apagado</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Sync</source>
+        <translation>Sinconización</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>external sync on/off</source>
+        <translation>Sincronización externa encedida/apagada</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Jack</source>
+        <translation>Jack</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Jack transport sync on/off</source>
+        <translation>Sincronizar a Jack Encendido/Apagado</translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Master</source>
+        <translation>Maestro</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>use master track</source>
+        <translation>usar pista maestra</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::VisibleTracks</name>
+    <message>
+        <location filename="../../muse/widgets/visibletracks.cpp" line="+35"/>
+        <location line="+9"/>
+        <source>Show wave tracks</source>
+        <translation>Ver pistas de audio</translation>
+    </message>
+    <message>
+        <location line="-8"/>
+        <location line="+9"/>
+        <source>Show group tracks</source>
+        <translation>Ver grupos</translation>
+    </message>
+    <message>
+        <location line="-8"/>
+        <location line="+9"/>
+        <source>Show aux tracks</source>
+        <translation>Ver envios auxiliares</translation>
+    </message>
+    <message>
+        <location line="-8"/>
+        <location line="+9"/>
+        <source>Show input tracks</source>
+        <translation>Ver entradas de audio</translation>
+    </message>
+    <message>
+        <location line="-8"/>
+        <location line="+9"/>
+        <source>Show output tracks</source>
+        <translation>Ver salidas de audio</translation>
+    </message>
+    <message>
+        <location line="-8"/>
+        <location line="+9"/>
+        <source>Show midi tracks</source>
+        <translation>Ver pistas MIDI</translation>
+    </message>
+    <message>
+        <location line="-8"/>
+        <location line="+9"/>
+        <source>Show synth tracks</source>
+        <translation>Ver Sintetizadores</translation>
+    </message>
+    <message>
+        <location line="+9"/>
         <source>Visible track types</source>
-        <translation type="unfinished"></translation>
+        <translation>Ver tipo de pistas</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::WaveEdit</name>
+    <message>
+        <location filename="../../muse/waveedit/waveedit.cpp" line="+91"/>
+        <source>&amp;Edit</source>
+        <translation>&amp;Editar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Func&amp;tions</source>
+        <translation>Funciones</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Gain</source>
+        <translation>&amp;Ganancia</translation>
+    </message>
+    <message>
+        <source>200%</source>
+        <translation type="obsolete">5 1/3&apos; {200%?}</translation>
+    </message>
+    <message>
+        <source>150%</source>
+        <translation type="obsolete">5 1/3&apos; {150%?}</translation>
+    </message>
+    <message>
+        <source>75%</source>
+        <translation type="obsolete">5 1/3&apos; {75%?}</translation>
+    </message>
+    <message>
+        <source>50%</source>
+        <translation type="obsolete">5 1/3&apos; {50%?}</translation>
+    </message>
+    <message>
+        <source>25%</source>
+        <translation type="obsolete">5 1/3&apos; {25%?}</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Other</source>
+        <translation>Otros</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>&amp;Copy</source>
+        <translation>&amp;Copiar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>C&amp;ut</source>
+        <translation>Cortar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Paste</source>
+        <translation>&amp;Pegar</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Edit in E&amp;xternal Editor</source>
+        <translation>Abrir con editor externo</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Mute Selection</source>
+        <translation>Silenciar selección</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Normalize Selection</source>
+        <translation>Normalizar selección</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Fade In Selection</source>
+        <translation>Aparecer progresivamente</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Fade Out Selection</source>
+        <translation>Desvanecer progresivamente</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Reverse Selection</source>
+        <translation>Invertir selección</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select</source>
+        <translation>Seleccionar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select &amp;All</source>
+        <translation>Seleccion&amp;ar todo</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Deselect All</source>
+        <translation>&amp;Deseleccionar todo</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Window &amp;Config</source>
+        <translation>&amp;Comportamiento de ventana</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Wave edit tools</source>
+        <translation>Herramientas de edición de audio</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>transport</source>
+        <translation>Transporte</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>WaveEdit tools</source>
+        <translation>Herramientas de edición de audio</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Solo</source>
+        <translation>Solo</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Cursor</source>
+        <translation>Cursor</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::WaveView</name>
+    <message>
+        <location filename="../../muse/waveedit/waveview.cpp" line="+996"/>
+        <source>MusE - external editor failed</source>
+        <translation>MusE: Falla del editor de audio externo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>MusE was unable to launch the external editor
+check if the editor setting in:
+Global Settings-&gt;Audio:External Waveditor
+is set to a valid editor.</source>
+        <translation>Muse no pudo lanzar el editor externo
+Compruebe esta configuraciòn en:
+Configuración global-&gt; Audio: Editor de audio externo
+que el comando del editor sea válido.</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>MusE - file size changed</source>
+        <translation>MusE: Cambió el tamaño del archivo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>When editing in external editor - you should not change the filesize
+since it must fit the selected region.
+
+Missing data is muted</source>
+        <translation>Al editar en el editor externo no se debe cambiar el tamaño del archivo
+ya que debe ajustarse a la región seleccionada.
+
+Los datos faltantes se silenciarán.</translation>
+    </message>
+</context>
+<context>
+    <name>MusEMixer::AudioMixerApp</name>
+    <message>
+        <source>&amp;Create</source>
+        <translation type="obsolete">&amp;Crear</translation>
+    </message>
+</context>
+<context>
+    <name>MusEMixer::AudioStrip</name>
+    <message>
+        <source>1/2 channel</source>
+        <translation type="obsolete">Canales 1/2</translation>
+    </message>
+    <message>
+        <source>Pre</source>
+        <translation type="obsolete">Pre</translation>
+    </message>
+    <message>
+        <source>pre fader - post fader</source>
+        <translation type="obsolete">pre fader - port fader</translation>
+    </message>
+    <message>
+        <source>dB</source>
+        <translation type="obsolete">dB</translation>
+    </message>
+    <message>
+        <source>record</source>
+        <translation type="obsolete">grabar</translation>
+    </message>
+    <message>
+        <source>mute</source>
+        <translation type="obsolete">silencio</translation>
+    </message>
+    <message>
+        <source>record downmix</source>
+        <translation type="obsolete">downmix de captura</translation>
+    </message>
+    <message>
+        <source>off</source>
+        <translation type="obsolete">apagado</translation>
+    </message>
+    <message>
+        <source>output routing</source>
+        <translation type="obsolete">ruteado de entrada</translation>
+    </message>
+</context>
+<context>
+    <name>MusEMixer::EffectRack</name>
+    <message>
+        <source>effect rack</source>
+        <translation type="obsolete">rack de efectos</translation>
+    </message>
+    <message>
+        <source>new</source>
+        <translation type="obsolete">nuevo</translation>
+    </message>
+    <message>
+        <source>change</source>
+        <translation type="obsolete">cambiar</translation>
+    </message>
+    <message>
+        <source>move up</source>
+        <translation type="obsolete">subir</translation>
+    </message>
+    <message>
+        <source>move down</source>
+        <translation type="obsolete">bajar</translation>
+    </message>
+    <message>
+        <source>remove</source>
+        <translation type="obsolete">quitar</translation>
+    </message>
+    <message>
+        <source>bypass</source>
+        <translation type="obsolete">saltar</translation>
+    </message>
+    <message>
+        <source>show gui</source>
+        <translation type="obsolete">mostrar gui</translation>
+    </message>
+</context>
+<context>
+    <name>MusEMixer::MidiStrip</name>
+    <message>
+        <source>off</source>
+        <translation type="obsolete">apagado</translation>
+    </message>
+    <message>
+        <source>Var</source>
+        <translation type="obsolete">Var</translation>
+    </message>
+    <message>
+        <source>Rev</source>
+        <translation type="obsolete">Rev</translation>
+    </message>
+    <message>
+        <source>Cho</source>
+        <translation type="obsolete">Cho</translation>
+    </message>
+    <message>
+        <source>dB</source>
+        <translation type="obsolete">dB</translation>
+    </message>
+    <message>
+        <source>record</source>
+        <translation type="obsolete">grabar</translation>
+    </message>
+    <message>
+        <source>mute</source>
+        <translation type="obsolete">silencio</translation>
+    </message>
+    <message>
+        <source>output routing</source>
+        <translation type="obsolete">ruteado de entrada</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::BigTime</name>
+    <message>
+        <source>minute</source>
+        <translation type="obsolete">minuto</translation>
+    </message>
+    <message>
+        <source>second</source>
+        <translation type="obsolete">segundo</translation>
+    </message>
+    <message>
+        <source>frame</source>
+        <translation type="obsolete">frame</translation>
+    </message>
+    <message>
+        <source>subframe</source>
+        <translation type="obsolete">sub-frame</translation>
+    </message>
+    <message>
+        <source>MusE: Bigtime</source>
+        <translation type="obsolete">MusE: Big Time</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::EditToolBar</name>
+    <message>
+        <source>Edit Tools</source>
+        <translation type="obsolete">Editar herramientas</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::MTScale</name>
+    <message>
+        <source>bar scale</source>
+        <translation type="obsolete">escala de compases</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::MTScaleFlo</name>
+    <message>
+        <source>bar scale</source>
+        <translation type="obsolete">escala de compases</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::MidiSyncConfig</name>
+    <message>
+        <source>Port Number</source>
+        <translation type="obsolete">Número de puerto</translation>
+    </message>
+    <message>
+        <source>Name of the midi device associated with this port number</source>
+        <translation type="obsolete">Nombre del dispositivo MIDI asociado con este número de puerto</translation>
+    </message>
+    <message>
+        <source>Port</source>
+        <translation type="obsolete">Puerto</translation>
+    </message>
+    <message>
+        <source>Device Name</source>
+        <translation type="obsolete">Nombre de dispositivo</translation>
+    </message>
+    <message>
+        <source>m</source>
+        <translation type="obsolete">m</translation>
+    </message>
+    <message>
+        <source>MusE</source>
+        <translation type="obsolete">MusE</translation>
+    </message>
+    <message>
+        <source>&amp;Apply</source>
+        <translation type="obsolete">&amp;Aplicar</translation>
+    </message>
+    <message>
+        <source>&amp;Abort</source>
+        <translation type="obsolete">&amp;Abortar</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::MixdownFileDialog</name>
+    <message>
+        <source>Wave Files (*.wav);;All Files (*)</source>
+        <translation type="obsolete">Archivos de onda (*.wav);;Todos los archivos(*)</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::NoteInfo</name>
+    <message>
+        <source>Note Info</source>
+        <translation type="obsolete">Información de nota</translation>
+    </message>
+    <message>
+        <source>Pitch</source>
+        <translation type="obsolete">Tono</translation>
+    </message>
+    <message>
+        <source>Velo On</source>
+        <translation type="obsolete">Velocidad On</translation>
+    </message>
+    <message>
+        <source>Velo Off</source>
+        <translation type="obsolete">Velocidad Off</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::RoutePopupMenu</name>
+    <message>
+        <source>Channel</source>
+        <translation type="obsolete">Canal</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::ScrollScale</name>
+    <message>
+        <source>next page</source>
+        <translation type="obsolete">página siguiente</translation>
+    </message>
+    <message>
+        <source>previous page</source>
+        <translation type="obsolete">página anterior</translation>
+    </message>
+    <message>
+        <source>current page number</source>
+        <translation type="obsolete">nuúmero de página actual</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::ShortcutCaptureDialog</name>
+    <message>
+        <source>Ok</source>
+        <translation type="obsolete">Aceptar</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="obsolete">Cancelar</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::SigScale</name>
+    <message>
+        <source>signature scale</source>
+        <translation type="obsolete">Armadura de la escala</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::Toolbar1</name>
+    <message>
+        <source>Solo</source>
+        <translation type="obsolete">Solo</translation>
+    </message>
+    <message>
+        <source>Cursor</source>
+        <translation type="obsolete">Cursor</translation>
+    </message>
+    <message>
+        <source>Snap</source>
+        <translation type="obsolete">Snap</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::TrackComment</name>
+    <message>
+        <source>MusE: Track Comment</source>
+        <translation type="obsolete">MusE: Comentario de la pista</translation>
+    </message>
+    <message>
+        <source>Track Comment:</source>
+        <translation type="obsolete">Comentario de la pista:</translation>
     </message>
 </context>
 <context>
@@ -12455,7 +15272,7 @@ Apply sync settings?</source>
     <message>
         <location filename="../../synti/organ/organguibase.ui" line="+20"/>
         <source>MusE: Organ</source>
-        <translation type="unfinished">MusE: órgano</translation>
+        <translation>MusE: órgano</translation>
     </message>
     <message>
         <source>Presets</source>
@@ -12476,67 +15293,67 @@ Apply sync settings?</source>
     <message>
         <location line="+763"/>
         <source>O-1</source>
-        <translation type="unfinished">0-1</translation>
+        <translation>0-1</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>Oscillator</source>
-        <translation type="unfinished">Oscilador</translation>
+        <translation>Oscillator</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Brass</source>
-        <translation type="unfinished">Metales</translation>
+        <translation>Brass</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Reed</source>
-        <translation type="unfinished">Reed</translation>
+        <translation>Reed</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Flute</source>
-        <translation type="unfinished">Flauta</translation>
+        <translation>Flute</translation>
     </message>
     <message>
         <location line="-808"/>
         <source>Drawbars</source>
-        <translation type="unfinished">Drawbars</translation>
+        <translation>Drawbars</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>16&apos;</source>
-        <translation type="unfinished">16&apos;</translation>
+        <translation>16&apos;</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>4&apos;</source>
-        <translation type="unfinished">4&apos;</translation>
+        <translation>4&apos;</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>2 2/3&apos;</source>
-        <translation type="unfinished">2 2/3&apos;</translation>
+        <translation>2 2/3&apos;</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>2&apos;</source>
-        <translation type="unfinished">2&apos;</translation>
+        <translation>2&apos;</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>8&apos;</source>
-        <translation type="unfinished">8&apos;</translation>
+        <translation>8&apos;</translation>
     </message>
     <message>
         <location line="-10"/>
         <source>5 1/3&apos;</source>
-        <translation type="unfinished">5 1/3&apos;</translation>
+        <translation>5 1/3&apos;</translation>
     </message>
     <message>
         <location line="+461"/>
         <source>Envelope Lo</source>
-        <translation type="unfinished">Envolvente Lo</translation>
+        <translation>Envelope Lo</translation>
     </message>
     <message>
         <source>Attack(ms)</source>
@@ -12557,31 +15374,31 @@ Apply sync settings?</source>
     <message>
         <location line="-219"/>
         <source>Envelope Hi</source>
-        <translation type="unfinished">Envolvente Hi</translation>
+        <translation>Envelope Hi</translation>
     </message>
     <message>
         <location line="+12"/>
         <location line="+252"/>
         <source>Release</source>
-        <translation type="unfinished">Relajación</translation>
+        <translation>Release</translation>
     </message>
     <message>
         <location line="-242"/>
         <location line="+232"/>
         <source>Sustain</source>
-        <translation type="unfinished">Sostenido</translation>
+        <translation>Sustain</translation>
     </message>
     <message>
         <location line="-222"/>
         <location line="+212"/>
         <source>Decay</source>
-        <translation type="unfinished">Decaimiento</translation>
+        <translation>Decay</translation>
     </message>
     <message>
         <location line="-196"/>
         <location line="+186"/>
         <source>Attack</source>
-        <translation type="unfinished">Ataque</translation>
+        <translation>Attack</translation>
     </message>
     <message>
         <location line="-110"/>
@@ -12591,18 +15408,18 @@ Apply sync settings?</source>
         <location line="+16"/>
         <location line="+38"/>
         <source>ms</source>
-        <translation type="unfinished"></translation>
+        <translation>ms</translation>
     </message>
     <message>
         <location line="-244"/>
         <location line="+222"/>
         <source>cB</source>
-        <translation type="unfinished"></translation>
+        <translation>cB</translation>
     </message>
     <message>
         <location line="+134"/>
         <source>Velocity</source>
-        <translation type="unfinished">Velocidad</translation>
+        <translation>Velocity</translation>
     </message>
 </context>
 <context>
@@ -12792,72 +15609,72 @@ Apply sync settings?</source>
     <message>
         <location filename="../../muse/widgets/pastedialogbase.ui" line="+14"/>
         <source>MusE: Paste Parts</source>
-        <translation type="unfinished"></translation>
+        <translation>MusE: Pegar regiones.</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Number and raster</source>
-        <translation type="unfinished"></translation>
+        <translation>Cantidad y alineado</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>insert</source>
-        <translation type="unfinished"></translation>
+        <translation>Insertar</translation>
     </message>
     <message>
         <location line="+7"/>
         <source> times</source>
-        <translation type="unfinished"></translation>
+        <translation>-Tiempos</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>raster</source>
-        <translation type="unfinished"></translation>
+        <translation>Trama</translation>
     </message>
     <message>
         <location line="+7"/>
         <source> ticks</source>
-        <translation type="unfinished"></translation>
+        <translation>Tics</translation>
     </message>
     <message>
         <location line="+64"/>
         <source>Move, Merge, Clone</source>
-        <translation type="unfinished"></translation>
+        <translation>Mover, Mezclar, Clonar</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Move everything to the right</source>
-        <translation type="unfinished"></translation>
+        <translation>Mover todo a la derecha.</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Move only affected parts to the right</source>
-        <translation type="unfinished"></translation>
+        <translation>Mover sólo las regiones afectadas a la derecha.</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Put everything into a single track</source>
-        <translation type="unfinished"></translation>
+        <translation>Poner todo en una sola pista.</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Merge with existing parts</source>
-        <translation type="unfinished"></translation>
+        <translation>Mezclar con las regiones existentes.</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Insert as clones (where possible)</source>
-        <translation type="unfinished"></translation>
+        <translation>Insertar como clones (si es posible)</translation>
     </message>
     <message>
         <location line="+44"/>
         <source>OK</source>
-        <translation type="unfinished">Aceptar</translation>
+        <translation>Aceptar</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Cancel</source>
-        <translation type="unfinished">Cancelar</translation>
+        <translation>Cancelar</translation>
     </message>
 </context>
 <context>
@@ -12865,69 +15682,70 @@ Apply sync settings?</source>
     <message>
         <location filename="../../muse/widgets/pasteeventsdialogbase.ui" line="+14"/>
         <source>MusE: Paste Events</source>
-        <translation type="unfinished"></translation>
+        <translation>MusE: Pegar eventos</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Number and raster</source>
-        <translation type="unfinished"></translation>
+        <translation>Cantidad y alineado</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>insert</source>
-        <translation type="unfinished"></translation>
+        <translation>Insertar</translation>
     </message>
     <message>
         <location line="+7"/>
         <source> times</source>
-        <translation type="unfinished"></translation>
+        <translation>-Tiempos</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>raster</source>
-        <translation type="unfinished"></translation>
+        <translation>Alineado</translation>
     </message>
     <message>
         <location line="+7"/>
         <location line="+133"/>
         <source> ticks</source>
-        <translation type="unfinished"></translation>
+        <translation>-Tics</translation>
     </message>
     <message>
         <location line="-69"/>
         <source>Paste options</source>
-        <translation type="unfinished"></translation>
+        <translation>Opciones del pegado</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Always into existing parts</source>
-        <translation type="unfinished"></translation>
+        <translation>Siempre en las regiones existentes.</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Never into existing parts</source>
-        <translation type="unfinished"></translation>
+        <translation>Nunca en las regiones existentes.</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Into existing parts if part has not
 to be expanded by more than </source>
-        <translation type="unfinished"></translation>
+        <translation>En las regiones existentes si mas de 
+una región no tiene que ser ampliada .</translation>
     </message>
     <message>
         <location line="+88"/>
         <source>Put everything into the (selected) part</source>
-        <translation type="unfinished"></translation>
+        <translation>Poner todo lo seleccionado en una región.</translation>
     </message>
     <message>
         <location line="+44"/>
         <source>OK</source>
-        <translation type="unfinished">Aceptar</translation>
+        <translation>Aceptar</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Cancel</source>
-        <translation type="unfinished">Cancelar</translation>
+        <translation>Cancelar</translation>
     </message>
 </context>
 <context>
@@ -12947,9 +15765,8 @@ to be expanded by more than </source>
 <context>
     <name>PianoRoll</name>
     <message>
-        <location filename="../../muse/midiedit/pianoroll.cpp" line="+97"/>
         <source>&amp;Edit</source>
-        <translation type="unfinished">&amp;Editar</translation>
+        <translation type="obsolete">&amp;Editar</translation>
     </message>
     <message>
         <source>Cut</source>
@@ -12988,9 +15805,8 @@ to be expanded by more than </source>
         <translation type="obsolete">Fuera del bucle</translation>
     </message>
     <message>
-        <location line="+34"/>
         <source>&amp;Select</source>
-        <translation type="unfinished">&amp;Seleccionar</translation>
+        <translation type="obsolete">&amp;Seleccionar</translation>
     </message>
     <message>
         <source>blue</source>
@@ -13037,24 +15853,20 @@ to be expanded by more than </source>
         <translation type="obsolete">Herramientas de pianola</translation>
     </message>
     <message>
-        <location line="+137"/>
         <source>Step Record</source>
-        <translation type="unfinished">captura por pasos</translation>
+        <translation type="obsolete">captura por pasos</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Midi Input</source>
-        <translation type="unfinished">Entrada MIDI</translation>
+        <translation type="obsolete">Entrada MIDI</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Play Events</source>
-        <translation type="unfinished">Reproducir eventos</translation>
+        <translation type="obsolete">Reproducir eventos</translation>
     </message>
     <message>
-        <location line="+41"/>
         <source>Add Controller View</source>
-        <translation type="unfinished">Añade vista de controladores</translation>
+        <translation type="obsolete">Añade vista de controladores</translation>
     </message>
     <message>
         <source>Config Quant...</source>
@@ -13065,18 +15877,16 @@ to be expanded by more than </source>
         <translation type="obsolete">Modifica el tiempo de puerta</translation>
     </message>
     <message>
-        <location line="-138"/>
         <source>Modify Velocity</source>
-        <translation type="unfinished">Modifica la velocidad</translation>
+        <translation type="obsolete">Modifica la velocidad</translation>
     </message>
     <message>
         <source>Crescendo</source>
         <translation type="obsolete">Crescendo</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Transpose</source>
-        <translation type="unfinished">Transponer</translation>
+        <translation type="obsolete">Transponer</translation>
     </message>
     <message>
         <source>Thin Out</source>
@@ -13111,306 +15921,142 @@ to be expanded by more than </source>
         <translation type="obsolete">Crear compás</translation>
     </message>
     <message>
-        <location line="+126"/>
         <source>ctrl</source>
-        <translation type="unfinished">control</translation>
+        <translation type="obsolete">control</translation>
     </message>
     <message>
-        <location line="-214"/>
         <source>C&amp;ut</source>
-        <translation type="unfinished">C&amp;ortar</translation>
+        <translation type="obsolete">C&amp;ortar</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Copy</source>
-        <translation type="unfinished">&amp;Copiar</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Copy events in range</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&amp;Copiar</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Paste</source>
-        <translation type="unfinished">&amp;Pegar</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>&amp;Paste (with dialog)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Delete &amp;Events</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&amp;Pegar</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Select &amp;All</source>
-        <translation type="unfinished">Seleccion&amp;ar Todo</translation>
+        <translation type="obsolete">Seleccion&amp;ar Todo</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Deselect All</source>
-        <translation type="unfinished">&amp;Deseleccionar Todo</translation>
+        <translation type="obsolete">&amp;Deseleccionar Todo</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Invert &amp;Selection</source>
-        <translation type="unfinished">Invertir &amp;Selección</translation>
+        <translation type="obsolete">Invertir &amp;Selección</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>&amp;Inside Loop</source>
-        <translation type="unfinished">&amp;Interior de bucle</translation>
+        <translation type="obsolete">&amp;Interior de bucle</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Outside Loop</source>
-        <translation type="unfinished">&amp;Exterior de Bucle</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>&amp;Previous Part</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>&amp;Next Part</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Fu&amp;nctions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+54"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>&amp;Event Color</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&amp;Exterior de Bucle</translation>
     </message>
     <message>
-        <location line="-52"/>
         <source>Quantize</source>
-        <translation type="unfinished">Cuantizar</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Modify Note Length</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Crescendo/Decrescendo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Erase Events</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Move Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Set Fixed Length</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Delete Overlaps</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Legato</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
-        <source>&amp;Blue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>&amp;Pitch colors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>&amp;Velocity colors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-27"/>
-        <source>&amp;Plugins</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+46"/>
-        <source>Pianoroll tools</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Cuantizar</translation>
     </message>
     <message>
-        <location line="+26"/>
         <source>panic</source>
-        <translation type="unfinished">pánico</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>transport</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">pánico</translation>
     </message>
 </context>
 <context>
     <name>PluginDialog</name>
     <message>
-        <location filename="../../muse/plugin.cpp" line="+3142"/>
         <source>Ok</source>
-        <translation type="unfinished">Aceptar</translation>
+        <translation type="obsolete">Aceptar</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Cancel</source>
-        <translation type="unfinished">Cancelar</translation>
+        <translation type="obsolete">Cancelar</translation>
     </message>
     <message>
-        <location line="-49"/>
         <source>MusE: select plugin</source>
-        <translation type="unfinished">MusE: Selecciona el plugin</translation>
+        <translation type="obsolete">MusE: Selecciona el plugin</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Lib</source>
-        <translation type="unfinished">Lib</translation>
+        <translation type="obsolete">Lib</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Label</source>
-        <translation type="unfinished">Etiqueta</translation>
+        <translation type="obsolete">Etiqueta</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Name</source>
-        <translation type="unfinished">Nombre</translation>
+        <translation type="obsolete">Nombre</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>AI</source>
-        <translation type="unfinished">AI</translation>
+        <translation type="obsolete">AI</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>AO</source>
-        <translation type="unfinished">AO</translation>
+        <translation type="obsolete">AO</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>CI</source>
-        <translation type="unfinished">CI</translation>
+        <translation type="obsolete">CI</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>CO</source>
-        <translation type="unfinished">CO</translation>
+        <translation type="obsolete">CO</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>IP</source>
-        <translation type="unfinished">IP</translation>
+        <translation type="obsolete">IP</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>id</source>
-        <translation type="unfinished">id</translation>
+        <translation type="obsolete">id</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Maker</source>
-        <translation type="unfinished">Fabricante</translation>
+        <translation type="obsolete">Fabricante</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Copyright</source>
-        <translation type="unfinished">Copyright</translation>
+        <translation type="obsolete">Copyright</translation>
     </message>
     <message>
-        <location line="+52"/>
         <source>Stereo</source>
-        <translation type="unfinished">Estéreo</translation>
+        <translation type="obsolete">Estéreo</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Mono</source>
-        <translation type="unfinished">Mono</translation>
-    </message>
-    <message>
-        <location line="-10"/>
-        <source>Mono and Stereo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+15"/>
-        <source>Show All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>Select which types of plugins should be visible in the list.&lt;br&gt;Note that using mono plugins on stereo tracks is not a problem, two will be used in parallell.&lt;br&gt;Also beware that the &apos;all&apos; alternative includes plugins that probably not are usable by MusE.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+9"/>
-        <source>Search in &apos;Label&apos; and &apos;Name&apos;:</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Mono</translation>
     </message>
 </context>
 <context>
     <name>PluginGui</name>
     <message>
-        <location line="+219"/>
-        <location line="+3"/>
         <source>bypass plugin</source>
-        <translation type="unfinished">saltar plugin</translation>
+        <translation type="obsolete">saltar plugin</translation>
     </message>
     <message>
-        <location line="+554"/>
         <source>MusE: load preset</source>
-        <translation type="unfinished">MusE: Cargar plantilla</translation>
+        <translation type="obsolete">MusE: Cargar plantilla</translation>
     </message>
     <message>
-        <location line="+66"/>
         <source>MusE: save preset</source>
-        <translation type="unfinished">MusE: Guardar plantilla</translation>
+        <translation type="obsolete">MusE: Guardar plantilla</translation>
     </message>
     <message>
-        <location line="-635"/>
         <source>File Buttons</source>
-        <translation type="unfinished">Archivar botones</translation>
+        <translation type="obsolete">Archivar botones</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Load Preset</source>
-        <translation type="unfinished">Cargar plantilla</translation>
+        <translation type="obsolete">Cargar plantilla</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Save Preset</source>
-        <translation type="unfinished">Guardar plantilla</translation>
-    </message>
-    <message>
-        <location line="+588"/>
-        <source>Error reading preset. Might not be right type for this plugin</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Guardar plantilla</translation>
     </message>
 </context>
 <context>
@@ -13445,32 +16091,32 @@ to be expanded by more than </source>
     <message>
         <location filename="../../muse/widgets/projectcreate.ui" line="+14"/>
         <source>Create Project</source>
-        <translation type="unfinished"></translation>
+        <translation>Crear sesión</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Project Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nombre del la sesión:</translation>
     </message>
     <message>
         <location line="+32"/>
         <source>Project Path to song file:</source>
-        <translation type="unfinished"></translation>
+        <translation>Ruta de la sesión:</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Create project folder (recommended for audio projects)</source>
-        <translation type="unfinished"></translation>
+        <translation>Crear carpeta para la sesión (recomendado para sesiones de audio)</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Browse</source>
-        <translation type="unfinished"></translation>
+        <translation>Buscar</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Song information:</source>
-        <translation type="unfinished"></translation>
+        <translation>Información de la sesión</translation>
     </message>
 </context>
 <context>
@@ -13609,21 +16255,21 @@ actualmente sin uso</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../../muse/helper.cpp" line="-49"/>
+        <location filename="../../muse/helper.cpp" line="-61"/>
         <source>Other</source>
-        <translation type="unfinished"></translation>
+        <translation>Otro</translation>
     </message>
     <message>
-        <location filename="../../muse/functions.cpp" line="+242"/>
-        <location line="+159"/>
+        <location filename="../../muse/functions.cpp" line="+244"/>
+        <location line="+160"/>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Error</translation>
     </message>
     <message>
-        <location line="-159"/>
-        <location line="+159"/>
+        <location line="-160"/>
+        <location line="+160"/>
         <source>Please first select the range for crescendo with the loop markers.</source>
-        <translation type="unfinished"></translation>
+        <translation>Por favor, seleccione el rango de crescendo con los marcadores de bucle.</translation>
     </message>
 </context>
 <context>
@@ -13637,36 +16283,36 @@ actualmente sin uso</translation>
         <translation type="obsolete">Velocidad</translation>
     </message>
     <message>
-        <location filename="../../muse/instruments/minstrument.cpp" line="+72"/>
-        <location filename="../../muse/liste/editevent.cpp" line="-410"/>
+        <location filename="../../muse/instruments/minstrument.cpp" line="+73"/>
+        <location filename="../../muse/liste/editevent.cpp" line="-418"/>
         <source>Cannot convert sysex string</source>
-        <translation type="unfinished">No puedo convertir el paquete de sistema exclusivo</translation>
+        <translation>No se puede convertir el paquete de sistema exclusivo</translation>
     </message>
     <message>
         <location line="+8"/>
         <location filename="../../muse/liste/editevent.cpp" line="+8"/>
         <source>Hex String too long (2048 bytes limit)</source>
-        <translation type="unfinished">Cadena hexadecimal demasiado larga (límite de 2048 bytes)</translation>
+        <translation>Cadena hexadecimal demasiado larga (límite de 2048 bytes)</translation>
     </message>
     <message>
         <location line="+189"/>
         <source>generic midi</source>
-        <translation type="unfinished">midi genánico</translation>
+        <translation>MIDI genérico</translation>
     </message>
     <message>
-        <location filename="../../muse/miditransform.cpp" line="+92"/>
+        <location filename="../../muse/miditransform.cpp" line="-231"/>
         <source>new</source>
-        <translation type="unfinished">nuevo</translation>
+        <translation>Nueva sesión</translation>
     </message>
     <message>
-        <location filename="../../muse/wave.cpp" line="-677"/>
+        <location filename="../../muse/wave.cpp" line="-990"/>
         <source>create peakfile for </source>
-        <translation type="unfinished">crear archivo de picos para</translation>
+        <translation>Crear archivo de picos </translation>
     </message>
     <message>
         <location filename="../../muse/widgets/filedialog.cpp" line="+80"/>
         <source>MusE: get file name</source>
-        <translation type="unfinished">MusE: obtener el nombre de archivo</translation>
+        <translation>MusE: Obtener el nombre de archivo</translation>
     </message>
     <message>
         <source>the directory
@@ -13691,20 +16337,48 @@ no existe
         <translation type="obsolete">Cancelar</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+1"/>
+        <source>The directory
+%1
+does not exist.
+Create it?</source>
+        <translation>La carpeta
+%1
+no existe.
+¿Desea crearla?</translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>MusE: create directory</source>
-        <translation type="unfinished">MusE: crear directorio</translation>
+        <translation>MusE: Crear carpeta</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>creating dir failed</source>
-        <translation type="unfinished">fallóla creación de directorio</translation>
+        <translation>falló la creación de carpeta</translation>
     </message>
     <message>
         <location line="+396"/>
         <source>File
+%1
+exists. Overwrite?</source>
+        <translation>El archivo
+%1
+ya existe. ¿Desea sobreescribirlo?</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Open File
+%1
+failed: %2</source>
+        <translation>Abrir archivo
+%1
+falló: %2</translation>
+    </message>
+    <message>
+        <source>File
 </source>
-        <translation type="unfinished">El archivo
+        <translation type="obsolete">El archivo
 </translation>
     </message>
     <message>
@@ -13714,9 +16388,9 @@ exists</source>
 existe</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="-19"/>
         <source>MusE: write</source>
-        <translation type="unfinished">MusE: escribe</translation>
+        <translation>MusE: Escribir</translation>
     </message>
     <message>
         <source>Overwrite</source>
@@ -13727,28 +16401,26 @@ existe</translation>
         <translation type="obsolete">Salir</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Open File
 </source>
-        <translation type="unfinished">Abrir archivo</translation>
+        <translation type="obsolete">Abrir archivo</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>
 failed: </source>
-        <translation type="unfinished">
+        <translation type="obsolete">
 falló </translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+20"/>
         <source>MusE: Open File</source>
-        <translation type="unfinished">MusE: Abrir archivo</translation>
+        <translation>MusE: Abrir archivo</translation>
     </message>
     <message>
-        <location filename="../../muse/route.cpp" line="+1041"/>
+        <location filename="../../muse/route.cpp" line="+1044"/>
         <location line="+37"/>
         <source>None</source>
-        <translation type="unfinished">Ninguno</translation>
+        <translation>Ningúno</translation>
     </message>
     <message>
         <source>Master</source>
@@ -13767,28 +16439,9 @@ falló </translation>
         <translation type="obsolete">Desconocido</translation>
     </message>
     <message>
-        <location filename="../../muse/waveedit/waveview.cpp" line="+632"/>
+        <location filename="../../muse/waveedit/waveview.cpp" line="-374"/>
         <source>No selection. Ignoring</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/widgets/filedialog.cpp" line="-440"/>
-        <source>The directory
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>
-does not exist.
-Create it?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+404"/>
-        <source>
-exists. Overwrite?</source>
-        <translation type="unfinished"></translation>
+        <translation>No hay nada seleccionado!</translation>
     </message>
 </context>
 <context>
@@ -13796,97 +16449,117 @@ exists. Overwrite?</source>
     <message>
         <location filename="../../muse/widgets/function_dialogs/quantbase.ui" line="+17"/>
         <source>MusE: Quantize</source>
-        <translation type="unfinished"></translation>
+        <translation>MusE: Cuantizár</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Range</source>
-        <translation type="unfinished">Rango</translation>
+        <translation>Rango</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>All Events</source>
-        <translation type="unfinished">Todos los eventos</translation>
+        <translation>Todos los eventos</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Selected Events</source>
-        <translation type="unfinished">Eventos seleccionados</translation>
+        <translation>Eventos seleccionados</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Looped Events</source>
-        <translation type="unfinished"></translation>
+        <translation>Eventos del bucle</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Selected Looped</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionar bucle</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Values</source>
-        <translation type="unfinished">Valores</translation>
+        <translation>Valores</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Strength:</source>
-        <translation type="unfinished"></translation>
+        <translation>Porcentaje:</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>%</source>
-        <translation type="unfinished">%</translation>
+        <translation>%</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Threshold (ticks):</source>
-        <translation type="unfinished"></translation>
+        <translation>Umbrál (Tics):</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Quantize Len</source>
-        <translation type="unfinished"></translation>
+        <translation>Cuantizar duración</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Raster</source>
-        <translation type="unfinished">Raster</translation>
+        <translation>Raster</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Whole</source>
-        <translation type="unfinished"></translation>
+        <translation>Totalidad</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Half</source>
-        <translation type="unfinished"></translation>
+        <translation>Mitad</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>4th</source>
+        <translation>4th</translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>Quarter</source>
-        <translation type="unfinished"></translation>
+        <source>4th Triplet</source>
+        <translation>4th Triplet</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>8th</source>
-        <translation type="unfinished"></translation>
+        <translation>Octavos</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>8th Triplet</source>
+        <translation>Octavos con puntillo</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>16th</source>
-        <translation type="unfinished"></translation>
+        <translation>16th</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>16th Triplet</source>
+        <translation>16th Triplet</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>32th</source>
-        <translation type="unfinished"></translation>
+        <translation>32th</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>32th Triplet</source>
+        <translation>32th Triplet</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Swing:</source>
-        <translation type="unfinished"></translation>
+        <translation>Oscilación:</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -13895,17 +16568,20 @@ If swing=0, this is normal
 If swing is 33, you get a 2:1-rhythm.
 If swing is -33, you get a 1:2-rhythm.
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Si en el cambio propuesto la duración es menor que el umbral, no se hace nada.
+Si la oscilación es = 0, esto es normal
+Si la oscilación es de 33, se obtiene un ritmo 2:1.
+Si la oscilación es de -33, se obtiene un ritmo1:2.</translation>
     </message>
     <message>
         <location line="+51"/>
         <source>OK</source>
-        <translation type="unfinished">Aceptar</translation>
+        <translation>Aceptar</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Cancel</source>
-        <translation type="unfinished">Cancelar</translation>
+        <translation>Cancelar</translation>
     </message>
 </context>
 <context>
@@ -13963,52 +16639,52 @@ If swing is -33, you get a 1:2-rhythm.
     <message>
         <location filename="../../muse/widgets/function_dialogs/removebase.ui" line="+17"/>
         <source>MusE: Erase Notes</source>
-        <translation type="unfinished"></translation>
+        <translation>MusE: Borrar notas</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Range</source>
-        <translation type="unfinished">Rango</translation>
+        <translation>Rango</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>All Events</source>
-        <translation type="unfinished">Todos los eventos</translation>
+        <translation>Todos los eventos</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Selected Events</source>
-        <translation type="unfinished">Eventos seleccionados</translation>
+        <translation>Eventos seleccionados</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Looped Events</source>
-        <translation type="unfinished"></translation>
+        <translation>Eventos del bucle</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Selected Looped</source>
-        <translation type="unfinished"></translation>
+        <translation>Bucle seleccionado</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Thresholds</source>
-        <translation type="unfinished"></translation>
+        <translation>Umbrales</translation>
     </message>
     <message>
         <location line="+46"/>
         <source> ticks</source>
-        <translation type="unfinished"></translation>
+        <translation>-Tics</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Velocity</source>
-        <translation type="unfinished">Velocidad</translation>
+        <translation>Velocidad</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Length</source>
-        <translation type="unfinished">Longitud</translation>
+        <translation>Duración</translation>
     </message>
     <message>
         <location line="+13"/>
@@ -14019,17 +16695,17 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot; margin-top:0px; margin-bottom:7px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;If nothing is checked, everything is removed.&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:7px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;If velocity is checked, only notes with velo &amp;lt; threshold are removed.&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;If both are checked, notes with velo &amp;lt; threshold OR with length &amp;lt; threshold are removed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation> </translation>
     </message>
     <message>
         <location line="+56"/>
         <source>OK</source>
-        <translation type="unfinished">Aceptar</translation>
+        <translation>Aceptar</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Cancel</source>
-        <translation type="unfinished">Cancelar</translation>
+        <translation>Cancelar</translation>
     </message>
 </context>
 <context>
@@ -14393,57 +17069,57 @@ en la lista de controles definidos por MusE</translation>
     <message>
         <location filename="../../muse/mixer/routedialogbase.ui" line="+20"/>
         <source>MusE: Routing</source>
-        <translation type="unfinished"></translation>
+        <translation>Muse: Ruteado</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Add Route</source>
-        <translation type="unfinished"></translation>
+        <translation>Agregar ruta</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Source:</source>
-        <translation type="unfinished"></translation>
+        <translation>Fuente:</translation>
     </message>
     <message>
         <location line="+24"/>
         <source>Destination:</source>
-        <translation type="unfinished"></translation>
+        <translation>Destino:</translation>
     </message>
     <message>
         <location line="+29"/>
         <source>Connect</source>
-        <translation type="unfinished"></translation>
+        <translation>Conectar</translation>
     </message>
     <message>
         <location line="-3"/>
         <source>connect source to destination</source>
-        <translation type="unfinished"></translation>
+        <translation>Conectar fuente a destino</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Current Routes</source>
-        <translation type="unfinished"></translation>
+        <translation>Rutas actuales</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Source</source>
-        <translation type="unfinished"></translation>
+        <translation>Fuente</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Destination</source>
-        <translation type="unfinished"></translation>
+        <translation>Destino</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Eliminar</translation>
     </message>
     <message>
         <location line="-3"/>
         <source>remove selected route</source>
-        <translation type="unfinished"></translation>
+        <translation>Eliminar ruta seleccionada</translation>
     </message>
 </context>
 <context>
@@ -14458,52 +17134,52 @@ en la lista de controles definidos por MusE</translation>
     <message>
         <location filename="../../synti/simpledrums2/sspluginchooserbase.ui" line="+16"/>
         <source>SimpleDrums - Ladspa Plugin Chooser</source>
-        <translation type="unfinished"></translation>
+        <translation>SimpleDrums - Selector de Efecto Ladspa</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Name</source>
-        <translation type="unfinished">Nombre</translation>
+        <translation>Nombre</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Label</source>
-        <translation type="unfinished">Etiqueta</translation>
+        <translation>Etiqueta</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Inports</source>
-        <translation type="unfinished"></translation>
+        <translation>Puerto de entrada</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Outports</source>
-        <translation type="unfinished"></translation>
+        <translation>Puerto de salida</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Creator</source>
-        <translation type="unfinished"></translation>
+        <translation>Creador</translation>
     </message>
     <message>
         <location line="+32"/>
         <source>&amp;Cancel</source>
-        <translation type="unfinished">&amp;Cancelar</translation>
+        <translation>&amp;Cancelar</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Alt+C</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt+C</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>&amp;OK</source>
-        <translation type="unfinished"></translation>
+        <translation>Aceptar</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Alt+O</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt+O</translation>
     </message>
 </context>
 <context>
@@ -14511,22 +17187,22 @@ en la lista de controles definidos por MusE</translation>
     <message>
         <location filename="../../synti/simpledrums2/ssplugingui.cpp" line="+238"/>
         <source>Clear and unload effect</source>
-        <translation type="unfinished"></translation>
+        <translation>Limpiar y descargar efecto</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Load effect</source>
-        <translation type="unfinished"></translation>
+        <translation>Cargar efecto</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Toggle display of effect parameters</source>
-        <translation type="unfinished"></translation>
+        <translation>Vista de los parámetros de efecto</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Turn effect on/off</source>
-        <translation type="unfinished"></translation>
+        <translation>Encender/Apagar efecto</translation>
     </message>
 </context>
 <context>
@@ -14625,49 +17301,6 @@ en la lista de controles definidos por MusE</translation>
     </message>
 </context>
 <context>
-    <name>ScoreCanvas</name>
-    <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="+1245"/>
-        <source>Treble</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Bass</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Grand Staff</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Remove staff</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2467"/>
-        <source>Ambiguous part</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There are two or more possible parts you could add the note to, but none matches the selected part. Please select the destination part by clicking on any note belonging to it and try again, or add a new stave containing only the destination part.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>No part</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There are no parts you could add the note to.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>ScoreConfig</name>
     <message>
         <source>Staff Settings: </source>
@@ -14729,251 +17362,52 @@ en la lista de controles definidos por MusE</translation>
 <context>
     <name>ScoreEdit</name>
     <message>
-        <location line="-3493"/>
-        <source>Undo/Redo tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Step recording tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Step Record</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
         <source>panic</source>
-        <translation type="unfinished">pánico</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>transport</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Note settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Note length:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>last</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+37"/>
-        <source>Velocity:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Off-Velocity:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>Quantisation settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Quantisation:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>Pixels per whole:</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">pánico</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>&amp;Edit</source>
-        <translation type="unfinished">&amp;Editar</translation>
+        <translation type="obsolete">&amp;Editar</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>C&amp;ut</source>
-        <translation type="unfinished">C&amp;ortar</translation>
+        <translation type="obsolete">C&amp;ortar</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Copy</source>
-        <translation type="unfinished">&amp;Copiar</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Copy events in range</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&amp;Copiar</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Paste</source>
-        <translation type="unfinished">&amp;Pegar</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Paste (with dialog)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Delete &amp;Events</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&amp;Pegar</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>&amp;Select</source>
-        <translation type="unfinished">&amp;Seleccionar</translation>
+        <translation type="obsolete">&amp;Seleccionar</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Select &amp;All</source>
-        <translation type="unfinished">Seleccion&amp;ar Todo</translation>
+        <translation type="obsolete">Seleccion&amp;ar Todo</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Deselect All</source>
-        <translation type="unfinished">&amp;Deseleccionar Todo</translation>
+        <translation type="obsolete">&amp;Deseleccionar Todo</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Invert &amp;Selection</source>
-        <translation type="unfinished">Invertir &amp;Selección</translation>
+        <translation type="obsolete">Invertir &amp;Selección</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>&amp;Inside Loop</source>
-        <translation type="unfinished">&amp;Interior de bucle</translation>
+        <translation type="obsolete">&amp;Interior de bucle</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Outside Loop</source>
-        <translation type="unfinished">&amp;Exterior de Bucle</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Fu&amp;nctions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>&amp;Quantize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Change note &amp;length</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Change note &amp;velocity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Crescendo/Decrescendo</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&amp;Exterior de Bucle</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Transpose</source>
-        <translation type="unfinished">Transponer</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Erase Events</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Move Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Set Fixed Length</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Delete Overlaps</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Legato</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Note head &amp;colors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>&amp;Black</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>&amp;Velocity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>&amp;Part</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Set up &amp;preamble</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Display &amp;key signature</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Display &amp;time signature</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Set Score &amp;name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+216"/>
-        <location line="+1"/>
-        <source>Enter the new score title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Changing score title failed:
-the selected title is not unique</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Transponer</translation>
     </message>
 </context>
 <context>
@@ -14996,57 +17430,57 @@ the selected title is not unique</source>
     <message>
         <location filename="../../muse/widgets/function_dialogs/setlenbase.ui" line="+14"/>
         <source>MusE: Set Note Length</source>
-        <translation type="unfinished"></translation>
+        <translation>MusE: Cambiar duración de notas</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Range</source>
-        <translation type="unfinished">Rango</translation>
+        <translation>Rango</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>All Events</source>
-        <translation type="unfinished">Todos los eventos</translation>
+        <translation>Todos los eventos</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Selected Events</source>
-        <translation type="unfinished">Eventos seleccionados</translation>
+        <translation>Eventos seleccionados</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Looped Events</source>
-        <translation type="unfinished"></translation>
+        <translation>Eventos en bucle</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Selected Looped</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionar bucle</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Value</source>
-        <translation type="unfinished">Valor</translation>
+        <translation>Valor</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>New length</source>
-        <translation type="unfinished"></translation>
+        <translation>Nueva duración</translation>
     </message>
     <message>
         <location line="+10"/>
         <source> ticks</source>
-        <translation type="unfinished"></translation>
+        <translation>-Tics</translation>
     </message>
     <message>
         <location line="+53"/>
         <source>OK</source>
-        <translation type="unfinished">Aceptar</translation>
+        <translation>Aceptar</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Cancel</source>
-        <translation type="unfinished">Cancelar</translation>
+        <translation>Cancelar</translation>
     </message>
 </context>
 <context>
@@ -15065,38 +17499,38 @@ the selected title is not unique</source>
     <message>
         <location filename="../../muse/widgets/shortcutcapturedialogbase.ui" line="+14"/>
         <source>Enter shortcut sequence</source>
-        <translation type="unfinished"></translation>
+        <translation>Ingresar atajo</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Press keys to enter shortcut sequence!</source>
-        <translation type="unfinished"></translation>
+        <translation>Ingrese la secuencia de teclas</translation>
     </message>
     <message>
         <location line="+25"/>
         <source>Old shortcut:</source>
-        <translation type="unfinished"></translation>
+        <translation>Atajo anterior</translation>
     </message>
     <message>
         <location line="+10"/>
         <location line="+24"/>
         <source>Undefined</source>
-        <translation type="unfinished"></translation>
+        <translation>Sin definir</translation>
     </message>
     <message>
         <location line="-10"/>
         <source>New shortcut:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nuevo atajo</translation>
     </message>
     <message>
         <location line="+27"/>
         <source>OK</source>
-        <translation type="unfinished">Aceptar</translation>
+        <translation>Aceptar</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Cancel</source>
-        <translation type="unfinished">Cancelar</translation>
+        <translation>Cancelar</translation>
     </message>
 </context>
 <context>
@@ -15104,52 +17538,52 @@ the selected title is not unique</source>
     <message>
         <location filename="../../muse/widgets/shortcutconfigbase.ui" line="+14"/>
         <source>Configure Keyboard Shortcuts</source>
-        <translation type="unfinished"></translation>
+        <translation>Configurar atajos de teclado</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>Shortcut Category</source>
-        <translation type="unfinished"></translation>
+        <translation>Categoría de accesos rápidos</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+24"/>
         <source>Description</source>
-        <translation type="unfinished"></translation>
+        <translation>Descripción</translation>
     </message>
     <message>
         <location line="-5"/>
         <source>Shortcut</source>
-        <translation type="unfinished"></translation>
+        <translation>Acceso rápido</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+35"/>
         <source>&amp;Clear</source>
-        <translation type="unfinished"></translation>
+        <translation>Limpiar</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Alt+C</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt+C</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>&amp;Define</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Definir</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Alt+D</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt+D</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>&amp;Apply</source>
-        <translation type="unfinished">&amp;Aplicar</translation>
+        <translation>&amp;Aplicar</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Alt+A</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt+A</translation>
     </message>
 </context>
 <context>
@@ -15164,7 +17598,7 @@ the selected title is not unique</source>
     <message>
         <location filename="../../synti/simpledrums2/simpledrumsguibase.ui" line="+16"/>
         <source>DrumSynth 0.1</source>
-        <translation type="unfinished"></translation>
+        <translation>DrumSynth 0.1</translation>
     </message>
 </context>
 <context>
@@ -15172,113 +17606,28 @@ the selected title is not unique</source>
     <message>
         <location filename="../../synti/simpledrums2/simpledrumsgui.cpp" line="+442"/>
         <source>&amp;Load setup</source>
-        <translation type="unfinished"></translation>
+        <translation>Cargar configuración</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>&amp;Save setup</source>
-        <translation type="unfinished"></translation>
+        <translation>Guardar configuración</translation>
     </message>
     <message>
         <location line="+344"/>
         <source>Load sample dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Cargar diálogo de muestra</translation>
     </message>
 </context>
 <context>
     <name>Song</name>
     <message>
-        <location filename="../../muse/song.cpp" line="+2412"/>
-        <source>Jack shutdown!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Jack has detected a performance problem which has lead to
-MusE being disconnected.
-This could happen due to a number of reasons:
-- a performance issue with your particular setup.
-- a bug in MusE (or possibly in another connected software).
-- a random hiccup which might never occur again.
-- jack was voluntary stopped by you or someone else
-- jack crashed
-If there is a persisting problem you are much welcome to discuss it
-on the MusE mailinglist.
-(there is information about joining the mailinglist on the MusE
- homepage which is available through the help menu)
-
-To proceed check the status of Jack and try to restart it and then .
-click on the Restart button.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+198"/>
-        <source>previous event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>next event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <location line="+183"/>
-        <source>set event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-181"/>
-        <location line="+183"/>
-        <source>add event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-179"/>
-        <location line="+184"/>
-        <source>erase event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-180"/>
-        <source>erase range</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>clear automation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+33"/>
-        <source>Clear all controller events?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
         <source>&amp;Ok</source>
-        <translation type="unfinished">Ac&amp;eptar</translation>
+        <translation type="obsolete">Ac&amp;eptar</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>&amp;Cancel</source>
-        <translation type="unfinished">&amp;Cancelar</translation>
-    </message>
-    <message>
-        <location line="+1134"/>
-        <source>MusE - external script failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>MusE was unable to launch the script, error message:
- </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-1200"/>
-        <source>Automation:</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&amp;Cancelar</translation>
     </message>
 </context>
 <context>
@@ -15286,32 +17635,32 @@ click on the Restart button.</source>
     <message>
         <location filename="../../muse/widgets/songinfo.ui" line="+14"/>
         <source>Song Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Información de la sesión</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Show on song load</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar al cargar la sesión</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>&amp;Cancel</source>
-        <translation type="unfinished">&amp;Cancelar</translation>
+        <translation>&amp;Cancelar</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Alt+C</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt+C</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>&amp;Ok</source>
-        <translation type="unfinished">Ac&amp;eptar</translation>
+        <translation>Aceptar</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Alt+O</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt+O</translation>
     </message>
 </context>
 <context>
@@ -15334,38 +17683,38 @@ click on the Restart button.</source>
     <message>
         <location filename="../../muse/widgets/synthconfigbase.ui" line="+14"/>
         <source>MusE: Synth Configuration</source>
-        <translation type="unfinished">MusE: Configuración del Sintetizador virtual</translation>
+        <translation>MusE: Configuración del Sintetizador virtual</translation>
     </message>
     <message>
         <location line="+75"/>
         <source>Soft Synthesizer</source>
-        <translation type="unfinished">Sintetizador Virtual</translation>
+        <translation>Sintetizador Virtual</translation>
     </message>
     <message>
         <location line="+46"/>
         <source>File</source>
-        <translation type="unfinished">Archivo</translation>
+        <translation>Archivo</translation>
     </message>
     <message>
         <location line="-115"/>
         <source>Instances</source>
-        <translation type="unfinished">Copias</translation>
+        <translation>Copias</translation>
     </message>
     <message>
         <location line="+10"/>
         <location line="+115"/>
         <source>Name</source>
-        <translation type="unfinished">Nombre</translation>
+        <translation>Nombre</translation>
     </message>
     <message>
         <location line="-17"/>
         <source>list of available software synthesizers</source>
-        <translation type="unfinished">lista de sintetizadores de software dispoibles</translation>
+        <translation>lista de sintetizadores de software dispoibles</translation>
     </message>
     <message>
         <location line="-25"/>
         <source>Add Instance</source>
-        <translation type="unfinished">Agregar copia</translation>
+        <translation>Agregar copia</translation>
     </message>
     <message>
         <source>Alsa Port</source>
@@ -15374,32 +17723,32 @@ click on the Restart button.</source>
     <message>
         <location line="-58"/>
         <source>Remove Instance</source>
-        <translation type="unfinished">Quitar copia</translation>
+        <translation>Quitar copia</translation>
     </message>
     <message>
         <location line="-10"/>
         <source>Midi Port</source>
-        <translation type="unfinished">Puerto MIDI</translation>
+        <translation>Puerto MIDI</translation>
     </message>
     <message>
         <location line="+38"/>
         <source>Midi connections</source>
-        <translation type="unfinished"></translation>
+        <translation>Conexiones de MIDI</translation>
     </message>
     <message>
         <location line="+67"/>
         <source>Inst</source>
-        <translation type="unfinished"></translation>
+        <translation>Instrumento</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Version</source>
-        <translation type="unfinished"></translation>
+        <translation>Versión</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Description</source>
-        <translation type="unfinished"></translation>
+        <translation>Descripción</translation>
     </message>
 </context>
 <context>
@@ -15448,9 +17797,8 @@ click on the Restart button.</source>
 <context>
     <name>TempoSig</name>
     <message>
-        <location filename="../../muse/transport.cpp" line="+103"/>
         <source>Tempo/Sig</source>
-        <translation type="unfinished">tempo/firma</translation>
+        <translation type="obsolete">tempo/firma</translation>
     </message>
 </context>
 <context>
@@ -15495,74 +17843,8 @@ click on the Restart button.</source>
 <context>
     <name>TopWin</name>
     <message>
-        <location filename="../../muse/cobject.cpp" line="+61"/>
-        <source>As subwindow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Shares tools and menu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Fullscreen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+418"/>
-        <source>Piano roll</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>List editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Drum editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Master track editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Master track list editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Wave editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Clip list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Marker view</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Score editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
         <source>Arranger</source>
-        <translation type="unfinished">Arreglador</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>&lt;unknown toplevel type&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Arreglador</translation>
     </message>
 </context>
 <context>
@@ -15579,158 +17861,116 @@ click on the Restart button.</source>
 <context>
     <name>Transport</name>
     <message>
-        <location filename="../../muse/transport.cpp" line="+150"/>
-        <location line="+3"/>
         <source>Punch In</source>
-        <translation type="unfinished">Pinchar</translation>
+        <translation type="obsolete">Pinchar</translation>
     </message>
     <message>
-        <location line="-2"/>
-        <location line="+3"/>
         <source>Loop</source>
-        <translation type="unfinished">Bucle</translation>
+        <translation type="obsolete">Bucle</translation>
     </message>
     <message>
-        <location line="-2"/>
-        <location line="+3"/>
         <source>Punch Out</source>
-        <translation type="unfinished">Fin pinchado</translation>
+        <translation type="obsolete">Fin pinchado</translation>
     </message>
     <message>
-        <location line="+33"/>
         <source>Left Mark</source>
-        <translation type="unfinished">Marca izquierda</translation>
+        <translation type="obsolete">Marca izquierda</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Right Mark</source>
-        <translation type="unfinished">Marca derecha</translation>
+        <translation type="obsolete">Marca derecha</translation>
     </message>
     <message>
-        <location line="-95"/>
         <source>Overdub</source>
-        <translation type="unfinished">Agregar</translation>
+        <translation type="obsolete">Agregar</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+15"/>
         <source>Replace</source>
-        <translation type="unfinished">Reemplazar</translation>
+        <translation type="obsolete">Reemplazar</translation>
     </message>
     <message>
-        <location line="-10"/>
         <source>Rec Mode</source>
-        <translation type="unfinished">Modo de captura</translation>
+        <translation type="obsolete">Modo de captura</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Normal</source>
-        <translation type="unfinished">Normal</translation>
+        <translation type="obsolete">Normal</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Mix</source>
-        <translation type="unfinished">Mezcla</translation>
+        <translation type="obsolete">Mezcla</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Cycle Rec</source>
-        <translation type="unfinished">Ciclar captura</translation>
+        <translation type="obsolete">Ciclar captura</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>punchin</source>
-        <translation type="unfinished">pinchar</translation>
+        <translation type="obsolete">pinchar</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>loop</source>
-        <translation type="unfinished">bucle</translation>
+        <translation type="obsolete">bucle</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>punchout</source>
-        <translation type="unfinished">fin pinchado</translation>
+        <translation type="obsolete">fin pinchado</translation>
     </message>
     <message>
-        <location line="+101"/>
         <source>rewind to start</source>
-        <translation type="unfinished">retroceder al inicio</translation>
+        <translation type="obsolete">retroceder al inicio</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>rewind</source>
-        <translation type="unfinished">retroceder</translation>
+        <translation type="obsolete">retroceder</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>forward</source>
-        <translation type="unfinished">avanzar</translation>
+        <translation type="obsolete">avanzar</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>stop</source>
-        <translation type="unfinished">parar</translation>
+        <translation type="obsolete">parar</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>play</source>
-        <translation type="unfinished">reproducir</translation>
+        <translation type="obsolete">reproducir</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>record</source>
-        <translation type="unfinished">grabar</translation>
+        <translation type="obsolete">grabar</translation>
     </message>
     <message>
-        <location line="+28"/>
         <source>AC</source>
-        <translation type="unfinished">AC</translation>
+        <translation type="obsolete">AC</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>quantize during record</source>
-        <translation type="unfinished">cuantizar durante la captura</translation>
+        <translation type="obsolete">cuantizar durante la captura</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Click</source>
-        <translation type="unfinished">Click</translation>
+        <translation type="obsolete">Click</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>metronom click on/off</source>
-        <translation type="unfinished">Click del metrónomo encendido/apagado</translation>
+        <translation type="obsolete">Click del metrónomo encendido/apagado</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Sync</source>
-        <translation type="unfinished">Sinconización</translation>
+        <translation type="obsolete">Sinconización</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>external sync on/off</source>
-        <translation type="unfinished">Sincronización externa encedida/apagada</translation>
+        <translation type="obsolete">Sincronización externa encedida/apagada</translation>
     </message>
     <message>
-        <location line="+45"/>
         <source>Master</source>
-        <translation type="unfinished">Maestro</translation>
+        <translation type="obsolete">Maestro</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>use master track</source>
-        <translation type="unfinished">usar pista maestra</translation>
-    </message>
-    <message>
-        <location line="-43"/>
-        <source>Jack</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Jack transport sync on/off</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">usar pista maestra</translation>
     </message>
 </context>
 <context>
@@ -15738,52 +17978,52 @@ click on the Restart button.</source>
     <message>
         <location filename="../../muse/widgets/function_dialogs/transposebase.ui" line="+14"/>
         <source>MusE: Transpose</source>
-        <translation type="unfinished"></translation>
+        <translation>MusE:-Transponer</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Range</source>
-        <translation type="unfinished">Rango</translation>
+        <translation>Rango</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>All Events</source>
-        <translation type="unfinished">Todos los eventos</translation>
+        <translation>Todos los eventos</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Selected Events</source>
-        <translation type="unfinished">Eventos seleccionados</translation>
+        <translation>Eventos seleccionados</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Looped Events</source>
-        <translation type="unfinished"></translation>
+        <translation>Eventos del bucle</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Selected Looped</source>
-        <translation type="unfinished"></translation>
+        <translation>Bucle seleccionadp</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Value</source>
-        <translation type="unfinished">Valor</translation>
+        <translation>Valor</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Halftone-steps</source>
-        <translation type="unfinished"></translation>
+        <translation>Semitonos</translation>
     </message>
     <message>
         <location line="+69"/>
         <source>OK</source>
-        <translation type="unfinished">Aceptar</translation>
+        <translation>Aceptar</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Cancel</source>
-        <translation type="unfinished">Cancelar</translation>
+        <translation>Cancelar</translation>
     </message>
 </context>
 <context>
@@ -15834,34 +18074,35 @@ click on the Restart button.</source>
     <message>
         <location filename="../../muse/widgets/unusedwavefiles.ui" line="+14"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Dialogo</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>List of unused audio files in current project directory:</source>
-        <translation type="unfinished"></translation>
+        <translation>Listar archivos de audio sin uso en la sesión</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Current project</source>
-        <translation type="unfinished"></translation>
+        <translation>Sesión actual</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>All .med files
 in current
  directory</source>
-        <translation type="unfinished"></translation>
+        <translation>Todas las sesiones
+en la carpeta actual</translation>
     </message>
     <message>
         <location line="+42"/>
         <source>Move files to &apos;unused&apos; subdir</source>
-        <translation type="unfinished"></translation>
+        <translation>Mover no usados a carpeta &quot;unused&quot;</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Cancel</source>
-        <translation type="unfinished">Cancelar</translation>
+        <translation>Cancelar</translation>
     </message>
 </context>
 <context>
@@ -15869,13 +18110,13 @@ in current
     <message>
         <location filename="../../synti/vam/vamgui.cpp" line="+610"/>
         <source>MusE: Load VAM Presets</source>
-        <translation type="unfinished"></translation>
+        <translation>MusE: Cargar preseteos de VAM</translation>
     </message>
     <message>
         <location line="+110"/>
         <location line="+18"/>
         <source>MusE: Save VAM Presets</source>
-        <translation type="unfinished"></translation>
+        <translation>Guardar preseteos de VAM</translation>
     </message>
 </context>
 <context>
@@ -15883,185 +18124,185 @@ in current
     <message>
         <location filename="../../synti/vam/vamguibase.ui" line="+23"/>
         <source>Virtual Analogue for MusE</source>
-        <translation type="unfinished">Analogico virtual para MusE</translation>
+        <translation>Analogico virtual para MusE</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>LFO</source>
-        <translation type="unfinished">LFO</translation>
+        <translation>LFO</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Freq</source>
-        <translation type="unfinished">Freq</translation>
+        <translation>Freq</translation>
     </message>
     <message>
         <location line="+42"/>
         <location line="+950"/>
         <location line="+177"/>
         <source>Waveform</source>
-        <translation type="unfinished">Tipo Onda</translation>
+        <translation>Tipo Onda</translation>
     </message>
     <message>
         <location line="-1116"/>
         <location line="+956"/>
         <location line="+177"/>
         <source>Sine</source>
-        <translation type="unfinished">Seno</translation>
+        <translation>Seno</translation>
     </message>
     <message>
         <location line="-1128"/>
         <location line="+956"/>
         <location line="+177"/>
         <source>Pulse</source>
-        <translation type="unfinished">Pulso</translation>
+        <translation>Pulso</translation>
     </message>
     <message>
         <location line="-1128"/>
         <location line="+956"/>
         <location line="+177"/>
         <source>Saw</source>
-        <translation type="unfinished">Sierra</translation>
+        <translation>Sierra</translation>
     </message>
     <message>
         <location line="-1128"/>
         <location line="+956"/>
         <location line="+177"/>
         <source>Triangle</source>
-        <translation type="unfinished">Triángulo</translation>
+        <translation>Triángulo</translation>
     </message>
     <message>
         <location line="-1122"/>
         <source>Filter</source>
-        <translation type="unfinished">Filtro</translation>
+        <translation>Filtro</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>EnvMod</source>
-        <translation type="unfinished">Modulación de envolvente</translation>
+        <translation>Modulación de envolvente</translation>
     </message>
     <message>
         <location line="+10"/>
         <location line="+717"/>
         <location line="+427"/>
         <source>Attack</source>
-        <translation type="unfinished">Ataque</translation>
+        <translation>Ataque</translation>
     </message>
     <message>
         <location line="-1134"/>
         <location line="+645"/>
         <location line="+531"/>
         <source>Decay</source>
-        <translation type="unfinished">Decaimiento</translation>
+        <translation>Decaimiento</translation>
     </message>
     <message>
         <location line="-1166"/>
         <location line="+677"/>
         <location line="+531"/>
         <source>Sustain</source>
-        <translation type="unfinished">Sostenido</translation>
+        <translation>Sostenido</translation>
     </message>
     <message>
         <location line="-1198"/>
         <location line="+677"/>
         <location line="+401"/>
         <source>Release</source>
-        <translation type="unfinished">Relajación</translation>
+        <translation>Relajación</translation>
     </message>
     <message>
         <location line="-972"/>
         <source>Cutoff</source>
-        <translation type="unfinished">Frecuencia de corte</translation>
+        <translation>Frecuencia de corte</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Resonance</source>
-        <translation type="unfinished">Resonancia</translation>
+        <translation>Resonancia</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Invert</source>
-        <translation type="unfinished">Invertir</translation>
+        <translation>Invertir</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>KeyTrack</source>
-        <translation type="unfinished">Seguir teclas</translation>
+        <translation>Seguir teclas</translation>
     </message>
     <message>
         <location line="+153"/>
         <source>Presets</source>
-        <translation type="unfinished">Plantillas</translation>
+        <translation>Plantillas</translation>
     </message>
     <message>
         <location line="+65"/>
         <source>Set</source>
-        <translation type="unfinished">Establecer</translation>
+        <translation>Establecer</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>load preset list</source>
-        <translation type="unfinished">cargar lista de plantillas</translation>
+        <translation>cargar lista de plantillas</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>save preset list</source>
-        <translation type="unfinished">guardar lista de plantillas</translation>
+        <translation>guardar lista de plantillas</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>save preset list to a new file</source>
-        <translation type="unfinished">guardar lista de plantillas en un archivo nuevo</translation>
+        <translation>guardar lista de plantillas en un archivo nuevo</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>delete preset</source>
-        <translation type="unfinished">borrar plantilla</translation>
+        <translation>borrar plantilla</translation>
     </message>
     <message>
         <location line="+41"/>
         <source>DCO 1</source>
-        <translation type="unfinished">DCO 1</translation>
+        <translation>DCO 1</translation>
     </message>
     <message>
         <location line="+12"/>
         <location line="+538"/>
         <source>Pitch</source>
-        <translation type="unfinished">Tono</translation>
+        <translation>Tono</translation>
     </message>
     <message>
         <location line="-506"/>
         <location line="+480"/>
         <source>Detune</source>
-        <translation type="unfinished">Desafinación</translation>
+        <translation>Desafinación</translation>
     </message>
     <message>
         <location line="-374"/>
         <location line="+473"/>
         <source>PWM</source>
-        <translation type="unfinished">PWM</translation>
+        <translation>PWM</translation>
     </message>
     <message>
         <location line="-391"/>
         <location line="+266"/>
         <source>FM</source>
-        <translation type="unfinished">FM</translation>
+        <translation>FM</translation>
     </message>
     <message>
         <location line="-240"/>
         <location line="+501"/>
         <source>PW</source>
-        <translation type="unfinished">PW</translation>
+        <translation>PW</translation>
     </message>
     <message>
         <location line="-314"/>
         <source>DCO 2</source>
-        <translation type="unfinished">DCO 2</translation>
+        <translation>DCO 2</translation>
     </message>
     <message>
         <location line="+324"/>
         <source>On</source>
-        <translation type="unfinished">Encendido</translation>
+        <translation>Encendido</translation>
     </message>
     <message utf8="true">
         <source>VAM 1.0beta2
@@ -16088,7 +18329,15 @@ Jotsif Lindman Hörnlund
 Copyright(C) 2005
 Robert Jonsson 
 (rj@spamatica.se)</source>
-        <translation type="unfinished"></translation>
+        <translation>VAM 1.0beta3
+Sintetizador análogo virtual para MusE
+Liberado bajo licencia GPL.
+Derechos Reservados(C) 2002
+Jotsif Lindman Hörnlund 
+( jotsif@linux.nu )
+Derechos Reservados(C) 2005
+Robert Jonsson 
+(rj@spamatica.se)</translation>
     </message>
 </context>
 <context>
@@ -16096,27 +18345,27 @@ Robert Jonsson
     <message>
         <location filename="../../muse/widgets/function_dialogs/velocitybase.ui" line="+14"/>
         <source>MusE: Modify Velocity</source>
-        <translation type="unfinished">MusE: Modificar velocidad</translation>
+        <translation>MusE: Modificar la  velocidad.</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Range</source>
-        <translation type="unfinished">Rango</translation>
+        <translation>Rango</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>All Events</source>
-        <translation type="unfinished">Todos los eventos</translation>
+        <translation>Todos los eventos</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Selected Events</source>
-        <translation type="unfinished">Eventos seleccionados</translation>
+        <translation>Eventos seleccionados</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Looped Events</source>
-        <translation type="unfinished">Eventos del bucle</translation>
+        <translation>Eventos del bucle</translation>
     </message>
     <message>
         <source>Selected &amp; Looped</source>
@@ -16125,42 +18374,42 @@ Robert Jonsson
     <message>
         <location line="+17"/>
         <source>Values</source>
-        <translation type="unfinished">Valores</translation>
+        <translation>Valores</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Rate:</source>
-        <translation type="unfinished">Velocidad:</translation>
+        <translation>Porcentajes:</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Offset:</source>
-        <translation type="unfinished">Desplazamiento:</translation>
+        <translation>Desplazamiento:</translation>
     </message>
     <message>
         <location line="-13"/>
         <source>%</source>
-        <translation type="unfinished">%</translation>
+        <translation>%</translation>
     </message>
     <message>
         <location line="-32"/>
         <source>Selected Looped</source>
-        <translation type="unfinished"></translation>
+        <translation>Selecionar bucles</translation>
     </message>
     <message>
         <location line="+71"/>
         <source>veloNew = (veloOld * rate) + offset</source>
-        <translation type="unfinished"></translation>
+        <translation> </translation>
     </message>
     <message>
         <location line="+44"/>
         <source>OK</source>
-        <translation type="unfinished">Aceptar</translation>
+        <translation>Aceptar</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Cancel</source>
-        <translation type="unfinished">Cancelar</translation>
+        <translation>Cancelar</translation>
     </message>
 </context>
 <context>
@@ -16181,14 +18430,12 @@ Robert Jonsson
         <translation type="obsolete">Herramientas de Audio</translation>
     </message>
     <message>
-        <location filename="../../muse/waveedit/waveedit.cpp" line="+196"/>
         <source>Solo</source>
-        <translation type="unfinished">Solo</translation>
+        <translation type="obsolete">Solo</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Cursor</source>
-        <translation type="unfinished">Cursor</translation>
+        <translation type="obsolete">Cursor</translation>
     </message>
     <message>
         <source>&amp;File</source>
@@ -16199,129 +18446,52 @@ Robert Jonsson
         <translation type="obsolete">Funciones</translation>
     </message>
     <message>
-        <location line="-115"/>
         <source>&amp;Edit</source>
-        <translation type="unfinished">&amp;Editar</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Func&amp;tions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>&amp;Gain</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&amp;Editar</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>200%</source>
-        <translation type="unfinished">5 1/3&apos; {200%?}</translation>
+        <translation type="obsolete">5 1/3&apos; {200%?}</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>150%</source>
-        <translation type="unfinished">5 1/3&apos; {150%?}</translation>
+        <translation type="obsolete">5 1/3&apos; {150%?}</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>75%</source>
-        <translation type="unfinished">5 1/3&apos; {75%?}</translation>
+        <translation type="obsolete">5 1/3&apos; {75%?}</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>50%</source>
-        <translation type="unfinished">5 1/3&apos; {50%?}</translation>
+        <translation type="obsolete">5 1/3&apos; {50%?}</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>25%</source>
-        <translation type="unfinished">5 1/3&apos; {25%?}</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">5 1/3&apos; {25%?}</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>&amp;Copy</source>
-        <translation type="unfinished">&amp;Copiar</translation>
+        <translation type="obsolete">&amp;Copiar</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>C&amp;ut</source>
-        <translation type="unfinished">C&amp;ortar</translation>
+        <translation type="obsolete">C&amp;ortar</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Paste</source>
-        <translation type="unfinished">&amp;Pegar</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Edit in E&amp;xternal Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Mute Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Normalize Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Fade In Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Fade Out Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Reverse Selection</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&amp;Pegar</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Select</source>
-        <translation type="unfinished">Seleccionar</translation>
+        <translation type="obsolete">Seleccionar</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Select &amp;All</source>
-        <translation type="unfinished">Seleccion&amp;ar Todo</translation>
+        <translation type="obsolete">Seleccion&amp;ar Todo</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Deselect All</source>
-        <translation type="unfinished">&amp;Deseleccionar Todo</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Wave edit tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+9"/>
-        <source>transport</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>WaveEdit tools</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&amp;Deseleccionar Todo</translation>
     </message>
 </context>
 <context>
@@ -16360,321 +18530,1166 @@ Robert Jonsson
     </message>
 </context>
 <context>
-    <name>WaveView</name>
-    <message>
-        <location filename="../../muse/waveedit/waveview.cpp" line="+359"/>
-        <source>MusE - external editor failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>MusE was unable to launch the external editor
-check if the editor setting in:
-Global Settings-&gt;Audio:External Waveditor
-is set to a valid editor.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>MusE - file size changed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>When editing in external editor - you should not change the filesize
-since it must fit the selected region.
-
-Missing data is muted</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>freeverb</name>
     <message>
         <location filename="../plugins/1050.ui" line="+20"/>
         <source>FreeVerb</source>
-        <translation type="unfinished"></translation>
+        <translation>FreeVerb</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Room Size</source>
-        <translation type="unfinished">Tamaño sala</translation>
+        <translation>Room Size</translation>
     </message>
     <message>
         <location line="+88"/>
         <source>Damping</source>
-        <translation type="unfinished">Amortiguamiento</translation>
+        <translation>Damping</translation>
     </message>
     <message>
         <location line="+60"/>
         <source>Wet Level</source>
-        <translation type="unfinished"></translation>
+        <translation>Wet Level</translation>
     </message>
     <message>
         <location filename="../plugins/2142.ui" line="+26"/>
         <source>Tap-Reverberator</source>
-        <translation type="unfinished"></translation>
+        <translation>Tap-Reverb</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Decay [ms]</source>
-        <translation type="unfinished"></translation>
+        <translation>Decay [ms]</translation>
     </message>
     <message>
         <location line="+59"/>
         <location line="+41"/>
         <source>dB</source>
-        <translation type="unfinished">dB</translation>
+        <translation>dB</translation>
     </message>
     <message>
         <location line="-31"/>
         <source>Dry Level [dB]</source>
-        <translation type="unfinished"></translation>
+        <translation>Dry Level [dB]</translation>
     </message>
     <message>
         <location line="+41"/>
         <source>Wet Level [dB]</source>
-        <translation type="unfinished"></translation>
+        <translation>Wet Level [dB]</translation>
     </message>
     <message>
         <location line="+72"/>
         <source>Preset:</source>
-        <translation type="unfinished"></translation>
+        <translation>Preseteo:</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>AfterBurn</source>
-        <translation type="unfinished"></translation>
+        <translation>AfterBurn</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>AfterBurn (Long)</source>
-        <translation type="unfinished"></translation>
+        <translation>AfterBurn (Long)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Ambience</source>
-        <translation type="unfinished"></translation>
+        <translation>Ambience</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Ambience (Thick)</source>
-        <translation type="unfinished"></translation>
+        <translation>Ambience (Thick)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Ambience (Thick) - HD</source>
-        <translation type="unfinished"></translation>
+        <translation>Ambience (Thick) - HD</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Cathedral</source>
-        <translation type="unfinished"></translation>
+        <translation>Cathedral</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Cathedral - HD</source>
-        <translation type="unfinished"></translation>
+        <translation>Cathedral - HD</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Drum Chamber</source>
-        <translation type="unfinished"></translation>
+        <translation>Drum Chamber</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Garage</source>
-        <translation type="unfinished"></translation>
+        <translation>Garage</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Garage (Bright)</source>
-        <translation type="unfinished"></translation>
+        <translation>Garage (Bright)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Gymnasium</source>
-        <translation type="unfinished"></translation>
+        <translation>Gymnasium</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Gymnasium (Bright)</source>
-        <translation type="unfinished"></translation>
+        <translation>Gymnasium (Bright)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Gymnasium (Bright) - HD</source>
-        <translation type="unfinished"></translation>
+        <translation>Gymnasium (Bright) - HD</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Hall (Small)</source>
-        <translation type="unfinished"></translation>
+        <translation>Hall (Small)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Hall (Medium)</source>
-        <translation type="unfinished"></translation>
+        <translation>Hall (Medium)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Hall (Large)</source>
-        <translation type="unfinished"></translation>
+        <translation>Hall (Large)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Hall (Large) - HD</source>
-        <translation type="unfinished"></translation>
+        <translation>Hall (Large) - HD</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Plate (Small)</source>
-        <translation type="unfinished"></translation>
+        <translation>Plate (Small)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Plate (Medium)</source>
-        <translation type="unfinished"></translation>
+        <translation>Plate (Medium)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Plate (Large)</source>
-        <translation type="unfinished"></translation>
+        <translation>Plate (Large)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Plate (Large) - HD</source>
-        <translation type="unfinished"></translation>
+        <translation>Plate (Large) - HD</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Pulse Chamber</source>
-        <translation type="unfinished"></translation>
+        <translation>Pulse Chamber</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Pulse Chamber (Reverse)</source>
-        <translation type="unfinished"></translation>
+        <translation>Pulse Chamber (Reverse)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Resonator (96 ms)</source>
-        <translation type="unfinished"></translation>
+        <translation>Resonator (96 ms)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Resonator (152 ms)</source>
-        <translation type="unfinished"></translation>
+        <translation>Resonator (152 ms)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Resonator (208 ms)</source>
-        <translation type="unfinished"></translation>
+        <translation>Resonator (208 ms)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Room (Small)</source>
-        <translation type="unfinished"></translation>
+        <translation>Room (Small)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Room (Medium)</source>
-        <translation type="unfinished"></translation>
+        <translation>Room (Medium)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Room (Large)</source>
-        <translation type="unfinished"></translation>
+        <translation>Room (Large)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Room (Large) - HD</source>
-        <translation type="unfinished"></translation>
+        <translation>Room (Large) - HD</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Slap Chamber</source>
-        <translation type="unfinished"></translation>
+        <translation>Slap Chamber</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Slap Chamber - HD</source>
-        <translation type="unfinished"></translation>
+        <translation>Slap Chamber - HD</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Slap Chamber (Bright)</source>
-        <translation type="unfinished"></translation>
+        <translation>Slap Chamber (Bright)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Slap Chamber (Bright) HD</source>
-        <translation type="unfinished"></translation>
+        <translation>Slap Chamber (Bright) HD</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Smooth Hall (Small)</source>
-        <translation type="unfinished"></translation>
+        <translation>Smooth Hall (Small)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Smooth Hall (Medium)</source>
-        <translation type="unfinished"></translation>
+        <translation>Smooth Hall (Medium)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Smooth Hall (Large)</source>
-        <translation type="unfinished"></translation>
+        <translation>Smooth Hall (Large)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Smooth Hall (Large) - HD</source>
-        <translation type="unfinished"></translation>
+        <translation>Smooth Hall (Large) - HD</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Vocal Plate</source>
-        <translation type="unfinished"></translation>
+        <translation>Vocal Plate</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Vocal Plate - HD</source>
-        <translation type="unfinished"></translation>
+        <translation>Vocal Plate - HD</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Warble Chamber</source>
-        <translation type="unfinished"></translation>
+        <translation>Warble Chamber</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Warehoouse</source>
-        <translation type="unfinished"></translation>
+        <translation>Warehoouse</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Warehouse - HD</source>
-        <translation type="unfinished"></translation>
+        <translation>Warehouse - HD</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Comb Filters</source>
-        <translation type="unfinished"></translation>
+        <translation>Filtros combinados</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Allpass Filters</source>
-        <translation type="unfinished"></translation>
+        <translation>Sin filtros</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Bandpass Filters</source>
-        <translation type="unfinished"></translation>
+        <translation>flitros de banda</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Enhanced Stereo</source>
-        <translation type="unfinished"></translation>
+        <translation>Ampliar estéreo</translation>
+    </message>
+</context>
+<context>
+    <name>shortcuts</name>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="+54"/>
+        <source>Transport: Start playback from current location</source>
+        <translation>Transporte: Iniciar reproducción desde la ubicación actual</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Toggle metronome</source>
+        <translation>Transporte: Alternar metrónomo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Stop Playback</source>
+        <translation>Transporte : Detener reproducción</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Goto Start</source>
+        <translation>Transporte: Ir al comienzo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Play, Stop, Rewind</source>
+        <translation>Transporte: Iniciar, Detener, Rebobinar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Goto left marker</source>
+        <translation>Transporte: Ir a la marca izquierda</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Goto right marker</source>
+        <translation>Transporte: Ir a la marca derecha</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Toggle Loop section</source>
+        <translation>Transporte: Alternar selección del bucle</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Toggle Record</source>
+        <translation>Transporte Alternar grabación</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Clear all rec enabled tracks</source>
+        <translation>Transporte: deshabilitar el grabado en todas las pistas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Toggle fullscreen</source>
+        <translation>Pantalla completa</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit: Copy</source>
+        <translation>Editar:Copiar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Copy in range</source>
+        <translation>Editar: Copiar rango</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Undo</source>
+        <translation>Editar: Deshacer</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Redo</source>
+        <translation>Edit: Rehacer</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Cut</source>
+        <translation>Editar: Cortar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Paste</source>
+        <translation>Editar: Pegar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Paste (with dialog)</source>
+        <translation>Editar: Pegar (con diálogo)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Delete</source>
+        <translation>Editar: Borrar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>File: New project</source>
+        <translation>Archivo: Nueva sesión</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>File: Open from disk</source>
+        <translation>Archivo: Abrir desde disco</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>File: Save project</source>
+        <translation>Archivo: Guardar sesión</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>File: Open recent file</source>
+        <translation>Archivo: Sesiones recientes</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>File: Save as</source>
+        <translation>Archivo: Guardar como</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>File: Load template</source>
+        <translation>Archivo: Abrir plantilla</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>File: Import midi file</source>
+        <translation>Archivo: Importar archivo MIDI</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>File: Export midi file</source>
+        <translation>Archivo: Exportar archivo MIDI</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>File: Import midi part</source>
+        <translation>Archivo: Importar región MIDI</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>File: Import audio file</source>
+        <translation>Archivo: Importar archivo de audio</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>File: Quit MusE</source>
+        <translation>Archivo: Cerrar MusE</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit: Select parts on track</source>
+        <translation>Editar: Seleccionar regiones de la pista</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Open pianoroll</source>
+        <translation>Abrir editor de matríz</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Open drumeditor</source>
+        <translation>Editar: Editor de percusión</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Open listeditor</source>
+        <translation>Abrir editor de lista</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Open waveeditor</source>
+        <translation>Abrir editor de audio</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Open graphical mastertrack editor</source>
+        <translation>Vista de pista maestra</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Open list mastertrack editor</source>
+        <translation>Lista de pista maestra</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Open midi transformer</source>
+        <translation>Abrir transformador MIDI</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add midi track</source>
+        <translation>Agregar pista MIDI</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add drum track</source>
+        <translation>Agregar pista de percusión</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add wave track</source>
+        <translation>Agregar pista de audio</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add audio output</source>
+        <translation>Agregar salida de audio</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add audio group</source>
+        <translation>Agregar grupo de audio</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add audio input</source>
+        <translation>Agregar entrada de audio</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add audio aux</source>
+        <translation>Agregar envio auxiliar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Structure: Global cut</source>
+        <translation>Estructura: Corte Globál</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Structure: Global insert</source>
+        <translation>Estructura: Inserción global</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Structure: Global split</source>
+        <translation>Estructura: División globál</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Structure: Cut events</source>
+        <translation>Estructura: Cortar eventos</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>View: Open mixer #1 window</source>
+        <translation>Ver: Abrir mezclador #1</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>View: Open mixer #2 window</source>
+        <translation>Ver: Abrir mezclador #2</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>View: Toggle transport window</source>
+        <translation>Ver: Ventana alternativa del transporte</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>View: Toggle bigtime window</source>
+        <translation>Ver: Ventana de reloj</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>View: Open marker window</source>
+        <translation>Ver: Abrir ventana de marcadores</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Settings: Follow song by page</source>
+        <translation>Ajustes: Seguir página</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Follow song off</source>
+        <translation>Ajustes: No seguir canción</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Follow song continuous</source>
+        <translation>Ajustes: Seguir canción indefinidamente</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Settings: Global configuration</source>
+        <translation>Configuraciones: Configuración global</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Configure shortcuts</source>
+        <translation>Configuraciones: Atajos de teclado</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Configure metronome</source>
+        <translation>Configuraciones: Metrónomo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Midi sync configuration</source>
+        <translation>Configuraciones: Sincronía MIDI</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Midi file import/export configuration</source>
+        <translation>Configuraciones: Configuracion de exportar/importar MIDI</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Appearance settings</source>
+        <translation>Configuraciones: Apariencia</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Midi ports / Soft Synth</source>
+        <translation>Configuraciones: Puertos MIDI/Sintetizadores virtuales</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Audio subsystem configuration</source>
+        <translation>Configuraciones: Configurar sub sistema de audio</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Midi: Edit midi instruments</source>
+        <translation>MIDI: Editar instrumentos</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi: Open midi input transform</source>
+        <translation>MIDI: Abrir el transformador de entrada MIDI</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi: Open midi input filter</source>
+        <translation>MIDI: Abrir el filtro de entrada MIDI</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi: Midi input transpose</source>
+        <translation>MIDI: Filtro de transporte de entrada</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi: Midi remote control</source>
+        <translation>MIDI: Control remoto MIDI</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Midi: Random rhythm generator</source>
+        <translation>MIDI: Generador de ritmo aleatorio</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Midi: Reset midi</source>
+        <translation>MIDI: Resetear MIDI</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi: Init midi</source>
+        <translation>MIDI: Inicializar MIDI</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi: Midi local off</source>
+        <translation>MIDI: MIDI local apagado</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Audio: Bounce audio to track</source>
+        <translation>Audio: Rebotar audio a pista</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Audio: Bounce audio to file</source>
+        <translation>Audio: Rebotar audio a archivo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Audio: Restart audio</source>
+        <translation>Audio: Reiniciar audio</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Automation: Mixer automation</source>
+        <translation>Automatización: Mezcladora de automatización</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Automation: Take mixer snapshot</source>
+        <translation>Automatización: Tomar instantánea del mezclador</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Automation: Clear mixer automation</source>
+        <translation>Automatización: Limpiar la mezcladora de automatización</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Help: Open Manual</source>
+        <translation>Ayuda: Abrir manual</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Help: Toggle whatsthis mode</source>
+        <translation>Ayuda: Cambiar el modo ¿qué es esto?</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit: Edit selected part</source>
+        <translation>Editar: Seleccionar región</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select nearest part on track above</source>
+        <translation>Editar: Seleccione la región más cercana por encima de la pista</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Add nearest part on track above</source>
+        <translation>Editar: Agregar la región más cercana por encima de la pista</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select nearest part on track below</source>
+        <translation>Editar: Seleccione la región más cercana por debajo de la pista</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Add nearest part on track below</source>
+        <translation>Editar: Agregar la región más cercana por debajo de la pista</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit: Insert empty measure</source>
+        <translation>Editar: Insertar compás vacío</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit: Paste as clones</source>
+        <translation>Editar: Pegar como clon</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Paste as clones (with dialog)</source>
+        <translation>Editar: Pegar como clon (con diálogo)</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select track above</source>
+        <translation>Seleccionar la pista anterior</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Select track below</source>
+        <translation>Seleccionar la pista siguiente</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Midi: Transpose</source>
+        <translation>MIDI: Transportar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit: Select all</source>
+        <translation>Editar: Seleccionar todo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select none</source>
+        <translation>Editar: Deseleccionar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Invert Selection</source>
+        <translation>Editar: Invertir selección</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select events/parts inside locators</source>
+        <translation>Editar: seleccionar eventos/regiones dentro de los marcadores</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select events/parts outside locators</source>
+        <translation>Editar: seleccionar eventos/regiones fuera de los marcadores</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select previous part</source>
+        <translation>Edición: Seleccionar región anterior</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select next part</source>
+        <translation>Editar: Seleccionar región siguiente</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select nearest part/event to the left or move cursor</source>
+        <translation>Editar: Seleccione región /evento mas cercano a la izquierda o mover el cursor</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Add nearest part/event to the left to selection</source>
+        <translation>Edit: Añadir región/evento mas cercano a la izquierda a la selección</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select nearest part/event to the right or move cursor</source>
+        <translation>Editar: seleccione la región/evento mas cercano la derecha o mover el cursor</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Add nearest part/event to the right to selection</source>
+        <translation>Edit: Añadir la región/evento a la derecha a la selección</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Set locators to selection</source>
+        <translation>Editar: Conjunto localizadores a la selección</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Increase pitch</source>
+        <translation>Editar: Subir afinación</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Decrease pitch</source>
+        <translation>Editar: Bajar afinación</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Increase event position</source>
+        <translation>Editar: Aumenta la posición del evento</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Decrease event position</source>
+        <translation>Editar: Disminuye la posición del evento</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>View: Zoom in</source>
+        <translation>Ver: Acercar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>View: Zoom out</source>
+        <translation>Ver: Alejar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>View: Goto Current Position</source>
+        <translation>Ver: Ir a la posición actual</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+1"/>
+        <source>View: Scroll left</source>
+        <translation>Ver: Mover a la izquierda</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Edit: Set Fixed Length on Midi Events</source>
+        <translation>Editar Igualar la duración de las notas MIDI</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Quantize</source>
+        <translation>Cuantizar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Modify Note Length</source>
+        <translation>Modificar duraciòn</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Modify Velocity</source>
+        <translation>Modificar la velocidad</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Crescendo</source>
+        <translation>Editar: Crescendo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Thin Out</source>
+        <translation>Editar: Truncar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Erase Event</source>
+        <translation>Editar: Borrar evento</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Delete Overlaps</source>
+        <translation>Editar: Borrar notas duplicadas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Note Shift</source>
+        <translation>Editar: Alterar nota</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Move Clock</source>
+        <translation>Editar: Mover reloj</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Copy Measure</source>
+        <translation>Editar: Copiar compás</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Erase Measure</source>
+        <translation>Editar: Vaciar compás</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Delete Measure</source>
+        <translation>Editar: Borrar compás</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Create Measure</source>
+        <translation>Editar: Crear compás</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Change Event Color</source>
+        <translation>Editar: Cambiar el color de evento</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool: Pointer</source>
+        <translation>Herramientas: Apuntador</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tool: Pencil</source>
+        <translation>Herramientas: Lápiz</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tool: Eraser</source>
+        <translation>Herramientas: Borrador</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Tool: Line Draw</source>
+        <translation>Herramientas: Linea de dibujo</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Tool: Cursor</source>
+        <translation>Herramientas: Cursor</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add note velocity 1</source>
+        <translation>Añadir velocidad de la nota 1</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add note velocity 2</source>
+        <translation>Añadir velocidad de la nota 2</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add note velocity 3</source>
+        <translation>Añadir velocidad de la nota 3</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add note velocity 4</source>
+        <translation>Añadir velocidad de la nota 4</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cursor step size: larger</source>
+        <translation>Aumentar el paso de cursor</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cursor step size: smaller</source>
+        <translation>Reducir el paso del cursor</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Instrument/Cursor up</source>
+        <translation>Instrumento, Incrementar valor</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Instrument/Cursor down</source>
+        <translation>Instrumento, Disminuir valor</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Tool: Scissor</source>
+        <translation>Herramientas: Tijeta</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tool: Glue</source>
+        <translation>Herramienta: Unir</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tool: Mute</source>
+        <translation>Herramienta: Silenciar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Transport: Increase current position</source>
+        <translation>Transporte: Incrementar la posición actual</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Decrease current position</source>
+        <translation>Transporte: retroceder de la posición actual</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Transport: Increase current position, no snap</source>
+        <translation>Transporte: Adelantar de la posición actual, no snap</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Decrease current position, no snap</source>
+        <translation>Transporte: retroceder de la posición actual, no snap</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Quantize: Set quantize to 1/1 note</source>
+        <translation>Cuantizar: Ajustar cuantizado a 1/1 note</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantize: Set quantize to 1/2 note</source>
+        <translation>Cuantizar: Ajustar cuantizado a 1/2 note</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantize: Set quantize to 1/4 note</source>
+        <translation>Cuantizar: Ajustar cuantizado a 1/4 note</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantize: Set quantize to 1/8 note</source>
+        <translation>Cuantizar: Ajustar cuantizado a 1/8 note</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantize: Set quantize to 1/16 note</source>
+        <translation>Cuantizar: Ajustar cuantizado a 1/16 note</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantize: Set quantize to 1/32 note</source>
+        <translation>Cuantizar: Ajustar cuantizado a 1/32 note</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantize: Set quantize to 1/64 note</source>
+        <translation>Cuantizar: Ajustar cuantizado a 1/64 note</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Quantize: Toggle triol quantization</source>
+        <translation>Cuantizado: Ajuste de cauntización triol.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantize: Toggle punctuation quantization</source>
+        <translation>Cuantización: Cambiar-puntuación-del cuantizado</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantize: Toggle punctuation quantization (2)</source>
+        <translation>Cuantización: Cambiar-puntuación-del cuantizado (2)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Insert at location</source>
+        <translation>Editar: Insertar en la posición</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit: Increase length</source>
+        <translation>Editar: Incrementar duración</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Decrease length</source>
+        <translation>Editar: Acortar duración</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Insert Note</source>
+        <translation>Insertar nota</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert SysEx</source>
+        <translation>Insertar sistema exclusivo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert Ctrl</source>
+        <translation>Insertar controlador</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert Meta</source>
+        <translation>Insertar Meta</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert Channel Aftertouch</source>
+        <translation>Insertar AfterTouch de canal</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert Key Aftertouch</source>
+        <translation>Insertar AfterTouch de tecla</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Insert Tempo</source>
+        <translation>Insertar tempo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert Signature</source>
+        <translation>Insertar armadura de clave</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Change Event Position</source>
+        <translation>Cambiar posición de evento</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit Event Value</source>
+        <translation>Editar valor del evento</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert Key</source>
+        <translation>Insertar clave</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Goto Next Marker</source>
+        <translation>Ir a la siguiente marca</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Goto Prev Marker</source>
+        <translation>Ir a la marca anterior</translation>
     </message>
 </context>
 </TS>
diff --git a/muse2/share/locale/muse_fr.ts b/muse2/share/locale/muse_fr.ts
index 041f5d4d..eb19761e 100644
--- a/muse2/share/locale/muse_fr.ts
+++ b/muse2/share/locale/muse_fr.ts
@@ -4,9 +4,8 @@
 <context>
     <name>@default</name>
     <message>
-        <location filename="../../muse/transport.cpp" line="+46"/>
         <source>Click this button to enable recording</source>
-        <translation>Cliquez sur ce bouton pour activer
+        <translation type="obsolete">Cliquez sur ce bouton pour activer
 l&apos;enregistrement</translation>
     </message>
     <message>
@@ -18,13 +17,12 @@ l&apos;enregistrement</translation>
 100 - quantisation complète</translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/tools.cpp" line="+33"/>
         <source>select Pointer Tool:
 with the pointer tool you can:
   select parts
   move parts
   copy parts</source>
-        <translation>Choisir l&apos;Outil de Pointage:
+        <translation type="obsolete">Choisir l&apos;Outil de Pointage:
 avec l&apos;outil de pointage vous pouvez:
   choisir des pièces
   déplacer des pièces
@@ -47,38 +45,32 @@ You can also select the Save command from the File menu.</source>
 Vous pouvez aussi choisir la commande Enregistrer dans le menu Fichier.	</translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="+95"/>
         <source>Create New Song</source>
-        <translation>Créer une nouvelle chanson</translation>
+        <translation type="obsolete">Créer une nouvelle chanson</translation>
     </message>
     <message>
-        <location filename="../../muse/transport.cpp" line="+1"/>
         <source>Click this button to stop playback</source>
-        <translation>Cliquez sur ce bouton pour arréter la
+        <translation type="obsolete">Cliquez sur ce bouton pour arréter la
 lecture</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Click this button to start playback</source>
-        <translation>Cliquez sur ce bouton pour démarrer la
+        <translation type="obsolete">Cliquez sur ce bouton pour démarrer la
 lecture</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Click this button to rewind to start position</source>
-        <translation>Cliquez sur ce bouton pour revenir � la position de
+        <translation type="obsolete">Cliquez sur ce bouton pour revenir � la position de
 départ</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Click this button to rewind</source>
-        <translation>Cliquez sur ce bouton pour revenir en
+        <translation type="obsolete">Cliquez sur ce bouton pour revenir en
 arrière</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Click this button to forward current play position</source>
-        <translation>Cliquez sur ce bouton pour avancer dans la
+        <translation type="obsolete">Cliquez sur ce bouton pour avancer dans la
 lecture</translation>
     </message>
     <message>
@@ -92,191 +84,137 @@ tick)</translation>
 défault</translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="+2"/>
         <source>loop between left mark and right mark</source>
-        <translation>Boucler entre les marqueurs gauche et droit</translation>
+        <translation type="obsolete">Boucler entre les marqueurs gauche et droit</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>record starts at left mark</source>
-        <translation>l&apos;enregistrement démarre au marqueur
+        <translation type="obsolete">l&apos;enregistrement démarre au marqueur
 gauche</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>record stops at right mark</source>
-        <translation>l&apos;enregistrement s&apos;arrète au marqueur
+        <translation type="obsolete">l&apos;enregistrement s&apos;arrète au marqueur
 droit</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>rewind to start position</source>
-        <translation>revenir � la position de départ</translation>
+        <translation type="obsolete">revenir � la position de départ</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>rewind current position</source>
-        <translation>revenir � la position en cours</translation>
+        <translation type="obsolete">revenir � la position en cours</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>move current position</source>
-        <translation>déplacer la position en cours</translation>
+        <translation type="obsolete">déplacer la position en cours</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>stop sequencer</source>
-        <translation>arréter le séquenceur</translation>
+        <translation type="obsolete">arréter le séquenceur</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>start sequencer play</source>
-        <translation>démarrer la lecture du séquenceur</translation>
+        <translation type="obsolete">démarrer la lecture du séquenceur</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>to record press record and then play</source>
-        <translation>pour enregistrer, presser Enregistrement (Record) puis
+        <translation type="obsolete">pour enregistrer, presser Enregistrement (Record) puis
 Lecture (Play)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>send note off to all midi channels</source>
-        <translation>envoyer ordre de relachement de note � tous les canaux
+        <translation type="obsolete">envoyer ordre de relachement de note � tous les canaux
 midi</translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/tools.cpp" line="+5"/>
         <source>select Pencil Tool:
 with the pencil tool you can:
   create new parts
   modify length of parts</source>
-        <translation>Choisir l&apos;Outil Crayon
+        <translation type="obsolete">Choisir l&apos;Outil Crayon
 avec le crayon vous pouvez:
   créer de nouvelles pièces
   modifier la longueur des pièces</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>select Delete Tool:
 with the delete tool you can delete parts</source>
-        <translation>choisir l&apos;Outil Gomme:
+        <translation type="obsolete">choisir l&apos;Outil Gomme:
 avec la gomme vous pouvez effacer les pièces</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>select Cut Tool:
 with the cut tool you can split a part</source>
-        <translation>Choisir l&apos;Outil Ciseaux
+        <translation type="obsolete">Choisir l&apos;Outil Ciseaux
 avec les ciseaux vous pouver couper une pièce</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>select Glue Tool:
 with the glue tool you can glue two parts</source>
-        <translation>Choisir l&apos;Outil Colle:
+        <translation type="obsolete">Choisir l&apos;Outil Colle:
 avec la colle vous pouvez coller deux pièces ensemble</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>select Score Tool:
 </source>
-        <translation>Choisir l&apos;Outil Partition</translation>
+        <translation type="obsolete">Choisir l&apos;Outil Partition</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>select Quantize Tool:
 insert display quantize event</source>
-        <translation>Choisir l&apos;Outil Quantisation:
+        <translation type="obsolete">Choisir l&apos;Outil Quantisation:
 pour voir les marques de quantisation</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>select Drawing Tool</source>
-        <translation>Choisir l&apos;Outil de Dessin</translation>
+        <translation type="obsolete">Choisir l&apos;Outil de Dessin</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>select Muting Tool:
 click on part to mute/unmute</source>
-        <translation>Choisir l&apos;Outil Silence:
+        <translation type="obsolete">Choisir l&apos;Outil Silence:
 cliquez sur une pièces pour la rendre muette ou pas.</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Manipulate automation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Cursor tool</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>pointer</source>
-        <translation>pointeur</translation>
+        <translation type="obsolete">pointeur</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>pencil</source>
-        <translation>crayon</translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>edit automation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>cursor</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">crayon</translation>
     </message>
     <message>
         <source>rubber</source>
         <translation type="obsolete">gomme</translation>
     </message>
     <message>
-        <location line="-7"/>
         <source>cutter</source>
-        <translation>ciseaux</translation>
+        <translation type="obsolete">ciseaux</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>score</source>
-        <translation>partition</translation>
+        <translation type="obsolete">partition</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>glue</source>
-        <translation>colle</translation>
+        <translation type="obsolete">colle</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>quantize</source>
-        <translation>quantisation</translation>
+        <translation type="obsolete">quantisation</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>draw</source>
-        <translation>dessin</translation>
+        <translation type="obsolete">dessin</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>mute parts</source>
-        <translation>silence</translation>
+        <translation type="obsolete">silence</translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="+155"/>
-        <location filename="../../muse/master/masteredit.cpp" line="+155"/>
-        <location filename="../../muse/widgets/comboQuant.cpp" line="+40"/>
-        <location line="+1"/>
-        <location line="+1"/>
-        <location filename="../../muse/widgets/tb1.cpp" line="+48"/>
-        <location line="+1"/>
-        <location line="+1"/>
         <source>Off</source>
-        <translation>Arrêt</translation>
+        <translation type="obsolete">Arrêt</translation>
     </message>
     <message>
         <source>presets (*.pre *.pre.gz *.pre.bz2)</source>
@@ -288,242 +226,91 @@ cliquez sur une pièces pour la rendre muette ou pas.</translation>
         <translation type="obsolete">Tous les Fichiers (*)</translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="-17"/>
-        <source>Click this button to open a &lt;em&gt;new song&lt;/em&gt;.&lt;br&gt;You can also select the &lt;b&gt;Open command&lt;/b&gt; from the File menu.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Click this button to save the song you are editing.  You will be prompted for a file name.
-You can also select the Save command from the File menu.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/helper.cpp" line="+242"/>
-        <source>MESS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>DSSI</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+9"/>
-        <source>FST</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
+        <location filename="../../muse/helper.cpp" line="+185"/>
         <source>Add Midi Track</source>
         <translation type="unfinished">Ajouter une Piste Midi</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>Add Drum Track</source>
         <translation type="unfinished">Ajouter une Piste de Batterie</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>Add Wave Track</source>
         <translation type="unfinished">Ajouter une Piste Audio</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+7"/>
         <source>Add Audio Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+7"/>
         <source>Add Audio Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+7"/>
         <source>Add Audio Input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+7"/>
         <source>Add Aux Send</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+9"/>
         <source>Add Synth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="+0"/>
         <source>Bar</source>
-        <translation type="unfinished">Mesure</translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="+729"/>
-        <source> Jack</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+46"/>
-        <source>ALSA:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
-        <source>SYNTH:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
-        <source>JACK:</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Mesure</translation>
     </message>
     <message>
-        <location filename="../../muse/driver/alsamidi.cpp" line="+209"/>
-        <location filename="../../muse/driver/jackmidi.cpp" line="+290"/>
-        <location filename="../../muse/midiport.cpp" line="+1138"/>
-        <location filename="../../muse/track.cpp" line="+799"/>
-        <location line="+16"/>
-        <location line="+30"/>
+        <location filename="../../muse/midiport.cpp" line="+1190"/>
         <source>Route</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location filename="../../muse/driver/jackmidi.cpp" line="+2"/>
-        <location filename="../../muse/track.cpp" line="-28"/>
-        <location line="+37"/>
-        <source> channel=&quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <location filename="../../muse/driver/jackmidi.cpp" line="+3"/>
-        <location filename="../../muse/midiport.cpp" line="+7"/>
-        <location filename="../../muse/track.cpp" line="-48"/>
-        <location line="+60"/>
+        <location line="+7"/>
         <source>dest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location filename="../../muse/driver/jackmidi.cpp" line="+2"/>
-        <source> devtype=&quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <location filename="../../muse/driver/jackmidi.cpp" line="-20"/>
-        <location line="+23"/>
-        <location filename="../../muse/track.cpp" line="-42"/>
-        <location line="+48"/>
-        <source> type=&quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location line="+1"/>
-        <location filename="../../muse/driver/jackmidi.cpp" line="-22"/>
-        <location line="+23"/>
-        <location filename="../../muse/midiport.cpp" line="+1"/>
-        <location filename="../../muse/track.cpp" line="-65"/>
-        <location line="+18"/>
-        <location line="+53"/>
         <source> name=&quot;%1&quot;/</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/driver/jackmidi.cpp" line="-26"/>
-        <location filename="../../muse/track.cpp" line="-56"/>
-        <source>source</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midictrl.cpp" line="+242"/>
         <source>Velocity</source>
-        <translation type="unfinished">Vélocité</translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiport.cpp" line="-807"/>
-        <source>&lt;none&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+801"/>
-        <location filename="../../muse/track.cpp" line="-21"/>
-        <location line="+48"/>
-        <source> channelMask=&quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/osc.cpp" line="+1320"/>
-        <source>dssi_synth</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+87"/>
-        <source>ladspa_efx</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/track.cpp" line="+8"/>
-        <source> channels=&quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source> remch=&quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+17"/>
-        <source> mport=&quot;%1&quot;/</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/widgets/tools.cpp" line="-6"/>
-        <source>eraser</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/widgets/visibletracks.cpp" line="+35"/>
-        <location line="+9"/>
-        <source>Show wave tracks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-8"/>
-        <location line="+9"/>
-        <source>Show group tracks</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Vélocité</translation>
     </message>
     <message>
-        <location line="-8"/>
-        <location line="+9"/>
-        <source>Show aux tracks</source>
+        <location line="-857"/>
+        <source>Warning: No output devices!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-8"/>
-        <location line="+9"/>
-        <source>Show input tracks</source>
+        <location line="+5"/>
+        <source>Open midi config...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-8"/>
-        <location line="+9"/>
-        <source>Show output tracks</source>
+        <location line="+23"/>
+        <source>Empty ports</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-8"/>
-        <location line="+9"/>
-        <source>Show midi tracks</source>
+        <location line="+22"/>
+        <source>&lt;none&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-8"/>
-        <location line="+9"/>
-        <source>Show synth tracks</source>
+        <location line="+801"/>
+        <source> channelMask=&quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -562,9 +349,8 @@ Published under the GNU Public License</source>
 <context>
     <name>Appearance</name>
     <message>
-        <location filename="../../muse/appearance.cpp" line="+769"/>
         <source>MusE: load image</source>
-        <translation>MusE: charger une image</translation>
+        <translation type="obsolete">MusE: charger une image</translation>
     </message>
     <message>
         <source>handle of transport window</source>
@@ -587,76 +373,6 @@ Published under the GNU Public License</source>
         <translation type="obsolete">Couleur du fond de l&apos;éditeur
 d&apos;échantillon</translation>
     </message>
-    <message>
-        <location line="-639"/>
-        <source>Main application font, and default font for any
- controls not defined here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>For small controls like mixer strips.
-Also timescale small numbers, arranger part name overlay,
- and effects rack.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Midi track info panel. Transport controls.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Controller graph and S/X buttons. Large numbers for time
- and tempo scale, and time signature.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Time scale markers.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>List editor: meta event edit dialog multi-line edit box.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Mixer label font. Auto-font-sizing up to chosen font size.
-Word-breaking but only with spaces.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Maximum mixer label auto-font-sizing font size.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Global opacity (opposite of transparency).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Standard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Custom</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+958"/>
-        <source>Select style sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Qt style sheets (*.qss)</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>AppearanceDialogBase</name>
@@ -1515,29 +1231,12 @@ dans l&apos;Arrangeur</translation>
 <context>
     <name>ClipListEdit</name>
     <message>
-        <location filename="../../muse/cliplist/cliplist.cpp" line="+127"/>
         <source>MusE: Clip List Editor</source>
-        <translation>MusE: Editeur de la Liste de Clips</translation>
+        <translation type="obsolete">MusE: Editeur de la Liste de Clips</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Undo/Redo tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
         <source>panic</source>
-        <translation type="unfinished">panique!</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>transport</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">panique!</translation>
     </message>
 </context>
 <context>
@@ -1609,17 +1308,17 @@ dans l&apos;Arrangeur</translation>
 <context>
     <name>ConfigMidiFileBase</name>
     <message>
-        <location filename="../../muse/widgets/configmidifilebase.ui" line="+17"/>
+        <location filename="../../muse/widgets/configmidifilebase.ui" line="+14"/>
         <source>MusE: Config Midi File Import/Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+15"/>
         <source>Import:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+9"/>
         <source>Split tracks into &amp;parts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1629,12 +1328,12 @@ dans l&apos;Arrangeur</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-6"/>
         <source>Split tracks into parts, or one single part</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+22"/>
         <source>Export:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1679,6 +1378,11 @@ dans l&apos;Arrangeur</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+16"/>
+        <source>Note: Format 0 uses the FIRST midi track&apos;s name/comment in the arranger</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+10"/>
         <source>Division:</source>
         <translation type="unfinished"></translation>
@@ -1781,14 +1485,12 @@ dans l&apos;Arrangeur</translation>
 <context>
     <name>CtrlPanel</name>
     <message>
-        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="+94"/>
         <source>select controller</source>
-        <translation>Choisissez le contrôle</translation>
+        <translation type="obsolete">Choisissez le contrôle</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>remove panel</source>
-        <translation>enlever le panneau</translation>
+        <translation type="obsolete">enlever le panneau</translation>
     </message>
     <message>
         <source>other ...</source>
@@ -1803,77 +1505,22 @@ dans l&apos;Arrangeur</translation>
         <translation type="obsolete">x</translation>
     </message>
     <message>
-        <location line="+463"/>
-        <location line="+236"/>
         <source>Velocity</source>
-        <translation>Vélocité</translation>
+        <translation type="obsolete">Vélocité</translation>
     </message>
     <message>
         <source>Pitch</source>
         <translation type="obsolete">Hauteur</translation>
     </message>
     <message>
-        <location line="-714"/>
         <source>S</source>
-        <translation type="unfinished">S</translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>X</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>manual adjust</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+9"/>
-        <source>double click on/off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+490"/>
-        <source>add new ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+163"/>
-        <location line="+58"/>
-        <source>Instrument-defined</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-43"/>
-        <location line="+21"/>
-        <source>Add ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-17"/>
-        <source>Others</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+65"/>
-        <source>Edit instrument ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+46"/>
-        <source>Common Controls</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">S</translation>
     </message>
 </context>
 <context>
     <name>DeicsOnzeGui</name>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="+538"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="+540"/>
         <source>Save configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3632,402 +3279,191 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
 <context>
     <name>DrumEdit</name>
     <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="+183"/>
         <source>Load Map</source>
-        <translation>Charger set de batterie</translation>
+        <translation type="obsolete">Charger set de batterie</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Save Map</source>
-        <translation>Enregistrer set de batterie</translation>
+        <translation type="obsolete">Enregistrer set de batterie</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>&amp;Edit</source>
-        <translation>&amp;Editer</translation>
+        <translation type="obsolete">&amp;Editer</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Cut</source>
-        <translation>Couper</translation>
+        <translation type="obsolete">Couper</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Copy</source>
-        <translation>Copier</translation>
+        <translation type="obsolete">Copier</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Paste</source>
-        <translation>Coller</translation>
+        <translation type="obsolete">Coller</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Delete Events</source>
-        <translation>Effacer</translation>
+        <translation type="obsolete">Effacer</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Select All</source>
-        <translation>Tout sélectionner</translation>
+        <translation type="obsolete">Tout sélectionner</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Select None</source>
-        <translation>Dé-sélectionner</translation>
+        <translation type="obsolete">Dé-sélectionner</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Invert</source>
-        <translation>Inverser</translation>
+        <translation type="obsolete">Inverser</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Inside Loop</source>
-        <translation>Dans la boucle</translation>
+        <translation type="obsolete">Dans la boucle</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Outside Loop</source>
-        <translation>Hors de la boucle</translation>
+        <translation type="obsolete">Hors de la boucle</translation>
     </message>
     <message>
-        <location line="-7"/>
         <source>&amp;Select</source>
-        <translation>&amp;Sélectionner</translation>
+        <translation type="obsolete">&amp;Sélectionner</translation>
     </message>
     <message>
-        <location line="-20"/>
-        <source>Copy events in range</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Paste (with Dialog)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+49"/>
-        <source>Fu&amp;nctions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+35"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+33"/>
         <source>Step Record</source>
-        <translation>Enregistrement pas-�-pas</translation>
+        <translation type="obsolete">Enregistrement pas-�-pas</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Midi Input</source>
-        <translation>Entrée Midi</translation>
+        <translation type="obsolete">Entrée Midi</translation>
     </message>
     <message>
-        <location line="+57"/>
         <source>Add Controller View</source>
-        <translation>Ajouter une Vue des contrôles</translation>
+        <translation type="obsolete">Ajouter une Vue des contrôles</translation>
     </message>
     <message>
-        <location line="+57"/>
         <source>M</source>
-        <translation>M</translation>
+        <translation type="obsolete">M</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Sound</source>
-        <translation>Son</translation>
+        <translation type="obsolete">Son</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>QNT</source>
-        <translation>QNT</translation>
+        <translation type="obsolete">QNT</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>E-Note</source>
-        <translation>E-Note</translation>
+        <translation type="obsolete">E-Note</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Len</source>
-        <translation>Long</translation>
+        <translation type="obsolete">Long</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A-Note</source>
-        <translation>A-Note</translation>
+        <translation type="obsolete">A-Note</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Ch</source>
-        <translation>Ch</translation>
+        <translation type="obsolete">Ch</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Port</source>
-        <translation>Port</translation>
+        <translation type="obsolete">Port</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>LV1</source>
-        <translation>LV1</translation>
+        <translation type="obsolete">LV1</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>LV2</source>
-        <translation>LV2</translation>
+        <translation type="obsolete">LV2</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>LV3</source>
-        <translation>LV3</translation>
+        <translation type="obsolete">LV3</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>LV4</source>
-        <translation>LV4</translation>
+        <translation type="obsolete">LV4</translation>
     </message>
     <message>
-        <location line="-271"/>
         <source>&amp;File</source>
-        <translation>&amp;Fichier</translation>
+        <translation type="obsolete">&amp;Fichier</translation>
     </message>
     <message>
-        <location line="+121"/>
         <source>Load Drummap</source>
-        <translation>Charger Set de Batterie</translation>
+        <translation type="obsolete">Charger Set de Batterie</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Store Drummap</source>
-        <translation>Enregistrer Set de Batterie</translation>
+        <translation type="obsolete">Enregistrer Set de Batterie</translation>
     </message>
     <message>
-        <location line="+68"/>
         <source>ctrl</source>
-        <translation>ctrl</translation>
+        <translation type="obsolete">ctrl</translation>
     </message>
     <message>
         <source>drummaps</source>
         <translation type="obsolete">Sets de Batterie</translation>
     </message>
     <message>
-        <location line="+449"/>
         <source>Muse: Load Drum Map</source>
-        <translation>MusE: Charger Set de Batterie</translation>
+        <translation type="obsolete">MusE: Charger Set de Batterie</translation>
     </message>
     <message>
-        <location line="+53"/>
         <source>MusE: Store Drum Map</source>
-        <translation>MusE: Enregistrer Set de Batterie</translation>
+        <translation type="obsolete">MusE: Enregistrer Set de Batterie</translation>
     </message>
     <message>
-        <location line="-767"/>
-        <location line="+21"/>
         <source>mute instrument</source>
-        <translation type="unfinished">Rendre muet l&apos;instrument</translation>
+        <translation type="obsolete">Rendre muet l&apos;instrument</translation>
     </message>
     <message>
-        <location line="-20"/>
-        <location line="+21"/>
         <source>sound name</source>
-        <translation type="unfinished">Nom du son</translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <location line="+21"/>
-        <source>volume percent</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Nom du son</translation>
     </message>
     <message>
-        <location line="-20"/>
-        <location line="+21"/>
         <source>quantisation</source>
-        <translation type="unfinished">quantisation</translation>
+        <translation type="obsolete">quantisation</translation>
     </message>
     <message>
-        <location line="-20"/>
-        <location line="+21"/>
         <source>this input note triggers the sound</source>
-        <translation type="unfinished">cette note en entrée déclenche le son</translation>
+        <translation type="obsolete">cette note en entrée déclenche le son</translation>
     </message>
     <message>
-        <location line="-20"/>
-        <location line="+21"/>
         <source>note length</source>
-        <translation type="unfinished">longueur de note</translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <location line="+21"/>
-        <source>this is the note which is played</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <source>output channel (hold ctl to affect all rows)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <location line="+21"/>
-        <source>output port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <location line="+21"/>
-        <source>shift + control key: draw velocity level 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <location line="+21"/>
-        <source>control key: draw velocity level 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <location line="+21"/>
-        <source>shift key: draw velocity level 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <location line="+21"/>
-        <source>draw velocity level 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-5"/>
-        <source>output channel (ctl: affect all rows)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+46"/>
-        <source>Reset GM Map</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+47"/>
-        <source>Previous Part</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Next Part</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">longueur de note</translation>
     </message>
     <message>
         <source>&amp;Functions</source>
         <translation type="obsolete">&amp;Fonctions</translation>
     </message>
     <message>
-        <location line="+23"/>
-        <source>Re-order list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Set Fixed Length</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
         <source>Modify Velocity</source>
-        <translation type="unfinished">Modifier la vélocité</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Crescendo/Decrescendo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Quantize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Erase Event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Move Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Delete Overlaps</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>&amp;Plugins</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Drum tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+37"/>
-        <source>cursor tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Set step size for cursor edit</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Modifier la vélocité</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>panic</source>
-        <translation type="unfinished">panique!</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>transport</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+84"/>
-        <source>Vol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+461"/>
-        <source>Drum map</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Reset the drum map with GM defaults?</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">panique!</translation>
     </message>
 </context>
 <context>
     <name>EditCAfterDialog</name>
     <message>
-        <location filename="../../muse/liste/editevent.cpp" line="+445"/>
         <source>Time Position</source>
-        <translation>Position temporelle</translation>
+        <translation type="obsolete">Position temporelle</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Pressure</source>
-        <translation>Pression</translation>
+        <translation type="obsolete">Pression</translation>
     </message>
     <message>
-        <location line="-6"/>
         <source>MusE: Enter Channel Aftertouch</source>
-        <translation>MusE: Entrez le Canal de Pression
+        <translation type="obsolete">MusE: Entrez le Canal de Pression
 (AfterTouch)</translation>
     </message>
 </context>
@@ -4181,14 +3617,12 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
 <context>
     <name>EditEventDialog</name>
     <message>
-        <location filename="../../muse/liste/editevent.cpp" line="-255"/>
         <source>Ok</source>
-        <translation>Ok</translation>
+        <translation type="obsolete">Ok</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Cancel</source>
-        <translation>Annuler</translation>
+        <translation type="obsolete">Annuler</translation>
     </message>
 </context>
 <context>
@@ -4252,180 +3686,20 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
 <context>
     <name>EditInstrument</name>
     <message>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="+311"/>
-        <location line="+34"/>
-        <source>MusE: Create file failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+33"/>
         <source>MusE: Write File failed</source>
-        <translation type="unfinished">MusE: échec de l&apos;enregistrement</translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <location line="+12"/>
-        <location line="+280"/>
-        <location line="+12"/>
-        <source>MusE:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-303"/>
-        <location line="+292"/>
-        <source>The user instrument directory
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-292"/>
-        <location line="+292"/>
-        <source>
-does not exist yet. Create it now?
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-291"/>
-        <location line="+292"/>
-        <source>(You can change the user instruments directory at Settings-&gt;Global Settings-&gt;Midi)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-282"/>
-        <location line="+292"/>
-        <source>Unable to create user instrument directory
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-244"/>
-        <location line="+266"/>
-        <source>MusE: Save Instrument Definition</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-265"/>
-        <location line="+266"/>
-        <source>Instrument Definition (*.idf)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-154"/>
-        <location line="+29"/>
-        <source>MusE: Save instrument as</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-29"/>
-        <source>Enter a new unique instrument name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+30"/>
-        <source>The user instrument:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>
-already exists. This will overwrite its .idf instrument file.
-Are you sure?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+525"/>
-        <source>MusE: Bad instrument name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Please choose a unique instrument name.
-(The name might be used by a hidden instrument.)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+136"/>
-        <source>MusE: Bad patch name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Please choose a unique patch name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
-        <source>MusE: Bad patchgroup name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Please choose a unique patchgroup name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+526"/>
-        <source>MusE: Bad controller name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Please choose a unique controller name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1287"/>
-        <location line="+12"/>
-        <source>MusE: Cannot add common controller</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-11"/>
-        <source>A controller named </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <location line="+12"/>
-        <source> already exists.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>A controller number </source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">MusE: échec de l&apos;enregistrement</translation>
     </message>
     <message>
-        <location line="+283"/>
-        <location line="+5"/>
         <source>MusE</source>
-        <translation type="unfinished">MusE</translation>
-    </message>
-    <message>
-        <location line="-4"/>
-        <location line="+5"/>
-        <source>The current Instrument contains unsaved data
-Save Current Instrument?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-3"/>
-        <location line="+5"/>
-        <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">MusE</translation>
     </message>
     <message>
-        <location line="-5"/>
-        <location line="+5"/>
         <source>&amp;Nosave</source>
-        <translation type="unfinished">&amp;Pas d&apos;enregistrement</translation>
+        <translation type="obsolete">&amp;Pas d&apos;enregistrement</translation>
     </message>
     <message>
-        <location line="-5"/>
         <source>&amp;Abort</source>
-        <translation type="unfinished">&amp;Annuler</translation>
+        <translation type="obsolete">&amp;Annuler</translation>
     </message>
 </context>
 <context>
@@ -5095,24 +4369,20 @@ Typically, set to 127/127, or an unused
 <context>
     <name>EditMetaDialog</name>
     <message>
-        <location filename="../../muse/liste/editevent.cpp" line="+120"/>
         <source>Time Position</source>
-        <translation>Position temporelle</translation>
+        <translation type="obsolete">Position temporelle</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Meta Type</source>
-        <translation>Meta Type</translation>
+        <translation type="obsolete">Meta Type</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Enter Hex</source>
-        <translation>Entrez en Hexa</translation>
+        <translation type="obsolete">Entrez en Hexa</translation>
     </message>
     <message>
-        <location line="-18"/>
         <source>MusE: Enter Meta Event</source>
-        <translation>MusE: Entrer un Evènement en Hexa</translation>
+        <translation type="obsolete">MusE: Entrer un Evènement en Hexa</translation>
     </message>
 </context>
 <context>
@@ -5192,24 +4462,20 @@ Typically, set to 127/127, or an unused
 <context>
     <name>EditPAfterDialog</name>
     <message>
-        <location filename="../../muse/liste/editevent.cpp" line="+196"/>
         <source>Time Position</source>
-        <translation>Position temporelle</translation>
+        <translation type="obsolete">Position temporelle</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Pitch</source>
-        <translation>Hauteur</translation>
+        <translation type="obsolete">Hauteur</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Pressure</source>
-        <translation>Pression</translation>
+        <translation type="obsolete">Pression</translation>
     </message>
     <message>
-        <location line="-8"/>
         <source>MusE: Enter Poly Aftertouch</source>
-        <translation>Muse: Entrer la Pression polyphonique</translation>
+        <translation type="obsolete">Muse: Entrer la Pression polyphonique</translation>
     </message>
 </context>
 <context>
@@ -5732,12 +4998,11 @@ Time)</translation>
 (Tics par sec.)</translation>
     </message>
     <message>
-        <location line="+212"/>
         <source>GUI</source>
-        <translation>GUI</translation>
+        <translation type="obsolete">GUI</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+240"/>
         <source>/sec</source>
         <translation>/sec</translation>
     </message>
@@ -5758,13 +5023,46 @@ l&apos;interface</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+13"/>
         <source>Allows some popup menus to stay open.
 Otherwise, hold Ctrl to keep them open.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+11"/>
+        <source>In some areas, the middle mouse button decreases
+values, while the right button increases. Users without a
+middle mouse button can select this option to make the
+left button behave like the middle button in such areas.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Use left mouse button for decreasing values</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Shift + Right click sets left range marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Allow adding hidden tracks in track list menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Unhide tracks when adding hidden tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>GUI Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>MDI-subwindowness and sharing menus</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5808,7 +5106,7 @@ Otherwise, hold Ctrl to keep them open.</source>
         <translation type="obsolete">Navigateur pour l&apos;aide:</translation>
     </message>
     <message>
-        <location line="-1438"/>
+        <location line="-1538"/>
         <source>Application</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6138,7 +5436,12 @@ Adjusts responsiveness of audio controls and
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+41"/>
+        <source>GUI Behaviour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+44"/>
         <source>Use old-style stop shortcut:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6161,139 +5464,44 @@ Adjusts responsiveness of audio controls and
 <context>
     <name>LMaster</name>
     <message>
-        <location filename="../../muse/master/lmaster.cpp" line="+207"/>
         <source>new tempo</source>
-        <translation>nouveau tempo</translation>
+        <translation type="obsolete">nouveau tempo</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>new signature</source>
-        <translation>nouvelle signature</translation>
+        <translation type="obsolete">nouvelle signature</translation>
     </message>
     <message>
-        <location line="+26"/>
         <source>Meter</source>
-        <translation>Métrage</translation>
+        <translation type="obsolete">Métrage</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Time</source>
-        <translation>Temps</translation>
+        <translation type="obsolete">Temps</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Type</source>
-        <translation>Type</translation>
+        <translation type="obsolete">Type</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Value</source>
-        <translation>Valeur</translation>
+        <translation type="obsolete">Valeur</translation>
     </message>
     <message>
-        <location line="-90"/>
         <source>MusE: Mastertrack</source>
-        <translation>MusE: Piste principale</translation>
+        <translation type="obsolete">MusE: Piste principale</translation>
     </message>
     <message>
-        <location line="+25"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+23"/>
-        <source>Undo/Redo tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+9"/>
         <source>Tempo</source>
-        <translation>Tempo</translation>
+        <translation type="obsolete">Tempo</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Timesig</source>
-        <translation>Signature Temporelle</translation>
-    </message>
-    <message>
-        <location line="-45"/>
-        <source>&amp;Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Insert Tempo</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Signature Temporelle</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Insert Signature</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Insert Key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Edit Positon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Edit Value</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Delete Event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+30"/>
-        <source>Edit tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>new key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
         <source>panic</source>
-        <translation type="unfinished">panique!</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>transport</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+408"/>
-        <source>Reposition of the initial tempo and signature events is not allowed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+54"/>
-        <source>MusE: List Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Input error, conversion not OK or value out of range</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>Reposition of tempo and signature events to start position is not allowed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">panique!</translation>
     </message>
 </context>
 <context>
@@ -6362,29 +5570,24 @@ Adjusts responsiveness of audio controls and
 <context>
     <name>ListEdit</name>
     <message>
-        <location filename="../../muse/liste/listedit.cpp" line="+486"/>
         <source>&amp;Edit</source>
-        <translation>&amp;Edition</translation>
+        <translation type="obsolete">&amp;Edition</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Cut</source>
-        <translation>Couper</translation>
+        <translation type="obsolete">Couper</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Copy</source>
-        <translation>Copier</translation>
+        <translation type="obsolete">Copier</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Paste</source>
-        <translation>Coller</translation>
+        <translation type="obsolete">Coller</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Delete Events</source>
-        <translation>Effacer évènements</translation>
+        <translation type="obsolete">Effacer évènements</translation>
     </message>
     <message>
         <source>List Tools</source>
@@ -6399,36 +5602,32 @@ Adjusts responsiveness of audio controls and
         <translation type="obsolete">Insérer Note</translation>
     </message>
     <message>
-        <location line="-37"/>
         <source>insert Note</source>
-        <translation>insére une note</translation>
+        <translation type="obsolete">insére une note</translation>
     </message>
     <message>
         <source>Insert SysEx</source>
         <translation type="obsolete">Insérer SysEx</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>insert SysEx</source>
-        <translation>insère une commande midi SysEx</translation>
+        <translation type="obsolete">insère une commande midi SysEx</translation>
     </message>
     <message>
         <source>Insert Ctrl</source>
         <translation type="obsolete">Insérer Ctrl</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>insert Ctrl</source>
-        <translation>insére un caractère de Contrôle</translation>
+        <translation type="obsolete">insére un caractère de Contrôle</translation>
     </message>
     <message>
         <source>Insert Meta</source>
         <translation type="obsolete">Insérer Meta</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>insert Meta</source>
-        <translation>insére une balise Meta</translation>
+        <translation type="obsolete">insére une balise Meta</translation>
     </message>
     <message>
         <source>Insert Pitch</source>
@@ -6443,93 +5642,61 @@ Adjusts responsiveness of audio controls and
         <translation type="obsolete">Insérer Canal de Pression</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>insert Channel Aftertouch</source>
-        <translation>insére un canal de Pression (AfterTouch)</translation>
+        <translation type="obsolete">insére un canal de Pression (AfterTouch)</translation>
     </message>
     <message>
         <source>Insert Key Aftertouch</source>
         <translation type="obsolete">Insérer une note de Pression</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>insert Poly Aftertouch</source>
-        <translation>insère une Pression (AfterTouch)
+        <translation type="obsolete">insère une Pression (AfterTouch)
 polyphonique</translation>
     </message>
     <message>
-        <location line="+42"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Undo/Redo tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
         <source>panic</source>
-        <translation type="unfinished">panique!</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>transport</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">panique!</translation>
     </message>
     <message>
-        <location line="+22"/>
         <source>Tick</source>
-        <translation>Tic</translation>
+        <translation type="obsolete">Tic</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Bar</source>
-        <translation>Mesure</translation>
+        <translation type="obsolete">Mesure</translation>
     </message>
     <message>
         <source>Typ</source>
         <translation type="obsolete">Typ</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Ch</source>
-        <translation>Can</translation>
+        <translation type="obsolete">Can</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Val A</source>
-        <translation>Val A</translation>
+        <translation type="obsolete">Val A</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Val B</source>
-        <translation>Val B</translation>
+        <translation type="obsolete">Val B</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Val C</source>
-        <translation>Val C</translation>
+        <translation type="obsolete">Val C</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Len</source>
-        <translation>Lon</translation>
+        <translation type="obsolete">Lon</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Comment</source>
-        <translation>Commentaire</translation>
-    </message>
-    <message>
-        <location line="-38"/>
-        <source>Insert tools</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Commentaire</translation>
     </message>
     <message>
-        <location line="+32"/>
         <source>Type</source>
-        <translation type="unfinished">Type</translation>
+        <translation type="obsolete">Type</translation>
     </message>
 </context>
 <context>
@@ -6576,273 +5743,44 @@ Transposition</translation>
         <translation type="obsolete">MusE: Table des ports Midi</translation>
     </message>
     <message>
-        <location filename="../../muse/confmport.cpp" line="+236"/>
         <source>Port</source>
-        <translation>Port</translation>
+        <translation type="obsolete">Port</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>GUI</source>
-        <translation>GUI</translation>
+        <translation type="obsolete">GUI</translation>
     </message>
     <message>
         <source>Rec</source>
         <translation type="obsolete">Enr</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Instrument</source>
-        <translation>Instrument</translation>
+        <translation type="obsolete">Instrument</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Device Name</source>
-        <translation>Nom du Périphérique</translation>
+        <translation type="obsolete">Nom du Périphérique</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>State</source>
-        <translation>Etat</translation>
+        <translation type="obsolete">Etat</translation>
     </message>
     <message>
         <source>unknown</source>
         <translation type="obsolete">inconnu</translation>
     </message>
     <message>
-        <location line="-976"/>
-        <location line="+176"/>
-        <source>Default input connections</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-175"/>
-        <location line="+66"/>
-        <source>Are you sure you want to apply to all existing midi tracks now?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-1"/>
-        <location line="+148"/>
-        <source>Default output connections</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-37"/>
-        <location line="+38"/>
-        <source>Setting will apply to new midi tracks.
-Do you want to apply to all existing midi tracks now?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+39"/>
-        <source>MusE: bad device name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>please choose a unique device name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+72"/>
-        <location line="+860"/>
-        <source>in</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-837"/>
-        <location line="+828"/>
-        <source>out</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-772"/>
-        <source>Show first aliases</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Show second aliases</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+130"/>
-        <location line="+42"/>
-        <source>Toggle all</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-38"/>
-        <location line="+43"/>
-        <source>Change all tracks now</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+43"/>
-        <source>Create</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source> device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+229"/>
-        <location line="+29"/>
         <source>Port Number</source>
-        <translation type="unfinished">Numéro de port</translation>
-    </message>
-    <message>
-        <location line="-28"/>
-        <source>Enable gui</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Enable reading</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Enable writing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Port instrument</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Midi device name. Click to edit (Jack)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Connections from Jack Midi outputs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Connections to Jack Midi inputs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Auto-connect these channels to new midi tracks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Auto-connect new midi tracks to these channels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Auto-connect new midi tracks to this channel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>Auto-connect these channels, on this port, to new midi tracks.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Connect new midi tracks to these channels, on this port.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Connect new midi tracks to this channel, on this port.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-45"/>
-        <source>Device state</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+15"/>
-        <source>Enable gui for device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Enable reading from device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Enable writing to device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Name of the midi device associated with this port number. Click to edit Jack midi name.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Numéro de port</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Instrument connected to port</source>
-        <translation type="unfinished">Instrument connecté au port</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Connections from Jack Midi output ports</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Connections to Jack Midi input ports</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Instrument connecté au port</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>State: result of opening the device</source>
-        <translation type="unfinished">Etat: résultat de l&apos;ouverture du port</translation>
-    </message>
-    <message>
-        <location line="+43"/>
-        <source>I</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>O</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>In routes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Out routes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Def in ch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Def out ch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+86"/>
-        <source>&lt;unknown&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+87"/>
-        <location line="+74"/>
-        <source>&lt;none&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Etat: résultat de l&apos;ouverture du port</translation>
     </message>
 </context>
 <context>
@@ -6904,68 +5842,44 @@ Distant</translation>
 <context>
     <name>MarkerView</name>
     <message>
-        <location filename="../../muse/marker/markerview.cpp" line="+192"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Undo/Redo tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+9"/>
         <source>panic</source>
-        <translation type="unfinished">panique!</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>transport</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">panique!</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Bar:Beat:Tick</source>
-        <translation>Mesure:Résolution(Beat):Tic</translation>
+        <translation type="obsolete">Mesure:Résolution(Beat):Tic</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Hr:Mn:Sc:Fr:Sf</source>
-        <translation>Hr:Mn:Sc:Fr:Sf</translation>
+        <translation type="obsolete">Hr:Mn:Sc:Fr:Sf</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Lock</source>
-        <translation>Verrouillage</translation>
+        <translation type="obsolete">Verrouillage</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Text</source>
-        <translation>Texte</translation>
+        <translation type="obsolete">Texte</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Marker Properties</source>
-        <translation>Propriétés du Marqueur</translation>
+        <translation type="obsolete">Propriétés du Marqueur</translation>
     </message>
     <message>
-        <location line="-70"/>
         <source>MusE: Marker</source>
-        <translation>MusE: Marqueur</translation>
+        <translation type="obsolete">MusE: Marqueur</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>add marker</source>
-        <translation>Ajouter marqueur</translation>
+        <translation type="obsolete">Ajouter marqueur</translation>
     </message>
     <message>
         <source>Add Marker</source>
         <translation type="obsolete">Ajoute un marqueur</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>delete marker</source>
-        <translation>Effacer Marqueur</translation>
+        <translation type="obsolete">Effacer Marqueur</translation>
     </message>
     <message>
         <source>Delete Marker</source>
@@ -6976,77 +5890,51 @@ Distant</translation>
         <translation type="obsolete">&amp;Fichier</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>&amp;Edit</source>
-        <translation>&amp;Edition</translation>
+        <translation type="obsolete">&amp;Edition</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>edit tools</source>
-        <translation type="unfinished">outils d&apos;édition</translation>
+        <translation type="obsolete">outils d&apos;édition</translation>
     </message>
 </context>
 <context>
     <name>MasterEdit</name>
     <message>
-        <location filename="../../muse/master/masteredit.cpp" line="-15"/>
         <source>Cursor</source>
-        <translation>Curseur</translation>
+        <translation type="obsolete">Curseur</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Snap</source>
-        <translation>Aligne</translation>
+        <translation type="obsolete">Aligne</translation>
     </message>
     <message>
-        <location line="-10"/>
         <source>time at cursor position</source>
-        <translation>Temps à la position du curseur</translation>
-    </message>
-    <message>
-        <location line="-41"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Temps à la position du curseur</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Undo/Redo tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
         <source>panic</source>
-        <translation type="unfinished">panique!</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>transport</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">panique!</translation>
     </message>
     <message>
-        <location line="+30"/>
         <source>tempo at cursor position</source>
-        <translation>Temps � la position du curseur</translation>
+        <translation type="obsolete">Temps � la position du curseur</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>CurPos </source>
-        <translation>PosCur</translation>
+        <translation type="obsolete">PosCur</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>tempo at current position</source>
-        <translation>tempo � la position en cours</translation>
+        <translation type="obsolete">tempo � la position en cours</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>time signature at current position</source>
-        <translation>Signature temporelle à la position en cours</translation>
+        <translation type="obsolete">Signature temporelle à la position en cours</translation>
     </message>
     <message>
-        <location line="-72"/>
         <source>MusE: Mastertrack</source>
-        <translation>MusE: PistePrincipale</translation>
+        <translation type="obsolete">MusE: PistePrincipale</translation>
     </message>
     <message>
         <source>edit tools</source>
@@ -7061,29 +5949,13 @@ Distant</translation>
         <translation type="obsolete">Utiliser la piste principale</translation>
     </message>
     <message>
-        <location line="+39"/>
         <source>Info</source>
-        <translation>Info</translation>
+        <translation type="obsolete">Info</translation>
     </message>
     <message>
         <source>Off</source>
         <translation type="obsolete">Off</translation>
     </message>
-    <message>
-        <location line="-10"/>
-        <source>Enable master</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Enable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Enable usage of master track</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>MdiSettingsBase</name>
@@ -7581,10 +6453,8 @@ Midi</translation>
 <context>
     <name>MidiInputTransformDialog</name>
     <message>
-        <location filename="../../muse/mplugins/midiitransform.cpp" line="+718"/>
-        <location line="+2"/>
         <source>New</source>
-        <translation>Nouveau</translation>
+        <translation type="obsolete">Nouveau</translation>
     </message>
 </context>
 <context>
@@ -8320,6 +7190,11 @@ Enabled inputs in the list will
         <source>Send sync delay</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+24"/>
+        <source>Note: Sync delay and MTC sync currently not fully implemeted</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MidiTrackInfoBase</name>
@@ -8955,15 +7830,6 @@ pour l&apos;enregistrement:
     </message>
 </context>
 <context>
-    <name>MidiTransformerDialog</name>
-    <message>
-        <location filename="../../muse/miditransform.cpp" line="+263"/>
-        <location line="+2"/>
-        <source>New</source>
-        <translation></translation>
-    </message>
-</context>
-<context>
     <name>MixdownFileDialog</name>
     <message>
         <source>Wave Files (*.wav);;All Files (*)</source>
@@ -9766,706 +8632,721 @@ failed: </source>
 <context>
     <name>MusEApp::MusE</name>
     <message>
-        <location filename="../../muse/app.cpp" line="+60"/>
-        <location line="+16"/>
-        <source>Failed to start audio!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-15"/>
-        <source>Was not able to start audio, check if jack is running.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <source>Timeout waiting for audio to run. Check if jack is running.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+219"/>
         <source>Und&amp;o</source>
-        <translation type="unfinished">&amp;Annuler</translation>
+        <translation type="obsolete">&amp;Annuler</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Re&amp;do</source>
-        <translation type="unfinished">Re&amp;faire</translation>
+        <translation type="obsolete">Re&amp;faire</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>undo last change to song</source>
-        <translation type="unfinished">Annuler le dernier changement sur la chanson</translation>
+        <translation type="obsolete">Annuler le dernier changement sur la chanson</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>redo last undo</source>
-        <translation type="unfinished">Refaire ce qui a été annulé en dernier</translation>
+        <translation type="obsolete">Refaire ce qui a été annulé en dernier</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Loop</source>
-        <translation type="unfinished">Boucle</translation>
+        <translation type="obsolete">Boucle</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Punchin</source>
-        <translation type="unfinished">Punch-In</translation>
+        <translation type="obsolete">Punch-In</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Punchout</source>
-        <translation type="unfinished">Punch-Out</translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Start</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Punch-Out</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Rewind</source>
-        <translation type="unfinished">Rembobiner</translation>
+        <translation type="obsolete">Rembobiner</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Forward</source>
-        <translation type="unfinished">Avance</translation>
+        <translation type="obsolete">Avance</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Stop</source>
-        <translation type="unfinished">Stop</translation>
+        <translation type="obsolete">Stop</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Play</source>
-        <translation type="unfinished">Jouer</translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Record</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Jouer</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <location line="+232"/>
         <source>Panic</source>
-        <translation type="unfinished">Panique!</translation>
+        <translation type="obsolete">Panique!</translation>
     </message>
     <message>
-        <location line="-220"/>
         <source>&amp;New</source>
-        <translation type="unfinished">&amp;Nouveau</translation>
+        <translation type="obsolete">&amp;Nouveau</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Open</source>
-        <translation type="unfinished">&amp;Ouvrir</translation>
+        <translation type="obsolete">&amp;Ouvrir</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Open &amp;Recent</source>
-        <translation type="unfinished">Ouvrir &amp;Récent</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <location line="+1005"/>
-        <location line="+1207"/>
-        <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Ouvrir &amp;Récent</translation>
     </message>
     <message>
-        <location line="-2207"/>
         <source>Save &amp;As</source>
-        <translation type="unfinished">Enregistrer &amp;Sous</translation>
+        <translation type="obsolete">Enregistrer &amp;Sous</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Import Midifile</source>
-        <translation type="unfinished">Importer fichier MIDI</translation>
+        <translation type="obsolete">Importer fichier MIDI</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Export Midifile</source>
-        <translation type="unfinished">Exporter fichier MIDI</translation>
+        <translation type="obsolete">Exporter fichier MIDI</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Import Part</source>
-        <translation type="unfinished"></translation>
+        <source>Import Wave File</source>
+        <translation type="obsolete">Importer fichier WAV</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location filename="../../muse/wave.cpp" line="+827"/>
-        <source>Import Wave File</source>
-        <translation type="unfinished">Importer fichier WAV</translation>
+        <source>&amp;Quit</source>
+        <translation type="obsolete">&amp;Quitter</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Find unused wave files</source>
-        <translation type="unfinished"></translation>
+        <source>Transport Panel</source>
+        <translation type="obsolete">Panneau de Contrôle</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>&amp;Quit</source>
-        <translation type="unfinished">&amp;Quitter</translation>
+        <source>Bigtime Window</source>
+        <translation type="obsolete">Fenêtre GrandeHorloge</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Song Info</source>
-        <translation type="unfinished"></translation>
+        <source>Cliplist</source>
+        <translation type="obsolete">ListClip</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Transport Panel</source>
-        <translation type="unfinished">Panneau de Contrôle</translation>
+        <source>Input Plugins</source>
+        <translation type="obsolete">Plugins d&apos;Entrée</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Bigtime Window</source>
-        <translation type="unfinished">Fenêtre GrandeHorloge</translation>
+        <source>Transpose</source>
+        <translation type="obsolete">Transposition</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Mixer A</source>
-        <translation type="unfinished"></translation>
+        <source>Midi Input Transform</source>
+        <translation type="obsolete">Transformations Entrée MIDI</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Mixer B</source>
-        <translation type="unfinished"></translation>
+        <source>Midi Input Filter</source>
+        <translation type="obsolete">Filtres pour l&apos;Entrée MIDI</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Cliplist</source>
-        <translation type="unfinished">ListClip</translation>
+        <source>Midi Remote Control</source>
+        <translation type="obsolete">Contrôle MIDI à distance</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Marker View</source>
-        <translation type="unfinished"></translation>
+        <source>Reset Instr.</source>
+        <translation type="obsolete">Ré-initialisation des Instruments</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Arranger View</source>
-        <translation type="unfinished"></translation>
+        <source>Init Instr.</source>
+        <translation type="obsolete">Init. Instr.</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Fullscreen</source>
-        <translation type="unfinished"></translation>
+        <source>Local Off</source>
+        <translation type="obsolete">Local Off</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>&amp;Plugins</source>
-        <translation type="unfinished"></translation>
+        <source>Bounce to Track</source>
+        <translation type="obsolete">Rebondir (bounce) sur la piste</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Edit Instrument</source>
-        <translation type="unfinished"></translation>
+        <source>Bounce to File</source>
+        <translation type="obsolete">Rebondir (bounce) sur Fichier</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Input Plugins</source>
-        <translation type="unfinished">Plugins d&apos;Entrée</translation>
+        <source>Global Settings</source>
+        <translation type="obsolete">Paramètres Généraux</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Transpose</source>
-        <translation type="unfinished">Transposition</translation>
+        <source>Follow Song</source>
+        <translation type="obsolete">suivre la chanson</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Midi Input Transform</source>
-        <translation type="unfinished">Transformations Entrée MIDI</translation>
+        <source>Don&apos;t Follow Song</source>
+        <translation type="obsolete">Ne pas suivre la chanson</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Midi Input Filter</source>
-        <translation type="unfinished">Filtres pour l&apos;Entrée MIDI</translation>
+        <source>Follow Page</source>
+        <translation type="obsolete">Défilement par page</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Midi Remote Control</source>
-        <translation type="unfinished">Contrôle MIDI à distance</translation>
+        <source>Follow Continuous</source>
+        <translation type="obsolete">Défilement fin</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Rhythm Generator</source>
-        <translation type="unfinished"></translation>
+        <source>Metronome</source>
+        <translation type="obsolete">Métronome</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Reset Instr.</source>
-        <translation type="unfinished">Ré-initialisation des Instruments</translation>
+        <source>Midi Sync</source>
+        <translation type="obsolete">Synchro MIDI</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Init Instr.</source>
-        <translation type="unfinished">Init. Instr.</translation>
+        <source>Appearance Settings</source>
+        <translation type="obsolete">Apparence</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Local Off</source>
-        <translation type="unfinished">Local Off</translation>
+        <source>Transport</source>
+        <translation type="obsolete">Transport</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Bounce to Track</source>
-        <translation type="unfinished">Rebondir (bounce) sur la piste</translation>
+        <source>&amp;File</source>
+        <translation type="obsolete">&amp;Fichier</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Bounce to File</source>
-        <translation type="unfinished">Rebondir (bounce) sur Fichier</translation>
+        <source>&amp;Midi</source>
+        <translation type="obsolete">&amp;MIDI</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Restart Audio</source>
-        <translation type="unfinished"></translation>
+        <source>&amp;Audio</source>
+        <translation type="obsolete">&amp;Audio</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Mixer Automation</source>
-        <translation type="unfinished"></translation>
+        <source>&amp;Help</source>
+        <translation type="obsolete">&amp;Aide</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Take Snapshot</source>
-        <translation type="unfinished"></translation>
+        <source>MusE: Song: </source>
+        <translation type="obsolete">MusE: chanson</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Clear Automation Data</source>
-        <translation type="unfinished"></translation>
+        <source>MusE: load project</source>
+        <translation type="obsolete">Muse: charger Projet</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Cascade</source>
-        <translation type="unfinished"></translation>
+        <source>MusE: Write File failed</source>
+        <translation type="obsolete">MusE: échec de l&apos;enregistrement</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Tile</source>
-        <translation type="unfinished"></translation>
+        <source>The current Project contains unsaved data
+Save Current Project?</source>
+        <translation type="obsolete">Le Projet en cours contient des données 
+non encore sauvegardées. Enregistrer?</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>In rows</source>
-        <translation type="unfinished"></translation>
+        <source>MusE: Save As</source>
+        <translation type="obsolete">MusE: enregistrer sous</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>In columns</source>
-        <translation type="unfinished"></translation>
+        <source>Nothing to edit</source>
+        <translation type="obsolete">Rien � éditer</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Global Settings</source>
-        <translation type="unfinished">Paramètres Généraux</translation>
+        <source>MusE: Bounce to Track</source>
+        <translation type="obsolete">MusE: Rebondir sur la piste (bounce)</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Configure Shortcuts</source>
-        <translation type="unfinished"></translation>
+        <source>The current Project contains unsaved data
+Load overwrites current Project:
+Save Current Project?</source>
+        <translation type="obsolete">Le Projet en cours contient des données non 
+sauvegardées. Voulez-vous l&apos;enregistrer 
+avant d&apos;en ouvrir un autre?</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Follow Song</source>
-        <translation type="unfinished">suivre la chanson</translation>
+        <source>&amp;Abort</source>
+        <translation type="obsolete">&amp;Annuler</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Don&apos;t Follow Song</source>
-        <translation type="unfinished">Ne pas suivre la chanson</translation>
+        <source>MusE: Export Midi</source>
+        <translation type="obsolete">MusE: exporter fichier MIDI</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Follow Page</source>
-        <translation type="unfinished">Défilement par page</translation>
+        <source>no help found at: </source>
+        <translation type="obsolete">Pas d&apos;aide trouvée ici:</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Follow Continuous</source>
-        <translation type="unfinished">Défilement fin</translation>
+        <source>MusE: Open Help</source>
+        <translation type="obsolete">MusE: Ouvrir l&apos;Aide</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Metronome</source>
-        <translation type="unfinished">Métronome</translation>
+        <source>MusE: Import Midi</source>
+        <translation type="obsolete">MusE: importer fichier MIDI</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Midi Sync</source>
-        <translation type="unfinished">Synchro MIDI</translation>
+        <source>reading midifile
+  </source>
+        <translation type="obsolete">lecture du fichier MIDI
+</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Midi File Import/Export</source>
-        <translation type="unfinished"></translation>
+        <source>
+failed: </source>
+        <translation type="obsolete">
+échec:</translation>
     </message>
+</context>
+<context>
+    <name>MusEArranger::Arranger</name>
     <message>
-        <location line="+1"/>
-        <source>Appearance Settings</source>
-        <translation type="unfinished">Apparence</translation>
+        <source>Enable Recording</source>
+        <translation type="obsolete">Activer l&apos;Enregistrement</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Midi Ports / Soft Synth</source>
-        <translation type="unfinished"></translation>
+        <source>Solo Indicator</source>
+        <translation type="obsolete">Indicateur de Solo</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>&amp;Manual</source>
-        <translation type="unfinished"></translation>
+        <source>Track Type</source>
+        <translation type="obsolete">Type de Piste</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>&amp;MusE Homepage</source>
-        <translation type="unfinished"></translation>
+        <source>Time Lock</source>
+        <translation type="obsolete">Vérouillage d&apos;Horloge</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>&amp;Report Bug...</source>
-        <translation type="unfinished"></translation>
+        <source>Arranger</source>
+        <translation type="obsolete">Arrangeur</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>&amp;About MusE</source>
-        <translation type="unfinished"></translation>
+        <source>Cursor</source>
+        <translation type="obsolete">Curseur</translation>
     </message>
     <message>
-        <location line="+99"/>
-        <source>File Buttons</source>
-        <translation type="unfinished"></translation>
+        <source>Snap</source>
+        <translation type="obsolete">Aligne</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Undo/Redo</source>
-        <translation type="unfinished"></translation>
+        <source>Type</source>
+        <translation type="obsolete">Type</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Transport</source>
-        <translation type="unfinished">Transport</translation>
+        <source>NO</source>
+        <translation type="obsolete">NON</translation>
     </message>
     <message>
-        <location line="+55"/>
-        <source>&amp;File</source>
-        <translation type="unfinished">&amp;Fichier</translation>
+        <source>GM</source>
+        <translation type="obsolete">GM</translation>
     </message>
     <message>
-        <location line="+29"/>
-        <source>&amp;View</source>
-        <translation type="unfinished"></translation>
+        <source>GS</source>
+        <translation type="obsolete">GS</translation>
     </message>
     <message>
-        <location line="+19"/>
-        <source>&amp;Midi</source>
-        <translation type="unfinished">&amp;MIDI</translation>
+        <source>XG</source>
+        <translation type="obsolete">XG</translation>
     </message>
     <message>
-        <location line="+29"/>
-        <source>&amp;Audio</source>
-        <translation type="unfinished">&amp;Audio</translation>
+        <source>midi song type</source>
+        <translation type="obsolete">type de fichier midi</translation>
     </message>
     <message>
-        <location line="+14"/>
-        <source>A&amp;utomation</source>
-        <translation type="unfinished"></translation>
+        <source>Pitch</source>
+        <translation type="obsolete">Hauteur</translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>&amp;Windows</source>
-        <translation type="unfinished"></translation>
+        <source>midi pitch</source>
+        <translation type="obsolete">hauteur midi</translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>MusE Se&amp;ttings</source>
-        <translation type="unfinished"></translation>
+        <source>global midi pitch shift</source>
+        <translation type="obsolete">transposition midi globale</translation>
     </message>
     <message>
-        <location line="+23"/>
-        <source>&amp;Help</source>
-        <translation type="unfinished">&amp;Aide</translation>
+        <source>Tempo</source>
+        <translation type="obsolete">Tempo</translation>
     </message>
     <message>
-        <location line="+268"/>
-        <source>Cannot read template</source>
-        <translation type="unfinished"></translation>
+        <source>midi tempo</source>
+        <translation type="obsolete">tempo midi</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <source>File open error</source>
-        <translation type="unfinished"></translation>
+        <source>N</source>
+        <translation type="obsolete">N</translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>File read error</source>
-        <translation type="unfinished"></translation>
+        <source>TrackInfo</source>
+        <translation type="obsolete">InfoPiste</translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>Unknown File Format: </source>
-        <translation type="unfinished"></translation>
+        <source>R</source>
+        <translation type="obsolete">R</translation>
     </message>
     <message>
-        <location line="+130"/>
-        <location line="+408"/>
-        <location line="+895"/>
-        <source>MusE: Song: </source>
-        <translation type="unfinished">MusE: chanson</translation>
+        <source>M</source>
+        <translation type="obsolete">M</translation>
     </message>
     <message>
-        <location line="-1269"/>
-        <source>MusE: load project</source>
-        <translation type="unfinished">Muse: charger Projet</translation>
+        <source>S</source>
+        <translation type="obsolete">S</translation>
     </message>
     <message>
-        <location line="+14"/>
-        <source>MusE: load template</source>
-        <translation type="unfinished"></translation>
+        <source>C</source>
+        <translation type="obsolete">C</translation>
     </message>
     <message>
-        <location line="+62"/>
-        <source>MusE: Write File failed</source>
-        <translation type="unfinished">MusE: échec de l&apos;enregistrement</translation>
+        <source>Track</source>
+        <translation type="obsolete">Piste</translation>
     </message>
     <message>
-        <location line="+38"/>
-        <source>The current Project contains unsaved data
-Save Current Project?</source>
-        <translation type="unfinished">Le Projet en cours contient des données 
-non encore sauvegardées. Enregistrer?</translation>
+        <source>Port</source>
+        <translation type="obsolete">Port</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location line="+1207"/>
-        <source>S&amp;kip</source>
-        <translation type="unfinished"></translation>
+        <source>T</source>
+        <translation type="obsolete">T</translation>
     </message>
+</context>
+<context>
+    <name>MusEArranger::ArrangerView</name>
     <message>
-        <location line="-1207"/>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
+        <source>panic</source>
+        <translation type="obsolete">panique!</translation>
     </message>
     <message>
-        <location line="+236"/>
-        <location line="+13"/>
-        <source>MusE: Save As</source>
-        <translation type="unfinished">MusE: enregistrer sous</translation>
+        <source>C&amp;ut</source>
+        <translation type="obsolete">Co&amp;uper</translation>
     </message>
     <message>
-        <location line="+57"/>
-        <location line="+161"/>
-        <source>Nothing to edit</source>
-        <translation type="unfinished">Rien � éditer</translation>
+        <source>&amp;Copy</source>
+        <translation type="obsolete">&amp;Copier</translation>
     </message>
     <message>
-        <location line="+474"/>
-        <location line="+10"/>
-        <location line="+31"/>
-        <location line="+34"/>
-        <location line="+8"/>
-        <source>MusE: Bounce to Track</source>
-        <translation type="unfinished">MusE: Rebondir sur la piste (bounce)</translation>
+        <source>Add Track</source>
+        <translation type="obsolete">Ajouter Piste</translation>
     </message>
     <message>
-        <location line="-82"/>
-        <source>No wave tracks found</source>
-        <translation type="unfinished"></translation>
+        <source>Select</source>
+        <translation type="obsolete">Sélectionner</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location line="+105"/>
-        <source>No audio output tracks found</source>
-        <translation type="unfinished"></translation>
+        <source>Select &amp;All</source>
+        <translation type="obsolete">Selectionner &amp;Tout</translation>
     </message>
     <message>
-        <location line="-74"/>
-        <source>Select one audio output track,
-and one target wave track</source>
-        <translation type="unfinished"></translation>
+        <source>&amp;Deselect All</source>
+        <translation type="obsolete">&amp;Dé-selectionner tout</translation>
     </message>
     <message>
-        <location line="+34"/>
-        <source>Select one target wave track</source>
-        <translation type="unfinished"></translation>
+        <source>Invert &amp;Selection</source>
+        <translation type="obsolete">Inverser la &amp;Sélection</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Select one target wave track,
-and one audio output track</source>
-        <translation type="unfinished"></translation>
+        <source>&amp;Inside Loop</source>
+        <translation type="obsolete">A l&apos;&amp;intérieur de la Boucle</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location line="+25"/>
-        <source>MusE: Bounce to File</source>
+        <source>&amp;Outside Loop</source>
+        <translation type="obsolete">A l&apos;e&amp;xtérieur de la Boucle</translation>
+    </message>
+    <message>
+        <source>All &amp;Parts on Track</source>
+        <translation type="obsolete">Tous les &amp;bouts de la Piste</translation>
+    </message>
+    <message>
+        <source>Score</source>
+        <translation type="obsolete">Partition</translation>
+    </message>
+    <message>
+        <source>Pianoroll</source>
+        <translation type="obsolete">Rouleau-Piano</translation>
+    </message>
+    <message>
+        <source>Drums</source>
+        <translation type="obsolete">Batterie</translation>
+    </message>
+    <message>
+        <source>List</source>
+        <translation type="obsolete">Liste</translation>
+    </message>
+    <message>
+        <source>Wave</source>
+        <translation type="obsolete">Forme d&apos;Onde</translation>
+    </message>
+    <message>
+        <source>Mastertrack</source>
+        <translation type="obsolete">PistePrincipale</translation>
+    </message>
+    <message>
+        <source>Graphic</source>
+        <translation type="obsolete">Graphique</translation>
+    </message>
+    <message>
+        <source>Midi &amp;Transform</source>
+        <translation type="obsolete">&amp;Transformation MIDI</translation>
+    </message>
+    <message>
+        <source>Global Cut</source>
+        <translation type="obsolete">Couper tout</translation>
+    </message>
+    <message>
+        <source>Global Insert</source>
+        <translation type="obsolete">Insérer tout</translation>
+    </message>
+    <message>
+        <source>Global Split</source>
+        <translation type="obsolete">Diviser Tout</translation>
+    </message>
+    <message>
+        <source>&amp;Structure</source>
+        <translation type="obsolete">&amp;Structure</translation>
+    </message>
+    <message>
+        <source>Functions</source>
+        <translation type="obsolete">Fonctions</translation>
+    </message>
+    <message>
+        <source>Transpose</source>
+        <translation type="obsolete">Transposition</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="obsolete">Nouveau</translation>
+    </message>
+</context>
+<context>
+    <name>MusEArranger::PartCanvas</name>
+    <message>
+        <source>Cannot copy/move/clone to different Track-Type</source>
+        <translation type="obsolete">Ne peut copier/déplacer vers une type de Piste
+différent</translation>
+    </message>
+    <message>
+        <source>C&amp;ut</source>
+        <translation type="obsolete">Co&amp;uper</translation>
+    </message>
+    <message>
+        <source>&amp;Copy</source>
+        <translation type="obsolete">&amp;Copier</translation>
+    </message>
+    <message>
+        <source>rename</source>
+        <translation type="obsolete">renommer</translation>
+    </message>
+    <message>
+        <source>color</source>
+        <translation type="obsolete">couleur</translation>
+    </message>
+    <message>
+        <source>delete</source>
+        <translation type="obsolete">effacer</translation>
+    </message>
+    <message>
+        <source>split</source>
+        <translation type="obsolete">séparer</translation>
+    </message>
+    <message>
+        <source>de-clone</source>
+        <translation type="obsolete">annuler-clônage</translation>
+    </message>
+    <message>
+        <source>wave edit</source>
+        <translation type="obsolete">édition wav</translation>
+    </message>
+    <message>
+        <source>Cannot paste: multiple tracks selected</source>
+        <translation type="obsolete">Ne peut coller: plusieurs pistes
+sélectionnées</translation>
+    </message>
+    <message>
+        <source>Cannot paste: no track selected</source>
+        <translation type="obsolete">Ne peut coller: pas de piste choisie</translation>
+    </message>
+    <message>
+        <source>Cannot paste: wrong data type</source>
+        <translation type="obsolete">Ne peut coller: mauvais type de donnée</translation>
+    </message>
+</context>
+<context>
+    <name>MusEArranger::TList</name>
+    <message>
+        <source>show gui</source>
+        <translation type="obsolete">montrer l&apos;interface</translation>
+    </message>
+    <message>
+        <source>Drum</source>
+        <translation type="obsolete">Batterie</translation>
+    </message>
+</context>
+<context>
+    <name>MusECore::Song</name>
+    <message>
+        <location filename="../../muse/song.cpp" line="+2233"/>
+        <source>Jack shutdown!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Select one audio output track</source>
+        <source>Jack has detected a performance problem which has lead to
+MusE being disconnected.
+This could happen due to a number of reasons:
+- a performance issue with your particular setup.
+- a bug in MusE (or possibly in another connected software).
+- a random hiccup which might never occur again.
+- jack was voluntary stopped by you or someone else
+- jack crashed
+If there is a persisting problem you are much welcome to discuss it
+on the MusE mailinglist.
+(there is information about joining the mailinglist on the MusE
+ homepage which is available through the help menu)
+
+To proceed check the status of Jack and try to restart it and then .
+click on the Restart button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
-        <source>MusE: Bounce</source>
+        <location line="+186"/>
+        <location line="+179"/>
+        <source>Automation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>set left/right marker for bounce range</source>
+        <location line="-177"/>
+        <source>previous event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
-        <source>The current Project contains unsaved data
-Load overwrites current Project:
-Save Current Project?</source>
-        <translation type="unfinished">Le Projet en cours contient des données non 
-sauvegardées. Voulez-vous l&apos;enregistrer 
-avant d&apos;en ouvrir un autre?</translation>
+        <location line="+4"/>
+        <source>next event</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location filename="../../muse/importmidi.cpp" line="+86"/>
-        <source>&amp;Abort</source>
-        <translation type="unfinished">&amp;Annuler</translation>
+        <location line="+9"/>
+        <location line="+169"/>
+        <source>set event</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/exportmidi.cpp" line="+143"/>
-        <source>MusE: Export Midi</source>
-        <translation type="unfinished">MusE: exporter fichier MIDI</translation>
+        <location line="-167"/>
+        <location line="+169"/>
+        <source>add event</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/help.cpp" line="+50"/>
-        <source>no help found at: </source>
-        <translation type="unfinished">Pas d&apos;aide trouvée ici:</translation>
+        <location line="-165"/>
+        <location line="+170"/>
+        <source>erase event</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>MusE: Open Help</source>
-        <translation type="unfinished">MusE: Ouvrir l&apos;Aide</translation>
+        <location line="-166"/>
+        <source>erase range</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Unable to launch help</source>
+        <location line="+4"/>
+        <source>clear automation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>For some reason MusE has to launch the default
-browser on your machine.</source>
+        <location line="+33"/>
+        <source>Clear all controller events?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/importmidi.cpp" line="-12"/>
-        <source>MusE: Import Midi</source>
-        <translation type="unfinished">MusE: importer fichier MIDI</translation>
+        <location line="+0"/>
+        <source>&amp;Ok</source>
+        <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Add midi file to current project?
-</source>
+        <location line="+0"/>
+        <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>&amp;Add to Project</source>
+        <location line="+878"/>
+        <source>MusE - external script failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>&amp;Replace</source>
+        <source>MusE was unable to launch the script, error message:
+%1</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::Appearance</name>
     <message>
-        <location line="+31"/>
-        <source>reading midifile
-  </source>
-        <translation type="unfinished">lecture du fichier MIDI
-</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>
-failed: </source>
-        <translation type="unfinished">
-échec:</translation>
+        <location filename="../../muse/appearance.cpp" line="+132"/>
+        <source>Main application font, and default font for any
+ controls not defined here.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+356"/>
-        <source>Import part is only valid for midi and wave tracks!</source>
+        <location line="+1"/>
+        <source>For small controls like mixer strips.
+Also timescale small numbers, arranger part name overlay,
+ and effects rack.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>MusE: load part</source>
+        <location line="+1"/>
+        <source>Midi track info panel. Transport controls.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <source>No track selected for import</source>
+        <location line="+1"/>
+        <source>Controller graph and S/X buttons. Large numbers for time
+ and tempo scale, and time signature.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+121"/>
-        <source> out of </source>
+        <location line="+1"/>
+        <source>Time scale markers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source> parts</source>
+        <source>List editor: meta event edit dialog multi-line edit box.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source> part</source>
+        <location line="+1"/>
+        <source>Mixer label font. Auto-font-sizing up to chosen font size.
+Word-breaking but only with spaces.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source> could not be imported.
-Likely the track is the wrong type.</source>
+        <source>Maximum mixer label auto-font-sizing font size.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/wave.cpp" line="-6"/>
-        <source>to import an audio file you have first to selecta wave track</source>
+        <location line="+2"/>
+        <source>Global opacity (opposite of transparency).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
-        <source>Import Wavefile</source>
+        <location line="+4"/>
+        <source>Standard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>This wave file has a samplerate of %1,
-as opposed to current setting %2.
-Do you still want to import it?</source>
+        <location line="+2"/>
+        <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>&amp;Yes</source>
+        <location line="+624"/>
+        <source>MusE: load image</source>
+        <translation type="unfinished">MusE: charger une image</translation>
+    </message>
+    <message>
+        <location line="+334"/>
+        <source>Select style sheet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
-        <source>&amp;No</source>
+        <source>Qt style sheets (*.qss)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MusEArranger::Arranger</name>
+    <name>MusEGui::Arranger</name>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="-74"/>
+        <location filename="../../muse/arranger/arranger.cpp" line="+81"/>
         <source>Enable Recording</source>
         <translation type="unfinished">Activer l&apos;Enregistrement</translation>
     </message>
@@ -10582,7 +9463,17 @@ Right-click to show GUI.</source>
         <translation type="unfinished">Curseur</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+10"/>
+        <source>Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Bar</source>
+        <translation type="unfinished">Mesure</translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Snap</source>
         <translation type="unfinished">Aligne</translation>
     </message>
@@ -10716,7 +9607,7 @@ Right-click to show GUI.</source>
     </message>
 </context>
 <context>
-    <name>MusEArranger::ArrangerView</name>
+    <name>MusEGui::ArrangerView</name>
     <message>
         <location filename="../../muse/arranger/arrangerview.cpp" line="+83"/>
         <source>MusE: Arranger</source>
@@ -10738,7 +9629,7 @@ Right-click to show GUI.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+31"/>
         <source>C&amp;ut</source>
         <translation type="unfinished">Co&amp;uper</translation>
     </message>
@@ -10844,12 +9735,12 @@ Right-click to show GUI.</source>
     </message>
     <message>
         <location line="+3"/>
-        <source>all parts in one staff</source>
+        <source>all tracks in one staff</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>one staff per part</source>
+        <source>one staff per track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -10909,6 +9800,21 @@ Right-click to show GUI.</source>
         <translation type="unfinished">Diviser Tout</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Global Cut - selected tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Global Insert - selected tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Global Split - selected tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+8"/>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
@@ -10919,7 +9825,7 @@ Right-click to show GUI.</source>
         <translation type="unfinished">&amp;Structure</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+11"/>
         <source>Functions</source>
         <translation type="unfinished">Fonctions</translation>
     </message>
@@ -10979,487 +9885,1104 @@ Right-click to show GUI.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+308"/>
+        <location line="+314"/>
         <location line="+6"/>
         <source>New</source>
         <translation type="unfinished">Nouveau</translation>
     </message>
 </context>
 <context>
-    <name>MusEArranger::PartCanvas</name>
+    <name>MusEGui::AudioMixerApp</name>
     <message>
-        <location filename="../../muse/arranger/pcanvas.cpp" line="+346"/>
-        <source>Cannot copy/move/clone to different Track-Type</source>
-        <translation type="unfinished">Ne peut copier/déplacer vers une type de Piste
-différent</translation>
+        <location filename="../../muse/mixer/amixer.cpp" line="+171"/>
+        <source>&amp;Create</source>
+        <translation type="unfinished">&amp;Créer</translation>
     </message>
     <message>
-        <location line="+261"/>
-        <source>C&amp;ut</source>
-        <translation type="unfinished">Co&amp;uper</translation>
+        <location line="+4"/>
+        <source>&amp;View</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>&amp;Copy</source>
-        <translation type="unfinished">&amp;Copier</translation>
+        <location line="+1"/>
+        <source>Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Show Midi Tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show Drum Tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show Wave Tracks</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+6"/>
-        <source>s&amp;elect </source>
+        <source>Show Inputs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>clones</source>
+        <location line="+1"/>
+        <source>Show Outputs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>rename</source>
-        <translation type="unfinished">renommer</translation>
+        <location line="+1"/>
+        <source>Show Groups</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>color</source>
-        <translation type="unfinished">couleur</translation>
+        <location line="+1"/>
+        <source>Show Auxs</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>delete</source>
-        <translation type="unfinished">effacer</translation>
+        <location line="+1"/>
+        <source>Show Synthesizers</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::AudioStrip</name>
     <message>
-        <location line="+2"/>
-        <source>split</source>
-        <translation type="unfinished">séparer</translation>
+        <location filename="../../muse/mixer/astrip.cpp" line="+667"/>
+        <source>panorama</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>glue</source>
+        <source>aux send level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>de-clone</source>
-        <translation type="unfinished">annuler-clônage</translation>
+        <location line="+23"/>
+        <source>Pan</source>
+        <translation type="unfinished">Pan</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location line="+7"/>
-        <location line="+7"/>
-        <source>save part to disk</source>
+        <location line="+87"/>
+        <source>1/2 channel</source>
+        <translation type="unfinished">1/2 canal</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Pre</source>
+        <translation type="unfinished">Pre</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>pre fader - post fader</source>
+        <translation type="unfinished">pre fader - post fader</translation>
+    </message>
+    <message>
+        <location line="+70"/>
+        <source>dB</source>
+        <translation type="unfinished">dB</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>record</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-2"/>
-        <source>wave edit</source>
-        <translation type="unfinished">édition wav</translation>
+        <location line="+11"/>
+        <source>mute</source>
+        <translation type="unfinished">silence</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>record downmix</source>
+        <translation type="unfinished">enregistrer mixdown</translation>
     </message>
     <message>
+        <location line="+2"/>
         <location line="+4"/>
-        <source>file info</source>
+        <source>solo mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
-        <source>MusE: save part</source>
+        <location line="+7"/>
+        <source>off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <source>Part name</source>
+        <location line="+21"/>
+        <source>iR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Files</source>
+        <location line="+2"/>
+        <source>input routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>oR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2090"/>
-        <source> out of </source>
+        <location line="+2"/>
+        <source>output routing</source>
+        <translation type="unfinished">chemin de sortie (routing)</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source> parts</source>
+        <source>Read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source> part</source>
+        <location line="+1"/>
+        <source>Touch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source> could not be pasted.
-Likely the selected track is the wrong type.</source>
+        <source>Write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
-        <source>Cannot paste: multiple tracks selected</source>
-        <translation type="unfinished">Ne peut coller: plusieurs pistes
-sélectionnées</translation>
+        <location line="+43"/>
+        <source>automation type</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::BigTime</name>
     <message>
-        <location line="+9"/>
-        <source>Cannot paste: no track selected</source>
-        <translation type="unfinished">Ne peut coller: pas de piste choisie</translation>
+        <location filename="../../muse/widgets/bigtime.cpp" line="+62"/>
+        <source>format display</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Can only paste to midi/drum track</source>
+        <location line="+17"/>
+        <source>bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>Can only paste to wave track</source>
+        <location line="+1"/>
+        <source>beat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>Can only paste to midi or wave track</source>
+        <location line="+1"/>
+        <location line="+6"/>
+        <source>tick</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Cannot paste: wrong data type</source>
-        <translation type="unfinished">Ne peut coller: mauvais type de donnée</translation>
+        <location line="-4"/>
+        <source>minute</source>
+        <translation type="unfinished">minute</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>second</source>
+        <translation type="unfinished">second</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+3"/>
+        <source>frame</source>
+        <translation type="unfinished">trame (frame)</translation>
+    </message>
+    <message>
+        <location line="-2"/>
+        <source>subframe</source>
+        <translation type="unfinished">trame fine (subframe)</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>MusE: Bigtime</source>
+        <translation type="unfinished">MusE: GrandChrono</translation>
     </message>
 </context>
 <context>
-    <name>MusEArranger::TList</name>
+    <name>MusEGui::ClipListEdit</name>
     <message>
-        <location filename="../../muse/arranger/tlist.cpp" line="+362"/>
-        <source>&lt;none&gt;</source>
+        <location filename="../../muse/cliplist/cliplist.cpp" line="+130"/>
+        <source>MusE: Clip List Editor</source>
+        <translation type="unfinished">MusE: Editeur de la Liste de Clips</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Undo/Redo tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
-        <source>no clef</source>
+        <location line="+5"/>
+        <source>panic</source>
+        <translation type="unfinished">panique!</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>transport</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Treble</source>
+        <location line="+4"/>
+        <source>Window &amp;Config</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::ComboQuant</name>
     <message>
-        <location line="+2"/>
-        <source>Bass</source>
+        <location filename="../../muse/widgets/comboQuant.cpp" line="+40"/>
+        <location line="+1"/>
+        <location line="+1"/>
+        <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::CtrlPanel</name>
     <message>
-        <location line="+2"/>
-        <source>Grand</source>
+        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="+91"/>
+        <source>S</source>
+        <translation type="unfinished">S</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>select controller</source>
+        <translation type="unfinished">Choisissez le contrôle</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>X</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>MusE: bad trackname</source>
+        <location line="+5"/>
+        <source>remove panel</source>
+        <translation type="unfinished">enlever le panneau</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>manual adjust</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>double click on/off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>please choose a unique track name</source>
+        <source>off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+157"/>
-        <location line="+1143"/>
-        <source>Update drummap?</source>
+        <location line="+443"/>
+        <location line="+236"/>
+        <source>Velocity</source>
+        <translation type="unfinished">Vélocité</translation>
+    </message>
+    <message>
+        <location line="-186"/>
+        <source>add new ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1142"/>
-        <source>Do you want to use same port for all instruments in the drummap?</source>
+        <location line="+163"/>
+        <location line="+58"/>
+        <source>Instrument-defined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+1143"/>
-        <source>&amp;Yes</source>
+        <location line="-43"/>
+        <location line="+21"/>
+        <source>Add ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1143"/>
-        <location line="+1143"/>
-        <source>&amp;No</source>
+        <location line="-17"/>
+        <source>Others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1066"/>
-        <location line="+55"/>
-        <source>show gui</source>
-        <translation type="unfinished">montrer l&apos;interface</translation>
+        <location line="+65"/>
+        <source>Edit instrument ...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-46"/>
-        <location line="+55"/>
-        <source>show native gui</source>
+        <location line="+46"/>
+        <source>Common Controls</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::DrumEdit</name>
     <message>
-        <location line="+338"/>
-        <source>Treble clef</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="+114"/>
+        <location line="+21"/>
+        <source>mute instrument</source>
+        <translation type="unfinished">Rendre muet l&apos;instrument</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>sound name</source>
+        <translation type="unfinished">Nom du son</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>volume percent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>quantisation</source>
+        <translation type="unfinished">quantisation</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>this input note triggers the sound</source>
+        <translation type="unfinished">cette note en entrée déclenche le son</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>note length</source>
+        <translation type="unfinished">longueur de note</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>this is the note which is played</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <source>output channel (hold ctl to affect all rows)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Bass clef</source>
+        <source>output port (hold ctl to affect all rows)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Grand Staff</source>
+        <location line="+21"/>
+        <source>shift + control key: draw velocity level 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
-        <source>Viewable automation</source>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>control key: draw velocity level 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+131"/>
-        <source>Delete Track</source>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>shift key: draw velocity level 3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>draw velocity level 4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-5"/>
+        <source>output channel (ctl: affect all rows)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Track Comment</source>
+        <source>output port (ctl: affect all rows)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Insert Track</source>
+        <location line="+43"/>
+        <source>&amp;File</source>
+        <translation type="unfinished">&amp;Fichier</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Load Map</source>
+        <translation type="unfinished">Charger set de batterie</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Save Map</source>
+        <translation type="unfinished">Enregistrer set de batterie</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reset GM Map</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+445"/>
-        <source>Midi</source>
+        <location line="+10"/>
+        <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+4"/>
+        <source>Cut</source>
+        <translation type="unfinished">Couper</translation>
+    </message>
+    <message>
         <location line="+1"/>
-        <source>Drum</source>
-        <translation type="unfinished">Batterie</translation>
+        <source>Copy</source>
+        <translation type="unfinished">Copier</translation>
     </message>
     <message>
-        <location line="+50"/>
-        <source>Do you want to use same port and channel for all instruments in the drummap?</source>
+        <location line="+1"/>
+        <source>Copy events in range</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MusEDialog::PasteDialog</name>
-    <message numerus="yes">
-        <location filename="../../muse/widgets/pastedialog.cpp" line="+81"/>
-        <source>%n quarter(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-        </translation>
+    <message>
+        <location line="+1"/>
+        <source>Paste</source>
+        <translation type="unfinished">Coller</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>quarter</source>
+        <location line="+1"/>
+        <source>Paste (with Dialog)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>quarters</source>
+        <source>Delete Events</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MusEDialog::PasteEventsDialog</name>
-    <message numerus="yes">
-        <location filename="../../muse/widgets/pasteeventsdialog.cpp" line="+95"/>
-        <source>%n quarter(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-        </translation>
+    <message>
+        <location line="+16"/>
+        <source>&amp;Select</source>
+        <translation type="unfinished">&amp;Sélectionner</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>quarter</source>
+        <location line="+2"/>
+        <source>Select All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>Select None</source>
+        <translation type="unfinished">Dé-sélectionner</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Invert</source>
+        <translation type="unfinished">Inverser</translation>
+    </message>
+    <message>
         <location line="+2"/>
-        <source>quarters</source>
+        <source>Inside Loop</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MusEMixer::AudioMixerApp</name>
     <message>
-        <location filename="../../muse/mixer/amixer.cpp" line="+171"/>
-        <source>&amp;Create</source>
-        <translation type="unfinished">&amp;Créer</translation>
+        <location line="+1"/>
+        <source>Outside Loop</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
-        <source>&amp;View</source>
+        <source>Previous Part</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Routing</source>
+        <source>Next Part</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Show Midi Tracks</source>
+        <location line="+19"/>
+        <source>Fu&amp;nctions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Re-order list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Set Fixed Length</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Show Drum Tracks</source>
+        <source>Modify Velocity</source>
+        <translation type="unfinished">Modifier la vélocité</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Crescendo/Decrescendo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Show Wave Tracks</source>
+        <source>Quantize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>Erase Event</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Move Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Delete Overlaps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>&amp;Plugins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Window &amp;Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Drum tools</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Load Drummap</source>
+        <translation type="unfinished">Charger Set de Batterie</translation>
+    </message>
+    <message>
         <location line="+6"/>
-        <source>Show Inputs</source>
+        <source>Store Drummap</source>
+        <translation type="unfinished">Enregistrer Set de Batterie</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Step Record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Midi Input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>cursor tools</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Set step size for cursor edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+14"/>
+        <source>panic</source>
+        <translation type="unfinished">panique!</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>transport</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>ctrl</source>
+        <translation type="unfinished">ctrl</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Add Controller View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>M</source>
+        <translation type="unfinished">M</translation>
+    </message>
+    <message>
         <location line="+1"/>
-        <source>Show Outputs</source>
+        <source>Sound</source>
+        <translation type="unfinished">Son</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Vol</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Show Groups</source>
+        <source>QNT</source>
+        <translation type="unfinished">QNT</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>E-Note</source>
+        <translation type="unfinished">E-Note</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Len</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Show Auxs</source>
+        <source>A-Note</source>
+        <translation type="unfinished">A-Note</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Show Synthesizers</source>
+        <source>Port</source>
+        <translation type="unfinished">Port</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>LV1</source>
+        <translation type="unfinished">LV1</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>LV2</source>
+        <translation type="unfinished">LV2</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>LV3</source>
+        <translation type="unfinished">LV3</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>LV4</source>
+        <translation type="unfinished">LV4</translation>
+    </message>
+    <message>
+        <location line="+377"/>
+        <source>Muse: Load Drum Map</source>
+        <translation type="unfinished">MusE: Charger Set de Batterie</translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>MusE: Store Drum Map</source>
+        <translation type="unfinished">MusE: Enregistrer Set de Batterie</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Drum map</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reset the drum map with GM defaults?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MusEMixer::AudioStrip</name>
+    <name>MusEGui::EditCAfterDialog</name>
     <message>
-        <location filename="../../muse/mixer/astrip.cpp" line="+645"/>
-        <source>panorama</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../muse/liste/editevent.cpp" line="+445"/>
+        <source>MusE: Enter Channel Aftertouch</source>
+        <translation type="unfinished">MusE: Entrez le Canal de Pression
+(AfterTouch)</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>aux send level</source>
+        <source>Time Position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
-        <source>Pan</source>
-        <translation type="unfinished">Pan</translation>
+        <location line="+4"/>
+        <source>Pressure</source>
+        <translation type="unfinished">Pression</translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::EditEventDialog</name>
     <message>
-        <location line="+93"/>
-        <source>1/2 channel</source>
-        <translation type="unfinished">1/2 canal</translation>
+        <location line="-261"/>
+        <source>Ok</source>
+        <translation type="unfinished">Ok</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Annuler</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::EditInstrument</name>
+    <message>
+        <location filename="../../muse/instruments/editinstrument.cpp" line="+312"/>
+        <location line="+34"/>
+        <source>MusE: Create file failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>MusE: Write File failed</source>
+        <translation type="unfinished">MusE: échec de l&apos;enregistrement</translation>
     </message>
     <message>
+        <location line="+32"/>
         <location line="+12"/>
-        <source>Pre</source>
-        <translation type="unfinished">Pre</translation>
+        <location line="+280"/>
+        <location line="+12"/>
+        <source>MusE:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-303"/>
+        <location line="+292"/>
+        <source>The user instrument directory
+%1
+does not exist yet. Create it now?
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-291"/>
+        <location line="+292"/>
+        <source>(You can change the user instruments directory at Settings-&gt;Global Settings-&gt;Midi)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-282"/>
+        <location line="+292"/>
+        <source>Unable to create user instrument directory &apos;%1&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-244"/>
+        <location line="+266"/>
+        <source>MusE: Save Instrument Definition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-265"/>
+        <location line="+266"/>
+        <source>Instrument Definition (*.idf)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-154"/>
+        <location line="+29"/>
+        <source>MusE: Save instrument as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-29"/>
+        <source>Enter a new unique instrument name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>The user instrument &apos;%1&apos; already exists. This will overwrite its .idf instrument file.
+Are you sure?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+526"/>
+        <source>MusE: Bad instrument name</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>pre fader - post fader</source>
-        <translation type="unfinished">pre fader - post fader</translation>
+        <source>Please choose a unique instrument name.
+(The name might be used by a hidden instrument.)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
-        <source>dB</source>
-        <translation type="unfinished">dB</translation>
+        <location line="+136"/>
+        <source>MusE: Bad patch name</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
-        <source>record</source>
+        <location line="+1"/>
+        <source>Please choose a unique patch name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
-        <source>mute</source>
-        <translation type="unfinished">silence</translation>
+        <location line="+22"/>
+        <source>MusE: Bad patchgroup name</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
-        <source>record downmix</source>
-        <translation type="unfinished">enregistrer mixdown</translation>
+        <location line="+1"/>
+        <source>Please choose a unique patchgroup name</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location line="+4"/>
-        <source>solo mode</source>
+        <location line="+526"/>
+        <source>MusE: Bad controller name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Please choose a unique controller name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1287"/>
         <location line="+12"/>
-        <source>off</source>
+        <source>MusE: Cannot add common controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
-        <source>iR</source>
+        <location line="-11"/>
+        <source>A controller named &apos;%1&apos; already exists.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>input routing</source>
+        <location line="+12"/>
+        <source>A controller number %1 already exists.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>oR</source>
+        <location line="+283"/>
+        <location line="+5"/>
+        <source>MusE</source>
+        <translation type="unfinished">MusE</translation>
+    </message>
+    <message>
+        <location line="-4"/>
+        <location line="+5"/>
+        <source>The current Instrument contains unsaved data
+Save Current Instrument?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <location line="+5"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-5"/>
+        <location line="+5"/>
+        <source>&amp;Nosave</source>
+        <translation type="unfinished">&amp;Pas d&apos;enregistrement</translation>
+    </message>
+    <message>
+        <location line="-5"/>
+        <source>&amp;Abort</source>
+        <translation type="unfinished">&amp;Annuler</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::EditMetaDialog</name>
+    <message>
+        <location filename="../../muse/liste/editevent.cpp" line="+118"/>
+        <source>MusE: Enter Meta Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>output routing</source>
-        <translation type="unfinished">chemin de sortie (routing)</translation>
+        <source>Time Position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Meta Type</source>
+        <translation type="unfinished">Meta Type</translation>
     </message>
     <message>
         <location line="+12"/>
-        <source>Off</source>
+        <source>Enter Hex</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::EditPAfterDialog</name>
+    <message>
+        <location line="+176"/>
+        <source>MusE: Enter Poly Aftertouch</source>
+        <translation type="unfinished">Muse: Entrer la Pression polyphonique</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Time Position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Pitch</source>
+        <translation type="unfinished">Hauteur</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Pressure</source>
+        <translation type="unfinished">Pression</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::EditToolBar</name>
+    <message>
+        <location filename="../../muse/widgets/tools.cpp" line="+33"/>
+        <source>select Pointer Tool:
+with the pointer tool you can:
+  select parts
+  move parts
+  copy parts</source>
+        <translation type="unfinished">Choisir l&apos;Outil de Pointage:
+avec l&apos;outil de pointage vous pouvez:
+  choisir des pièces
+  déplacer des pièces
+  copier des pièces</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>select Pencil Tool:
+with the pencil tool you can:
+  create new parts
+  modify length of parts</source>
+        <translation type="unfinished">Choisir l&apos;Outil Crayon
+avec le crayon vous pouvez:
+  créer de nouvelles pièces
+  modifier la longueur des pièces</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>select Delete Tool:
+with the delete tool you can delete parts</source>
+        <translation type="unfinished">choisir l&apos;Outil Gomme:
+avec la gomme vous pouvez effacer les pièces</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>select Cut Tool:
+with the cut tool you can split a part</source>
+        <translation type="unfinished">Choisir l&apos;Outil Ciseaux
+avec les ciseaux vous pouver couper une pièce</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>select Glue Tool:
+with the glue tool you can glue two parts</source>
+        <translation type="unfinished">Choisir l&apos;Outil Colle:
+avec la colle vous pouvez coller deux pièces ensemble</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>select Score Tool:
+</source>
+        <translation type="unfinished">Choisir l&apos;Outil Partition</translation>
+    </message>
     <message>
         <location line="+1"/>
-        <source>Read</source>
+        <source>select Quantize Tool:
+insert display quantize event</source>
+        <translation type="unfinished">Choisir l&apos;Outil Quantisation:
+pour voir les marques de quantisation</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>select Drawing Tool</source>
+        <translation type="unfinished">Choisir l&apos;Outil de Dessin</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>select Muting Tool:
+click on part to mute/unmute</source>
+        <translation type="unfinished">Choisir l&apos;Outil Silence:
+cliquez sur une pièces pour la rendre muette ou pas.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Manipulate automation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Touch</source>
+        <source>Cursor tool</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
+        <source>pointer</source>
+        <translation type="unfinished">pointeur</translation>
+    </message>
+    <message>
         <location line="+1"/>
-        <source>Write</source>
+        <source>pencil</source>
+        <translation type="unfinished">crayon</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>eraser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>automation type</source>
+        <location line="+1"/>
+        <source>cutter</source>
+        <translation type="unfinished">ciseaux</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>score</source>
+        <translation type="unfinished">partition</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>glue</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>quantize</source>
+        <translation type="unfinished">quantisation</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>draw</source>
+        <translation type="unfinished">dessin</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>mute parts</source>
+        <translation type="unfinished">silence</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>edit automation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Edit Tools</source>
+        <translation type="unfinished">Outils d&apos;Edition</translation>
+    </message>
 </context>
 <context>
-    <name>MusEMixer::EffectRack</name>
+    <name>MusEGui::EffectRack</name>
     <message>
         <location filename="../../muse/mixer/rack.cpp" line="+193"/>
         <source>effect rack</source>
@@ -11527,193 +11050,836 @@ sélectionnées</translation>
     </message>
 </context>
 <context>
-    <name>MusEMixer::MidiStrip</name>
+    <name>MusEGui::GlobalSettingsConfig</name>
     <message>
-        <location filename="../../muse/mixer/mstrip.cpp" line="+109"/>
-        <location line="+121"/>
-        <location line="+158"/>
-        <source>off</source>
+        <location filename="../../muse/widgets/genset.cpp" line="+561"/>
+        <source>Selects instruments directory</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::Header</name>
     <message>
-        <location line="-278"/>
-        <location line="+122"/>
-        <source>double click on/off</source>
+        <location filename="../../muse/widgets/header.cpp" line="+164"/>
+        <source>Track Info Columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::LMaster</name>
+    <message>
+        <location filename="../../muse/master/lmaster.cpp" line="+158"/>
+        <source>MusE: Mastertrack</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-42"/>
-        <source>VariationSend</source>
+        <location line="+13"/>
+        <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Var</source>
-        <translation type="unfinished">Var</translation>
+        <location line="+4"/>
+        <source>Insert Tempo</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>ReverbSend</source>
+        <source>Insert Signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Rev</source>
-        <translation type="unfinished">Rev</translation>
+        <location line="+1"/>
+        <source>Insert Key</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>ChorusSend</source>
+        <source>Edit Positon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Cho</source>
-        <translation type="unfinished">Cho</translation>
+        <location line="+1"/>
+        <source>Edit Value</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
-        <source>dB</source>
-        <translation type="unfinished">dB</translation>
+        <location line="+1"/>
+        <source>Delete Event</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
-        <source>Pan/Balance</source>
+        <location line="+3"/>
+        <source>Window &amp;Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Pan</source>
-        <translation type="unfinished">Pan</translation>
+        <location line="+23"/>
+        <source>Undo/Redo tools</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>record</source>
+        <location line="+4"/>
+        <source>Edit tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>mute</source>
-        <translation type="unfinished">silence</translation>
+        <location line="+5"/>
+        <source>Tempo</source>
+        <translation type="unfinished">Tempo</translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>solo mode</source>
+        <location line="+1"/>
+        <source>Timesig</source>
+        <translation type="unfinished">Signature Temporelle</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+67"/>
-        <source>iR</source>
+        <location line="+1"/>
+        <source>new tempo</source>
+        <translation type="unfinished">nouveau tempo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>new signature</source>
+        <translation type="unfinished">nouvelle signature</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>new key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>input routing</source>
+        <location line="+5"/>
+        <source>panic</source>
+        <translation type="unfinished">panique!</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>transport</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>oR</source>
+        <location line="+16"/>
+        <source>Meter</source>
+        <translation type="unfinished">Métrage</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Time</source>
+        <translation type="unfinished">Temps</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Type</source>
+        <translation type="unfinished">Type</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Value</source>
+        <translation type="unfinished">Valeur</translation>
+    </message>
+    <message>
+        <location line="+391"/>
+        <source>Reposition of the initial tempo and signature events is not allowed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>output routing</source>
-        <translation type="unfinished">chemin de sortie (routing)</translation>
+        <location line="+54"/>
+        <source>MusE: List Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Input error, conversion not OK or value out of range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Reposition of tempo and signature events to start position is not allowed!</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::BigTime</name>
+    <name>MusEGui::ListEdit</name>
     <message>
-        <location filename="../../muse/widgets/bigtime.cpp" line="+60"/>
-        <source>format display</source>
+        <location filename="../../muse/liste/listedit.cpp" line="+477"/>
+        <source>insert Note</source>
+        <translation type="unfinished">insére une note</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>insert SysEx</source>
+        <translation type="unfinished">insère une commande midi SysEx</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>insert Ctrl</source>
+        <translation type="unfinished">insére un caractère de Contrôle</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>insert Meta</source>
+        <translation type="unfinished">insére une balise Meta</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>insert Channel Aftertouch</source>
+        <translation type="unfinished">insére un canal de Pression (AfterTouch)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>insert Poly Aftertouch</source>
+        <translation type="unfinished">insère une Pression (AfterTouch)
+polyphonique</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>bar</source>
+        <location line="+5"/>
+        <source>Cut</source>
+        <translation type="unfinished">Couper</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Copy</source>
+        <translation type="unfinished">Copier</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Paste</source>
+        <translation type="unfinished">Coller</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Delete Events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
+        <source>Window &amp;Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Undo/Redo tools</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Insert tools</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>panic</source>
+        <translation type="unfinished">panique!</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>transport</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Tick</source>
+        <translation type="unfinished">Tic</translation>
+    </message>
+    <message>
         <location line="+1"/>
-        <source>beat</source>
+        <source>Bar</source>
+        <translation type="unfinished">Mesure</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Type</source>
+        <translation type="unfinished">Type</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Val A</source>
+        <translation type="unfinished">Val A</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Val B</source>
+        <translation type="unfinished">Val B</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Val C</source>
+        <translation type="unfinished">Val C</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Len</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Comment</source>
+        <translation type="unfinished">Commentaire</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::MPConfig</name>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="+101"/>
+        <location line="+176"/>
+        <source>Default input connections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-175"/>
+        <location line="+66"/>
+        <source>Are you sure you want to apply to all existing midi tracks now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-1"/>
+        <location line="+148"/>
+        <source>Default output connections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-37"/>
+        <location line="+38"/>
+        <source>Setting will apply to new midi tracks.
+Do you want to apply to all existing midi tracks now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>MusE: bad device name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>please choose a unique device name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+72"/>
+        <location line="+859"/>
+        <source>in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-836"/>
+        <location line="+827"/>
+        <source>out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-771"/>
+        <source>Show first aliases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+6"/>
-        <source>tick</source>
+        <source>Show second aliases</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-4"/>
-        <source>minute</source>
-        <translation type="unfinished">minute</translation>
+        <location line="+130"/>
+        <location line="+42"/>
+        <source>Toggle all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-38"/>
+        <location line="+43"/>
+        <source>Change all tracks now</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Create Jack device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+229"/>
+        <location line="+29"/>
+        <source>Port Number</source>
+        <translation type="unfinished">Numéro de port</translation>
+    </message>
+    <message>
+        <location line="-28"/>
+        <source>Enable gui</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>second</source>
-        <translation type="unfinished">second</translation>
+        <source>Enable reading</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Enable writing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Port instrument</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi device name. Click to edit (Jack)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Connections from Jack Midi outputs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Connections to Jack Midi inputs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Auto-connect these channels to new midi tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+3"/>
-        <source>frame</source>
-        <translation type="unfinished">trame (frame)</translation>
+        <source>Auto-connect new midi tracks to these channels</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-2"/>
-        <source>subframe</source>
-        <translation type="unfinished">trame fine (subframe)</translation>
+        <location line="+2"/>
+        <source>Auto-connect new midi tracks to this channel</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <source>MusE: Bigtime</source>
-        <translation type="unfinished">MusE: GrandChrono</translation>
+        <location line="+2"/>
+        <source>Device state</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Enable gui for device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Enable reading from device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Enable writing to device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Name of the midi device associated with this port number. Click to edit Jack midi name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Instrument connected to port</source>
+        <translation type="unfinished">Instrument connecté au port</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Connections from Jack Midi output ports</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Connections to Jack Midi input ports</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Auto-connect these channels, on this port, to new midi tracks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Connect new midi tracks to these channels, on this port.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Connect new midi tracks to this channel, on this port.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>State: result of opening the device</source>
+        <translation type="unfinished">Etat: résultat de l&apos;ouverture du port</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Port</source>
+        <translation type="unfinished">Port</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>GUI</source>
+        <translation type="unfinished">GUI</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>I</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>O</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Instrument</source>
+        <translation type="unfinished">Instrument</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Device Name</source>
+        <translation type="unfinished">Nom du Périphérique</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>In routes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Out routes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Def in ch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Def out ch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>State</source>
+        <translation type="unfinished">Etat</translation>
+    </message>
+    <message>
+        <location line="+84"/>
+        <source>&lt;unknown&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+87"/>
+        <location line="+71"/>
+        <source>&lt;none&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::EditToolBar</name>
+    <name>MusEGui::MTScale</name>
     <message>
-        <location filename="../../muse/widgets/tools.cpp" line="+17"/>
-        <source>Edit Tools</source>
-        <translation type="unfinished">Outils d&apos;Edition</translation>
+        <location filename="../../muse/widgets/mtscale.cpp" line="+44"/>
+        <source>bar scale</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::GlobalSettingsConfig</name>
+    <name>MusEGui::MTScaleFlo</name>
     <message>
-        <location filename="../../muse/widgets/genset.cpp" line="+546"/>
-        <source>Selects instruments directory</source>
+        <location filename="../../muse/widgets/mtscale_flo.cpp" line="+44"/>
+        <source>bar scale</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::Header</name>
+    <name>MusEGui::MarkerView</name>
     <message>
-        <location filename="../../muse/widgets/header.cpp" line="+164"/>
-        <source>Track Info Columns</source>
+        <location filename="../../muse/marker/markerview.cpp" line="+175"/>
+        <source>MusE: Marker</source>
+        <translation type="unfinished">MusE: Marqueur</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>add marker</source>
+        <translation type="unfinished">Ajouter marqueur</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>delete marker</source>
+        <translation type="unfinished">Effacer Marqueur</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+6"/>
+        <source>Window &amp;Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Undo/Redo tools</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>edit tools</source>
+        <translation type="unfinished">outils d&apos;édition</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>panic</source>
+        <translation type="unfinished">panique!</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>transport</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Bar:Beat:Tick</source>
+        <translation type="unfinished">Mesure:Résolution(Beat):Tic</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hr:Mn:Sc:Fr:Sf</source>
+        <translation type="unfinished">Hr:Mn:Sc:Fr:Sf</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lock</source>
+        <translation type="unfinished">Verrouillage</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Text</source>
+        <translation type="unfinished">Texte</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Marker Properties</source>
+        <translation type="unfinished">Propriétés du Marqueur</translation>
+    </message>
 </context>
 <context>
-    <name>MusEWidget::MTScale</name>
+    <name>MusEGui::MasterEdit</name>
     <message>
-        <location filename="../../muse/widgets/mtscale.cpp" line="+44"/>
-        <source>bar scale</source>
+        <location filename="../../muse/master/masteredit.cpp" line="+107"/>
+        <source>MusE: Mastertrack</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+7"/>
+        <source>Window &amp;Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Undo/Redo tools</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>panic</source>
+        <translation type="unfinished">panique!</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>transport</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Enable master</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable usage of master track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Info</source>
+        <translation type="unfinished">Info</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cursor</source>
+        <translation type="unfinished">Curseur</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>time at cursor position</source>
+        <translation type="unfinished">Temps à la position du curseur</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>tempo at cursor position</source>
+        <translation type="unfinished">Temps � la position du curseur</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Bar</source>
+        <translation type="unfinished">Mesure</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Snap</source>
+        <translation type="unfinished">Aligne</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>CurPos </source>
+        <translation type="unfinished">PosCur</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>tempo at current position</source>
+        <translation type="unfinished">tempo � la position en cours</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>time signature at current position</source>
+        <translation type="unfinished">Signature temporelle à la position en cours</translation>
+    </message>
 </context>
 <context>
-    <name>MusEWidget::MTScaleFlo</name>
+    <name>MusEGui::MidiInputTransformDialog</name>
     <message>
-        <location filename="../../muse/widgets/mtscale_flo.cpp" line="+44"/>
-        <source>bar scale</source>
+        <location filename="../../muse/mplugins/midiitransform.cpp" line="+953"/>
+        <location line="+2"/>
+        <source>New</source>
+        <translation type="unfinished">Nouveau</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::MidiStrip</name>
+    <message>
+        <location filename="../../muse/mixer/mstrip.cpp" line="+110"/>
+        <location line="+121"/>
+        <location line="+137"/>
+        <source>off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-257"/>
+        <location line="+122"/>
+        <source>double click on/off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-42"/>
+        <source>VariationSend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Var</source>
+        <translation type="unfinished">Var</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>ReverbSend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Rev</source>
+        <translation type="unfinished">Rev</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>ChorusSend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Cho</source>
+        <translation type="unfinished">Cho</translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>dB</source>
+        <translation type="unfinished">dB</translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Pan/Balance</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+0"/>
+        <source>Pan</source>
+        <translation type="unfinished">Pan</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>mute</source>
+        <translation type="unfinished">silence</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>solo mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
+        <source>iR</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>input routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>oR</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>output routing</source>
+        <translation type="unfinished">chemin de sortie (routing)</translation>
+    </message>
 </context>
 <context>
-    <name>MusEWidget::MidiSyncConfig</name>
+    <name>MusEGui::MidiSyncConfig</name>
     <message>
         <location filename="../../muse/widgets/midisyncimpl.cpp" line="+58"/>
         <location line="+29"/>
@@ -12037,24 +12203,800 @@ Apply sync settings?</source>
     </message>
 </context>
 <context>
-    <name>MusEWidget::MidiTrackInfo</name>
+    <name>MusEGui::MidiTrackInfo</name>
     <message>
-        <location filename="../../muse/widgets/mtrackinfo.cpp" line="+319"/>
-        <location line="+1046"/>
+        <location filename="../../muse/widgets/mtrackinfo.cpp" line="+335"/>
+        <location line="+1068"/>
         <source>&lt;unknown&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::MixdownFileDialog</name>
+    <name>MusEGui::MidiTransformerDialog</name>
+    <message>
+        <location filename="../../muse/miditransform.cpp" line="+464"/>
+        <location line="+2"/>
+        <source>New</source>
+        <translation type="unfinished">Nouveau</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::MixdownFileDialog</name>
     <message>
-        <location filename="../../muse/widgets/mixdowndialog.cpp" line="+118"/>
+        <location filename="../../muse/widgets/mixdowndialog.cpp" line="+122"/>
         <source>Wave Files (*.wav);;All Files (*)</source>
         <translation type="unfinished">Fichiers Wave (*.wav);;Tous les Fichiers (*)</translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::NoteInfo</name>
+    <name>MusEGui::MusE</name>
+    <message>
+        <location filename="../../muse/app.cpp" line="+137"/>
+        <location line="+16"/>
+        <source>Failed to start audio!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-15"/>
+        <source>Was not able to start audio, check if jack is running.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Timeout waiting for audio to run. Check if jack is running.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+220"/>
+        <source>Und&amp;o</source>
+        <translation type="unfinished">&amp;Annuler</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Re&amp;do</source>
+        <translation type="unfinished">Re&amp;faire</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>undo last change to song</source>
+        <translation type="unfinished">Annuler le dernier changement sur la chanson</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>redo last undo</source>
+        <translation type="unfinished">Refaire ce qui a été annulé en dernier</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Loop</source>
+        <translation type="unfinished">Boucle</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>loop between left mark and right mark</source>
+        <translation type="unfinished">Boucler entre les marqueurs gauche et droit</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Punchin</source>
+        <translation type="unfinished">Punch-In</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>record starts at left mark</source>
+        <translation type="unfinished">l&apos;enregistrement démarre au marqueur
+gauche</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Punchout</source>
+        <translation type="unfinished">Punch-Out</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>record stops at right mark</source>
+        <translation type="unfinished">l&apos;enregistrement s&apos;arrète au marqueur
+droit</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>rewind to start position</source>
+        <translation type="unfinished">revenir � la position de départ</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Rewind</source>
+        <translation type="unfinished">Rembobiner</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>rewind current position</source>
+        <translation type="unfinished">revenir � la position en cours</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Forward</source>
+        <translation type="unfinished">Avance</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>move current position</source>
+        <translation type="unfinished">déplacer la position en cours</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Stop</source>
+        <translation type="unfinished">Stop</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop sequencer</source>
+        <translation type="unfinished">arréter le séquenceur</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Play</source>
+        <translation type="unfinished">Jouer</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>start sequencer play</source>
+        <translation type="unfinished">démarrer la lecture du séquenceur</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>to record press record and then play</source>
+        <translation type="unfinished">pour enregistrer, presser Enregistrement (Record) puis
+Lecture (Play)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+238"/>
+        <source>Panic</source>
+        <translation type="unfinished">Panique!</translation>
+    </message>
+    <message>
+        <location line="-236"/>
+        <source>send note off to all midi channels</source>
+        <translation type="unfinished">envoyer ordre de relachement de note � tous les canaux
+midi</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>&amp;New</source>
+        <translation type="unfinished">&amp;Nouveau</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+1"/>
+        <source>Create New Song</source>
+        <translation type="unfinished">Créer une nouvelle chanson</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Open</source>
+        <translation type="unfinished">&amp;Ouvrir</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+2"/>
+        <source>Click this button to open a &lt;em&gt;new song&lt;/em&gt;.&lt;br&gt;You can also select the &lt;b&gt;Open command&lt;/b&gt; from the File menu.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Open &amp;Recent</source>
+        <translation type="unfinished">Ouvrir &amp;Récent</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+1030"/>
+        <location line="+1255"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-2283"/>
+        <location line="+3"/>
+        <source>Click this button to save the song you are editing.  You will be prompted for a file name.
+You can also select the Save command from the File menu.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Save &amp;As</source>
+        <translation type="unfinished">Enregistrer &amp;Sous</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Import Midifile</source>
+        <translation type="unfinished">Importer fichier MIDI</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Export Midifile</source>
+        <translation type="unfinished">Exporter fichier MIDI</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Import Part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../../muse/wave.cpp" line="+1158"/>
+        <source>Import Wave File</source>
+        <translation type="unfinished">Importer fichier WAV</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Find unused wave files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Quit</source>
+        <translation type="unfinished">&amp;Quitter</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Song Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Transport Panel</source>
+        <translation type="unfinished">Panneau de Contrôle</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Bigtime Window</source>
+        <translation type="unfinished">Fenêtre GrandeHorloge</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Mixer A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Mixer B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cliplist</source>
+        <translation type="unfinished">ListClip</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Marker View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Arranger View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Fullscreen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Plugins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit Instrument</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Input Plugins</source>
+        <translation type="unfinished">Plugins d&apos;Entrée</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Transpose</source>
+        <translation type="unfinished">Transposition</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi Input Transform</source>
+        <translation type="unfinished">Transformations Entrée MIDI</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi Input Filter</source>
+        <translation type="unfinished">Filtres pour l&apos;Entrée MIDI</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi Remote Control</source>
+        <translation type="unfinished">Contrôle MIDI à distance</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Rhythm Generator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Reset Instr.</source>
+        <translation type="unfinished">Ré-initialisation des Instruments</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Init Instr.</source>
+        <translation type="unfinished">Init. Instr.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Local Off</source>
+        <translation type="unfinished">Local Off</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Bounce to Track</source>
+        <translation type="unfinished">Rebondir (bounce) sur la piste</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bounce to File</source>
+        <translation type="unfinished">Rebondir (bounce) sur Fichier</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Restart Audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Mixer Automation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Take Snapshot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Clear Automation Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Cascade</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>In rows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>In columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Global Settings</source>
+        <translation type="unfinished">Paramètres Généraux</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Configure Shortcuts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Follow Song</source>
+        <translation type="unfinished">suivre la chanson</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Don&apos;t Follow Song</source>
+        <translation type="unfinished">Ne pas suivre la chanson</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Follow Page</source>
+        <translation type="unfinished">Défilement par page</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Follow Continuous</source>
+        <translation type="unfinished">Défilement fin</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Metronome</source>
+        <translation type="unfinished">Métronome</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi Sync</source>
+        <translation type="unfinished">Synchro MIDI</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi File Import/Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Appearance Settings</source>
+        <translation type="unfinished">Apparence</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi Ports / Soft Synth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>&amp;Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;MusE Homepage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Report Bug...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;About MusE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+99"/>
+        <source>File Buttons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Undo/Redo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Transport</source>
+        <translation type="unfinished">Transport</translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>&amp;File</source>
+        <translation type="unfinished">&amp;Fichier</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>&amp;View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>&amp;Midi</source>
+        <translation type="unfinished">&amp;MIDI</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>&amp;Audio</source>
+        <translation type="unfinished">&amp;Audio</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>A&amp;utomation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&amp;Windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>MusE Se&amp;ttings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>&amp;Help</source>
+        <translation type="unfinished">&amp;Aide</translation>
+    </message>
+    <message>
+        <location line="+289"/>
+        <source>Cannot read template</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>File open error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>File read error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Unknown File Format: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+130"/>
+        <location line="+437"/>
+        <location line="+914"/>
+        <source>MusE: Song: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-1317"/>
+        <source>MusE: load project</source>
+        <translation type="unfinished">Muse: charger Projet</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>MusE: load template</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>MusE: Write File failed</source>
+        <translation type="unfinished">MusE: échec de l&apos;enregistrement</translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>The current Project contains unsaved data
+Save Current Project?</source>
+        <translation type="unfinished">Le Projet en cours contient des données 
+non encore sauvegardées. Enregistrer?</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+1255"/>
+        <source>S&amp;kip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-1255"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+265"/>
+        <location line="+13"/>
+        <source>MusE: Save As</source>
+        <translation type="unfinished">MusE: enregistrer sous</translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <location line="+160"/>
+        <source>Nothing to edit</source>
+        <translation type="unfinished">Rien � éditer</translation>
+    </message>
+    <message>
+        <location line="+494"/>
+        <location line="+10"/>
+        <location line="+31"/>
+        <location line="+34"/>
+        <location line="+8"/>
+        <source>MusE: Bounce to Track</source>
+        <translation type="unfinished">MusE: Rebondir sur la piste (bounce)</translation>
+    </message>
+    <message>
+        <location line="-82"/>
+        <source>No wave tracks found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+105"/>
+        <source>No audio output tracks found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-74"/>
+        <source>Select one audio output track,
+and one target wave track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <source>Select one target wave track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Select one target wave track,
+and one audio output track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <location line="+25"/>
+        <source>MusE: Bounce to File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Select one audio output track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>MusE: Bounce</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>set left/right marker for bounce range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+82"/>
+        <source>The current Project contains unsaved data
+Load overwrites current Project:
+Save Current Project?</source>
+        <translation type="unfinished">Le Projet en cours contient des données non 
+sauvegardées. Voulez-vous l&apos;enregistrer 
+avant d&apos;en ouvrir un autre?</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location filename="../../muse/importmidi.cpp" line="+85"/>
+        <source>&amp;Abort</source>
+        <translation type="unfinished">&amp;Annuler</translation>
+    </message>
+    <message>
+        <location filename="../../muse/exportmidi.cpp" line="+147"/>
+        <source>MusE: Export Midi</source>
+        <translation type="unfinished">MusE: exporter fichier MIDI</translation>
+    </message>
+    <message>
+        <location filename="../../muse/help.cpp" line="+50"/>
+        <source>no help found at: </source>
+        <translation type="unfinished">Pas d&apos;aide trouvée ici:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>MusE: Open Help</source>
+        <translation type="unfinished">MusE: Ouvrir l&apos;Aide</translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>Unable to launch help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>For some reason MusE has to launch the default
+browser on your machine.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/importmidi.cpp" line="-12"/>
+        <source>MusE: Import Midi</source>
+        <translation type="unfinished">MusE: importer fichier MIDI</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Add midi file to current project?
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Add to Project</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>reading midifile
+  </source>
+        <translation type="unfinished">lecture du fichier MIDI
+</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>
+failed: </source>
+        <translation type="unfinished">
+échec:</translation>
+    </message>
+    <message>
+        <location line="+357"/>
+        <source>Import part is only valid for midi and wave tracks!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>MusE: load part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>No track selected for import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <location line="+121"/>
+        <source>%n part(s) out of %1 could not be imported.
+Likely the selected track is the wrong type.</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location line="+1"/>
+        <source>%n part(s) could not be imported.
+Likely the selected track is the wrong type.</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <location filename="../../muse/wave.cpp" line="-6"/>
+        <source>to import an audio file you have first to selecta wave track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Import Wavefile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>This wave file has a samplerate of %1,
+as opposed to current setting %2.
+Do you still want to import it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>&amp;Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>&amp;No</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::NoteInfo</name>
     <message>
         <location filename="../../muse/widgets/noteinfo.cpp" line="+44"/>
         <source>Note Info</source>
@@ -12087,35 +13029,558 @@ Apply sync settings?</source>
     </message>
 </context>
 <context>
-    <name>MusEWidget::RoutePopupMenu</name>
+    <name>MusEGui::PartCanvas</name>
+    <message>
+        <location filename="../../muse/arranger/pcanvas.cpp" line="+355"/>
+        <source>Cannot copy/move/clone to different Track-Type</source>
+        <translation type="unfinished">Ne peut copier/déplacer vers une type de Piste
+différent</translation>
+    </message>
+    <message>
+        <location line="+280"/>
+        <source>C&amp;ut</source>
+        <translation type="unfinished">Co&amp;uper</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Copy</source>
+        <translation type="unfinished">&amp;Copier</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>s&amp;elect </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>clones</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>rename</source>
+        <translation type="unfinished">renommer</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>color</source>
+        <translation type="unfinished">couleur</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>delete</source>
+        <translation type="unfinished">effacer</translation>
+    </message>
     <message>
-        <location filename="../../muse/widgets/routepopup.cpp" line="+223"/>
         <location line="+2"/>
-        <location line="+125"/>
+        <source>split</source>
+        <translation type="unfinished">séparer</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>glue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>de-clone</source>
+        <translation type="unfinished">annuler-clônage</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <source>save part to disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-2"/>
+        <source>wave edit</source>
+        <translation type="unfinished">édition wav</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>file info</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+88"/>
+        <source>MusE: save part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>Part name: %1
+Files:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <location line="+2136"/>
+        <source>%n part(s) out of %1 could not be pasted.
+Likely the selected track is the wrong type.</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location line="+1"/>
+        <source>%n part(s) could not be pasted.
+Likely the selected track is the wrong type.</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Cannot paste: multiple tracks selected</source>
+        <translation type="unfinished">Ne peut coller: plusieurs pistes
+sélectionnées</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Cannot paste: no track selected</source>
+        <translation type="unfinished">Ne peut coller: pas de piste choisie</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Can only paste to midi/drum track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Can only paste to wave track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Can only paste to midi or wave track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Cannot paste: wrong data type</source>
+        <translation type="unfinished">Ne peut coller: mauvais type de donnée</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::PasteDialog</name>
+    <message numerus="yes">
+        <location filename="../../muse/widgets/pastedialog.cpp" line="+81"/>
+        <source>%n quarter(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>%1 quarter</source>
+        <comment>for floating-point arguments like 1.5</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>%1 quarters</source>
+        <comment>for floating-point arguments like 1.5</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::PasteEventsDialog</name>
+    <message numerus="yes">
+        <location filename="../../muse/widgets/pasteeventsdialog.cpp" line="+95"/>
+        <source>%n quarter(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>%1 quarter</source>
+        <comment>for floating-point arguments like 1.5</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>%1 quarters</source>
+        <comment>for floating-point arguments like 1.5</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::PianoRoll</name>
+    <message>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="+100"/>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>C&amp;ut</source>
+        <translation type="unfinished">Co&amp;uper</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Copy</source>
+        <translation type="unfinished">&amp;Copier</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Copy events in range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Paste (with dialog)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Delete &amp;Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>&amp;Select</source>
+        <translation type="unfinished">&amp;Sélectionner</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select &amp;All</source>
+        <translation type="unfinished">Selectionner &amp;Tout</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Deselect All</source>
+        <translation type="unfinished">&amp;Dé-selectionner tout</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Invert &amp;Selection</source>
+        <translation type="unfinished">Inverser la &amp;Sélection</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>&amp;Inside Loop</source>
+        <translation type="unfinished">A l&apos;&amp;intérieur de la Boucle</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Outside Loop</source>
+        <translation type="unfinished">A l&apos;e&amp;xtérieur de la Boucle</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&amp;Previous Part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Next Part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Fu&amp;nctions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Quantize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Modify Note Length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Modify Velocity</source>
+        <translation type="unfinished">Modifier la vélocité</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Crescendo/Decrescendo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Transpose</source>
+        <translation type="unfinished">Transposition</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Erase Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Move Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Set Fixed Length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Delete Overlaps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Legato</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Plugins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Window &amp;Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Event Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>&amp;Blue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Pitch colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Velocity colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Pianoroll tools</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Step Record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Midi Input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Play Events</source>
+        <translation type="unfinished">Jouer Evènements</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>panic</source>
+        <translation type="unfinished">panique!</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>transport</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>ctrl</source>
+        <translation type="unfinished">ctrl</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Add Controller View</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::PluginDialog</name>
+    <message>
+        <location filename="../../muse/plugin.cpp" line="+3137"/>
+        <source>MusE: select plugin</source>
+        <translation type="unfinished">MusE: choisir plugin</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Lib</source>
+        <translation type="unfinished">Lib</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Label</source>
+        <translation type="unfinished">Label</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Name</source>
+        <translation type="unfinished">Nom</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>AI</source>
+        <translation type="unfinished">AI</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>AO</source>
+        <translation type="unfinished">AO</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>CI</source>
+        <translation type="unfinished">CI</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>CO</source>
+        <translation type="unfinished">CO</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>IP</source>
+        <translation type="unfinished">IP</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>id</source>
+        <translation type="unfinished">id</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Maker</source>
+        <translation type="unfinished">Fabrique</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copyright</source>
+        <translation type="unfinished">Copyright</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Ok</source>
+        <translation type="unfinished">Ok</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Annuler</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Mono and Stereo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Stereo</source>
+        <translation type="unfinished">Stéréo</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Mono</source>
+        <translation type="unfinished">Mono</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Show All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Select which types of plugins should be visible in the list.&lt;br&gt;Note that using mono plugins on stereo tracks is not a problem, two will be used in parallell.&lt;br&gt;Also beware that the &apos;all&apos; alternative includes plugins that probably not are usable by MusE.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Search in &apos;Label&apos; and &apos;Name&apos;:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::PluginGui</name>
+    <message>
+        <location line="+207"/>
+        <source>File Buttons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Load Preset</source>
+        <translation type="unfinished">Charger réglages</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Save Preset</source>
+        <translation type="unfinished">Enregistrer réglages</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location line="+3"/>
+        <source>bypass plugin</source>
+        <translation type="unfinished">Plugin de Direct (bypass)</translation>
+    </message>
+    <message>
+        <location line="+554"/>
+        <source>MusE: load preset</source>
+        <translation type="unfinished">MusE: charger réglages</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Error reading preset. Might not be right type for this plugin</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>MusE: save preset</source>
+        <translation type="unfinished">MusE: enregistrer réglages</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::RoutePopupMenu</name>
+    <message>
+        <location filename="../../muse/widgets/routepopup.cpp" line="+230"/>
+        <location line="+2"/>
+        <location line="+132"/>
         <location line="+78"/>
         <location line="+57"/>
-        <location line="+53"/>
-        <location line="+682"/>
+        <location line="+60"/>
+        <location line="+685"/>
         <location line="+85"/>
         <source>Channel</source>
         <translation type="unfinished">Canal</translation>
     </message>
     <message>
-        <location line="-274"/>
-        <location line="+224"/>
+        <location line="-270"/>
+        <location line="+220"/>
         <location line="+85"/>
         <source>Soloing chain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-307"/>
-        <location line="+224"/>
+        <location line="-303"/>
+        <location line="+220"/>
         <source>Audio returns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-185"/>
-        <source>Warning: No midi input devices!</source>
+        <location line="-182"/>
+        <source>Warning: No input devices!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -12124,7 +13589,7 @@ Apply sync settings?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+42"/>
         <location line="+33"/>
         <source>&lt;none&gt;</source>
         <translation type="unfinished"></translation>
@@ -12151,9 +13616,315 @@ Apply sync settings?</source>
     </message>
 </context>
 <context>
-    <name>MusEWidget::ScrollScale</name>
+    <name>MusEGui::ScoreCanvas</name>
+    <message>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="+1313"/>
+        <source>Treble</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Bass</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Grand Staff</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove staff</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2471"/>
+        <source>Ambiguous part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There are two or more possible parts you could add the note to, but none matches the selected part. Please select the destination part by clicking on any note belonging to it and try again, or add a new stave containing only the destination part.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>No part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There are no parts you could add the note to.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::ScoreEdit</name>
+    <message>
+        <location line="-3557"/>
+        <source>Undo/Redo tools</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Step recording tools</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Step Record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>panic</source>
+        <translation type="unfinished">panique!</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>transport</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Note settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Note length:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>last</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <location line="+1"/>
+        <location line="+325"/>
+        <source>Apply to new notes:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-324"/>
+        <location line="+328"/>
+        <source>Apply to selected notes:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-321"/>
+        <source>Velocity:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Off-Velocity:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Quantisation settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Quantisation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Pixels per whole:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>C&amp;ut</source>
+        <translation type="unfinished">Co&amp;uper</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Copy</source>
+        <translation type="unfinished">&amp;Copier</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Copy events in range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Paste (with dialog)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Delete &amp;Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>&amp;Select</source>
+        <translation type="unfinished">&amp;Sélectionner</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select &amp;All</source>
+        <translation type="unfinished">Selectionner &amp;Tout</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Deselect All</source>
+        <translation type="unfinished">&amp;Dé-selectionner tout</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Invert &amp;Selection</source>
+        <translation type="unfinished">Inverser la &amp;Sélection</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>&amp;Inside Loop</source>
+        <translation type="unfinished">A l&apos;&amp;intérieur de la Boucle</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Outside Loop</source>
+        <translation type="unfinished">A l&apos;e&amp;xtérieur de la Boucle</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Fu&amp;nctions</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <location filename="../../muse/widgets/scrollscale.cpp" line="+316"/>
+        <location line="+2"/>
+        <source>&amp;Quantize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Change note &amp;length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Change note &amp;velocity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Crescendo/Decrescendo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transpose</source>
+        <translation type="unfinished">Transposition</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Erase Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Move Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Set Fixed Length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Delete Overlaps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Legato</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Window &amp;Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Note head &amp;colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Black</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Velocity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Set up &amp;preamble</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Display &amp;key signature</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Display &amp;time signature</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Set Score &amp;name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+224"/>
+        <location line="+1"/>
+        <source>Enter the new score title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Changing score title failed:
+the selected title is not unique</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::ScrollScale</name>
+    <message>
+        <location filename="../../muse/widgets/scrollscale.cpp" line="+318"/>
         <source>next page</source>
         <translation type="unfinished">page suivante</translation>
     </message>
@@ -12169,7 +13940,7 @@ Apply sync settings?</source>
     </message>
 </context>
 <context>
-    <name>MusEWidget::ShortcutCaptureDialog</name>
+    <name>MusEGui::ShortcutCaptureDialog</name>
     <message>
         <location filename="../../muse/widgets/shortcutcapturedialog.cpp" line="+55"/>
         <source>Ok</source>
@@ -12182,7 +13953,7 @@ Apply sync settings?</source>
     </message>
     <message>
         <location line="+52"/>
-        <source>Shortcut conflicts with </source>
+        <source>Shortcut conflicts with %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -12192,7 +13963,7 @@ Apply sync settings?</source>
     </message>
 </context>
 <context>
-    <name>MusEWidget::SigScale</name>
+    <name>MusEGui::SigScale</name>
     <message>
         <location filename="../../muse/widgets/sigscale.cpp" line="+44"/>
         <source>signature scale</source>
@@ -12200,9 +13971,155 @@ Apply sync settings?</source>
     </message>
 </context>
 <context>
-    <name>MusEWidget::Toolbar1</name>
+    <name>MusEGui::Strip</name>
+    <message>
+        <location filename="../../muse/mixer/strip.cpp" line="+314"/>
+        <source>Remove track?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::TList</name>
+    <message>
+        <location filename="../../muse/arranger/tlist.cpp" line="+373"/>
+        <source>&lt;none&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>no clef</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Treble</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Bass</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Grand</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>MusE: bad trackname</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>please choose a unique track name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+172"/>
+        <location line="+1149"/>
+        <source>Update drummap?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-1148"/>
+        <source>Do you want to use same port for all instruments in the drummap?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+1149"/>
+        <source>&amp;Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-1149"/>
+        <location line="+1149"/>
+        <source>&amp;No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-1074"/>
+        <location line="+55"/>
+        <source>show gui</source>
+        <translation type="unfinished">montrer l&apos;interface</translation>
+    </message>
+    <message>
+        <location line="-46"/>
+        <location line="+55"/>
+        <source>show native gui</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+346"/>
+        <source>Treble clef</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bass clef</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Grand Staff</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Viewable automation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+131"/>
+        <source>Delete Track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Track Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Insert Track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+445"/>
+        <source>Midi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Drum</source>
+        <translation type="unfinished">Batterie</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Do you want to use same port and channel for all instruments in the drummap?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::TempoSig</name>
+    <message>
+        <location filename="../../muse/transport.cpp" line="+149"/>
+        <source>Tempo/Sig</source>
+        <translation type="unfinished">Tempo/Sig</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::Toolbar1</name>
+    <message>
+        <location filename="../../muse/widgets/tb1.cpp" line="+47"/>
+        <location line="+1"/>
+        <location line="+1"/>
+        <source>Off</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <location filename="../../muse/widgets/tb1.cpp" line="+21"/>
+        <location line="+21"/>
         <source>Solo</source>
         <translation type="unfinished">Solo</translation>
     </message>
@@ -12218,7 +14135,80 @@ Apply sync settings?</source>
     </message>
 </context>
 <context>
-    <name>MusEWidget::TrackComment</name>
+    <name>MusEGui::TopWin</name>
+    <message>
+        <location filename="../../muse/cobject.cpp" line="+64"/>
+        <source>As subwindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Shares tools and menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Fullscreen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+468"/>
+        <source>Piano roll</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>List editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Drum editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Master track editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Master track list editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Wave editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Clip list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Marker view</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Score editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Arranger</source>
+        <translation type="unfinished">Arrangeur</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&lt;unknown toplevel type&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::TrackComment</name>
     <message>
         <location filename="../../muse/widgets/comment.cpp" line="+58"/>
         <source>MusE: Track Comment</source>
@@ -12231,14 +14221,672 @@ Apply sync settings?</source>
     </message>
 </context>
 <context>
-    <name>MusEWidget::VisibleTracks</name>
+    <name>MusEGui::Transport</name>
+    <message>
+        <location filename="../../muse/transport.cpp" line="+105"/>
+        <source>Overdub</source>
+        <translation type="unfinished">Sur-enregistrement (Overdub)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+15"/>
+        <source>Replace</source>
+        <translation type="unfinished">Remplace</translation>
+    </message>
+    <message>
+        <location line="-10"/>
+        <source>Rec Mode</source>
+        <translation type="unfinished">Mode Enregistrement</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Normal</source>
+        <translation type="unfinished">Normal</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mix</source>
+        <translation type="unfinished">Mix</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Cycle Rec</source>
+        <translation type="unfinished">Enr. Cycle</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>punchin</source>
+        <translation type="unfinished">Punch-In</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>loop</source>
+        <translation type="unfinished">boucle</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>punchout</source>
+        <translation type="unfinished">Punch-Out</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+3"/>
+        <source>Punch In</source>
+        <translation type="unfinished">Punch-In</translation>
+    </message>
+    <message>
+        <location line="-2"/>
+        <location line="+3"/>
+        <source>Loop</source>
+        <translation type="unfinished">Boucle</translation>
+    </message>
+    <message>
+        <location line="-2"/>
+        <location line="+3"/>
+        <source>Punch Out</source>
+        <translation type="unfinished">Punch-Out</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Left Mark</source>
+        <translation type="unfinished">Marque Gauche</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Right Mark</source>
+        <translation type="unfinished">Marque Droite</translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>rewind to start</source>
+        <translation type="unfinished">rembobine au départ</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Click this button to rewind to start position</source>
+        <translation type="unfinished">Cliquez sur ce bouton pour revenir � la position de
+départ</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>rewind</source>
+        <translation type="unfinished">rembobiner</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Click this button to rewind</source>
+        <translation type="unfinished">Cliquez sur ce bouton pour revenir en
+arrière</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>forward</source>
+        <translation type="unfinished">avance</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Click this button to forward current play position</source>
+        <translation type="unfinished">Cliquez sur ce bouton pour avancer dans la
+lecture</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>stop</source>
+        <translation type="unfinished">stop</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Click this button to stop playback</source>
+        <translation type="unfinished">Cliquez sur ce bouton pour arréter la
+lecture</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>play</source>
+        <translation type="unfinished">jouer</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Click this button to start playback</source>
+        <translation type="unfinished">Cliquez sur ce bouton pour démarrer la
+lecture</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Click this button to enable recording</source>
+        <translation type="unfinished">Cliquez sur ce bouton pour activer
+l&apos;enregistrement</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>AC</source>
+        <translation type="unfinished">AC</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>quantize during record</source>
+        <translation type="unfinished">quantise pendant l&apos;enregistrement</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Click</source>
+        <translation type="unfinished">Clic</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>metronom click on/off</source>
+        <translation type="unfinished">clic du métronome oui/non</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Sync</source>
+        <translation type="unfinished">Synchro</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>external sync on/off</source>
+        <translation type="unfinished">synchro externe oui/non</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Jack</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Jack transport sync on/off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Master</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>use master track</source>
+        <translation type="unfinished">Utiliser la piste principale</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::VisibleTracks</name>
+    <message>
+        <location filename="../../muse/widgets/visibletracks.cpp" line="+36"/>
+        <location line="+9"/>
+        <source>Show wave tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-8"/>
+        <location line="+9"/>
+        <source>Show group tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <location filename="../../muse/widgets/visibletracks.cpp" line="+9"/>
+        <location line="-8"/>
+        <location line="+9"/>
+        <source>Show aux tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-8"/>
+        <location line="+9"/>
+        <source>Show input tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-8"/>
+        <location line="+9"/>
+        <source>Show output tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-8"/>
+        <location line="+9"/>
+        <source>Show midi tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-8"/>
+        <location line="+9"/>
+        <source>Show synth tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
         <source>Visible track types</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>MusEGui::WaveEdit</name>
+    <message>
+        <location filename="../../muse/waveedit/waveedit.cpp" line="+91"/>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Func&amp;tions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Gain</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>200%</source>
+        <translation type="obsolete">5 1/3&apos; {200%?}</translation>
+    </message>
+    <message>
+        <source>150%</source>
+        <translation type="obsolete">5 1/3&apos; {150%?}</translation>
+    </message>
+    <message>
+        <source>75%</source>
+        <translation type="obsolete">5 1/3&apos; {75%?}</translation>
+    </message>
+    <message>
+        <source>50%</source>
+        <translation type="obsolete">5 1/3&apos; {50%?}</translation>
+    </message>
+    <message>
+        <source>25%</source>
+        <translation type="obsolete">5 1/3&apos; {25%?}</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>&amp;Copy</source>
+        <translation type="unfinished">&amp;Copier</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>C&amp;ut</source>
+        <translation type="unfinished">Co&amp;uper</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Edit in E&amp;xternal Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Mute Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Normalize Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Fade In Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Fade Out Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Reverse Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select</source>
+        <translation type="unfinished">Sélectionner</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select &amp;All</source>
+        <translation type="unfinished">Selectionner &amp;Tout</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Deselect All</source>
+        <translation type="unfinished">&amp;Dé-selectionner tout</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Window &amp;Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Wave edit tools</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>transport</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>WaveEdit tools</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Solo</source>
+        <translation type="unfinished">Solo</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Cursor</source>
+        <translation type="unfinished">Curseur</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::WaveView</name>
+    <message>
+        <location filename="../../muse/waveedit/waveview.cpp" line="+996"/>
+        <source>MusE - external editor failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>MusE was unable to launch the external editor
+check if the editor setting in:
+Global Settings-&gt;Audio:External Waveditor
+is set to a valid editor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>MusE - file size changed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>When editing in external editor - you should not change the filesize
+since it must fit the selected region.
+
+Missing data is muted</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEMixer::AudioMixerApp</name>
+    <message>
+        <source>&amp;Create</source>
+        <translation type="obsolete">&amp;Créer</translation>
+    </message>
+</context>
+<context>
+    <name>MusEMixer::AudioStrip</name>
+    <message>
+        <source>Pan</source>
+        <translation type="obsolete">Pan</translation>
+    </message>
+    <message>
+        <source>1/2 channel</source>
+        <translation type="obsolete">1/2 canal</translation>
+    </message>
+    <message>
+        <source>Pre</source>
+        <translation type="obsolete">Pre</translation>
+    </message>
+    <message>
+        <source>pre fader - post fader</source>
+        <translation type="obsolete">pre fader - post fader</translation>
+    </message>
+    <message>
+        <source>dB</source>
+        <translation type="obsolete">dB</translation>
+    </message>
+    <message>
+        <source>mute</source>
+        <translation type="obsolete">silence</translation>
+    </message>
+    <message>
+        <source>record downmix</source>
+        <translation type="obsolete">enregistrer mixdown</translation>
+    </message>
+    <message>
+        <source>output routing</source>
+        <translation type="obsolete">chemin de sortie (routing)</translation>
+    </message>
+</context>
+<context>
+    <name>MusEMixer::EffectRack</name>
+    <message>
+        <source>effect rack</source>
+        <translation type="obsolete">rack d&apos;effets</translation>
+    </message>
+    <message>
+        <source>new</source>
+        <translation type="obsolete">nouveau</translation>
+    </message>
+    <message>
+        <source>change</source>
+        <translation type="obsolete">changement</translation>
+    </message>
+    <message>
+        <source>move up</source>
+        <translation type="obsolete">Déplacer vers le haut</translation>
+    </message>
+    <message>
+        <source>move down</source>
+        <translation type="obsolete">Déplacer vers le bas</translation>
+    </message>
+    <message>
+        <source>remove</source>
+        <translation type="obsolete">enlever</translation>
+    </message>
+    <message>
+        <source>bypass</source>
+        <translation type="obsolete">direct</translation>
+    </message>
+    <message>
+        <source>show gui</source>
+        <translation type="obsolete">montrer l&apos;interface</translation>
+    </message>
+</context>
+<context>
+    <name>MusEMixer::MidiStrip</name>
+    <message>
+        <source>Var</source>
+        <translation type="obsolete">Var</translation>
+    </message>
+    <message>
+        <source>Rev</source>
+        <translation type="obsolete">Rev</translation>
+    </message>
+    <message>
+        <source>Cho</source>
+        <translation type="obsolete">Cho</translation>
+    </message>
+    <message>
+        <source>dB</source>
+        <translation type="obsolete">dB</translation>
+    </message>
+    <message>
+        <source>Pan</source>
+        <translation type="obsolete">Pan</translation>
+    </message>
+    <message>
+        <source>mute</source>
+        <translation type="obsolete">silence</translation>
+    </message>
+    <message>
+        <source>output routing</source>
+        <translation type="obsolete">chemin de sortie (routing)</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::BigTime</name>
+    <message>
+        <source>minute</source>
+        <translation type="obsolete">minute</translation>
+    </message>
+    <message>
+        <source>second</source>
+        <translation type="obsolete">second</translation>
+    </message>
+    <message>
+        <source>frame</source>
+        <translation type="obsolete">trame (frame)</translation>
+    </message>
+    <message>
+        <source>subframe</source>
+        <translation type="obsolete">trame fine (subframe)</translation>
+    </message>
+    <message>
+        <source>MusE: Bigtime</source>
+        <translation type="obsolete">MusE: GrandChrono</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::EditToolBar</name>
+    <message>
+        <source>Edit Tools</source>
+        <translation type="obsolete">Outils d&apos;Edition</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::MidiSyncConfig</name>
+    <message>
+        <source>Port Number</source>
+        <translation type="obsolete">Numéro de port</translation>
+    </message>
+    <message>
+        <source>Port</source>
+        <translation type="obsolete">Port</translation>
+    </message>
+    <message>
+        <source>Device Name</source>
+        <translation type="obsolete">Nom du Périphérique</translation>
+    </message>
+    <message>
+        <source>m</source>
+        <translation type="obsolete">m</translation>
+    </message>
+    <message>
+        <source>MusE</source>
+        <translation type="obsolete">MusE</translation>
+    </message>
+    <message>
+        <source>&amp;Apply</source>
+        <translation type="obsolete">&amp;Appliquer</translation>
+    </message>
+    <message>
+        <source>&amp;Abort</source>
+        <translation type="obsolete">&amp;Annuler</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::MixdownFileDialog</name>
+    <message>
+        <source>Wave Files (*.wav);;All Files (*)</source>
+        <translation type="obsolete">Fichiers Wave (*.wav);;Tous les Fichiers (*)</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::NoteInfo</name>
+    <message>
+        <source>Note Info</source>
+        <translation type="obsolete">Info Note</translation>
+    </message>
+    <message>
+        <source>Pitch</source>
+        <translation type="obsolete">Hauteur</translation>
+    </message>
+    <message>
+        <source>Velo On</source>
+        <translation type="obsolete">Vélo on</translation>
+    </message>
+    <message>
+        <source>Velo Off</source>
+        <translation type="obsolete">Vélo off</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::RoutePopupMenu</name>
+    <message>
+        <source>Channel</source>
+        <translation type="obsolete">Canal</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::ScrollScale</name>
+    <message>
+        <source>next page</source>
+        <translation type="obsolete">page suivante</translation>
+    </message>
+    <message>
+        <source>previous page</source>
+        <translation type="obsolete">page précédente</translation>
+    </message>
+    <message>
+        <source>current page number</source>
+        <translation type="obsolete">numéro de page courante</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::ShortcutCaptureDialog</name>
+    <message>
+        <source>Ok</source>
+        <translation type="obsolete">Ok</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="obsolete">Annuler</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::SigScale</name>
+    <message>
+        <source>signature scale</source>
+        <translation type="obsolete">Echelle de la signature</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::Toolbar1</name>
+    <message>
+        <source>Solo</source>
+        <translation type="obsolete">Solo</translation>
+    </message>
+    <message>
+        <source>Cursor</source>
+        <translation type="obsolete">Curseur</translation>
+    </message>
+    <message>
+        <source>Snap</source>
+        <translation type="obsolete">Aligne</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::TrackComment</name>
+    <message>
+        <source>MusE: Track Comment</source>
+        <translation type="obsolete">Muse: Commentaire de Piste</translation>
+    </message>
+    <message>
+        <source>Track Comment:</source>
+        <translation type="obsolete">Commentaire de Piste:</translation>
+    </message>
+</context>
+<context>
     <name>NoteInfo</name>
     <message>
         <source>Start</source>
@@ -12766,9 +15414,8 @@ to be expanded by more than </source>
 <context>
     <name>PianoRoll</name>
     <message>
-        <location filename="../../muse/midiedit/pianoroll.cpp" line="+97"/>
         <source>&amp;Edit</source>
-        <translation>&amp;Edition</translation>
+        <translation type="obsolete">&amp;Edition</translation>
     </message>
     <message>
         <source>Cut</source>
@@ -12807,9 +15454,8 @@ to be expanded by more than </source>
         <translation type="obsolete">Hors de la Boucle</translation>
     </message>
     <message>
-        <location line="+34"/>
         <source>&amp;Select</source>
-        <translation>&amp;Sélectionner</translation>
+        <translation type="obsolete">&amp;Sélectionner</translation>
     </message>
     <message>
         <source>blue</source>
@@ -12860,18 +15506,16 @@ to be expanded by more than </source>
         <translation type="obsolete">Modifier temps de fermeture (gate time)</translation>
     </message>
     <message>
-        <location line="+52"/>
         <source>Modify Velocity</source>
-        <translation>Modifier la vélocité</translation>
+        <translation type="obsolete">Modifier la vélocité</translation>
     </message>
     <message>
         <source>Crescendo</source>
         <translation type="obsolete">Crescendo</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Transpose</source>
-        <translation>Transposition</translation>
+        <translation type="obsolete">Transposition</translation>
     </message>
     <message>
         <source>Thin Out</source>
@@ -12910,326 +15554,150 @@ to be expanded by more than </source>
         <translation type="obsolete">Outils de piano-roll</translation>
     </message>
     <message>
-        <location line="+77"/>
         <source>Step Record</source>
-        <translation>Enregistrement pas-a-pas</translation>
+        <translation type="obsolete">Enregistrement pas-a-pas</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Midi Input</source>
-        <translation>Entrée MIDI</translation>
+        <translation type="obsolete">Entrée MIDI</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Play Events</source>
-        <translation>Jouer Evènements</translation>
+        <translation type="obsolete">Jouer Evènements</translation>
     </message>
     <message>
-        <location line="+41"/>
         <source>Add Controller View</source>
-        <translation>Ajouter une vue de contrôles</translation>
+        <translation type="obsolete">Ajouter une vue de contrôles</translation>
     </message>
     <message>
-        <location line="-4"/>
         <source>ctrl</source>
-        <translation>ctrl</translation>
+        <translation type="obsolete">ctrl</translation>
     </message>
     <message>
-        <location line="-214"/>
         <source>C&amp;ut</source>
-        <translation type="unfinished">Co&amp;uper</translation>
+        <translation type="obsolete">Co&amp;uper</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Copy</source>
-        <translation type="unfinished">&amp;Copier</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Copy events in range</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>&amp;Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>&amp;Paste (with dialog)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Delete &amp;Events</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&amp;Copier</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Select &amp;All</source>
-        <translation type="unfinished">Selectionner &amp;Tout</translation>
+        <translation type="obsolete">Selectionner &amp;Tout</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Deselect All</source>
-        <translation type="unfinished">&amp;Dé-selectionner tout</translation>
+        <translation type="obsolete">&amp;Dé-selectionner tout</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Invert &amp;Selection</source>
-        <translation type="unfinished">Inverser la &amp;Sélection</translation>
+        <translation type="obsolete">Inverser la &amp;Sélection</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>&amp;Inside Loop</source>
-        <translation type="unfinished">A l&apos;&amp;intérieur de la Boucle</translation>
+        <translation type="obsolete">A l&apos;&amp;intérieur de la Boucle</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Outside Loop</source>
-        <translation type="unfinished">A l&apos;e&amp;xtérieur de la Boucle</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>&amp;Previous Part</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>&amp;Next Part</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Fu&amp;nctions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+54"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>&amp;Event Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>&amp;Blue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>&amp;Pitch colors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>&amp;Velocity colors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-68"/>
-        <source>Quantize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Modify Note Length</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Crescendo/Decrescendo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Erase Events</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Move Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Set Fixed Length</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Delete Overlaps</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Legato</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>&amp;Plugins</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+46"/>
-        <source>Pianoroll tools</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">A l&apos;e&amp;xtérieur de la Boucle</translation>
     </message>
     <message>
-        <location line="+26"/>
         <source>panic</source>
-        <translation type="unfinished">panique!</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>transport</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">panique!</translation>
     </message>
 </context>
 <context>
     <name>PluginDialog</name>
     <message>
-        <location filename="../../muse/plugin.cpp" line="+3142"/>
         <source>Ok</source>
-        <translation>Ok</translation>
+        <translation type="obsolete">Ok</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Cancel</source>
-        <translation>Annuler</translation>
+        <translation type="obsolete">Annuler</translation>
     </message>
     <message>
-        <location line="-49"/>
         <source>MusE: select plugin</source>
-        <translation>MusE: choisir plugin</translation>
+        <translation type="obsolete">MusE: choisir plugin</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Lib</source>
-        <translation>Lib</translation>
+        <translation type="obsolete">Lib</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Label</source>
-        <translation>Label</translation>
+        <translation type="obsolete">Label</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Name</source>
-        <translation>Nom</translation>
+        <translation type="obsolete">Nom</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>AI</source>
-        <translation>AI</translation>
+        <translation type="obsolete">AI</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>AO</source>
-        <translation>AO</translation>
+        <translation type="obsolete">AO</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>CI</source>
-        <translation>CI</translation>
+        <translation type="obsolete">CI</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>CO</source>
-        <translation>CO</translation>
+        <translation type="obsolete">CO</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>IP</source>
-        <translation>IP</translation>
+        <translation type="obsolete">IP</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>id</source>
-        <translation>id</translation>
+        <translation type="obsolete">id</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Maker</source>
-        <translation>Fabrique</translation>
+        <translation type="obsolete">Fabrique</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Copyright</source>
-        <translation>Copyright</translation>
-    </message>
-    <message>
-        <location line="+47"/>
-        <source>Mono and Stereo</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Copyright</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Stereo</source>
-        <translation type="unfinished">Stéréo</translation>
+        <translation type="obsolete">Stéréo</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Mono</source>
-        <translation type="unfinished">Mono</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Show All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>Select which types of plugins should be visible in the list.&lt;br&gt;Note that using mono plugins on stereo tracks is not a problem, two will be used in parallell.&lt;br&gt;Also beware that the &apos;all&apos; alternative includes plugins that probably not are usable by MusE.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+9"/>
-        <source>Search in &apos;Label&apos; and &apos;Name&apos;:</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Mono</translation>
     </message>
 </context>
 <context>
     <name>PluginGui</name>
     <message>
-        <location line="+219"/>
-        <location line="+3"/>
         <source>bypass plugin</source>
-        <translation>Plugin de Direct (bypass)</translation>
+        <translation type="obsolete">Plugin de Direct (bypass)</translation>
     </message>
     <message>
-        <location line="+554"/>
         <source>MusE: load preset</source>
-        <translation>MusE: charger réglages</translation>
+        <translation type="obsolete">MusE: charger réglages</translation>
     </message>
     <message>
-        <location line="+66"/>
         <source>MusE: save preset</source>
-        <translation>MusE: enregistrer réglages</translation>
+        <translation type="obsolete">MusE: enregistrer réglages</translation>
     </message>
     <message>
-        <location line="-635"/>
         <source>File Buttons</source>
-        <translation>Boutons Fichier</translation>
+        <translation type="obsolete">Boutons Fichier</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Load Preset</source>
-        <translation>Charger réglages</translation>
+        <translation type="obsolete">Charger réglages</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Save Preset</source>
-        <translation>Enregistrer réglages</translation>
-    </message>
-    <message>
-        <location line="+588"/>
-        <source>Error reading preset. Might not be right type for this plugin</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Enregistrer réglages</translation>
     </message>
 </context>
 <context>
@@ -13432,19 +15900,14 @@ port</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../../muse/helper.cpp" line="-49"/>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/functions.cpp" line="+242"/>
-        <location line="+159"/>
+        <location filename="../../muse/functions.cpp" line="+244"/>
+        <location line="+160"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-159"/>
-        <location line="+159"/>
+        <location line="-160"/>
+        <location line="+160"/>
         <source>Please first select the range for crescendo with the loop markers.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13460,8 +15923,8 @@ port</translation>
         <translation type="obsolete">Vélocité</translation>
     </message>
     <message>
-        <location filename="../../muse/instruments/minstrument.cpp" line="+72"/>
-        <location filename="../../muse/liste/editevent.cpp" line="-410"/>
+        <location filename="../../muse/instruments/minstrument.cpp" line="+73"/>
+        <location filename="../../muse/liste/editevent.cpp" line="-418"/>
         <source>Cannot convert sysex string</source>
         <translation>Ne peut convertir le code sysex</translation>
     </message>
@@ -13477,17 +15940,17 @@ port</translation>
         <translation>MIDI générique</translation>
     </message>
     <message>
-        <location filename="../../muse/miditransform.cpp" line="+92"/>
+        <location filename="../../muse/miditransform.cpp" line="-231"/>
         <source>new</source>
         <translation>nouveau</translation>
     </message>
     <message>
-        <location filename="../../muse/wave.cpp" line="-677"/>
+        <location filename="../../muse/wave.cpp" line="-1006"/>
         <source>create peakfile for </source>
         <translation>créer fichier de crêtes pour</translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/filedialog.cpp" line="+80"/>
+        <location filename="../../muse/widgets/filedialog.cpp" line="+81"/>
         <source>MusE: get file name</source>
         <translation>MusE: avoir le nom du fichier</translation>
     </message>
@@ -13513,7 +15976,15 @@ Le créer?</translation>
         <translation type="obsolete">Annuler</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+1"/>
+        <source>The directory
+%1
+does not exist.
+Create it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>MusE: create directory</source>
         <translation>MusE: créer un répertoire</translation>
     </message>
@@ -13523,10 +15994,23 @@ Le créer?</translation>
         <translation>échec de la création du répertoire</translation>
     </message>
     <message>
-        <location line="+396"/>
+        <location line="+399"/>
+        <source>File
+%1
+exists. Overwrite?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Open File
+%1
+failed: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>File
 </source>
-        <translation>Fichier
+        <translation type="obsolete">Fichier
 </translation>
     </message>
     <message>
@@ -13536,7 +16020,7 @@ exists</source>
 existe</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="-19"/>
         <source>MusE: write</source>
         <translation>MusE: écriture</translation>
     </message>
@@ -13549,27 +16033,25 @@ existe</translation>
         <translation type="obsolete">Quitter</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Open File
 </source>
-        <translation>Ouvrir Fichier
+        <translation type="obsolete">Ouvrir Fichier
 </translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>
 failed: </source>
-        <translation>
+        <translation type="obsolete">
 échec:</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+20"/>
         <source>MusE: Open File</source>
         <translation>MusE: Ouvrir un Fichier</translation>
     </message>
     <message>
-        <location filename="../../muse/route.cpp" line="+1041"/>
-        <location line="+37"/>
+        <location filename="../../muse/route.cpp" line="+792"/>
+        <location line="+25"/>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13582,29 +16064,10 @@ failed: </source>
         <translation type="obsolete">Inconnu</translation>
     </message>
     <message>
-        <location filename="../../muse/waveedit/waveview.cpp" line="+632"/>
+        <location filename="../../muse/waveedit/waveview.cpp" line="-374"/>
         <source>No selection. Ignoring</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../../muse/widgets/filedialog.cpp" line="-440"/>
-        <source>The directory
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>
-does not exist.
-Create it?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+404"/>
-        <source>
-exists. Overwrite?</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QuantBase</name>
@@ -13680,7 +16143,12 @@ exists. Overwrite?</source>
     </message>
     <message>
         <location line="+5"/>
-        <source>Quarter</source>
+        <source>4th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>4th Triplet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -13690,15 +16158,30 @@ exists. Overwrite?</source>
     </message>
     <message>
         <location line="+5"/>
+        <source>8th Triplet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>16th</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
+        <source>16th Triplet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>32th</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
+        <source>32th Triplet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+8"/>
         <source>Swing:</source>
         <translation type="unfinished"></translation>
@@ -14434,49 +16917,6 @@ sélectionnées</translation>
     </message>
 </context>
 <context>
-    <name>ScoreCanvas</name>
-    <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="+1245"/>
-        <source>Treble</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Bass</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Grand Staff</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Remove staff</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2467"/>
-        <source>Ambiguous part</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There are two or more possible parts you could add the note to, but none matches the selected part. Please select the destination part by clicking on any note belonging to it and try again, or add a new stave containing only the destination part.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>No part</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There are no parts you could add the note to.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>ScoreConfig</name>
     <message>
         <source>Staff Settings: </source>
@@ -14538,251 +16978,44 @@ sélectionnées</translation>
 <context>
     <name>ScoreEdit</name>
     <message>
-        <location line="-3493"/>
-        <source>Undo/Redo tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Step recording tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Step Record</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
         <source>panic</source>
-        <translation type="unfinished">panique!</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>transport</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Note settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Note length:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>last</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+37"/>
-        <source>Velocity:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Off-Velocity:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>Quantisation settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Quantisation:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>Pixels per whole:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+9"/>
-        <source>&amp;Edit</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">panique!</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>C&amp;ut</source>
-        <translation type="unfinished">Co&amp;uper</translation>
+        <translation type="obsolete">Co&amp;uper</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Copy</source>
-        <translation type="unfinished">&amp;Copier</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Copy events in range</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>&amp;Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Paste (with dialog)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Delete &amp;Events</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&amp;Copier</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>&amp;Select</source>
-        <translation type="unfinished">&amp;Sélectionner</translation>
+        <translation type="obsolete">&amp;Sélectionner</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Select &amp;All</source>
-        <translation type="unfinished">Selectionner &amp;Tout</translation>
+        <translation type="obsolete">Selectionner &amp;Tout</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Deselect All</source>
-        <translation type="unfinished">&amp;Dé-selectionner tout</translation>
+        <translation type="obsolete">&amp;Dé-selectionner tout</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Invert &amp;Selection</source>
-        <translation type="unfinished">Inverser la &amp;Sélection</translation>
+        <translation type="obsolete">Inverser la &amp;Sélection</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>&amp;Inside Loop</source>
-        <translation type="unfinished">A l&apos;&amp;intérieur de la Boucle</translation>
+        <translation type="obsolete">A l&apos;&amp;intérieur de la Boucle</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Outside Loop</source>
-        <translation type="unfinished">A l&apos;e&amp;xtérieur de la Boucle</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Fu&amp;nctions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>&amp;Quantize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Change note &amp;length</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Change note &amp;velocity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Crescendo/Decrescendo</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">A l&apos;e&amp;xtérieur de la Boucle</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Transpose</source>
-        <translation type="unfinished">Transposition</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Erase Events</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Move Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Set Fixed Length</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Delete Overlaps</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Legato</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Note head &amp;colors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>&amp;Black</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>&amp;Velocity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>&amp;Part</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Set up &amp;preamble</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Display &amp;key signature</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Display &amp;time signature</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Set Score &amp;name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+216"/>
-        <location line="+1"/>
-        <source>Enter the new score title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Changing score title failed:
-the selected title is not unique</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Transposition</translation>
     </message>
 </context>
 <context>
@@ -14916,12 +17149,12 @@ the selected title is not unique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>Shortcut Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+24"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14931,7 +17164,7 @@ the selected title is not unique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+35"/>
         <source>&amp;Clear</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14997,97 +17230,8 @@ the selected title is not unique</source>
 <context>
     <name>Song</name>
     <message>
-        <location filename="../../muse/song.cpp" line="+2412"/>
-        <source>Jack shutdown!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Jack has detected a performance problem which has lead to
-MusE being disconnected.
-This could happen due to a number of reasons:
-- a performance issue with your particular setup.
-- a bug in MusE (or possibly in another connected software).
-- a random hiccup which might never occur again.
-- jack was voluntary stopped by you or someone else
-- jack crashed
-If there is a persisting problem you are much welcome to discuss it
-on the MusE mailinglist.
-(there is information about joining the mailinglist on the MusE
- homepage which is available through the help menu)
-
-To proceed check the status of Jack and try to restart it and then .
-click on the Restart button.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+198"/>
-        <source>previous event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>next event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <location line="+183"/>
-        <source>set event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-181"/>
-        <location line="+183"/>
-        <source>add event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-179"/>
-        <location line="+184"/>
-        <source>erase event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-180"/>
-        <source>erase range</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>clear automation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+33"/>
-        <source>Clear all controller events?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
         <source>&amp;Ok</source>
-        <translation type="unfinished">&amp;Ok</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1134"/>
-        <source>MusE - external script failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>MusE was unable to launch the script, error message:
- </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-1200"/>
-        <source>Automation:</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&amp;Ok</translation>
     </message>
 </context>
 <context>
@@ -15141,12 +17285,11 @@ click on the Restart button.</source>
 <context>
     <name>SynthConfigBase</name>
     <message>
-        <location filename="../../muse/widgets/synthconfigbase.ui" line="+14"/>
         <source>MusE: Synth Configuration</source>
-        <translation>MusE: Configuration Synth Virtuel</translation>
+        <translation type="obsolete">MusE: Configuration Synth Virtuel</translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location filename="../../muse/widgets/synthconfigbase.ui" line="+94"/>
         <source>Soft Synthesizer</source>
         <translation>Synthétiseur Virtuel</translation>
     </message>
@@ -15156,18 +17299,18 @@ click on the Restart button.</source>
         <translation>Fichier</translation>
     </message>
     <message>
-        <location line="-115"/>
+        <location line="-120"/>
         <source>Instances</source>
         <translation>Exemplaires</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location line="+115"/>
+        <location line="+125"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
-        <location line="-17"/>
+        <location line="-22"/>
         <source>list of available software synthesizers</source>
         <translation>liste des synthétiseurs virtuels
 disponibles</translation>
@@ -15192,12 +17335,23 @@ disponibles</translation>
         <translation type="unfinished">Port MIDI</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="-26"/>
+        <source>Midi Port and Soft Synth Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location line="+110"/>
+        <source>Type</source>
+        <translation type="unfinished">Type</translation>
+    </message>
+    <message>
+        <location line="-67"/>
         <source>Midi connections</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="+72"/>
         <source>Inst</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15258,9 +17412,8 @@ disponibles</translation>
 <context>
     <name>TempoSig</name>
     <message>
-        <location filename="../../muse/transport.cpp" line="+103"/>
         <source>Tempo/Sig</source>
-        <translation>Tempo/Sig</translation>
+        <translation type="obsolete">Tempo/Sig</translation>
     </message>
 </context>
 <context>
@@ -15305,74 +17458,8 @@ disponibles</translation>
 <context>
     <name>TopWin</name>
     <message>
-        <location filename="../../muse/cobject.cpp" line="+61"/>
-        <source>As subwindow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Shares tools and menu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Fullscreen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+418"/>
-        <source>Piano roll</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>List editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Drum editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Master track editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Master track list editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Wave editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Clip list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Marker view</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Score editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
         <source>Arranger</source>
-        <translation type="unfinished">Arrangeur</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>&lt;unknown toplevel type&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Arrangeur</translation>
     </message>
 </context>
 <context>
@@ -15389,158 +17476,112 @@ disponibles</translation>
 <context>
     <name>Transport</name>
     <message>
-        <location filename="../../muse/transport.cpp" line="+150"/>
-        <location line="+3"/>
         <source>Punch In</source>
-        <translation>Punch-In</translation>
+        <translation type="obsolete">Punch-In</translation>
     </message>
     <message>
-        <location line="-2"/>
-        <location line="+3"/>
         <source>Loop</source>
-        <translation>Boucle</translation>
+        <translation type="obsolete">Boucle</translation>
     </message>
     <message>
-        <location line="-2"/>
-        <location line="+3"/>
         <source>Punch Out</source>
-        <translation>Punch-Out</translation>
+        <translation type="obsolete">Punch-Out</translation>
     </message>
     <message>
-        <location line="+33"/>
         <source>Left Mark</source>
-        <translation>Marque Gauche</translation>
+        <translation type="obsolete">Marque Gauche</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Right Mark</source>
-        <translation>Marque Droite</translation>
+        <translation type="obsolete">Marque Droite</translation>
     </message>
     <message>
-        <location line="-95"/>
         <source>Overdub</source>
-        <translation>Sur-enregistrement (Overdub)</translation>
+        <translation type="obsolete">Sur-enregistrement (Overdub)</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+15"/>
         <source>Replace</source>
-        <translation>Remplace</translation>
+        <translation type="obsolete">Remplace</translation>
     </message>
     <message>
-        <location line="-10"/>
         <source>Rec Mode</source>
-        <translation>Mode Enregistrement</translation>
+        <translation type="obsolete">Mode Enregistrement</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Normal</source>
-        <translation>Normal</translation>
+        <translation type="obsolete">Normal</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Mix</source>
-        <translation>Mix</translation>
+        <translation type="obsolete">Mix</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Cycle Rec</source>
-        <translation>Enr. Cycle</translation>
+        <translation type="obsolete">Enr. Cycle</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>punchin</source>
-        <translation>Punch-In</translation>
+        <translation type="obsolete">Punch-In</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>loop</source>
-        <translation>boucle</translation>
+        <translation type="obsolete">boucle</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>punchout</source>
-        <translation>Punch-Out</translation>
+        <translation type="obsolete">Punch-Out</translation>
     </message>
     <message>
-        <location line="+101"/>
         <source>rewind to start</source>
-        <translation>rembobine au départ</translation>
+        <translation type="obsolete">rembobine au départ</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>rewind</source>
-        <translation>rembobiner</translation>
+        <translation type="obsolete">rembobiner</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>forward</source>
-        <translation>avance</translation>
+        <translation type="obsolete">avance</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>stop</source>
-        <translation>stop</translation>
+        <translation type="obsolete">stop</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>play</source>
-        <translation>jouer</translation>
+        <translation type="obsolete">jouer</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>record</source>
-        <translation>enregistrement</translation>
+        <translation type="obsolete">enregistrement</translation>
     </message>
     <message>
-        <location line="+28"/>
         <source>AC</source>
-        <translation>AC</translation>
+        <translation type="obsolete">AC</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>quantize during record</source>
-        <translation>quantise pendant l&apos;enregistrement</translation>
+        <translation type="obsolete">quantise pendant l&apos;enregistrement</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Click</source>
-        <translation>Clic</translation>
+        <translation type="obsolete">Clic</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>metronom click on/off</source>
-        <translation>clic du métronome oui/non</translation>
+        <translation type="obsolete">clic du métronome oui/non</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Sync</source>
-        <translation>Synchro</translation>
+        <translation type="obsolete">Synchro</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>external sync on/off</source>
-        <translation>synchro externe oui/non</translation>
-    </message>
-    <message>
-        <location line="+45"/>
-        <source>Master</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">synchro externe oui/non</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>use master track</source>
-        <translation>Utiliser la piste principale</translation>
-    </message>
-    <message>
-        <location line="-43"/>
-        <source>Jack</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Jack transport sync on/off</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Utiliser la piste principale</translation>
     </message>
 </context>
 <context>
@@ -15992,14 +18033,12 @@ Robert Jonsson
         <translation type="obsolete">weTools</translation>
     </message>
     <message>
-        <location filename="../../muse/waveedit/waveedit.cpp" line="+196"/>
         <source>Solo</source>
-        <translation>Solo</translation>
+        <translation type="obsolete">Solo</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Cursor</source>
-        <translation>Curseur</translation>
+        <translation type="obsolete">Curseur</translation>
     </message>
     <message>
         <source>&amp;File</source>
@@ -16010,192 +18049,250 @@ Robert Jonsson
         <translation type="obsolete">Fonctions</translation>
     </message>
     <message>
-        <location line="-115"/>
-        <source>&amp;Edit</source>
-        <translation type="unfinished"></translation>
+        <source>200%</source>
+        <translation type="obsolete">5 1/3&apos; {200%?}</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Func&amp;tions</source>
-        <translation type="unfinished"></translation>
+        <source>150%</source>
+        <translation type="obsolete">5 1/3&apos; {150%?}</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>&amp;Gain</source>
-        <translation type="unfinished"></translation>
+        <source>75%</source>
+        <translation type="obsolete">5 1/3&apos; {75%?}</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>200%</source>
-        <translation type="unfinished">5 1/3&apos; {200%?}</translation>
+        <source>50%</source>
+        <translation type="obsolete">5 1/3&apos; {50%?}</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>150%</source>
-        <translation type="unfinished">5 1/3&apos; {150%?}</translation>
+        <source>25%</source>
+        <translation type="obsolete">5 1/3&apos; {25%?}</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>75%</source>
-        <translation type="unfinished">5 1/3&apos; {75%?}</translation>
+        <source>&amp;Copy</source>
+        <translation type="obsolete">&amp;Copier</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>50%</source>
-        <translation type="unfinished">5 1/3&apos; {50%?}</translation>
+        <source>C&amp;ut</source>
+        <translation type="obsolete">Co&amp;uper</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>25%</source>
-        <translation type="unfinished">5 1/3&apos; {25%?}</translation>
+        <source>Select</source>
+        <translation type="obsolete">Sélectionner</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Other</source>
+        <source>Select &amp;All</source>
+        <translation type="obsolete">Selectionner &amp;Tout</translation>
+    </message>
+    <message>
+        <source>&amp;Deselect All</source>
+        <translation type="obsolete">&amp;Dé-selectionner tout</translation>
+    </message>
+</context>
+<context>
+    <name>WaveTrackInfoBase</name>
+    <message>
+        <source>MusE: TrackInfo</source>
+        <translation type="obsolete">MusE: InfoPiste</translation>
+    </message>
+    <message>
+        <source>Track Info</source>
+        <translation type="obsolete">Info Piste</translation>
+    </message>
+    <message>
+        <source>Track Name</source>
+        <translation type="obsolete">Nom de Piste</translation>
+    </message>
+    <message>
+        <source>Output Route:</source>
+        <translation type="obsolete">Chemin de Sortie:</translation>
+    </message>
+    <message>
+        <source>Input Route:</source>
+        <translation type="obsolete">Chemin d&apos;Entrée:</translation>
+    </message>
+    <message>
+        <source>Ports:</source>
+        <translation type="obsolete">Ports:</translation>
+    </message>
+    <message>
+        <source>Mono</source>
+        <translation type="obsolete">Mono</translation>
+    </message>
+    <message>
+        <source>Stereo</source>
+        <translation type="obsolete">Stéréo</translation>
+    </message>
+</context>
+<context>
+    <name>file_patterns</name>
+    <message>
+        <location filename="../../muse/globals.cpp" line="+120"/>
+        <source>Midi/Kar (*.mid *.MID *.kar *.KAR *.mid.gz *.mid.bz2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>&amp;Copy</source>
-        <translation type="unfinished">&amp;Copier</translation>
+        <location line="+1"/>
+        <source>Midi (*.mid *.MID *.mid.gz *.mid.bz2)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>C&amp;ut</source>
-        <translation type="unfinished">Co&amp;uper</translation>
+        <location line="+1"/>
+        <source>Karaoke (*.kar *.KAR *.kar.gz *.kar.bz2)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>&amp;Paste</source>
+        <location line="+1"/>
+        <location line="+24"/>
+        <location line="+11"/>
+        <location line="+7"/>
+        <location line="+9"/>
+        <location line="+15"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+8"/>
+        <location line="+6"/>
+        <location line="+8"/>
+        <location line="+8"/>
+        <source>All Files (*)</source>
+        <translation type="unfinished">Tous les Fichiers (*)</translation>
+    </message>
+    <message>
+        <location line="-95"/>
+        <source>Midi (*.mid)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Edit in E&amp;xternal Editor</source>
+        <location line="+1"/>
+        <source>Karaoke (*.kar)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Mute Selection</source>
+        <location line="+6"/>
+        <source>all known files (*.med *.med.gz *.med.bz2 *.mid *.midi *.kar)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Normalize Selection</source>
+        <location line="+1"/>
+        <source>med Files (*.med *.med.gz *.med.bz2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Fade In Selection</source>
+        <location line="+1"/>
+        <location line="+8"/>
+        <source>Uncompressed med Files (*.med)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Fade Out Selection</source>
+        <location line="-7"/>
+        <location line="+8"/>
+        <source>gzip compressed med Files (*.med.gz)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Reverse Selection</source>
+        <location line="-7"/>
+        <location line="+8"/>
+        <source>bzip2 compressed med Files (*.med.bz2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Select</source>
-        <translation type="unfinished">Sélectionner</translation>
+        <location line="-7"/>
+        <source>mid Files (*.mid *.midi *.kar *.MID *.MIDI *.KAR)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Select &amp;All</source>
-        <translation type="unfinished">Selectionner &amp;Tout</translation>
+        <location line="+13"/>
+        <source>(*.jpg *.gif *.png)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>&amp;Deselect All</source>
-        <translation type="unfinished">&amp;Dé-selectionner tout</translation>
+        <location line="+1"/>
+        <source>(*.jpg)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Window &amp;Config</source>
+        <location line="+1"/>
+        <source>(*.gif)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Wave edit tools</source>
+        <location line="+1"/>
+        <source>(*.png)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>transport</source>
+        <location line="+15"/>
+        <source>part Files (*.mpt *.mpt.gz *.mpt.bz2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>WaveEdit tools</source>
+        <location line="+5"/>
+        <source>part Files (*.mpt)</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WaveTrackInfoBase</name>
     <message>
-        <source>MusE: TrackInfo</source>
-        <translation type="obsolete">MusE: InfoPiste</translation>
+        <location line="+1"/>
+        <source>gzip compressed part Files (*.mpt.gz)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Track Info</source>
-        <translation type="obsolete">Info Piste</translation>
+        <location line="+1"/>
+        <source>bzip2 compressed part Files (*.mpt.bz2)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Track Name</source>
-        <translation type="obsolete">Nom de Piste</translation>
+        <location line="+14"/>
+        <source>Presets (*.pre *.pre.gz *.pre.bz2)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Output Route:</source>
-        <translation type="obsolete">Chemin de Sortie:</translation>
+        <location line="+6"/>
+        <source>Presets (*.pre)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Input Route:</source>
-        <translation type="obsolete">Chemin d&apos;Entrée:</translation>
+        <location line="+1"/>
+        <source>gzip compressed presets (*.pre.gz)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ports:</source>
-        <translation type="obsolete">Ports:</translation>
+        <location line="+1"/>
+        <source>bzip2 compressed presets (*.pre.bz2)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mono</source>
-        <translation type="obsolete">Mono</translation>
+        <location line="+6"/>
+        <source>Presets (*.map *.map.gz *.map.bz2)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stereo</source>
-        <translation type="obsolete">Stéréo</translation>
+        <location line="+6"/>
+        <source>Presets (*.map)</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WaveView</name>
     <message>
-        <location filename="../../muse/waveedit/waveview.cpp" line="+359"/>
-        <source>MusE - external editor failed</source>
+        <location line="+1"/>
+        <source>gzip compressed presets (*.map.gz)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>MusE was unable to launch the external editor
-check if the editor setting in:
-Global Settings-&gt;Audio:External Waveditor
-is set to a valid editor.</source>
+        <source>bzip2 compressed presets (*.map.bz2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>MusE - file size changed</source>
+        <location line="+6"/>
+        <source>Wave/Binary (*.wav *.ogg *.bin)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>When editing in external editor - you should not change the filesize
-since it must fit the selected region.
-
-Missing data is muted</source>
+        <source>Wave (*.wav *.ogg)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Binary (*.bin)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -16488,4 +18585,878 @@ Missing data is muted</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>shortcuts</name>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="+54"/>
+        <source>Transport: Start playback from current location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Toggle metronome</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Stop Playback</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Goto Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Play, Stop, Rewind</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Goto left marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Goto right marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Toggle Loop section</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Toggle Record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Clear all rec enabled tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Toggle fullscreen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit: Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Copy in range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Redo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Paste (with dialog)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>File: New project</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>File: Open from disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>File: Save project</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>File: Open recent file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>File: Save as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>File: Load template</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>File: Import midi file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>File: Export midi file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>File: Import midi part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>File: Import audio file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>File: Quit MusE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit: Select parts on track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Open pianoroll</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Open drumeditor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Open listeditor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Open waveeditor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Open graphical mastertrack editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Open list mastertrack editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Open midi transformer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add midi track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add drum track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add wave track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add audio output</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add audio group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add audio input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add audio aux</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Structure: Global cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Structure: Global insert</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Structure: Global split</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Structure: Cut events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>View: Open mixer #1 window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>View: Open mixer #2 window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>View: Toggle transport window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>View: Toggle bigtime window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>View: Open marker window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Settings: Follow song by page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Follow song off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Follow song continuous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Settings: Global configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Configure shortcuts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Configure metronome</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Midi sync configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Midi file import/export configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Appearance settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Midi ports / Soft Synth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Audio subsystem configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Midi: Edit midi instruments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi: Open midi input transform</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi: Open midi input filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi: Midi input transpose</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi: Midi remote control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Midi: Random rhythm generator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Midi: Reset midi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi: Init midi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi: Midi local off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Audio: Bounce audio to track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Audio: Bounce audio to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Audio: Restart audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Automation: Mixer automation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Automation: Take mixer snapshot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Automation: Clear mixer automation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Help: Open Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Help: Toggle whatsthis mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit: Edit selected part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select nearest part on track above</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Add nearest part on track above</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select nearest part on track below</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Add nearest part on track below</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit: Insert empty measure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit: Paste as clones</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Paste as clones (with dialog)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select track above</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Select track below</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Midi: Transpose</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit: Select all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select none</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Invert Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select events/parts inside locators</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select events/parts outside locators</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select previous part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select next part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select nearest part/event to the left or move cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Add nearest part/event to the left to selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select nearest part/event to the right or move cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Add nearest part/event to the right to selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Set locators to selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Increase pitch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Decrease pitch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Increase event position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Decrease event position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>View: Zoom in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>View: Zoom out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>View: Goto Current Position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+1"/>
+        <source>View: Scroll left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Edit: Set Fixed Length on Midi Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Quantize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Modify Note Length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Modify Velocity</source>
+        <translation type="unfinished">Modifier la vélocité</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Crescendo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Thin Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Erase Event</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Delete Overlaps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Note Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Move Clock</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Copy Measure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Erase Measure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Delete Measure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Create Measure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Change Event Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool: Pointer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tool: Pencil</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tool: Eraser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Tool: Line Draw</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Tool: Cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add note velocity 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add note velocity 2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add note velocity 3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add note velocity 4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cursor step size: larger</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cursor step size: smaller</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Instrument/Cursor up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Instrument/Cursor down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Tool: Scissor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tool: Glue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tool: Mute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Transport: Increase current position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Decrease current position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Transport: Increase current position, no snap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Decrease current position, no snap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Quantize: Set quantize to 1/1 note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantize: Set quantize to 1/2 note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantize: Set quantize to 1/4 note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantize: Set quantize to 1/8 note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantize: Set quantize to 1/16 note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantize: Set quantize to 1/32 note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantize: Set quantize to 1/64 note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Quantize: Toggle triol quantization</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantize: Toggle punctuation quantization</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantize: Toggle punctuation quantization (2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Insert at location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit: Increase length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Decrease length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Insert Note</source>
+        <translation type="unfinished">Insérer Note</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert SysEx</source>
+        <translation type="unfinished">Insérer SysEx</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert Ctrl</source>
+        <translation type="unfinished">Insérer Ctrl</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert Meta</source>
+        <translation type="unfinished">Insérer Meta</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert Channel Aftertouch</source>
+        <translation type="unfinished">Insérer Canal de Pression</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert Key Aftertouch</source>
+        <translation type="unfinished">Insérer une note de Pression</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Insert Tempo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert Signature</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Change Event Position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit Event Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Goto Next Marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Goto Prev Marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/muse2/share/locale/muse_pl.ts b/muse2/share/locale/muse_pl.ts
index 2394a0a0..00fa0d2c 100644
--- a/muse2/share/locale/muse_pl.ts
+++ b/muse2/share/locale/muse_pl.ts
@@ -4,9 +4,8 @@
 <context>
     <name>@default</name>
     <message>
-        <location filename="../../muse/transport.cpp" line="+46"/>
         <source>Click this button to enable recording</source>
-        <translation>Naciśnij ten przycisk, aby pozwolić na nagrywanie</translation>
+        <translation type="obsolete">Naciśnij ten przycisk, aby pozwolić na nagrywanie</translation>
     </message>
     <message>
         <source>sets amount of quantization:
@@ -17,58 +16,49 @@
 100 - pełna kwantyzacja</translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/tools.cpp" line="+33"/>
         <source>select Pointer Tool:
 with the pointer tool you can:
   select parts
   move parts
   copy parts</source>
-        <translation>Kliknij na strzałkę.
+        <translation type="obsolete">Kliknij na strzałkę.
 Strzałką możesz zaznaczać, przesuwać i kopiować klocki</translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="+89"/>
         <source>Click this button to open a &lt;em&gt;new song&lt;/em&gt;.&lt;br&gt;You can also select the &lt;b&gt;Open command&lt;/b&gt; from the File menu.</source>
-        <translation>Otwórz nowy utwór. Można też wybrać &lt;b&gt;Otwórz&lt;/b&gt; z menu Plik.
+        <translation type="obsolete">Otwórz nowy utwór. Można też wybrać &lt;b&gt;Otwórz&lt;/b&gt; z menu Plik.
 </translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Click this button to save the song you are editing.  You will be prompted for a file name.
 You can also select the Save command from the File menu.</source>
-        <translation>Zapisz edytowany utwór. Trzeba podać nazwę pliku.
+        <translation type="obsolete">Zapisz edytowany utwór. Trzeba podać nazwę pliku.
 Można też wybrać &quot;Zapisz&quot; z menu plik, lub &quot;Ctrl-S&quot;.
 </translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Create New Song</source>
-        <translation>Twórz nowy utwór. Można też nacisnąć skrót &quot;Ctrl-N&quot;.</translation>
+        <translation type="obsolete">Twórz nowy utwór. Można też nacisnąć skrót &quot;Ctrl-N&quot;.</translation>
     </message>
     <message>
-        <location filename="../../muse/transport.cpp" line="+1"/>
         <source>Click this button to stop playback</source>
-        <translation>Zatrzymaj odtwarzanie.</translation>
+        <translation type="obsolete">Zatrzymaj odtwarzanie.</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Click this button to start playback</source>
-        <translation>Rozpocznij odtwarzanie.</translation>
+        <translation type="obsolete">Rozpocznij odtwarzanie.</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Click this button to rewind to start position</source>
-        <translation>Przewiń do początku.</translation>
+        <translation type="obsolete">Przewiń do początku.</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Click this button to rewind</source>
-        <translation>Przewijaj do tyłu.</translation>
+        <translation type="obsolete">Przewijaj do tyłu.</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Click this button to forward current play position</source>
-        <translation>Przewijaj do przodu.</translation>
+        <translation type="obsolete">Przewijaj do przodu.</translation>
     </message>
     <message>
         <source>don&apos;t quantize notes above this tick limit</source>
@@ -79,181 +69,127 @@ Można też wybrać &quot;Zapisz&quot; z menu plik, lub &quot;Ctrl-S&quot;.
         <translation type="obsolete">Kwantyzuj długości nut tak samo jak domyślnie.</translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="+2"/>
         <source>loop between left mark and right mark</source>
-        <translation>Zapętl pomiędzy lokatorami</translation>
+        <translation type="obsolete">Zapętl pomiędzy lokatorami</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>record starts at left mark</source>
-        <translation>Nagrywaj od lewego lokatora.</translation>
+        <translation type="obsolete">Nagrywaj od lewego lokatora.</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>record stops at right mark</source>
-        <translation>Nagrywaj od prawego lokatora.</translation>
+        <translation type="obsolete">Nagrywaj od prawego lokatora.</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>rewind to start position</source>
-        <translation>Przewiń do początku.</translation>
+        <translation type="obsolete">Przewiń do początku.</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>rewind current position</source>
-        <translation>Przewijaj kursor do tyłu.</translation>
+        <translation type="obsolete">Przewijaj kursor do tyłu.</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>move current position</source>
-        <translation>Przewijaj kursor do przodu.</translation>
+        <translation type="obsolete">Przewijaj kursor do przodu.</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>stop sequencer</source>
-        <translation>Zatrzymaj sekwencer.</translation>
+        <translation type="obsolete">Zatrzymaj sekwencer.</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>start sequencer play</source>
-        <translation>Uruchom odtwarzanie sekwencera.</translation>
+        <translation type="obsolete">Uruchom odtwarzanie sekwencera.</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>to record press record and then play</source>
-        <translation>Aby nagrywać najpierw naciśnij nagrywanie, potem odtwarzanie.</translation>
+        <translation type="obsolete">Aby nagrywać najpierw naciśnij nagrywanie, potem odtwarzanie.</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>send note off to all midi channels</source>
-        <translation>Zatrzymaj komunikaty midi na wszystkich kanałach!</translation>
+        <translation type="obsolete">Zatrzymaj komunikaty midi na wszystkich kanałach!</translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/tools.cpp" line="+5"/>
         <source>select Pencil Tool:
 with the pencil tool you can:
   create new parts
   modify length of parts</source>
-        <translation>Kliknij na ołówek.
+        <translation type="obsolete">Kliknij na ołówek.
 Ołówkiem możesz tworzyć klocki oraz zmieniać ich długość.</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>select Delete Tool:
 with the delete tool you can delete parts</source>
-        <translation>Kliknij na GumkÄ™.
+        <translation type="obsolete">Kliknij na GumkÄ™.
 Gumką można kasować klocki.</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>select Cut Tool:
 with the cut tool you can split a part</source>
-        <translation>Kliknij na Nożyczki.
+        <translation type="obsolete">Kliknij na Nożyczki.
 Nożyczkami można ciąć klocki.</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>select Glue Tool:
 with the glue tool you can glue two parts</source>
-        <translation>Kliknij na Klej.
+        <translation type="obsolete">Kliknij na Klej.
 Klejem możesz sklejać dwa klocki</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>select Score Tool:
 </source>
-        <translation>Wybierz PodglÄ…d Nutowy.</translation>
+        <translation type="obsolete">Wybierz PodglÄ…d Nutowy.</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>select Quantize Tool:
 insert display quantize event</source>
-        <translation>Ustaw Kwantyzator
+        <translation type="obsolete">Ustaw Kwantyzator
 (ustawia kwantyzację wstawiania komunikatów midi).</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>select Drawing Tool</source>
-        <translation>wybierz Wykres</translation>
+        <translation type="obsolete">wybierz Wykres</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>select Muting Tool:
 click on part to mute/unmute</source>
-        <translation>Kliknij na Wyłącz.
+        <translation type="obsolete">Kliknij na Wyłącz.
 Kliknij na pojedynczy klocek aby go wyłączyć z odtwarzania.</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Manipulate automation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Cursor tool</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>pointer</source>
-        <translation>Strzałka</translation>
+        <translation type="obsolete">Strzałka</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>pencil</source>
-        <translation>Ołówek</translation>
+        <translation type="obsolete">Ołówek</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>cutter</source>
-        <translation>Nożyczki</translation>
+        <translation type="obsolete">Nożyczki</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>score</source>
-        <translation>PoglÄ…d nutowy</translation>
+        <translation type="obsolete">PoglÄ…d nutowy</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>glue</source>
-        <translation>Klej</translation>
+        <translation type="obsolete">Klej</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>quantize</source>
-        <translation>Kwantyzator</translation>
+        <translation type="obsolete">Kwantyzator</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>draw</source>
-        <translation>Wykres</translation>
+        <translation type="obsolete">Wykres</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>mute parts</source>
-        <translation>Wyłącz klocki z odtwarzania</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>edit automation</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Wyłącz klocki z odtwarzania</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>cursor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="+155"/>
-        <location filename="../../muse/master/masteredit.cpp" line="+155"/>
-        <location filename="../../muse/widgets/comboQuant.cpp" line="+40"/>
-        <location line="+1"/>
-        <location line="+1"/>
-        <location filename="../../muse/widgets/tb1.cpp" line="+48"/>
-        <location line="+1"/>
-        <location line="+1"/>
         <source>Off</source>
-        <translation>Wył.</translation>
+        <translation type="obsolete">Wył.</translation>
     </message>
     <message>
         <source>presets (*.pre *.pre.gz *.pre.bz2)</source>
@@ -264,233 +200,89 @@ Kliknij na pojedynczy klocek aby go wyłączyć z odtwarzania.</translation>
         <translation type="obsolete">Wszystkie Pliki (*)</translation>
     </message>
     <message>
-        <location filename="../../muse/helper.cpp" line="+242"/>
-        <source>MESS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>DSSI</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+9"/>
-        <source>FST</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
+        <location filename="../../muse/helper.cpp" line="+185"/>
         <source>Add Midi Track</source>
         <translation type="unfinished">Dodaj Åšlad Midi</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>Add Drum Track</source>
         <translation type="unfinished">Dodaj Åšlad Perkusyjny</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>Add Wave Track</source>
         <translation type="unfinished">Dodaj Åšlad Audio</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+7"/>
         <source>Add Audio Output</source>
         <translation type="unfinished">Dodaj Wyjście Audio</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+7"/>
         <source>Add Audio Group</source>
         <translation type="unfinished">Dodaj GrupÄ™(SzynÄ™) Audio</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+7"/>
         <source>Add Audio Input</source>
         <translation type="unfinished">Dodaj Wejście Audio</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+7"/>
         <source>Add Aux Send</source>
         <translation type="unfinished">Dodaj Wysyłkę Audio</translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/tools.cpp" line="-8"/>
         <source>eraser</source>
-        <translation>Gumka</translation>
+        <translation type="obsolete">Gumka</translation>
     </message>
     <message>
-        <location filename="../../muse/helper.cpp" line="+7"/>
+        <location line="+9"/>
         <source>Add Synth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="+0"/>
-        <source>Bar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="+729"/>
-        <source> Jack</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+46"/>
-        <source>ALSA:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
-        <source>SYNTH:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
-        <source>JACK:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/driver/alsamidi.cpp" line="+209"/>
-        <location filename="../../muse/driver/jackmidi.cpp" line="+290"/>
-        <location filename="../../muse/midiport.cpp" line="+1138"/>
-        <location filename="../../muse/track.cpp" line="+799"/>
-        <location line="+16"/>
-        <location line="+30"/>
+        <location filename="../../muse/midiport.cpp" line="+1190"/>
         <source>Route</source>
         <translation type="unfinished">Połącznie</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location filename="../../muse/driver/jackmidi.cpp" line="+2"/>
-        <location filename="../../muse/track.cpp" line="-28"/>
-        <location line="+37"/>
-        <source> channel=&quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <location filename="../../muse/driver/jackmidi.cpp" line="+3"/>
-        <location filename="../../muse/midiport.cpp" line="+7"/>
-        <location filename="../../muse/track.cpp" line="-48"/>
-        <location line="+60"/>
+        <location line="+7"/>
         <source>dest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location filename="../../muse/driver/jackmidi.cpp" line="+2"/>
-        <source> devtype=&quot;%1&quot;</source>
+        <location line="+1"/>
+        <source> name=&quot;%1&quot;/</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location filename="../../muse/driver/jackmidi.cpp" line="-20"/>
-        <location line="+23"/>
-        <location filename="../../muse/track.cpp" line="-42"/>
-        <location line="+48"/>
-        <source> type=&quot;%1&quot;</source>
+        <location line="-857"/>
+        <source>Warning: No output devices!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location filename="../../muse/driver/jackmidi.cpp" line="-22"/>
-        <location line="+23"/>
-        <location filename="../../muse/midiport.cpp" line="+1"/>
-        <location filename="../../muse/track.cpp" line="-65"/>
-        <location line="+18"/>
-        <location line="+53"/>
-        <source> name=&quot;%1&quot;/</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/driver/jackmidi.cpp" line="-26"/>
-        <location filename="../../muse/track.cpp" line="-56"/>
-        <source>source</source>
+        <location line="+5"/>
+        <source>Open midi config...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midictrl.cpp" line="+242"/>
-        <source>Velocity</source>
+        <location line="+23"/>
+        <source>Empty ports</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiport.cpp" line="-807"/>
+        <location line="+22"/>
         <source>&lt;none&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+801"/>
-        <location filename="../../muse/track.cpp" line="-21"/>
-        <location line="+48"/>
         <source> channelMask=&quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../../muse/osc.cpp" line="+1320"/>
-        <source>dssi_synth</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+87"/>
-        <source>ladspa_efx</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/track.cpp" line="+8"/>
-        <source> channels=&quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source> remch=&quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+17"/>
-        <source> mport=&quot;%1&quot;/</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/widgets/visibletracks.cpp" line="+35"/>
-        <location line="+9"/>
-        <source>Show wave tracks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-8"/>
-        <location line="+9"/>
-        <source>Show group tracks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-8"/>
-        <location line="+9"/>
-        <source>Show aux tracks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-8"/>
-        <location line="+9"/>
-        <source>Show input tracks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-8"/>
-        <location line="+9"/>
-        <source>Show output tracks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-8"/>
-        <location line="+9"/>
-        <source>Show midi tracks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-8"/>
-        <location line="+9"/>
-        <source>Show synth tracks</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>AboutBox</name>
@@ -548,79 +340,8 @@ Published under the GNU Public License</source>
 <context>
     <name>Appearance</name>
     <message>
-        <location filename="../../muse/appearance.cpp" line="+769"/>
         <source>MusE: load image</source>
-        <translation type="unfinished">Muza: Załaduj obrazek.</translation>
-    </message>
-    <message>
-        <location line="-639"/>
-        <source>Main application font, and default font for any
- controls not defined here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>For small controls like mixer strips.
-Also timescale small numbers, arranger part name overlay,
- and effects rack.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Midi track info panel. Transport controls.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Controller graph and S/X buttons. Large numbers for time
- and tempo scale, and time signature.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Time scale markers.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>List editor: meta event edit dialog multi-line edit box.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Mixer label font. Auto-font-sizing up to chosen font size.
-Word-breaking but only with spaces.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Maximum mixer label auto-font-sizing font size.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Global opacity (opposite of transparency).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Standard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Custom</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+958"/>
-        <source>Select style sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Qt style sheets (*.qss)</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Muza: Załaduj obrazek.</translation>
     </message>
 </context>
 <context>
@@ -1344,29 +1065,8 @@ Word-breaking but only with spaces.</source>
 <context>
     <name>ClipListEdit</name>
     <message>
-        <location filename="../../muse/cliplist/cliplist.cpp" line="+127"/>
-        <source>MusE: Clip List Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Undo/Redo tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
         <source>panic</source>
-        <translation type="unfinished">Zatrzymaj wszystkie komunikaty midi!</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>transport</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Zatrzymaj wszystkie komunikaty midi!</translation>
     </message>
 </context>
 <context>
@@ -1442,7 +1142,7 @@ Word-breaking but only with spaces.</source>
         <translation type="obsolete">MuzA: Konfiguracja exportu plików midi</translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/configmidifilebase.ui" line="+193"/>
+        <location filename="../../muse/widgets/configmidifilebase.ui" line="+202"/>
         <source>&amp;OK</source>
         <translation>&amp;Akceptuj</translation>
     </message>
@@ -1462,7 +1162,7 @@ Word-breaking but only with spaces.</source>
         <translation>1 (wiele śladów)</translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-52"/>
         <source>Format:</source>
         <translation>Format:</translation>
     </message>
@@ -1482,12 +1182,12 @@ Word-breaking but only with spaces.</source>
         <translation>384</translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+64"/>
         <source>Division:</source>
         <translation>Rozdzielczość:</translation>
     </message>
     <message>
-        <location line="-20"/>
+        <location line="-36"/>
         <source>Copyright:</source>
         <translation>Prawa autorskie:</translation>
     </message>
@@ -1496,17 +1196,17 @@ Word-breaking but only with spaces.</source>
         <translation type="obsolete">Aktuwuj rozszerzony format smf (standard midi file)</translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-91"/>
         <source>MusE: Config Midi File Import/Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+15"/>
         <source>Import:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+9"/>
         <source>Split tracks into &amp;parts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1516,12 +1216,12 @@ Word-breaking but only with spaces.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-6"/>
         <source>Split tracks into parts, or one single part</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+22"/>
         <source>Export:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1541,7 +1241,12 @@ Word-breaking but only with spaces.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+33"/>
+        <source>Note: Format 0 uses the FIRST midi track&apos;s name/comment in the arranger</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Save space by replacing note-offs with &amp;zero velocity note-ons</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1618,14 +1323,12 @@ Word-breaking but only with spaces.</source>
 <context>
     <name>CtrlPanel</name>
     <message>
-        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="+94"/>
         <source>select controller</source>
-        <translation>Wybierz kontroler</translation>
+        <translation type="obsolete">Wybierz kontroler</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>remove panel</source>
-        <translation>Usuń panel</translation>
+        <translation type="obsolete">Usuń panel</translation>
     </message>
     <message>
         <source>Sel</source>
@@ -1636,73 +1339,22 @@ Word-breaking but only with spaces.</source>
         <translation type="obsolete">x</translation>
     </message>
     <message>
-        <location line="+463"/>
-        <location line="+236"/>
         <source>Velocity</source>
-        <translation>Predkość uderzenia (velocity)</translation>
+        <translation type="obsolete">Predkość uderzenia (velocity)</translation>
     </message>
     <message>
-        <location line="-186"/>
         <source>add new ...</source>
-        <translation>dodaj nowe ...</translation>
+        <translation type="obsolete">dodaj nowe ...</translation>
     </message>
     <message>
-        <location line="-528"/>
         <source>S</source>
-        <translation type="unfinished">S</translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>X</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>manual adjust</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+9"/>
-        <source>double click on/off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+653"/>
-        <location line="+58"/>
-        <source>Instrument-defined</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-43"/>
-        <location line="+21"/>
-        <source>Add ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-17"/>
-        <source>Others</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+65"/>
-        <source>Edit instrument ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+46"/>
-        <source>Common Controls</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">S</translation>
     </message>
 </context>
 <context>
     <name>DeicsOnzeGui</name>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="+538"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="+540"/>
         <source>Save configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3461,402 +3113,199 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
 <context>
     <name>DrumEdit</name>
     <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="+183"/>
         <source>Load Map</source>
-        <translation>Załaduj zestaw</translation>
+        <translation type="obsolete">Załaduj zestaw</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Save Map</source>
-        <translation>Zapisz zestaw</translation>
+        <translation type="obsolete">Zapisz zestaw</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>&amp;Edit</source>
-        <translation>&amp;Edytuj</translation>
+        <translation type="obsolete">&amp;Edytuj</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Cut</source>
-        <translation>Wytnij</translation>
+        <translation type="obsolete">Wytnij</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Copy</source>
-        <translation>Kopiuj</translation>
+        <translation type="obsolete">Kopiuj</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Paste</source>
-        <translation>Wklej</translation>
+        <translation type="obsolete">Wklej</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Delete Events</source>
-        <translation>Kasuj Elementy</translation>
+        <translation type="obsolete">Kasuj Elementy</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Select All</source>
-        <translation>Zaznacz wszystko</translation>
+        <translation type="obsolete">Zaznacz wszystko</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Select None</source>
-        <translation>Bez zaznaczenia</translation>
+        <translation type="obsolete">Bez zaznaczenia</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Invert</source>
-        <translation>Odwróć zaznaczenie</translation>
+        <translation type="obsolete">Odwróć zaznaczenie</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Inside Loop</source>
-        <translation>Pomiędzy lokatorami</translation>
+        <translation type="obsolete">Pomiędzy lokatorami</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Outside Loop</source>
-        <translation>Poza obrębem lokatorów</translation>
+        <translation type="obsolete">Poza obrębem lokatorów</translation>
     </message>
     <message>
-        <location line="-7"/>
         <source>&amp;Select</source>
-        <translation>&amp;Zaznacz</translation>
+        <translation type="obsolete">&amp;Zaznacz</translation>
     </message>
     <message>
-        <location line="+99"/>
         <source>Step Record</source>
-        <translation>Nagrywanie po jednej nucie</translation>
+        <translation type="obsolete">Nagrywanie po jednej nucie</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Midi Input</source>
-        <translation>PodglÄ…d Midi</translation>
+        <translation type="obsolete">PodglÄ…d Midi</translation>
     </message>
     <message>
-        <location line="+57"/>
         <source>Add Controller View</source>
-        <translation>Pokaż widok kontrolerów</translation>
+        <translation type="obsolete">Pokaż widok kontrolerów</translation>
     </message>
     <message>
-        <location line="+57"/>
         <source>M</source>
-        <translation>Wycisz</translation>
+        <translation type="obsolete">Wycisz</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Sound</source>
-        <translation>Brzmienie</translation>
+        <translation type="obsolete">Brzmienie</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>QNT</source>
-        <translation>Kwant.</translation>
+        <translation type="obsolete">Kwant.</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>E-Note</source>
-        <translation>U-Wys</translation>
+        <translation type="obsolete">U-Wys</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Len</source>
-        <translation>DÅ‚ug.</translation>
+        <translation type="obsolete">DÅ‚ug.</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A-Note</source>
-        <translation>W-Wys</translation>
+        <translation type="obsolete">W-Wys</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Ch</source>
-        <translation>Kanał</translation>
+        <translation type="obsolete">Kanał</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Port</source>
-        <translation>Urz. Midi</translation>
+        <translation type="obsolete">Urz. Midi</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>LV1</source>
-        <translation>PV1</translation>
+        <translation type="obsolete">PV1</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>LV2</source>
-        <translation>PV2</translation>
+        <translation type="obsolete">PV2</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>LV3</source>
-        <translation>PV3</translation>
+        <translation type="obsolete">PV3</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>LV4</source>
-        <translation>PV4</translation>
+        <translation type="obsolete">PV4</translation>
     </message>
     <message>
-        <location line="-271"/>
         <source>&amp;File</source>
-        <translation>&amp;Plik</translation>
+        <translation type="obsolete">&amp;Plik</translation>
     </message>
     <message>
-        <location line="+121"/>
         <source>Load Drummap</source>
-        <translation>Załaduj zestaw perkusyjny</translation>
+        <translation type="obsolete">Załaduj zestaw perkusyjny</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Store Drummap</source>
-        <translation>Zapisz zestaw perkusyjny</translation>
+        <translation type="obsolete">Zapisz zestaw perkusyjny</translation>
     </message>
     <message>
-        <location line="+68"/>
         <source>ctrl</source>
-        <translation>ctrl</translation>
+        <translation type="obsolete">ctrl</translation>
     </message>
     <message>
         <source>drummaps</source>
         <translation type="obsolete">Zestawy perkusyjne</translation>
     </message>
     <message>
-        <location line="+449"/>
         <source>Muse: Load Drum Map</source>
-        <translation>MuzA: Załaduj zestaw perkusyjny</translation>
+        <translation type="obsolete">MuzA: Załaduj zestaw perkusyjny</translation>
     </message>
     <message>
-        <location line="+53"/>
         <source>MusE: Store Drum Map</source>
-        <translation>MuzA: Zapisz zestaw perkusyjny</translation>
+        <translation type="obsolete">MuzA: Zapisz zestaw perkusyjny</translation>
     </message>
     <message>
-        <location line="-620"/>
         <source>Set Fixed Length</source>
-        <translation>Ustaw stałą długość nut</translation>
+        <translation type="obsolete">Ustaw stałą długość nut</translation>
     </message>
     <message>
         <source>&amp;Functions</source>
         <translation type="obsolete">&amp;Opcje</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Modify Velocity</source>
-        <translation>Zmień Velocity</translation>
+        <translation type="obsolete">Zmień Velocity</translation>
     </message>
     <message>
-        <location line="-148"/>
-        <location line="+21"/>
         <source>mute instrument</source>
-        <translation type="unfinished">wyłącz instrument</translation>
+        <translation type="obsolete">wyłącz instrument</translation>
     </message>
     <message>
-        <location line="-20"/>
-        <location line="+21"/>
         <source>sound name</source>
-        <translation type="unfinished">nazwa brzmienia</translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <location line="+21"/>
-        <source>volume percent</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">nazwa brzmienia</translation>
     </message>
     <message>
-        <location line="-20"/>
-        <location line="+21"/>
         <source>quantisation</source>
-        <translation type="unfinished">kwantyzacja</translation>
+        <translation type="obsolete">kwantyzacja</translation>
     </message>
     <message>
-        <location line="-20"/>
-        <location line="+21"/>
         <source>this input note triggers the sound</source>
-        <translation type="unfinished">ta wysokość uruchamia brzmienie</translation>
+        <translation type="obsolete">ta wysokość uruchamia brzmienie</translation>
     </message>
     <message>
-        <location line="-20"/>
-        <location line="+21"/>
         <source>note length</source>
-        <translation type="unfinished">długość dźwięku</translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <location line="+21"/>
-        <source>this is the note which is played</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <source>output channel (hold ctl to affect all rows)</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">długość dźwięku</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+21"/>
         <source>output port</source>
-        <translation type="unfinished">port wyjściowy</translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <location line="+21"/>
-        <source>shift + control key: draw velocity level 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <location line="+21"/>
-        <source>control key: draw velocity level 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <location line="+21"/>
-        <source>shift key: draw velocity level 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <location line="+21"/>
-        <source>draw velocity level 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-5"/>
-        <source>output channel (ctl: affect all rows)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+46"/>
-        <source>Reset GM Map</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <source>Copy events in range</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Paste (with Dialog)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+29"/>
-        <source>Previous Part</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Next Part</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
-        <source>Fu&amp;nctions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Re-order list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Crescendo/Decrescendo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Quantize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Erase Event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Move Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Delete Overlaps</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>&amp;Plugins</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Drum tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+37"/>
-        <source>cursor tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Set step size for cursor edit</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">port wyjściowy</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>panic</source>
-        <translation type="unfinished">Zatrzymaj wszystkie komunikaty midi!</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>transport</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+84"/>
-        <source>Vol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+461"/>
-        <source>Drum map</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Reset the drum map with GM defaults?</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Zatrzymaj wszystkie komunikaty midi!</translation>
     </message>
 </context>
 <context>
     <name>EditCAfterDialog</name>
     <message>
-        <location filename="../../muse/liste/editevent.cpp" line="+445"/>
         <source>Time Position</source>
-        <translation>Pozycja:</translation>
+        <translation type="obsolete">Pozycja:</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Pressure</source>
-        <translation>Nacisk</translation>
+        <translation type="obsolete">Nacisk</translation>
     </message>
     <message>
-        <location line="-6"/>
         <source>MusE: Enter Channel Aftertouch</source>
-        <translation>MuzA: Wstaw zmianę średniego nacisku pod uderzeniu (channel aftertouch)</translation>
+        <translation type="obsolete">MuzA: Wstaw zmianę średniego nacisku pod uderzeniu (channel aftertouch)</translation>
     </message>
 </context>
 <context>
@@ -3967,14 +3416,12 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
 <context>
     <name>EditEventDialog</name>
     <message>
-        <location filename="../../muse/liste/editevent.cpp" line="-255"/>
         <source>Ok</source>
-        <translation>Akceptuj</translation>
+        <translation type="obsolete">Akceptuj</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Cancel</source>
-        <translation>Anuluj</translation>
+        <translation type="obsolete">Anuluj</translation>
     </message>
 </context>
 <context>
@@ -4038,180 +3485,24 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
 <context>
     <name>EditInstrument</name>
     <message>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="+311"/>
-        <location line="+34"/>
-        <source>MusE: Create file failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+33"/>
         <source>MusE: Write File failed</source>
-        <translation type="unfinished">MuzA: Zapis pliku nie powiódł się</translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <location line="+12"/>
-        <location line="+280"/>
-        <location line="+12"/>
-        <source>MusE:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-303"/>
-        <location line="+292"/>
-        <source>The user instrument directory
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-292"/>
-        <location line="+292"/>
-        <source>
-does not exist yet. Create it now?
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-291"/>
-        <location line="+292"/>
-        <source>(You can change the user instruments directory at Settings-&gt;Global Settings-&gt;Midi)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-282"/>
-        <location line="+292"/>
-        <source>Unable to create user instrument directory
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-244"/>
-        <location line="+266"/>
-        <source>MusE: Save Instrument Definition</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-265"/>
-        <location line="+266"/>
-        <source>Instrument Definition (*.idf)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-154"/>
-        <location line="+29"/>
-        <source>MusE: Save instrument as</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-29"/>
-        <source>Enter a new unique instrument name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+30"/>
-        <source>The user instrument:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>
-already exists. This will overwrite its .idf instrument file.
-Are you sure?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+525"/>
-        <source>MusE: Bad instrument name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Please choose a unique instrument name.
-(The name might be used by a hidden instrument.)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+136"/>
-        <source>MusE: Bad patch name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Please choose a unique patch name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
-        <source>MusE: Bad patchgroup name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Please choose a unique patchgroup name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+526"/>
-        <source>MusE: Bad controller name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Please choose a unique controller name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1287"/>
-        <location line="+12"/>
-        <source>MusE: Cannot add common controller</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-11"/>
-        <source>A controller named </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <location line="+12"/>
-        <source> already exists.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>A controller number </source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">MuzA: Zapis pliku nie powiódł się</translation>
     </message>
     <message>
-        <location line="+283"/>
-        <location line="+5"/>
         <source>MusE</source>
-        <translation type="unfinished">MuzA</translation>
-    </message>
-    <message>
-        <location line="-4"/>
-        <location line="+5"/>
-        <source>The current Instrument contains unsaved data
-Save Current Instrument?</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">MuzA</translation>
     </message>
     <message>
-        <location line="-3"/>
-        <location line="+5"/>
         <source>&amp;Save</source>
-        <translation type="unfinished">&amp;Zapisz</translation>
+        <translation type="obsolete">&amp;Zapisz</translation>
     </message>
     <message>
-        <location line="-5"/>
-        <location line="+5"/>
         <source>&amp;Nosave</source>
-        <translation type="unfinished">&amp;Nie zapisuj</translation>
+        <translation type="obsolete">&amp;Nie zapisuj</translation>
     </message>
     <message>
-        <location line="-5"/>
         <source>&amp;Abort</source>
-        <translation type="unfinished">&amp;Anuluj</translation>
+        <translation type="obsolete">&amp;Anuluj</translation>
     </message>
 </context>
 <context>
@@ -4976,24 +4267,20 @@ Typically, set to 127/127, or an unused
 <context>
     <name>EditMetaDialog</name>
     <message>
-        <location filename="../../muse/liste/editevent.cpp" line="+120"/>
         <source>Time Position</source>
-        <translation>Pozycja:</translation>
+        <translation type="obsolete">Pozycja:</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Meta Type</source>
-        <translation>Meta Typ</translation>
+        <translation type="obsolete">Meta Typ</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Enter Hex</source>
-        <translation>Wstaw Heks.</translation>
+        <translation type="obsolete">Wstaw Heks.</translation>
     </message>
     <message>
-        <location line="-18"/>
         <source>MusE: Enter Meta Event</source>
-        <translation>MuzA: Wstaw Zdarzenie Meta (nacisk po uderzeniu</translation>
+        <translation type="obsolete">MuzA: Wstaw Zdarzenie Meta (nacisk po uderzeniu</translation>
     </message>
 </context>
 <context>
@@ -5073,24 +4360,20 @@ Typically, set to 127/127, or an unused
 <context>
     <name>EditPAfterDialog</name>
     <message>
-        <location filename="../../muse/liste/editevent.cpp" line="+196"/>
         <source>Time Position</source>
-        <translation>Pozycja:</translation>
+        <translation type="obsolete">Pozycja:</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Pitch</source>
-        <translation>Wysokość dźwięku</translation>
+        <translation type="obsolete">Wysokość dźwięku</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Pressure</source>
-        <translation>Nacisk</translation>
+        <translation type="obsolete">Nacisk</translation>
     </message>
     <message>
-        <location line="-8"/>
         <source>MusE: Enter Poly Aftertouch</source>
-        <translation>MuzA: Wstaw zmianę średniego nacisku pod uderzeniu (channel aftertouch)</translation>
+        <translation type="obsolete">MuzA: Wstaw zmianę średniego nacisku pod uderzeniu (channel aftertouch)</translation>
     </message>
 </context>
 <context>
@@ -5588,12 +4871,11 @@ RTC (Rzeczywista Rozdzielczość Zegara)
 (Tykanie/Sekunda)</translation>
     </message>
     <message>
-        <location line="+212"/>
         <source>GUI</source>
-        <translation>Interfejs Użytkownika</translation>
+        <translation type="obsolete">Interfejs Użytkownika</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+240"/>
         <source>/sec</source>
         <translation>/sek.</translation>
     </message>
@@ -5613,13 +4895,46 @@ RTC (Rzeczywista Rozdzielczość Zegara)
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+13"/>
         <source>Allows some popup menus to stay open.
 Otherwise, hold Ctrl to keep them open.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+11"/>
+        <source>In some areas, the middle mouse button decreases
+values, while the right button increases. Users without a
+middle mouse button can select this option to make the
+left button behave like the middle button in such areas.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Use left mouse button for decreasing values</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Shift + Right click sets left range marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Allow adding hidden tracks in track list menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Unhide tracks when adding hidden tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>GUI Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>MDI-subwindowness and sharing menus</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5663,7 +4978,7 @@ Otherwise, hold Ctrl to keep them open.</source>
         <translation type="obsolete">PrzeglÄ…darka pomocy:</translation>
     </message>
     <message>
-        <location line="-1438"/>
+        <location line="-1538"/>
         <source>Application</source>
         <translation>Zastosowanie</translation>
     </message>
@@ -5993,7 +5308,12 @@ Adjusts responsiveness of audio controls and
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+41"/>
+        <source>GUI Behaviour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+44"/>
         <source>Use old-style stop shortcut:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6016,139 +5336,44 @@ Adjusts responsiveness of audio controls and
 <context>
     <name>LMaster</name>
     <message>
-        <location filename="../../muse/master/lmaster.cpp" line="+207"/>
         <source>new tempo</source>
-        <translation>nowe tempo</translation>
+        <translation type="obsolete">nowe tempo</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>new signature</source>
-        <translation>nowe metrum</translation>
+        <translation type="obsolete">nowe metrum</translation>
     </message>
     <message>
-        <location line="+26"/>
         <source>Meter</source>
-        <translation>Miernik</translation>
+        <translation type="obsolete">Miernik</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Time</source>
-        <translation>Pozycja</translation>
+        <translation type="obsolete">Pozycja</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Type</source>
-        <translation>Typ</translation>
+        <translation type="obsolete">Typ</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Value</source>
-        <translation>Wartość</translation>
+        <translation type="obsolete">Wartość</translation>
     </message>
     <message>
-        <location line="-90"/>
         <source>MusE: Mastertrack</source>
-        <translation>MuzA: Åšlad Tempo/Metrum</translation>
-    </message>
-    <message>
-        <location line="+25"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+23"/>
-        <source>Undo/Redo tools</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">MuzA: Åšlad Tempo/Metrum</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Tempo</source>
-        <translation>Tempo</translation>
+        <translation type="obsolete">Tempo</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Timesig</source>
-        <translation>Metrum</translation>
-    </message>
-    <message>
-        <location line="-45"/>
-        <source>&amp;Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Insert Tempo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Insert Signature</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Insert Key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Edit Positon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Edit Value</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Delete Event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+30"/>
-        <source>Edit tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>new key</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Metrum</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>panic</source>
-        <translation type="unfinished">Zatrzymaj wszystkie komunikaty midi!</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>transport</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+408"/>
-        <source>Reposition of the initial tempo and signature events is not allowed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+54"/>
-        <source>MusE: List Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Input error, conversion not OK or value out of range</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>Reposition of tempo and signature events to start position is not allowed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Zatrzymaj wszystkie komunikaty midi!</translation>
     </message>
 </context>
 <context>
@@ -6217,24 +5442,20 @@ Adjusts responsiveness of audio controls and
 <context>
     <name>ListEdit</name>
     <message>
-        <location filename="../../muse/liste/listedit.cpp" line="+486"/>
         <source>&amp;Edit</source>
-        <translation>E&amp;dytuj</translation>
+        <translation type="obsolete">E&amp;dytuj</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Cut</source>
-        <translation>Wytnij</translation>
+        <translation type="obsolete">Wytnij</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Copy</source>
-        <translation>Kopiuj</translation>
+        <translation type="obsolete">Kopiuj</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Paste</source>
-        <translation>Wklej</translation>
+        <translation type="obsolete">Wklej</translation>
     </message>
     <message>
         <source>List Tools</source>
@@ -6245,137 +5466,100 @@ Adjusts responsiveness of audio controls and
         <translation type="obsolete">Wstaw Narzędzia</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Delete Events</source>
-        <translation>Kasuj Elementy</translation>
+        <translation type="obsolete">Kasuj Elementy</translation>
     </message>
     <message>
         <source>Insert Note</source>
         <translation type="obsolete">Wstaw nutÄ™</translation>
     </message>
     <message>
-        <location line="-37"/>
         <source>insert Note</source>
-        <translation>Wstaw nutÄ™</translation>
+        <translation type="obsolete">Wstaw nutÄ™</translation>
     </message>
     <message>
         <source>Insert SysEx</source>
         <translation type="obsolete">wstaw SysEx</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>insert SysEx</source>
-        <translation>wstaw SysEx</translation>
+        <translation type="obsolete">wstaw SysEx</translation>
     </message>
     <message>
         <source>Insert Ctrl</source>
         <translation type="obsolete">Wstaw kontroler</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>insert Ctrl</source>
-        <translation>wstaw </translation>
+        <translation type="obsolete">wstaw </translation>
     </message>
     <message>
         <source>Insert Meta</source>
         <translation type="obsolete">Wstaw Meta</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>insert Meta</source>
-        <translation>Wstaw Meta</translation>
+        <translation type="obsolete">Wstaw Meta</translation>
     </message>
     <message>
         <source>Insert Channel Aftertouch</source>
         <translation type="obsolete">Wstaw zmianę średniego nacisku pod uderzeniu (channel aftertouch)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>insert Channel Aftertouch</source>
-        <translation>Wstaw zmianę średniego nacisku pod uderzeniu (channel aftertouch)</translation>
+        <translation type="obsolete">Wstaw zmianę średniego nacisku pod uderzeniu (channel aftertouch)</translation>
     </message>
     <message>
         <source>Insert Key Aftertouch</source>
         <translation type="obsolete">Wstaw pojedynczÄ… zmiane nacisku pod uderzeniu</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>insert Poly Aftertouch</source>
-        <translation>Wstaw zmianę średniego nacisku pod uderzeniu (Poly Aftertouch)</translation>
-    </message>
-    <message>
-        <location line="+42"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Wstaw zmianę średniego nacisku pod uderzeniu (Poly Aftertouch)</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Undo/Redo tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
         <source>panic</source>
-        <translation type="unfinished">Zatrzymaj wszystkie komunikaty midi!</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>transport</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Zatrzymaj wszystkie komunikaty midi!</translation>
     </message>
     <message>
-        <location line="+22"/>
         <source>Tick</source>
-        <translation>Takt (impuls sygnału czasu)</translation>
+        <translation type="obsolete">Takt (impuls sygnału czasu)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Bar</source>
-        <translation>Takt</translation>
+        <translation type="obsolete">Takt</translation>
     </message>
     <message>
         <source>Typ</source>
         <translation type="obsolete">Typ</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Ch</source>
-        <translation>Kan</translation>
+        <translation type="obsolete">Kan</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Val A</source>
-        <translation>Wart. A</translation>
+        <translation type="obsolete">Wart. A</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Val B</source>
-        <translation>Wart. B</translation>
+        <translation type="obsolete">Wart. B</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Val C</source>
-        <translation>Wart. C</translation>
+        <translation type="obsolete">Wart. C</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Len</source>
-        <translation>DÅ‚ug.</translation>
+        <translation type="obsolete">DÅ‚ug.</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Comment</source>
-        <translation>Opis</translation>
+        <translation type="obsolete">Opis</translation>
     </message>
     <message>
-        <location line="-38"/>
-        <source>Insert tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+32"/>
         <source>Type</source>
-        <translation type="unfinished">Typ</translation>
+        <translation type="obsolete">Typ</translation>
     </message>
 </context>
 <context>
@@ -6413,269 +5597,48 @@ Adjusts responsiveness of audio controls and
         <translation type="obsolete">brak</translation>
     </message>
     <message>
-        <location filename="../../muse/confmport.cpp" line="+236"/>
         <source>Port</source>
-        <translation>Numer</translation>
+        <translation type="obsolete">Numer</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>GUI</source>
-        <translation>Interfejs użytkownika </translation>
+        <translation type="obsolete">Interfejs użytkownika </translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Instrument</source>
-        <translation>Typ portu midi</translation>
+        <translation type="obsolete">Typ portu midi</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Device Name</source>
-        <translation>Nazwa UrzÄ…dzenia</translation>
+        <translation type="obsolete">Nazwa UrzÄ…dzenia</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>State</source>
-        <translation>Status</translation>
+        <translation type="obsolete">Status</translation>
     </message>
     <message>
         <source>unknown</source>
         <translation type="obsolete">nieznane</translation>
     </message>
     <message>
-        <location line="-8"/>
         <source>I</source>
-        <translation>Wej.</translation>
+        <translation type="obsolete">Wej.</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>O</source>
-        <translation>Wyj.</translation>
-    </message>
-    <message>
-        <location line="-715"/>
-        <source>MusE: bad device name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-254"/>
-        <location line="+176"/>
-        <source>Default input connections</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-175"/>
-        <location line="+66"/>
-        <source>Are you sure you want to apply to all existing midi tracks now?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-1"/>
-        <location line="+148"/>
-        <source>Default output connections</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-37"/>
-        <location line="+38"/>
-        <source>Setting will apply to new midi tracks.
-Do you want to apply to all existing midi tracks now?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+40"/>
-        <source>please choose a unique device name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+72"/>
-        <location line="+860"/>
-        <source>in</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-837"/>
-        <location line="+828"/>
-        <source>out</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-772"/>
-        <source>Show first aliases</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Show second aliases</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+130"/>
-        <location line="+42"/>
-        <source>Toggle all</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-38"/>
-        <location line="+43"/>
-        <source>Change all tracks now</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+43"/>
-        <source>Create</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source> device</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Wyj.</translation>
     </message>
     <message>
-        <location line="+229"/>
-        <location line="+29"/>
         <source>Port Number</source>
-        <translation type="unfinished">Numer portu</translation>
-    </message>
-    <message>
-        <location line="-28"/>
-        <source>Enable gui</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Enable reading</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Enable writing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Port instrument</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Midi device name. Click to edit (Jack)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Connections from Jack Midi outputs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Connections to Jack Midi inputs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Auto-connect these channels to new midi tracks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Auto-connect new midi tracks to these channels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Auto-connect new midi tracks to this channel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>Auto-connect these channels, on this port, to new midi tracks.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Connect new midi tracks to these channels, on this port.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Connect new midi tracks to this channel, on this port.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-45"/>
-        <source>Device state</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+15"/>
-        <source>Enable gui for device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Enable reading from device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Enable writing to device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Name of the midi device associated with this port number. Click to edit Jack midi name.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Numer portu</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Instrument connected to port</source>
-        <translation type="unfinished">Instrument połączony do portu</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Connections from Jack Midi output ports</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Connections to Jack Midi input ports</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Instrument połączony do portu</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>State: result of opening the device</source>
-        <translation type="unfinished">Status: rezultat otworzenia urzÄ…dzenia</translation>
-    </message>
-    <message>
-        <location line="+47"/>
-        <source>In routes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Out routes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Def in ch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Def out ch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+86"/>
-        <source>&lt;unknown&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+87"/>
-        <location line="+74"/>
-        <source>&lt;none&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Status: rezultat otworzenia urzÄ…dzenia</translation>
     </message>
 </context>
 <context>
@@ -6736,68 +5699,44 @@ Do you want to apply to all existing midi tracks now?</source>
 <context>
     <name>MarkerView</name>
     <message>
-        <location filename="../../muse/marker/markerview.cpp" line="+192"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Undo/Redo tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+9"/>
         <source>panic</source>
-        <translation type="unfinished">Zatrzymaj wszystkie komunikaty midi!</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>transport</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Zatrzymaj wszystkie komunikaty midi!</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Bar:Beat:Tick</source>
-        <translation>Takt:Puls:Takt</translation>
+        <translation type="obsolete">Takt:Puls:Takt</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Hr:Mn:Sc:Fr:Sf</source>
-        <translation>Godz.:Min.:Sek.:Kl.:SKl</translation>
+        <translation type="obsolete">Godz.:Min.:Sek.:Kl.:SKl</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Lock</source>
-        <translation>Zablokuj</translation>
+        <translation type="obsolete">Zablokuj</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Text</source>
-        <translation>Tekst</translation>
+        <translation type="obsolete">Tekst</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Marker Properties</source>
-        <translation>Właściwości znacznika</translation>
+        <translation type="obsolete">Właściwości znacznika</translation>
     </message>
     <message>
-        <location line="-70"/>
         <source>MusE: Marker</source>
-        <translation>MuzA: Znacznik</translation>
+        <translation type="obsolete">MuzA: Znacznik</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>add marker</source>
-        <translation>Dodaj znacznik</translation>
+        <translation type="obsolete">Dodaj znacznik</translation>
     </message>
     <message>
         <source>Add Marker</source>
         <translation type="obsolete">Dodaj znacznik</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>delete marker</source>
-        <translation>Kasuj znacznik</translation>
+        <translation type="obsolete">Kasuj znacznik</translation>
     </message>
     <message>
         <source>Delete Marker</source>
@@ -6808,77 +5747,51 @@ Do you want to apply to all existing midi tracks now?</source>
         <translation type="obsolete">&amp;Plik</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>&amp;Edit</source>
-        <translation>&amp;Edycja</translation>
+        <translation type="obsolete">&amp;Edycja</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>edit tools</source>
-        <translation type="unfinished">Narzędzia Edycyjne</translation>
+        <translation type="obsolete">Narzędzia Edycyjne</translation>
     </message>
 </context>
 <context>
     <name>MasterEdit</name>
     <message>
-        <location filename="../../muse/master/masteredit.cpp" line="-15"/>
         <source>Cursor</source>
-        <translation>Poz. kursora</translation>
+        <translation type="obsolete">Poz. kursora</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Snap</source>
-        <translation>PrzyciÄ…ganie</translation>
+        <translation type="obsolete">PrzyciÄ…ganie</translation>
     </message>
     <message>
-        <location line="-10"/>
         <source>time at cursor position</source>
-        <translation>Wstaw metrum w aktualnej pozycji kursora</translation>
+        <translation type="obsolete">Wstaw metrum w aktualnej pozycji kursora</translation>
     </message>
     <message>
-        <location line="-41"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Undo/Redo tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
         <source>panic</source>
-        <translation type="unfinished">Zatrzymaj wszystkie komunikaty midi!</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>transport</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Zatrzymaj wszystkie komunikaty midi!</translation>
     </message>
     <message>
-        <location line="+30"/>
         <source>tempo at cursor position</source>
-        <translation>Wstaw tempo w aktualnej pozycji kursora</translation>
+        <translation type="obsolete">Wstaw tempo w aktualnej pozycji kursora</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>CurPos </source>
-        <translation>Akt. Poz. Kursora:</translation>
+        <translation type="obsolete">Akt. Poz. Kursora:</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>tempo at current position</source>
-        <translation>Wstaw tempo w aktualnej pozycji kursora</translation>
+        <translation type="obsolete">Wstaw tempo w aktualnej pozycji kursora</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>time signature at current position</source>
-        <translation>Wstaw tempo w aktualnej pozycji kursora</translation>
+        <translation type="obsolete">Wstaw tempo w aktualnej pozycji kursora</translation>
     </message>
     <message>
-        <location line="-72"/>
         <source>MusE: Mastertrack</source>
-        <translation>MuzA: Åšlad Tempo/Metrum</translation>
+        <translation type="obsolete">MuzA: Åšlad Tempo/Metrum</translation>
     </message>
     <message>
         <source>edit tools</source>
@@ -6889,28 +5802,20 @@ Do you want to apply to all existing midi tracks now?</source>
         <translation type="obsolete">Aktywuj Åšlad Tempo/Metrum</translation>
     </message>
     <message>
-        <location line="+39"/>
         <source>Info</source>
-        <translation>Info</translation>
+        <translation type="obsolete">Info</translation>
     </message>
     <message>
         <source>Off</source>
         <translation type="obsolete">Wył.</translation>
     </message>
     <message>
-        <location line="-6"/>
         <source>Enable</source>
-        <translation>WÅ‚Ä…cz</translation>
+        <translation type="obsolete">WÅ‚Ä…cz</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Enable usage of master track</source>
-        <translation>Aktywuj Åšlad Tempo/Metrum</translation>
-    </message>
-    <message>
-        <location line="-5"/>
-        <source>Enable master</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Aktywuj Åšlad Tempo/Metrum</translation>
     </message>
 </context>
 <context>
@@ -7395,10 +6300,8 @@ Zauważ, że &quot;pitch&quot; i &quot;zmiana programu (program change)&quot; sÄ
 <context>
     <name>MidiInputTransformDialog</name>
     <message>
-        <location filename="../../muse/mplugins/midiitransform.cpp" line="+718"/>
-        <location line="+2"/>
         <source>New</source>
-        <translation>Nowy</translation>
+        <translation type="obsolete">Nowy</translation>
     </message>
 </context>
 <context>
@@ -8134,6 +7037,11 @@ Enabled inputs in the list will
         <source>Send sync delay</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+24"/>
+        <source>Note: Sync delay and MTC sync currently not fully implemeted</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MidiTrackInfoBase</name>
@@ -8779,10 +7687,8 @@ Możesz określić więcej niż jeden ślad do nagrywania:
 <context>
     <name>MidiTransformerDialog</name>
     <message>
-        <location filename="../../muse/miditransform.cpp" line="+263"/>
-        <location line="+2"/>
         <source>New</source>
-        <translation>Nowy</translation>
+        <translation type="obsolete">Nowy</translation>
     </message>
 </context>
 <context>
@@ -9610,705 +8516,818 @@ failed: </source>
 <context>
     <name>MusEApp::MusE</name>
     <message>
-        <location filename="../../muse/app.cpp" line="+46"/>
-        <location line="+16"/>
-        <source>Failed to start audio!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-15"/>
-        <source>Was not able to start audio, check if jack is running.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <source>Timeout waiting for audio to run. Check if jack is running.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+219"/>
         <source>Und&amp;o</source>
-        <translation type="unfinished">Co&amp;fnij</translation>
+        <translation type="obsolete">Co&amp;fnij</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Re&amp;do</source>
-        <translation type="unfinished">Co&amp;fnij</translation>
+        <translation type="obsolete">Co&amp;fnij</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>undo last change to song</source>
-        <translation type="unfinished">cofnij ostatniÄ… zmianÄ™ w utworze</translation>
+        <translation type="obsolete">cofnij ostatniÄ… zmianÄ™ w utworze</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>redo last undo</source>
-        <translation type="unfinished">ponów ostanie cofnij</translation>
+        <translation type="obsolete">ponów ostanie cofnij</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Loop</source>
-        <translation type="unfinished">Pętla</translation>
+        <translation type="obsolete">Pętla</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Punchin</source>
-        <translation type="unfinished">WÅ‚Ä…cz wcinki (punch In)</translation>
+        <translation type="obsolete">WÅ‚Ä…cz wcinki (punch In)</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Punchout</source>
-        <translation type="unfinished">Wył. wcinki (punch out)</translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Start</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Wył. wcinki (punch out)</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Rewind</source>
-        <translation type="unfinished">Przewiń do tyłu</translation>
+        <translation type="obsolete">Przewiń do tyłu</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Forward</source>
-        <translation type="unfinished">Przewiń do przodu</translation>
+        <translation type="obsolete">Przewiń do przodu</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Stop</source>
-        <translation type="unfinished">Stop</translation>
+        <translation type="obsolete">Stop</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Play</source>
-        <translation type="unfinished">Odtwarzanie</translation>
+        <translation type="obsolete">Odtwarzanie</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Record</source>
-        <translation type="unfinished">Nagrywanie</translation>
+        <translation type="obsolete">Nagrywanie</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <location line="+232"/>
         <source>Panic</source>
-        <translation type="unfinished">Zatrzymaj wszystkie komunikaty midi!</translation>
-    </message>
-    <message>
-        <location line="-220"/>
-        <source>&amp;New</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Zatrzymaj wszystkie komunikaty midi!</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Open</source>
-        <translation type="unfinished">&amp;Otwórz</translation>
+        <translation type="obsolete">&amp;Otwórz</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Open &amp;Recent</source>
-        <translation type="unfinished">Otwórz O&amp;statnie</translation>
+        <translation type="obsolete">Otwórz O&amp;statnie</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location line="+1005"/>
-        <location line="+1207"/>
         <source>&amp;Save</source>
-        <translation type="unfinished">&amp;Zapisz</translation>
+        <translation type="obsolete">&amp;Zapisz</translation>
     </message>
     <message>
-        <location line="-2207"/>
         <source>Save &amp;As</source>
-        <translation type="unfinished">Zapisz &amp;Jako</translation>
+        <translation type="obsolete">Zapisz &amp;Jako</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Import Midifile</source>
-        <translation type="unfinished">&amp;Import Pliku Midi</translation>
+        <translation type="obsolete">&amp;Import Pliku Midi</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Export Midifile</source>
-        <translation type="unfinished">&amp;Export do pliku midi</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Import Part</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&amp;Export do pliku midi</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location filename="../../muse/wave.cpp" line="+827"/>
         <source>Import Wave File</source>
-        <translation type="unfinished">Import Pliku &amp;Wave</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Find unused wave files</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Import Pliku &amp;Wave</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>&amp;Quit</source>
-        <translation type="unfinished">&amp;Zakończ</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Song Info</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&amp;Zakończ</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Transport Panel</source>
-        <translation type="unfinished">Panel transportu</translation>
+        <translation type="obsolete">Panel transportu</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Bigtime Window</source>
-        <translation type="unfinished">Duży Zegar</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Mixer A</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Mixer B</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Cliplist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Marker View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Arranger View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Fullscreen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>&amp;Plugins</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Duży Zegar</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Edit Instrument</source>
-        <translation type="unfinished">Edytuj Instrument</translation>
+        <translation type="obsolete">Edytuj Instrument</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Input Plugins</source>
-        <translation type="unfinished">Wtyczki wejścia</translation>
+        <translation type="obsolete">Wtyczki wejścia</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Transpose</source>
-        <translation type="unfinished">Transponuj</translation>
+        <translation type="obsolete">Transponuj</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Midi Input Transform</source>
-        <translation type="unfinished">Przekształcanie Wejścia Midi</translation>
+        <translation type="obsolete">Przekształcanie Wejścia Midi</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Midi Input Filter</source>
-        <translation type="unfinished">Filtr Wejścia Midi</translation>
+        <translation type="obsolete">Filtr Wejścia Midi</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Midi Remote Control</source>
-        <translation type="unfinished">Zdalne Sterowanie Midi</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Rhythm Generator</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Zdalne Sterowanie Midi</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Reset Instr.</source>
-        <translation type="unfinished">Reset Instr.</translation>
+        <translation type="obsolete">Reset Instr.</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Init Instr.</source>
-        <translation type="unfinished">Inicjalizacja Instr.</translation>
+        <translation type="obsolete">Inicjalizacja Instr.</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Local Off</source>
-        <translation type="unfinished">Local Off</translation>
+        <translation type="obsolete">Local Off</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Bounce to Track</source>
-        <translation type="unfinished">
+        <translation type="obsolete">
 Zgrywanie śladu (bounce)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Bounce to File</source>
-        <translation type="unfinished">Zgrywanie do Pliku (bounce)</translation>
+        <translation type="obsolete">Zgrywanie do Pliku (bounce)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Restart Audio</source>
-        <translation type="unfinished">Zrestartuj Audio</translation>
+        <translation type="obsolete">Zrestartuj Audio</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Mixer Automation</source>
-        <translation type="unfinished">Automatyka Miksera</translation>
+        <translation type="obsolete">Automatyka Miksera</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Take Snapshot</source>
-        <translation type="unfinished">Zrób zrzut ekranu</translation>
+        <translation type="obsolete">Zrób zrzut ekranu</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Clear Automation Data</source>
-        <translation type="unfinished">Wyczyść automatykę</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Cascade</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Tile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>In rows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>In columns</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Wyczyść automatykę</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Global Settings</source>
-        <translation type="unfinished">Globalne Ustawienia</translation>
+        <translation type="obsolete">Globalne Ustawienia</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Configure Shortcuts</source>
-        <translation type="unfinished">Konfiguracja skrótów</translation>
+        <translation type="obsolete">Konfiguracja skrótów</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Follow Song</source>
-        <translation type="unfinished">podążanie kursora za utworem</translation>
+        <translation type="obsolete">podążanie kursora za utworem</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Don&apos;t Follow Song</source>
-        <translation type="unfinished">nie podążaj za utworem</translation>
+        <translation type="obsolete">nie podążaj za utworem</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Follow Page</source>
-        <translation type="unfinished">kursor siÄ™ przesuwa</translation>
+        <translation type="obsolete">kursor siÄ™ przesuwa</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Follow Continuous</source>
-        <translation type="unfinished">takty siÄ™ przesuwajÄ… (kursor stoi)</translation>
+        <translation type="obsolete">takty siÄ™ przesuwajÄ… (kursor stoi)</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Metronome</source>
-        <translation type="unfinished">Metronom</translation>
+        <translation type="obsolete">Metronom</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Midi Sync</source>
-        <translation type="unfinished">Synchronizacja Midi</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Midi File Import/Export</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Synchronizacja Midi</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Appearance Settings</source>
-        <translation type="unfinished">Ustawienia wyglÄ…du</translation>
+        <translation type="obsolete">Ustawienia wyglÄ…du</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Midi Ports / Soft Synth</source>
-        <translation type="unfinished">Porty Midi i Syntezatory Softowe</translation>
+        <translation type="obsolete">Porty Midi i Syntezatory Softowe</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>&amp;Manual</source>
-        <translation type="unfinished">&amp;Instrukcja Obłsugi</translation>
+        <translation type="obsolete">&amp;Instrukcja Obłsugi</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;MusE Homepage</source>
-        <translation type="unfinished">strona domowa &amp;MuzA</translation>
+        <translation type="obsolete">strona domowa &amp;MuzA</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Report Bug...</source>
-        <translation type="unfinished">&amp;Zgłoś Błąd...</translation>
+        <translation type="obsolete">&amp;Zgłoś Błąd...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;About MusE</source>
-        <translation type="unfinished">&amp;Informacje o programie</translation>
+        <translation type="obsolete">&amp;Informacje o programie</translation>
     </message>
     <message>
-        <location line="+99"/>
         <source>File Buttons</source>
-        <translation type="unfinished">Przyciski Menu Plik</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Undo/Redo</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Przyciski Menu Plik</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Transport</source>
-        <translation type="unfinished">Panel transportu</translation>
+        <translation type="obsolete">Panel transportu</translation>
     </message>
     <message>
-        <location line="+55"/>
         <source>&amp;File</source>
-        <translation type="unfinished">&amp;Plik</translation>
+        <translation type="obsolete">&amp;Plik</translation>
     </message>
     <message>
-        <location line="+29"/>
         <source>&amp;View</source>
-        <translation type="unfinished">&amp;PrzeglÄ…daj</translation>
+        <translation type="obsolete">&amp;PrzeglÄ…daj</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>&amp;Midi</source>
-        <translation type="unfinished">&amp;Midi</translation>
+        <translation type="obsolete">&amp;Midi</translation>
     </message>
     <message>
-        <location line="+29"/>
         <source>&amp;Audio</source>
-        <translation type="unfinished">&amp;Audio</translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>A&amp;utomation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&amp;Windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>MusE Se&amp;ttings</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&amp;Audio</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>&amp;Help</source>
-        <translation type="unfinished">P&amp;omoc</translation>
+        <translation type="obsolete">P&amp;omoc</translation>
     </message>
     <message>
-        <location line="+268"/>
         <source>Cannot read template</source>
-        <translation type="unfinished">Nie można odczytać pliku szablonu</translation>
+        <translation type="obsolete">Nie można odczytać pliku szablonu</translation>
     </message>
     <message>
-        <location line="+31"/>
         <source>File open error</source>
-        <translation type="unfinished">BÅ‚Ä…d odczytu pliku</translation>
+        <translation type="obsolete">BÅ‚Ä…d odczytu pliku</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>File read error</source>
-        <translation type="unfinished">błąd odczytu pliku</translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>Unknown File Format: </source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">błąd odczytu pliku</translation>
     </message>
     <message>
-        <location line="+130"/>
-        <location line="+408"/>
-        <location line="+895"/>
         <source>MusE: Song: </source>
-        <translation type="unfinished">MuzA: Utwór</translation>
+        <translation type="obsolete">MuzA: Utwór</translation>
     </message>
     <message>
-        <location line="-1269"/>
         <source>MusE: load project</source>
-        <translation type="unfinished">MuzA: ładuj utwór</translation>
+        <translation type="obsolete">MuzA: ładuj utwór</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>MusE: load template</source>
-        <translation type="unfinished">MuzA: Å‚aduj szablon</translation>
+        <translation type="obsolete">MuzA: Å‚aduj szablon</translation>
     </message>
     <message>
-        <location line="+62"/>
         <source>MusE: Write File failed</source>
-        <translation type="unfinished">MuzA: Zapis pliku nie powiódł się</translation>
+        <translation type="obsolete">MuzA: Zapis pliku nie powiódł się</translation>
     </message>
     <message>
-        <location line="+38"/>
         <source>The current Project contains unsaved data
 Save Current Project?</source>
-        <translation type="unfinished">Otwarty utwór zawiera niezapisane dane
+        <translation type="obsolete">Otwarty utwór zawiera niezapisane dane
 Zapisać otwarty utwór?</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location line="+1207"/>
-        <source>S&amp;kip</source>
-        <translation type="unfinished"></translation>
+        <source>MusE: Save As</source>
+        <translation type="obsolete">MuzA: Zapisz Jako</translation>
     </message>
     <message>
-        <location line="-1207"/>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
+        <source>Nothing to edit</source>
+        <translation type="obsolete">Nie ma nic do edytowania</translation>
     </message>
     <message>
-        <location line="+236"/>
-        <location line="+13"/>
-        <source>MusE: Save As</source>
-        <translation type="unfinished">MuzA: Zapisz Jako</translation>
+        <source>MusE: Bounce to Track</source>
+        <translation type="obsolete">MuzA: Zgrywanie (bounce) do Åšladu</translation>
     </message>
     <message>
-        <location line="+57"/>
-        <location line="+161"/>
-        <source>Nothing to edit</source>
-        <translation type="unfinished">Nie ma nic do edytowania</translation>
+        <source>MusE: Bounce to File</source>
+        <translation type="obsolete">MuzA: Zgrywanie (bounce) do Pliku</translation>
     </message>
     <message>
-        <location line="+474"/>
-        <location line="+10"/>
-        <location line="+31"/>
-        <location line="+34"/>
-        <location line="+8"/>
-        <source>MusE: Bounce to Track</source>
-        <translation type="unfinished">MuzA: Zgrywanie (bounce) do Åšladu</translation>
+        <source>MusE: Bounce</source>
+        <translation type="obsolete">MuzA: Zgrywanie (bounce)</translation>
     </message>
     <message>
-        <location line="-82"/>
-        <source>No wave tracks found</source>
-        <translation type="unfinished"></translation>
+        <source>set left/right marker for bounce range</source>
+        <translation type="obsolete">ustaw lokatory do zgrania (bounce) danego zakresu</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location line="+105"/>
-        <source>No audio output tracks found</source>
-        <translation type="unfinished"></translation>
+        <source>The current Project contains unsaved data
+Load overwrites current Project:
+Save Current Project?</source>
+        <translation type="obsolete">Otwarty utwór zawiera niezapisane dane.
+Załadowanie nadpisze otwarty utwór:
+Zapisać otwarty utwór?</translation>
     </message>
     <message>
-        <location line="-74"/>
-        <source>Select one audio output track,
-and one target wave track</source>
-        <translation type="unfinished"></translation>
+        <source>&amp;Abort</source>
+        <translation type="obsolete">&amp;Anuluj</translation>
     </message>
     <message>
-        <location line="+34"/>
-        <source>Select one target wave track</source>
-        <translation type="unfinished"></translation>
+        <source>MusE: Export Midi</source>
+        <translation type="obsolete">MuzA: Exportuj Midi</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Select one target wave track,
-and one audio output track</source>
-        <translation type="unfinished"></translation>
+        <source>no help found at: </source>
+        <translation type="obsolete">nie znalezniono pomocy</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location line="+25"/>
-        <source>MusE: Bounce to File</source>
-        <translation type="unfinished">MuzA: Zgrywanie (bounce) do Pliku</translation>
+        <source>MusE: Open Help</source>
+        <translation type="obsolete">MuzA: Otwórz Pomoc</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Select one audio output track</source>
-        <translation type="unfinished"></translation>
+        <source>MusE: Import Midi</source>
+        <translation type="obsolete">MuzA: Importuj Midi</translation>
     </message>
     <message>
-        <location line="+39"/>
-        <source>MusE: Bounce</source>
-        <translation type="unfinished">MuzA: Zgrywanie (bounce)</translation>
+        <source>Add midi file to current project?
+</source>
+        <translation type="obsolete">Dodać plik midi do otwartego utworu?</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>set left/right marker for bounce range</source>
-        <translation type="unfinished">ustaw lokatory do zgrania (bounce) danego zakresu</translation>
+        <source>&amp;Add to Project</source>
+        <translation type="obsolete">&amp;Dodaj do utworu</translation>
     </message>
     <message>
-        <location line="+82"/>
-        <source>The current Project contains unsaved data
-Load overwrites current Project:
-Save Current Project?</source>
-        <translation type="unfinished">Otwarty utwór zawiera niezapisane dane.
-Załadowanie nadpisze otwarty utwór:
-Zapisać otwarty utwór?</translation>
+        <source>&amp;Replace</source>
+        <translation type="obsolete">&amp;ZastÄ…p</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location filename="../../muse/importmidi.cpp" line="+86"/>
-        <source>&amp;Abort</source>
-        <translation type="unfinished">&amp;Anuluj</translation>
+        <source>reading midifile
+  </source>
+        <translation type="obsolete">czytanie pliku midi</translation>
     </message>
     <message>
-        <location filename="../../muse/exportmidi.cpp" line="+143"/>
-        <source>MusE: Export Midi</source>
-        <translation type="unfinished">MuzA: Exportuj Midi</translation>
+        <source>&amp;Yes</source>
+        <translation type="obsolete">&amp;Tak</translation>
     </message>
     <message>
-        <location filename="../../muse/help.cpp" line="+50"/>
-        <source>no help found at: </source>
-        <translation type="unfinished">nie znalezniono pomocy</translation>
+        <source>&amp;No</source>
+        <translation type="obsolete">&amp;Nie</translation>
     </message>
+</context>
+<context>
+    <name>MusEArranger::Arranger</name>
     <message>
-        <location line="+2"/>
-        <source>MusE: Open Help</source>
-        <translation type="unfinished">MuzA: Otwórz Pomoc</translation>
+        <source>Enable Recording</source>
+        <translation type="obsolete">Udostępnij nagrywanie</translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Unable to launch help</source>
+        <source>Solo Indicator</source>
+        <translation type="obsolete">Solo Wzkaźnik</translation>
+    </message>
+    <message>
+        <source>Track Type</source>
+        <translation type="obsolete">Typ śladu</translation>
+    </message>
+    <message>
+        <source>Time Lock</source>
+        <translation type="obsolete">Zablokuj Åšlad</translation>
+    </message>
+    <message>
+        <source>Arranger</source>
+        <translation type="obsolete">Główne Okno</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="obsolete">Typ</translation>
+    </message>
+    <message>
+        <source>NO</source>
+        <translation type="obsolete">Brak</translation>
+    </message>
+    <message>
+        <source>GM</source>
+        <translation type="obsolete">GM</translation>
+    </message>
+    <message>
+        <source>GS</source>
+        <translation type="obsolete">GS</translation>
+    </message>
+    <message>
+        <source>XG</source>
+        <translation type="obsolete">XG</translation>
+    </message>
+    <message>
+        <source>midi song type</source>
+        <translation type="obsolete">Utwór Midi</translation>
+    </message>
+    <message>
+        <source>midi pitch</source>
+        <translation type="obsolete">transpozycja midi</translation>
+    </message>
+    <message>
+        <source>global midi pitch shift</source>
+        <translation type="obsolete">globalna transpozycja midi</translation>
+    </message>
+    <message>
+        <source>Tempo</source>
+        <translation type="obsolete">Tempo</translation>
+    </message>
+    <message>
+        <source>midi tempo</source>
+        <translation type="obsolete">Tempo Midi</translation>
+    </message>
+    <message>
+        <source>N</source>
+        <translation type="obsolete">100%</translation>
+    </message>
+    <message>
+        <source>TrackInfo</source>
+        <translation type="obsolete">Info o śladzie</translation>
+    </message>
+    <message>
+        <source>S</source>
+        <translation type="obsolete">S</translation>
+    </message>
+    <message>
+        <source>C</source>
+        <translation type="obsolete">T</translation>
+    </message>
+    <message>
+        <source>Track</source>
+        <translation type="obsolete">Åšlad</translation>
+    </message>
+    <message>
+        <source>T</source>
+        <translation type="obsolete">B</translation>
+    </message>
+    <message>
+        <source>Automation</source>
+        <translation type="obsolete">Au&amp;tomatyka</translation>
+    </message>
+</context>
+<context>
+    <name>MusEArranger::ArrangerView</name>
+    <message>
+        <source>panic</source>
+        <translation type="obsolete">Zatrzymaj wszystkie komunikaty midi!</translation>
+    </message>
+    <message>
+        <source>&amp;Copy</source>
+        <translation type="obsolete">&amp;Kopiuj</translation>
+    </message>
+    <message>
+        <source>&amp;Paste</source>
+        <translation type="obsolete">&amp;Wklej</translation>
+    </message>
+    <message>
+        <source>Delete Selected Tracks</source>
+        <translation type="obsolete">Skasuj Zaznaczone Åšlady</translation>
+    </message>
+    <message>
+        <source>Add Track</source>
+        <translation type="obsolete">Dodaj Åšlad</translation>
+    </message>
+    <message>
+        <source>Select &amp;All</source>
+        <translation type="obsolete">Zaznacz &amp;wszystko</translation>
+    </message>
+    <message>
+        <source>&amp;Deselect All</source>
+        <translation type="obsolete">&amp;Odznacz wszystko</translation>
+    </message>
+    <message>
+        <source>Invert &amp;Selection</source>
+        <translation type="obsolete">Odwróć &amp;zaznaczenie</translation>
+    </message>
+    <message>
+        <source>&amp;Inside Loop</source>
+        <translation type="obsolete">&amp;Pomiędzy lokatorami.</translation>
+    </message>
+    <message>
+        <source>&amp;Outside Loop</source>
+        <translation type="obsolete">&amp;Poza obrębem lokatorów</translation>
+    </message>
+    <message>
+        <source>All &amp;Parts on Track</source>
+        <translation type="obsolete">Wszystkie &amp;klocki na śladzie</translation>
+    </message>
+    <message>
+        <source>Pianoroll</source>
+        <translation type="obsolete">Pianoroll</translation>
+    </message>
+    <message>
+        <source>Drums</source>
+        <translation type="obsolete">Edytor Perkusji</translation>
+    </message>
+    <message>
+        <source>List</source>
+        <translation type="obsolete">Edytor Lista</translation>
+    </message>
+    <message>
+        <source>Mastertrack</source>
+        <translation type="obsolete">Åšlad Tempo/Metrum</translation>
+    </message>
+    <message>
+        <source>Graphic</source>
+        <translation type="obsolete">Edytor Graficzny Tempo/Metrum</translation>
+    </message>
+    <message>
+        <source>Midi &amp;Transform</source>
+        <translation type="obsolete">&amp;Przekształcanie Midi</translation>
+    </message>
+    <message>
+        <source>Global Cut</source>
+        <translation type="obsolete">Globalne Wycięcie</translation>
+    </message>
+    <message>
+        <source>Global Insert</source>
+        <translation type="obsolete">Globalne Wstawienie</translation>
+    </message>
+    <message>
+        <source>Global Split</source>
+        <translation type="obsolete">Globalne Podzielenie</translation>
+    </message>
+    <message>
+        <source>&amp;Structure</source>
+        <translation type="obsolete">&amp;Globalne</translation>
+    </message>
+    <message>
+        <source>Functions</source>
+        <translation type="obsolete">Opcje</translation>
+    </message>
+    <message>
+        <source>Transpose</source>
+        <translation type="obsolete">Transponuj</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="obsolete">Nowy</translation>
+    </message>
+</context>
+<context>
+    <name>MusEArranger::PartCanvas</name>
+    <message>
+        <source>Cannot copy/move/clone to different Track-Type</source>
+        <translation type="obsolete">Nie można skopiować/przenieść/sklonować do innego typu śladu</translation>
+    </message>
+    <message>
+        <source>&amp;Copy</source>
+        <translation type="obsolete">&amp;Kopiuj</translation>
+    </message>
+    <message>
+        <source>rename</source>
+        <translation type="obsolete">zmień nazwę</translation>
+    </message>
+    <message>
+        <source>color</source>
+        <translation type="obsolete">kolor</translation>
+    </message>
+    <message>
+        <source>split</source>
+        <translation type="obsolete">podziel</translation>
+    </message>
+    <message>
+        <source>de-clone</source>
+        <translation type="obsolete">sklonuj</translation>
+    </message>
+    <message>
+        <source>wave edit</source>
+        <translation type="obsolete">edycja audio</translation>
+    </message>
+    <message>
+        <source>Cannot paste: multiple tracks selected</source>
+        <translation type="obsolete">Nie można wkleić: zaznaczono kilka śladów</translation>
+    </message>
+    <message>
+        <source>Cannot paste: no track selected</source>
+        <translation type="obsolete">Nie można wkleić: nie zaznaczono żadnych śladów</translation>
+    </message>
+    <message>
+        <source>Can only paste to midi/drum track</source>
+        <translation type="obsolete">Można tylko wkleić do śladu midi, lub perkusji</translation>
+    </message>
+    <message>
+        <source>Can only paste to wave track</source>
+        <translation type="obsolete">Można wkleić tylko do śladu audio</translation>
+    </message>
+    <message>
+        <source>Cannot paste: wrong data type</source>
+        <translation type="obsolete">Nie można wkleić: nieprawidłowy typ danych</translation>
+    </message>
+</context>
+<context>
+    <name>MusEArranger::TList</name>
+    <message>
+        <source>MusE: bad trackname</source>
+        <translation type="obsolete">MuzA: zła nazwa śladu</translation>
+    </message>
+    <message>
+        <source>please choose a unique track name</source>
+        <translation type="obsolete">proszę wybrać niepowtarzalną nazwę dla śladu</translation>
+    </message>
+    <message>
+        <source>Update drummap?</source>
+        <translation type="obsolete">Zaktualizować zestaw perkusyjny?</translation>
+    </message>
+    <message>
+        <source>Do you want to use same port for all instruments in the drummap?</source>
+        <translation type="obsolete">Czy chcesz używać jednego portu midi dla wszystkich instrumentów w zestawie perkusyjnym?</translation>
+    </message>
+    <message>
+        <source>&amp;Yes</source>
+        <translation type="obsolete">&amp;Tak</translation>
+    </message>
+    <message>
+        <source>&amp;No</source>
+        <translation type="obsolete">&amp;Nie</translation>
+    </message>
+    <message>
+        <source>show gui</source>
+        <translation type="obsolete">pokaż interfejs użytkownika</translation>
+    </message>
+    <message>
+        <source>Midi</source>
+        <translation type="obsolete">Midi</translation>
+    </message>
+    <message>
+        <source>Drum</source>
+        <translation type="obsolete">Perkusja</translation>
+    </message>
+    <message>
+        <source>Do you want to use same port and channel for all instruments in the drummap?</source>
+        <translation type="obsolete">Czy chcesz używać jednego portu  i jednego kanału dla wszystkich instrumentów w zestawie perkusyjnym?</translation>
+    </message>
+</context>
+<context>
+    <name>MusECore::Song</name>
+    <message>
+        <location filename="../../muse/song.cpp" line="+2233"/>
+        <source>Jack shutdown!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>For some reason MusE has to launch the default
-browser on your machine.</source>
+        <source>Jack has detected a performance problem which has lead to
+MusE being disconnected.
+This could happen due to a number of reasons:
+- a performance issue with your particular setup.
+- a bug in MusE (or possibly in another connected software).
+- a random hiccup which might never occur again.
+- jack was voluntary stopped by you or someone else
+- jack crashed
+If there is a persisting problem you are much welcome to discuss it
+on the MusE mailinglist.
+(there is information about joining the mailinglist on the MusE
+ homepage which is available through the help menu)
+
+To proceed check the status of Jack and try to restart it and then .
+click on the Restart button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/importmidi.cpp" line="-12"/>
-        <source>MusE: Import Midi</source>
-        <translation type="unfinished">MuzA: Importuj Midi</translation>
+        <location line="+186"/>
+        <location line="+179"/>
+        <source>Automation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-177"/>
+        <source>previous event</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>next event</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
-        <source>Add midi file to current project?
-</source>
-        <translation type="unfinished">Dodać plik midi do otwartego utworu?</translation>
+        <location line="+169"/>
+        <source>set event</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>&amp;Add to Project</source>
-        <translation type="unfinished">&amp;Dodaj do utworu</translation>
+        <location line="-167"/>
+        <location line="+169"/>
+        <source>add event</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>&amp;Replace</source>
-        <translation type="unfinished">&amp;ZastÄ…p</translation>
+        <location line="-165"/>
+        <location line="+170"/>
+        <source>erase event</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
-        <source>reading midifile
-  </source>
-        <translation type="unfinished">czytanie pliku midi</translation>
+        <location line="-166"/>
+        <source>erase range</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>
-failed: </source>
+        <location line="+4"/>
+        <source>clear automation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+356"/>
-        <source>Import part is only valid for midi and wave tracks!</source>
+        <location line="+33"/>
+        <source>Clear all controller events?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>MusE: load part</source>
+        <location line="+0"/>
+        <source>&amp;Ok</source>
+        <translation type="unfinished">&amp;Akceptuj</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <source>No track selected for import</source>
+        <location line="+878"/>
+        <source>MusE - external script failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+121"/>
-        <source> out of </source>
+        <location line="+1"/>
+        <source>MusE was unable to launch the script, error message:
+%1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::Appearance</name>
+    <message>
+        <location filename="../../muse/appearance.cpp" line="+132"/>
+        <source>Main application font, and default font for any
+ controls not defined here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source> parts</source>
+        <source>For small controls like mixer strips.
+Also timescale small numbers, arranger part name overlay,
+ and effects rack.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source> part</source>
+        <location line="+1"/>
+        <source>Midi track info panel. Transport controls.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source> could not be imported.
-Likely the track is the wrong type.</source>
+        <source>Controller graph and S/X buttons. Large numbers for time
+ and tempo scale, and time signature.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/wave.cpp" line="-6"/>
-        <source>to import an audio file you have first to selecta wave track</source>
+        <location line="+1"/>
+        <source>Time scale markers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
-        <source>Import Wavefile</source>
+        <location line="+1"/>
+        <source>List editor: meta event edit dialog multi-line edit box.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>This wave file has a samplerate of %1,
-as opposed to current setting %2.
-Do you still want to import it?</source>
+        <source>Mixer label font. Auto-font-sizing up to chosen font size.
+Word-breaking but only with spaces.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>&amp;Yes</source>
-        <translation type="unfinished">&amp;Tak</translation>
+        <location line="+1"/>
+        <source>Maximum mixer label auto-font-sizing font size.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Global opacity (opposite of transparency).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Standard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Custom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+624"/>
+        <source>MusE: load image</source>
+        <translation type="unfinished">Muza: Załaduj obrazek.</translation>
+    </message>
+    <message>
+        <location line="+334"/>
+        <source>Select style sheet</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
-        <source>&amp;No</source>
-        <translation type="unfinished">&amp;Nie</translation>
+        <source>Qt style sheets (*.qss)</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MusEArranger::Arranger</name>
+    <name>MusEGui::Arranger</name>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="-74"/>
+        <location filename="../../muse/arranger/arranger.cpp" line="+81"/>
         <source>Enable Recording</source>
         <translation type="unfinished">Udostępnij nagrywanie</translation>
     </message>
@@ -10425,7 +9444,17 @@ Right-click to show GUI.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+10"/>
+        <source>Off</source>
+        <translation type="unfinished">Wył.</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Snap</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10559,7 +9588,7 @@ Right-click to show GUI.</source>
     </message>
 </context>
 <context>
-    <name>MusEArranger::ArrangerView</name>
+    <name>MusEGui::ArrangerView</name>
     <message>
         <location filename="../../muse/arranger/arrangerview.cpp" line="+83"/>
         <source>MusE: Arranger</source>
@@ -10581,7 +9610,7 @@ Right-click to show GUI.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+31"/>
         <source>C&amp;ut</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10687,12 +9716,12 @@ Right-click to show GUI.</source>
     </message>
     <message>
         <location line="+3"/>
-        <source>all parts in one staff</source>
+        <source>all tracks in one staff</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>one staff per part</source>
+        <source>one staff per track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -10752,6 +9781,21 @@ Right-click to show GUI.</source>
         <translation type="unfinished">Globalne Podzielenie</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Global Cut - selected tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Global Insert - selected tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Global Split - selected tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+8"/>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
@@ -10762,7 +9806,7 @@ Right-click to show GUI.</source>
         <translation type="unfinished">&amp;Globalne</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+11"/>
         <source>Functions</source>
         <translation type="unfinished">Opcje</translation>
     </message>
@@ -10822,485 +9866,1098 @@ Right-click to show GUI.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+308"/>
+        <location line="+314"/>
         <location line="+6"/>
         <source>New</source>
         <translation type="unfinished">Nowy</translation>
     </message>
 </context>
 <context>
-    <name>MusEArranger::PartCanvas</name>
+    <name>MusEGui::AudioMixerApp</name>
     <message>
-        <location filename="../../muse/arranger/pcanvas.cpp" line="+346"/>
-        <source>Cannot copy/move/clone to different Track-Type</source>
-        <translation type="unfinished">Nie można skopiować/przenieść/sklonować do innego typu śladu</translation>
+        <location filename="../../muse/mixer/amixer.cpp" line="+171"/>
+        <source>&amp;Create</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+261"/>
-        <source>C&amp;ut</source>
+        <location line="+4"/>
+        <source>&amp;View</source>
+        <translation type="unfinished">&amp;PrzeglÄ…daj</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Routing</source>
+        <translation type="unfinished">Konfiguracja połączeń</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Show Midi Tracks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>&amp;Copy</source>
-        <translation type="unfinished">&amp;Kopiuj</translation>
+        <location line="+1"/>
+        <source>Show Drum Tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show Wave Tracks</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+6"/>
-        <source>s&amp;elect </source>
+        <source>Show Inputs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>clones</source>
+        <location line="+1"/>
+        <source>Show Outputs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>rename</source>
-        <translation type="unfinished">zmień nazwę</translation>
+        <location line="+1"/>
+        <source>Show Groups</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>color</source>
-        <translation type="unfinished">kolor</translation>
+        <location line="+1"/>
+        <source>Show Auxs</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>delete</source>
+        <location line="+1"/>
+        <source>Show Synthesizers</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::AudioStrip</name>
     <message>
-        <location line="+2"/>
-        <source>split</source>
-        <translation type="unfinished">podziel</translation>
+        <location filename="../../muse/mixer/astrip.cpp" line="+667"/>
+        <source>panorama</source>
+        <translation type="unfinished">Panorama</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>glue</source>
+        <source>aux send level</source>
+        <translation type="unfinished">Poziom syngału na wysyłce</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Pan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+87"/>
+        <source>1/2 channel</source>
+        <translation type="unfinished">kanał m/s</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Pre</source>
+        <translation type="unfinished">Przed</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>pre fader - post fader</source>
+        <translation type="unfinished">przed/ za tłumikiem</translation>
+    </message>
+    <message>
+        <location line="+70"/>
+        <source>dB</source>
+        <translation type="unfinished">dB</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>mute</source>
+        <translation type="unfinished">wycisz</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>record downmix</source>
+        <translation type="unfinished">zgraj miks</translation>
+    </message>
+    <message>
         <location line="+2"/>
-        <source>de-clone</source>
-        <translation type="unfinished">sklonuj</translation>
+        <location line="+4"/>
+        <source>solo mode</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location line="+7"/>
         <location line="+7"/>
-        <source>save part to disk</source>
+        <source>off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-2"/>
-        <source>wave edit</source>
-        <translation type="unfinished">edycja audio</translation>
+        <location line="+21"/>
+        <source>iR</source>
+        <translation type="unfinished">Wej.</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>file info</source>
+        <location line="+2"/>
+        <source>input routing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
-        <source>MusE: save part</source>
+        <location line="+8"/>
+        <source>oR</source>
+        <translation type="unfinished">Wyj.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>output routing</source>
+        <translation type="unfinished">połączenie Wyjścia</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Off</source>
+        <translation type="unfinished">Wył.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Read</source>
+        <translation type="unfinished">Czytaj</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Touch</source>
+        <translation type="unfinished">Dotknij</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Write</source>
+        <translation type="unfinished">Zapisz</translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>automation type</source>
+        <translation type="unfinished">typ automatyki</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::BigTime</name>
+    <message>
+        <location filename="../../muse/widgets/bigtime.cpp" line="+62"/>
+        <source>format display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <source>Part name</source>
+        <location line="+17"/>
+        <source>bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Files</source>
+        <location line="+1"/>
+        <source>beat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2090"/>
-        <source> out of </source>
+        <location line="+1"/>
+        <location line="+6"/>
+        <source>tick</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-4"/>
+        <source>minute</source>
+        <translation type="unfinished">minuta</translation>
+    </message>
+    <message>
         <location line="+1"/>
-        <source> parts</source>
+        <source>second</source>
+        <translation type="unfinished">sekunda</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+3"/>
+        <source>frame</source>
+        <translation type="unfinished">ramka</translation>
+    </message>
+    <message>
+        <location line="-2"/>
+        <source>subframe</source>
+        <translation type="unfinished">subramka</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>MusE: Bigtime</source>
+        <translation type="unfinished">MuzA: Duży zegar</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::ClipListEdit</name>
+    <message>
+        <location filename="../../muse/cliplist/cliplist.cpp" line="+130"/>
+        <source>MusE: Clip List Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source> part</source>
+        <location line="+8"/>
+        <source>Undo/Redo tools</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>panic</source>
+        <translation type="unfinished">Zatrzymaj wszystkie komunikaty midi!</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>transport</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Window &amp;Config</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::ComboQuant</name>
     <message>
+        <location filename="../../muse/widgets/comboQuant.cpp" line="+40"/>
         <location line="+1"/>
-        <source> could not be pasted.
-Likely the selected track is the wrong type.</source>
+        <location line="+1"/>
+        <source>Off</source>
+        <translation type="unfinished">Wył.</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::CtrlPanel</name>
+    <message>
+        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="+91"/>
+        <source>S</source>
+        <translation type="unfinished">S</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>select controller</source>
+        <translation type="unfinished">Wybierz kontroler</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>X</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
-        <source>Cannot paste: multiple tracks selected</source>
-        <translation type="unfinished">Nie można wkleić: zaznaczono kilka śladów</translation>
+        <location line="+5"/>
+        <source>remove panel</source>
+        <translation type="unfinished">Usuń panel</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>manual adjust</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
-        <source>Cannot paste: no track selected</source>
-        <translation type="unfinished">Nie można wkleić: nie zaznaczono żadnych śladów</translation>
+        <source>double click on/off</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Can only paste to midi/drum track</source>
-        <translation type="unfinished">Można tylko wkleić do śladu midi, lub perkusji</translation>
+        <location line="+1"/>
+        <source>off</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>Can only paste to wave track</source>
-        <translation type="unfinished">Można wkleić tylko do śladu audio</translation>
+        <location line="+443"/>
+        <location line="+236"/>
+        <source>Velocity</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>Can only paste to midi or wave track</source>
+        <location line="-186"/>
+        <source>add new ...</source>
+        <translation type="unfinished">dodaj nowe ...</translation>
+    </message>
+    <message>
+        <location line="+163"/>
+        <location line="+58"/>
+        <source>Instrument-defined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Cannot paste: wrong data type</source>
-        <translation type="unfinished">Nie można wkleić: nieprawidłowy typ danych</translation>
+        <location line="-43"/>
+        <location line="+21"/>
+        <source>Add ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-17"/>
+        <source>Others</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Edit instrument ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Common Controls</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MusEArranger::TList</name>
+    <name>MusEGui::DrumEdit</name>
     <message>
-        <location filename="../../muse/arranger/tlist.cpp" line="+362"/>
-        <source>&lt;none&gt;</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="+114"/>
+        <location line="+21"/>
+        <source>mute instrument</source>
+        <translation type="unfinished">wyłącz instrument</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>sound name</source>
+        <translation type="unfinished">nazwa brzmienia</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>volume percent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
-        <source>no clef</source>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>quantisation</source>
+        <translation type="unfinished">kwantyzacja</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>this input note triggers the sound</source>
+        <translation type="unfinished">ta wysokość uruchamia brzmienie</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>note length</source>
+        <translation type="unfinished">długość dźwięku</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>this is the note which is played</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Treble</source>
+        <location line="-20"/>
+        <source>output channel (hold ctl to affect all rows)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Bass</source>
+        <location line="+1"/>
+        <source>output port (hold ctl to affect all rows)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+21"/>
+        <source>shift + control key: draw velocity level 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>control key: draw velocity level 2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>shift key: draw velocity level 3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>draw velocity level 4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-5"/>
+        <source>output channel (ctl: affect all rows)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>output port (ctl: affect all rows)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+43"/>
+        <source>&amp;File</source>
+        <translation type="unfinished">&amp;Plik</translation>
+    </message>
+    <message>
         <location line="+2"/>
-        <source>Grand</source>
+        <source>Load Map</source>
+        <translation type="unfinished">Załaduj zestaw</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Save Map</source>
+        <translation type="unfinished">Zapisz zestaw</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reset GM Map</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>MusE: bad trackname</source>
-        <translation type="unfinished">MuzA: zła nazwa śladu</translation>
+        <location line="+10"/>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Cut</source>
+        <translation type="unfinished">Wytnij</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>please choose a unique track name</source>
-        <translation type="unfinished">proszę wybrać niepowtarzalną nazwę dla śladu</translation>
+        <source>Copy</source>
+        <translation type="unfinished">Kopiuj</translation>
     </message>
     <message>
-        <location line="+157"/>
-        <location line="+1143"/>
-        <source>Update drummap?</source>
-        <translation type="unfinished">Zaktualizować zestaw perkusyjny?</translation>
+        <location line="+1"/>
+        <source>Copy events in range</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1142"/>
-        <source>Do you want to use same port for all instruments in the drummap?</source>
-        <translation type="unfinished">Czy chcesz używać jednego portu midi dla wszystkich instrumentów w zestawie perkusyjnym?</translation>
+        <location line="+1"/>
+        <source>Paste</source>
+        <translation type="unfinished">Wklej</translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+1143"/>
-        <source>&amp;Yes</source>
-        <translation type="unfinished">&amp;Tak</translation>
+        <source>Paste (with Dialog)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1143"/>
-        <location line="+1143"/>
-        <source>&amp;No</source>
-        <translation type="unfinished">&amp;Nie</translation>
+        <location line="+2"/>
+        <source>Delete Events</source>
+        <translation type="unfinished">Kasuj Elementy</translation>
     </message>
     <message>
-        <location line="-1066"/>
-        <location line="+55"/>
-        <source>show gui</source>
-        <translation type="unfinished">pokaż interfejs użytkownika</translation>
+        <location line="+16"/>
+        <source>&amp;Select</source>
+        <translation type="unfinished">&amp;Zaznacz</translation>
     </message>
     <message>
-        <location line="-46"/>
-        <location line="+55"/>
-        <source>show native gui</source>
+        <location line="+2"/>
+        <source>Select All</source>
+        <translation type="unfinished">Zaznacz wszystko</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Select None</source>
+        <translation type="unfinished">Bez zaznaczenia</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Invert</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+338"/>
-        <source>Treble clef</source>
+        <location line="+2"/>
+        <source>Inside Loop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Bass clef</source>
+        <source>Outside Loop</source>
+        <translation type="unfinished">Poza obrębem lokatorów</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Previous Part</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Grand Staff</source>
+        <source>Next Part</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
-        <source>Viewable automation</source>
+        <location line="+19"/>
+        <source>Fu&amp;nctions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+131"/>
-        <source>Delete Track</source>
+        <location line="+4"/>
+        <source>Re-order list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Set Fixed Length</source>
+        <translation type="unfinished">Ustaw stałą długość nut</translation>
+    </message>
+    <message>
         <location line="+1"/>
-        <source>Track Comment</source>
+        <source>Modify Velocity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Insert Track</source>
+        <location line="+1"/>
+        <source>Crescendo/Decrescendo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+445"/>
-        <source>Midi</source>
-        <translation type="unfinished">Midi</translation>
+        <location line="+1"/>
+        <source>Quantize</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Drum</source>
-        <translation type="unfinished">Perkusja</translation>
+        <source>Erase Event</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+50"/>
-        <source>Do you want to use same port and channel for all instruments in the drummap?</source>
-        <translation type="unfinished">Czy chcesz używać jednego portu  i jednego kanału dla wszystkich instrumentów w zestawie perkusyjnym?</translation>
+        <location line="+1"/>
+        <source>Move Notes</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MusEDialog::PasteDialog</name>
-    <message numerus="yes">
-        <location filename="../../muse/widgets/pastedialog.cpp" line="+81"/>
-        <source>%n quarter(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-        </translation>
+    <message>
+        <location line="+1"/>
+        <source>Delete Overlaps</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>quarter</source>
+        <location line="+20"/>
+        <source>&amp;Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>quarters</source>
+        <location line="+3"/>
+        <source>Window &amp;Config</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MusEDialog::PasteEventsDialog</name>
-    <message numerus="yes">
-        <location filename="../../muse/widgets/pasteeventsdialog.cpp" line="+95"/>
-        <source>%n quarter(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-        </translation>
+    <message>
+        <location line="+11"/>
+        <source>Drum tools</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>quarter</source>
+        <location line="+4"/>
+        <source>Load Drummap</source>
+        <translation type="unfinished">Załaduj zestaw perkusyjny</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Store Drummap</source>
+        <translation type="unfinished">Zapisz zestaw perkusyjny</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Step Record</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>quarters</source>
+        <location line="+6"/>
+        <source>Midi Input</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MusEMixer::AudioMixerApp</name>
     <message>
-        <location filename="../../muse/mixer/amixer.cpp" line="+171"/>
-        <source>&amp;Create</source>
+        <location line="+9"/>
+        <source>cursor tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
+        <source>Set step size for cursor edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>panic</source>
+        <translation type="unfinished">Zatrzymaj wszystkie komunikaty midi!</translation>
+    </message>
+    <message>
         <location line="+4"/>
-        <source>&amp;View</source>
-        <translation type="unfinished">&amp;PrzeglÄ…daj</translation>
+        <source>transport</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Routing</source>
-        <translation type="unfinished">Konfiguracja połączeń</translation>
+        <location line="+18"/>
+        <source>ctrl</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Show Midi Tracks</source>
+        <location line="+7"/>
+        <source>Add Controller View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Show Drum Tracks</source>
+        <location line="+57"/>
+        <source>M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Show Wave Tracks</source>
+        <source>Sound</source>
+        <translation type="unfinished">Brzmienie</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Vol</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Show Inputs</source>
+        <location line="+1"/>
+        <source>QNT</source>
+        <translation type="unfinished">Kwant.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>E-Note</source>
+        <translation type="unfinished">U-Wys</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Len</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Show Outputs</source>
+        <source>A-Note</source>
+        <translation type="unfinished">W-Wys</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Show Groups</source>
+        <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Show Auxs</source>
+        <source>LV1</source>
+        <translation type="unfinished">PV1</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>LV2</source>
+        <translation type="unfinished">PV2</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>LV3</source>
+        <translation type="unfinished">PV3</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>LV4</source>
+        <translation type="unfinished">PV4</translation>
+    </message>
+    <message>
+        <location line="+377"/>
+        <source>Muse: Load Drum Map</source>
+        <translation type="unfinished">MuzA: Załaduj zestaw perkusyjny</translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>MusE: Store Drum Map</source>
+        <translation type="unfinished">MuzA: Zapisz zestaw perkusyjny</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Drum map</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Show Synthesizers</source>
+        <source>Reset the drum map with GM defaults?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MusEMixer::AudioStrip</name>
+    <name>MusEGui::EditCAfterDialog</name>
     <message>
-        <location filename="../../muse/mixer/astrip.cpp" line="+645"/>
-        <source>panorama</source>
-        <translation type="unfinished">Panorama</translation>
+        <location filename="../../muse/liste/editevent.cpp" line="+445"/>
+        <source>MusE: Enter Channel Aftertouch</source>
+        <translation type="unfinished">MuzA: Wstaw zmianę średniego nacisku pod uderzeniu (channel aftertouch)</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>aux send level</source>
-        <translation type="unfinished">Poziom syngału na wysyłce</translation>
+        <source>Time Position</source>
+        <translation type="unfinished">Pozycja:</translation>
     </message>
     <message>
-        <location line="+23"/>
-        <source>Pan</source>
+        <location line="+4"/>
+        <source>Pressure</source>
+        <translation type="unfinished">Nacisk</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::EditEventDialog</name>
+    <message>
+        <location line="-261"/>
+        <source>Ok</source>
+        <translation type="unfinished">Akceptuj</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Anuluj</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::EditInstrument</name>
+    <message>
+        <location filename="../../muse/instruments/editinstrument.cpp" line="+312"/>
+        <location line="+34"/>
+        <source>MusE: Create file failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
-        <source>1/2 channel</source>
-        <translation type="unfinished">kanał m/s</translation>
+        <location line="+33"/>
+        <source>MusE: Write File failed</source>
+        <translation type="unfinished">MuzA: Zapis pliku nie powiódł się</translation>
     </message>
     <message>
+        <location line="+32"/>
         <location line="+12"/>
-        <source>Pre</source>
-        <translation type="unfinished">Przed</translation>
+        <location line="+280"/>
+        <location line="+12"/>
+        <source>MusE:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-303"/>
+        <location line="+292"/>
+        <source>The user instrument directory
+%1
+does not exist yet. Create it now?
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-291"/>
+        <location line="+292"/>
+        <source>(You can change the user instruments directory at Settings-&gt;Global Settings-&gt;Midi)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-282"/>
+        <location line="+292"/>
+        <source>Unable to create user instrument directory &apos;%1&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-244"/>
+        <location line="+266"/>
+        <source>MusE: Save Instrument Definition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-265"/>
+        <location line="+266"/>
+        <source>Instrument Definition (*.idf)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-154"/>
+        <location line="+29"/>
+        <source>MusE: Save instrument as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-29"/>
+        <source>Enter a new unique instrument name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>The user instrument &apos;%1&apos; already exists. This will overwrite its .idf instrument file.
+Are you sure?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+526"/>
+        <source>MusE: Bad instrument name</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>pre fader - post fader</source>
-        <translation type="unfinished">przed/ za tłumikiem</translation>
+        <source>Please choose a unique instrument name.
+(The name might be used by a hidden instrument.)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
-        <source>dB</source>
-        <translation type="unfinished">dB</translation>
+        <location line="+136"/>
+        <source>MusE: Bad patch name</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
-        <source>record</source>
+        <location line="+1"/>
+        <source>Please choose a unique patch name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
-        <source>mute</source>
-        <translation type="unfinished">wycisz</translation>
+        <location line="+22"/>
+        <source>MusE: Bad patchgroup name</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
-        <source>record downmix</source>
-        <translation type="unfinished">zgraj miks</translation>
+        <location line="+1"/>
+        <source>Please choose a unique patchgroup name</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location line="+4"/>
-        <source>solo mode</source>
+        <location line="+526"/>
+        <source>MusE: Bad controller name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>Please choose a unique controller name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1287"/>
         <location line="+12"/>
-        <source>off</source>
+        <source>MusE: Cannot add common controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
-        <source>iR</source>
-        <translation type="unfinished">Wej.</translation>
+        <location line="-11"/>
+        <source>A controller named &apos;%1&apos; already exists.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>input routing</source>
+        <location line="+12"/>
+        <source>A controller number %1 already exists.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>oR</source>
-        <translation type="unfinished">Wyj.</translation>
+        <location line="+283"/>
+        <location line="+5"/>
+        <source>MusE</source>
+        <translation type="unfinished">MuzA</translation>
+    </message>
+    <message>
+        <location line="-4"/>
+        <location line="+5"/>
+        <source>The current Instrument contains unsaved data
+Save Current Instrument?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <location line="+5"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished">&amp;Zapisz</translation>
+    </message>
+    <message>
+        <location line="-5"/>
+        <location line="+5"/>
+        <source>&amp;Nosave</source>
+        <translation type="unfinished">&amp;Nie zapisuj</translation>
+    </message>
+    <message>
+        <location line="-5"/>
+        <source>&amp;Abort</source>
+        <translation type="unfinished">&amp;Anuluj</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::EditMetaDialog</name>
+    <message>
+        <location filename="../../muse/liste/editevent.cpp" line="+118"/>
+        <source>MusE: Enter Meta Event</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>output routing</source>
-        <translation type="unfinished">połączenie Wyjścia</translation>
+        <source>Time Position</source>
+        <translation type="unfinished">Pozycja:</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Meta Type</source>
+        <translation type="unfinished">Meta Typ</translation>
     </message>
     <message>
         <location line="+12"/>
-        <source>Off</source>
-        <translation type="unfinished">Wył.</translation>
+        <source>Enter Hex</source>
+        <translation type="unfinished">Wstaw Heks.</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::EditPAfterDialog</name>
+    <message>
+        <location line="+176"/>
+        <source>MusE: Enter Poly Aftertouch</source>
+        <translation type="unfinished">MuzA: Wstaw zmianę średniego nacisku pod uderzeniu (channel aftertouch)</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Time Position</source>
+        <translation type="unfinished">Pozycja:</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Pitch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Pressure</source>
+        <translation type="unfinished">Nacisk</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::EditToolBar</name>
+    <message>
+        <location filename="../../muse/widgets/tools.cpp" line="+33"/>
+        <source>select Pointer Tool:
+with the pointer tool you can:
+  select parts
+  move parts
+  copy parts</source>
+        <translation type="unfinished">Kliknij na strzałkę.
+Strzałką możesz zaznaczać, przesuwać i kopiować klocki</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>select Pencil Tool:
+with the pencil tool you can:
+  create new parts
+  modify length of parts</source>
+        <translation type="unfinished">Kliknij na ołówek.
+Ołówkiem możesz tworzyć klocki oraz zmieniać ich długość.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>select Delete Tool:
+with the delete tool you can delete parts</source>
+        <translation type="unfinished">Kliknij na GumkÄ™.
+Gumką można kasować klocki.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>select Cut Tool:
+with the cut tool you can split a part</source>
+        <translation type="unfinished">Kliknij na Nożyczki.
+Nożyczkami można ciąć klocki.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>select Glue Tool:
+with the glue tool you can glue two parts</source>
+        <translation type="unfinished">Kliknij na Klej.
+Klejem możesz sklejać dwa klocki</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>select Score Tool:
+</source>
+        <translation type="unfinished">Wybierz PodglÄ…d Nutowy.</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Read</source>
-        <translation type="unfinished">Czytaj</translation>
+        <source>select Quantize Tool:
+insert display quantize event</source>
+        <translation type="unfinished">Ustaw Kwantyzator
+(ustawia kwantyzację wstawiania komunikatów midi).</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>select Drawing Tool</source>
+        <translation type="unfinished">wybierz Wykres</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Touch</source>
-        <translation type="unfinished">Dotknij</translation>
+        <source>select Muting Tool:
+click on part to mute/unmute</source>
+        <translation type="unfinished">Kliknij na Wyłącz.
+Kliknij na pojedynczy klocek aby go wyłączyć z odtwarzania.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Manipulate automation</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Write</source>
-        <translation type="unfinished">Zapisz</translation>
+        <source>Cursor tool</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>automation type</source>
-        <translation type="unfinished">typ automatyki</translation>
+        <location line="+3"/>
+        <source>pointer</source>
+        <translation type="unfinished">Strzałka</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>pencil</source>
+        <translation type="unfinished">Ołówek</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>eraser</source>
+        <translation type="unfinished">Gumka</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>cutter</source>
+        <translation type="unfinished">Nożyczki</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>score</source>
+        <translation type="unfinished">PoglÄ…d nutowy</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>glue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>quantize</source>
+        <translation type="unfinished">Kwantyzator</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>draw</source>
+        <translation type="unfinished">Wykres</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>mute parts</source>
+        <translation type="unfinished">Wyłącz klocki z odtwarzania</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>edit automation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Edit Tools</source>
+        <translation type="unfinished">Narzędzia Edycyjne</translation>
     </message>
 </context>
 <context>
-    <name>MusEMixer::EffectRack</name>
+    <name>MusEGui::EffectRack</name>
     <message>
         <location filename="../../muse/mixer/rack.cpp" line="+193"/>
         <source>effect rack</source>
@@ -11368,193 +11025,835 @@ Likely the selected track is the wrong type.</source>
     </message>
 </context>
 <context>
-    <name>MusEMixer::MidiStrip</name>
+    <name>MusEGui::GlobalSettingsConfig</name>
     <message>
-        <location filename="../../muse/mixer/mstrip.cpp" line="+109"/>
-        <location line="+121"/>
-        <location line="+158"/>
-        <source>off</source>
+        <location filename="../../muse/widgets/genset.cpp" line="+561"/>
+        <source>Selects instruments directory</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::Header</name>
     <message>
-        <location line="-278"/>
-        <location line="+122"/>
-        <source>double click on/off</source>
+        <location filename="../../muse/widgets/header.cpp" line="+164"/>
+        <source>Track Info Columns</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::LMaster</name>
     <message>
-        <location line="-42"/>
-        <source>VariationSend</source>
-        <translation type="unfinished">VariationSend</translation>
+        <location filename="../../muse/master/lmaster.cpp" line="+158"/>
+        <source>MusE: Mastertrack</source>
+        <translation type="unfinished">MuzA: Åšlad Tempo/Metrum</translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Var</source>
-        <translation type="unfinished">Var</translation>
+        <location line="+13"/>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Insert Tempo</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>ReverbSend</source>
-        <translation type="unfinished">Wysyłka Pogłosu</translation>
+        <source>Insert Signature</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Rev</source>
-        <translation type="unfinished">Pogł.</translation>
+        <location line="+1"/>
+        <source>Insert Key</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>ChorusSend</source>
-        <translation type="unfinished">Wysyłka Chorusa</translation>
+        <source>Edit Positon</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Cho</source>
-        <translation type="unfinished">Chorus</translation>
+        <location line="+1"/>
+        <source>Edit Value</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
-        <source>dB</source>
-        <translation type="unfinished">dB</translation>
+        <location line="+1"/>
+        <source>Delete Event</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
-        <source>Pan/Balance</source>
-        <translation type="unfinished">Pan/Równowaga</translation>
+        <location line="+3"/>
+        <source>Window &amp;Config</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Pan</source>
+        <location line="+23"/>
+        <source>Undo/Redo tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>record</source>
+        <location line="+4"/>
+        <source>Edit tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>mute</source>
-        <translation type="unfinished">wycisz</translation>
+        <location line="+5"/>
+        <source>Tempo</source>
+        <translation type="unfinished">Tempo</translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>solo mode</source>
+        <location line="+1"/>
+        <source>Timesig</source>
+        <translation type="unfinished">Metrum</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+67"/>
-        <source>iR</source>
-        <translation type="unfinished">Wej.</translation>
+        <location line="+1"/>
+        <source>new tempo</source>
+        <translation type="unfinished">nowe tempo</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>input routing</source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>new signature</source>
+        <translation type="unfinished">nowe metrum</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>oR</source>
-        <translation type="unfinished">Wyj.</translation>
+        <location line="+1"/>
+        <source>new key</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>output routing</source>
-        <translation type="unfinished">połączenie Wyjścia</translation>
+        <source>panic</source>
+        <translation type="unfinished">Zatrzymaj wszystkie komunikaty midi!</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>transport</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Meter</source>
+        <translation type="unfinished">Miernik</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Type</source>
+        <translation type="unfinished">Typ</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Value</source>
+        <translation type="unfinished">Wartość</translation>
+    </message>
+    <message>
+        <location line="+391"/>
+        <source>Reposition of the initial tempo and signature events is not allowed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>MusE: List Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Input error, conversion not OK or value out of range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Reposition of tempo and signature events to start position is not allowed!</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::BigTime</name>
+    <name>MusEGui::ListEdit</name>
     <message>
-        <location filename="../../muse/widgets/bigtime.cpp" line="+60"/>
-        <source>format display</source>
+        <location filename="../../muse/liste/listedit.cpp" line="+477"/>
+        <source>insert Note</source>
+        <translation type="unfinished">Wstaw nutÄ™</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>insert SysEx</source>
+        <translation type="unfinished">wstaw SysEx</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>insert Ctrl</source>
+        <translation type="unfinished">wstaw </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>insert Meta</source>
+        <translation type="unfinished">Wstaw Meta</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>insert Channel Aftertouch</source>
+        <translation type="unfinished">Wstaw zmianę średniego nacisku pod uderzeniu (channel aftertouch)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>insert Poly Aftertouch</source>
+        <translation type="unfinished">Wstaw zmianę średniego nacisku pod uderzeniu (Poly Aftertouch)</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>bar</source>
+        <location line="+5"/>
+        <source>Cut</source>
+        <translation type="unfinished">Wytnij</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Copy</source>
+        <translation type="unfinished">Kopiuj</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Paste</source>
+        <translation type="unfinished">Wklej</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Delete Events</source>
+        <translation type="unfinished">Kasuj Elementy</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Window &amp;Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Undo/Redo tools</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Insert tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+4"/>
+        <source>panic</source>
+        <translation type="unfinished">Zatrzymaj wszystkie komunikaty midi!</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>transport</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Tick</source>
+        <translation type="unfinished">Takt (impuls sygnału czasu)</translation>
+    </message>
+    <message>
         <location line="+1"/>
-        <source>beat</source>
+        <source>Bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Type</source>
+        <translation type="unfinished">Typ</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Val A</source>
+        <translation type="unfinished">Wart. A</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Val B</source>
+        <translation type="unfinished">Wart. B</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Val C</source>
+        <translation type="unfinished">Wart. C</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Len</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Comment</source>
+        <translation type="unfinished">Opis</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::MPConfig</name>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="+101"/>
+        <location line="+176"/>
+        <source>Default input connections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-175"/>
+        <location line="+66"/>
+        <source>Are you sure you want to apply to all existing midi tracks now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-1"/>
+        <location line="+148"/>
+        <source>Default output connections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-37"/>
+        <location line="+38"/>
+        <source>Setting will apply to new midi tracks.
+Do you want to apply to all existing midi tracks now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>MusE: bad device name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>please choose a unique device name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+72"/>
+        <location line="+859"/>
+        <source>in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-836"/>
+        <location line="+827"/>
+        <source>out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-771"/>
+        <source>Show first aliases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+6"/>
-        <source>tick</source>
+        <source>Show second aliases</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-4"/>
-        <source>minute</source>
-        <translation type="unfinished">minuta</translation>
+        <location line="+130"/>
+        <location line="+42"/>
+        <source>Toggle all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-38"/>
+        <location line="+43"/>
+        <source>Change all tracks now</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Create Jack device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+229"/>
+        <location line="+29"/>
+        <source>Port Number</source>
+        <translation type="unfinished">Numer portu</translation>
+    </message>
+    <message>
+        <location line="-28"/>
+        <source>Enable gui</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>second</source>
-        <translation type="unfinished">sekunda</translation>
+        <source>Enable reading</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Enable writing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Port instrument</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi device name. Click to edit (Jack)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Connections from Jack Midi outputs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Connections to Jack Midi inputs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Auto-connect these channels to new midi tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+3"/>
-        <source>frame</source>
-        <translation type="unfinished">ramka</translation>
+        <source>Auto-connect new midi tracks to these channels</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-2"/>
-        <source>subframe</source>
-        <translation type="unfinished">subramka</translation>
+        <location line="+2"/>
+        <source>Auto-connect new midi tracks to this channel</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <source>MusE: Bigtime</source>
-        <translation type="unfinished">MuzA: Duży zegar</translation>
+        <location line="+2"/>
+        <source>Device state</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Enable gui for device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Enable reading from device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Enable writing to device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Name of the midi device associated with this port number. Click to edit Jack midi name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Instrument connected to port</source>
+        <translation type="unfinished">Instrument połączony do portu</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Connections from Jack Midi output ports</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Connections to Jack Midi input ports</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Auto-connect these channels, on this port, to new midi tracks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Connect new midi tracks to these channels, on this port.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Connect new midi tracks to this channel, on this port.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>State: result of opening the device</source>
+        <translation type="unfinished">Status: rezultat otworzenia urzÄ…dzenia</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>GUI</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>I</source>
+        <translation type="unfinished">Wej.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>O</source>
+        <translation type="unfinished">Wyj.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Instrument</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Device Name</source>
+        <translation type="unfinished">Nazwa UrzÄ…dzenia</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>In routes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Out routes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Def in ch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Def out ch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>State</source>
+        <translation type="unfinished">Status</translation>
+    </message>
+    <message>
+        <location line="+84"/>
+        <source>&lt;unknown&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+87"/>
+        <location line="+71"/>
+        <source>&lt;none&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::EditToolBar</name>
+    <name>MusEGui::MTScale</name>
     <message>
-        <location filename="../../muse/widgets/tools.cpp" line="+17"/>
-        <source>Edit Tools</source>
-        <translation type="unfinished">Narzędzia Edycyjne</translation>
+        <location filename="../../muse/widgets/mtscale.cpp" line="+44"/>
+        <source>bar scale</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::GlobalSettingsConfig</name>
+    <name>MusEGui::MTScaleFlo</name>
     <message>
-        <location filename="../../muse/widgets/genset.cpp" line="+546"/>
-        <source>Selects instruments directory</source>
+        <location filename="../../muse/widgets/mtscale_flo.cpp" line="+44"/>
+        <source>bar scale</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::Header</name>
+    <name>MusEGui::MarkerView</name>
     <message>
-        <location filename="../../muse/widgets/header.cpp" line="+164"/>
-        <source>Track Info Columns</source>
+        <location filename="../../muse/marker/markerview.cpp" line="+175"/>
+        <source>MusE: Marker</source>
+        <translation type="unfinished">MuzA: Znacznik</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>add marker</source>
+        <translation type="unfinished">Dodaj znacznik</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>delete marker</source>
+        <translation type="unfinished">Kasuj znacznik</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Window &amp;Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Undo/Redo tools</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+4"/>
+        <source>edit tools</source>
+        <translation type="unfinished">Narzędzia Edycyjne</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>panic</source>
+        <translation type="unfinished">Zatrzymaj wszystkie komunikaty midi!</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>transport</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Bar:Beat:Tick</source>
+        <translation type="unfinished">Takt:Puls:Takt</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hr:Mn:Sc:Fr:Sf</source>
+        <translation type="unfinished">Godz.:Min.:Sek.:Kl.:SKl</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lock</source>
+        <translation type="unfinished">Zablokuj</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Text</source>
+        <translation type="unfinished">Tekst</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Marker Properties</source>
+        <translation type="unfinished">Właściwości znacznika</translation>
+    </message>
 </context>
 <context>
-    <name>MusEWidget::MTScale</name>
+    <name>MusEGui::MasterEdit</name>
     <message>
-        <location filename="../../muse/widgets/mtscale.cpp" line="+44"/>
-        <source>bar scale</source>
+        <location filename="../../muse/master/masteredit.cpp" line="+107"/>
+        <source>MusE: Mastertrack</source>
+        <translation type="unfinished">MuzA: Åšlad Tempo/Metrum</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Window &amp;Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Undo/Redo tools</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>panic</source>
+        <translation type="unfinished">Zatrzymaj wszystkie komunikaty midi!</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>transport</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Enable master</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Enable</source>
+        <translation type="unfinished">WÅ‚Ä…cz</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable usage of master track</source>
+        <translation type="unfinished">Aktywuj Åšlad Tempo/Metrum</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Info</source>
+        <translation type="unfinished">Info</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>time at cursor position</source>
+        <translation type="unfinished">Wstaw metrum w aktualnej pozycji kursora</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>tempo at cursor position</source>
+        <translation type="unfinished">Wstaw tempo w aktualnej pozycji kursora</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Off</source>
+        <translation type="unfinished">Wył.</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Bar</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+2"/>
+        <source>Snap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>CurPos </source>
+        <translation type="unfinished">Akt. Poz. Kursora:</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>tempo at current position</source>
+        <translation type="unfinished">Wstaw tempo w aktualnej pozycji kursora</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>time signature at current position</source>
+        <translation type="unfinished">Wstaw tempo w aktualnej pozycji kursora</translation>
+    </message>
 </context>
 <context>
-    <name>MusEWidget::MTScaleFlo</name>
+    <name>MusEGui::MidiInputTransformDialog</name>
     <message>
-        <location filename="../../muse/widgets/mtscale_flo.cpp" line="+44"/>
-        <source>bar scale</source>
+        <location filename="../../muse/mplugins/midiitransform.cpp" line="+953"/>
+        <location line="+2"/>
+        <source>New</source>
+        <translation type="unfinished">Nowy</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::MidiStrip</name>
+    <message>
+        <location filename="../../muse/mixer/mstrip.cpp" line="+110"/>
+        <location line="+121"/>
+        <location line="+137"/>
+        <source>off</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="-257"/>
+        <location line="+122"/>
+        <source>double click on/off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-42"/>
+        <source>VariationSend</source>
+        <translation type="unfinished">VariationSend</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Var</source>
+        <translation type="unfinished">Var</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>ReverbSend</source>
+        <translation type="unfinished">Wysyłka Pogłosu</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Rev</source>
+        <translation type="unfinished">Pogł.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>ChorusSend</source>
+        <translation type="unfinished">Wysyłka Chorusa</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Cho</source>
+        <translation type="unfinished">Chorus</translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>dB</source>
+        <translation type="unfinished">dB</translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Pan/Balance</source>
+        <translation type="unfinished">Pan/Równowaga</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Pan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>mute</source>
+        <translation type="unfinished">wycisz</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>solo mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
+        <source>iR</source>
+        <translation type="unfinished">Wej.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>input routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>oR</source>
+        <translation type="unfinished">Wyj.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>output routing</source>
+        <translation type="unfinished">połączenie Wyjścia</translation>
+    </message>
 </context>
 <context>
-    <name>MusEWidget::MidiSyncConfig</name>
+    <name>MusEGui::MidiSyncConfig</name>
     <message>
         <location filename="../../muse/widgets/midisyncimpl.cpp" line="+58"/>
         <location line="+29"/>
@@ -11878,24 +12177,798 @@ Apply sync settings?</source>
     </message>
 </context>
 <context>
-    <name>MusEWidget::MidiTrackInfo</name>
+    <name>MusEGui::MidiTrackInfo</name>
     <message>
-        <location filename="../../muse/widgets/mtrackinfo.cpp" line="+319"/>
-        <location line="+1046"/>
+        <location filename="../../muse/widgets/mtrackinfo.cpp" line="+335"/>
+        <location line="+1068"/>
         <source>&lt;unknown&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::MixdownFileDialog</name>
+    <name>MusEGui::MidiTransformerDialog</name>
+    <message>
+        <location filename="../../muse/miditransform.cpp" line="+464"/>
+        <location line="+2"/>
+        <source>New</source>
+        <translation type="unfinished">Nowy</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::MixdownFileDialog</name>
     <message>
-        <location filename="../../muse/widgets/mixdowndialog.cpp" line="+118"/>
+        <location filename="../../muse/widgets/mixdowndialog.cpp" line="+122"/>
         <source>Wave Files (*.wav);;All Files (*)</source>
         <translation type="unfinished">Pliki Wave (*.wav);;Wszystkie Pliki (*)</translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::NoteInfo</name>
+    <name>MusEGui::MusE</name>
+    <message>
+        <location filename="../../muse/app.cpp" line="+137"/>
+        <location line="+16"/>
+        <source>Failed to start audio!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-15"/>
+        <source>Was not able to start audio, check if jack is running.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Timeout waiting for audio to run. Check if jack is running.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+220"/>
+        <source>Und&amp;o</source>
+        <translation type="unfinished">Co&amp;fnij</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Re&amp;do</source>
+        <translation type="unfinished">Co&amp;fnij</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>undo last change to song</source>
+        <translation type="unfinished">cofnij ostatniÄ… zmianÄ™ w utworze</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>redo last undo</source>
+        <translation type="unfinished">ponów ostanie cofnij</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Loop</source>
+        <translation type="unfinished">Pętla</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>loop between left mark and right mark</source>
+        <translation type="unfinished">Zapętl pomiędzy lokatorami</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Punchin</source>
+        <translation type="unfinished">WÅ‚Ä…cz wcinki (punch In)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>record starts at left mark</source>
+        <translation type="unfinished">Nagrywaj od lewego lokatora.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Punchout</source>
+        <translation type="unfinished">Wył. wcinki (punch out)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>record stops at right mark</source>
+        <translation type="unfinished">Nagrywaj od prawego lokatora.</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>rewind to start position</source>
+        <translation type="unfinished">Przewiń do początku.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Rewind</source>
+        <translation type="unfinished">Przewiń do tyłu</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>rewind current position</source>
+        <translation type="unfinished">Przewijaj kursor do tyłu.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Forward</source>
+        <translation type="unfinished">Przewiń do przodu</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>move current position</source>
+        <translation type="unfinished">Przewijaj kursor do przodu.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Stop</source>
+        <translation type="unfinished">Stop</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop sequencer</source>
+        <translation type="unfinished">Zatrzymaj sekwencer.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Play</source>
+        <translation type="unfinished">Odtwarzanie</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>start sequencer play</source>
+        <translation type="unfinished">Uruchom odtwarzanie sekwencera.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Record</source>
+        <translation type="unfinished">Nagrywanie</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>to record press record and then play</source>
+        <translation type="unfinished">Aby nagrywać najpierw naciśnij nagrywanie, potem odtwarzanie.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+238"/>
+        <source>Panic</source>
+        <translation type="unfinished">Zatrzymaj wszystkie komunikaty midi!</translation>
+    </message>
+    <message>
+        <location line="-236"/>
+        <source>send note off to all midi channels</source>
+        <translation type="unfinished">Zatrzymaj komunikaty midi na wszystkich kanałach!</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>&amp;New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+1"/>
+        <source>Create New Song</source>
+        <translation type="unfinished">Twórz nowy utwór. Można też nacisnąć skrót &quot;Ctrl-N&quot;.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Open</source>
+        <translation type="unfinished">&amp;Otwórz</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+2"/>
+        <source>Click this button to open a &lt;em&gt;new song&lt;/em&gt;.&lt;br&gt;You can also select the &lt;b&gt;Open command&lt;/b&gt; from the File menu.</source>
+        <translation type="unfinished">Otwórz nowy utwór. Można też wybrać &lt;b&gt;Otwórz&lt;/b&gt; z menu Plik.
+</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Open &amp;Recent</source>
+        <translation type="unfinished">Otwórz O&amp;statnie</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+1030"/>
+        <location line="+1255"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished">&amp;Zapisz</translation>
+    </message>
+    <message>
+        <location line="-2283"/>
+        <location line="+3"/>
+        <source>Click this button to save the song you are editing.  You will be prompted for a file name.
+You can also select the Save command from the File menu.</source>
+        <translation type="unfinished">Zapisz edytowany utwór. Trzeba podać nazwę pliku.
+Można też wybrać &quot;Zapisz&quot; z menu plik, lub &quot;Ctrl-S&quot;.
+</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Save &amp;As</source>
+        <translation type="unfinished">Zapisz &amp;Jako</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Import Midifile</source>
+        <translation type="unfinished">&amp;Import Pliku Midi</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Export Midifile</source>
+        <translation type="unfinished">&amp;Export do pliku midi</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Import Part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../../muse/wave.cpp" line="+1158"/>
+        <source>Import Wave File</source>
+        <translation type="unfinished">Import Pliku &amp;Wave</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Find unused wave files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Quit</source>
+        <translation type="unfinished">&amp;Zakończ</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Song Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Transport Panel</source>
+        <translation type="unfinished">Panel transportu</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Bigtime Window</source>
+        <translation type="unfinished">Duży Zegar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Mixer A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Mixer B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cliplist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Marker View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Arranger View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Fullscreen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Plugins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit Instrument</source>
+        <translation type="unfinished">Edytuj Instrument</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Input Plugins</source>
+        <translation type="unfinished">Wtyczki wejścia</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Transpose</source>
+        <translation type="unfinished">Transponuj</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi Input Transform</source>
+        <translation type="unfinished">Przekształcanie Wejścia Midi</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi Input Filter</source>
+        <translation type="unfinished">Filtr Wejścia Midi</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi Remote Control</source>
+        <translation type="unfinished">Zdalne Sterowanie Midi</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Rhythm Generator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Reset Instr.</source>
+        <translation type="unfinished">Reset Instr.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Init Instr.</source>
+        <translation type="unfinished">Inicjalizacja Instr.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Local Off</source>
+        <translation type="unfinished">Local Off</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Bounce to Track</source>
+        <translation type="unfinished">
+Zgrywanie śladu (bounce)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bounce to File</source>
+        <translation type="unfinished">Zgrywanie do Pliku (bounce)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Restart Audio</source>
+        <translation type="unfinished">Zrestartuj Audio</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Mixer Automation</source>
+        <translation type="unfinished">Automatyka Miksera</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Take Snapshot</source>
+        <translation type="unfinished">Zrób zrzut ekranu</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Clear Automation Data</source>
+        <translation type="unfinished">Wyczyść automatykę</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Cascade</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>In rows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>In columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Global Settings</source>
+        <translation type="unfinished">Globalne Ustawienia</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Configure Shortcuts</source>
+        <translation type="unfinished">Konfiguracja skrótów</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Follow Song</source>
+        <translation type="unfinished">podążanie kursora za utworem</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Don&apos;t Follow Song</source>
+        <translation type="unfinished">nie podążaj za utworem</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Follow Page</source>
+        <translation type="unfinished">kursor siÄ™ przesuwa</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Follow Continuous</source>
+        <translation type="unfinished">takty siÄ™ przesuwajÄ… (kursor stoi)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Metronome</source>
+        <translation type="unfinished">Metronom</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi Sync</source>
+        <translation type="unfinished">Synchronizacja Midi</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi File Import/Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Appearance Settings</source>
+        <translation type="unfinished">Ustawienia wyglÄ…du</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi Ports / Soft Synth</source>
+        <translation type="unfinished">Porty Midi i Syntezatory Softowe</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>&amp;Manual</source>
+        <translation type="unfinished">&amp;Instrukcja Obłsugi</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;MusE Homepage</source>
+        <translation type="unfinished">strona domowa &amp;MuzA</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Report Bug...</source>
+        <translation type="unfinished">&amp;Zgłoś Błąd...</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;About MusE</source>
+        <translation type="unfinished">&amp;Informacje o programie</translation>
+    </message>
+    <message>
+        <location line="+99"/>
+        <source>File Buttons</source>
+        <translation type="unfinished">Przyciski Menu Plik</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Undo/Redo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Transport</source>
+        <translation type="unfinished">Panel transportu</translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>&amp;File</source>
+        <translation type="unfinished">&amp;Plik</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>&amp;View</source>
+        <translation type="unfinished">&amp;PrzeglÄ…daj</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>&amp;Midi</source>
+        <translation type="unfinished">&amp;Midi</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>&amp;Audio</source>
+        <translation type="unfinished">&amp;Audio</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>A&amp;utomation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&amp;Windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>MusE Se&amp;ttings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>&amp;Help</source>
+        <translation type="unfinished">P&amp;omoc</translation>
+    </message>
+    <message>
+        <location line="+289"/>
+        <source>Cannot read template</source>
+        <translation type="unfinished">Nie można odczytać pliku szablonu</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>File open error</source>
+        <translation type="unfinished">BÅ‚Ä…d odczytu pliku</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>File read error</source>
+        <translation type="unfinished">błąd odczytu pliku</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Unknown File Format: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+130"/>
+        <location line="+437"/>
+        <location line="+914"/>
+        <source>MusE: Song: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-1317"/>
+        <source>MusE: load project</source>
+        <translation type="unfinished">MuzA: ładuj utwór</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>MusE: load template</source>
+        <translation type="unfinished">MuzA: Å‚aduj szablon</translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>MusE: Write File failed</source>
+        <translation type="unfinished">MuzA: Zapis pliku nie powiódł się</translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>The current Project contains unsaved data
+Save Current Project?</source>
+        <translation type="unfinished">Otwarty utwór zawiera niezapisane dane
+Zapisać otwarty utwór?</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+1255"/>
+        <source>S&amp;kip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-1255"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+265"/>
+        <location line="+13"/>
+        <source>MusE: Save As</source>
+        <translation type="unfinished">MuzA: Zapisz Jako</translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <location line="+160"/>
+        <source>Nothing to edit</source>
+        <translation type="unfinished">Nie ma nic do edytowania</translation>
+    </message>
+    <message>
+        <location line="+494"/>
+        <location line="+10"/>
+        <location line="+31"/>
+        <location line="+34"/>
+        <location line="+8"/>
+        <source>MusE: Bounce to Track</source>
+        <translation type="unfinished">MuzA: Zgrywanie (bounce) do Åšladu</translation>
+    </message>
+    <message>
+        <location line="-82"/>
+        <source>No wave tracks found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+105"/>
+        <source>No audio output tracks found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-74"/>
+        <source>Select one audio output track,
+and one target wave track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <source>Select one target wave track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Select one target wave track,
+and one audio output track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <location line="+25"/>
+        <source>MusE: Bounce to File</source>
+        <translation type="unfinished">MuzA: Zgrywanie (bounce) do Pliku</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Select one audio output track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>MusE: Bounce</source>
+        <translation type="unfinished">MuzA: Zgrywanie (bounce)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>set left/right marker for bounce range</source>
+        <translation type="unfinished">ustaw lokatory do zgrania (bounce) danego zakresu</translation>
+    </message>
+    <message>
+        <location line="+82"/>
+        <source>The current Project contains unsaved data
+Load overwrites current Project:
+Save Current Project?</source>
+        <translation type="unfinished">Otwarty utwór zawiera niezapisane dane.
+Załadowanie nadpisze otwarty utwór:
+Zapisać otwarty utwór?</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location filename="../../muse/importmidi.cpp" line="+85"/>
+        <source>&amp;Abort</source>
+        <translation type="unfinished">&amp;Anuluj</translation>
+    </message>
+    <message>
+        <location filename="../../muse/exportmidi.cpp" line="+147"/>
+        <source>MusE: Export Midi</source>
+        <translation type="unfinished">MuzA: Exportuj Midi</translation>
+    </message>
+    <message>
+        <location filename="../../muse/help.cpp" line="+50"/>
+        <source>no help found at: </source>
+        <translation type="unfinished">nie znalezniono pomocy</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>MusE: Open Help</source>
+        <translation type="unfinished">MuzA: Otwórz Pomoc</translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>Unable to launch help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>For some reason MusE has to launch the default
+browser on your machine.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/importmidi.cpp" line="-12"/>
+        <source>MusE: Import Midi</source>
+        <translation type="unfinished">MuzA: Importuj Midi</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Add midi file to current project?
+</source>
+        <translation type="unfinished">Dodać plik midi do otwartego utworu?</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Add to Project</source>
+        <translation type="unfinished">&amp;Dodaj do utworu</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Replace</source>
+        <translation type="unfinished">&amp;ZastÄ…p</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>reading midifile
+  </source>
+        <translation type="unfinished">czytanie pliku midi</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>
+failed: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+357"/>
+        <source>Import part is only valid for midi and wave tracks!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>MusE: load part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>No track selected for import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <location line="+121"/>
+        <source>%n part(s) out of %1 could not be imported.
+Likely the selected track is the wrong type.</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location line="+1"/>
+        <source>%n part(s) could not be imported.
+Likely the selected track is the wrong type.</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <location filename="../../muse/wave.cpp" line="-6"/>
+        <source>to import an audio file you have first to selecta wave track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Import Wavefile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>This wave file has a samplerate of %1,
+as opposed to current setting %2.
+Do you still want to import it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>&amp;Yes</source>
+        <translation type="unfinished">&amp;Tak</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>&amp;No</source>
+        <translation type="unfinished">&amp;Nie</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::NoteInfo</name>
     <message>
         <location filename="../../muse/widgets/noteinfo.cpp" line="+44"/>
         <source>Note Info</source>
@@ -11928,35 +13001,556 @@ Apply sync settings?</source>
     </message>
 </context>
 <context>
-    <name>MusEWidget::RoutePopupMenu</name>
+    <name>MusEGui::PartCanvas</name>
+    <message>
+        <location filename="../../muse/arranger/pcanvas.cpp" line="+355"/>
+        <source>Cannot copy/move/clone to different Track-Type</source>
+        <translation type="unfinished">Nie można skopiować/przenieść/sklonować do innego typu śladu</translation>
+    </message>
+    <message>
+        <location line="+280"/>
+        <source>C&amp;ut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Copy</source>
+        <translation type="unfinished">&amp;Kopiuj</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>s&amp;elect </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>clones</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>rename</source>
+        <translation type="unfinished">zmień nazwę</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>color</source>
+        <translation type="unfinished">kolor</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>delete</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <location filename="../../muse/widgets/routepopup.cpp" line="+223"/>
         <location line="+2"/>
-        <location line="+125"/>
+        <source>split</source>
+        <translation type="unfinished">podziel</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>glue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>de-clone</source>
+        <translation type="unfinished">sklonuj</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <source>save part to disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-2"/>
+        <source>wave edit</source>
+        <translation type="unfinished">edycja audio</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>file info</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+88"/>
+        <source>MusE: save part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>Part name: %1
+Files:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <location line="+2136"/>
+        <source>%n part(s) out of %1 could not be pasted.
+Likely the selected track is the wrong type.</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location line="+1"/>
+        <source>%n part(s) could not be pasted.
+Likely the selected track is the wrong type.</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Cannot paste: multiple tracks selected</source>
+        <translation type="unfinished">Nie można wkleić: zaznaczono kilka śladów</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Cannot paste: no track selected</source>
+        <translation type="unfinished">Nie można wkleić: nie zaznaczono żadnych śladów</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Can only paste to midi/drum track</source>
+        <translation type="unfinished">Można tylko wkleić do śladu midi, lub perkusji</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Can only paste to wave track</source>
+        <translation type="unfinished">Można wkleić tylko do śladu audio</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Can only paste to midi or wave track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Cannot paste: wrong data type</source>
+        <translation type="unfinished">Nie można wkleić: nieprawidłowy typ danych</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::PasteDialog</name>
+    <message numerus="yes">
+        <location filename="../../muse/widgets/pastedialog.cpp" line="+81"/>
+        <source>%n quarter(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>%1 quarter</source>
+        <comment>for floating-point arguments like 1.5</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>%1 quarters</source>
+        <comment>for floating-point arguments like 1.5</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::PasteEventsDialog</name>
+    <message numerus="yes">
+        <location filename="../../muse/widgets/pasteeventsdialog.cpp" line="+95"/>
+        <source>%n quarter(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>%1 quarter</source>
+        <comment>for floating-point arguments like 1.5</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>%1 quarters</source>
+        <comment>for floating-point arguments like 1.5</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::PianoRoll</name>
+    <message>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="+100"/>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>C&amp;ut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Copy</source>
+        <translation type="unfinished">&amp;Kopiuj</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Copy events in range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Paste</source>
+        <translation type="unfinished">&amp;Wklej</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Paste (with dialog)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Delete &amp;Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>&amp;Select</source>
+        <translation type="unfinished">&amp;Zaznacz</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select &amp;All</source>
+        <translation type="unfinished">Zaznacz &amp;wszystko</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Deselect All</source>
+        <translation type="unfinished">&amp;Odznacz wszystko</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Invert &amp;Selection</source>
+        <translation type="unfinished">Odwróć &amp;zaznaczenie</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>&amp;Inside Loop</source>
+        <translation type="unfinished">&amp;Pomiędzy lokatorami.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Outside Loop</source>
+        <translation type="unfinished">&amp;Poza obrębem lokatorów</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&amp;Previous Part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Next Part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Fu&amp;nctions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Quantize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Modify Note Length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Modify Velocity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Crescendo/Decrescendo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Transpose</source>
+        <translation type="unfinished">Transponuj</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Erase Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Move Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Set Fixed Length</source>
+        <translation type="unfinished">Ustaw stałą długość nut</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Delete Overlaps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Legato</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Plugins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Window &amp;Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Event Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>&amp;Blue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Pitch colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Velocity colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Pianoroll tools</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Step Record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Midi Input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Play Events</source>
+        <translation type="unfinished">PodglÄ…d midi</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>panic</source>
+        <translation type="unfinished">Zatrzymaj wszystkie komunikaty midi!</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>transport</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>ctrl</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Add Controller View</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::PluginDialog</name>
+    <message>
+        <location filename="../../muse/plugin.cpp" line="+3137"/>
+        <source>MusE: select plugin</source>
+        <translation type="unfinished">MuzA: wybierz wtyczkÄ™</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Lib</source>
+        <translation type="unfinished">Bibl.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Label</source>
+        <translation type="unfinished">Etykieta</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Name</source>
+        <translation type="unfinished">Nazwa</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>AI</source>
+        <translation type="unfinished">AI</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>AO</source>
+        <translation type="unfinished">AO</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>CI</source>
+        <translation type="unfinished">CI</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>CO</source>
+        <translation type="unfinished">CO</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>IP</source>
+        <translation type="unfinished">IP</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>id</source>
+        <translation type="unfinished">numer</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Maker</source>
+        <translation type="unfinished">Znacznik</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copyright</source>
+        <translation type="unfinished">Prawa autorskie</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Ok</source>
+        <translation type="unfinished">Akceptuj</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Anuluj</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Mono and Stereo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Stereo</source>
+        <translation type="unfinished">Stereo</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Mono</source>
+        <translation type="unfinished">Mono</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Show All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Select which types of plugins should be visible in the list.&lt;br&gt;Note that using mono plugins on stereo tracks is not a problem, two will be used in parallell.&lt;br&gt;Also beware that the &apos;all&apos; alternative includes plugins that probably not are usable by MusE.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Search in &apos;Label&apos; and &apos;Name&apos;:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::PluginGui</name>
+    <message>
+        <location line="+207"/>
+        <source>File Buttons</source>
+        <translation type="unfinished">Przyciski Menu Plik</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Load Preset</source>
+        <translation type="unfinished">Załaduj Ustawienie</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Save Preset</source>
+        <translation type="unfinished">Zapisz ustawienie</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location line="+3"/>
+        <source>bypass plugin</source>
+        <translation type="unfinished">omiń wtyczkę (bypass)</translation>
+    </message>
+    <message>
+        <location line="+554"/>
+        <source>MusE: load preset</source>
+        <translation type="unfinished">MuzA: załaduj ustawienie</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Error reading preset. Might not be right type for this plugin</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>MusE: save preset</source>
+        <translation type="unfinished">MuzA: zapisz ustawienie</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::RoutePopupMenu</name>
+    <message>
+        <location filename="../../muse/widgets/routepopup.cpp" line="+230"/>
+        <location line="+2"/>
+        <location line="+132"/>
         <location line="+78"/>
         <location line="+57"/>
-        <location line="+53"/>
-        <location line="+682"/>
+        <location line="+60"/>
+        <location line="+685"/>
         <location line="+85"/>
         <source>Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-274"/>
-        <location line="+224"/>
+        <location line="-270"/>
+        <location line="+220"/>
         <location line="+85"/>
         <source>Soloing chain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-307"/>
-        <location line="+224"/>
+        <location line="-303"/>
+        <location line="+220"/>
         <source>Audio returns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-185"/>
-        <source>Warning: No midi input devices!</source>
+        <location line="-182"/>
+        <source>Warning: No input devices!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -11965,7 +13559,7 @@ Apply sync settings?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+42"/>
         <location line="+33"/>
         <source>&lt;none&gt;</source>
         <translation type="unfinished"></translation>
@@ -11992,9 +13586,315 @@ Apply sync settings?</source>
     </message>
 </context>
 <context>
-    <name>MusEWidget::ScrollScale</name>
+    <name>MusEGui::ScoreCanvas</name>
+    <message>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="+1313"/>
+        <source>Treble</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Bass</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Grand Staff</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove staff</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2471"/>
+        <source>Ambiguous part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There are two or more possible parts you could add the note to, but none matches the selected part. Please select the destination part by clicking on any note belonging to it and try again, or add a new stave containing only the destination part.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>No part</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <location filename="../../muse/widgets/scrollscale.cpp" line="+316"/>
+        <location line="+0"/>
+        <source>There are no parts you could add the note to.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::ScoreEdit</name>
+    <message>
+        <location line="-3557"/>
+        <source>Undo/Redo tools</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Step recording tools</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Step Record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>panic</source>
+        <translation type="unfinished">Zatrzymaj wszystkie komunikaty midi!</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>transport</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Note settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Note length:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>last</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <location line="+1"/>
+        <location line="+325"/>
+        <source>Apply to new notes:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-324"/>
+        <location line="+328"/>
+        <source>Apply to selected notes:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-321"/>
+        <source>Velocity:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Off-Velocity:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Quantisation settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Quantisation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Pixels per whole:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>C&amp;ut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Copy</source>
+        <translation type="unfinished">&amp;Kopiuj</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Copy events in range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Paste</source>
+        <translation type="unfinished">&amp;Wklej</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Paste (with dialog)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Delete &amp;Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>&amp;Select</source>
+        <translation type="unfinished">&amp;Zaznacz</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select &amp;All</source>
+        <translation type="unfinished">Zaznacz &amp;wszystko</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Deselect All</source>
+        <translation type="unfinished">&amp;Odznacz wszystko</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Invert &amp;Selection</source>
+        <translation type="unfinished">Odwróć &amp;zaznaczenie</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>&amp;Inside Loop</source>
+        <translation type="unfinished">&amp;Pomiędzy lokatorami.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Outside Loop</source>
+        <translation type="unfinished">&amp;Poza obrębem lokatorów</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Fu&amp;nctions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Quantize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Change note &amp;length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Change note &amp;velocity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Crescendo/Decrescendo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transpose</source>
+        <translation type="unfinished">Transponuj</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Erase Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Move Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Set Fixed Length</source>
+        <translation type="unfinished">Ustaw stałą długość nut</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Delete Overlaps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Legato</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Window &amp;Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Note head &amp;colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Black</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Velocity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Set up &amp;preamble</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Display &amp;key signature</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Display &amp;time signature</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Set Score &amp;name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+224"/>
+        <location line="+1"/>
+        <source>Enter the new score title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Changing score title failed:
+the selected title is not unique</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::ScrollScale</name>
+    <message>
+        <location filename="../../muse/widgets/scrollscale.cpp" line="+318"/>
         <source>next page</source>
         <translation type="unfinished">następna strona</translation>
     </message>
@@ -12010,7 +13910,7 @@ Apply sync settings?</source>
     </message>
 </context>
 <context>
-    <name>MusEWidget::ShortcutCaptureDialog</name>
+    <name>MusEGui::ShortcutCaptureDialog</name>
     <message>
         <location filename="../../muse/widgets/shortcutcapturedialog.cpp" line="+55"/>
         <source>Ok</source>
@@ -12023,7 +13923,7 @@ Apply sync settings?</source>
     </message>
     <message>
         <location line="+52"/>
-        <source>Shortcut conflicts with </source>
+        <source>Shortcut conflicts with %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -12033,7 +13933,7 @@ Apply sync settings?</source>
     </message>
 </context>
 <context>
-    <name>MusEWidget::SigScale</name>
+    <name>MusEGui::SigScale</name>
     <message>
         <location filename="../../muse/widgets/sigscale.cpp" line="+44"/>
         <source>signature scale</source>
@@ -12041,9 +13941,155 @@ Apply sync settings?</source>
     </message>
 </context>
 <context>
-    <name>MusEWidget::Toolbar1</name>
+    <name>MusEGui::Strip</name>
+    <message>
+        <location filename="../../muse/mixer/strip.cpp" line="+314"/>
+        <source>Remove track?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::TList</name>
+    <message>
+        <location filename="../../muse/arranger/tlist.cpp" line="+373"/>
+        <source>&lt;none&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>no clef</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Treble</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Bass</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Grand</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>MusE: bad trackname</source>
+        <translation type="unfinished">MuzA: zła nazwa śladu</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>please choose a unique track name</source>
+        <translation type="unfinished">proszę wybrać niepowtarzalną nazwę dla śladu</translation>
+    </message>
+    <message>
+        <location line="+172"/>
+        <location line="+1149"/>
+        <source>Update drummap?</source>
+        <translation type="unfinished">Zaktualizować zestaw perkusyjny?</translation>
+    </message>
+    <message>
+        <location line="-1148"/>
+        <source>Do you want to use same port for all instruments in the drummap?</source>
+        <translation type="unfinished">Czy chcesz używać jednego portu midi dla wszystkich instrumentów w zestawie perkusyjnym?</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+1149"/>
+        <source>&amp;Yes</source>
+        <translation type="unfinished">&amp;Tak</translation>
+    </message>
+    <message>
+        <location line="-1149"/>
+        <location line="+1149"/>
+        <source>&amp;No</source>
+        <translation type="unfinished">&amp;Nie</translation>
+    </message>
+    <message>
+        <location line="-1074"/>
+        <location line="+55"/>
+        <source>show gui</source>
+        <translation type="unfinished">pokaż interfejs użytkownika</translation>
+    </message>
     <message>
-        <location filename="../../muse/widgets/tb1.cpp" line="+21"/>
+        <location line="-46"/>
+        <location line="+55"/>
+        <source>show native gui</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+346"/>
+        <source>Treble clef</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bass clef</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Grand Staff</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Viewable automation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+131"/>
+        <source>Delete Track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Track Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Insert Track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+445"/>
+        <source>Midi</source>
+        <translation type="unfinished">Midi</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Drum</source>
+        <translation type="unfinished">Perkusja</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Do you want to use same port and channel for all instruments in the drummap?</source>
+        <translation type="unfinished">Czy chcesz używać jednego portu  i jednego kanału dla wszystkich instrumentów w zestawie perkusyjnym?</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::TempoSig</name>
+    <message>
+        <location filename="../../muse/transport.cpp" line="+149"/>
+        <source>Tempo/Sig</source>
+        <translation type="unfinished">Tempo/Metrum</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::Toolbar1</name>
+    <message>
+        <location filename="../../muse/widgets/tb1.cpp" line="+47"/>
+        <location line="+1"/>
+        <location line="+1"/>
+        <source>Off</source>
+        <translation type="unfinished">Wył.</translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>Solo</source>
         <translation type="unfinished">Solo</translation>
     </message>
@@ -12059,7 +14105,80 @@ Apply sync settings?</source>
     </message>
 </context>
 <context>
-    <name>MusEWidget::TrackComment</name>
+    <name>MusEGui::TopWin</name>
+    <message>
+        <location filename="../../muse/cobject.cpp" line="+64"/>
+        <source>As subwindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Shares tools and menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Fullscreen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+468"/>
+        <source>Piano roll</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>List editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Drum editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Master track editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Master track list editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Wave editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Clip list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Marker view</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Score editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Arranger</source>
+        <translation type="unfinished">Główne Okno</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&lt;unknown toplevel type&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::TrackComment</name>
     <message>
         <location filename="../../muse/widgets/comment.cpp" line="+58"/>
         <source>MusE: Track Comment</source>
@@ -12072,14 +14191,711 @@ Apply sync settings?</source>
     </message>
 </context>
 <context>
-    <name>MusEWidget::VisibleTracks</name>
+    <name>MusEGui::Transport</name>
+    <message>
+        <location filename="../../muse/transport.cpp" line="+105"/>
+        <source>Overdub</source>
+        <translation type="unfinished">Dogrywanie</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+15"/>
+        <source>Replace</source>
+        <translation type="unfinished">Zastępowania</translation>
+    </message>
+    <message>
+        <location line="-10"/>
+        <source>Rec Mode</source>
+        <translation type="unfinished">Typ Nagrywania</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Normal</source>
+        <translation type="unfinished">Normalny</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mix</source>
+        <translation type="unfinished">Miks</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Cycle Rec</source>
+        <translation type="unfinished">Zapętl nagrywanie</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>punchin</source>
+        <translation type="unfinished">włącz wcinki (punch In)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>loop</source>
+        <translation type="unfinished">pętla</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>punchout</source>
+        <translation type="unfinished">wył. wcinki (punch out)punchout</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+3"/>
+        <source>Punch In</source>
+        <translation type="unfinished">WÅ‚Ä…cz wcinki (punch In)</translation>
+    </message>
+    <message>
+        <location line="-2"/>
+        <location line="+3"/>
+        <source>Loop</source>
+        <translation type="unfinished">Pętla</translation>
+    </message>
+    <message>
+        <location line="-2"/>
+        <location line="+3"/>
+        <source>Punch Out</source>
+        <translation type="unfinished">Wył. wcinki (punch out)</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Left Mark</source>
+        <translation type="unfinished">Lewy Lokator</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Right Mark</source>
+        <translation type="unfinished">Prawy Lokator</translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>rewind to start</source>
+        <translation type="unfinished">przewiń do początku</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Click this button to rewind to start position</source>
+        <translation type="unfinished">Przewiń do początku.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>rewind</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Click this button to rewind</source>
+        <translation type="unfinished">Przewijaj do tyłu.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Click this button to forward current play position</source>
+        <translation type="unfinished">Przewijaj do przodu.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>stop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Click this button to stop playback</source>
+        <translation type="unfinished">Zatrzymaj odtwarzanie.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Click this button to start playback</source>
+        <translation type="unfinished">Rozpocznij odtwarzanie.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Click this button to enable recording</source>
+        <translation type="unfinished">Naciśnij ten przycisk, aby pozwolić na nagrywanie</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>AC</source>
+        <translation type="unfinished">Aut. Kw.</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>quantize during record</source>
+        <translation type="unfinished">kwantyzuj podczas nagrywania</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Click</source>
+        <translation type="unfinished">Metronom</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>metronom click on/off</source>
+        <translation type="unfinished">włącz/wyłącz metronom</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Sync</source>
+        <translation type="unfinished">Synch.</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>external sync on/off</source>
+        <translation type="unfinished">synchronizowanie do zewn. urz.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Jack</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Jack transport sync on/off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Master</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>use master track</source>
+        <translation type="unfinished">Używaj śladu tempo/metrum</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::VisibleTracks</name>
     <message>
-        <location filename="../../muse/widgets/visibletracks.cpp" line="+9"/>
+        <location filename="../../muse/widgets/visibletracks.cpp" line="+36"/>
+        <location line="+9"/>
+        <source>Show wave tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-8"/>
+        <location line="+9"/>
+        <source>Show group tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-8"/>
+        <location line="+9"/>
+        <source>Show aux tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-8"/>
+        <location line="+9"/>
+        <source>Show input tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-8"/>
+        <location line="+9"/>
+        <source>Show output tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-8"/>
+        <location line="+9"/>
+        <source>Show midi tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-8"/>
+        <location line="+9"/>
+        <source>Show synth tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
         <source>Visible track types</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>MusEGui::WaveEdit</name>
+    <message>
+        <location filename="../../muse/waveedit/waveedit.cpp" line="+91"/>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Func&amp;tions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Gain</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>200%</source>
+        <translation type="obsolete">200%</translation>
+    </message>
+    <message>
+        <source>150%</source>
+        <translation type="obsolete">150%</translation>
+    </message>
+    <message>
+        <source>75%</source>
+        <translation type="obsolete">75%</translation>
+    </message>
+    <message>
+        <source>50%</source>
+        <translation type="obsolete">50%</translation>
+    </message>
+    <message>
+        <source>25%</source>
+        <translation type="obsolete">25%</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>&amp;Copy</source>
+        <translation type="unfinished">&amp;Kopiuj</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>C&amp;ut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Paste</source>
+        <translation type="unfinished">&amp;Wklej</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Edit in E&amp;xternal Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Mute Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Normalize Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Fade In Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Fade Out Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Reverse Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select &amp;All</source>
+        <translation type="unfinished">Zaznacz &amp;wszystko</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Deselect All</source>
+        <translation type="unfinished">&amp;Odznacz wszystko</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Window &amp;Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Wave edit tools</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>transport</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>WaveEdit tools</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Solo</source>
+        <translation type="unfinished">Solo</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::WaveView</name>
+    <message>
+        <location filename="../../muse/waveedit/waveview.cpp" line="+996"/>
+        <source>MusE - external editor failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>MusE was unable to launch the external editor
+check if the editor setting in:
+Global Settings-&gt;Audio:External Waveditor
+is set to a valid editor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>MusE - file size changed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>When editing in external editor - you should not change the filesize
+since it must fit the selected region.
+
+Missing data is muted</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEMixer::AudioMixerApp</name>
+    <message>
+        <source>&amp;View</source>
+        <translation type="obsolete">&amp;PrzeglÄ…daj</translation>
+    </message>
+    <message>
+        <source>Routing</source>
+        <translation type="obsolete">Konfiguracja połączeń</translation>
+    </message>
+</context>
+<context>
+    <name>MusEMixer::AudioStrip</name>
+    <message>
+        <source>panorama</source>
+        <translation type="obsolete">Panorama</translation>
+    </message>
+    <message>
+        <source>aux send level</source>
+        <translation type="obsolete">Poziom syngału na wysyłce</translation>
+    </message>
+    <message>
+        <source>1/2 channel</source>
+        <translation type="obsolete">kanał m/s</translation>
+    </message>
+    <message>
+        <source>Pre</source>
+        <translation type="obsolete">Przed</translation>
+    </message>
+    <message>
+        <source>pre fader - post fader</source>
+        <translation type="obsolete">przed/ za tłumikiem</translation>
+    </message>
+    <message>
+        <source>dB</source>
+        <translation type="obsolete">dB</translation>
+    </message>
+    <message>
+        <source>mute</source>
+        <translation type="obsolete">wycisz</translation>
+    </message>
+    <message>
+        <source>record downmix</source>
+        <translation type="obsolete">zgraj miks</translation>
+    </message>
+    <message>
+        <source>iR</source>
+        <translation type="obsolete">Wej.</translation>
+    </message>
+    <message>
+        <source>oR</source>
+        <translation type="obsolete">Wyj.</translation>
+    </message>
+    <message>
+        <source>output routing</source>
+        <translation type="obsolete">połączenie Wyjścia</translation>
+    </message>
+    <message>
+        <source>Off</source>
+        <translation type="obsolete">Wył.</translation>
+    </message>
+    <message>
+        <source>Read</source>
+        <translation type="obsolete">Czytaj</translation>
+    </message>
+    <message>
+        <source>Touch</source>
+        <translation type="obsolete">Dotknij</translation>
+    </message>
+    <message>
+        <source>Write</source>
+        <translation type="obsolete">Zapisz</translation>
+    </message>
+    <message>
+        <source>automation type</source>
+        <translation type="obsolete">typ automatyki</translation>
+    </message>
+</context>
+<context>
+    <name>MusEMixer::EffectRack</name>
+    <message>
+        <source>effect rack</source>
+        <translation type="obsolete">skrzynia efektów</translation>
+    </message>
+    <message>
+        <source>new</source>
+        <translation type="obsolete">nowy</translation>
+    </message>
+    <message>
+        <source>change</source>
+        <translation type="obsolete">zmień</translation>
+    </message>
+    <message>
+        <source>move up</source>
+        <translation type="obsolete">przesuń w górę</translation>
+    </message>
+    <message>
+        <source>move down</source>
+        <translation type="obsolete">przesuń w dół</translation>
+    </message>
+    <message>
+        <source>remove</source>
+        <translation type="obsolete">usuń</translation>
+    </message>
+    <message>
+        <source>bypass</source>
+        <translation type="obsolete">omiń (bypass)</translation>
+    </message>
+    <message>
+        <source>show gui</source>
+        <translation type="obsolete">pokaż interfejs użytkownika</translation>
+    </message>
+</context>
+<context>
+    <name>MusEMixer::MidiStrip</name>
+    <message>
+        <source>VariationSend</source>
+        <translation type="obsolete">VariationSend</translation>
+    </message>
+    <message>
+        <source>Var</source>
+        <translation type="obsolete">Var</translation>
+    </message>
+    <message>
+        <source>ReverbSend</source>
+        <translation type="obsolete">Wysyłka Pogłosu</translation>
+    </message>
+    <message>
+        <source>Rev</source>
+        <translation type="obsolete">Pogł.</translation>
+    </message>
+    <message>
+        <source>ChorusSend</source>
+        <translation type="obsolete">Wysyłka Chorusa</translation>
+    </message>
+    <message>
+        <source>Cho</source>
+        <translation type="obsolete">Chorus</translation>
+    </message>
+    <message>
+        <source>dB</source>
+        <translation type="obsolete">dB</translation>
+    </message>
+    <message>
+        <source>Pan/Balance</source>
+        <translation type="obsolete">Pan/Równowaga</translation>
+    </message>
+    <message>
+        <source>mute</source>
+        <translation type="obsolete">wycisz</translation>
+    </message>
+    <message>
+        <source>iR</source>
+        <translation type="obsolete">Wej.</translation>
+    </message>
+    <message>
+        <source>oR</source>
+        <translation type="obsolete">Wyj.</translation>
+    </message>
+    <message>
+        <source>output routing</source>
+        <translation type="obsolete">połączenie Wyjścia</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::BigTime</name>
+    <message>
+        <source>minute</source>
+        <translation type="obsolete">minuta</translation>
+    </message>
+    <message>
+        <source>second</source>
+        <translation type="obsolete">sekunda</translation>
+    </message>
+    <message>
+        <source>frame</source>
+        <translation type="obsolete">ramka</translation>
+    </message>
+    <message>
+        <source>subframe</source>
+        <translation type="obsolete">subramka</translation>
+    </message>
+    <message>
+        <source>MusE: Bigtime</source>
+        <translation type="obsolete">MuzA: Duży zegar</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::EditToolBar</name>
+    <message>
+        <source>Edit Tools</source>
+        <translation type="obsolete">Narzędzia Edycyjne</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::MidiSyncConfig</name>
+    <message>
+        <source>Port Number</source>
+        <translation type="obsolete">Numer portu</translation>
+    </message>
+    <message>
+        <source>Name of the midi device associated with this port number</source>
+        <translation type="obsolete">Nazwa urzÄ…dzenia midi skojarzona z tym numerem portu</translation>
+    </message>
+    <message>
+        <source>Device Name</source>
+        <translation type="obsolete">Nazwa UrzÄ…dzenia</translation>
+    </message>
+    <message>
+        <source>m</source>
+        <translation type="obsolete">min.</translation>
+    </message>
+    <message>
+        <source>MusE</source>
+        <translation type="obsolete">MuzA</translation>
+    </message>
+    <message>
+        <source>&amp;Apply</source>
+        <translation type="obsolete">&amp;Zastosuj</translation>
+    </message>
+    <message>
+        <source>&amp;No</source>
+        <translation type="obsolete">&amp;Nie</translation>
+    </message>
+    <message>
+        <source>&amp;Abort</source>
+        <translation type="obsolete">&amp;Anuluj</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::MixdownFileDialog</name>
+    <message>
+        <source>Wave Files (*.wav);;All Files (*)</source>
+        <translation type="obsolete">Pliki Wave (*.wav);;Wszystkie Pliki (*)</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::NoteInfo</name>
+    <message>
+        <source>Note Info</source>
+        <translation type="obsolete">Info o dźwięku</translation>
+    </message>
+    <message>
+        <source>Velo On</source>
+        <translation type="obsolete">Prędk. uderz.</translation>
+    </message>
+    <message>
+        <source>Velo Off</source>
+        <translation type="obsolete">Prędk. puszcz.</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::ScrollScale</name>
+    <message>
+        <source>next page</source>
+        <translation type="obsolete">następna strona</translation>
+    </message>
+    <message>
+        <source>previous page</source>
+        <translation type="obsolete">poprzednia strona</translation>
+    </message>
+    <message>
+        <source>current page number</source>
+        <translation type="obsolete">aktualny numer strony</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::ShortcutCaptureDialog</name>
+    <message>
+        <source>Ok</source>
+        <translation type="obsolete">Akceptuj</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="obsolete">Anuluj</translation>
+    </message>
+    <message>
+        <source>Undefined</source>
+        <translation type="obsolete">Niezdefiniowany</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::SigScale</name>
+    <message>
+        <source>signature scale</source>
+        <translation type="obsolete">oÅ› metrum</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::Toolbar1</name>
+    <message>
+        <source>Solo</source>
+        <translation type="obsolete">Solo</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::TrackComment</name>
+    <message>
+        <source>MusE: Track Comment</source>
+        <translation type="obsolete">MuzA: Opis Åšladu</translation>
+    </message>
+    <message>
+        <source>Track Comment:</source>
+        <translation type="obsolete">Opis Åšladu</translation>
+    </message>
+</context>
+<context>
     <name>NoteInfo</name>
     <message>
         <source>Start</source>
@@ -12471,9 +15287,8 @@ to be expanded by more than </source>
 <context>
     <name>PianoRoll</name>
     <message>
-        <location filename="../../muse/midiedit/pianoroll.cpp" line="+97"/>
         <source>&amp;Edit</source>
-        <translation>&amp;Edycja</translation>
+        <translation type="obsolete">&amp;Edycja</translation>
     </message>
     <message>
         <source>Cut</source>
@@ -12512,9 +15327,8 @@ to be expanded by more than </source>
         <translation type="obsolete">Poza obrębem lokatorów</translation>
     </message>
     <message>
-        <location line="+34"/>
         <source>&amp;Select</source>
-        <translation>&amp;Zaznacz</translation>
+        <translation type="obsolete">&amp;Zaznacz</translation>
     </message>
     <message>
         <source>blue</source>
@@ -12561,24 +15375,20 @@ to be expanded by more than </source>
         <translation type="obsolete">Narzędzia Pianoroll</translation>
     </message>
     <message>
-        <location line="+137"/>
         <source>Step Record</source>
-        <translation>Nagrywanie krok po kroku</translation>
+        <translation type="obsolete">Nagrywanie krok po kroku</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Midi Input</source>
-        <translation>Wejście Midi</translation>
+        <translation type="obsolete">Wejście Midi</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Play Events</source>
-        <translation>PodglÄ…d midi</translation>
+        <translation type="obsolete">PodglÄ…d midi</translation>
     </message>
     <message>
-        <location line="+41"/>
         <source>Add Controller View</source>
-        <translation>Dodaj wykres kontorolera</translation>
+        <translation type="obsolete">Dodaj wykres kontorolera</translation>
     </message>
     <message>
         <source>Config Quant...</source>
@@ -12589,18 +15399,16 @@ to be expanded by more than </source>
         <translation type="obsolete">Modyfikuj czas bramki</translation>
     </message>
     <message>
-        <location line="-138"/>
         <source>Modify Velocity</source>
-        <translation>Modyfikuj predkość uderzenia (velocity)</translation>
+        <translation type="obsolete">Modyfikuj predkość uderzenia (velocity)</translation>
     </message>
     <message>
         <source>Crescendo</source>
         <translation type="obsolete">Crescendo</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Transpose</source>
-        <translation>Transponuj</translation>
+        <translation type="obsolete">Transponuj</translation>
     </message>
     <message>
         <source>Thin Out</source>
@@ -12635,237 +15443,103 @@ to be expanded by more than </source>
         <translation type="obsolete">Stwórz takt</translation>
     </message>
     <message>
-        <location line="+126"/>
         <source>ctrl</source>
-        <translation>kontr.</translation>
-    </message>
-    <message>
-        <location line="-214"/>
-        <source>C&amp;ut</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">kontr.</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Copy</source>
-        <translation type="unfinished">&amp;Kopiuj</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Copy events in range</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&amp;Kopiuj</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Paste</source>
-        <translation type="unfinished">&amp;Wklej</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>&amp;Paste (with dialog)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Delete &amp;Events</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&amp;Wklej</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Select &amp;All</source>
-        <translation type="unfinished">Zaznacz &amp;wszystko</translation>
+        <translation type="obsolete">Zaznacz &amp;wszystko</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Deselect All</source>
-        <translation type="unfinished">&amp;Odznacz wszystko</translation>
+        <translation type="obsolete">&amp;Odznacz wszystko</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Invert &amp;Selection</source>
-        <translation type="unfinished">Odwróć &amp;zaznaczenie</translation>
+        <translation type="obsolete">Odwróć &amp;zaznaczenie</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>&amp;Inside Loop</source>
-        <translation type="unfinished">&amp;Pomiędzy lokatorami.</translation>
+        <translation type="obsolete">&amp;Pomiędzy lokatorami.</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Outside Loop</source>
-        <translation type="unfinished">&amp;Poza obrębem lokatorów</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>&amp;Previous Part</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>&amp;Next Part</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Fu&amp;nctions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+54"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>&amp;Event Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>&amp;Blue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>&amp;Pitch colors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>&amp;Velocity colors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-68"/>
-        <source>Quantize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Modify Note Length</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Crescendo/Decrescendo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Erase Events</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Move Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&amp;Poza obrębem lokatorów</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Set Fixed Length</source>
-        <translation type="unfinished">Ustaw stałą długość nut</translation>
+        <translation type="obsolete">Ustaw stałą długość nut</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Delete Overlaps</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Legato</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>&amp;Plugins</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+46"/>
-        <source>Pianoroll tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
         <source>panic</source>
-        <translation type="unfinished">Zatrzymaj wszystkie komunikaty midi!</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>transport</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Zatrzymaj wszystkie komunikaty midi!</translation>
     </message>
 </context>
 <context>
     <name>PluginDialog</name>
     <message>
-        <location filename="../../muse/plugin.cpp" line="+3142"/>
         <source>Ok</source>
-        <translation>Akceptuj</translation>
+        <translation type="obsolete">Akceptuj</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Cancel</source>
-        <translation>Anuluj</translation>
+        <translation type="obsolete">Anuluj</translation>
     </message>
     <message>
-        <location line="-49"/>
         <source>MusE: select plugin</source>
-        <translation>MuzA: wybierz wtyczkÄ™</translation>
+        <translation type="obsolete">MuzA: wybierz wtyczkÄ™</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Lib</source>
-        <translation type="unfinished">Bibl.</translation>
+        <translation type="obsolete">Bibl.</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Label</source>
-        <translation>Etykieta</translation>
+        <translation type="obsolete">Etykieta</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Name</source>
-        <translation>Nazwa</translation>
+        <translation type="obsolete">Nazwa</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>AI</source>
-        <translation type="unfinished">AI</translation>
+        <translation type="obsolete">AI</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>AO</source>
-        <translation type="unfinished">AO</translation>
+        <translation type="obsolete">AO</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>CI</source>
-        <translation type="unfinished">CI</translation>
+        <translation type="obsolete">CI</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>CO</source>
-        <translation type="unfinished">CO</translation>
+        <translation type="obsolete">CO</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>IP</source>
-        <translation type="unfinished">IP</translation>
+        <translation type="obsolete">IP</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>id</source>
-        <translation>numer</translation>
+        <translation type="obsolete">numer</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Maker</source>
-        <translation>Znacznik</translation>
+        <translation type="obsolete">Znacznik</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Copyright</source>
-        <translation>Prawa autorskie</translation>
+        <translation type="obsolete">Prawa autorskie</translation>
     </message>
     <message>
         <source>Select which types of plugins should be visible in the list,&lt;br&gt;beware that &apos;all&apos; includes plugins that probably are not usable by MusE.</source>
@@ -12876,77 +15550,43 @@ to be expanded by more than </source>
         <translation type="obsolete">Stereo i Mono</translation>
     </message>
     <message>
-        <location line="+52"/>
         <source>Stereo</source>
-        <translation>Stereo</translation>
+        <translation type="obsolete">Stereo</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Mono</source>
-        <translation>Mono</translation>
+        <translation type="obsolete">Mono</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="obsolete">Wszystko</translation>
     </message>
-    <message>
-        <location line="-10"/>
-        <source>Mono and Stereo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+15"/>
-        <source>Show All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>Select which types of plugins should be visible in the list.&lt;br&gt;Note that using mono plugins on stereo tracks is not a problem, two will be used in parallell.&lt;br&gt;Also beware that the &apos;all&apos; alternative includes plugins that probably not are usable by MusE.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+9"/>
-        <source>Search in &apos;Label&apos; and &apos;Name&apos;:</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>PluginGui</name>
     <message>
-        <location line="+219"/>
-        <location line="+3"/>
         <source>bypass plugin</source>
-        <translation>omiń wtyczkę (bypass)</translation>
+        <translation type="obsolete">omiń wtyczkę (bypass)</translation>
     </message>
     <message>
-        <location line="+554"/>
         <source>MusE: load preset</source>
-        <translation>MuzA: załaduj ustawienie</translation>
+        <translation type="obsolete">MuzA: załaduj ustawienie</translation>
     </message>
     <message>
-        <location line="+66"/>
         <source>MusE: save preset</source>
-        <translation>MuzA: zapisz ustawienie</translation>
+        <translation type="obsolete">MuzA: zapisz ustawienie</translation>
     </message>
     <message>
-        <location line="-635"/>
         <source>File Buttons</source>
-        <translation>Przyciski Menu Plik</translation>
+        <translation type="obsolete">Przyciski Menu Plik</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Load Preset</source>
-        <translation>Załaduj Ustawienie</translation>
+        <translation type="obsolete">Załaduj Ustawienie</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Save Preset</source>
-        <translation>Zapisz ustawienie</translation>
-    </message>
-    <message>
-        <location line="+588"/>
-        <source>Error reading preset. Might not be right type for this plugin</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Zapisz ustawienie</translation>
     </message>
 </context>
 <context>
@@ -13115,19 +15755,14 @@ currently not used</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../../muse/helper.cpp" line="-49"/>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/functions.cpp" line="+242"/>
-        <location line="+159"/>
+        <location filename="../../muse/functions.cpp" line="+244"/>
+        <location line="+160"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-159"/>
-        <location line="+159"/>
+        <location line="-160"/>
+        <location line="+160"/>
         <source>Please first select the range for crescendo with the loop markers.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13135,8 +15770,8 @@ currently not used</source>
 <context>
     <name>QWidget</name>
     <message>
-        <location filename="../../muse/instruments/minstrument.cpp" line="+72"/>
-        <location filename="../../muse/liste/editevent.cpp" line="-410"/>
+        <location filename="../../muse/instruments/minstrument.cpp" line="+73"/>
+        <location filename="../../muse/liste/editevent.cpp" line="-418"/>
         <source>Cannot convert sysex string</source>
         <translation type="unfinished">Nie można przekonwertować łańcucha sysex</translation>
     </message>
@@ -13147,17 +15782,17 @@ currently not used</source>
         <translation type="unfinished">�ańcuch Hex za długi (limit 2048 bajtów)</translation>
     </message>
     <message>
-        <location filename="../../muse/miditransform.cpp" line="+92"/>
+        <location filename="../../muse/miditransform.cpp" line="-231"/>
         <source>new</source>
         <translation>nowy</translation>
     </message>
     <message>
-        <location filename="../../muse/wave.cpp" line="-677"/>
+        <location filename="../../muse/wave.cpp" line="-1006"/>
         <source>create peakfile for </source>
         <translation type="unfinished">stwórz plik szczytu dla</translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/filedialog.cpp" line="+80"/>
+        <location filename="../../muse/widgets/filedialog.cpp" line="+81"/>
         <source>MusE: get file name</source>
         <translation>MuzA: weź nazwę pliku</translation>
     </message>
@@ -13182,7 +15817,15 @@ utworzyć?</translation>
         <translation type="obsolete">Anuluj</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+1"/>
+        <source>The directory
+%1
+does not exist.
+Create it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>MusE: create directory</source>
         <translation>MuzA: utwórz katalog</translation>
     </message>
@@ -13192,10 +15835,23 @@ utworzyć?</translation>
         <translation>tworzenie katalogu nie powiodło się</translation>
     </message>
     <message>
-        <location line="+396"/>
+        <location line="+399"/>
+        <source>File
+%1
+exists. Overwrite?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Open File
+%1
+failed: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>File
 </source>
-        <translation>Plik</translation>
+        <translation type="obsolete">Plik</translation>
     </message>
     <message>
         <source>
@@ -13203,7 +15859,7 @@ exists</source>
         <translation type="obsolete">istnieje</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="-19"/>
         <source>MusE: write</source>
         <translation type="unfinished">MuzA: zapis:</translation>
     </message>
@@ -13216,25 +15872,23 @@ exists</source>
         <translation type="obsolete">Wyjdź</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Open File
 </source>
-        <translation>Otwórz plik</translation>
+        <translation type="obsolete">Otwórz plik</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>
 failed: </source>
-        <translation>nie udane</translation>
+        <translation type="obsolete">nie udane</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+20"/>
         <source>MusE: Open File</source>
         <translation>MuzA: Otwórz plik</translation>
     </message>
     <message>
-        <location filename="../../muse/route.cpp" line="+1041"/>
-        <location line="+37"/>
+        <location filename="../../muse/route.cpp" line="+792"/>
+        <location line="+25"/>
         <source>None</source>
         <translation>Brak</translation>
     </message>
@@ -13244,29 +15898,10 @@ failed: </source>
         <translation>generyczne midi</translation>
     </message>
     <message>
-        <location filename="../../muse/waveedit/waveview.cpp" line="+632"/>
+        <location filename="../../muse/waveedit/waveview.cpp" line="-374"/>
         <source>No selection. Ignoring</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../../muse/widgets/filedialog.cpp" line="-440"/>
-        <source>The directory
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>
-does not exist.
-Create it?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+404"/>
-        <source>
-exists. Overwrite?</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QuantBase</name>
@@ -13342,7 +15977,12 @@ exists. Overwrite?</source>
     </message>
     <message>
         <location line="+5"/>
-        <source>Quarter</source>
+        <source>4th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>4th Triplet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -13352,15 +15992,30 @@ exists. Overwrite?</source>
     </message>
     <message>
         <location line="+5"/>
+        <source>8th Triplet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>16th</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
+        <source>16th Triplet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>32th</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
+        <source>32th Triplet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+8"/>
         <source>Swing:</source>
         <translation type="unfinished"></translation>
@@ -13974,296 +16629,50 @@ Losowy Generator Rytmu jeszcze nie jest udostępniony!</translation>
     </message>
 </context>
 <context>
-    <name>ScoreCanvas</name>
-    <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="+1245"/>
-        <source>Treble</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Bass</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Grand Staff</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Remove staff</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2467"/>
-        <source>Ambiguous part</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There are two or more possible parts you could add the note to, but none matches the selected part. Please select the destination part by clicking on any note belonging to it and try again, or add a new stave containing only the destination part.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>No part</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There are no parts you could add the note to.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>ScoreEdit</name>
     <message>
-        <location line="-3493"/>
-        <source>Undo/Redo tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Step recording tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Step Record</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
         <source>panic</source>
-        <translation type="unfinished">Zatrzymaj wszystkie komunikaty midi!</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>transport</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Note settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Note length:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>last</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+37"/>
-        <source>Velocity:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Off-Velocity:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>Quantisation settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Quantisation:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>Pixels per whole:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+9"/>
-        <source>&amp;Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>C&amp;ut</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Zatrzymaj wszystkie komunikaty midi!</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Copy</source>
-        <translation type="unfinished">&amp;Kopiuj</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Copy events in range</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&amp;Kopiuj</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Paste</source>
-        <translation type="unfinished">&amp;Wklej</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Paste (with dialog)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Delete &amp;Events</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&amp;Wklej</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>&amp;Select</source>
-        <translation type="unfinished">&amp;Zaznacz</translation>
+        <translation type="obsolete">&amp;Zaznacz</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Select &amp;All</source>
-        <translation type="unfinished">Zaznacz &amp;wszystko</translation>
+        <translation type="obsolete">Zaznacz &amp;wszystko</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Deselect All</source>
-        <translation type="unfinished">&amp;Odznacz wszystko</translation>
+        <translation type="obsolete">&amp;Odznacz wszystko</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Invert &amp;Selection</source>
-        <translation type="unfinished">Odwróć &amp;zaznaczenie</translation>
+        <translation type="obsolete">Odwróć &amp;zaznaczenie</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>&amp;Inside Loop</source>
-        <translation type="unfinished">&amp;Pomiędzy lokatorami.</translation>
+        <translation type="obsolete">&amp;Pomiędzy lokatorami.</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Outside Loop</source>
-        <translation type="unfinished">&amp;Poza obrębem lokatorów</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Fu&amp;nctions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>&amp;Quantize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Change note &amp;length</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Change note &amp;velocity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Crescendo/Decrescendo</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&amp;Poza obrębem lokatorów</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Transpose</source>
-        <translation type="unfinished">Transponuj</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Erase Events</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Move Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Transponuj</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Set Fixed Length</source>
-        <translation type="unfinished">Ustaw stałą długość nut</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Delete Overlaps</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Legato</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Note head &amp;colors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>&amp;Black</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>&amp;Velocity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>&amp;Part</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Set up &amp;preamble</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Display &amp;key signature</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Display &amp;time signature</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Set Score &amp;name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+216"/>
-        <location line="+1"/>
-        <source>Enter the new score title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Changing score title failed:
-the selected title is not unique</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Ustaw stałą długość nut</translation>
     </message>
 </context>
 <context>
@@ -14401,12 +16810,12 @@ the selected title is not unique</source>
         <translation>Konfiguruj Skróty Klawiaturowe</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>Shortcut Category</source>
         <translation>Kategoria Skrótu</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+24"/>
         <source>Description</source>
         <translation>Opis</translation>
     </message>
@@ -14416,7 +16825,7 @@ the selected title is not unique</source>
         <translation>Skrót</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+35"/>
         <source>&amp;Clear</source>
         <translation>&amp;Wyczyść</translation>
     </message>
@@ -14482,97 +16891,8 @@ the selected title is not unique</source>
 <context>
     <name>Song</name>
     <message>
-        <location filename="../../muse/song.cpp" line="+2412"/>
-        <source>Jack shutdown!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Jack has detected a performance problem which has lead to
-MusE being disconnected.
-This could happen due to a number of reasons:
-- a performance issue with your particular setup.
-- a bug in MusE (or possibly in another connected software).
-- a random hiccup which might never occur again.
-- jack was voluntary stopped by you or someone else
-- jack crashed
-If there is a persisting problem you are much welcome to discuss it
-on the MusE mailinglist.
-(there is information about joining the mailinglist on the MusE
- homepage which is available through the help menu)
-
-To proceed check the status of Jack and try to restart it and then .
-click on the Restart button.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+198"/>
-        <source>previous event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>next event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <location line="+183"/>
-        <source>set event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-181"/>
-        <location line="+183"/>
-        <source>add event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-179"/>
-        <location line="+184"/>
-        <source>erase event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-180"/>
-        <source>erase range</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>clear automation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+33"/>
-        <source>Clear all controller events?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
         <source>&amp;Ok</source>
-        <translation type="unfinished">&amp;Akceptuj</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1134"/>
-        <source>MusE - external script failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>MusE was unable to launch the script, error message:
- </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-1200"/>
-        <source>Automation:</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&amp;Akceptuj</translation>
     </message>
 </context>
 <context>
@@ -14611,12 +16931,11 @@ click on the Restart button.</source>
 <context>
     <name>SynthConfigBase</name>
     <message>
-        <location filename="../../muse/widgets/synthconfigbase.ui" line="+14"/>
         <source>MusE: Synth Configuration</source>
-        <translation>MuzA: Konfiguracja Syntezatora Softowego</translation>
+        <translation type="obsolete">MuzA: Konfiguracja Syntezatora Softowego</translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location filename="../../muse/widgets/synthconfigbase.ui" line="+94"/>
         <source>Soft Synthesizer</source>
         <translation>Syntezator Softowy</translation>
     </message>
@@ -14626,18 +16945,18 @@ click on the Restart button.</source>
         <translation>Plik</translation>
     </message>
     <message>
-        <location line="-115"/>
+        <location line="-120"/>
         <source>Instances</source>
         <translation>UrzÄ…dzenia</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location line="+115"/>
+        <location line="+125"/>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
     <message>
-        <location line="-17"/>
+        <location line="-22"/>
         <source>list of available software synthesizers</source>
         <translation>lista wszystkich dostępnych syntezatorów softowych</translation>
     </message>
@@ -14657,12 +16976,23 @@ click on the Restart button.</source>
         <translation>Port Midi</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="-26"/>
+        <source>Midi Port and Soft Synth Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location line="+110"/>
+        <source>Type</source>
+        <translation type="unfinished">Typ</translation>
+    </message>
+    <message>
+        <location line="-67"/>
         <source>Midi connections</source>
         <translation>Połączenia midi</translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="+72"/>
         <source>Inst</source>
         <translation>Instr.</translation>
     </message>
@@ -14763,9 +17093,8 @@ click on the Restart button.</source>
 <context>
     <name>TempoSig</name>
     <message>
-        <location filename="../../muse/transport.cpp" line="+103"/>
         <source>Tempo/Sig</source>
-        <translation>Tempo/Metrum</translation>
+        <translation type="obsolete">Tempo/Metrum</translation>
     </message>
 </context>
 <context>
@@ -14810,74 +17139,8 @@ click on the Restart button.</source>
 <context>
     <name>TopWin</name>
     <message>
-        <location filename="../../muse/cobject.cpp" line="+61"/>
-        <source>As subwindow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Shares tools and menu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Fullscreen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+418"/>
-        <source>Piano roll</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>List editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Drum editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Master track editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Master track list editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Wave editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Clip list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Marker view</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Score editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
         <source>Arranger</source>
-        <translation type="unfinished">Główne Okno</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>&lt;unknown toplevel type&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Główne Okno</translation>
     </message>
 </context>
 <context>
@@ -14894,158 +17157,116 @@ click on the Restart button.</source>
 <context>
     <name>Transport</name>
     <message>
-        <location filename="../../muse/transport.cpp" line="+150"/>
-        <location line="+3"/>
         <source>Punch In</source>
-        <translation>WÅ‚Ä…cz wcinki (punch In)</translation>
+        <translation type="obsolete">WÅ‚Ä…cz wcinki (punch In)</translation>
     </message>
     <message>
-        <location line="-2"/>
-        <location line="+3"/>
         <source>Loop</source>
-        <translation>Pętla</translation>
+        <translation type="obsolete">Pętla</translation>
     </message>
     <message>
-        <location line="-2"/>
-        <location line="+3"/>
         <source>Punch Out</source>
-        <translation>Wył. wcinki (punch out)</translation>
+        <translation type="obsolete">Wył. wcinki (punch out)</translation>
     </message>
     <message>
-        <location line="+33"/>
         <source>Left Mark</source>
-        <translation>Lewy Lokator</translation>
+        <translation type="obsolete">Lewy Lokator</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Right Mark</source>
-        <translation>Prawy Lokator</translation>
+        <translation type="obsolete">Prawy Lokator</translation>
     </message>
     <message>
-        <location line="-95"/>
         <source>Overdub</source>
-        <translation>Dogrywanie</translation>
+        <translation type="obsolete">Dogrywanie</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+15"/>
         <source>Replace</source>
-        <translation>Zastępowania</translation>
+        <translation type="obsolete">Zastępowania</translation>
     </message>
     <message>
-        <location line="-10"/>
         <source>Rec Mode</source>
-        <translation>Typ Nagrywania</translation>
+        <translation type="obsolete">Typ Nagrywania</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Normal</source>
-        <translation>Normalny</translation>
+        <translation type="obsolete">Normalny</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Mix</source>
-        <translation>Miks</translation>
+        <translation type="obsolete">Miks</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Cycle Rec</source>
-        <translation>Zapętl nagrywanie</translation>
+        <translation type="obsolete">Zapętl nagrywanie</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>punchin</source>
-        <translation>włącz wcinki (punch In)</translation>
+        <translation type="obsolete">włącz wcinki (punch In)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>loop</source>
-        <translation>pętla</translation>
+        <translation type="obsolete">pętla</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>punchout</source>
-        <translation>wył. wcinki (punch out)punchout</translation>
+        <translation type="obsolete">wył. wcinki (punch out)punchout</translation>
     </message>
     <message>
-        <location line="+101"/>
         <source>rewind to start</source>
-        <translation>przewiń do początku</translation>
+        <translation type="obsolete">przewiń do początku</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>rewind</source>
-        <translation>przewijaj do tyłu</translation>
+        <translation type="obsolete">przewijaj do tyłu</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>forward</source>
-        <translation>przewijaj do przodu</translation>
+        <translation type="obsolete">przewijaj do przodu</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>stop</source>
-        <translation>stop</translation>
+        <translation type="obsolete">stop</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>play</source>
-        <translation>odtwarzanie</translation>
+        <translation type="obsolete">odtwarzanie</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>record</source>
-        <translation>nagrywanie</translation>
+        <translation type="obsolete">nagrywanie</translation>
     </message>
     <message>
-        <location line="+28"/>
         <source>AC</source>
-        <translation>Aut. Kw.</translation>
+        <translation type="obsolete">Aut. Kw.</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>quantize during record</source>
-        <translation>kwantyzuj podczas nagrywania</translation>
+        <translation type="obsolete">kwantyzuj podczas nagrywania</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Click</source>
-        <translation>Metronom</translation>
+        <translation type="obsolete">Metronom</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>metronom click on/off</source>
-        <translation>włącz/wyłącz metronom</translation>
+        <translation type="obsolete">włącz/wyłącz metronom</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Sync</source>
-        <translation>Synch.</translation>
+        <translation type="obsolete">Synch.</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>external sync on/off</source>
-        <translation>synchronizowanie do zewn. urz.</translation>
+        <translation type="obsolete">synchronizowanie do zewn. urz.</translation>
     </message>
     <message>
-        <location line="+45"/>
         <source>Master</source>
-        <translation>Åšlad Tempo/Metrum</translation>
+        <translation type="obsolete">Åšlad Tempo/Metrum</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>use master track</source>
-        <translation>Używaj śladu tempo/metrum</translation>
-    </message>
-    <message>
-        <location line="-43"/>
-        <source>Jack</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Jack transport sync on/off</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Używaj śladu tempo/metrum</translation>
     </message>
 </context>
 <context>
@@ -15482,14 +17703,12 @@ Robert Jonsson
         <translation type="obsolete">Narzędzia audio</translation>
     </message>
     <message>
-        <location filename="../../muse/waveedit/waveedit.cpp" line="+196"/>
         <source>Solo</source>
-        <translation>Solo</translation>
+        <translation type="obsolete">Solo</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Cursor</source>
-        <translation>Kursor</translation>
+        <translation type="obsolete">Kursor</translation>
     </message>
     <message>
         <source>&amp;File</source>
@@ -15500,192 +17719,246 @@ Robert Jonsson
         <translation type="obsolete">Opcje</translation>
     </message>
     <message>
-        <location line="-115"/>
-        <source>&amp;Edit</source>
-        <translation type="unfinished"></translation>
+        <source>200%</source>
+        <translation type="obsolete">200%</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Func&amp;tions</source>
-        <translation type="unfinished"></translation>
+        <source>150%</source>
+        <translation type="obsolete">150%</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>&amp;Gain</source>
-        <translation type="unfinished"></translation>
+        <source>75%</source>
+        <translation type="obsolete">75%</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>200%</source>
-        <translation type="unfinished">200%</translation>
+        <source>50%</source>
+        <translation type="obsolete">50%</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>150%</source>
-        <translation type="unfinished">150%</translation>
+        <source>25%</source>
+        <translation type="obsolete">25%</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>75%</source>
-        <translation type="unfinished">75%</translation>
+        <source>&amp;Copy</source>
+        <translation type="obsolete">&amp;Kopiuj</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>50%</source>
-        <translation type="unfinished">50%</translation>
+        <source>&amp;Paste</source>
+        <translation type="obsolete">&amp;Wklej</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>25%</source>
-        <translation type="unfinished">25%</translation>
+        <source>Select &amp;All</source>
+        <translation type="obsolete">Zaznacz &amp;wszystko</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Other</source>
+        <source>&amp;Deselect All</source>
+        <translation type="obsolete">&amp;Odznacz wszystko</translation>
+    </message>
+</context>
+<context>
+    <name>WaveTrackInfoBase</name>
+    <message>
+        <source>MusE: TrackInfo</source>
+        <translation type="obsolete">MuzA: Info o śladzie</translation>
+    </message>
+    <message>
+        <source>Track Info</source>
+        <translation type="obsolete">Info o śladzie</translation>
+    </message>
+    <message>
+        <source>Track Name</source>
+        <translation type="obsolete">Nazwa Åšladu</translation>
+    </message>
+    <message>
+        <source>Output Route:</source>
+        <translation type="obsolete">połączenie Wyjścia</translation>
+    </message>
+    <message>
+        <source>Input Route:</source>
+        <translation type="obsolete">połączenie wejścia</translation>
+    </message>
+    <message>
+        <source>Ports:</source>
+        <translation type="obsolete">Porty</translation>
+    </message>
+    <message>
+        <source>Mono</source>
+        <translation type="obsolete">Mono</translation>
+    </message>
+    <message>
+        <source>Stereo</source>
+        <translation type="obsolete">Stereo</translation>
+    </message>
+</context>
+<context>
+    <name>file_patterns</name>
+    <message>
+        <location filename="../../muse/globals.cpp" line="+120"/>
+        <source>Midi/Kar (*.mid *.MID *.kar *.KAR *.mid.gz *.mid.bz2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>&amp;Copy</source>
-        <translation type="unfinished">&amp;Kopiuj</translation>
+        <location line="+1"/>
+        <source>Midi (*.mid *.MID *.mid.gz *.mid.bz2)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>C&amp;ut</source>
+        <location line="+1"/>
+        <source>Karaoke (*.kar *.KAR *.kar.gz *.kar.bz2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>&amp;Paste</source>
-        <translation type="unfinished">&amp;Wklej</translation>
+        <location line="+1"/>
+        <location line="+24"/>
+        <location line="+11"/>
+        <location line="+7"/>
+        <location line="+9"/>
+        <location line="+15"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+8"/>
+        <location line="+6"/>
+        <location line="+8"/>
+        <location line="+8"/>
+        <source>All Files (*)</source>
+        <translation type="unfinished">Wszystkie Pliki (*)</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Edit in E&amp;xternal Editor</source>
+        <location line="-95"/>
+        <source>Midi (*.mid)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Mute Selection</source>
+        <location line="+1"/>
+        <source>Karaoke (*.kar)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Normalize Selection</source>
+        <location line="+6"/>
+        <source>all known files (*.med *.med.gz *.med.bz2 *.mid *.midi *.kar)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Fade In Selection</source>
+        <location line="+1"/>
+        <source>med Files (*.med *.med.gz *.med.bz2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Fade Out Selection</source>
+        <location line="+1"/>
+        <location line="+8"/>
+        <source>Uncompressed med Files (*.med)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Reverse Selection</source>
+        <location line="-7"/>
+        <location line="+8"/>
+        <source>gzip compressed med Files (*.med.gz)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Select</source>
+        <location line="-7"/>
+        <location line="+8"/>
+        <source>bzip2 compressed med Files (*.med.bz2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Select &amp;All</source>
-        <translation type="unfinished">Zaznacz &amp;wszystko</translation>
+        <location line="-7"/>
+        <source>mid Files (*.mid *.midi *.kar *.MID *.MIDI *.KAR)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>&amp;Deselect All</source>
-        <translation type="unfinished">&amp;Odznacz wszystko</translation>
+        <location line="+13"/>
+        <source>(*.jpg *.gif *.png)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Window &amp;Config</source>
+        <location line="+1"/>
+        <source>(*.jpg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Wave edit tools</source>
+        <location line="+1"/>
+        <source>(*.gif)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>transport</source>
+        <location line="+1"/>
+        <source>(*.png)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>WaveEdit tools</source>
+        <location line="+15"/>
+        <source>part Files (*.mpt *.mpt.gz *.mpt.bz2)</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WaveTrackInfoBase</name>
     <message>
-        <source>MusE: TrackInfo</source>
-        <translation type="obsolete">MuzA: Info o śladzie</translation>
+        <location line="+5"/>
+        <source>part Files (*.mpt)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Track Info</source>
-        <translation type="obsolete">Info o śladzie</translation>
+        <location line="+1"/>
+        <source>gzip compressed part Files (*.mpt.gz)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Track Name</source>
-        <translation type="obsolete">Nazwa Åšladu</translation>
+        <location line="+1"/>
+        <source>bzip2 compressed part Files (*.mpt.bz2)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Output Route:</source>
-        <translation type="obsolete">połączenie Wyjścia</translation>
+        <location line="+14"/>
+        <source>Presets (*.pre *.pre.gz *.pre.bz2)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Input Route:</source>
-        <translation type="obsolete">połączenie wejścia</translation>
+        <location line="+6"/>
+        <source>Presets (*.pre)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ports:</source>
-        <translation type="obsolete">Porty</translation>
+        <location line="+1"/>
+        <source>gzip compressed presets (*.pre.gz)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mono</source>
-        <translation type="obsolete">Mono</translation>
+        <location line="+1"/>
+        <source>bzip2 compressed presets (*.pre.bz2)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stereo</source>
-        <translation type="obsolete">Stereo</translation>
+        <location line="+6"/>
+        <source>Presets (*.map *.map.gz *.map.bz2)</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WaveView</name>
     <message>
-        <location filename="../../muse/waveedit/waveview.cpp" line="+359"/>
-        <source>MusE - external editor failed</source>
+        <location line="+6"/>
+        <source>Presets (*.map)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>MusE was unable to launch the external editor
-check if the editor setting in:
-Global Settings-&gt;Audio:External Waveditor
-is set to a valid editor.</source>
+        <source>gzip compressed presets (*.map.gz)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>MusE - file size changed</source>
+        <location line="+1"/>
+        <source>bzip2 compressed presets (*.map.bz2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Wave/Binary (*.wav *.ogg *.bin)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>When editing in external editor - you should not change the filesize
-since it must fit the selected region.
-
-Missing data is muted</source>
+        <source>Wave (*.wav *.ogg)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Binary (*.bin)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -15978,4 +18251,878 @@ Missing data is muted</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>shortcuts</name>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="+54"/>
+        <source>Transport: Start playback from current location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Toggle metronome</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Stop Playback</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Goto Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Play, Stop, Rewind</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Goto left marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Goto right marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Toggle Loop section</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Toggle Record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Clear all rec enabled tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Toggle fullscreen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit: Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Copy in range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Redo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Paste (with dialog)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>File: New project</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>File: Open from disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>File: Save project</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>File: Open recent file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>File: Save as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>File: Load template</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>File: Import midi file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>File: Export midi file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>File: Import midi part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>File: Import audio file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>File: Quit MusE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit: Select parts on track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Open pianoroll</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Open drumeditor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Open listeditor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Open waveeditor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Open graphical mastertrack editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Open list mastertrack editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Open midi transformer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add midi track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add drum track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add wave track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add audio output</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add audio group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add audio input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add audio aux</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Structure: Global cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Structure: Global insert</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Structure: Global split</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Structure: Cut events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>View: Open mixer #1 window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>View: Open mixer #2 window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>View: Toggle transport window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>View: Toggle bigtime window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>View: Open marker window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Settings: Follow song by page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Follow song off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Follow song continuous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Settings: Global configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Configure shortcuts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Configure metronome</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Midi sync configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Midi file import/export configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Appearance settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Midi ports / Soft Synth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Audio subsystem configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Midi: Edit midi instruments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi: Open midi input transform</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi: Open midi input filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi: Midi input transpose</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi: Midi remote control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Midi: Random rhythm generator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Midi: Reset midi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi: Init midi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi: Midi local off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Audio: Bounce audio to track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Audio: Bounce audio to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Audio: Restart audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Automation: Mixer automation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Automation: Take mixer snapshot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Automation: Clear mixer automation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Help: Open Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Help: Toggle whatsthis mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit: Edit selected part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select nearest part on track above</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Add nearest part on track above</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select nearest part on track below</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Add nearest part on track below</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit: Insert empty measure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit: Paste as clones</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Paste as clones (with dialog)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select track above</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Select track below</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Midi: Transpose</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit: Select all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select none</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Invert Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select events/parts inside locators</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select events/parts outside locators</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select previous part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select next part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select nearest part/event to the left or move cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Add nearest part/event to the left to selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select nearest part/event to the right or move cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Add nearest part/event to the right to selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Set locators to selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Increase pitch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Decrease pitch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Increase event position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Decrease event position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>View: Zoom in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>View: Zoom out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>View: Goto Current Position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+1"/>
+        <source>View: Scroll left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Edit: Set Fixed Length on Midi Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Quantize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Modify Note Length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Modify Velocity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Crescendo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Thin Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Erase Event</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Delete Overlaps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Note Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Move Clock</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Copy Measure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Erase Measure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Delete Measure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Create Measure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Change Event Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool: Pointer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tool: Pencil</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tool: Eraser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Tool: Line Draw</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Tool: Cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add note velocity 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add note velocity 2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add note velocity 3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add note velocity 4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cursor step size: larger</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cursor step size: smaller</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Instrument/Cursor up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Instrument/Cursor down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Tool: Scissor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tool: Glue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tool: Mute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Transport: Increase current position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Decrease current position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Transport: Increase current position, no snap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Decrease current position, no snap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Quantize: Set quantize to 1/1 note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantize: Set quantize to 1/2 note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantize: Set quantize to 1/4 note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantize: Set quantize to 1/8 note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantize: Set quantize to 1/16 note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantize: Set quantize to 1/32 note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantize: Set quantize to 1/64 note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Quantize: Toggle triol quantization</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantize: Toggle punctuation quantization</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantize: Toggle punctuation quantization (2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Insert at location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit: Increase length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Decrease length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Insert Note</source>
+        <translation type="unfinished">Wstaw nutÄ™</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert SysEx</source>
+        <translation type="unfinished">wstaw SysEx</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert Ctrl</source>
+        <translation type="unfinished">Wstaw kontroler</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert Meta</source>
+        <translation type="unfinished">Wstaw Meta</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert Channel Aftertouch</source>
+        <translation type="unfinished">Wstaw zmianę średniego nacisku pod uderzeniu (channel aftertouch)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert Key Aftertouch</source>
+        <translation type="unfinished">Wstaw pojedynczÄ… zmiane nacisku pod uderzeniu</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Insert Tempo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert Signature</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Change Event Position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit Event Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Goto Next Marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Goto Prev Marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/muse2/share/locale/muse_ru.ts b/muse2/share/locale/muse_ru.ts
index cffebe53..4510daa7 100644
--- a/muse2/share/locale/muse_ru.ts
+++ b/muse2/share/locale/muse_ru.ts
@@ -4,9 +4,8 @@
 <context>
     <name>@default</name>
     <message>
-        <location filename="../../muse/transport.cpp" line="+46"/>
         <source>Click this button to enable recording</source>
-        <translation>Щелкните по �той кнопке дл� активизации режима запи�и</translation>
+        <translation type="obsolete">Щелкните по �той кнопке дл� активизации режима запи�и</translation>
     </message>
     <message>
         <source>sets amount of quantization:
@@ -17,42 +16,36 @@
 100 - полное квантование</translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/tools.cpp" line="+33"/>
         <source>select Pointer Tool:
 with the pointer tool you can:
   select parts
   move parts
   copy parts</source>
-        <translation>выбрать ин�трумент &quot;Указатель&quot;:
+        <translation type="obsolete">выбрать ин�трумент &quot;Указатель&quot;:
 при помощи указател� можно:
   выдел�ть партии(new line)
   перемещать партии(new line)
   копировать партии</translation>
     </message>
     <message>
-        <location filename="../../muse/transport.cpp" line="+1"/>
         <source>Click this button to stop playback</source>
-        <translation>Щелкните по �той кнопке дл� о�тановки во�произведени�</translation>
+        <translation type="obsolete">Щелкните по �той кнопке дл� о�тановки во�произведени�</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Click this button to start playback</source>
-        <translation>Щелкните по �той кнопке, чтобы начать во�произведение</translation>
+        <translation type="obsolete">Щелкните по �той кнопке, чтобы начать во�произведение</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Click this button to rewind to start position</source>
-        <translation>Щелкните по �той кнопке дл� перемещени� к началу</translation>
+        <translation type="obsolete">Щелкните по �той кнопке дл� перемещени� к началу</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Click this button to rewind</source>
-        <translation>Щелкните по �той кнопке дл� перемотки назад</translation>
+        <translation type="obsolete">Щелкните по �той кнопке дл� перемотки назад</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Click this button to forward current play position</source>
-        <translation>Щелкните по �той кнопке дл� перемещени� вперёд</translation>
+        <translation type="obsolete">Щелкните по �той кнопке дл� перемещени� вперёд</translation>
     </message>
     <message>
         <source>don&apos;t quantize notes above this tick limit</source>
@@ -63,201 +56,144 @@ with the pointer tool you can:
         <translation type="obsolete">также квантовать длительно�ть нот по умолчанию</translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="+89"/>
         <source>Click this button to open a &lt;em&gt;new song&lt;/em&gt;.&lt;br&gt;You can also select the &lt;b&gt;Open command&lt;/b&gt; from the File menu.</source>
-        <translation>Щелкните по �той кнопке дл� открыти� другого проекта. Вы также можете выбрать пункт Открыть в меню &quot;Файл&quot;.</translation>
+        <translation type="obsolete">Щелкните по �той кнопке дл� открыти� другого проекта. Вы также можете выбрать пункт Открыть в меню &quot;Файл&quot;.</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Click this button to save the song you are editing.  You will be prompted for a file name.
 You can also select the Save command from the File menu.</source>
-        <translation>Щелкните по �той кнопке дл� �охранени� проекта.  Будет предложено вве�ти им� файла.
+        <translation type="obsolete">Щелкните по �той кнопке дл� �охранени� проекта.  Будет предложено вве�ти им� файла.
 Вы также можете выбрать пункт &quot;Сохранить&quot; в меню &quot;Файл&quot;.</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Create New Song</source>
-        <translation>Создать новый проект</translation>
+        <translation type="obsolete">Создать новый проект</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>loop between left mark and right mark</source>
-        <translation>цикл между левым и правым маркерами</translation>
+        <translation type="obsolete">цикл между левым и правым маркерами</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>record starts at left mark</source>
-        <translation>запи�ь начинает�� � левого маркера</translation>
+        <translation type="obsolete">запи�ь начинает�� � левого маркера</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>record stops at right mark</source>
-        <translation>запи�ь о�танавливает�� на правом маркере</translation>
+        <translation type="obsolete">запи�ь о�танавливает�� на правом маркере</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>rewind to start position</source>
-        <translation>перемотать к начальной позиции</translation>
+        <translation type="obsolete">перемотать к начальной позиции</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>rewind current position</source>
-        <translation>перемотать к текущей позиции</translation>
+        <translation type="obsolete">перемотать к текущей позиции</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>move current position</source>
-        <translation>переме�тить текущую позицию</translation>
+        <translation type="obsolete">переме�тить текущую позицию</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>stop sequencer</source>
-        <translation>о�тановить �еквен�ер</translation>
+        <translation type="obsolete">о�тановить �еквен�ер</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>start sequencer play</source>
-        <translation>начать во�произведение в �еквен�ере</translation>
+        <translation type="obsolete">начать во�произведение в �еквен�ере</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>to record press record and then play</source>
-        <translation>чтобы начать запи�ь нажмите &quot;запи�ь&quot;, а затем &quot;во�произве�ти&quot;</translation>
+        <translation type="obsolete">чтобы начать запи�ь нажмите &quot;запи�ь&quot;, а затем &quot;во�произве�ти&quot;</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>send note off to all midi channels</source>
-        <translation>по�лать �ообщение &quot;note off&quot; на в�е midi-каналы</translation>
+        <translation type="obsolete">по�лать �ообщение &quot;note off&quot; на в�е midi-каналы</translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/tools.cpp" line="+5"/>
         <source>select Pencil Tool:
 with the pencil tool you can:
   create new parts
   modify length of parts</source>
-        <translation>выбрать ин�трумент &quot;Карандаш&quot;:
+        <translation type="obsolete">выбрать ин�трумент &quot;Карандаш&quot;:
 � помощью ин�трумента &quot;Карандаш&quot; вы можете:
   �оздавать новые партии
   измен�ть длину партий</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>select Delete Tool:
 with the delete tool you can delete parts</source>
-        <translation>выбрать ин�трумент &quot;Ла�тик&quot;:
+        <translation type="obsolete">выбрать ин�трумент &quot;Ла�тик&quot;:
 � помощью ин�трумента &quot;Ла�тик&quot; вы можете удал�ть партии</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>select Cut Tool:
 with the cut tool you can split a part</source>
-        <translation>выбрать ин�трумент &quot;�ожницы&quot;:(new line)
+        <translation type="obsolete">выбрать ин�трумент &quot;�ожницы&quot;:(new line)
 � помощью ин�трумента &quot;�ожницы&quot; вы можете разрезать партию</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>select Glue Tool:
 with the glue tool you can glue two parts</source>
-        <translation>выбрать ин�трумент &quot;Клей&quot;:
+        <translation type="obsolete">выбрать ин�трумент &quot;Клей&quot;:
 � помощью ин�трумента &quot;Клей&quot; вы можете �оединить две партии</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>select Score Tool:
 </source>
-        <translation>выбрать редактор партитур:
+        <translation type="obsolete">выбрать редактор партитур:
 </translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>select Quantize Tool:
 insert display quantize event</source>
-        <translation>выбрать ин�трумент &quot;Квантование&quot;:
+        <translation type="obsolete">выбрать ин�трумент &quot;Квантование&quot;:
 в�тавить отображение квантуемых �обытий</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>select Drawing Tool</source>
-        <translation>выбрать ин�трумент &quot;Ри�ование&quot;</translation>
+        <translation type="obsolete">выбрать ин�трумент &quot;Ри�ование&quot;</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>select Muting Tool:
 click on part to mute/unmute</source>
-        <translation>выбрать ин�трумент &quot;�е проигрывать партию (Заглушить)&quot;:
+        <translation type="obsolete">выбрать ин�трумент &quot;�е проигрывать партию (Заглушить)&quot;:
 Щелкните по партии, чтобы &quot;Проигрывать&quot; или &quot;�е проигрывать&quot; ее</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Manipulate automation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Cursor tool</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>pointer</source>
-        <translation>указатель</translation>
+        <translation type="obsolete">указатель</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>pencil</source>
-        <translation>карандаш</translation>
+        <translation type="obsolete">карандаш</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>cutter</source>
-        <translation>ножницы</translation>
+        <translation type="obsolete">ножницы</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>score</source>
-        <translation>партитура</translation>
+        <translation type="obsolete">партитура</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>glue</source>
-        <translation>клей</translation>
+        <translation type="obsolete">клей</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>quantize</source>
-        <translation>квантовать</translation>
+        <translation type="obsolete">квантовать</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>draw</source>
-        <translation>ри�овать</translation>
+        <translation type="obsolete">ри�овать</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>mute parts</source>
-        <translation>заглушить партии</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>edit automation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>cursor</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">заглушить партии</translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="+155"/>
-        <location filename="../../muse/master/masteredit.cpp" line="+155"/>
-        <location filename="../../muse/widgets/comboQuant.cpp" line="+40"/>
-        <location line="+1"/>
-        <location line="+1"/>
-        <location filename="../../muse/widgets/tb1.cpp" line="+48"/>
-        <location line="+1"/>
-        <location line="+1"/>
         <source>Off</source>
-        <translation>Выкл</translation>
+        <translation type="obsolete">Выкл</translation>
     </message>
     <message>
         <source>presets (*.pre *.pre.gz *.pre.bz2)</source>
@@ -268,232 +204,160 @@ click on part to mute/unmute</source>
         <translation type="obsolete">В�е файлы (*)</translation>
     </message>
     <message>
-        <location filename="../../muse/helper.cpp" line="+285"/>
+        <location filename="../../muse/helper.cpp" line="+185"/>
         <source>Add Midi Track</source>
         <translation type="unfinished">Добавить Midi Трек</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>Add Drum Track</source>
         <translation type="unfinished">Добавить трек � ударными</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>Add Wave Track</source>
         <translation type="unfinished">Добавить wave-трек</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+7"/>
         <source>Add Audio Output</source>
         <translation type="unfinished">Добавить аудиовыход</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+7"/>
         <source>Add Audio Group</source>
         <translation type="unfinished">Добавить аудиогруппу</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+7"/>
         <source>Add Audio Input</source>
         <translation type="unfinished">Добавить аудиовход</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+7"/>
         <source>Add Aux Send</source>
         <translation type="unfinished">Добавить Aux по�ыл</translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/tools.cpp" line="-8"/>
         <source>eraser</source>
-        <translation>ла�тик</translation>
+        <translation type="obsolete">ла�тик</translation>
     </message>
     <message>
-        <location filename="../../muse/helper.cpp" line="-67"/>
         <source>MESS</source>
-        <translation type="unfinished">MESS</translation>
+        <translation type="obsolete">MESS</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>DSSI</source>
-        <translation type="unfinished">DSSI</translation>
+        <translation type="obsolete">DSSI</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>FST</source>
-        <translation type="unfinished">FST</translation>
+        <translation type="obsolete">FST</translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+9"/>
         <source>Add Synth</source>
         <translation>Добавить �интезатор</translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="+0"/>
         <source>Bar</source>
-        <translation>Такт</translation>
+        <translation type="obsolete">Такт</translation>
     </message>
     <message>
-        <location filename="../../muse/confmport.cpp" line="+729"/>
         <source> Jack</source>
-        <translation> Jack</translation>
+        <translation type="obsolete"> Jack</translation>
     </message>
     <message>
-        <location line="+46"/>
         <source>ALSA:</source>
-        <translation>ALSA:</translation>
+        <translation type="obsolete">ALSA:</translation>
     </message>
     <message>
-        <location line="+26"/>
         <source>SYNTH:</source>
-        <translation>SYNTH:</translation>
+        <translation type="obsolete">SYNTH:</translation>
     </message>
     <message>
-        <location line="+26"/>
         <source>JACK:</source>
-        <translation>JACK:</translation>
+        <translation type="obsolete">JACK:</translation>
     </message>
     <message>
-        <location filename="../../muse/driver/alsamidi.cpp" line="+209"/>
-        <location filename="../../muse/driver/jackmidi.cpp" line="+290"/>
-        <location filename="../../muse/midiport.cpp" line="+1138"/>
-        <location filename="../../muse/track.cpp" line="+799"/>
-        <location line="+16"/>
-        <location line="+30"/>
+        <location filename="../../muse/midiport.cpp" line="+1190"/>
         <source>Route</source>
         <translation>Маршрут</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location filename="../../muse/driver/jackmidi.cpp" line="+2"/>
-        <location filename="../../muse/track.cpp" line="-28"/>
-        <location line="+37"/>
         <source> channel=&quot;%1&quot;</source>
-        <translation> канал=&quot;%1&quot;</translation>
+        <translation type="obsolete"> канал=&quot;%1&quot;</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location filename="../../muse/driver/jackmidi.cpp" line="+3"/>
-        <location filename="../../muse/midiport.cpp" line="+7"/>
-        <location filename="../../muse/track.cpp" line="-48"/>
-        <location line="+60"/>
+        <location line="+7"/>
         <source>dest</source>
         <translation>dest</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location filename="../../muse/driver/jackmidi.cpp" line="+2"/>
         <source> devtype=&quot;%1&quot;</source>
-        <translation> типУ�тр=&quot;%1&quot;</translation>
+        <translation type="obsolete"> типУ�тр=&quot;%1&quot;</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location filename="../../muse/driver/jackmidi.cpp" line="-20"/>
-        <location line="+23"/>
-        <location filename="../../muse/track.cpp" line="-42"/>
-        <location line="+48"/>
         <source> type=&quot;%1&quot;</source>
-        <translation> тип=&quot;%1&quot;</translation>
+        <translation type="obsolete"> тип=&quot;%1&quot;</translation>
     </message>
     <message>
         <location line="+1"/>
-        <location filename="../../muse/driver/jackmidi.cpp" line="-22"/>
-        <location line="+23"/>
-        <location filename="../../muse/midiport.cpp" line="+1"/>
-        <location filename="../../muse/track.cpp" line="-65"/>
-        <location line="+18"/>
-        <location line="+53"/>
         <source> name=&quot;%1&quot;/</source>
         <translation> им�=&quot;%1&quot;/</translation>
     </message>
     <message>
-        <location filename="../../muse/driver/jackmidi.cpp" line="-26"/>
-        <location filename="../../muse/track.cpp" line="-56"/>
         <source>source</source>
-        <translation>и�точник</translation>
+        <translation type="obsolete">и�точник</translation>
     </message>
     <message>
-        <location filename="../../muse/midictrl.cpp" line="+242"/>
         <source>Velocity</source>
-        <translation>Скоро�ть нажати�</translation>
+        <translation type="obsolete">Скоро�ть нажати�</translation>
+    </message>
+    <message>
+        <location line="-857"/>
+        <source>Warning: No output devices!</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/midiport.cpp" line="-807"/>
+        <location line="+5"/>
+        <source>Open midi config...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Empty ports</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>&lt;none&gt;</source>
         <translation>&lt;ничего&gt;</translation>
     </message>
     <message>
         <location line="+801"/>
-        <location filename="../../muse/track.cpp" line="-21"/>
-        <location line="+48"/>
         <source> channelMask=&quot;%1&quot;</source>
         <translation> Ма�каКанала=&quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="../../muse/osc.cpp" line="+1320"/>
         <source>dssi_synth</source>
-        <translation>dssi_synth</translation>
+        <translation type="obsolete">dssi_synth</translation>
     </message>
     <message>
-        <location line="+87"/>
         <source>ladspa_efx</source>
-        <translation>ladspa_efx</translation>
+        <translation type="obsolete">ladspa_efx</translation>
     </message>
     <message>
-        <location filename="../../muse/track.cpp" line="+8"/>
         <source> channels=&quot;%1&quot;</source>
-        <translation> каналы=&quot;%1&quot;</translation>
+        <translation type="obsolete"> каналы=&quot;%1&quot;</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source> remch=&quot;%1&quot;</source>
-        <translation> remch=&quot;%1&quot;</translation>
+        <translation type="obsolete"> remch=&quot;%1&quot;</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source> mport=&quot;%1&quot;/</source>
-        <translation> mport=&quot;%1&quot;/</translation>
-    </message>
-    <message>
-        <location filename="../../muse/widgets/visibletracks.cpp" line="+35"/>
-        <location line="+9"/>
-        <source>Show wave tracks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-8"/>
-        <location line="+9"/>
-        <source>Show group tracks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-8"/>
-        <location line="+9"/>
-        <source>Show aux tracks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-8"/>
-        <location line="+9"/>
-        <source>Show input tracks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-8"/>
-        <location line="+9"/>
-        <source>Show output tracks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-8"/>
-        <location line="+9"/>
-        <source>Show midi tracks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-8"/>
-        <location line="+9"/>
-        <source>Show synth tracks</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"> mport=&quot;%1&quot;/</translation>
     </message>
 </context>
 <context>
@@ -554,87 +418,61 @@ Published under the GNU Public License</source>
 <context>
     <name>Appearance</name>
     <message>
-        <location filename="../../muse/appearance.cpp" line="+769"/>
         <source>MusE: load image</source>
-        <translation>MusE: загрузить изображение</translation>
+        <translation type="obsolete">MusE: загрузить изображение</translation>
     </message>
     <message>
-        <location line="-639"/>
         <source>Main application font, and default font for any
  controls not defined here.</source>
-        <translation>Главный шрифт приложени�, и шрифт по умолчанию 
+        <translation type="obsolete">Главный шрифт приложени�, и шрифт по умолчанию 
 дл� в�ех �ред�тв управлени�, зде�ь не определены.</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>For small controls like mixer strips.
 Also timescale small numbers, arranger part name overlay,
  and effects rack.</source>
-        <translation>Дл� небольших �ред�тв контрол�, типа линеек микшера.
+        <translation type="obsolete">Дл� небольших �ред�тв контрол�, типа линеек микшера.
 Также дл� маленьких цифр на линейке времени, названий партий в компоновщике и р�ка �ффектов.</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Midi track info panel. Transport controls.</source>
-        <translation>Инфо-панель Midi-трека. Управление тран�портом.</translation>
+        <translation type="obsolete">Инфо-панель Midi-трека. Управление тран�портом.</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Controller graph and S/X buttons. Large numbers for time
  and tempo scale, and time signature.</source>
-        <translation>Диаграмма контроллера и S/X кнопки. Большие цифры дл�
+        <translation type="obsolete">Диаграмма контроллера и S/X кнопки. Большие цифры дл�
 линеек времени и темпа, а также дл� тактового размера.</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Time scale markers.</source>
-        <translation>Маркеры на линейке времени.</translation>
+        <translation type="obsolete">Маркеры на линейке времени.</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>List editor: meta event edit dialog multi-line edit box.</source>
-        <translation>Редактор �пи�ка: редактирование мета-�обыти� много�трочное окно редактировани�. </translation>
+        <translation type="obsolete">Редактор �пи�ка: редактирование мета-�обыти� много�трочное окно редактировани�. </translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Mixer label font. Auto-font-sizing up to chosen font size.
 Word-breaking but only with spaces.</source>
-        <translation>Шрифт метки микшера. �втоматиче�кое изменение размера шрифта до выбранного размера.
+        <translation type="obsolete">Шрифт метки микшера. �втоматиче�кое изменение размера шрифта до выбранного размера.
 Перено�ы только по пробелам.</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Maximum mixer label auto-font-sizing font size.</source>
-        <translation>Мак�имальный размер автоматиче�ки измен�ющего�� шрифта метки микшера.</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Global opacity (opposite of transparency).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Standard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Custom</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Мак�имальный размер автоматиче�ки измен�ющего�� шрифта метки микшера.</translation>
     </message>
     <message>
         <source>&lt;none&gt;</source>
         <translation type="obsolete">&lt;ничего&gt;</translation>
     </message>
     <message>
-        <location line="+958"/>
         <source>Select style sheet</source>
-        <translation>Выберите таблицу �тилей</translation>
+        <translation type="obsolete">Выберите таблицу �тилей</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Qt style sheets (*.qss)</source>
-        <translation>Таблицы �тилей Qt (*.qss)</translation>
+        <translation type="obsolete">Таблицы �тилей Qt (*.qss)</translation>
     </message>
 </context>
 <context>
@@ -1514,29 +1352,16 @@ Right-click to show GUI.</source>
 <context>
     <name>ClipListEdit</name>
     <message>
-        <location filename="../../muse/cliplist/cliplist.cpp" line="+127"/>
         <source>MusE: Clip List Editor</source>
-        <translation>MusE: Редактор �пи�ка фрагментов</translation>
+        <translation type="obsolete">MusE: Редактор �пи�ка фрагментов</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Undo/Redo tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
         <source>panic</source>
-        <translation type="unfinished">паника</translation>
+        <translation type="obsolete">паника</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>transport</source>
-        <translation type="unfinished">тран�порт</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">тран�порт</translation>
     </message>
 </context>
 <context>
@@ -1612,7 +1437,7 @@ Right-click to show GUI.</source>
         <translation type="obsolete">�а�троить �к�порт midi-файла</translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/configmidifilebase.ui" line="+193"/>
+        <location filename="../../muse/widgets/configmidifilebase.ui" line="+202"/>
         <source>&amp;OK</source>
         <translation>&amp;ОК</translation>
     </message>
@@ -1632,7 +1457,7 @@ Right-click to show GUI.</source>
         <translation>1 (не�колько треков)</translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-52"/>
         <source>Format:</source>
         <translation>Формат:</translation>
     </message>
@@ -1652,12 +1477,12 @@ Right-click to show GUI.</source>
         <translation>384</translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+64"/>
         <source>Division:</source>
         <translation>Деление(Division):</translation>
     </message>
     <message>
-        <location line="-20"/>
+        <location line="-36"/>
         <source>Copyright:</source>
         <translation>Copyright:</translation>
     </message>
@@ -1666,17 +1491,17 @@ Right-click to show GUI.</source>
         <translation type="obsolete">Разрешить ра�ширенный формат SMF</translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-91"/>
         <source>MusE: Config Midi File Import/Export</source>
         <translation>MusE: �а�троить Импорт/Эк�порт Midi-файла</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+15"/>
         <source>Import:</source>
         <translation>Импорт:</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+9"/>
         <source>Split tracks into &amp;parts</source>
         <translation>Разделить треки на &amp;партии</translation>
     </message>
@@ -1686,12 +1511,12 @@ Right-click to show GUI.</source>
         <translation>Alt+P</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-6"/>
         <source>Split tracks into parts, or one single part</source>
         <translation>Разделить треки на партии, или одну партию</translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+22"/>
         <source>Export:</source>
         <translation>Эк�порт:</translation>
     </message>
@@ -1711,7 +1536,12 @@ Right-click to show GUI.</source>
         <translation>Alt+2</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+33"/>
+        <source>Note: Format 0 uses the FIRST midi track&apos;s name/comment in the arranger</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Save space by replacing note-offs with &amp;zero velocity note-ons</source>
         <translation>Сохранить ме�то, замен�� note-offs на &amp;note-ons � нулевой �коро�тью нажати�</translation>
     </message>
@@ -1792,87 +1622,50 @@ Right-click to show GUI.</source>
         <translation type="obsolete">Выбр</translation>
     </message>
     <message>
-        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="+94"/>
         <source>select controller</source>
-        <translation>выбрать контроллер</translation>
+        <translation type="obsolete">выбрать контроллер</translation>
     </message>
     <message>
         <source>x</source>
         <translation type="obsolete">x</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>remove panel</source>
-        <translation>удалить панель</translation>
+        <translation type="obsolete">удалить панель</translation>
     </message>
     <message>
-        <location line="+463"/>
-        <location line="+236"/>
         <source>Velocity</source>
-        <translation>Скоро�ть нажати�</translation>
+        <translation type="obsolete">Скоро�ть нажати�</translation>
     </message>
     <message>
-        <location line="-186"/>
         <source>add new ...</source>
-        <translation>Добавить новый...</translation>
+        <translation type="obsolete">Добавить новый...</translation>
     </message>
     <message>
-        <location line="-528"/>
         <source>S</source>
-        <translation>S</translation>
+        <translation type="obsolete">S</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>X</source>
-        <translation>X</translation>
+        <translation type="obsolete">X</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>manual adjust</source>
-        <translation>на�тройка вручную</translation>
+        <translation type="obsolete">на�тройка вручную</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>double click on/off</source>
-        <translation>двойной щелчок вкл/выкл</translation>
+        <translation type="obsolete">двойной щелчок вкл/выкл</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>off</source>
-        <translation>выкл</translation>
-    </message>
-    <message>
-        <location line="+653"/>
-        <location line="+58"/>
-        <source>Instrument-defined</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-43"/>
-        <location line="+21"/>
-        <source>Add ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-17"/>
-        <source>Others</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+65"/>
-        <source>Edit instrument ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+46"/>
-        <source>Common Controls</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">выкл</translation>
     </message>
 </context>
 <context>
     <name>DeicsOnzeGui</name>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="+1904"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="+1906"/>
         <location line="+389"/>
         <source>Delete preset</source>
         <translation>Удалить пре�ет</translation>
@@ -3747,402 +3540,279 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
 <context>
     <name>DrumEdit</name>
     <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="+181"/>
         <source>&amp;File</source>
-        <translation>&amp;Файл</translation>
+        <translation type="obsolete">&amp;Файл</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Load Map</source>
-        <translation>Загрузить карту</translation>
+        <translation type="obsolete">Загрузить карту</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Save Map</source>
-        <translation>Сохранить карту</translation>
+        <translation type="obsolete">Сохранить карту</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>&amp;Edit</source>
-        <translation>&amp;Правка</translation>
+        <translation type="obsolete">&amp;Правка</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Cut</source>
-        <translation>Вырезать</translation>
+        <translation type="obsolete">Вырезать</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Copy</source>
-        <translation>Копировать</translation>
+        <translation type="obsolete">Копировать</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Paste</source>
-        <translation>В�тавить</translation>
+        <translation type="obsolete">В�тавить</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Delete Events</source>
-        <translation>Удалить �обыти�</translation>
+        <translation type="obsolete">Удалить �обыти�</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Select All</source>
-        <translation>Выделить в�ё</translation>
+        <translation type="obsolete">Выделить в�ё</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Select None</source>
-        <translation>Убрать выделение</translation>
+        <translation type="obsolete">Убрать выделение</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Invert</source>
-        <translation>Инвертировать</translation>
+        <translation type="obsolete">Инвертировать</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Inside Loop</source>
-        <translation>Внутри цикла</translation>
+        <translation type="obsolete">Внутри цикла</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Outside Loop</source>
-        <translation>Вне цикла</translation>
+        <translation type="obsolete">Вне цикла</translation>
     </message>
     <message>
-        <location line="-7"/>
         <source>&amp;Select</source>
-        <translation>&amp;Выделение</translation>
+        <translation type="obsolete">&amp;Выделение</translation>
     </message>
     <message>
-        <location line="+81"/>
         <source>Load Drummap</source>
-        <translation>Загрузить драм-карту</translation>
+        <translation type="obsolete">Загрузить драм-карту</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Store Drummap</source>
-        <translation>Сохранить драм-карту</translation>
+        <translation type="obsolete">Сохранить драм-карту</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Step Record</source>
-        <translation>Пошагова� запи�ь</translation>
+        <translation type="obsolete">Пошагова� запи�ь</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Midi Input</source>
-        <translation>MIDI-вход</translation>
+        <translation type="obsolete">MIDI-вход</translation>
     </message>
     <message>
-        <location line="+50"/>
         <source>ctrl</source>
-        <translation>ctrl</translation>
+        <translation type="obsolete">ctrl</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Add Controller View</source>
-        <translation>Показать контроллеры</translation>
+        <translation type="obsolete">Показать контроллеры</translation>
     </message>
     <message>
-        <location line="+57"/>
         <source>M</source>
-        <translation>M</translation>
+        <translation type="obsolete">M</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Sound</source>
-        <translation>Звук</translation>
+        <translation type="obsolete">Звук</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>QNT</source>
-        <translation>КВ�Т</translation>
+        <translation type="obsolete">КВ�Т</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>E-Note</source>
-        <translation>E-�ота</translation>
+        <translation type="obsolete">E-�ота</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Len</source>
-        <translation>Дл</translation>
+        <translation type="obsolete">Дл</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A-Note</source>
-        <translation>A-�ота</translation>
+        <translation type="obsolete">A-�ота</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Ch</source>
-        <translation>Кан</translation>
+        <translation type="obsolete">Кан</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Port</source>
-        <translation>Порт</translation>
+        <translation type="obsolete">Порт</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>LV1</source>
-        <translation>LV1</translation>
+        <translation type="obsolete">LV1</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>LV2</source>
-        <translation>LV2</translation>
+        <translation type="obsolete">LV2</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>LV3</source>
-        <translation>LV3</translation>
+        <translation type="obsolete">LV3</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>LV4</source>
-        <translation>LV4</translation>
+        <translation type="obsolete">LV4</translation>
     </message>
     <message>
         <source>drummaps</source>
         <translation type="obsolete">драм-карты</translation>
     </message>
     <message>
-        <location line="+373"/>
         <source>Muse: Load Drum Map</source>
-        <translation>Muse: Загрузить драм-карту</translation>
+        <translation type="obsolete">Muse: Загрузить драм-карту</translation>
     </message>
     <message>
-        <location line="+53"/>
         <source>MusE: Store Drum Map</source>
-        <translation>Muse: Сохранить драм-карту</translation>
+        <translation type="obsolete">Muse: Сохранить драм-карту</translation>
     </message>
     <message>
-        <location line="-620"/>
         <source>Set Fixed Length</source>
-        <translation>У�тановить фик�. длительно�ть</translation>
+        <translation type="obsolete">У�тановить фик�. длительно�ть</translation>
     </message>
     <message>
         <source>&amp;Functions</source>
         <translation type="obsolete">&amp;Функции</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Modify Velocity</source>
-        <translation>Изменить �коро�ть нажати�</translation>
+        <translation type="obsolete">Изменить �коро�ть нажати�</translation>
     </message>
     <message>
-        <location line="-148"/>
-        <location line="+21"/>
         <source>mute instrument</source>
-        <translation>заглушить ин�трумент</translation>
+        <translation type="obsolete">заглушить ин�трумент</translation>
     </message>
     <message>
-        <location line="-20"/>
-        <location line="+21"/>
         <source>sound name</source>
-        <translation>название звука</translation>
+        <translation type="obsolete">название звука</translation>
     </message>
     <message>
-        <location line="-20"/>
-        <location line="+21"/>
         <source>volume percent</source>
-        <translation>громко�ть в процентах</translation>
+        <translation type="obsolete">громко�ть в процентах</translation>
     </message>
     <message>
-        <location line="-20"/>
-        <location line="+21"/>
         <source>quantisation</source>
-        <translation>квантование</translation>
+        <translation type="obsolete">квантование</translation>
     </message>
     <message>
-        <location line="-20"/>
-        <location line="+21"/>
         <source>this input note triggers the sound</source>
-        <translation>�та вход�ща� нота включает звук</translation>
+        <translation type="obsolete">�та вход�ща� нота включает звук</translation>
     </message>
     <message>
-        <location line="-20"/>
-        <location line="+21"/>
         <source>note length</source>
-        <translation>длина ноты</translation>
+        <translation type="obsolete">длина ноты</translation>
     </message>
     <message>
-        <location line="-20"/>
-        <location line="+21"/>
         <source>this is the note which is played</source>
-        <translation>�то нота, котора� во�производит��</translation>
+        <translation type="obsolete">�то нота, котора� во�производит��</translation>
     </message>
     <message>
-        <location line="-20"/>
         <source>output channel (hold ctl to affect all rows)</source>
-        <translation>канал выхода (удерживайте ctrl, чтобы воздей�твовать на в�е р�ды)</translation>
+        <translation type="obsolete">канал выхода (удерживайте ctrl, чтобы воздей�твовать на в�е р�ды)</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+21"/>
         <source>output port</source>
-        <translation>порт выхода</translation>
+        <translation type="obsolete">порт выхода</translation>
     </message>
     <message>
-        <location line="-20"/>
-        <location line="+21"/>
         <source>shift + control key: draw velocity level 1</source>
-        <translation>клавиши shift+control: ри�овать уровень 1 �коро�ти нажати�</translation>
+        <translation type="obsolete">клавиши shift+control: ри�овать уровень 1 �коро�ти нажати�</translation>
     </message>
     <message>
-        <location line="-20"/>
-        <location line="+21"/>
         <source>control key: draw velocity level 2</source>
-        <translation>Клавиша control: ри�овать уровень 2 �коро�ти нажати�</translation>
+        <translation type="obsolete">Клавиша control: ри�овать уровень 2 �коро�ти нажати�</translation>
     </message>
     <message>
-        <location line="-20"/>
-        <location line="+21"/>
         <source>shift key: draw velocity level 3</source>
-        <translation>Клавиша shift: ри�овать уровень 3 �коро�ти нажати�</translation>
+        <translation type="obsolete">Клавиша shift: ри�овать уровень 3 �коро�ти нажати�</translation>
     </message>
     <message>
-        <location line="-20"/>
-        <location line="+21"/>
         <source>draw velocity level 4</source>
-        <translation>ри�овать уровень 4 �коро�ти нажати�</translation>
+        <translation type="obsolete">ри�овать уровень 4 �коро�ти нажати�</translation>
     </message>
     <message>
-        <location line="-5"/>
         <source>output channel (ctl: affect all rows)</source>
-        <translation>канал выхода (ctrl: дей�твует на в�е р�ды)</translation>
+        <translation type="obsolete">канал выхода (ctrl: дей�твует на в�е р�ды)</translation>
     </message>
     <message>
-        <location line="+46"/>
         <source>Reset GM Map</source>
-        <translation>�а�троить карту GM по умолчанию </translation>
+        <translation type="obsolete">�а�троить карту GM по умолчанию </translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>Copy events in range</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Paste (with Dialog)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+29"/>
         <source>Previous Part</source>
-        <translation>Предыдуща� парти�</translation>
+        <translation type="obsolete">Предыдуща� парти�</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Next Part</source>
-        <translation>Следующа� парти�</translation>
-    </message>
-    <message>
-        <location line="+19"/>
-        <source>Fu&amp;nctions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Re-order list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Crescendo/Decrescendo</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Следующа� парти�</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Quantize</source>
-        <translation type="unfinished">Квантовать</translation>
+        <translation type="obsolete">Квантовать</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Erase Event</source>
-        <translation type="unfinished">Удалить �обытие</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Move Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Удалить �обытие</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Delete Overlaps</source>
-        <translation type="unfinished">Удалить наложени�</translation>
+        <translation type="obsolete">Удалить наложени�</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>&amp;Plugins</source>
-        <translation>&amp;Плагины</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&amp;Плагины</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Drum tools</source>
-        <translation>Ин�трументы ударных</translation>
+        <translation type="obsolete">Ин�трументы ударных</translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>cursor tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Set step size for cursor edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
         <source>panic</source>
-        <translation>паника</translation>
+        <translation type="obsolete">паника</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>transport</source>
-        <translation>тран�порт</translation>
+        <translation type="obsolete">тран�порт</translation>
     </message>
     <message>
-        <location line="+84"/>
         <source>Vol</source>
-        <translation>Громк</translation>
+        <translation type="obsolete">Громк</translation>
     </message>
     <message>
-        <location line="+461"/>
         <source>Drum map</source>
-        <translation>Карта ударных</translation>
+        <translation type="obsolete">Карта ударных</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Reset the drum map with GM defaults?</source>
-        <translation>Сбро� карты ударных на GM по умолчанию?</translation>
+        <translation type="obsolete">Сбро� карты ударных на GM по умолчанию?</translation>
     </message>
 </context>
 <context>
     <name>EditCAfterDialog</name>
     <message>
-        <location filename="../../muse/liste/editevent.cpp" line="+443"/>
         <source>MusE: Enter Channel Aftertouch</source>
-        <translation>MusE: Вве�ти Channel Aftertouch</translation>
+        <translation type="obsolete">MusE: Вве�ти Channel Aftertouch</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Time Position</source>
-        <translation>Позици� по времени</translation>
+        <translation type="obsolete">Позици� по времени</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Pressure</source>
-        <translation>Давление</translation>
+        <translation type="obsolete">Давление</translation>
     </message>
 </context>
 <context>
@@ -4253,14 +3923,12 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
 <context>
     <name>EditEventDialog</name>
     <message>
-        <location filename="../../muse/liste/editevent.cpp" line="-261"/>
         <source>Ok</source>
-        <translation>ОК</translation>
+        <translation type="obsolete">ОК</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Cancel</source>
-        <translation>Отмена</translation>
+        <translation type="obsolete">Отмена</translation>
     </message>
 </context>
 <context>
@@ -4324,188 +3992,137 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
 <context>
     <name>EditInstrument</name>
     <message>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="+311"/>
-        <location line="+34"/>
         <source>MusE: Create file failed</source>
-        <translation>MusE: �е удало�ь �оздать файл</translation>
+        <translation type="obsolete">MusE: �е удало�ь �оздать файл</translation>
     </message>
     <message>
-        <location line="+33"/>
         <source>MusE: Write File failed</source>
-        <translation>MusE: �е удало�ь запи�ать файл</translation>
+        <translation type="obsolete">MusE: �е удало�ь запи�ать файл</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <location line="+12"/>
-        <location line="+280"/>
-        <location line="+12"/>
         <source>MusE:</source>
-        <translation>MusE:</translation>
+        <translation type="obsolete">MusE:</translation>
     </message>
     <message>
-        <location line="-303"/>
-        <location line="+292"/>
         <source>The user instrument directory
 </source>
-        <translation>Пользователь�кий ин�трументальный каталог</translation>
+        <translation type="obsolete">Пользователь�кий ин�трументальный каталог</translation>
     </message>
     <message>
-        <location line="-292"/>
-        <location line="+292"/>
         <source>
 does not exist yet. Create it now?
 </source>
-        <translation>не �уще�твует. Создать?</translation>
+        <translation type="obsolete">не �уще�твует. Создать?</translation>
     </message>
     <message>
         <source>(You can override with the environment variable MUSEINSTRUMENTS)</source>
         <translation type="obsolete">(Вы можете перепи�ать � переменной окружени� MUSEINSTRUMENTS)</translation>
     </message>
     <message>
-        <location line="-291"/>
-        <location line="+292"/>
-        <source>(You can change the user instruments directory at Settings-&gt;Global Settings-&gt;Midi)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-282"/>
-        <location line="+292"/>
         <source>Unable to create user instrument directory
 </source>
-        <translation>�евозможно �оздать пользователь�кий ин�трументальный каталог</translation>
+        <translation type="obsolete">�евозможно �оздать пользователь�кий ин�трументальный каталог</translation>
     </message>
     <message>
-        <location line="-244"/>
-        <location line="+266"/>
         <source>MusE: Save Instrument Definition</source>
-        <translation>MusE: Сохранить Определение Ин�трумента</translation>
+        <translation type="obsolete">MusE: Сохранить Определение Ин�трумента</translation>
     </message>
     <message>
-        <location line="-265"/>
-        <location line="+266"/>
         <source>Instrument Definition (*.idf)</source>
-        <translation>Определение ин�трумента (*.idf)</translation>
+        <translation type="obsolete">Определение ин�трумента (*.idf)</translation>
     </message>
     <message>
-        <location line="-154"/>
-        <location line="+29"/>
         <source>MusE: Save instrument as</source>
-        <translation>MusE: Сохранить ин�трумент как</translation>
+        <translation type="obsolete">MusE: Сохранить ин�трумент как</translation>
     </message>
     <message>
-        <location line="-29"/>
         <source>Enter a new unique instrument name:</source>
-        <translation>Введите неповтор�ющее�� им� ин�трумента:</translation>
+        <translation type="obsolete">Введите неповтор�ющее�� им� ин�трумента:</translation>
     </message>
     <message>
-        <location line="+30"/>
         <source>The user instrument:
 </source>
-        <translation>Ин�трумент пользовател�:</translation>
+        <translation type="obsolete">Ин�трумент пользовател�:</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>
 already exists. This will overwrite its .idf instrument file.
 Are you sure?</source>
-        <translation>уже �уще�твует. �ажатие на кнопку &quot;ОК&quot;
+        <translation type="obsolete">уже �уще�твует. �ажатие на кнопку &quot;ОК&quot;
 перепишет .idf файл ин�трумента.
 Вы уверены?</translation>
     </message>
     <message>
-        <location line="+525"/>
         <source>MusE: Bad instrument name</source>
-        <translation>MusE: �еверное им� ин�трумента</translation>
+        <translation type="obsolete">MusE: �еверное им� ин�трумента</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Please choose a unique instrument name.
 (The name might be used by a hidden instrument.)</source>
-        <translation>Пожалуй�та, выберите неповтор�ющее�� им� дл� ин�трумента.
+        <translation type="obsolete">Пожалуй�та, выберите неповтор�ющее�� им� дл� ин�трумента.
 (Им� может и�пользовать�� в �крытых ин�трументах)</translation>
     </message>
     <message>
-        <location line="+136"/>
         <source>MusE: Bad patch name</source>
-        <translation>MusE: �еверное им� патча</translation>
+        <translation type="obsolete">MusE: �еверное им� патча</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Please choose a unique patch name</source>
-        <translation>Пожалуй�та, выберите неповтор�ющее�� им� патча</translation>
+        <translation type="obsolete">Пожалуй�та, выберите неповтор�ющее�� им� патча</translation>
     </message>
     <message>
-        <location line="+22"/>
         <source>MusE: Bad patchgroup name</source>
-        <translation>MusE: �еверное им� группы</translation>
+        <translation type="obsolete">MusE: �еверное им� группы</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Please choose a unique patchgroup name</source>
-        <translation>Пожалуй�та, выберите неповтор�ющее�� им� группы</translation>
+        <translation type="obsolete">Пожалуй�та, выберите неповтор�ющее�� им� группы</translation>
     </message>
     <message>
-        <location line="+526"/>
         <source>MusE: Bad controller name</source>
-        <translation>MusE: �еверное им� контроллера</translation>
+        <translation type="obsolete">MusE: �еверное им� контроллера</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Please choose a unique controller name</source>
-        <translation>Пожалуй�та, выберите неповтор�ющее�� им� дл� контроллера</translation>
+        <translation type="obsolete">Пожалуй�та, выберите неповтор�ющее�� им� дл� контроллера</translation>
     </message>
     <message>
-        <location line="+1287"/>
-        <location line="+12"/>
         <source>MusE: Cannot add common controller</source>
-        <translation>MusE: �евозможно добавить обычный контроллер</translation>
+        <translation type="obsolete">MusE: �евозможно добавить обычный контроллер</translation>
     </message>
     <message>
-        <location line="-11"/>
         <source>A controller named </source>
-        <translation>Контроллер названый </translation>
+        <translation type="obsolete">Контроллер названый </translation>
     </message>
     <message>
-        <location line="+0"/>
-        <location line="+12"/>
         <source> already exists.</source>
-        <translation> уже �уще�твует.</translation>
+        <translation type="obsolete"> уже �уще�твует.</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>A controller number </source>
-        <translation>�омер контроллера </translation>
+        <translation type="obsolete">�омер контроллера </translation>
     </message>
     <message>
-        <location line="+283"/>
-        <location line="+5"/>
         <source>MusE</source>
-        <translation>MusE</translation>
+        <translation type="obsolete">MusE</translation>
     </message>
     <message>
-        <location line="-4"/>
-        <location line="+5"/>
         <source>The current Instrument contains unsaved data
 Save Current Instrument?</source>
-        <translation>Текущий Ин�трумент �одержит не�охраненные данные
+        <translation type="obsolete">Текущий Ин�трумент �одержит не�охраненные данные
 Сохранить �тот Ин�трумент?</translation>
     </message>
     <message>
-        <location line="-3"/>
-        <location line="+5"/>
         <source>&amp;Save</source>
-        <translation>&amp;Сохранить</translation>
+        <translation type="obsolete">&amp;Сохранить</translation>
     </message>
     <message>
-        <location line="-5"/>
-        <location line="+5"/>
         <source>&amp;Nosave</source>
-        <translation>&amp;�е �охран�ть</translation>
+        <translation type="obsolete">&amp;�е �охран�ть</translation>
     </message>
     <message>
-        <location line="-5"/>
         <source>&amp;Abort</source>
-        <translation>&amp;Отмена</translation>
+        <translation type="obsolete">&amp;Отмена</translation>
     </message>
 </context>
 <context>
@@ -5315,24 +4932,20 @@ Typically, set to 127/127, or an unused
 <context>
     <name>EditMetaDialog</name>
     <message>
-        <location filename="../../muse/liste/editevent.cpp" line="+118"/>
         <source>MusE: Enter Meta Event</source>
-        <translation>MusE: Вве�ти мета�обытие</translation>
+        <translation type="obsolete">MusE: Вве�ти мета�обытие</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Time Position</source>
-        <translation>Позици� по времени</translation>
+        <translation type="obsolete">Позици� по времени</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Meta Type</source>
-        <translation>Метатип</translation>
+        <translation type="obsolete">Метатип</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Enter Hex</source>
-        <translation>Вве�ти Hex</translation>
+        <translation type="obsolete">Вве�ти Hex</translation>
     </message>
 </context>
 <context>
@@ -5412,24 +5025,20 @@ Typically, set to 127/127, or an unused
 <context>
     <name>EditPAfterDialog</name>
     <message>
-        <location filename="../../muse/liste/editevent.cpp" line="+176"/>
         <source>MusE: Enter Poly Aftertouch</source>
-        <translation>MusE: Вве�ти полиф. по�ленажатие</translation>
+        <translation type="obsolete">MusE: Вве�ти полиф. по�ленажатие</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Time Position</source>
-        <translation>Позици� по времени</translation>
+        <translation type="obsolete">Позици� по времени</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Pitch</source>
-        <translation>Вы�ота тона</translation>
+        <translation type="obsolete">Вы�ота тона</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Pressure</source>
-        <translation>Давление</translation>
+        <translation type="obsolete">Давление</translation>
     </message>
 </context>
 <context>
@@ -5841,13 +5450,46 @@ Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+13"/>
         <source>Allows some popup menus to stay open.
 Otherwise, hold Ctrl to keep them open.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+11"/>
+        <source>In some areas, the middle mouse button decreases
+values, while the right button increases. Users without a
+middle mouse button can select this option to make the
+left button behave like the middle button in such areas.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Use left mouse button for decreasing values</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Shift + Right click sets left range marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Allow adding hidden tracks in track list menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Unhide tracks when adding hidden tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>GUI Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>MDI-subwindowness and sharing menus</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5887,7 +5529,7 @@ Otherwise, hold Ctrl to keep them open.</source>
         <translation>&amp;Отмена</translation>
     </message>
     <message>
-        <location line="-924"/>
+        <location line="-1024"/>
         <source>Audio</source>
         <translation>�удио</translation>
     </message>
@@ -6013,16 +5655,15 @@ Otherwise, hold Ctrl to keep them open.</source>
 (тиков/в �ек)</translation>
     </message>
     <message>
-        <location line="+212"/>
         <source>GUI</source>
-        <translation>ГИП</translation>
+        <translation type="obsolete">ГИП</translation>
     </message>
     <message>
         <source>Help Browser:</source>
         <translation type="obsolete">В чём читать �правку:</translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+230"/>
         <source>GUI Refresh Rate</source>
         <translation>Ча�тота обновлени� ГИП</translation>
     </message>
@@ -6403,7 +6044,12 @@ Adjusts responsiveness of audio controls and
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+41"/>
+        <source>GUI Behaviour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+44"/>
         <source>Use old-style stop shortcut:</source>
         <translation>И�пользовать �тарую &quot;гор�чую клавишу&quot; дл� о�тановки:</translation>
     </message>
@@ -6426,143 +6072,96 @@ Adjusts responsiveness of audio controls and
 <context>
     <name>LMaster</name>
     <message>
-        <location filename="../../muse/master/lmaster.cpp" line="+147"/>
         <source>MusE: Mastertrack</source>
-        <translation>MusE: Ма�тер-трек</translation>
+        <translation type="obsolete">MusE: Ма�тер-трек</translation>
     </message>
     <message>
-        <location line="+57"/>
         <source>Tempo</source>
-        <translation>Темп</translation>
+        <translation type="obsolete">Темп</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Timesig</source>
-        <translation>Размер</translation>
+        <translation type="obsolete">Размер</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>new tempo</source>
-        <translation>новый темп</translation>
+        <translation type="obsolete">новый темп</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>new signature</source>
-        <translation>новый размер</translation>
+        <translation type="obsolete">новый размер</translation>
     </message>
     <message>
-        <location line="+26"/>
         <source>Meter</source>
-        <translation>Индикатор</translation>
+        <translation type="obsolete">Индикатор</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Time</source>
-        <translation>Врем�</translation>
+        <translation type="obsolete">Врем�</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Type</source>
-        <translation>Тип</translation>
+        <translation type="obsolete">Тип</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Value</source>
-        <translation>Значение</translation>
+        <translation type="obsolete">Значение</translation>
     </message>
     <message>
-        <location line="-77"/>
         <source>&amp;Edit</source>
-        <translation>&amp;Правка</translation>
+        <translation type="obsolete">&amp;Правка</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Insert Tempo</source>
-        <translation>В�тавить темп</translation>
+        <translation type="obsolete">В�тавить темп</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Insert Signature</source>
-        <translation>В�тавить размер</translation>
+        <translation type="obsolete">В�тавить размер</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Insert Key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
         <source>Edit Positon</source>
-        <translation>Изменить позицию</translation>
+        <translation type="obsolete">Изменить позицию</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Edit Value</source>
-        <translation>Изменить значение</translation>
+        <translation type="obsolete">Изменить значение</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Delete Event</source>
-        <translation>Удалить �обытие</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+23"/>
-        <source>Undo/Redo tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>new key</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Удалить �обытие</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>panic</source>
-        <translation type="unfinished">паника</translation>
+        <translation type="obsolete">паника</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>transport</source>
-        <translation type="unfinished">тран�порт</translation>
+        <translation type="obsolete">тран�порт</translation>
     </message>
     <message>
-        <location line="+408"/>
         <source>Reposition of the initial tempo and signature events is not allowed</source>
-        <translation>Изменение начального темпа и размера запрещено</translation>
+        <translation type="obsolete">Изменение начального темпа и размера запрещено</translation>
     </message>
     <message>
-        <location line="+54"/>
         <source>MusE: List Editor</source>
-        <translation>MusE: Редактор �пи�ка �обытий</translation>
+        <translation type="obsolete">MusE: Редактор �пи�ка �обытий</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Input error, conversion not OK or value out of range</source>
-        <translation>Ошибка ввода, неверна� конвер�и� или значение вне диапазона</translation>
+        <translation type="obsolete">Ошибка ввода, неверна� конвер�и� или значение вне диапазона</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Reposition of tempo and signature events to start position is not allowed!</source>
-        <translation>Изменение темпа и размера запрещено</translation>
+        <translation type="obsolete">Изменение темпа и размера запрещено</translation>
     </message>
     <message>
         <source>Master tools</source>
         <translation type="obsolete">О�новные ин�трументы</translation>
     </message>
     <message>
-        <location line="-495"/>
         <source>Edit tools</source>
-        <translation>Ин�трументы редактировани�</translation>
+        <translation type="obsolete">Ин�трументы редактировани�</translation>
     </message>
 </context>
 <context>
@@ -6635,89 +6234,68 @@ Adjusts responsiveness of audio controls and
         <translation type="obsolete">В�тавить ноту</translation>
     </message>
     <message>
-        <location filename="../../muse/liste/listedit.cpp" line="+468"/>
         <source>insert Note</source>
-        <translation>в�тавить �оту</translation>
+        <translation type="obsolete">в�тавить �оту</translation>
     </message>
     <message>
         <source>Insert SysEx</source>
         <translation type="obsolete">В�тавить SysEx</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>insert SysEx</source>
-        <translation>в�тавить SysEx</translation>
+        <translation type="obsolete">в�тавить SysEx</translation>
     </message>
     <message>
         <source>Insert Ctrl</source>
         <translation type="obsolete">В�тавить кнтрл</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>insert Ctrl</source>
-        <translation>В�тавить кнтрл</translation>
+        <translation type="obsolete">В�тавить кнтрл</translation>
     </message>
     <message>
         <source>Insert Meta</source>
         <translation type="obsolete">В�тавить Meta</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>insert Meta</source>
-        <translation>в�тавить Meta</translation>
+        <translation type="obsolete">в�тавить Meta</translation>
     </message>
     <message>
         <source>Insert Channel Aftertouch</source>
         <translation type="obsolete">В�тавить Channel Aftertouch</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>insert Channel Aftertouch</source>
-        <translation>в�тавить Channel Aftertouch</translation>
+        <translation type="obsolete">в�тавить Channel Aftertouch</translation>
     </message>
     <message>
         <source>Insert Key Aftertouch</source>
         <translation type="obsolete">В�тавить Key Aftertouch</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>insert Poly Aftertouch</source>
-        <translation>в�тавить Poly Aftertouch</translation>
+        <translation type="obsolete">в�тавить Poly Aftertouch</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>&amp;Edit</source>
-        <translation>&amp;Правка</translation>
+        <translation type="obsolete">&amp;Правка</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Cut</source>
-        <translation>Вырезать</translation>
+        <translation type="obsolete">Вырезать</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Copy</source>
-        <translation>Скопировать</translation>
+        <translation type="obsolete">Скопировать</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Paste</source>
-        <translation>В�тавить</translation>
+        <translation type="obsolete">В�тавить</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Delete Events</source>
-        <translation>Удалить �обыти�</translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Undo/Redo tools</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Удалить �обыти�</translation>
     </message>
     <message>
         <source>List Tools</source>
@@ -6728,72 +6306,60 @@ Adjusts responsiveness of audio controls and
         <translation type="obsolete">В�тавить ин�трументы</translation>
     </message>
     <message>
-        <location line="+34"/>
         <source>Tick</source>
-        <translation>Тик</translation>
+        <translation type="obsolete">Тик</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Bar</source>
-        <translation>Такт</translation>
+        <translation type="obsolete">Такт</translation>
     </message>
     <message>
         <source>Typ</source>
         <translation type="obsolete">Тип</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Ch</source>
-        <translation>Кан</translation>
+        <translation type="obsolete">Кан</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Val A</source>
-        <translation>Знач. �</translation>
+        <translation type="obsolete">Знач. �</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Val B</source>
-        <translation>Знач. B</translation>
+        <translation type="obsolete">Знач. B</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Val C</source>
-        <translation>Знач. С</translation>
+        <translation type="obsolete">Знач. С</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Len</source>
-        <translation>Дл</translation>
+        <translation type="obsolete">Дл</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Comment</source>
-        <translation>Комментарий</translation>
+        <translation type="obsolete">Комментарий</translation>
     </message>
     <message>
         <source>List tools</source>
         <translation type="obsolete">Ин�трументы редактора �пи�ка</translation>
     </message>
     <message>
-        <location line="-38"/>
         <source>Insert tools</source>
-        <translation>Ин�трументы дл� в�тавки</translation>
+        <translation type="obsolete">Ин�трументы дл� в�тавки</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>panic</source>
-        <translation type="unfinished">паника</translation>
+        <translation type="obsolete">паника</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>transport</source>
-        <translation type="unfinished">тран�порт</translation>
+        <translation type="obsolete">тран�порт</translation>
     </message>
     <message>
-        <location line="+24"/>
         <source>Type</source>
-        <translation>Тип</translation>
+        <translation type="obsolete">Тип</translation>
     </message>
 </context>
 <context>
@@ -6831,193 +6397,100 @@ Adjusts responsiveness of audio controls and
         <translation type="obsolete">ничего</translation>
     </message>
     <message>
-        <location filename="../../muse/confmport.cpp" line="+236"/>
         <source>Port</source>
-        <translation>Порт</translation>
+        <translation type="obsolete">Порт</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>GUI</source>
-        <translation>ГИП</translation>
+        <translation type="obsolete">ГИП</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Instrument</source>
-        <translation>Ин�трумент</translation>
+        <translation type="obsolete">Ин�трумент</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Device Name</source>
-        <translation>Им� у�трой�тва</translation>
+        <translation type="obsolete">Им� у�трой�тва</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>State</source>
-        <translation>Со�то�ние</translation>
+        <translation type="obsolete">Со�то�ние</translation>
     </message>
     <message>
         <source>unknown</source>
         <translation type="obsolete">неизве�тно</translation>
     </message>
     <message>
-        <location line="-8"/>
         <source>I</source>
-        <translation>Ð’Ñ…</translation>
+        <translation type="obsolete">Ð’Ñ…</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>O</source>
-        <translation>Ð’Ñ‹Ñ…</translation>
+        <translation type="obsolete">Ð’Ñ‹Ñ…</translation>
     </message>
     <message>
-        <location line="-715"/>
         <source>MusE: bad device name</source>
-        <translation>MusE: неверное им� у�трой�тва</translation>
+        <translation type="obsolete">MusE: неверное им� у�трой�тва</translation>
     </message>
     <message>
-        <location line="-254"/>
-        <location line="+176"/>
-        <source>Default input connections</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-175"/>
-        <location line="+66"/>
-        <source>Are you sure you want to apply to all existing midi tracks now?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-1"/>
-        <location line="+148"/>
-        <source>Default output connections</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-37"/>
-        <location line="+38"/>
-        <source>Setting will apply to new midi tracks.
-Do you want to apply to all existing midi tracks now?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+40"/>
         <source>please choose a unique device name</source>
-        <translation>пожалуй�та выберите неповтор�ющее�� им� дл� у�трой�тва</translation>
+        <translation type="obsolete">пожалуй�та выберите неповтор�ющее�� им� дл� у�трой�тва</translation>
     </message>
     <message>
-        <location line="+72"/>
-        <location line="+860"/>
         <source>in</source>
-        <translation>в</translation>
+        <translation type="obsolete">в</translation>
     </message>
     <message>
-        <location line="-837"/>
-        <location line="+828"/>
         <source>out</source>
-        <translation>вне (из)</translation>
+        <translation type="obsolete">вне (из)</translation>
     </message>
     <message>
-        <location line="-772"/>
         <source>Show first aliases</source>
-        <translation>Показать первые п�евдонимы</translation>
+        <translation type="obsolete">Показать первые п�евдонимы</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Show second aliases</source>
-        <translation>Показать вторые п�евдонимы</translation>
-    </message>
-    <message>
-        <location line="+130"/>
-        <location line="+42"/>
-        <source>Toggle all</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Показать вторые п�евдонимы</translation>
     </message>
     <message>
-        <location line="-38"/>
-        <location line="+43"/>
-        <source>Change all tracks now</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+43"/>
         <source>Create</source>
-        <translation>Создать</translation>
+        <translation type="obsolete">Создать</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source> device</source>
-        <translation> у�трой�тво</translation>
+        <translation type="obsolete"> у�трой�тво</translation>
     </message>
     <message>
-        <location line="+229"/>
-        <location line="+29"/>
         <source>Port Number</source>
-        <translation>�омер порта</translation>
+        <translation type="obsolete">�омер порта</translation>
     </message>
     <message>
-        <location line="-28"/>
         <source>Enable gui</source>
-        <translation>Разрешить ГИП</translation>
+        <translation type="obsolete">Разрешить ГИП</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Enable reading</source>
-        <translation>Разрешить чтение</translation>
+        <translation type="obsolete">Разрешить чтение</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Enable writing</source>
-        <translation>Разрешить запи�ь</translation>
+        <translation type="obsolete">Разрешить запи�ь</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Port instrument</source>
-        <translation>Ин�трумент, назначенный на порт</translation>
+        <translation type="obsolete">Ин�трумент, назначенный на порт</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Midi device name. Click to edit (Jack)</source>
-        <translation>Им� midi-у�трой�тва. Щелкните дл� редактировани� (Jack)</translation>
+        <translation type="obsolete">Им� midi-у�трой�тва. Щелкните дл� редактировани� (Jack)</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Connections from Jack Midi outputs</source>
-        <translation>Соединени� от midi-выходов Jack</translation>
+        <translation type="obsolete">Соединени� от midi-выходов Jack</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Connections to Jack Midi inputs</source>
-        <translation>Соединени� к midi-входам Jack</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Auto-connect these channels to new midi tracks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Auto-connect new midi tracks to these channels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Auto-connect new midi tracks to this channel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>Auto-connect these channels, on this port, to new midi tracks.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Connect new midi tracks to these channels, on this port.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Connect new midi tracks to this channel, on this port.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Соединени� к midi-входам Jack</translation>
     </message>
     <message>
         <source>Connect these to new midi tracks</source>
@@ -7028,44 +6501,36 @@ Do you want to apply to all existing midi tracks now?</source>
         <translation type="obsolete">Под�оедин�ть новые midi-треки �юда (только к первому в �пи�ке)</translation>
     </message>
     <message>
-        <location line="-45"/>
         <source>Device state</source>
-        <translation>Со�то�ние у�трой�тва</translation>
+        <translation type="obsolete">Со�то�ние у�трой�тва</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Enable gui for device</source>
-        <translation>Разрешить ГИП дл� у�трой�тва</translation>
+        <translation type="obsolete">Разрешить ГИП дл� у�трой�тва</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Enable reading from device</source>
-        <translation>Разрешить чтение � у�трой�тва</translation>
+        <translation type="obsolete">Разрешить чтение � у�трой�тва</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Enable writing to device</source>
-        <translation>Разрешить запи�ь на у�трой�тво</translation>
+        <translation type="obsolete">Разрешить запи�ь на у�трой�тво</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Name of the midi device associated with this port number. Click to edit Jack midi name.</source>
-        <translation>Им� midi-у�трой�тва �в�зано � номером порта &quot;Jack&quot;. Щелкните, чтобы редактировать его.</translation>
+        <translation type="obsolete">Им� midi-у�трой�тва �в�зано � номером порта &quot;Jack&quot;. Щелкните, чтобы редактировать его.</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Instrument connected to port</source>
-        <translation>Ин�трумент, под�оединённый к порту</translation>
+        <translation type="obsolete">Ин�трумент, под�оединённый к порту</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Connections from Jack Midi output ports</source>
-        <translation>Соединени� от выходных midi-портов Jack</translation>
+        <translation type="obsolete">Соединени� от выходных midi-портов Jack</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Connections to Jack Midi input ports</source>
-        <translation>Соединени� � входными midi-портами Jack</translation>
+        <translation type="obsolete">Соединени� � входными midi-портами Jack</translation>
     </message>
     <message>
         <source>Connect these channels, on this port, to new midi tracks.
@@ -7093,40 +6558,32 @@ NOTE: Currently only one output port and channel supported (first found)</source
 (первый найденный)</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>State: result of opening the device</source>
-        <translation>Со�то�ние: результат открыти� у�трой�тва</translation>
+        <translation type="obsolete">Со�то�ние: результат открыти� у�трой�тва</translation>
     </message>
     <message>
-        <location line="+47"/>
         <source>In routes</source>
-        <translation>Маршруты входа</translation>
+        <translation type="obsolete">Маршруты входа</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Out routes</source>
-        <translation>Маршруты выхода</translation>
+        <translation type="obsolete">Маршруты выхода</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Def in ch</source>
-        <translation>вх кан по ум</translation>
+        <translation type="obsolete">вх кан по ум</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Def out ch</source>
-        <translation>вых кан по ум</translation>
+        <translation type="obsolete">вых кан по ум</translation>
     </message>
     <message>
-        <location line="+86"/>
         <source>&lt;unknown&gt;</source>
-        <translation>&lt;неизве�тно&gt;</translation>
+        <translation type="obsolete">&lt;неизве�тно&gt;</translation>
     </message>
     <message>
-        <location line="+87"/>
-        <location line="+74"/>
         <source>&lt;none&gt;</source>
-        <translation>&lt;ничего&gt;</translation>
+        <translation type="obsolete">&lt;ничего&gt;</translation>
     </message>
 </context>
 <context>
@@ -7187,23 +6644,20 @@ NOTE: Currently only one output port and channel supported (first found)</source
 <context>
     <name>MarkerView</name>
     <message>
-        <location filename="../../muse/marker/markerview.cpp" line="+173"/>
         <source>MusE: Marker</source>
-        <translation>MusE: Маркер</translation>
+        <translation type="obsolete">MusE: Маркер</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>add marker</source>
-        <translation>добавить маркер</translation>
+        <translation type="obsolete">добавить маркер</translation>
     </message>
     <message>
         <source>Add Marker</source>
         <translation type="obsolete">Добавить Маркер</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>delete marker</source>
-        <translation>удалить маркер</translation>
+        <translation type="obsolete">удалить маркер</translation>
     </message>
     <message>
         <source>Delete Marker</source>
@@ -7214,71 +6668,51 @@ NOTE: Currently only one output port and channel supported (first found)</source
         <translation type="obsolete">&amp;Файл</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>&amp;Edit</source>
-        <translation>&amp;Правка</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Undo/Redo tools</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&amp;Правка</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>panic</source>
-        <translation type="unfinished">паника</translation>
+        <translation type="obsolete">паника</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>transport</source>
-        <translation type="unfinished">тран�порт</translation>
+        <translation type="obsolete">тран�порт</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Bar:Beat:Tick</source>
-        <translation>Такт:Дол�:Тик</translation>
+        <translation type="obsolete">Такт:Дол�:Тик</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Hr:Mn:Sc:Fr:Sf</source>
-        <translation>Ч�:Мин:Сек:Фрм:Субфрм</translation>
+        <translation type="obsolete">Ч�:Мин:Сек:Фрм:Субфрм</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Lock</source>
-        <translation>Закрыть</translation>
+        <translation type="obsolete">Закрыть</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Text</source>
-        <translation>Тек�т</translation>
+        <translation type="obsolete">Тек�т</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Marker Properties</source>
-        <translation>Свой�тва маркера</translation>
+        <translation type="obsolete">Свой�тва маркера</translation>
     </message>
     <message>
         <source>marker-tools</source>
         <translation type="obsolete">ин�трументы маркера</translation>
     </message>
     <message>
-        <location line="-40"/>
         <source>edit tools</source>
-        <translation>ин�трументы редактировани�</translation>
+        <translation type="obsolete">ин�трументы редактировани�</translation>
     </message>
 </context>
 <context>
     <name>MasterEdit</name>
     <message>
-        <location filename="../../muse/master/masteredit.cpp" line="-56"/>
         <source>MusE: Mastertrack</source>
-        <translation>MusE: Ма�тер-трек</translation>
+        <translation type="obsolete">MusE: Ма�тер-трек</translation>
     </message>
     <message>
         <source>edit tools</source>
@@ -7289,87 +6723,64 @@ NOTE: Currently only one output port and channel supported (first found)</source
         <translation type="obsolete">Разрешить(Ма�тер)</translation>
     </message>
     <message>
-        <location line="+39"/>
         <source>Info</source>
-        <translation>Инфо</translation>
+        <translation type="obsolete">Инфо</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Cursor</source>
-        <translation>Кур�ор</translation>
+        <translation type="obsolete">Кур�ор</translation>
     </message>
     <message>
         <source>Off</source>
         <translation type="obsolete">выкл</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Snap</source>
-        <translation>Прив�зка</translation>
+        <translation type="obsolete">Прив�зка</translation>
     </message>
     <message>
-        <location line="-10"/>
         <source>time at cursor position</source>
-        <translation>врем� в позиции кур�ора</translation>
+        <translation type="obsolete">врем� в позиции кур�ора</translation>
     </message>
     <message>
-        <location line="-41"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Undo/Redo tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
         <source>panic</source>
-        <translation type="unfinished">паника</translation>
+        <translation type="obsolete">паника</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>transport</source>
-        <translation type="unfinished">тран�порт</translation>
+        <translation type="obsolete">тран�порт</translation>
     </message>
     <message>
-        <location line="+30"/>
         <source>tempo at cursor position</source>
-        <translation>темп в позиции кур�ора</translation>
+        <translation type="obsolete">темп в позиции кур�ора</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>CurPos </source>
-        <translation>Кур�Поз</translation>
+        <translation type="obsolete">Кур�Поз</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>tempo at current position</source>
-        <translation>темп в текущей позиции</translation>
+        <translation type="obsolete">темп в текущей позиции</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>time signature at current position</source>
-        <translation>размер в текущей позиции</translation>
+        <translation type="obsolete">размер в текущей позиции</translation>
     </message>
     <message>
-        <location line="-39"/>
         <source>Enable</source>
-        <translation>Разрешить</translation>
+        <translation type="obsolete">Разрешить</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Enable usage of master track</source>
-        <translation>Разрешить и�пользование ма�тер-трека</translation>
+        <translation type="obsolete">Разрешить и�пользование ма�тер-трека</translation>
     </message>
     <message>
         <source>Master tools</source>
         <translation type="obsolete">О�новные ин�трументы</translation>
     </message>
     <message>
-        <location line="-5"/>
         <source>Enable master</source>
-        <translation>Разрешить ма�тер(а)</translation>
+        <translation type="obsolete">Разрешить ма�тер(а)</translation>
     </message>
 </context>
 <context>
@@ -7860,10 +7271,8 @@ handled like normal controllers.</source>
 <context>
     <name>MidiInputTransformDialog</name>
     <message>
-        <location filename="../../muse/mplugins/midiitransform.cpp" line="+718"/>
-        <location line="+2"/>
         <source>New</source>
-        <translation>�овый</translation>
+        <translation type="obsolete">�овый</translation>
     </message>
 </context>
 <context>
@@ -8878,6 +8287,11 @@ Enabled inputs in the list will
         <source>Send sync delay</source>
         <translation>По�ылать �инхр. задержку</translation>
     </message>
+    <message>
+        <location line="+24"/>
+        <source>Note: Sync delay and MTC sync currently not fully implemeted</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MidiTrackInfo</name>
@@ -9549,10 +8963,8 @@ recording:
 <context>
     <name>MidiTransformerDialog</name>
     <message>
-        <location filename="../../muse/miditransform.cpp" line="+263"/>
-        <location line="+2"/>
         <source>New</source>
-        <translation>�овый</translation>
+        <translation type="obsolete">�овый</translation>
     </message>
 </context>
 <context>
@@ -10506,715 +9918,1141 @@ Do you still want to import it?</source>
 <context>
     <name>MusEApp::MusE</name>
     <message>
-        <location filename="../../muse/app.cpp" line="+46"/>
-        <location line="+16"/>
         <source>Failed to start audio!</source>
-        <translation type="unfinished">�е могу во�производить аудио!</translation>
+        <translation type="obsolete">�е могу во�производить аудио!</translation>
     </message>
     <message>
-        <location line="-15"/>
         <source>Was not able to start audio, check if jack is running.
 </source>
-        <translation type="unfinished">�е могу во�производить аудио, проверте работает ли &quot;Jack&quot;.
+        <translation type="obsolete">�е могу во�производить аудио, проверте работает ли &quot;Jack&quot;.
 </translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>Timeout waiting for audio to run. Check if jack is running.
 </source>
-        <translation type="unfinished">Ожидание запу�ка аудио. Проверте, работает ли &quot;Jack&quot;.
+        <translation type="obsolete">Ожидание запу�ка аудио. Проверте, работает ли &quot;Jack&quot;.
  </translation>
     </message>
     <message>
-        <location line="+219"/>
         <source>Und&amp;o</source>
-        <translation type="unfinished">&amp;Отменить дей�твие</translation>
+        <translation type="obsolete">&amp;Отменить дей�твие</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Re&amp;do</source>
-        <translation type="unfinished">&amp;Повторить</translation>
+        <translation type="obsolete">&amp;Повторить</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>undo last change to song</source>
-        <translation type="unfinished">отменить по�леднее изменение в проекте</translation>
+        <translation type="obsolete">отменить по�леднее изменение в проекте</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>redo last undo</source>
-        <translation type="unfinished">повторить по�леднюю отмену</translation>
+        <translation type="obsolete">повторить по�леднюю отмену</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Loop</source>
-        <translation type="unfinished">Цикл</translation>
+        <translation type="obsolete">Цикл</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Punchin</source>
-        <translation type="unfinished">�ачало врезки</translation>
+        <translation type="obsolete">�ачало врезки</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Punchout</source>
-        <translation type="unfinished">Конец врезки</translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Start</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Конец врезки</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Rewind</source>
-        <translation type="unfinished">Перемотать назад</translation>
+        <translation type="obsolete">Перемотать назад</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Forward</source>
-        <translation type="unfinished">Перемотать вперёд</translation>
+        <translation type="obsolete">Перемотать вперёд</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Stop</source>
-        <translation type="unfinished">О�тановить</translation>
+        <translation type="obsolete">О�тановить</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Play</source>
-        <translation type="unfinished">Во�произве�ти</translation>
+        <translation type="obsolete">Во�произве�ти</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Record</source>
-        <translation type="unfinished">Запи�ать</translation>
+        <translation type="obsolete">Запи�ать</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <location line="+232"/>
         <source>Panic</source>
-        <translation type="unfinished">Паника</translation>
-    </message>
-    <message>
-        <location line="-220"/>
-        <source>&amp;New</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Паника</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Open</source>
-        <translation type="unfinished">&amp;Открыть</translation>
+        <translation type="obsolete">&amp;Открыть</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Open &amp;Recent</source>
-        <translation type="unfinished">Открыть  &amp;�едавние</translation>
+        <translation type="obsolete">Открыть  &amp;�едавние</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location line="+1005"/>
-        <location line="+1207"/>
         <source>&amp;Save</source>
-        <translation type="unfinished">&amp;Сохранить</translation>
+        <translation type="obsolete">&amp;Сохранить</translation>
     </message>
     <message>
-        <location line="-2207"/>
         <source>Save &amp;As</source>
-        <translation type="unfinished">Сохранить &amp;Как</translation>
+        <translation type="obsolete">Сохранить &amp;Как</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Import Midifile</source>
-        <translation type="unfinished">Импортировать MIDI-файл</translation>
+        <translation type="obsolete">Импортировать MIDI-файл</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Export Midifile</source>
-        <translation type="unfinished">Эк�портировать MIDI-файл</translation>
+        <translation type="obsolete">Эк�портировать MIDI-файл</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Import Part</source>
-        <translation type="unfinished">Импортировать Партию</translation>
+        <translation type="obsolete">Импортировать Партию</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location filename="../../muse/wave.cpp" line="+827"/>
         <source>Import Wave File</source>
-        <translation type="unfinished">Импортировать WAV-файл</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Find unused wave files</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Импортировать WAV-файл</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>&amp;Quit</source>
-        <translation type="unfinished">Вы&amp;йти</translation>
+        <translation type="obsolete">Вы&amp;йти</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Song Info</source>
-        <translation type="unfinished">Проект инфо</translation>
+        <translation type="obsolete">Проект инфо</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Transport Panel</source>
-        <translation type="unfinished">Панель тран�порта</translation>
+        <translation type="obsolete">Панель тран�порта</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Bigtime Window</source>
-        <translation type="unfinished">Окно хронометра</translation>
+        <translation type="obsolete">Окно хронометра</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Mixer A</source>
-        <translation type="unfinished">Микшер �</translation>
+        <translation type="obsolete">Микшер �</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Mixer B</source>
-        <translation type="unfinished">Микшер В</translation>
+        <translation type="obsolete">Микшер В</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Cliplist</source>
-        <translation type="unfinished">Спи�ок фрагментов</translation>
+        <translation type="obsolete">Спи�ок фрагментов</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Marker View</source>
-        <translation type="unfinished">Маркеры</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Arranger View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Fullscreen</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Маркеры</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>&amp;Plugins</source>
-        <translation type="unfinished">&amp;Плагины</translation>
+        <translation type="obsolete">&amp;Плагины</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Edit Instrument</source>
-        <translation type="unfinished">Редактировать Ин�трумент</translation>
+        <translation type="obsolete">Редактировать Ин�трумент</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Input Plugins</source>
-        <translation type="unfinished">Плагины на входе</translation>
+        <translation type="obsolete">Плагины на входе</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Transpose</source>
-        <translation type="unfinished">Тран�понировать</translation>
+        <translation type="obsolete">Тран�понировать</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Midi Input Transform</source>
-        <translation type="unfinished">Преобразование вход�щих MIDI-�ообщений</translation>
+        <translation type="obsolete">Преобразование вход�щих MIDI-�ообщений</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Midi Input Filter</source>
-        <translation type="unfinished">Фильтр вход�щих MIDI-�обытий</translation>
+        <translation type="obsolete">Фильтр вход�щих MIDI-�обытий</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Midi Remote Control</source>
-        <translation type="unfinished">Ди�танционное управление MIDI</translation>
+        <translation type="obsolete">Ди�танционное управление MIDI</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Rhythm Generator</source>
-        <translation type="unfinished">Генератор Ритма</translation>
+        <translation type="obsolete">Генератор Ритма</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Reset Instr.</source>
-        <translation type="unfinished">Перезагрузить Ин�тр.</translation>
+        <translation type="obsolete">Перезагрузить Ин�тр.</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Init Instr.</source>
-        <translation type="unfinished">Запу�тить Ин�тр.</translation>
+        <translation type="obsolete">Запу�тить Ин�тр.</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Local Off</source>
-        <translation type="unfinished">откл. локальное управление</translation>
+        <translation type="obsolete">откл. локальное управление</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Bounce to Track</source>
-        <translation type="unfinished">Све�ти в трек</translation>
+        <translation type="obsolete">Све�ти в трек</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Bounce to File</source>
-        <translation type="unfinished">Све�ти в файл</translation>
+        <translation type="obsolete">Све�ти в файл</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Restart Audio</source>
-        <translation type="unfinished">Перезапу�тить аудио</translation>
+        <translation type="obsolete">Перезапу�тить аудио</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Mixer Automation</source>
-        <translation type="unfinished">�втоматизаци� микшера</translation>
+        <translation type="obsolete">�втоматизаци� микшера</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Take Snapshot</source>
-        <translation type="unfinished">Сделать �нимок</translation>
+        <translation type="obsolete">Сделать �нимок</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Clear Automation Data</source>
-        <translation type="unfinished">Удалить Данные �втоматизации</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Cascade</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Tile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>In rows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>In columns</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Удалить Данные �втоматизации</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Global Settings</source>
-        <translation type="unfinished">Общие на�тройки</translation>
+        <translation type="obsolete">Общие на�тройки</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Configure Shortcuts</source>
-        <translation type="unfinished">�а�троить гор�чие клавиши</translation>
+        <translation type="obsolete">�а�троить гор�чие клавиши</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Follow Song</source>
-        <translation type="unfinished">�ледовать за проектом</translation>
+        <translation type="obsolete">�ледовать за проектом</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Don&apos;t Follow Song</source>
-        <translation type="unfinished">не �ледовать за проектом</translation>
+        <translation type="obsolete">не �ледовать за проектом</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Follow Page</source>
-        <translation type="unfinished">�ледовать по�транично</translation>
+        <translation type="obsolete">�ледовать по�транично</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Follow Continuous</source>
-        <translation type="unfinished">�ледовать плавно</translation>
+        <translation type="obsolete">�ледовать плавно</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Metronome</source>
-        <translation type="unfinished">Метроном</translation>
+        <translation type="obsolete">Метроном</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Midi Sync</source>
-        <translation type="unfinished">MIDI-�инхр</translation>
+        <translation type="obsolete">MIDI-�инхр</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Midi File Import/Export</source>
-        <translation type="unfinished">Импорт/Эк�порт midi-файла</translation>
+        <translation type="obsolete">Импорт/Эк�порт midi-файла</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Appearance Settings</source>
-        <translation type="unfinished">�а�тройки вида</translation>
+        <translation type="obsolete">�а�тройки вида</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Midi Ports / Soft Synth</source>
-        <translation type="unfinished">MIDI-порты / Прогр. �интезаторы</translation>
+        <translation type="obsolete">MIDI-порты / Прогр. �интезаторы</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>&amp;Manual</source>
-        <translation type="unfinished">&amp;Руковод�тво</translation>
+        <translation type="obsolete">&amp;Руковод�тво</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;MusE Homepage</source>
-        <translation type="unfinished">&amp;Домашн�� �траница MusE</translation>
+        <translation type="obsolete">&amp;Домашн�� �траница MusE</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Report Bug...</source>
-        <translation type="unfinished">&amp;Сообщить об ошибке...</translation>
+        <translation type="obsolete">&amp;Сообщить об ошибке...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;About MusE</source>
-        <translation type="unfinished">&amp;О программе MusE</translation>
+        <translation type="obsolete">&amp;О программе MusE</translation>
     </message>
     <message>
-        <location line="+99"/>
         <source>File Buttons</source>
-        <translation type="unfinished">Файловые кнопки</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Undo/Redo</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Файловые кнопки</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Transport</source>
-        <translation type="unfinished">Тран�порт</translation>
+        <translation type="obsolete">Тран�порт</translation>
     </message>
     <message>
-        <location line="+55"/>
         <source>&amp;File</source>
-        <translation type="unfinished">&amp;Файл</translation>
+        <translation type="obsolete">&amp;Файл</translation>
     </message>
     <message>
-        <location line="+29"/>
         <source>&amp;View</source>
-        <translation type="unfinished">&amp;Вид</translation>
+        <translation type="obsolete">&amp;Вид</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>&amp;Midi</source>
-        <translation type="unfinished">&amp;MIDI</translation>
+        <translation type="obsolete">&amp;MIDI</translation>
     </message>
     <message>
-        <location line="+29"/>
         <source>&amp;Audio</source>
-        <translation type="unfinished">&amp;�удио</translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>A&amp;utomation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&amp;Windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>MusE Se&amp;ttings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+23"/>
-        <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&amp;�удио</translation>
     </message>
     <message>
-        <location line="+268"/>
         <source>Cannot read template</source>
-        <translation type="unfinished">�е могу прочитать шаблон</translation>
+        <translation type="obsolete">�е могу прочитать шаблон</translation>
     </message>
     <message>
-        <location line="+31"/>
         <source>File open error</source>
-        <translation type="unfinished">Ошибка при открытии файла</translation>
+        <translation type="obsolete">Ошибка при открытии файла</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>File read error</source>
-        <translation type="unfinished">Ошибка прочтени� файла</translation>
+        <translation type="obsolete">Ошибка прочтени� файла</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Unknown File Format: </source>
-        <translation type="unfinished">�е�зве�тный формат файла: </translation>
+        <translation type="obsolete">�е�зве�тный формат файла: </translation>
     </message>
     <message>
-        <location line="+130"/>
-        <location line="+408"/>
-        <location line="+895"/>
         <source>MusE: Song: </source>
-        <translation type="unfinished">MusE: Проект: </translation>
+        <translation type="obsolete">MusE: Проект: </translation>
     </message>
     <message>
-        <location line="-1269"/>
         <source>MusE: load project</source>
-        <translation type="unfinished">MusE: Открыть проект</translation>
+        <translation type="obsolete">MusE: Открыть проект</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>MusE: load template</source>
-        <translation type="unfinished">MusE: открыть шаблон</translation>
-    </message>
-    <message>
-        <location line="+62"/>
-        <source>MusE: Write File failed</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">MusE: открыть шаблон</translation>
     </message>
     <message>
-        <location line="+38"/>
         <source>The current Project contains unsaved data
 Save Current Project?</source>
-        <translation type="unfinished">Текущий проект �одержит не �охранённые данные.
+        <translation type="obsolete">Текущий проект �одержит не �охранённые данные.
 Сохранить текущий проект?</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location line="+1207"/>
-        <source>S&amp;kip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-1207"/>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+236"/>
-        <location line="+13"/>
         <source>MusE: Save As</source>
-        <translation type="unfinished">MusE: Сохранить как</translation>
+        <translation type="obsolete">MusE: Сохранить как</translation>
     </message>
     <message>
-        <location line="+57"/>
-        <location line="+161"/>
         <source>Nothing to edit</source>
-        <translation type="unfinished">�ечего редактировать</translation>
+        <translation type="obsolete">�ечего редактировать</translation>
     </message>
     <message>
-        <location line="+474"/>
-        <location line="+10"/>
-        <location line="+31"/>
-        <location line="+34"/>
-        <location line="+8"/>
         <source>MusE: Bounce to Track</source>
-        <translation type="unfinished">MusE: Сведение в Трек</translation>
+        <translation type="obsolete">MusE: Сведение в Трек</translation>
     </message>
     <message>
-        <location line="-82"/>
         <source>No wave tracks found</source>
-        <translation type="unfinished">wave-треки не найдены</translation>
+        <translation type="obsolete">wave-треки не найдены</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location line="+105"/>
         <source>No audio output tracks found</source>
-        <translation type="unfinished">Выходные аудио треки не найдены</translation>
+        <translation type="obsolete">Выходные аудио треки не найдены</translation>
     </message>
     <message>
-        <location line="-74"/>
         <source>Select one audio output track,
 and one target wave track</source>
-        <translation type="unfinished">Выберите один трек аудио выхода
+        <translation type="obsolete">Выберите один трек аудио выхода
 и один wave-трек, как цель </translation>
     </message>
     <message>
-        <location line="+34"/>
         <source>Select one target wave track</source>
-        <translation type="unfinished">Выделите один wave-трек, как цель (трек назначени�) </translation>
+        <translation type="obsolete">Выделите один wave-трек, как цель (трек назначени�) </translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Select one target wave track,
 and one audio output track</source>
-        <translation type="unfinished">Выберите один wave-трек, как цель,
+        <translation type="obsolete">Выберите один wave-трек, как цель,
 (трек назначени�) и один трек аудио выхода</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location line="+25"/>
         <source>MusE: Bounce to File</source>
-        <translation type="unfinished">MusE: Све�ти в файл</translation>
+        <translation type="obsolete">MusE: Све�ти в файл</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Select one audio output track</source>
-        <translation type="unfinished">Выделите один трек аудио выхода</translation>
+        <translation type="obsolete">Выделите один трек аудио выхода</translation>
     </message>
     <message>
-        <location line="+39"/>
         <source>MusE: Bounce</source>
-        <translation type="unfinished">MusE: Све�ти</translation>
+        <translation type="obsolete">MusE: Све�ти</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>set left/right marker for bounce range</source>
-        <translation type="unfinished">на�тройте левый/правый маркеры дл� у�тановки диапазона �ведени�</translation>
+        <translation type="obsolete">на�тройте левый/правый маркеры дл� у�тановки диапазона �ведени�</translation>
     </message>
     <message>
-        <location line="+82"/>
         <source>The current Project contains unsaved data
 Load overwrites current Project:
 Save Current Project?</source>
-        <translation type="unfinished">Текущий проект �одержит не �охранённые данные.
+        <translation type="obsolete">Текущий проект �одержит не �охранённые данные.
 Загрузка нового проекта приведёт к перезапи�и данных текущего проекта.
 Сохранить текущий проект?</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location filename="../../muse/importmidi.cpp" line="+86"/>
         <source>&amp;Abort</source>
-        <translation type="unfinished">&amp;Отмена</translation>
+        <translation type="obsolete">&amp;Отмена</translation>
     </message>
     <message>
-        <location filename="../../muse/exportmidi.cpp" line="+143"/>
         <source>MusE: Export Midi</source>
-        <translation type="unfinished">MusE:Эк�порт MIDI</translation>
+        <translation type="obsolete">MusE:Эк�порт MIDI</translation>
     </message>
     <message>
-        <location filename="../../muse/help.cpp" line="+50"/>
         <source>no help found at: </source>
-        <translation type="unfinished">�правка не найдена в: </translation>
+        <translation type="obsolete">�правка не найдена в: </translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>MusE: Open Help</source>
-        <translation type="unfinished">MusE: Открыть �правку</translation>
-    </message>
-    <message>
-        <location line="+53"/>
-        <source>Unable to launch help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>For some reason MusE has to launch the default
-browser on your machine.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">MusE: Открыть �правку</translation>
     </message>
     <message>
-        <location filename="../../muse/importmidi.cpp" line="-12"/>
         <source>MusE: Import Midi</source>
-        <translation type="unfinished">MusE: Импорт MIDI</translation>
+        <translation type="obsolete">MusE: Импорт MIDI</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Add midi file to current project?
 </source>
-        <translation type="unfinished">Добавить midi файл в текущий проект?
+        <translation type="obsolete">Добавить midi файл в текущий проект?
 </translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Add to Project</source>
-        <translation type="unfinished">&amp;Добавить в Проект</translation>
+        <translation type="obsolete">&amp;Добавить в Проект</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Replace</source>
-        <translation type="unfinished">&amp;Заменить</translation>
+        <translation type="obsolete">&amp;Заменить</translation>
     </message>
     <message>
-        <location line="+31"/>
         <source>reading midifile
   </source>
-        <translation type="unfinished">читает�� MIDI-файл
+        <translation type="obsolete">читает�� MIDI-файл
   
   </translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>
 failed: </source>
-        <translation type="unfinished">
+        <translation type="obsolete">
 не удало�ь:</translation>
     </message>
     <message>
-        <location line="+356"/>
         <source>Import part is only valid for midi and wave tracks!</source>
-        <translation type="unfinished">Импортирование партий допу�тимо только дл� midi и wave треков!</translation>
+        <translation type="obsolete">Импортирование партий допу�тимо только дл� midi и wave треков!</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>MusE: load part</source>
-        <translation type="unfinished">MusE: открыть партию</translation>
+        <translation type="obsolete">MusE: открыть партию</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>No track selected for import</source>
-        <translation type="unfinished">�е выбран трек дл� импорта</translation>
-    </message>
-    <message>
-        <location line="+121"/>
-        <source> out of </source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">�е выбран трек дл� импорта</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source> parts</source>
-        <translation type="unfinished"> партии</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source> part</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"> партии</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source> could not be imported.
 Likely the track is the wrong type.</source>
-        <translation type="unfinished"> не может быть импортирована
+        <translation type="obsolete"> не может быть импортирована
 Возможно неверный тип трека.</translation>
     </message>
     <message>
-        <location filename="../../muse/wave.cpp" line="-6"/>
         <source>to import an audio file you have first to selecta wave track</source>
-        <translation type="unfinished">чтобы импортировать аудио файл, вы должны �начала выделить wave-трек</translation>
+        <translation type="obsolete">чтобы импортировать аудио файл, вы должны �начала выделить wave-трек</translation>
     </message>
     <message>
-        <location line="+30"/>
         <source>Import Wavefile</source>
-        <translation type="unfinished">Импортировать wave-файл</translation>
+        <translation type="obsolete">Импортировать wave-файл</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>This wave file has a samplerate of %1,
 as opposed to current setting %2.
 Do you still want to import it?</source>
-        <translation type="unfinished">Samplerate �того wave-файла %1,
+        <translation type="obsolete">Samplerate �того wave-файла %1,
 в то врем� как текущий Samplerate %2.
 Хотите ли вы импортировать его?</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>&amp;Yes</source>
-        <translation type="unfinished">&amp;Да</translation>
+        <translation type="obsolete">&amp;Да</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>&amp;No</source>
-        <translation type="unfinished">&amp;�ет</translation>
+        <translation type="obsolete">&amp;�ет</translation>
     </message>
 </context>
 <context>
     <name>MusEArranger::Arranger</name>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="-74"/>
+        <source>Enable Recording</source>
+        <translation type="obsolete">Разрешить запи�ь</translation>
+    </message>
+    <message>
+        <source>Mute/Off Indicator</source>
+        <translation type="obsolete">Индикатор глушени� вкл/выкл</translation>
+    </message>
+    <message>
+        <source>Solo Indicator</source>
+        <translation type="obsolete">Индикатор �оло</translation>
+    </message>
+    <message>
+        <source>Track Type</source>
+        <translation type="obsolete">Тип трека</translation>
+    </message>
+    <message>
+        <source>Track Name</source>
+        <translation type="obsolete">Им� трека</translation>
+    </message>
+    <message>
+        <source>Midi output channel number or audio channels</source>
+        <translation type="obsolete">�омер выходного Midi-канала или аудио каналов</translation>
+    </message>
+    <message>
+        <source>Midi output port or synth midi port</source>
+        <translation type="obsolete">Выходной midi-порт или midi-порт �интезатора</translation>
+    </message>
+    <message>
+        <source>Time Lock</source>
+        <translation type="obsolete">Изменение времени заблокировано</translation>
+    </message>
+    <message>
+        <source>Enable recording. Click to toggle.</source>
+        <translation type="obsolete">Разрешить запи�ь. Щелкните дл� переключени�.</translation>
+    </message>
+    <message>
+        <source>Mute indicator. Click to toggle.
+Right-click to toggle track on/off.
+Mute is designed for rapid, repeated action.
+On/Off is not!</source>
+        <translation type="obsolete">Индикатор заглушки. Щелкните дл� переключени�.
+Щелчок правой кнопкой мыши включает/выключает трек.
+Заглушка предназначена дл� бы�трых, повтор�ющих�� дей�твий.
+� Вкл/Выкл нет!</translation>
+    </message>
+    <message>
+        <source>Solo indicator. Click to toggle.
+Connected tracks are also &apos;phantom&apos; soloed,
+ indicated by a dark square.</source>
+        <translation type="obsolete">Индикатор Соло.  Щелкните дл� переключени�.
+В�е треки, �в�занные � �тим треком тоже перейдут режим &quot;фантомного&quot; �оло,
+Они будут обозначены темными квадратами.</translation>
+    </message>
+    <message>
+        <source>Track type. Right-click to change
+ midi and drum track types.</source>
+        <translation type="obsolete">Тип трека. Щелкните правой кнопкой мыши чтобы
+изменить тип трека (midi-трек или трек ударных).</translation>
+    </message>
+    <message>
+        <source>Track name. Double-click to edit.
+Right-click for more options.</source>
+        <translation type="obsolete">�азвание трека. Редактирование - двойной щелчок.
+Большее количе�тво опций -  правый щелчок мыши.</translation>
+    </message>
+    <message>
+        <source>Midi/drum track: Output channel number.
+Audio track: Channels.
+Mid/right-click to change.</source>
+        <translation type="obsolete">Трек Midi/Ударных: номер канала выхода.
+�удио трек: Каналы.
+Чтобы изменить, щелкните Средней/Правой кнопкой мыши.</translation>
+    </message>
+    <message>
+        <source>Midi/drum track: Output port.
+Synth track: Assigned midi port.
+Left-click to change.
+Right-click to show GUI.</source>
+        <translation type="obsolete">Трек Midi/Ударных: Порт выхода.
+Трек �интезатора: �азначенный midi-порт.
+Щелчок левой кнопкой - изменить.
+Щелчок правой кнопкой - показать ГИП.</translation>
+    </message>
+    <message>
+        <source>Time lock</source>
+        <translation type="obsolete">Изменение времени заблокировано</translation>
+    </message>
+    <message>
+        <source>Arranger</source>
+        <translation type="obsolete">Компоновщик</translation>
+    </message>
+    <message>
+        <source>Cursor</source>
+        <translation type="obsolete">Кур�ор</translation>
+    </message>
+    <message>
+        <source>Snap</source>
+        <translation type="obsolete">Прив�зка</translation>
+    </message>
+    <message>
+        <source>Len</source>
+        <translation type="obsolete">Дл</translation>
+    </message>
+    <message>
+        <source>song length - bars</source>
+        <translation type="obsolete">длина проекта - в тактах</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="obsolete">Тип</translation>
+    </message>
+    <message>
+        <source>NO</source>
+        <translation type="obsolete">�ЕТ</translation>
+    </message>
+    <message>
+        <source>GM</source>
+        <translation type="obsolete">GM</translation>
+    </message>
+    <message>
+        <source>GS</source>
+        <translation type="obsolete">GS</translation>
+    </message>
+    <message>
+        <source>XG</source>
+        <translation type="obsolete">XG</translation>
+    </message>
+    <message>
+        <source>midi song type</source>
+        <translation type="obsolete">тип midi-проекта</translation>
+    </message>
+    <message>
+        <source>Pitch</source>
+        <translation type="obsolete">Вы�ота тона</translation>
+    </message>
+    <message>
+        <source>midi pitch</source>
+        <translation type="obsolete">midi вы�отно�ть</translation>
+    </message>
+    <message>
+        <source>global midi pitch shift</source>
+        <translation type="obsolete">общий �двиг midi-вы�отно�ти</translation>
+    </message>
+    <message>
+        <source>Tempo</source>
+        <translation type="obsolete">Темп</translation>
+    </message>
+    <message>
+        <source>midi tempo</source>
+        <translation type="obsolete">midi-темп</translation>
+    </message>
+    <message>
+        <source>N</source>
+        <translation type="obsolete">N</translation>
+    </message>
+    <message>
+        <source>TrackInfo</source>
+        <translation type="obsolete">ТрекИнфо</translation>
+    </message>
+    <message>
+        <source>R</source>
+        <translation type="obsolete">R</translation>
+    </message>
+    <message>
+        <source>M</source>
+        <translation type="obsolete">M</translation>
+    </message>
+    <message>
+        <source>S</source>
+        <translation type="obsolete">S</translation>
+    </message>
+    <message>
+        <source>C</source>
+        <translation type="obsolete">Т</translation>
+    </message>
+    <message>
+        <source>Track</source>
+        <translation type="obsolete"> Трек</translation>
+    </message>
+    <message>
+        <source>Port</source>
+        <translation type="obsolete">Порт</translation>
+    </message>
+    <message>
+        <source>Ch</source>
+        <translation type="obsolete">Кан</translation>
+    </message>
+    <message>
+        <source>T</source>
+        <translation type="obsolete">Т</translation>
+    </message>
+    <message>
+        <source>Automation</source>
+        <translation type="obsolete">�втоматизаци�</translation>
+    </message>
+</context>
+<context>
+    <name>MusEArranger::ArrangerView</name>
+    <message>
+        <source>panic</source>
+        <translation type="obsolete">паника</translation>
+    </message>
+    <message>
+        <source>transport</source>
+        <translation type="obsolete">тран�порт</translation>
+    </message>
+    <message>
+        <source>C&amp;ut</source>
+        <translation type="obsolete">&amp;Вырезать</translation>
+    </message>
+    <message>
+        <source>&amp;Copy</source>
+        <translation type="obsolete">С&amp;копировать</translation>
+    </message>
+    <message>
+        <source>&amp;Paste</source>
+        <translation type="obsolete">&amp;В�тавить</translation>
+    </message>
+    <message>
+        <source>Paste c&amp;lone</source>
+        <translation type="obsolete">В�тавить к&amp;лон</translation>
+    </message>
+    <message>
+        <source>&amp;Insert Empty Measure</source>
+        <translation type="obsolete">&amp;В�тавить пу�той такт</translation>
+    </message>
+    <message>
+        <source>Delete Selected Tracks</source>
+        <translation type="obsolete">Удалить выделенные треки</translation>
+    </message>
+    <message>
+        <source>Add Track</source>
+        <translation type="obsolete">Добавить трек</translation>
+    </message>
+    <message>
+        <source>Select</source>
+        <translation type="obsolete">Выделить</translation>
+    </message>
+    <message>
+        <source>&amp;Deselect All</source>
+        <translation type="obsolete">&amp;Убрать выделение</translation>
+    </message>
+    <message>
+        <source>&amp;Inside Loop</source>
+        <translation type="obsolete">&amp;Внутри цикла</translation>
+    </message>
+    <message>
+        <source>&amp;Outside Loop</source>
+        <translation type="obsolete">&amp;Вне цикла</translation>
+    </message>
+    <message>
+        <source>All &amp;Parts on Track</source>
+        <translation type="obsolete">В�е &amp;партии в треке</translation>
+    </message>
+    <message>
+        <source>Pianoroll</source>
+        <translation type="obsolete">Пианоролл</translation>
+    </message>
+    <message>
+        <source>Drums</source>
+        <translation type="obsolete">Ударные</translation>
+    </message>
+    <message>
+        <source>List</source>
+        <translation type="obsolete">Спи�ок</translation>
+    </message>
+    <message>
+        <source>Wave</source>
+        <translation type="obsolete">Wave</translation>
+    </message>
+    <message>
+        <source>Mastertrack</source>
+        <translation type="obsolete">Ма�тер-трек</translation>
+    </message>
+    <message>
+        <source>Graphic</source>
+        <translation type="obsolete">Графика</translation>
+    </message>
+    <message>
+        <source>Midi &amp;Transform</source>
+        <translation type="obsolete">&amp;Преобразовать MIDI-�ообщени�</translation>
+    </message>
+    <message>
+        <source>Global Cut</source>
+        <translation type="obsolete">Глобальное вырезание</translation>
+    </message>
+    <message>
+        <source>Global Insert</source>
+        <translation type="obsolete">Глобальна� в�тавка</translation>
+    </message>
+    <message>
+        <source>Global Split</source>
+        <translation type="obsolete">Глобальное разделение</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="obsolete">&amp;Правка</translation>
+    </message>
+    <message>
+        <source>&amp;Structure</source>
+        <translation type="obsolete">&amp;Структура</translation>
+    </message>
+    <message>
+        <source>Transpose</source>
+        <translation type="obsolete">Тран�понировать</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="obsolete">�овый</translation>
+    </message>
+</context>
+<context>
+    <name>MusEArranger::PartCanvas</name>
+    <message>
+        <source>Cannot copy/move/clone to different Track-Type</source>
+        <translation type="obsolete">�евозможно копировать/перемещать/клонировать данные в другие типы дорожек</translation>
+    </message>
+    <message>
+        <source>C&amp;ut</source>
+        <translation type="obsolete">&amp;Вырезать</translation>
+    </message>
+    <message>
+        <source>&amp;Copy</source>
+        <translation type="obsolete">С&amp;копировать</translation>
+    </message>
+    <message>
+        <source>s&amp;elect </source>
+        <translation type="obsolete">В&amp;ыбрать </translation>
+    </message>
+    <message>
+        <source>clones</source>
+        <translation type="obsolete">клоны</translation>
+    </message>
+    <message>
+        <source>rename</source>
+        <translation type="obsolete">Переименовать</translation>
+    </message>
+    <message>
+        <source>color</source>
+        <translation type="obsolete">цвет</translation>
+    </message>
+    <message>
+        <source>delete</source>
+        <translation type="obsolete">удалить</translation>
+    </message>
+    <message>
+        <source>split</source>
+        <translation type="obsolete">разделить</translation>
+    </message>
+    <message>
+        <source>de-clone</source>
+        <translation type="obsolete">деклонировать</translation>
+    </message>
+    <message>
+        <source>wave edit</source>
+        <translation type="obsolete">Редактор �емплов</translation>
+    </message>
+    <message>
+        <source>file info</source>
+        <translation type="obsolete">файл-инфо</translation>
+    </message>
+    <message>
+        <source>MusE: save part</source>
+        <translation type="obsolete">MusE: �охранить партию</translation>
+    </message>
+    <message>
+        <source>Part name</source>
+        <translation type="obsolete">Им� партии</translation>
+    </message>
+    <message>
+        <source>Files</source>
+        <translation type="obsolete">Файлы</translation>
+    </message>
+    <message>
+        <source> parts</source>
+        <translation type="obsolete"> партии</translation>
+    </message>
+    <message>
+        <source> could not be pasted.
+Likely the selected track is the wrong type.</source>
+        <translation type="obsolete"> не может быть в�тавлена.
+Возможно выбранный трек не того типа.</translation>
+    </message>
+    <message>
+        <source>Cannot paste: multiple tracks selected</source>
+        <translation type="obsolete">В�тавка невозможна: выделено не�колько треков</translation>
+    </message>
+    <message>
+        <source>Cannot paste: no track selected</source>
+        <translation type="obsolete">В�тавка невозможна: не выделено ни  одного трека</translation>
+    </message>
+    <message>
+        <source>Can only paste to midi/drum track</source>
+        <translation type="obsolete">Можно в�тавить только в midi/drum трек</translation>
+    </message>
+    <message>
+        <source>Can only paste to wave track</source>
+        <translation type="obsolete">Можно в�тавить только в звуковой трек</translation>
+    </message>
+    <message>
+        <source>Can only paste to midi or wave track</source>
+        <translation type="obsolete">Можно в�тавить только в midi или wave треки</translation>
+    </message>
+    <message>
+        <source>Cannot paste: wrong data type</source>
+        <translation type="obsolete">В�тавка невозможна: неверный тип данных</translation>
+    </message>
+</context>
+<context>
+    <name>MusEArranger::TList</name>
+    <message>
+        <source>&lt;none&gt;</source>
+        <translation type="obsolete">&lt;ничего&gt;</translation>
+    </message>
+    <message>
+        <source>MusE: bad trackname</source>
+        <translation type="obsolete">MusE: неверное им� трека</translation>
+    </message>
+    <message>
+        <source>please choose a unique track name</source>
+        <translation type="obsolete">Выберите неповтор�ющее�� им� дл� трека</translation>
+    </message>
+    <message>
+        <source>Update drummap?</source>
+        <translation type="obsolete">Обновить карту ударных?</translation>
+    </message>
+    <message>
+        <source>Do you want to use same port for all instruments in the drummap?</source>
+        <translation type="obsolete">Вы хотите и�пользовать один и тот же порт дл� в�ех ин�трументов в �пи�ке ударных?</translation>
+    </message>
+    <message>
+        <source>&amp;Yes</source>
+        <translation type="obsolete">&amp;Да</translation>
+    </message>
+    <message>
+        <source>&amp;No</source>
+        <translation type="obsolete">&amp;�ет</translation>
+    </message>
+    <message>
+        <source>show gui</source>
+        <translation type="obsolete">показать ГИП</translation>
+    </message>
+    <message>
+        <source>show native gui</source>
+        <translation type="obsolete">показать ГИП</translation>
+    </message>
+    <message>
+        <source>Delete Track</source>
+        <translation type="obsolete">Удалить трек</translation>
+    </message>
+    <message>
+        <source>Track Comment</source>
+        <translation type="obsolete">Комментарий к треку</translation>
+    </message>
+    <message>
+        <source>Drum</source>
+        <translation type="obsolete">Ударные</translation>
+    </message>
+    <message>
+        <source>Do you want to use same port and channel for all instruments in the drummap?</source>
+        <translation type="obsolete">Вы хотите и�пользовать один и тот же порт и канал дл� в�ех ин�трументов в �пи�ке ударных?</translation>
+    </message>
+</context>
+<context>
+    <name>MusECore::Song</name>
+    <message>
+        <location filename="../../muse/song.cpp" line="+2233"/>
+        <source>Jack shutdown!</source>
+        <translation type="unfinished">Jack прекратил работу!</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Jack has detected a performance problem which has lead to
+MusE being disconnected.
+This could happen due to a number of reasons:
+- a performance issue with your particular setup.
+- a bug in MusE (or possibly in another connected software).
+- a random hiccup which might never occur again.
+- jack was voluntary stopped by you or someone else
+- jack crashed
+If there is a persisting problem you are much welcome to discuss it
+on the MusE mailinglist.
+(there is information about joining the mailinglist on the MusE
+ homepage which is available through the help menu)
+
+To proceed check the status of Jack and try to restart it and then .
+click on the Restart button.</source>
+        <translation type="unfinished">Проблемы в работе &quot;Jack&quot;, привели к его ра��оединению � &quot;MusE&quot;.
+Это могло произойти по разным причинам:
+-проблемы в работе, вызванные о�обенно�тью ваших на�троек.
+-баг в &quot;MusE&quot; (или, возможно, в других под�оединенных программах).
+-�лучайное выключение, которое больше никогда не повторит��.
+-&quot;Jack&quot; о�тановлен вами или кем-нибудь еще.
+-&quot;Jack&quot; рухнул
+Е�ли �то по�то�нна� проблема мы приглашаем ва� об�удить её
+в почтовой ра��ылке &quot;MusE&quot;.
+(в меню &quot;Помощь&quot; е�ть информаци� о том, как при�оединить��
+к почтовой ра��ылке &quot;MusE&quot;)
+
+Чтобы продолжить работу, проверте �о�то�ние &quot;Jack&quot;, по�тарайте�ь
+перезапу�тить его, а затем щелкните по кнопке &quot;Перезапу�тить&quot;.
+
+</translation>
+    </message>
+    <message>
+        <location line="+186"/>
+        <location line="+179"/>
+        <source>Automation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-177"/>
+        <source>previous event</source>
+        <translation type="unfinished">предыдущее �обытие</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>next event</source>
+        <translation type="unfinished">�ледующее �обытие</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <location line="+169"/>
+        <source>set event</source>
+        <translation type="unfinished">на�троить �обытие</translation>
+    </message>
+    <message>
+        <location line="-167"/>
+        <location line="+169"/>
+        <source>add event</source>
+        <translation type="unfinished">добавить �обытие</translation>
+    </message>
+    <message>
+        <location line="-165"/>
+        <location line="+170"/>
+        <source>erase event</source>
+        <translation type="unfinished">�тереть �обытие</translation>
+    </message>
+    <message>
+        <location line="-166"/>
+        <source>erase range</source>
+        <translation type="unfinished">�тереть диапазон</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>clear automation</source>
+        <translation type="unfinished">Очи�тить автоматизацию</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Clear all controller events?</source>
+        <translation type="unfinished">Очи�тить в�е �обыти� контроллеров?</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>&amp;Ok</source>
+        <translation type="unfinished">&amp;ОК</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+878"/>
+        <source>MusE - external script failed</source>
+        <translation type="unfinished">MusE - ошибка запу�ка внешнего �крипта</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>MusE was unable to launch the script, error message:
+%1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::Appearance</name>
+    <message>
+        <location filename="../../muse/appearance.cpp" line="+132"/>
+        <source>Main application font, and default font for any
+ controls not defined here.</source>
+        <translation type="unfinished">Главный шрифт приложени�, и шрифт по умолчанию 
+дл� в�ех �ред�тв управлени�, зде�ь не определены.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>For small controls like mixer strips.
+Also timescale small numbers, arranger part name overlay,
+ and effects rack.</source>
+        <translation type="unfinished">Дл� небольших �ред�тв контрол�, типа линеек микшера.
+Также дл� маленьких цифр на линейке времени, названий партий в компоновщике и р�ка �ффектов.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi track info panel. Transport controls.</source>
+        <translation type="unfinished">Инфо-панель Midi-трека. Управление тран�портом.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Controller graph and S/X buttons. Large numbers for time
+ and tempo scale, and time signature.</source>
+        <translation type="unfinished">Диаграмма контроллера и S/X кнопки. Большие цифры дл�
+линеек времени и темпа, а также дл� тактового размера.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Time scale markers.</source>
+        <translation type="unfinished">Маркеры на линейке времени.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>List editor: meta event edit dialog multi-line edit box.</source>
+        <translation type="unfinished">Редактор �пи�ка: редактирование мета-�обыти� много�трочное окно редактировани�. </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mixer label font. Auto-font-sizing up to chosen font size.
+Word-breaking but only with spaces.</source>
+        <translation type="unfinished">Шрифт метки микшера. �втоматиче�кое изменение размера шрифта до выбранного размера.
+Перено�ы только по пробелам.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Maximum mixer label auto-font-sizing font size.</source>
+        <translation type="unfinished">Мак�имальный размер автоматиче�ки измен�ющего�� шрифта метки микшера.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Global opacity (opposite of transparency).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Standard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Custom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+624"/>
+        <source>MusE: load image</source>
+        <translation type="unfinished">MusE: загрузить изображение</translation>
+    </message>
+    <message>
+        <location line="+334"/>
+        <source>Select style sheet</source>
+        <translation type="unfinished">Выберите таблицу �тилей</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Qt style sheets (*.qss)</source>
+        <translation type="unfinished">Таблицы �тилей Qt (*.qss)</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::Arranger</name>
+    <message>
+        <location filename="../../muse/arranger/arranger.cpp" line="+81"/>
         <source>Enable Recording</source>
         <translation type="unfinished">Разрешить запи�ь</translation>
     </message>
@@ -11343,7 +11181,17 @@ Right-click to show GUI.</source>
         <translation type="unfinished">Кур�ор</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+10"/>
+        <source>Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Bar</source>
+        <translation type="unfinished">Такт</translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Snap</source>
         <translation type="unfinished">Прив�зка</translation>
     </message>
@@ -11477,7 +11325,7 @@ Right-click to show GUI.</source>
     </message>
 </context>
 <context>
-    <name>MusEArranger::ArrangerView</name>
+    <name>MusEGui::ArrangerView</name>
     <message>
         <location filename="../../muse/arranger/arrangerview.cpp" line="+83"/>
         <source>MusE: Arranger</source>
@@ -11499,7 +11347,7 @@ Right-click to show GUI.</source>
         <translation type="unfinished">тран�порт</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+31"/>
         <source>C&amp;ut</source>
         <translation type="unfinished">&amp;Вырезать</translation>
     </message>
@@ -11605,12 +11453,12 @@ Right-click to show GUI.</source>
     </message>
     <message>
         <location line="+3"/>
-        <source>all parts in one staff</source>
+        <source>all tracks in one staff</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>one staff per part</source>
+        <source>one staff per track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -11670,6 +11518,21 @@ Right-click to show GUI.</source>
         <translation type="unfinished">Глобальное разделение</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Global Cut - selected tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Global Insert - selected tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Global Split - selected tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+8"/>
         <source>&amp;Edit</source>
         <translation type="unfinished">&amp;Правка</translation>
@@ -11680,7 +11543,7 @@ Right-click to show GUI.</source>
         <translation type="unfinished">&amp;Структура</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+11"/>
         <source>Functions</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11740,486 +11603,1106 @@ Right-click to show GUI.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+308"/>
+        <location line="+314"/>
         <location line="+6"/>
         <source>New</source>
         <translation type="unfinished">�овый</translation>
     </message>
 </context>
 <context>
-    <name>MusEArranger::PartCanvas</name>
+    <name>MusEGui::AudioMixerApp</name>
     <message>
-        <location filename="../../muse/arranger/pcanvas.cpp" line="+346"/>
-        <source>Cannot copy/move/clone to different Track-Type</source>
-        <translation type="unfinished">�евозможно копировать/перемещать/клонировать данные в другие типы дорожек</translation>
+        <location filename="../../muse/mixer/amixer.cpp" line="+171"/>
+        <source>&amp;Create</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+261"/>
-        <source>C&amp;ut</source>
-        <translation type="unfinished">&amp;Вырезать</translation>
+        <location line="+4"/>
+        <source>&amp;View</source>
+        <translation type="unfinished">&amp;Вид</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>&amp;Copy</source>
-        <translation type="unfinished">С&amp;копировать</translation>
+        <location line="+1"/>
+        <source>Routing</source>
+        <translation type="unfinished">Маршрутизаци�</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Show Midi Tracks</source>
+        <translation type="unfinished">Показать Midi-треки</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show Drum Tracks</source>
+        <translation type="unfinished">Показать треки ударных</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show Wave Tracks</source>
+        <translation type="unfinished">Показать Wave-треки</translation>
     </message>
     <message>
         <location line="+6"/>
-        <source>s&amp;elect </source>
-        <translation type="unfinished">В&amp;ыбрать </translation>
+        <source>Show Inputs</source>
+        <translation type="unfinished">Показать входы</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>clones</source>
-        <translation type="unfinished">клоны</translation>
+        <location line="+1"/>
+        <source>Show Outputs</source>
+        <translation type="unfinished">Показать выходы</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>rename</source>
-        <translation type="unfinished">Переименовать</translation>
+        <location line="+1"/>
+        <source>Show Groups</source>
+        <translation type="unfinished">Показать группы</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>color</source>
-        <translation type="unfinished">цвет</translation>
+        <location line="+1"/>
+        <source>Show Auxs</source>
+        <translation type="unfinished">Показать Auxs</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>delete</source>
-        <translation type="unfinished">удалить</translation>
+        <location line="+1"/>
+        <source>Show Synthesizers</source>
+        <translation type="unfinished">Показать �интезаторы</translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::AudioStrip</name>
     <message>
-        <location line="+2"/>
-        <source>split</source>
-        <translation type="unfinished">разделить</translation>
+        <location filename="../../muse/mixer/astrip.cpp" line="+667"/>
+        <source>panorama</source>
+        <translation type="unfinished">панорама</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>glue</source>
+        <source>aux send level</source>
+        <translation type="unfinished">уровень aux по�ыла</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Pan</source>
+        <translation type="unfinished">Пан</translation>
+    </message>
+    <message>
+        <location line="+87"/>
+        <source>1/2 channel</source>
+        <translation type="unfinished">�терео-моно</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Pre</source>
+        <translation type="unfinished">Пре</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>pre fader - post fader</source>
+        <translation type="unfinished">пре федер - по�т федер</translation>
+    </message>
+    <message>
+        <location line="+70"/>
+        <source>dB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+31"/>
+        <source>record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>mute</source>
+        <translation type="unfinished">заглушить</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>record downmix</source>
+        <translation type="unfinished">запи�ать downmix</translation>
+    </message>
+    <message>
         <location line="+2"/>
-        <source>de-clone</source>
-        <translation type="unfinished">деклонировать</translation>
+        <location line="+4"/>
+        <source>solo mode</source>
+        <translation type="unfinished">режим �оло</translation>
     </message>
     <message>
-        <location line="+10"/>
         <location line="+7"/>
-        <location line="+7"/>
-        <source>save part to disk</source>
+        <source>off</source>
+        <translation type="unfinished">выкл</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>iR</source>
+        <translation type="unfinished">вх</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>input routing</source>
+        <translation type="unfinished">маршрут входа</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>oR</source>
+        <translation type="unfinished">вых</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>output routing</source>
+        <translation type="unfinished">маршрут выхода</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-2"/>
-        <source>wave edit</source>
-        <translation type="unfinished">Редактор �емплов</translation>
+        <location line="+1"/>
+        <source>Read</source>
+        <translation type="unfinished">Читать</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>file info</source>
-        <translation type="unfinished">файл-инфо</translation>
+        <location line="+1"/>
+        <source>Touch</source>
+        <translation type="unfinished">По ка�анию</translation>
     </message>
     <message>
-        <location line="+88"/>
-        <source>MusE: save part</source>
-        <translation type="unfinished">MusE: �охранить партию</translation>
+        <location line="+1"/>
+        <source>Write</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>automation type</source>
+        <translation type="unfinished">тип автоматизации</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::BigTime</name>
+    <message>
+        <location filename="../../muse/widgets/bigtime.cpp" line="+62"/>
+        <source>format display</source>
+        <translation type="unfinished">формат ди�пле�</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>bar</source>
+        <translation type="unfinished">такт</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>beat</source>
+        <translation type="unfinished">дол�</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+6"/>
+        <source>tick</source>
+        <translation type="unfinished">тик</translation>
+    </message>
+    <message>
+        <location line="-4"/>
+        <source>minute</source>
+        <translation type="unfinished">минут(а)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>second</source>
+        <translation type="unfinished">�екунд(а)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+3"/>
+        <source>frame</source>
+        <translation type="unfinished">фреймов</translation>
+    </message>
+    <message>
+        <location line="-2"/>
+        <source>subframe</source>
+        <translation type="unfinished">�убфреймов</translation>
     </message>
     <message>
         <location line="+18"/>
-        <source>Part name</source>
-        <translation type="unfinished">Им� партии</translation>
+        <source>MusE: Bigtime</source>
+        <translation type="unfinished">MusE: Хронометр</translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::ClipListEdit</name>
     <message>
-        <location line="+0"/>
-        <source>Files</source>
-        <translation type="unfinished">Файлы</translation>
+        <location filename="../../muse/cliplist/cliplist.cpp" line="+130"/>
+        <source>MusE: Clip List Editor</source>
+        <translation type="unfinished">MusE: Редактор �пи�ка фрагментов</translation>
     </message>
     <message>
-        <location line="+2090"/>
-        <source> out of </source>
+        <location line="+8"/>
+        <source>Undo/Redo tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source> parts</source>
-        <translation type="unfinished"> партии</translation>
+        <location line="+5"/>
+        <source>panic</source>
+        <translation type="unfinished">паника</translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source> part</source>
+        <location line="+4"/>
+        <source>transport</source>
+        <translation type="unfinished">тран�порт</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Window &amp;Config</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::ComboQuant</name>
     <message>
+        <location filename="../../muse/widgets/comboQuant.cpp" line="+40"/>
         <location line="+1"/>
-        <source> could not be pasted.
-Likely the selected track is the wrong type.</source>
-        <translation type="unfinished"> не может быть в�тавлена.
-Возможно выбранный трек не того типа.</translation>
+        <location line="+1"/>
+        <source>Off</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::CtrlPanel</name>
     <message>
-        <location line="+25"/>
-        <source>Cannot paste: multiple tracks selected</source>
-        <translation type="unfinished">В�тавка невозможна: выделено не�колько треков</translation>
+        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="+91"/>
+        <source>S</source>
+        <translation type="unfinished">S</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>select controller</source>
+        <translation type="unfinished">выбрать контроллер</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>X</source>
+        <translation type="unfinished">X</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>remove panel</source>
+        <translation type="unfinished">удалить панель</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>manual adjust</source>
+        <translation type="unfinished">на�тройка вручную</translation>
     </message>
     <message>
         <location line="+9"/>
-        <source>Cannot paste: no track selected</source>
-        <translation type="unfinished">В�тавка невозможна: не выделено ни  одного трека</translation>
+        <source>double click on/off</source>
+        <translation type="unfinished">двойной щелчок вкл/выкл</translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Can only paste to midi/drum track</source>
-        <translation type="unfinished">Можно в�тавить только в midi/drum трек</translation>
+        <location line="+1"/>
+        <source>off</source>
+        <translation type="unfinished">выкл</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>Can only paste to wave track</source>
-        <translation type="unfinished">Можно в�тавить только в звуковой трек</translation>
+        <location line="+443"/>
+        <location line="+236"/>
+        <source>Velocity</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>Can only paste to midi or wave track</source>
-        <translation type="unfinished">Можно в�тавить только в midi или wave треки</translation>
+        <location line="-186"/>
+        <source>add new ...</source>
+        <translation type="unfinished">Добавить новый...</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Cannot paste: wrong data type</source>
-        <translation type="unfinished">В�тавка невозможна: неверный тип данных</translation>
+        <location line="+163"/>
+        <location line="+58"/>
+        <source>Instrument-defined</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-43"/>
+        <location line="+21"/>
+        <source>Add ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-17"/>
+        <source>Others</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Edit instrument ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Common Controls</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MusEArranger::TList</name>
+    <name>MusEGui::DrumEdit</name>
     <message>
-        <location filename="../../muse/arranger/tlist.cpp" line="+362"/>
-        <source>&lt;none&gt;</source>
-        <translation type="unfinished">&lt;ничего&gt;</translation>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="+114"/>
+        <location line="+21"/>
+        <source>mute instrument</source>
+        <translation type="unfinished">заглушить ин�трумент</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <source>no clef</source>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>sound name</source>
+        <translation type="unfinished">название звука</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>volume percent</source>
+        <translation type="unfinished">громко�ть в процентах</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>quantisation</source>
+        <translation type="unfinished">квантование</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>this input note triggers the sound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Treble</source>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>note length</source>
+        <translation type="unfinished">длина ноты</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>this is the note which is played</source>
+        <translation type="unfinished">�то нота, котора� во�производит��</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <source>output channel (hold ctl to affect all rows)</source>
+        <translation type="unfinished">канал выхода (удерживайте ctrl, чтобы воздей�твовать на в�е р�ды)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>output port (hold ctl to affect all rows)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+21"/>
+        <source>shift + control key: draw velocity level 1</source>
+        <translation type="unfinished">клавиши shift+control: ри�овать уровень 1 �коро�ти нажати�</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>control key: draw velocity level 2</source>
+        <translation type="unfinished">Клавиша control: ри�овать уровень 2 �коро�ти нажати�</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>shift key: draw velocity level 3</source>
+        <translation type="unfinished">Клавиша shift: ри�овать уровень 3 �коро�ти нажати�</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>draw velocity level 4</source>
+        <translation type="unfinished">ри�овать уровень 4 �коро�ти нажати�</translation>
+    </message>
+    <message>
+        <location line="-5"/>
+        <source>output channel (ctl: affect all rows)</source>
+        <translation type="unfinished">канал выхода (ctrl: дей�твует на в�е р�ды)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>output port (ctl: affect all rows)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+43"/>
+        <source>&amp;File</source>
+        <translation type="unfinished">&amp;Файл</translation>
+    </message>
+    <message>
         <location line="+2"/>
-        <source>Bass</source>
+        <source>Load Map</source>
+        <translation type="unfinished">Загрузить карту</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Save Map</source>
+        <translation type="unfinished">Сохранить карту</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reset GM Map</source>
+        <translation type="unfinished">�а�троить карту GM по умолчанию </translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>&amp;Edit</source>
+        <translation type="unfinished">&amp;Правка</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Cut</source>
+        <translation type="unfinished">Вырезать</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy events in range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Paste</source>
+        <translation type="unfinished">В�тавить</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Paste (with Dialog)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>Grand</source>
+        <source>Delete Events</source>
+        <translation type="unfinished">Удалить �обыти�</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>&amp;Select</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>MusE: bad trackname</source>
-        <translation type="unfinished">MusE: неверное им� трека</translation>
+        <location line="+2"/>
+        <source>Select All</source>
+        <translation type="unfinished">Выделить в�ё</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>please choose a unique track name</source>
-        <translation type="unfinished">Выберите неповтор�ющее�� им� дл� трека</translation>
+        <source>Select None</source>
+        <translation type="unfinished">Убрать выделение</translation>
     </message>
     <message>
-        <location line="+157"/>
-        <location line="+1143"/>
-        <source>Update drummap?</source>
-        <translation type="unfinished">Обновить карту ударных?</translation>
+        <location line="+1"/>
+        <source>Invert</source>
+        <translation type="unfinished">Инвертировать</translation>
     </message>
     <message>
-        <location line="-1142"/>
-        <source>Do you want to use same port for all instruments in the drummap?</source>
-        <translation type="unfinished">Вы хотите и�пользовать один и тот же порт дл� в�ех ин�трументов в �пи�ке ударных?</translation>
+        <location line="+2"/>
+        <source>Inside Loop</source>
+        <translation type="unfinished">Внутри цикла</translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+1143"/>
-        <source>&amp;Yes</source>
-        <translation type="unfinished">&amp;Да</translation>
+        <source>Outside Loop</source>
+        <translation type="unfinished">Вне цикла</translation>
     </message>
     <message>
-        <location line="-1143"/>
-        <location line="+1143"/>
-        <source>&amp;No</source>
-        <translation type="unfinished">&amp;�ет</translation>
+        <location line="+4"/>
+        <source>Previous Part</source>
+        <translation type="unfinished">Предыдуща� парти�</translation>
     </message>
     <message>
-        <location line="-1066"/>
-        <location line="+55"/>
-        <source>show gui</source>
-        <translation type="unfinished">показать ГИП</translation>
+        <location line="+1"/>
+        <source>Next Part</source>
+        <translation type="unfinished">Следующа� парти�</translation>
     </message>
     <message>
-        <location line="-46"/>
-        <location line="+55"/>
-        <source>show native gui</source>
-        <translation type="unfinished">показать ГИП</translation>
+        <location line="+19"/>
+        <source>Fu&amp;nctions</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+338"/>
-        <source>Treble clef</source>
+        <location line="+4"/>
+        <source>Re-order list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Bass clef</source>
+        <location line="+2"/>
+        <source>Set Fixed Length</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Grand Staff</source>
+        <source>Modify Velocity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
-        <source>Viewable automation</source>
+        <location line="+1"/>
+        <source>Crescendo/Decrescendo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+131"/>
-        <source>Delete Track</source>
-        <translation type="unfinished">Удалить трек</translation>
+        <location line="+1"/>
+        <source>Quantize</source>
+        <translation type="unfinished">Квантовать</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Track Comment</source>
-        <translation type="unfinished">Комментарий к треку</translation>
+        <source>Erase Event</source>
+        <translation type="unfinished">Удалить �обытие</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Insert Track</source>
+        <location line="+1"/>
+        <source>Move Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+445"/>
-        <source>Midi</source>
+        <location line="+1"/>
+        <source>Delete Overlaps</source>
+        <translation type="unfinished">Удалить наложени�</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>&amp;Plugins</source>
+        <translation type="unfinished">&amp;Плагины</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Window &amp;Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Drum</source>
-        <translation type="unfinished">Ударные</translation>
+        <location line="+11"/>
+        <source>Drum tools</source>
+        <translation type="unfinished">Ин�трументы ударных</translation>
     </message>
     <message>
-        <location line="+50"/>
-        <source>Do you want to use same port and channel for all instruments in the drummap?</source>
-        <translation type="unfinished">Вы хотите и�пользовать один и тот же порт и канал дл� в�ех ин�трументов в �пи�ке ударных?</translation>
+        <location line="+4"/>
+        <source>Load Drummap</source>
+        <translation type="unfinished">Загрузить драм-карту</translation>
     </message>
-</context>
-<context>
-    <name>MusEDialog::PasteDialog</name>
-    <message numerus="yes">
-        <location filename="../../muse/widgets/pastedialog.cpp" line="+81"/>
-        <source>%n quarter(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-        </translation>
+    <message>
+        <location line="+6"/>
+        <source>Store Drummap</source>
+        <translation type="unfinished">Сохранить драм-карту</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>quarter</source>
+        <location line="+12"/>
+        <source>Step Record</source>
+        <translation type="unfinished">Пошагова� запи�ь</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Midi Input</source>
+        <translation type="unfinished">MIDI-вход</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>cursor tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>quarters</source>
+        <location line="+5"/>
+        <source>Set step size for cursor edit</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MusEDialog::PasteEventsDialog</name>
-    <message numerus="yes">
-        <location filename="../../muse/widgets/pasteeventsdialog.cpp" line="+95"/>
-        <source>%n quarter(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-        </translation>
+    <message>
+        <location line="+14"/>
+        <source>panic</source>
+        <translation type="unfinished">паника</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>quarter</source>
-        <translation type="unfinished"></translation>
+        <location line="+4"/>
+        <source>transport</source>
+        <translation type="unfinished">тран�порт</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>quarters</source>
+        <location line="+18"/>
+        <source>ctrl</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MusEMixer::AudioMixerApp</name>
     <message>
-        <location filename="../../muse/mixer/amixer.cpp" line="+171"/>
-        <source>&amp;Create</source>
+        <location line="+7"/>
+        <source>Add Controller View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>&amp;View</source>
-        <translation type="unfinished">&amp;Вид</translation>
+        <location line="+57"/>
+        <source>M</source>
+        <translation type="unfinished">M</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Routing</source>
-        <translation type="unfinished">Маршрутизаци�</translation>
+        <source>Sound</source>
+        <translation type="unfinished">Звук</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Show Midi Tracks</source>
-        <translation type="unfinished">Показать Midi-треки</translation>
+        <location line="+1"/>
+        <source>Vol</source>
+        <translation type="unfinished">Громк</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Show Drum Tracks</source>
-        <translation type="unfinished">Показать треки ударных</translation>
+        <source>QNT</source>
+        <translation type="unfinished">КВ�Т</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Show Wave Tracks</source>
-        <translation type="unfinished">Показать Wave-треки</translation>
+        <source>E-Note</source>
+        <translation type="unfinished">E-�ота</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Show Inputs</source>
-        <translation type="unfinished">Показать входы</translation>
+        <location line="+1"/>
+        <source>Len</source>
+        <translation type="unfinished">Дл</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Show Outputs</source>
-        <translation type="unfinished">Показать выходы</translation>
+        <source>A-Note</source>
+        <translation type="unfinished">A-�ота</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Show Groups</source>
-        <translation type="unfinished">Показать группы</translation>
+        <source>Ch</source>
+        <translation type="unfinished">Кан</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Show Auxs</source>
-        <translation type="unfinished">Показать Auxs</translation>
+        <source>Port</source>
+        <translation type="unfinished">Порт</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Show Synthesizers</source>
-        <translation type="unfinished">Показать �интезаторы</translation>
+        <source>LV1</source>
+        <translation type="unfinished">LV1</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>LV2</source>
+        <translation type="unfinished">LV2</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>LV3</source>
+        <translation type="unfinished">LV3</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>LV4</source>
+        <translation type="unfinished">LV4</translation>
+    </message>
+    <message>
+        <location line="+377"/>
+        <source>Muse: Load Drum Map</source>
+        <translation type="unfinished">Muse: Загрузить драм-карту</translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>MusE: Store Drum Map</source>
+        <translation type="unfinished">Muse: Сохранить драм-карту</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Drum map</source>
+        <translation type="unfinished">Карта ударных</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reset the drum map with GM defaults?</source>
+        <translation type="unfinished">Сбро� карты ударных на GM по умолчанию?</translation>
     </message>
 </context>
 <context>
-    <name>MusEMixer::AudioStrip</name>
+    <name>MusEGui::EditCAfterDialog</name>
     <message>
-        <location filename="../../muse/mixer/astrip.cpp" line="+645"/>
-        <source>panorama</source>
-        <translation type="unfinished">панорама</translation>
+        <location filename="../../muse/liste/editevent.cpp" line="+445"/>
+        <source>MusE: Enter Channel Aftertouch</source>
+        <translation type="unfinished">MusE: Вве�ти Channel Aftertouch</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>aux send level</source>
-        <translation type="unfinished">уровень aux по�ыла</translation>
+        <source>Time Position</source>
+        <translation type="unfinished">Позици� по времени</translation>
     </message>
     <message>
-        <location line="+23"/>
-        <source>Pan</source>
-        <translation type="unfinished">Пан</translation>
+        <location line="+4"/>
+        <source>Pressure</source>
+        <translation type="unfinished">Давление</translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::EditEventDialog</name>
     <message>
-        <location line="+93"/>
-        <source>1/2 channel</source>
-        <translation type="unfinished">�терео-моно</translation>
+        <location line="-261"/>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Отмена</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::EditInstrument</name>
+    <message>
+        <location filename="../../muse/instruments/editinstrument.cpp" line="+312"/>
+        <location line="+34"/>
+        <source>MusE: Create file failed</source>
+        <translation type="unfinished">MusE: �е удало�ь �оздать файл</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>MusE: Write File failed</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+32"/>
         <location line="+12"/>
-        <source>Pre</source>
-        <translation type="unfinished">Пре</translation>
+        <location line="+280"/>
+        <location line="+12"/>
+        <source>MusE:</source>
+        <translation type="unfinished">MusE:</translation>
+    </message>
+    <message>
+        <location line="-303"/>
+        <location line="+292"/>
+        <source>The user instrument directory
+%1
+does not exist yet. Create it now?
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-291"/>
+        <location line="+292"/>
+        <source>(You can change the user instruments directory at Settings-&gt;Global Settings-&gt;Midi)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-282"/>
+        <location line="+292"/>
+        <source>Unable to create user instrument directory &apos;%1&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-244"/>
+        <location line="+266"/>
+        <source>MusE: Save Instrument Definition</source>
+        <translation type="unfinished">MusE: Сохранить Определение Ин�трумента</translation>
+    </message>
+    <message>
+        <location line="-265"/>
+        <location line="+266"/>
+        <source>Instrument Definition (*.idf)</source>
+        <translation type="unfinished">Определение ин�трумента (*.idf)</translation>
+    </message>
+    <message>
+        <location line="-154"/>
+        <location line="+29"/>
+        <source>MusE: Save instrument as</source>
+        <translation type="unfinished">MusE: Сохранить ин�трумент как</translation>
+    </message>
+    <message>
+        <location line="-29"/>
+        <source>Enter a new unique instrument name:</source>
+        <translation type="unfinished">Введите неповтор�ющее�� им� ин�трумента:</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>The user instrument &apos;%1&apos; already exists. This will overwrite its .idf instrument file.
+Are you sure?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+526"/>
+        <source>MusE: Bad instrument name</source>
+        <translation type="unfinished">MusE: �еверное им� ин�трумента</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>pre fader - post fader</source>
-        <translation type="unfinished">пре федер - по�т федер</translation>
+        <source>Please choose a unique instrument name.
+(The name might be used by a hidden instrument.)</source>
+        <translation type="unfinished">Пожалуй�та, выберите неповтор�ющее�� им� дл� ин�трумента.
+(Им� может и�пользовать�� в �крытых ин�трументах)</translation>
     </message>
     <message>
-        <location line="+64"/>
-        <source>dB</source>
+        <location line="+136"/>
+        <source>MusE: Bad patch name</source>
+        <translation type="unfinished">MusE: �еверное им� патча</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Please choose a unique patch name</source>
+        <translation type="unfinished">Пожалуй�та, выберите неповтор�ющее�� им� патча</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>MusE: Bad patchgroup name</source>
+        <translation type="unfinished">MusE: �еверное им� группы</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Please choose a unique patchgroup name</source>
+        <translation type="unfinished">Пожалуй�та, выберите неповтор�ющее�� им� группы</translation>
+    </message>
+    <message>
+        <location line="+526"/>
+        <source>MusE: Bad controller name</source>
+        <translation type="unfinished">MusE: �еверное им� контроллера</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Please choose a unique controller name</source>
+        <translation type="unfinished">Пожалуй�та, выберите неповтор�ющее�� им� дл� контроллера</translation>
+    </message>
+    <message>
+        <location line="+1287"/>
+        <location line="+12"/>
+        <source>MusE: Cannot add common controller</source>
+        <translation type="unfinished">MusE: �евозможно добавить обычный контроллер</translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <source>A controller named &apos;%1&apos; already exists.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
-        <source>record</source>
+        <location line="+12"/>
+        <source>A controller number %1 already exists.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
-        <source>mute</source>
-        <translation type="unfinished">заглушить</translation>
+        <location line="+283"/>
+        <location line="+5"/>
+        <source>MusE</source>
+        <translation type="unfinished">MusE</translation>
     </message>
     <message>
-        <location line="+25"/>
-        <source>record downmix</source>
-        <translation type="unfinished">запи�ать downmix</translation>
+        <location line="-4"/>
+        <location line="+5"/>
+        <source>The current Instrument contains unsaved data
+Save Current Instrument?</source>
+        <translation type="unfinished">Текущий Ин�трумент �одержит не�охраненные данные
+Сохранить �тот Ин�трумент?</translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <location line="+5"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished">&amp;Сохранить</translation>
+    </message>
+    <message>
+        <location line="-5"/>
+        <location line="+5"/>
+        <source>&amp;Nosave</source>
+        <translation type="unfinished">&amp;�е �охран�ть</translation>
+    </message>
+    <message>
+        <location line="-5"/>
+        <source>&amp;Abort</source>
+        <translation type="unfinished">&amp;Отмена</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::EditMetaDialog</name>
+    <message>
+        <location filename="../../muse/liste/editevent.cpp" line="+118"/>
+        <source>MusE: Enter Meta Event</source>
+        <translation type="unfinished">MusE: Вве�ти мета�обытие</translation>
     </message>
     <message>
         <location line="+2"/>
+        <source>Time Position</source>
+        <translation type="unfinished">Позици� по времени</translation>
+    </message>
+    <message>
         <location line="+4"/>
-        <source>solo mode</source>
-        <translation type="unfinished">режим �оло</translation>
+        <source>Meta Type</source>
+        <translation type="unfinished">Метатип</translation>
     </message>
     <message>
         <location line="+12"/>
-        <source>off</source>
-        <translation type="unfinished">выкл</translation>
+        <source>Enter Hex</source>
+        <translation type="unfinished">Вве�ти Hex</translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::EditPAfterDialog</name>
     <message>
-        <location line="+19"/>
-        <source>iR</source>
-        <translation type="unfinished">вх</translation>
+        <location line="+176"/>
+        <source>MusE: Enter Poly Aftertouch</source>
+        <translation type="unfinished">MusE: Вве�ти полиф. по�ленажатие</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>input routing</source>
-        <translation type="unfinished">маршрут входа</translation>
+        <source>Time Position</source>
+        <translation type="unfinished">Позици� по времени</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>oR</source>
-        <translation type="unfinished">вых</translation>
+        <location line="+4"/>
+        <source>Pitch</source>
+        <translation type="unfinished">Вы�ота тона</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>output routing</source>
-        <translation type="unfinished">маршрут выхода</translation>
+        <source>Pressure</source>
+        <translation type="unfinished">Давление</translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::EditToolBar</name>
     <message>
-        <location line="+12"/>
-        <source>Off</source>
+        <location filename="../../muse/widgets/tools.cpp" line="+33"/>
+        <source>select Pointer Tool:
+with the pointer tool you can:
+  select parts
+  move parts
+  copy parts</source>
+        <translation type="unfinished">выбрать ин�трумент &quot;Указатель&quot;:
+при помощи указател� можно:
+  выдел�ть партии(new line)
+  перемещать партии(new line)
+  копировать партии</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>select Pencil Tool:
+with the pencil tool you can:
+  create new parts
+  modify length of parts</source>
+        <translation type="unfinished">выбрать ин�трумент &quot;Карандаш&quot;:
+� помощью ин�трумента &quot;Карандаш&quot; вы можете:
+  �оздавать новые партии
+  измен�ть длину партий</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>select Delete Tool:
+with the delete tool you can delete parts</source>
+        <translation type="unfinished">выбрать ин�трумент &quot;Ла�тик&quot;:
+� помощью ин�трумента &quot;Ла�тик&quot; вы можете удал�ть партии</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>select Cut Tool:
+with the cut tool you can split a part</source>
+        <translation type="unfinished">выбрать ин�трумент &quot;�ожницы&quot;:(new line)
+� помощью ин�трумента &quot;�ожницы&quot; вы можете разрезать партию</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>select Glue Tool:
+with the glue tool you can glue two parts</source>
+        <translation type="unfinished">выбрать ин�трумент &quot;Клей&quot;:
+� помощью ин�трумента &quot;Клей&quot; вы можете �оединить две партии</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>select Score Tool:
+</source>
+        <translation type="unfinished">выбрать редактор партитур:
+</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>select Quantize Tool:
+insert display quantize event</source>
+        <translation type="unfinished">выбрать ин�трумент &quot;Квантование&quot;:
+в�тавить отображение квантуемых �обытий</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>select Drawing Tool</source>
+        <translation type="unfinished">выбрать ин�трумент &quot;Ри�ование&quot;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>select Muting Tool:
+click on part to mute/unmute</source>
+        <translation type="unfinished">выбрать ин�трумент &quot;�е проигрывать партию (Заглушить)&quot;:
+Щелкните по партии, чтобы &quot;Проигрывать&quot; или &quot;�е проигрывать&quot; ее</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Manipulate automation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Read</source>
-        <translation type="unfinished">Читать</translation>
+        <source>Cursor tool</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>pointer</source>
+        <translation type="unfinished">указатель</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Touch</source>
-        <translation type="unfinished">По ка�анию</translation>
+        <source>pencil</source>
+        <translation type="unfinished">карандаш</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Write</source>
+        <source>eraser</source>
+        <translation type="unfinished">ла�тик</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>cutter</source>
+        <translation type="unfinished">ножницы</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>score</source>
+        <translation type="unfinished">партитура</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>glue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>automation type</source>
-        <translation type="unfinished">тип автоматизации</translation>
+        <location line="+1"/>
+        <source>quantize</source>
+        <translation type="unfinished">квантовать</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>draw</source>
+        <translation type="unfinished">ри�овать</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>mute parts</source>
+        <translation type="unfinished">заглушить партии</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>edit automation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Edit Tools</source>
+        <translation type="unfinished">Ин�трументы редактировани�</translation>
     </message>
 </context>
 <context>
-    <name>MusEMixer::EffectRack</name>
+    <name>MusEGui::EffectRack</name>
     <message>
         <location filename="../../muse/mixer/rack.cpp" line="+193"/>
         <source>effect rack</source>
@@ -12287,193 +12770,843 @@ Likely the selected track is the wrong type.</source>
     </message>
 </context>
 <context>
-    <name>MusEMixer::MidiStrip</name>
+    <name>MusEGui::GlobalSettingsConfig</name>
     <message>
-        <location filename="../../muse/mixer/mstrip.cpp" line="+109"/>
-        <location line="+121"/>
-        <location line="+158"/>
-        <source>off</source>
-        <translation type="unfinished">выкл</translation>
+        <location filename="../../muse/widgets/genset.cpp" line="+561"/>
+        <source>Selects instruments directory</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::Header</name>
     <message>
-        <location line="-278"/>
-        <location line="+122"/>
-        <source>double click on/off</source>
-        <translation type="unfinished">двойной щелчок вкл/выкл</translation>
+        <location filename="../../muse/widgets/header.cpp" line="+164"/>
+        <source>Track Info Columns</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::LMaster</name>
     <message>
-        <location line="-42"/>
-        <source>VariationSend</source>
-        <translation type="unfinished">Вариационный по�ыл</translation>
+        <location filename="../../muse/master/lmaster.cpp" line="+158"/>
+        <source>MusE: Mastertrack</source>
+        <translation type="unfinished">MusE: Ма�тер-трек</translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Var</source>
-        <translation type="unfinished">Вар</translation>
+        <location line="+13"/>
+        <source>&amp;Edit</source>
+        <translation type="unfinished">&amp;Правка</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Insert Tempo</source>
+        <translation type="unfinished">В�тавить темп</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>ReverbSend</source>
-        <translation type="unfinished">По�ыл Реверберации</translation>
+        <source>Insert Signature</source>
+        <translation type="unfinished">В�тавить размер</translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Rev</source>
-        <translation type="unfinished">Ревер</translation>
+        <location line="+1"/>
+        <source>Insert Key</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>ChorusSend</source>
-        <translation type="unfinished">По�ыл Хору�а</translation>
+        <source>Edit Positon</source>
+        <translation type="unfinished">Изменить позицию</translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Cho</source>
-        <translation type="unfinished">Хору�</translation>
+        <location line="+1"/>
+        <source>Edit Value</source>
+        <translation type="unfinished">Изменить значение</translation>
     </message>
     <message>
-        <location line="+39"/>
-        <source>dB</source>
+        <location line="+1"/>
+        <source>Delete Event</source>
+        <translation type="unfinished">Удалить �обытие</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Window &amp;Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
-        <source>Pan/Balance</source>
-        <translation type="unfinished">Пан/Балан�</translation>
+        <location line="+23"/>
+        <source>Undo/Redo tools</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Pan</source>
-        <translation type="unfinished">Пан</translation>
+        <location line="+4"/>
+        <source>Edit tools</source>
+        <translation type="unfinished">Ин�трументы редактировани�</translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>record</source>
-        <translation type="unfinished"></translation>
+        <location line="+5"/>
+        <source>Tempo</source>
+        <translation type="unfinished">Темп</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>mute</source>
-        <translation type="unfinished">заглушить</translation>
+        <location line="+1"/>
+        <source>Timesig</source>
+        <translation type="unfinished">Размер</translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>solo mode</source>
-        <translation type="unfinished">режим �оло</translation>
+        <location line="+1"/>
+        <source>Key</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+67"/>
-        <source>iR</source>
-        <translation type="unfinished">вх</translation>
+        <location line="+1"/>
+        <source>new tempo</source>
+        <translation type="unfinished">новый темп</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>input routing</source>
-        <translation type="unfinished">маршрут входа</translation>
+        <location line="+1"/>
+        <source>new signature</source>
+        <translation type="unfinished">новый размер</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>oR</source>
-        <translation type="unfinished">вых</translation>
+        <location line="+1"/>
+        <source>new key</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>output routing</source>
-        <translation type="unfinished">маршрут выхода</translation>
+        <source>panic</source>
+        <translation type="unfinished">паника</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>transport</source>
+        <translation type="unfinished">тран�порт</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Meter</source>
+        <translation type="unfinished">Индикатор</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Time</source>
+        <translation type="unfinished">Врем�</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Type</source>
+        <translation type="unfinished">Тип</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Value</source>
+        <translation type="unfinished">Значение</translation>
+    </message>
+    <message>
+        <location line="+391"/>
+        <source>Reposition of the initial tempo and signature events is not allowed</source>
+        <translation type="unfinished">Изменение начального темпа и размера запрещено</translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>MusE: List Editor</source>
+        <translation type="unfinished">MusE: Редактор �пи�ка �обытий</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Input error, conversion not OK or value out of range</source>
+        <translation type="unfinished">Ошибка ввода, неверна� конвер�и� или значение вне диапазона</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Reposition of tempo and signature events to start position is not allowed!</source>
+        <translation type="unfinished">Изменение темпа и размера запрещено</translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::BigTime</name>
+    <name>MusEGui::ListEdit</name>
     <message>
-        <location filename="../../muse/widgets/bigtime.cpp" line="+60"/>
-        <source>format display</source>
-        <translation type="unfinished">формат ди�пле�</translation>
+        <location filename="../../muse/liste/listedit.cpp" line="+477"/>
+        <source>insert Note</source>
+        <translation type="unfinished">в�тавить �оту</translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>bar</source>
-        <translation type="unfinished">такт</translation>
+        <location line="+1"/>
+        <source>insert SysEx</source>
+        <translation type="unfinished">в�тавить SysEx</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>beat</source>
-        <translation type="unfinished">дол�</translation>
+        <source>insert Ctrl</source>
+        <translation type="unfinished">В�тавить кнтрл</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>insert Meta</source>
+        <translation type="unfinished">в�тавить Meta</translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>insert Channel Aftertouch</source>
+        <translation type="unfinished">в�тавить Channel Aftertouch</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>insert Poly Aftertouch</source>
+        <translation type="unfinished">в�тавить Poly Aftertouch</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&amp;Edit</source>
+        <translation type="unfinished">&amp;Правка</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Cut</source>
+        <translation type="unfinished">Вырезать</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Paste</source>
+        <translation type="unfinished">В�тавить</translation>
+    </message>
+    <message>
         <location line="+6"/>
-        <source>tick</source>
-        <translation type="unfinished">тик</translation>
+        <source>Delete Events</source>
+        <translation type="unfinished">Удалить �обыти�</translation>
     </message>
     <message>
-        <location line="-4"/>
-        <source>minute</source>
-        <translation type="unfinished">минут(а)</translation>
+        <location line="+10"/>
+        <source>Window &amp;Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Undo/Redo tools</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Insert tools</source>
+        <translation type="unfinished">Ин�трументы дл� в�тавки</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>panic</source>
+        <translation type="unfinished">паника</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>transport</source>
+        <translation type="unfinished">тран�порт</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Tick</source>
+        <translation type="unfinished">Тик</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>second</source>
-        <translation type="unfinished">�екунд(а)</translation>
+        <source>Bar</source>
+        <translation type="unfinished">Такт</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Type</source>
+        <translation type="unfinished">Тип</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ch</source>
+        <translation type="unfinished">Кан</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Val A</source>
+        <translation type="unfinished">Знач. �</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Val B</source>
+        <translation type="unfinished">Знач. B</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Val C</source>
+        <translation type="unfinished">Знач. С</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Len</source>
+        <translation type="unfinished">Дл</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Comment</source>
+        <translation type="unfinished">Комментарий</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::MPConfig</name>
+    <message>
+        <location filename="../../muse/confmport.cpp" line="+101"/>
+        <location line="+176"/>
+        <source>Default input connections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-175"/>
+        <location line="+66"/>
+        <source>Are you sure you want to apply to all existing midi tracks now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-1"/>
+        <location line="+148"/>
+        <source>Default output connections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-37"/>
+        <location line="+38"/>
+        <source>Setting will apply to new midi tracks.
+Do you want to apply to all existing midi tracks now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>MusE: bad device name</source>
+        <translation type="unfinished">MusE: неверное им� у�трой�тва</translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>please choose a unique device name</source>
+        <translation type="unfinished">пожалуй�та выберите неповтор�ющее�� им� дл� у�трой�тва</translation>
+    </message>
+    <message>
+        <location line="+72"/>
+        <location line="+859"/>
+        <source>in</source>
+        <translation type="unfinished">в</translation>
+    </message>
+    <message>
+        <location line="-836"/>
+        <location line="+827"/>
+        <source>out</source>
+        <translation type="unfinished">вне (из)</translation>
+    </message>
+    <message>
+        <location line="-771"/>
+        <source>Show first aliases</source>
+        <translation type="unfinished">Показать первые п�евдонимы</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Show second aliases</source>
+        <translation type="unfinished">Показать вторые п�евдонимы</translation>
+    </message>
+    <message>
+        <location line="+130"/>
+        <location line="+42"/>
+        <source>Toggle all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-38"/>
+        <location line="+43"/>
+        <source>Change all tracks now</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create</source>
+        <translation type="obsolete">Создать</translation>
+    </message>
+    <message>
+        <source> device</source>
+        <translation type="obsolete"> у�трой�тво</translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Create Jack device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+229"/>
+        <location line="+29"/>
+        <source>Port Number</source>
+        <translation type="unfinished">�омер порта</translation>
+    </message>
+    <message>
+        <location line="-28"/>
+        <source>Enable gui</source>
+        <translation type="unfinished">Разрешить ГИП</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable reading</source>
+        <translation type="unfinished">Разрешить чтение</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable writing</source>
+        <translation type="unfinished">Разрешить запи�ь</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Port instrument</source>
+        <translation type="unfinished">Ин�трумент, назначенный на порт</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi device name. Click to edit (Jack)</source>
+        <translation type="unfinished">Им� midi-у�трой�тва. Щелкните дл� редактировани� (Jack)</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Connections from Jack Midi outputs</source>
+        <translation type="unfinished">Соединени� от midi-выходов Jack</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Connections to Jack Midi inputs</source>
+        <translation type="unfinished">Соединени� к midi-входам Jack</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Auto-connect these channels to new midi tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+3"/>
-        <source>frame</source>
-        <translation type="unfinished">фреймов</translation>
+        <source>Auto-connect new midi tracks to these channels</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-2"/>
-        <source>subframe</source>
-        <translation type="unfinished">�убфреймов</translation>
+        <location line="+2"/>
+        <source>Auto-connect new midi tracks to this channel</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <source>MusE: Bigtime</source>
-        <translation type="unfinished">MusE: Хронометр</translation>
+        <location line="+2"/>
+        <source>Device state</source>
+        <translation type="unfinished">Со�то�ние у�трой�тва</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Enable gui for device</source>
+        <translation type="unfinished">Разрешить ГИП дл� у�трой�тва</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Enable reading from device</source>
+        <translation type="unfinished">Разрешить чтение � у�трой�тва</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Enable writing to device</source>
+        <translation type="unfinished">Разрешить запи�ь на у�трой�тво</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Name of the midi device associated with this port number. Click to edit Jack midi name.</source>
+        <translation type="unfinished">Им� midi-у�трой�тва �в�зано � номером порта &quot;Jack&quot;. Щелкните, чтобы редактировать его.</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Instrument connected to port</source>
+        <translation type="unfinished">Ин�трумент, под�оединённый к порту</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Connections from Jack Midi output ports</source>
+        <translation type="unfinished">Соединени� от выходных midi-портов Jack</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Connections to Jack Midi input ports</source>
+        <translation type="unfinished">Соединени� � входными midi-портами Jack</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Auto-connect these channels, on this port, to new midi tracks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Connect new midi tracks to these channels, on this port.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Connect new midi tracks to this channel, on this port.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>State: result of opening the device</source>
+        <translation type="unfinished">Со�то�ние: результат открыти� у�трой�тва</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Port</source>
+        <translation type="unfinished">Порт</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>GUI</source>
+        <translation type="unfinished">ГИП</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>I</source>
+        <translation type="unfinished">Ð’Ñ…</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>O</source>
+        <translation type="unfinished">Ð’Ñ‹Ñ…</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Instrument</source>
+        <translation type="unfinished">Ин�трумент</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Device Name</source>
+        <translation type="unfinished">Им� у�трой�тва</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>In routes</source>
+        <translation type="unfinished">Маршруты входа</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Out routes</source>
+        <translation type="unfinished">Маршруты выхода</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Def in ch</source>
+        <translation type="unfinished">вх кан по ум</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Def out ch</source>
+        <translation type="unfinished">вых кан по ум</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>State</source>
+        <translation type="unfinished">Со�то�ние</translation>
+    </message>
+    <message>
+        <location line="+84"/>
+        <source>&lt;unknown&gt;</source>
+        <translation type="unfinished">&lt;неизве�тно&gt;</translation>
+    </message>
+    <message>
+        <location line="+87"/>
+        <location line="+71"/>
+        <source>&lt;none&gt;</source>
+        <translation type="unfinished">&lt;ничего&gt;</translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::EditToolBar</name>
+    <name>MusEGui::MTScale</name>
     <message>
-        <location filename="../../muse/widgets/tools.cpp" line="+17"/>
-        <source>Edit Tools</source>
-        <translation type="unfinished">Ин�трументы редактировани�</translation>
+        <location filename="../../muse/widgets/mtscale.cpp" line="+44"/>
+        <source>bar scale</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::GlobalSettingsConfig</name>
+    <name>MusEGui::MTScaleFlo</name>
     <message>
-        <location filename="../../muse/widgets/genset.cpp" line="+546"/>
-        <source>Selects instruments directory</source>
+        <location filename="../../muse/widgets/mtscale_flo.cpp" line="+44"/>
+        <source>bar scale</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::Header</name>
+    <name>MusEGui::MarkerView</name>
     <message>
-        <location filename="../../muse/widgets/header.cpp" line="+164"/>
-        <source>Track Info Columns</source>
+        <location filename="../../muse/marker/markerview.cpp" line="+175"/>
+        <source>MusE: Marker</source>
+        <translation type="unfinished">MusE: Маркер</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>add marker</source>
+        <translation type="unfinished">добавить маркер</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>delete marker</source>
+        <translation type="unfinished">удалить маркер</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>&amp;Edit</source>
+        <translation type="unfinished">&amp;Правка</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Window &amp;Config</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+7"/>
+        <source>Undo/Redo tools</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>edit tools</source>
+        <translation type="unfinished">ин�трументы редактировани�</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>panic</source>
+        <translation type="unfinished">паника</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>transport</source>
+        <translation type="unfinished">тран�порт</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Bar:Beat:Tick</source>
+        <translation type="unfinished">Такт:Дол�:Тик</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hr:Mn:Sc:Fr:Sf</source>
+        <translation type="unfinished">Ч�:Мин:Сек:Фрм:Субфрм</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lock</source>
+        <translation type="unfinished">Закрыть</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Text</source>
+        <translation type="unfinished">Тек�т</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Marker Properties</source>
+        <translation type="unfinished">Свой�тва маркера</translation>
+    </message>
 </context>
 <context>
-    <name>MusEWidget::MTScale</name>
+    <name>MusEGui::MasterEdit</name>
     <message>
-        <location filename="../../muse/widgets/mtscale.cpp" line="+44"/>
-        <source>bar scale</source>
+        <location filename="../../muse/master/masteredit.cpp" line="+107"/>
+        <source>MusE: Mastertrack</source>
+        <translation type="unfinished">MusE: Ма�тер-трек</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Window &amp;Config</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+6"/>
+        <source>Undo/Redo tools</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>panic</source>
+        <translation type="unfinished">паника</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>transport</source>
+        <translation type="unfinished">тран�порт</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Enable master</source>
+        <translation type="unfinished">Разрешить ма�тер(а)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Enable</source>
+        <translation type="unfinished">Разрешить</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable usage of master track</source>
+        <translation type="unfinished">Разрешить и�пользование ма�тер-трека</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Info</source>
+        <translation type="unfinished">Инфо</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cursor</source>
+        <translation type="unfinished">Кур�ор</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>time at cursor position</source>
+        <translation type="unfinished">врем� в позиции кур�ора</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>tempo at cursor position</source>
+        <translation type="unfinished">темп в позиции кур�ора</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Bar</source>
+        <translation type="unfinished">Такт</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Snap</source>
+        <translation type="unfinished">Прив�зка</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>CurPos </source>
+        <translation type="unfinished">Кур�Поз</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>tempo at current position</source>
+        <translation type="unfinished">темп в текущей позиции</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>time signature at current position</source>
+        <translation type="unfinished">размер в текущей позиции</translation>
+    </message>
 </context>
 <context>
-    <name>MusEWidget::MTScaleFlo</name>
+    <name>MusEGui::MidiInputTransformDialog</name>
     <message>
-        <location filename="../../muse/widgets/mtscale_flo.cpp" line="+44"/>
-        <source>bar scale</source>
+        <location filename="../../muse/mplugins/midiitransform.cpp" line="+953"/>
+        <location line="+2"/>
+        <source>New</source>
+        <translation type="unfinished">�овый</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::MidiStrip</name>
+    <message>
+        <location filename="../../muse/mixer/mstrip.cpp" line="+110"/>
+        <location line="+121"/>
+        <location line="+137"/>
+        <source>off</source>
+        <translation type="unfinished">выкл</translation>
+    </message>
+    <message>
+        <location line="-257"/>
+        <location line="+122"/>
+        <source>double click on/off</source>
+        <translation type="unfinished">двойной щелчок вкл/выкл</translation>
+    </message>
+    <message>
+        <location line="-42"/>
+        <source>VariationSend</source>
+        <translation type="unfinished">Вариационный по�ыл</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Var</source>
+        <translation type="unfinished">Вар</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>ReverbSend</source>
+        <translation type="unfinished">По�ыл Реверберации</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Rev</source>
+        <translation type="unfinished">Ревер</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>ChorusSend</source>
+        <translation type="unfinished">По�ыл Хору�а</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Cho</source>
+        <translation type="unfinished">Хору�</translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>dB</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+54"/>
+        <source>Pan/Balance</source>
+        <translation type="unfinished">Пан/Балан�</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Pan</source>
+        <translation type="unfinished">Пан</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>mute</source>
+        <translation type="unfinished">заглушить</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>solo mode</source>
+        <translation type="unfinished">режим �оло</translation>
+    </message>
+    <message>
+        <location line="+69"/>
+        <source>iR</source>
+        <translation type="unfinished">вх</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>input routing</source>
+        <translation type="unfinished">маршрут входа</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>oR</source>
+        <translation type="unfinished">вых</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>output routing</source>
+        <translation type="unfinished">маршрут выхода</translation>
+    </message>
 </context>
 <context>
-    <name>MusEWidget::MidiSyncConfig</name>
+    <name>MusEGui::MidiSyncConfig</name>
     <message>
         <location filename="../../muse/widgets/midisyncimpl.cpp" line="+58"/>
         <location line="+29"/>
@@ -12827,24 +13960,805 @@ Apply sync settings?</source>
     </message>
 </context>
 <context>
-    <name>MusEWidget::MidiTrackInfo</name>
+    <name>MusEGui::MidiTrackInfo</name>
     <message>
-        <location filename="../../muse/widgets/mtrackinfo.cpp" line="+319"/>
-        <location line="+1046"/>
+        <location filename="../../muse/widgets/mtrackinfo.cpp" line="+335"/>
+        <location line="+1068"/>
         <source>&lt;unknown&gt;</source>
         <translation type="unfinished">&lt;неизве�тно&gt;</translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::MixdownFileDialog</name>
+    <name>MusEGui::MidiTransformerDialog</name>
     <message>
-        <location filename="../../muse/widgets/mixdowndialog.cpp" line="+118"/>
+        <location filename="../../muse/miditransform.cpp" line="+464"/>
+        <location line="+2"/>
+        <source>New</source>
+        <translation type="unfinished">�овый</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::MixdownFileDialog</name>
+    <message>
+        <location filename="../../muse/widgets/mixdowndialog.cpp" line="+122"/>
         <source>Wave Files (*.wav);;All Files (*)</source>
         <translation type="unfinished">Файлы Wave (*.wav);;В�е файлы (*)</translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::NoteInfo</name>
+    <name>MusEGui::MusE</name>
+    <message>
+        <location filename="../../muse/app.cpp" line="+137"/>
+        <location line="+16"/>
+        <source>Failed to start audio!</source>
+        <translation type="unfinished">�е могу во�производить аудио!</translation>
+    </message>
+    <message>
+        <location line="-15"/>
+        <source>Was not able to start audio, check if jack is running.
+</source>
+        <translation type="unfinished">�е могу во�производить аудио, проверте работает ли &quot;Jack&quot;.
+</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Timeout waiting for audio to run. Check if jack is running.
+</source>
+        <translation type="unfinished">Ожидание запу�ка аудио. Проверте, работает ли &quot;Jack&quot;.
+ </translation>
+    </message>
+    <message>
+        <location line="+220"/>
+        <source>Und&amp;o</source>
+        <translation type="unfinished">&amp;Отменить дей�твие</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Re&amp;do</source>
+        <translation type="unfinished">&amp;Повторить</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>undo last change to song</source>
+        <translation type="unfinished">отменить по�леднее изменение в проекте</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>redo last undo</source>
+        <translation type="unfinished">повторить по�леднюю отмену</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Loop</source>
+        <translation type="unfinished">Цикл</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>loop between left mark and right mark</source>
+        <translation type="unfinished">цикл между левым и правым маркерами</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Punchin</source>
+        <translation type="unfinished">�ачало врезки</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>record starts at left mark</source>
+        <translation type="unfinished">запи�ь начинает�� � левого маркера</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Punchout</source>
+        <translation type="unfinished">Конец врезки</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>record stops at right mark</source>
+        <translation type="unfinished">запи�ь о�танавливает�� на правом маркере</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>rewind to start position</source>
+        <translation type="unfinished">перемотать к начальной позиции</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Rewind</source>
+        <translation type="unfinished">Перемотать назад</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>rewind current position</source>
+        <translation type="unfinished">перемотать к текущей позиции</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Forward</source>
+        <translation type="unfinished">Перемотать вперёд</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>move current position</source>
+        <translation type="unfinished">переме�тить текущую позицию</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Stop</source>
+        <translation type="unfinished">О�тановить</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop sequencer</source>
+        <translation type="unfinished">о�тановить �еквен�ер</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Play</source>
+        <translation type="unfinished">Во�произве�ти</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>start sequencer play</source>
+        <translation type="unfinished">начать во�произведение в �еквен�ере</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Record</source>
+        <translation type="unfinished">Запи�ать</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>to record press record and then play</source>
+        <translation type="unfinished">чтобы начать запи�ь нажмите &quot;запи�ь&quot;, а затем &quot;во�произве�ти&quot;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+238"/>
+        <source>Panic</source>
+        <translation type="unfinished">Паника</translation>
+    </message>
+    <message>
+        <location line="-236"/>
+        <source>send note off to all midi channels</source>
+        <translation type="unfinished">по�лать �ообщение &quot;note off&quot; на в�е midi-каналы</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>&amp;New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+1"/>
+        <source>Create New Song</source>
+        <translation type="unfinished">Создать новый проект</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Open</source>
+        <translation type="unfinished">&amp;Открыть</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+2"/>
+        <source>Click this button to open a &lt;em&gt;new song&lt;/em&gt;.&lt;br&gt;You can also select the &lt;b&gt;Open command&lt;/b&gt; from the File menu.</source>
+        <translation type="unfinished">Щелкните по �той кнопке дл� открыти� другого проекта. Вы также можете выбрать пункт Открыть в меню &quot;Файл&quot;.</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Open &amp;Recent</source>
+        <translation type="unfinished">Открыть  &amp;�едавние</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+1030"/>
+        <location line="+1255"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished">&amp;Сохранить</translation>
+    </message>
+    <message>
+        <location line="-2283"/>
+        <location line="+3"/>
+        <source>Click this button to save the song you are editing.  You will be prompted for a file name.
+You can also select the Save command from the File menu.</source>
+        <translation type="unfinished">Щелкните по �той кнопке дл� �охранени� проекта.  Будет предложено вве�ти им� файла.
+Вы также можете выбрать пункт &quot;Сохранить&quot; в меню &quot;Файл&quot;.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Save &amp;As</source>
+        <translation type="unfinished">Сохранить &amp;Как</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Import Midifile</source>
+        <translation type="unfinished">Импортировать MIDI-файл</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Export Midifile</source>
+        <translation type="unfinished">Эк�портировать MIDI-файл</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Import Part</source>
+        <translation type="unfinished">Импортировать Партию</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../../muse/wave.cpp" line="+1158"/>
+        <source>Import Wave File</source>
+        <translation type="unfinished">Импортировать WAV-файл</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Find unused wave files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Quit</source>
+        <translation type="unfinished">Вы&amp;йти</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Song Info</source>
+        <translation type="unfinished">Проект инфо</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Transport Panel</source>
+        <translation type="unfinished">Панель тран�порта</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Bigtime Window</source>
+        <translation type="unfinished">Окно хронометра</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Mixer A</source>
+        <translation type="unfinished">Микшер �</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Mixer B</source>
+        <translation type="unfinished">Микшер В</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cliplist</source>
+        <translation type="unfinished">Спи�ок фрагментов</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Marker View</source>
+        <translation type="unfinished">Маркеры</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Arranger View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Fullscreen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Plugins</source>
+        <translation type="unfinished">&amp;Плагины</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit Instrument</source>
+        <translation type="unfinished">Редактировать Ин�трумент</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Input Plugins</source>
+        <translation type="unfinished">Плагины на входе</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Transpose</source>
+        <translation type="unfinished">Тран�понировать</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi Input Transform</source>
+        <translation type="unfinished">Преобразование вход�щих MIDI-�ообщений</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi Input Filter</source>
+        <translation type="unfinished">Фильтр вход�щих MIDI-�обытий</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi Remote Control</source>
+        <translation type="unfinished">Ди�танционное управление MIDI</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Rhythm Generator</source>
+        <translation type="unfinished">Генератор Ритма</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Reset Instr.</source>
+        <translation type="unfinished">Перезагрузить Ин�тр.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Init Instr.</source>
+        <translation type="unfinished">Запу�тить Ин�тр.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Local Off</source>
+        <translation type="unfinished">откл. локальное управление</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Bounce to Track</source>
+        <translation type="unfinished">Све�ти в трек</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bounce to File</source>
+        <translation type="unfinished">Све�ти в файл</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Restart Audio</source>
+        <translation type="unfinished">Перезапу�тить аудио</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Mixer Automation</source>
+        <translation type="unfinished">�втоматизаци� микшера</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Take Snapshot</source>
+        <translation type="unfinished">Сделать �нимок</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Clear Automation Data</source>
+        <translation type="unfinished">Удалить Данные �втоматизации</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Cascade</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>In rows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>In columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Global Settings</source>
+        <translation type="unfinished">Общие на�тройки</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Configure Shortcuts</source>
+        <translation type="unfinished">�а�троить гор�чие клавиши</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Follow Song</source>
+        <translation type="unfinished">�ледовать за проектом</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Don&apos;t Follow Song</source>
+        <translation type="unfinished">не �ледовать за проектом</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Follow Page</source>
+        <translation type="unfinished">�ледовать по�транично</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Follow Continuous</source>
+        <translation type="unfinished">�ледовать плавно</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Metronome</source>
+        <translation type="unfinished">Метроном</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi Sync</source>
+        <translation type="unfinished">MIDI-�инхр</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi File Import/Export</source>
+        <translation type="unfinished">Импорт/Эк�порт midi-файла</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Appearance Settings</source>
+        <translation type="unfinished">�а�тройки вида</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi Ports / Soft Synth</source>
+        <translation type="unfinished">MIDI-порты / Прогр. �интезаторы</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>&amp;Manual</source>
+        <translation type="unfinished">&amp;Руковод�тво</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;MusE Homepage</source>
+        <translation type="unfinished">&amp;Домашн�� �траница MusE</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Report Bug...</source>
+        <translation type="unfinished">&amp;Сообщить об ошибке...</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;About MusE</source>
+        <translation type="unfinished">&amp;О программе MusE</translation>
+    </message>
+    <message>
+        <location line="+99"/>
+        <source>File Buttons</source>
+        <translation type="unfinished">Файловые кнопки</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Undo/Redo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Transport</source>
+        <translation type="unfinished">Тран�порт</translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>&amp;File</source>
+        <translation type="unfinished">&amp;Файл</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>&amp;View</source>
+        <translation type="unfinished">&amp;Вид</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>&amp;Midi</source>
+        <translation type="unfinished">&amp;MIDI</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>&amp;Audio</source>
+        <translation type="unfinished">&amp;�удио</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>A&amp;utomation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&amp;Windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>MusE Se&amp;ttings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+289"/>
+        <source>Cannot read template</source>
+        <translation type="unfinished">�е могу прочитать шаблон</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>File open error</source>
+        <translation type="unfinished">Ошибка при открытии файла</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>File read error</source>
+        <translation type="unfinished">Ошибка прочтени� файла</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Unknown File Format: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+130"/>
+        <location line="+437"/>
+        <location line="+914"/>
+        <source>MusE: Song: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-1317"/>
+        <source>MusE: load project</source>
+        <translation type="unfinished">MusE: Открыть проект</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>MusE: load template</source>
+        <translation type="unfinished">MusE: открыть шаблон</translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>MusE: Write File failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>The current Project contains unsaved data
+Save Current Project?</source>
+        <translation type="unfinished">Текущий проект �одержит не �охранённые данные.
+Сохранить текущий проект?</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+1255"/>
+        <source>S&amp;kip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-1255"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+265"/>
+        <location line="+13"/>
+        <source>MusE: Save As</source>
+        <translation type="unfinished">MusE: Сохранить как</translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <location line="+160"/>
+        <source>Nothing to edit</source>
+        <translation type="unfinished">�ечего редактировать</translation>
+    </message>
+    <message>
+        <location line="+494"/>
+        <location line="+10"/>
+        <location line="+31"/>
+        <location line="+34"/>
+        <location line="+8"/>
+        <source>MusE: Bounce to Track</source>
+        <translation type="unfinished">MusE: Сведение в Трек</translation>
+    </message>
+    <message>
+        <location line="-82"/>
+        <source>No wave tracks found</source>
+        <translation type="unfinished">wave-треки не найдены</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+105"/>
+        <source>No audio output tracks found</source>
+        <translation type="unfinished">Выходные аудио треки не найдены</translation>
+    </message>
+    <message>
+        <location line="-74"/>
+        <source>Select one audio output track,
+and one target wave track</source>
+        <translation type="unfinished">Выберите один трек аудио выхода
+и один wave-трек, как цель </translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <source>Select one target wave track</source>
+        <translation type="unfinished">Выделите один wave-трек, как цель (трек назначени�) </translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Select one target wave track,
+and one audio output track</source>
+        <translation type="unfinished">Выберите один wave-трек, как цель,
+(трек назначени�) и один трек аудио выхода</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <location line="+25"/>
+        <source>MusE: Bounce to File</source>
+        <translation type="unfinished">MusE: Све�ти в файл</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Select one audio output track</source>
+        <translation type="unfinished">Выделите один трек аудио выхода</translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>MusE: Bounce</source>
+        <translation type="unfinished">MusE: Све�ти</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>set left/right marker for bounce range</source>
+        <translation type="unfinished">на�тройте левый/правый маркеры дл� у�тановки диапазона �ведени�</translation>
+    </message>
+    <message>
+        <location line="+82"/>
+        <source>The current Project contains unsaved data
+Load overwrites current Project:
+Save Current Project?</source>
+        <translation type="unfinished">Текущий проект �одержит не �охранённые данные.
+Загрузка нового проекта приведёт к перезапи�и данных текущего проекта.
+Сохранить текущий проект?</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location filename="../../muse/importmidi.cpp" line="+85"/>
+        <source>&amp;Abort</source>
+        <translation type="unfinished">&amp;Отмена</translation>
+    </message>
+    <message>
+        <location filename="../../muse/exportmidi.cpp" line="+147"/>
+        <source>MusE: Export Midi</source>
+        <translation type="unfinished">MusE:Эк�порт MIDI</translation>
+    </message>
+    <message>
+        <location filename="../../muse/help.cpp" line="+50"/>
+        <source>no help found at: </source>
+        <translation type="unfinished">�правка не найдена в: </translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>MusE: Open Help</source>
+        <translation type="unfinished">MusE: Открыть �правку</translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>Unable to launch help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>For some reason MusE has to launch the default
+browser on your machine.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/importmidi.cpp" line="-12"/>
+        <source>MusE: Import Midi</source>
+        <translation type="unfinished">MusE: Импорт MIDI</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Add midi file to current project?
+</source>
+        <translation type="unfinished">Добавить midi файл в текущий проект?
+</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Add to Project</source>
+        <translation type="unfinished">&amp;Добавить в Проект</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Replace</source>
+        <translation type="unfinished">&amp;Заменить</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>reading midifile
+  </source>
+        <translation type="unfinished">читает�� MIDI-файл
+  
+  </translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>
+failed: </source>
+        <translation type="unfinished">
+не удало�ь:</translation>
+    </message>
+    <message>
+        <location line="+357"/>
+        <source>Import part is only valid for midi and wave tracks!</source>
+        <translation type="unfinished">Импортирование партий допу�тимо только дл� midi и wave треков!</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>MusE: load part</source>
+        <translation type="unfinished">MusE: открыть партию</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>No track selected for import</source>
+        <translation type="unfinished">�е выбран трек дл� импорта</translation>
+    </message>
+    <message numerus="yes">
+        <location line="+121"/>
+        <source>%n part(s) out of %1 could not be imported.
+Likely the selected track is the wrong type.</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location line="+1"/>
+        <source>%n part(s) could not be imported.
+Likely the selected track is the wrong type.</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <location filename="../../muse/wave.cpp" line="-6"/>
+        <source>to import an audio file you have first to selecta wave track</source>
+        <translation type="unfinished">чтобы импортировать аудио файл, вы должны �начала выделить wave-трек</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Import Wavefile</source>
+        <translation type="unfinished">Импортировать wave-файл</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>This wave file has a samplerate of %1,
+as opposed to current setting %2.
+Do you still want to import it?</source>
+        <translation type="unfinished">Samplerate �того wave-файла %1,
+в то врем� как текущий Samplerate %2.
+Хотите ли вы импортировать его?</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>&amp;Yes</source>
+        <translation type="unfinished">&amp;Да</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>&amp;No</source>
+        <translation type="unfinished">&amp;�ет</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::NoteInfo</name>
     <message>
         <location filename="../../muse/widgets/noteinfo.cpp" line="+44"/>
         <source>Note Info</source>
@@ -12877,35 +14791,556 @@ Apply sync settings?</source>
     </message>
 </context>
 <context>
-    <name>MusEWidget::RoutePopupMenu</name>
+    <name>MusEGui::PartCanvas</name>
+    <message>
+        <location filename="../../muse/arranger/pcanvas.cpp" line="+355"/>
+        <source>Cannot copy/move/clone to different Track-Type</source>
+        <translation type="unfinished">�евозможно копировать/перемещать/клонировать данные в другие типы дорожек</translation>
+    </message>
+    <message>
+        <location line="+280"/>
+        <source>C&amp;ut</source>
+        <translation type="unfinished">&amp;Вырезать</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Copy</source>
+        <translation type="unfinished">С&amp;копировать</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>s&amp;elect </source>
+        <translation type="unfinished">В&amp;ыбрать </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>clones</source>
+        <translation type="unfinished">клоны</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>rename</source>
+        <translation type="unfinished">Переименовать</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>color</source>
+        <translation type="unfinished">цвет</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>delete</source>
+        <translation type="unfinished">удалить</translation>
+    </message>
     <message>
-        <location filename="../../muse/widgets/routepopup.cpp" line="+223"/>
         <location line="+2"/>
-        <location line="+125"/>
+        <source>split</source>
+        <translation type="unfinished">разделить</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>glue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>de-clone</source>
+        <translation type="unfinished">деклонировать</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <source>save part to disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-2"/>
+        <source>wave edit</source>
+        <translation type="unfinished">Редактор �емплов</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>file info</source>
+        <translation type="unfinished">файл-инфо</translation>
+    </message>
+    <message>
+        <location line="+88"/>
+        <source>MusE: save part</source>
+        <translation type="unfinished">MusE: �охранить партию</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>Part name: %1
+Files:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <location line="+2136"/>
+        <source>%n part(s) out of %1 could not be pasted.
+Likely the selected track is the wrong type.</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location line="+1"/>
+        <source>%n part(s) could not be pasted.
+Likely the selected track is the wrong type.</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Cannot paste: multiple tracks selected</source>
+        <translation type="unfinished">В�тавка невозможна: выделено не�колько треков</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Cannot paste: no track selected</source>
+        <translation type="unfinished">В�тавка невозможна: не выделено ни  одного трека</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Can only paste to midi/drum track</source>
+        <translation type="unfinished">Можно в�тавить только в midi/drum трек</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Can only paste to wave track</source>
+        <translation type="unfinished">Можно в�тавить только в звуковой трек</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Can only paste to midi or wave track</source>
+        <translation type="unfinished">Можно в�тавить только в midi или wave треки</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Cannot paste: wrong data type</source>
+        <translation type="unfinished">В�тавка невозможна: неверный тип данных</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::PasteDialog</name>
+    <message numerus="yes">
+        <location filename="../../muse/widgets/pastedialog.cpp" line="+81"/>
+        <source>%n quarter(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>%1 quarter</source>
+        <comment>for floating-point arguments like 1.5</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>%1 quarters</source>
+        <comment>for floating-point arguments like 1.5</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::PasteEventsDialog</name>
+    <message numerus="yes">
+        <location filename="../../muse/widgets/pasteeventsdialog.cpp" line="+95"/>
+        <source>%n quarter(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>%1 quarter</source>
+        <comment>for floating-point arguments like 1.5</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>%1 quarters</source>
+        <comment>for floating-point arguments like 1.5</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::PianoRoll</name>
+    <message>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="+100"/>
+        <source>&amp;Edit</source>
+        <translation type="unfinished">&amp;Правка</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>C&amp;ut</source>
+        <translation type="unfinished">&amp;Вырезать</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Copy</source>
+        <translation type="unfinished">С&amp;копировать</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Copy events in range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Paste</source>
+        <translation type="unfinished">&amp;В�тавить</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Paste (with dialog)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Delete &amp;Events</source>
+        <translation type="unfinished">Удалить &amp;Событи�</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>&amp;Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select &amp;All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Deselect All</source>
+        <translation type="unfinished">&amp;Убрать выделение</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Invert &amp;Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>&amp;Inside Loop</source>
+        <translation type="unfinished">&amp;Внутри цикла</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Outside Loop</source>
+        <translation type="unfinished">&amp;Вне цикла</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&amp;Previous Part</source>
+        <translation type="unfinished">&amp;Предыдуща� парти�</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Next Part</source>
+        <translation type="unfinished">&amp;Следующа� парти�</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Fu&amp;nctions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Quantize</source>
+        <translation type="unfinished">Квантовать</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Modify Note Length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Modify Velocity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Crescendo/Decrescendo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Transpose</source>
+        <translation type="unfinished">Тран�понировать</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Erase Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Move Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Set Fixed Length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Delete Overlaps</source>
+        <translation type="unfinished">Удалить наложени�</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Legato</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Plugins</source>
+        <translation type="unfinished">&amp;Плагины</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Window &amp;Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Event Color</source>
+        <translation type="unfinished">&amp;Цвет �обыти�</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>&amp;Blue</source>
+        <translation type="unfinished">&amp;Синий</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Pitch colors</source>
+        <translation type="unfinished">&amp;Цвета вы�оты тона</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Velocity colors</source>
+        <translation type="unfinished">&amp;Цвета �коро�ти нажати�</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Pianoroll tools</source>
+        <translation type="unfinished">Ин�трументы пианоролла</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Step Record</source>
+        <translation type="unfinished">Пошагова� запи�ь</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Midi Input</source>
+        <translation type="unfinished">MIDI-вход</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Play Events</source>
+        <translation type="unfinished">Во�произве�ти �обыти�</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>panic</source>
+        <translation type="unfinished">паника</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>transport</source>
+        <translation type="unfinished">тран�порт</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>ctrl</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Add Controller View</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::PluginDialog</name>
+    <message>
+        <location filename="../../muse/plugin.cpp" line="+3137"/>
+        <source>MusE: select plugin</source>
+        <translation type="unfinished">MusE: выбрать плагин</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Lib</source>
+        <translation type="unfinished">Библ.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Label</source>
+        <translation type="unfinished">Метка</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Name</source>
+        <translation type="unfinished">Им�</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>AI</source>
+        <translation type="unfinished">AI</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>AO</source>
+        <translation type="unfinished">AO</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>CI</source>
+        <translation type="unfinished">CI</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>CO</source>
+        <translation type="unfinished">CP</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>IP</source>
+        <translation type="unfinished">IP</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>id</source>
+        <translation type="unfinished">id</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Maker</source>
+        <translation type="unfinished">Создатель</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copyright</source>
+        <translation type="unfinished">Copyright</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Отмена</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Mono and Stereo</source>
+        <translation type="unfinished">Моно и Стерео</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Stereo</source>
+        <translation type="unfinished">Стерео</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Mono</source>
+        <translation type="unfinished">Моно</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Show All</source>
+        <translation type="unfinished">Показать В�е</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Select which types of plugins should be visible in the list.&lt;br&gt;Note that using mono plugins on stereo tracks is not a problem, two will be used in parallell.&lt;br&gt;Also beware that the &apos;all&apos; alternative includes plugins that probably not are usable by MusE.</source>
+        <translation type="unfinished">Выберите типы плагинов, которые будут видны в �пи�ке.&lt;br&gt;Обратите внимание, что можно и�пользовать моно плагины в �терео треках, два будут и�пользованы параллельно.&lt;br&gt;Также будте о�торожны � плагинами категории &quot;в�е&quot; альтернативные, возможно их нельз� и�пользовать в MusE.</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Search in &apos;Label&apos; and &apos;Name&apos;:</source>
+        <translation type="unfinished">И�кать по &quot;Меткам&quot; и &quot;Именам&quot;:</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::PluginGui</name>
+    <message>
+        <location line="+207"/>
+        <source>File Buttons</source>
+        <translation type="unfinished">Файловые кнопки</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Load Preset</source>
+        <translation type="unfinished">Загрузить пре�ет</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Save Preset</source>
+        <translation type="unfinished">Сохранить пре�ет</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location line="+3"/>
+        <source>bypass plugin</source>
+        <translation type="unfinished">обойти плагин</translation>
+    </message>
+    <message>
+        <location line="+554"/>
+        <source>MusE: load preset</source>
+        <translation type="unfinished">MusE: загрузить пре�ет</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Error reading preset. Might not be right type for this plugin</source>
+        <translation type="unfinished">Ошибка прочтени� пре�ета. Возможно неверный тип дл� �того плагина</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>MusE: save preset</source>
+        <translation type="unfinished">MusE: �охранить пре�ет</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::RoutePopupMenu</name>
+    <message>
+        <location filename="../../muse/widgets/routepopup.cpp" line="+230"/>
+        <location line="+2"/>
+        <location line="+132"/>
         <location line="+78"/>
         <location line="+57"/>
-        <location line="+53"/>
-        <location line="+682"/>
+        <location line="+60"/>
+        <location line="+685"/>
         <location line="+85"/>
         <source>Channel</source>
         <translation type="unfinished">Канал</translation>
     </message>
     <message>
-        <location line="-274"/>
-        <location line="+224"/>
+        <location line="-270"/>
+        <location line="+220"/>
         <location line="+85"/>
         <source>Soloing chain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-307"/>
-        <location line="+224"/>
+        <location line="-303"/>
+        <location line="+220"/>
         <source>Audio returns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-185"/>
-        <source>Warning: No midi input devices!</source>
+        <location line="-182"/>
+        <source>Warning: No input devices!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -12914,7 +15349,7 @@ Apply sync settings?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+42"/>
         <location line="+33"/>
         <source>&lt;none&gt;</source>
         <translation type="unfinished">&lt;ничего&gt;</translation>
@@ -12941,9 +15376,315 @@ Apply sync settings?</source>
     </message>
 </context>
 <context>
-    <name>MusEWidget::ScrollScale</name>
+    <name>MusEGui::ScoreCanvas</name>
+    <message>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="+1313"/>
+        <source>Treble</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Bass</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Grand Staff</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove staff</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2471"/>
+        <source>Ambiguous part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There are two or more possible parts you could add the note to, but none matches the selected part. Please select the destination part by clicking on any note belonging to it and try again, or add a new stave containing only the destination part.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>No part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There are no parts you could add the note to.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::ScoreEdit</name>
+    <message>
+        <location line="-3557"/>
+        <source>Undo/Redo tools</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Step recording tools</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Step Record</source>
+        <translation type="unfinished">Пошагова� запи�ь</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>panic</source>
+        <translation type="unfinished">паника</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>transport</source>
+        <translation type="unfinished">тран�порт</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Note settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Note length:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>last</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <location filename="../../muse/widgets/scrollscale.cpp" line="+316"/>
+        <location line="+42"/>
+        <location line="+1"/>
+        <location line="+325"/>
+        <source>Apply to new notes:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-324"/>
+        <location line="+328"/>
+        <source>Apply to selected notes:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-321"/>
+        <source>Velocity:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Off-Velocity:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Quantisation settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Quantisation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Pixels per whole:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>&amp;Edit</source>
+        <translation type="unfinished">&amp;Правка</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>C&amp;ut</source>
+        <translation type="unfinished">&amp;Вырезать</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Copy</source>
+        <translation type="unfinished">С&amp;копировать</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Copy events in range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Paste</source>
+        <translation type="unfinished">&amp;В�тавить</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Paste (with dialog)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Delete &amp;Events</source>
+        <translation type="unfinished">Удалить &amp;Событи�</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>&amp;Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select &amp;All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Deselect All</source>
+        <translation type="unfinished">&amp;Убрать выделение</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Invert &amp;Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>&amp;Inside Loop</source>
+        <translation type="unfinished">&amp;Внутри цикла</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Outside Loop</source>
+        <translation type="unfinished">&amp;Вне цикла</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Fu&amp;nctions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Quantize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Change note &amp;length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Change note &amp;velocity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Crescendo/Decrescendo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transpose</source>
+        <translation type="unfinished">Тран�понировать</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Erase Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Move Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Set Fixed Length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Delete Overlaps</source>
+        <translation type="unfinished">Удалить наложени�</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Legato</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Window &amp;Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Note head &amp;colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Black</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Velocity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Set up &amp;preamble</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Display &amp;key signature</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Display &amp;time signature</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Set Score &amp;name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+224"/>
+        <location line="+1"/>
+        <source>Enter the new score title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Changing score title failed:
+the selected title is not unique</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::ScrollScale</name>
+    <message>
+        <location filename="../../muse/widgets/scrollscale.cpp" line="+318"/>
         <source>next page</source>
         <translation type="unfinished">�лед �траница</translation>
     </message>
@@ -12959,7 +15700,7 @@ Apply sync settings?</source>
     </message>
 </context>
 <context>
-    <name>MusEWidget::ShortcutCaptureDialog</name>
+    <name>MusEGui::ShortcutCaptureDialog</name>
     <message>
         <location filename="../../muse/widgets/shortcutcapturedialog.cpp" line="+55"/>
         <source>Ok</source>
@@ -12972,8 +15713,8 @@ Apply sync settings?</source>
     </message>
     <message>
         <location line="+52"/>
-        <source>Shortcut conflicts with </source>
-        <translation type="unfinished">&quot;Гор�ча� клавиша&quot; конфликтует � </translation>
+        <source>Shortcut conflicts with %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
@@ -12982,7 +15723,7 @@ Apply sync settings?</source>
     </message>
 </context>
 <context>
-    <name>MusEWidget::SigScale</name>
+    <name>MusEGui::SigScale</name>
     <message>
         <location filename="../../muse/widgets/sigscale.cpp" line="+44"/>
         <source>signature scale</source>
@@ -12990,9 +15731,155 @@ Apply sync settings?</source>
     </message>
 </context>
 <context>
-    <name>MusEWidget::Toolbar1</name>
+    <name>MusEGui::Strip</name>
+    <message>
+        <location filename="../../muse/mixer/strip.cpp" line="+314"/>
+        <source>Remove track?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::TList</name>
+    <message>
+        <location filename="../../muse/arranger/tlist.cpp" line="+373"/>
+        <source>&lt;none&gt;</source>
+        <translation type="unfinished">&lt;ничего&gt;</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>no clef</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <location filename="../../muse/widgets/tb1.cpp" line="+21"/>
+        <location line="+2"/>
+        <source>Treble</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Bass</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Grand</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>MusE: bad trackname</source>
+        <translation type="unfinished">MusE: неверное им� трека</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>please choose a unique track name</source>
+        <translation type="unfinished">Выберите неповтор�ющее�� им� дл� трека</translation>
+    </message>
+    <message>
+        <location line="+172"/>
+        <location line="+1149"/>
+        <source>Update drummap?</source>
+        <translation type="unfinished">Обновить карту ударных?</translation>
+    </message>
+    <message>
+        <location line="-1148"/>
+        <source>Do you want to use same port for all instruments in the drummap?</source>
+        <translation type="unfinished">Вы хотите и�пользовать один и тот же порт дл� в�ех ин�трументов в �пи�ке ударных?</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+1149"/>
+        <source>&amp;Yes</source>
+        <translation type="unfinished">&amp;Да</translation>
+    </message>
+    <message>
+        <location line="-1149"/>
+        <location line="+1149"/>
+        <source>&amp;No</source>
+        <translation type="unfinished">&amp;�ет</translation>
+    </message>
+    <message>
+        <location line="-1074"/>
+        <location line="+55"/>
+        <source>show gui</source>
+        <translation type="unfinished">показать ГИП</translation>
+    </message>
+    <message>
+        <location line="-46"/>
+        <location line="+55"/>
+        <source>show native gui</source>
+        <translation type="unfinished">показать ГИП</translation>
+    </message>
+    <message>
+        <location line="+346"/>
+        <source>Treble clef</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bass clef</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Grand Staff</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Viewable automation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+131"/>
+        <source>Delete Track</source>
+        <translation type="unfinished">Удалить трек</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Track Comment</source>
+        <translation type="unfinished">Комментарий к треку</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Insert Track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+445"/>
+        <source>Midi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Drum</source>
+        <translation type="unfinished">Ударные</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Do you want to use same port and channel for all instruments in the drummap?</source>
+        <translation type="unfinished">Вы хотите и�пользовать один и тот же порт и канал дл� в�ех ин�трументов в �пи�ке ударных?</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::TempoSig</name>
+    <message>
+        <location filename="../../muse/transport.cpp" line="+149"/>
+        <source>Tempo/Sig</source>
+        <translation type="unfinished">Темп/Знаки альтерации</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::Toolbar1</name>
+    <message>
+        <location filename="../../muse/widgets/tb1.cpp" line="+47"/>
+        <location line="+1"/>
+        <location line="+1"/>
+        <source>Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>Solo</source>
         <translation type="unfinished">Соло</translation>
     </message>
@@ -13008,7 +15895,80 @@ Apply sync settings?</source>
     </message>
 </context>
 <context>
-    <name>MusEWidget::TrackComment</name>
+    <name>MusEGui::TopWin</name>
+    <message>
+        <location filename="../../muse/cobject.cpp" line="+64"/>
+        <source>As subwindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Shares tools and menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Fullscreen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+468"/>
+        <source>Piano roll</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>List editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Drum editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Master track editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Master track list editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Wave editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Clip list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Marker view</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Score editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Arranger</source>
+        <translation type="unfinished">Компоновщик</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&lt;unknown toplevel type&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::TrackComment</name>
     <message>
         <location filename="../../muse/widgets/comment.cpp" line="+58"/>
         <source>MusE: Track Comment</source>
@@ -13021,14 +15981,1091 @@ Apply sync settings?</source>
     </message>
 </context>
 <context>
-    <name>MusEWidget::VisibleTracks</name>
+    <name>MusEGui::Transport</name>
+    <message>
+        <location filename="../../muse/transport.cpp" line="+105"/>
+        <source>Overdub</source>
+        <translation type="unfinished">�аложить</translation>
+    </message>
     <message>
-        <location filename="../../muse/widgets/visibletracks.cpp" line="+9"/>
+        <location line="+1"/>
+        <location line="+15"/>
+        <source>Replace</source>
+        <translation type="unfinished">Заменить</translation>
+    </message>
+    <message>
+        <location line="-10"/>
+        <source>Rec Mode</source>
+        <translation type="unfinished">Режим запи�и</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Normal</source>
+        <translation type="unfinished">�орм.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mix</source>
+        <translation type="unfinished">Смешать</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Cycle Rec</source>
+        <translation type="unfinished">Циклич. запи�ь</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>punchin</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>loop</source>
+        <translation type="unfinished">цикл</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>punchout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+3"/>
+        <source>Punch In</source>
+        <translation type="unfinished">�ачало врезки</translation>
+    </message>
+    <message>
+        <location line="-2"/>
+        <location line="+3"/>
+        <source>Loop</source>
+        <translation type="unfinished">Цикл</translation>
+    </message>
+    <message>
+        <location line="-2"/>
+        <location line="+3"/>
+        <source>Punch Out</source>
+        <translation type="unfinished">Конец врезки</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Left Mark</source>
+        <translation type="unfinished">Левый маркер</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Right Mark</source>
+        <translation type="unfinished">Правый маркер</translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>rewind to start</source>
+        <translation type="unfinished">перемотать к началу</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Click this button to rewind to start position</source>
+        <translation type="unfinished">Щелкните по �той кнопке дл� перемещени� к началу</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>rewind</source>
+        <translation type="unfinished">перемотать назад</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Click this button to rewind</source>
+        <translation type="unfinished">Щелкните по �той кнопке дл� перемотки назад</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>forward</source>
+        <translation type="unfinished">перемотать вперёд</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Click this button to forward current play position</source>
+        <translation type="unfinished">Щелкните по �той кнопке дл� перемещени� вперёд</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>stop</source>
+        <translation type="unfinished">о�тановить</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Click this button to stop playback</source>
+        <translation type="unfinished">Щелкните по �той кнопке дл� о�тановки во�произведени�</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>play</source>
+        <translation type="unfinished">во�произве�ти</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Click this button to start playback</source>
+        <translation type="unfinished">Щелкните по �той кнопке, чтобы начать во�произведение</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Click this button to enable recording</source>
+        <translation type="unfinished">Щелкните по �той кнопке дл� активизации режима запи�и</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>AC</source>
+        <translation type="unfinished">AC</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>quantize during record</source>
+        <translation type="unfinished">квантовать при запи�и</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Click</source>
+        <translation type="unfinished">Метр.</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>metronom click on/off</source>
+        <translation type="unfinished">Метроном вкл/выкл</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Sync</source>
+        <translation type="unfinished">Синхр.</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>external sync on/off</source>
+        <translation type="unfinished">Вкл/выкл внешн. �инхр.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Jack</source>
+        <translation type="unfinished">Jack</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Jack transport sync on/off</source>
+        <translation type="unfinished">Синхр. тран�порта &quot;Jack&quot; вкл/выкл</translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Master</source>
+        <translation type="unfinished">Ма�тер</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>use master track</source>
+        <translation type="unfinished">и�пользовать ма�тер-трек</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::VisibleTracks</name>
+    <message>
+        <location filename="../../muse/widgets/visibletracks.cpp" line="+36"/>
+        <location line="+9"/>
+        <source>Show wave tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-8"/>
+        <location line="+9"/>
+        <source>Show group tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-8"/>
+        <location line="+9"/>
+        <source>Show aux tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-8"/>
+        <location line="+9"/>
+        <source>Show input tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-8"/>
+        <location line="+9"/>
+        <source>Show output tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-8"/>
+        <location line="+9"/>
+        <source>Show midi tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-8"/>
+        <location line="+9"/>
+        <source>Show synth tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
         <source>Visible track types</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>MusEGui::WaveEdit</name>
+    <message>
+        <location filename="../../muse/waveedit/waveedit.cpp" line="+91"/>
+        <source>&amp;Edit</source>
+        <translation type="unfinished">&amp;Правка</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Func&amp;tions</source>
+        <translation type="unfinished">Фу&amp;нкции</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Gain</source>
+        <translation type="unfinished">&amp;У�иление</translation>
+    </message>
+    <message>
+        <source>200%</source>
+        <translation type="obsolete">200%</translation>
+    </message>
+    <message>
+        <source>150%</source>
+        <translation type="obsolete">150%</translation>
+    </message>
+    <message>
+        <source>75%</source>
+        <translation type="obsolete">75%</translation>
+    </message>
+    <message>
+        <source>50%</source>
+        <translation type="obsolete">50%</translation>
+    </message>
+    <message>
+        <source>25%</source>
+        <translation type="obsolete">25%</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Other</source>
+        <translation type="unfinished">Другой</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>&amp;Copy</source>
+        <translation type="unfinished">С&amp;копировать</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>C&amp;ut</source>
+        <translation type="unfinished">&amp;Вырезать</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Paste</source>
+        <translation type="unfinished">&amp;В�тавить</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Edit in E&amp;xternal Editor</source>
+        <translation type="unfinished">Редактировать во &amp;внешнем редакторе</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Mute Selection</source>
+        <translation type="unfinished">Заглушить выделенное</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Normalize Selection</source>
+        <translation type="unfinished">�ормализовать выделенное</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Fade In Selection</source>
+        <translation type="unfinished">�ара�тание звука в выделенном</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Fade Out Selection</source>
+        <translation type="unfinished">Затихание звука в выделенном</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Reverse Selection</source>
+        <translation type="unfinished">Перевернуть выделенное</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select</source>
+        <translation type="unfinished">Выделить</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select &amp;All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Deselect All</source>
+        <translation type="unfinished">&amp;Убрать выделение</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Window &amp;Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Wave edit tools</source>
+        <translation type="unfinished">Ин�трументы редактировани� Wave</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>transport</source>
+        <translation type="unfinished">тран�порт</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>WaveEdit tools</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Solo</source>
+        <translation type="unfinished">Соло</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Cursor</source>
+        <translation type="unfinished">Кур�ор</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::WaveView</name>
+    <message>
+        <location filename="../../muse/waveedit/waveview.cpp" line="+996"/>
+        <source>MusE - external editor failed</source>
+        <translation type="unfinished">MusE - ошибка запу�ка внешнего редактора</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>MusE was unable to launch the external editor
+check if the editor setting in:
+Global Settings-&gt;Audio:External Waveditor
+is set to a valid editor.</source>
+        <translation type="unfinished">&quot;MusE&quot; не может запу�тить внешний редактор.
+Проверте, дей�твительно ли в:
+Общие на�тройки-&gt;�удио:Внешний редактор
+выбран правильный редактор.</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>MusE - file size changed</source>
+        <translation type="unfinished">MusE - размер файла изменил��</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>When editing in external editor - you should not change the filesize
+since it must fit the selected region.
+
+Missing data is muted</source>
+        <translation type="unfinished">При редактировании во внешнем редакторе - не измен�йте размер файла
+так как он должен �оответ�твовать выбранной обла�ти.
+
+Утер�нные данные заглушены</translation>
+    </message>
+</context>
+<context>
+    <name>MusEMixer::AudioMixerApp</name>
+    <message>
+        <source>&amp;View</source>
+        <translation type="obsolete">&amp;Вид</translation>
+    </message>
+    <message>
+        <source>Routing</source>
+        <translation type="obsolete">Маршрутизаци�</translation>
+    </message>
+    <message>
+        <source>Show Midi Tracks</source>
+        <translation type="obsolete">Показать Midi-треки</translation>
+    </message>
+    <message>
+        <source>Show Drum Tracks</source>
+        <translation type="obsolete">Показать треки ударных</translation>
+    </message>
+    <message>
+        <source>Show Wave Tracks</source>
+        <translation type="obsolete">Показать Wave-треки</translation>
+    </message>
+    <message>
+        <source>Show Inputs</source>
+        <translation type="obsolete">Показать входы</translation>
+    </message>
+    <message>
+        <source>Show Outputs</source>
+        <translation type="obsolete">Показать выходы</translation>
+    </message>
+    <message>
+        <source>Show Groups</source>
+        <translation type="obsolete">Показать группы</translation>
+    </message>
+    <message>
+        <source>Show Auxs</source>
+        <translation type="obsolete">Показать Auxs</translation>
+    </message>
+    <message>
+        <source>Show Synthesizers</source>
+        <translation type="obsolete">Показать �интезаторы</translation>
+    </message>
+</context>
+<context>
+    <name>MusEMixer::AudioStrip</name>
+    <message>
+        <source>panorama</source>
+        <translation type="obsolete">панорама</translation>
+    </message>
+    <message>
+        <source>aux send level</source>
+        <translation type="obsolete">уровень aux по�ыла</translation>
+    </message>
+    <message>
+        <source>Pan</source>
+        <translation type="obsolete">Пан</translation>
+    </message>
+    <message>
+        <source>1/2 channel</source>
+        <translation type="obsolete">�терео-моно</translation>
+    </message>
+    <message>
+        <source>Pre</source>
+        <translation type="obsolete">Пре</translation>
+    </message>
+    <message>
+        <source>pre fader - post fader</source>
+        <translation type="obsolete">пре федер - по�т федер</translation>
+    </message>
+    <message>
+        <source>mute</source>
+        <translation type="obsolete">заглушить</translation>
+    </message>
+    <message>
+        <source>record downmix</source>
+        <translation type="obsolete">запи�ать downmix</translation>
+    </message>
+    <message>
+        <source>solo mode</source>
+        <translation type="obsolete">режим �оло</translation>
+    </message>
+    <message>
+        <source>off</source>
+        <translation type="obsolete">выкл</translation>
+    </message>
+    <message>
+        <source>iR</source>
+        <translation type="obsolete">вх</translation>
+    </message>
+    <message>
+        <source>input routing</source>
+        <translation type="obsolete">маршрут входа</translation>
+    </message>
+    <message>
+        <source>oR</source>
+        <translation type="obsolete">вых</translation>
+    </message>
+    <message>
+        <source>output routing</source>
+        <translation type="obsolete">маршрут выхода</translation>
+    </message>
+    <message>
+        <source>Read</source>
+        <translation type="obsolete">Читать</translation>
+    </message>
+    <message>
+        <source>Touch</source>
+        <translation type="obsolete">По ка�анию</translation>
+    </message>
+    <message>
+        <source>automation type</source>
+        <translation type="obsolete">тип автоматизации</translation>
+    </message>
+</context>
+<context>
+    <name>MusEMixer::EffectRack</name>
+    <message>
+        <source>effect rack</source>
+        <translation type="obsolete">р�к �ффектов</translation>
+    </message>
+    <message>
+        <source>new</source>
+        <translation type="obsolete">новый</translation>
+    </message>
+    <message>
+        <source>change</source>
+        <translation type="obsolete">изменить</translation>
+    </message>
+    <message>
+        <source>move up</source>
+        <translation type="obsolete">�двинуть выше</translation>
+    </message>
+    <message>
+        <source>move down</source>
+        <translation type="obsolete">�двинуть ниже</translation>
+    </message>
+    <message>
+        <source>remove</source>
+        <translation type="obsolete">удалить</translation>
+    </message>
+    <message>
+        <source>bypass</source>
+        <translation type="obsolete">обойти</translation>
+    </message>
+    <message>
+        <source>show gui</source>
+        <translation type="obsolete">показать ГИП</translation>
+    </message>
+    <message>
+        <source>show native gui</source>
+        <translation type="obsolete">показать ГИП</translation>
+    </message>
+    <message>
+        <source>save preset</source>
+        <translation type="obsolete">�охранить пре�ет</translation>
+    </message>
+    <message>
+        <source>MusE: Save Preset</source>
+        <translation type="obsolete">MusE: Сохранить Пре�ет</translation>
+    </message>
+    <message>
+        <source>Replace effect</source>
+        <translation type="obsolete">Заменить �ффект</translation>
+    </message>
+    <message>
+        <source>Do you really want to replace the effect %1?</source>
+        <translation type="obsolete">Вы дей�твительно хотите заменить �ффект %1?</translation>
+    </message>
+</context>
+<context>
+    <name>MusEMixer::MidiStrip</name>
+    <message>
+        <source>off</source>
+        <translation type="obsolete">выкл</translation>
+    </message>
+    <message>
+        <source>double click on/off</source>
+        <translation type="obsolete">двойной щелчок вкл/выкл</translation>
+    </message>
+    <message>
+        <source>VariationSend</source>
+        <translation type="obsolete">Вариационный по�ыл</translation>
+    </message>
+    <message>
+        <source>Var</source>
+        <translation type="obsolete">Вар</translation>
+    </message>
+    <message>
+        <source>ReverbSend</source>
+        <translation type="obsolete">По�ыл Реверберации</translation>
+    </message>
+    <message>
+        <source>Rev</source>
+        <translation type="obsolete">Ревер</translation>
+    </message>
+    <message>
+        <source>ChorusSend</source>
+        <translation type="obsolete">По�ыл Хору�а</translation>
+    </message>
+    <message>
+        <source>Cho</source>
+        <translation type="obsolete">Хору�</translation>
+    </message>
+    <message>
+        <source>Pan/Balance</source>
+        <translation type="obsolete">Пан/Балан�</translation>
+    </message>
+    <message>
+        <source>Pan</source>
+        <translation type="obsolete">Пан</translation>
+    </message>
+    <message>
+        <source>mute</source>
+        <translation type="obsolete">заглушить</translation>
+    </message>
+    <message>
+        <source>solo mode</source>
+        <translation type="obsolete">режим �оло</translation>
+    </message>
+    <message>
+        <source>iR</source>
+        <translation type="obsolete">вх</translation>
+    </message>
+    <message>
+        <source>input routing</source>
+        <translation type="obsolete">маршрут входа</translation>
+    </message>
+    <message>
+        <source>oR</source>
+        <translation type="obsolete">вых</translation>
+    </message>
+    <message>
+        <source>output routing</source>
+        <translation type="obsolete">маршрут выхода</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::BigTime</name>
+    <message>
+        <source>format display</source>
+        <translation type="obsolete">формат ди�пле�</translation>
+    </message>
+    <message>
+        <source>bar</source>
+        <translation type="obsolete">такт</translation>
+    </message>
+    <message>
+        <source>beat</source>
+        <translation type="obsolete">дол�</translation>
+    </message>
+    <message>
+        <source>tick</source>
+        <translation type="obsolete">тик</translation>
+    </message>
+    <message>
+        <source>minute</source>
+        <translation type="obsolete">минут(а)</translation>
+    </message>
+    <message>
+        <source>second</source>
+        <translation type="obsolete">�екунд(а)</translation>
+    </message>
+    <message>
+        <source>frame</source>
+        <translation type="obsolete">фреймов</translation>
+    </message>
+    <message>
+        <source>subframe</source>
+        <translation type="obsolete">�убфреймов</translation>
+    </message>
+    <message>
+        <source>MusE: Bigtime</source>
+        <translation type="obsolete">MusE: Хронометр</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::EditToolBar</name>
+    <message>
+        <source>Edit Tools</source>
+        <translation type="obsolete">Ин�трументы редактировани�</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::MidiSyncConfig</name>
+    <message>
+        <source>Port Number</source>
+        <translation type="obsolete">�омер порта</translation>
+    </message>
+    <message>
+        <source>Name of the midi device associated with this port number</source>
+        <translation type="obsolete">Им� MIDI-у�трой�тва, а��оциированного � номером �того порта </translation>
+    </message>
+    <message>
+        <source>Midi clock input detected</source>
+        <translation type="obsolete">Обнаружен вход midi-clock</translation>
+    </message>
+    <message>
+        <source>Midi tick input detected</source>
+        <translation type="obsolete">Обнаружен вход midi-тика</translation>
+    </message>
+    <message>
+        <source>Midi real time input detected</source>
+        <translation type="obsolete">Обнаружен midi-вход реального времени</translation>
+    </message>
+    <message>
+        <source>MMC input detected</source>
+        <translation type="obsolete">Обнаружен вход MMC</translation>
+    </message>
+    <message>
+        <source>MTC input detected</source>
+        <translation type="obsolete">Обнаружен вход MTC</translation>
+    </message>
+    <message>
+        <source>Detected SMPTE format</source>
+        <translation type="obsolete">Обнаруженые SMPTE форматы</translation>
+    </message>
+    <message>
+        <source>Receive id number. 127 = Global. Double click to edit.</source>
+        <translation type="obsolete">Получить id номер. 127 = Глобально. Двойной щелчок дл� редактировани�.</translation>
+    </message>
+    <message>
+        <source>Accept midi clock input</source>
+        <translation type="obsolete">Прин�ть вход Midi-clock</translation>
+    </message>
+    <message>
+        <source>Accept midi real time input</source>
+        <translation type="obsolete">Прин�ть midi-вход реального времени</translation>
+    </message>
+    <message>
+        <source>Accept MMC input</source>
+        <translation type="obsolete">Прин�ть вход MMC</translation>
+    </message>
+    <message>
+        <source>Accept MTC input</source>
+        <translation type="obsolete">Прин�ть вход MTC</translation>
+    </message>
+    <message>
+        <source>Receive start rewinds before playing</source>
+        <translation type="obsolete">Получить перед во�произведением �ообщение о начале перемотки</translation>
+    </message>
+    <message>
+        <source>Transmit id number. 127 = Global. Double click to edit.</source>
+        <translation type="obsolete">Передать номер id. 127 = Общий. Двойной щелчок дл� редактировани�.</translation>
+    </message>
+    <message>
+        <source>Send midi clock output</source>
+        <translation type="obsolete">По�лать выход midi-clock</translation>
+    </message>
+    <message>
+        <source>Send midi realtime output</source>
+        <translation type="obsolete">По�лать midi-выход реального времени</translation>
+    </message>
+    <message>
+        <source>Send MMC output</source>
+        <translation type="obsolete">По�лать выход MMC</translation>
+    </message>
+    <message>
+        <source>Send MTC output</source>
+        <translation type="obsolete">По�лать выход MTC</translation>
+    </message>
+    <message>
+        <source>Midi clock input detected.
+Current port actually used is red.
+Click to force a port to be used.</source>
+        <translation type="obsolete">Обнаружен вход midi-clock.
+Фактиче�ки и�пользуемый
+текущий порт - кра�ный.
+Щелкните, чтобы принудительно
+и�пользовать порт.</translation>
+    </message>
+    <message>
+        <source>Midi realtime input detected, including
+ start/stop/continue, and song position.</source>
+        <translation type="obsolete">Обнаружен midi-вход реального времени,
+� &quot;�тарт/�топ/продолжить&quot; и позицией проекта.</translation>
+    </message>
+    <message>
+        <source>MMC input detected, including stop/play/deferred play, and locate.</source>
+        <translation type="obsolete">Обнаружен MMC-вход c &quot;�тарт/�топ/отложенное во�произведение&quot;
+ и локацией.</translation>
+    </message>
+    <message>
+        <source>MTC input detected, including forward quarter-frame sync and full-frame locate.
+Current port actually used is red. Click to force a port to be current.</source>
+        <translation type="obsolete">Обнаружен MTC-вход, � четверть-фреймовой
+�инхронизацией и полно-фреймовой локацией.
+Фактиче�ки и�пользуемый
+текущий порт - кра�ный.
+Щелкните, чтобы принудительно
+�делать порт текущим.</translation>
+    </message>
+    <message>
+        <source>Detected SMPTE format: 24fps, 25fps, 30fps drop frame, or 30fps non-drop
+Detects format of MTC quarter and full frame, and MMC locate.</source>
+        <translation type="obsolete">Обнаруженые форматы SMPTE: 24fps, 25fps, 30fps � пропущенным
+фреймом, или 30fps без пропущенного фрейма
+Обнаруживает MTC-формат четверть и полно-фреймовый, и MMC локацию.</translation>
+    </message>
+    <message>
+        <source>Receive id number. 127 = global receive all, even if not global.</source>
+        <translation type="obsolete">Получить номер id. 127 =глобальный получает в�е, даже е�ли не глобальный.</translation>
+    </message>
+    <message>
+        <source>Accept midi clock input. Only one input is used for clock.
+Auto-acquire: If two or more port realtime inputs are enabled,
+ the first clock detected is used, until clock is lost,
+ then another can take over. Best if each turns off its clock
+ at stop, so MusE can re-acquire the clock from another port.
+Click on detect indicator to force another.</source>
+        <translation type="obsolete">Прин�ть вход midi-clock. Только один вход и�пользует�� дл� &quot;clock&quot;.
+�вто-получение: е�ли разрешены два или более входов реального времени на порт, то будут и�пользован первый обнаруженный &quot;clock&quot;, пока он не будет потер�н, затем будет и�пользован другой. Самое лучшее, е�ли каждый отключит �вой &quot;clock&quot; во врем� о�тановки, чтобы MusE �нова получил &quot;clock&quot; � другого порта. Щелкните по индикатору обнаружени�, чтобы �делать по другому.</translation>
+    </message>
+    <message>
+        <source>Accept midi realtime input, including
+ start/stop/continue, and song position.
+Non-clock events (start,stop etc) are
+ accepted by ALL enabled ports.
+This means you may have several master
+ devices connected, and muse will accept
+ input from them.</source>
+        <translation type="obsolete">Прин�ть midi-вход реального времени
+� &quot;�тарт/�топ/продолжить&quot; и позицией проекта.
+Событи� &quot;Non-clock&quot; (�тарт, �топ, и т. п.) принимают��
+ВСЕМИ разрешенными портами. Это означает, что вы
+можете иметь не�колько под�оединенных ма�тер-у�трой�тв,
+и MusE примет вход от них.</translation>
+    </message>
+    <message>
+        <source>Accept MMC input, including stop/play/deferred play, and locate.</source>
+        <translation type="obsolete">Прин�ть вход MMC,  � &quot;�топ/�тарт/отложенным во�произведением&quot; и локацией.</translation>
+    </message>
+    <message>
+        <source>Accept MTC input, including forward quarter-frame sync and full-frame locate.
+See &apos;rc&apos; column for more help.</source>
+        <translation type="obsolete">Прин�ть вход MTC, � четверть-фреймовой
+�инхронизацией и полно-фреймовой локацией.
+См. колонку &quot;rc&quot; дл� получени� помощи.</translation>
+    </message>
+    <message>
+        <source>When start is received, rewind before playing.
+Note: It may be impossible to rewind fast
+ enough to synchronize with the external device.</source>
+        <translation type="obsolete">Когда �ообщение &quot;�тарт&quot; получено, перемотать перед
+во�произведением. Примечание: может быть
+так, что перемотка окажет�� недо�таточно бы�трой
+дл� �инхронизации � внешним у�трой�твом.</translation>
+    </message>
+    <message>
+        <source>Transmit id number. 127 = global transmit to all.</source>
+        <translation type="obsolete">Передавать номер id. 127 =обща� передача дл� в�ех.</translation>
+    </message>
+    <message>
+        <source>Send midi clock output. If &apos;Slave to External Sync&apos; is chosen,
+ muse can re-transmit clock to any other chosen ports.</source>
+        <translation type="obsolete">По�ылать выход midi-clock. Е�ли выбрано &quot;Slave to External Sync&quot;,
+то MusE может �нова передать &quot;clock&quot; на любой другой выбранный порт.</translation>
+    </message>
+    <message>
+        <source>Send midi realtime output, including start/stop/continue,
+ and song position. If &apos;Slave to external sync&apos; is chosen,
+ muse can re-transmit midi realtime input messages to any
+ other chosen ports. This means you may have several slave
+ devices connected, and muse can re-send realtime messages
+ to any or all of them.</source>
+        <translation type="obsolete">По�лать midi-выход реального времени, � &quot;�тарт/�топ/продолжить&quot;
+и позицией проекта. Е�ли выбрано &quot;Slave to External Sync&quot;,
+то MusE может �нова передать �ообщени� � midi-входа реального
+времени на любой другой выбранный порт. Это значит, что вы можете
+иметь не�колько при�оединенных ведомых у�трой�тв, и MusE может �нова по�лать �ообщени� реального времени на любое из них или на в�е.</translation>
+    </message>
+    <message>
+        <source>Port</source>
+        <translation type="obsolete">Порт</translation>
+    </message>
+    <message>
+        <source>Device Name</source>
+        <translation type="obsolete">Им� у�трой�тва</translation>
+    </message>
+    <message>
+        <source>c</source>
+        <translation type="obsolete">c</translation>
+    </message>
+    <message>
+        <source>k</source>
+        <translation type="obsolete">k</translation>
+    </message>
+    <message>
+        <source>r</source>
+        <translation type="obsolete">r</translation>
+    </message>
+    <message>
+        <source>t</source>
+        <translation type="obsolete">t</translation>
+    </message>
+    <message>
+        <source>type</source>
+        <translation type="obsolete">тип</translation>
+    </message>
+    <message>
+        <source>rid</source>
+        <translation type="obsolete">rid</translation>
+    </message>
+    <message>
+        <source>rc</source>
+        <translation type="obsolete">rc</translation>
+    </message>
+    <message>
+        <source>rr</source>
+        <translation type="obsolete">rr</translation>
+    </message>
+    <message>
+        <source>rm</source>
+        <translation type="obsolete">rm</translation>
+    </message>
+    <message>
+        <source>rt</source>
+        <translation type="obsolete">rt</translation>
+    </message>
+    <message>
+        <source>rw</source>
+        <translation type="obsolete">rw</translation>
+    </message>
+    <message>
+        <source>tid</source>
+        <translation type="obsolete">tid</translation>
+    </message>
+    <message>
+        <source>tc</source>
+        <translation type="obsolete">tc</translation>
+    </message>
+    <message>
+        <source>tr</source>
+        <translation type="obsolete">tr</translation>
+    </message>
+    <message>
+        <source>tm</source>
+        <translation type="obsolete">tm</translation>
+    </message>
+    <message>
+        <source>tt</source>
+        <translation type="obsolete">tt</translation>
+    </message>
+    <message>
+        <source>MusE</source>
+        <translation type="obsolete">MusE</translation>
+    </message>
+    <message>
+        <source>Settings have changed
+Apply sync settings?</source>
+        <translation type="obsolete">�а�тройки изменили�ь
+Применить на�тройки �инхронизации?</translation>
+    </message>
+    <message>
+        <source>&amp;Apply</source>
+        <translation type="obsolete">&amp;Применить</translation>
+    </message>
+    <message>
+        <source>&amp;No</source>
+        <translation type="obsolete">&amp;�ет</translation>
+    </message>
+    <message>
+        <source>&amp;Abort</source>
+        <translation type="obsolete">&amp;Отмена</translation>
+    </message>
+    <message>
+        <source>&lt;none&gt;</source>
+        <translation type="obsolete">&lt;ничего&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::MidiTrackInfo</name>
+    <message>
+        <source>&lt;unknown&gt;</source>
+        <translation type="obsolete">&lt;неизве�тно&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::MixdownFileDialog</name>
+    <message>
+        <source>Wave Files (*.wav);;All Files (*)</source>
+        <translation type="obsolete">Файлы Wave (*.wav);;В�е файлы (*)</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::NoteInfo</name>
+    <message>
+        <source>Note Info</source>
+        <translation type="obsolete">Информаци� о ноте</translation>
+    </message>
+    <message>
+        <source>Len</source>
+        <translation type="obsolete">Дл</translation>
+    </message>
+    <message>
+        <source>Pitch</source>
+        <translation type="obsolete">Вы�ота тона</translation>
+    </message>
+    <message>
+        <source>Velo On</source>
+        <translation type="obsolete">Скор. наж</translation>
+    </message>
+    <message>
+        <source>Velo Off</source>
+        <translation type="obsolete">Скор. �н�ти�</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::RoutePopupMenu</name>
+    <message>
+        <source>Channel</source>
+        <translation type="obsolete">Канал</translation>
+    </message>
+    <message>
+        <source>&lt;none&gt;</source>
+        <translation type="obsolete">&lt;ничего&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::ScrollScale</name>
+    <message>
+        <source>next page</source>
+        <translation type="obsolete">�лед �траница</translation>
+    </message>
+    <message>
+        <source>previous page</source>
+        <translation type="obsolete">пред �траница</translation>
+    </message>
+    <message>
+        <source>current page number</source>
+        <translation type="obsolete">номер текущей �траницы</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::ShortcutCaptureDialog</name>
+    <message>
+        <source>Cancel</source>
+        <translation type="obsolete">Отмена</translation>
+    </message>
+    <message>
+        <source>Shortcut conflicts with </source>
+        <translation type="obsolete">&quot;Гор�ча� клавиша&quot; конфликтует � </translation>
+    </message>
+    <message>
+        <source>Undefined</source>
+        <translation type="obsolete">�е назначено</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::SigScale</name>
+    <message>
+        <source>signature scale</source>
+        <translation type="obsolete">шкала ключей </translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::Toolbar1</name>
+    <message>
+        <source>Solo</source>
+        <translation type="obsolete">Соло</translation>
+    </message>
+    <message>
+        <source>Cursor</source>
+        <translation type="obsolete">Кур�ор</translation>
+    </message>
+    <message>
+        <source>Snap</source>
+        <translation type="obsolete">Прив�зка</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::TrackComment</name>
+    <message>
+        <source>MusE: Track Comment</source>
+        <translation type="obsolete">MusE: Комментарий к треку</translation>
+    </message>
+    <message>
+        <source>Track Comment:</source>
+        <translation type="obsolete">Комментарий к треку:</translation>
+    </message>
+</context>
+<context>
     <name>NewPreset</name>
     <message>
         <source>New preset</source>
@@ -13522,9 +17559,8 @@ to be expanded by more than </source>
 <context>
     <name>PianoRoll</name>
     <message>
-        <location filename="../../muse/midiedit/pianoroll.cpp" line="+97"/>
         <source>&amp;Edit</source>
-        <translation>&amp;Правка</translation>
+        <translation type="obsolete">&amp;Правка</translation>
     </message>
     <message>
         <source>Cut</source>
@@ -13563,9 +17599,8 @@ to be expanded by more than </source>
         <translation type="obsolete">Вне цикла</translation>
     </message>
     <message>
-        <location line="+34"/>
         <source>&amp;Select</source>
-        <translation>&amp;Выбрать</translation>
+        <translation type="obsolete">&amp;Выбрать</translation>
     </message>
     <message>
         <source>blue</source>
@@ -13616,18 +17651,16 @@ to be expanded by more than </source>
         <translation type="obsolete">Изменить врем� звучани�</translation>
     </message>
     <message>
-        <location line="+52"/>
         <source>Modify Velocity</source>
-        <translation>Изменить �коро�ть нажати�</translation>
+        <translation type="obsolete">Изменить �коро�ть нажати�</translation>
     </message>
     <message>
         <source>Crescendo</source>
         <translation type="obsolete">Крещендо</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Transpose</source>
-        <translation>Тран�понировать</translation>
+        <translation type="obsolete">Тран�понировать</translation>
     </message>
     <message>
         <source>Thin Out</source>
@@ -13666,334 +17699,234 @@ to be expanded by more than </source>
         <translation type="obsolete">Ин�трументы пианорола</translation>
     </message>
     <message>
-        <location line="+77"/>
         <source>Step Record</source>
-        <translation>Пошагова� запи�ь</translation>
+        <translation type="obsolete">Пошагова� запи�ь</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Midi Input</source>
-        <translation>MIDI-вход</translation>
+        <translation type="obsolete">MIDI-вход</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Play Events</source>
-        <translation>Во�произве�ти �обыти�</translation>
+        <translation type="obsolete">Во�произве�ти �обыти�</translation>
     </message>
     <message>
-        <location line="+37"/>
         <source>ctrl</source>
-        <translation>кнтр</translation>
+        <translation type="obsolete">кнтр</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Add Controller View</source>
-        <translation>Добавить панель контроллеров</translation>
+        <translation type="obsolete">Добавить панель контроллеров</translation>
     </message>
     <message>
-        <location line="-118"/>
         <source>Set Fixed Length</source>
-        <translation>У�тановить фик�. длину</translation>
+        <translation type="obsolete">У�тановить фик�. длину</translation>
     </message>
     <message>
-        <location line="-100"/>
         <source>C&amp;ut</source>
-        <translation>&amp;Вырезать</translation>
+        <translation type="obsolete">&amp;Вырезать</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Copy</source>
-        <translation>С&amp;копировать</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Copy events in range</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">С&amp;копировать</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Paste</source>
-        <translation>&amp;В�тавить</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>&amp;Paste (with dialog)</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&amp;В�тавить</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Delete &amp;Events</source>
-        <translation>Удалить &amp;Событи�</translation>
+        <translation type="obsolete">Удалить &amp;Событи�</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Select &amp;All</source>
-        <translation>Выбрать &amp;В�ё</translation>
+        <translation type="obsolete">Выбрать &amp;В�ё</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Deselect All</source>
-        <translation>&amp;Убрать выделение</translation>
+        <translation type="obsolete">&amp;Убрать выделение</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Invert &amp;Selection</source>
-        <translation>Обратить В&amp;ыделение</translation>
+        <translation type="obsolete">Обратить В&amp;ыделение</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>&amp;Inside Loop</source>
-        <translation>&amp;Внутри цикла</translation>
+        <translation type="obsolete">&amp;Внутри цикла</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Outside Loop</source>
-        <translation>&amp;Вне цикла</translation>
+        <translation type="obsolete">&amp;Вне цикла</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>&amp;Previous Part</source>
-        <translation>&amp;Предыдуща� парти�</translation>
+        <translation type="obsolete">&amp;Предыдуща� парти�</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>&amp;Next Part</source>
-        <translation>&amp;Следующа� парти�</translation>
+        <translation type="obsolete">&amp;Следующа� парти�</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Fu&amp;nctions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+54"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
         <source>&amp;Event Color</source>
-        <translation>&amp;Цвет �обыти�</translation>
+        <translation type="obsolete">&amp;Цвет �обыти�</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>&amp;Blue</source>
-        <translation>&amp;Синий</translation>
+        <translation type="obsolete">&amp;Синий</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>&amp;Pitch colors</source>
-        <translation>&amp;Цвета вы�оты тона</translation>
+        <translation type="obsolete">&amp;Цвета вы�оты тона</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>&amp;Velocity colors</source>
-        <translation>&amp;Цвета �коро�ти нажати�</translation>
+        <translation type="obsolete">&amp;Цвета �коро�ти нажати�</translation>
     </message>
     <message>
-        <location line="-68"/>
         <source>Quantize</source>
-        <translation type="unfinished">Квантовать</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Modify Note Length</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Crescendo/Decrescendo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Erase Events</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Move Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Квантовать</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Delete Overlaps</source>
-        <translation>Удалить наложени�</translation>
+        <translation type="obsolete">Удалить наложени�</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Legato</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
         <source>&amp;Plugins</source>
-        <translation>&amp;Плагины</translation>
+        <translation type="obsolete">&amp;Плагины</translation>
     </message>
     <message>
-        <location line="+46"/>
         <source>Pianoroll tools</source>
-        <translation>Ин�трументы пианоролла</translation>
+        <translation type="obsolete">Ин�трументы пианоролла</translation>
     </message>
     <message>
-        <location line="+26"/>
         <source>panic</source>
-        <translation>паника</translation>
+        <translation type="obsolete">паника</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>transport</source>
-        <translation>тран�порт</translation>
+        <translation type="obsolete">тран�порт</translation>
     </message>
 </context>
 <context>
     <name>PluginDialog</name>
     <message>
-        <location filename="../../muse/plugin.cpp" line="+3095"/>
         <source>MusE: select plugin</source>
-        <translation>MusE: выбрать плагин</translation>
+        <translation type="obsolete">MusE: выбрать плагин</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Lib</source>
-        <translation>Библ.</translation>
+        <translation type="obsolete">Библ.</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Label</source>
-        <translation>Метка</translation>
+        <translation type="obsolete">Метка</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Name</source>
-        <translation>Им�</translation>
+        <translation type="obsolete">Им�</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>AI</source>
-        <translation>AI</translation>
+        <translation type="obsolete">AI</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>AO</source>
-        <translation>AO</translation>
+        <translation type="obsolete">AO</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>CI</source>
-        <translation>CI</translation>
+        <translation type="obsolete">CI</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>CO</source>
-        <translation>CP</translation>
+        <translation type="obsolete">CP</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>IP</source>
-        <translation>IP</translation>
+        <translation type="obsolete">IP</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>id</source>
-        <translation>id</translation>
+        <translation type="obsolete">id</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Maker</source>
-        <translation>Создатель</translation>
+        <translation type="obsolete">Создатель</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Copyright</source>
-        <translation>Copyright</translation>
+        <translation type="obsolete">Copyright</translation>
     </message>
     <message>
-        <location line="+30"/>
         <source>Ok</source>
-        <translation>Ok</translation>
+        <translation type="obsolete">Ok</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Cancel</source>
-        <translation>Отмена</translation>
+        <translation type="obsolete">Отмена</translation>
     </message>
     <message>
         <source>Stereo and Mono</source>
         <translation type="obsolete">Стерео и Моно</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Stereo</source>
-        <translation>Стерео</translation>
+        <translation type="obsolete">Стерео</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Mono</source>
-        <translation>Моно</translation>
+        <translation type="obsolete">Моно</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="obsolete">В�е</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Select which types of plugins should be visible in the list.&lt;br&gt;Note that using mono plugins on stereo tracks is not a problem, two will be used in parallell.&lt;br&gt;Also beware that the &apos;all&apos; alternative includes plugins that probably not are usable by MusE.</source>
-        <translation>Выберите типы плагинов, которые будут видны в �пи�ке.&lt;br&gt;Обратите внимание, что можно и�пользовать моно плагины в �терео треках, два будут и�пользованы параллельно.&lt;br&gt;Также будте о�торожны � плагинами категории &quot;в�е&quot; альтернативные, возможно их нельз� и�пользовать в MusE.</translation>
+        <translation type="obsolete">Выберите типы плагинов, которые будут видны в �пи�ке.&lt;br&gt;Обратите внимание, что можно и�пользовать моно плагины в �терео треках, два будут и�пользованы параллельно.&lt;br&gt;Также будте о�торожны � плагинами категории &quot;в�е&quot; альтернативные, возможно их нельз� и�пользовать в MusE.</translation>
     </message>
     <message>
-        <location line="-28"/>
         <source>Mono and Stereo</source>
-        <translation>Моно и Стерео</translation>
+        <translation type="obsolete">Моно и Стерео</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Show All</source>
-        <translation>Показать В�е</translation>
+        <translation type="obsolete">Показать В�е</translation>
     </message>
     <message>
-        <location line="+22"/>
         <source>Search in &apos;Label&apos; and &apos;Name&apos;:</source>
-        <translation>И�кать по &quot;Меткам&quot; и &quot;Именам&quot;:</translation>
+        <translation type="obsolete">И�кать по &quot;Меткам&quot; и &quot;Именам&quot;:</translation>
     </message>
 </context>
 <context>
     <name>PluginGui</name>
     <message>
-        <location line="+207"/>
         <source>File Buttons</source>
-        <translation>Файловые кнопки</translation>
+        <translation type="obsolete">Файловые кнопки</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Load Preset</source>
-        <translation>Загрузить пре�ет</translation>
+        <translation type="obsolete">Загрузить пре�ет</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Save Preset</source>
-        <translation>Сохранить пре�ет</translation>
+        <translation type="obsolete">Сохранить пре�ет</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <location line="+3"/>
         <source>bypass plugin</source>
-        <translation>обойти плагин</translation>
+        <translation type="obsolete">обойти плагин</translation>
     </message>
     <message>
-        <location line="+554"/>
         <source>MusE: load preset</source>
-        <translation>MusE: загрузить пре�ет</translation>
+        <translation type="obsolete">MusE: загрузить пре�ет</translation>
     </message>
     <message>
-        <location line="+66"/>
         <source>MusE: save preset</source>
-        <translation>MusE: �охранить пре�ет</translation>
+        <translation type="obsolete">MusE: �охранить пре�ет</translation>
     </message>
     <message>
-        <location line="-41"/>
         <source>Error reading preset. Might not be right type for this plugin</source>
-        <translation>Ошибка прочтени� пре�ета. Возможно неверный тип дл� �того плагина</translation>
+        <translation type="obsolete">Ошибка прочтени� пре�ета. Возможно неверный тип дл� �того плагина</translation>
     </message>
 </context>
 <context>
@@ -14165,19 +18098,18 @@ currently not used</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../../muse/helper.cpp" line="-49"/>
         <source>Other</source>
-        <translation type="unfinished">Другой</translation>
+        <translation type="obsolete">Другой</translation>
     </message>
     <message>
-        <location filename="../../muse/functions.cpp" line="+242"/>
-        <location line="+159"/>
+        <location filename="../../muse/functions.cpp" line="+244"/>
+        <location line="+160"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-159"/>
-        <location line="+159"/>
+        <location line="-160"/>
+        <location line="+160"/>
         <source>Please first select the range for crescendo with the loop markers.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14185,7 +18117,7 @@ currently not used</source>
 <context>
     <name>QWidget</name>
     <message>
-        <location filename="../../muse/instruments/minstrument.cpp" line="+72"/>
+        <location filename="../../muse/instruments/minstrument.cpp" line="+73"/>
         <location filename="../../muse/liste/editevent.cpp" line="-418"/>
         <source>Cannot convert sysex string</source>
         <translation>�евозможно конвертировать �троку SysEx</translation>
@@ -14202,17 +18134,17 @@ currently not used</source>
         <translation>обычный MIDI</translation>
     </message>
     <message>
-        <location filename="../../muse/miditransform.cpp" line="+92"/>
+        <location filename="../../muse/miditransform.cpp" line="-231"/>
         <source>new</source>
         <translation>новый</translation>
     </message>
     <message>
-        <location filename="../../muse/wave.cpp" line="-677"/>
+        <location filename="../../muse/wave.cpp" line="-1006"/>
         <source>create peakfile for </source>
         <translation>�оздать пиковый файл дл� </translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/filedialog.cpp" line="+80"/>
+        <location filename="../../muse/widgets/filedialog.cpp" line="+81"/>
         <source>MusE: get file name</source>
         <translation>MusE: получить им� файла</translation>
     </message>
@@ -14239,7 +18171,15 @@ create?</source>
         <translation type="obsolete">Отмена</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+1"/>
+        <source>The directory
+%1
+does not exist.
+Create it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>MusE: create directory</source>
         <translation>MusE: �оздать каталог</translation>
     </message>
@@ -14249,10 +18189,23 @@ create?</source>
         <translation>�оздание каталога не удало�ь</translation>
     </message>
     <message>
-        <location line="+396"/>
+        <location line="+399"/>
+        <source>File
+%1
+exists. Overwrite?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Open File
+%1
+failed: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>File
 </source>
-        <translation>Файл</translation>
+        <translation type="obsolete">Файл</translation>
     </message>
     <message>
         <source>
@@ -14261,7 +18214,7 @@ exists</source>
 �уще�твует</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="-19"/>
         <source>MusE: write</source>
         <translation>MusE: запи�ать</translation>
     </message>
@@ -14274,55 +18227,50 @@ exists</source>
         <translation type="obsolete">Выйти</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Open File
 </source>
-        <translation>Открыть файл</translation>
+        <translation type="obsolete">Открыть файл</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>
 failed: </source>
-        <translation>
+        <translation type="obsolete">
 не удало�ь:</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+20"/>
         <source>MusE: Open File</source>
         <translation>MusE: Открыть файл</translation>
     </message>
     <message>
-        <location filename="../../muse/route.cpp" line="+1041"/>
-        <location line="+37"/>
+        <location filename="../../muse/route.cpp" line="+792"/>
+        <location line="+25"/>
         <source>None</source>
         <translation>�ичего</translation>
     </message>
     <message>
-        <location filename="../../muse/waveedit/waveview.cpp" line="+632"/>
+        <location filename="../../muse/waveedit/waveview.cpp" line="-374"/>
         <source>No selection. Ignoring</source>
         <translation>�е выделено. Игнорирует��</translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/filedialog.cpp" line="-440"/>
         <source>The directory
 </source>
-        <translation>Директори�
+        <translation type="obsolete">Директори�
 </translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>
 does not exist.
 Create it?</source>
-        <translation>
+        <translation type="obsolete">
 не �уще�твует.
 Создать?</translation>
     </message>
     <message>
-        <location line="+404"/>
         <source>
 exists. Overwrite?</source>
-        <translation>
+        <translation type="obsolete">
 �уще�твует. Перепи�ать?</translation>
     </message>
 </context>
@@ -14400,7 +18348,12 @@ exists. Overwrite?</source>
     </message>
     <message>
         <location line="+5"/>
-        <source>Quarter</source>
+        <source>4th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>4th Triplet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -14410,15 +18363,30 @@ exists. Overwrite?</source>
     </message>
     <message>
         <location line="+5"/>
+        <source>8th Triplet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>16th</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
+        <source>16th Triplet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>32th</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
+        <source>32th Triplet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+8"/>
         <source>Swing:</source>
         <translation type="unfinished"></translation>
@@ -15088,296 +19056,58 @@ Random Rhythm Generator is not enabled yet!</source>
     </message>
 </context>
 <context>
-    <name>ScoreCanvas</name>
-    <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="+1245"/>
-        <source>Treble</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Bass</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Grand Staff</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Remove staff</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2467"/>
-        <source>Ambiguous part</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There are two or more possible parts you could add the note to, but none matches the selected part. Please select the destination part by clicking on any note belonging to it and try again, or add a new stave containing only the destination part.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>No part</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There are no parts you could add the note to.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>ScoreEdit</name>
     <message>
-        <location line="-3493"/>
-        <source>Undo/Redo tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Step recording tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>Step Record</source>
-        <translation type="unfinished">Пошагова� запи�ь</translation>
+        <translation type="obsolete">Пошагова� запи�ь</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>panic</source>
-        <translation type="unfinished">паника</translation>
+        <translation type="obsolete">паника</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>transport</source>
-        <translation type="unfinished">тран�порт</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Note settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Note length:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>last</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+37"/>
-        <source>Velocity:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Off-Velocity:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>Quantisation settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Quantisation:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>Pixels per whole:</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">тран�порт</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>&amp;Edit</source>
-        <translation type="unfinished">&amp;Правка</translation>
+        <translation type="obsolete">&amp;Правка</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>C&amp;ut</source>
-        <translation type="unfinished">&amp;Вырезать</translation>
+        <translation type="obsolete">&amp;Вырезать</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Copy</source>
-        <translation type="unfinished">С&amp;копировать</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Copy events in range</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">С&amp;копировать</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Paste</source>
-        <translation type="unfinished">&amp;В�тавить</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Paste (with dialog)</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&amp;В�тавить</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Delete &amp;Events</source>
-        <translation type="unfinished">Удалить &amp;Событи�</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>&amp;Select</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Select &amp;All</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Удалить &amp;Событи�</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Deselect All</source>
-        <translation type="unfinished">&amp;Убрать выделение</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Invert &amp;Selection</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&amp;Убрать выделение</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>&amp;Inside Loop</source>
-        <translation type="unfinished">&amp;Внутри цикла</translation>
+        <translation type="obsolete">&amp;Внутри цикла</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Outside Loop</source>
-        <translation type="unfinished">&amp;Вне цикла</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Fu&amp;nctions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>&amp;Quantize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Change note &amp;length</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Change note &amp;velocity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Crescendo/Decrescendo</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&amp;Вне цикла</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Transpose</source>
-        <translation type="unfinished">Тран�понировать</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Erase Events</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Move Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Set Fixed Length</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Тран�понировать</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Delete Overlaps</source>
-        <translation type="unfinished">Удалить наложени�</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Legato</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Note head &amp;colors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>&amp;Black</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>&amp;Velocity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>&amp;Part</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Set up &amp;preamble</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Display &amp;key signature</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Display &amp;time signature</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Set Score &amp;name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+216"/>
-        <location line="+1"/>
-        <source>Enter the new score title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Changing score title failed:
-the selected title is not unique</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Удалить наложени�</translation>
     </message>
 </context>
 <context>
@@ -15519,12 +19249,12 @@ the selected title is not unique</source>
         <translation>�а�троить &quot;гор�чие клавиши&quot;</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>Shortcut Category</source>
         <translation>Категори� &quot;гор�чих клавиш&quot;</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+24"/>
         <source>Description</source>
         <translation>Опи�ание</translation>
     </message>
@@ -15534,7 +19264,7 @@ the selected title is not unique</source>
         <translation>&quot;Гор�ча� клавиша&quot;</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+35"/>
         <source>&amp;Clear</source>
         <translation>&amp;Очи�тить</translation>
     </message>
@@ -15600,12 +19330,10 @@ the selected title is not unique</source>
 <context>
     <name>Song</name>
     <message>
-        <location filename="../../muse/song.cpp" line="+2412"/>
         <source>Jack shutdown!</source>
-        <translation>Jack прекратил работу!</translation>
+        <translation type="obsolete">Jack прекратил работу!</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Jack has detected a performance problem which has lead to
 MusE being disconnected.
 This could happen due to a number of reasons:
@@ -15621,7 +19349,7 @@ on the MusE mailinglist.
 
 To proceed check the status of Jack and try to restart it and then .
 click on the Restart button.</source>
-        <translation>Проблемы в работе &quot;Jack&quot;, привели к его ра��оединению � &quot;MusE&quot;.
+        <translation type="obsolete">Проблемы в работе &quot;Jack&quot;, привели к его ра��оединению � &quot;MusE&quot;.
 Это могло произойти по разным причинам:
 -проблемы в работе, вызванные о�обенно�тью ваших на�троек.
 -баг в &quot;MusE&quot; (или, возможно, в других под�оединенных программах).
@@ -15639,79 +19367,54 @@ click on the Restart button.</source>
 </translation>
     </message>
     <message>
-        <location line="+198"/>
         <source>previous event</source>
-        <translation>предыдущее �обытие</translation>
+        <translation type="obsolete">предыдущее �обытие</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>next event</source>
-        <translation>�ледующее �обытие</translation>
+        <translation type="obsolete">�ледующее �обытие</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location line="+183"/>
         <source>set event</source>
-        <translation>на�троить �обытие</translation>
+        <translation type="obsolete">на�троить �обытие</translation>
     </message>
     <message>
-        <location line="-181"/>
-        <location line="+183"/>
         <source>add event</source>
-        <translation>добавить �обытие</translation>
+        <translation type="obsolete">добавить �обытие</translation>
     </message>
     <message>
-        <location line="-179"/>
-        <location line="+184"/>
         <source>erase event</source>
-        <translation>�тереть �обытие</translation>
+        <translation type="obsolete">�тереть �обытие</translation>
     </message>
     <message>
-        <location line="-180"/>
         <source>erase range</source>
-        <translation>�тереть диапазон</translation>
+        <translation type="obsolete">�тереть диапазон</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>clear automation</source>
-        <translation>Очи�тить автоматизацию</translation>
+        <translation type="obsolete">Очи�тить автоматизацию</translation>
     </message>
     <message>
-        <location line="+33"/>
         <source>Clear all controller events?</source>
-        <translation>Очи�тить в�е �обыти� контроллеров?</translation>
+        <translation type="obsolete">Очи�тить в�е �обыти� контроллеров?</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>&amp;Ok</source>
-        <translation>&amp;ОК</translation>
+        <translation type="obsolete">&amp;ОК</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>&amp;Cancel</source>
-        <translation>&amp;Отменить</translation>
+        <translation type="obsolete">&amp;Отменить</translation>
     </message>
     <message>
-        <location line="+1134"/>
         <source>MusE - external script failed</source>
-        <translation>MusE - ошибка запу�ка внешнего �крипта</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>MusE was unable to launch the script, error message:
- </source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">MusE - ошибка запу�ка внешнего �крипта</translation>
     </message>
     <message>
         <source>MusE was unable to launch the script
 </source>
         <translation type="obsolete">MusE не может запу�тить �крипт</translation>
     </message>
-    <message>
-        <location line="-1200"/>
-        <source>Automation:</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>SongInfo</name>
@@ -15749,12 +19452,11 @@ click on the Restart button.</source>
 <context>
     <name>SynthConfigBase</name>
     <message>
-        <location filename="../../muse/widgets/synthconfigbase.ui" line="+14"/>
         <source>MusE: Synth Configuration</source>
-        <translation>MusE: �а�тройка програм. �инт.</translation>
+        <translation type="obsolete">MusE: �а�тройка програм. �инт.</translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location filename="../../muse/widgets/synthconfigbase.ui" line="+94"/>
         <source>Soft Synthesizer</source>
         <translation>Программный �интезатор</translation>
     </message>
@@ -15764,18 +19466,18 @@ click on the Restart button.</source>
         <translation>Файл</translation>
     </message>
     <message>
-        <location line="-115"/>
+        <location line="-120"/>
         <source>Instances</source>
         <translation>Выбранный</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location line="+115"/>
+        <location line="+125"/>
         <source>Name</source>
         <translation>Им�</translation>
     </message>
     <message>
-        <location line="-17"/>
+        <location line="-22"/>
         <source>list of available software synthesizers</source>
         <translation>�пи�ок до�тупных программных �интезаторов</translation>
     </message>
@@ -15800,7 +19502,18 @@ click on the Restart button.</source>
         <translation>MIDI-порт</translation>
     </message>
     <message>
-        <location line="+105"/>
+        <location line="-26"/>
+        <source>Midi Port and Soft Synth Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location line="+110"/>
+        <source>Type</source>
+        <translation type="unfinished">Тип</translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>Inst</source>
         <translation>Ин�тр</translation>
     </message>
@@ -15909,9 +19622,8 @@ click on the Restart button.</source>
 <context>
     <name>TempoSig</name>
     <message>
-        <location filename="../../muse/transport.cpp" line="+103"/>
         <source>Tempo/Sig</source>
-        <translation>Темп/Знаки альтерации</translation>
+        <translation type="obsolete">Темп/Знаки альтерации</translation>
     </message>
 </context>
 <context>
@@ -15968,74 +19680,8 @@ click on the Restart button.</source>
 <context>
     <name>TopWin</name>
     <message>
-        <location filename="../../muse/cobject.cpp" line="+61"/>
-        <source>As subwindow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Shares tools and menu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Fullscreen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+418"/>
-        <source>Piano roll</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>List editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Drum editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Master track editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Master track list editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Wave editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Clip list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Marker view</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Score editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
         <source>Arranger</source>
-        <translation type="unfinished">Компоновщик</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>&lt;unknown toplevel type&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Компоновщик</translation>
     </message>
 </context>
 <context>
@@ -16052,158 +19698,124 @@ click on the Restart button.</source>
 <context>
     <name>Transport</name>
     <message>
-        <location filename="../../muse/transport.cpp" line="+105"/>
         <source>Overdub</source>
-        <translation>�аложить</translation>
+        <translation type="obsolete">�аложить</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+15"/>
         <source>Replace</source>
-        <translation>Заменить</translation>
+        <translation type="obsolete">Заменить</translation>
     </message>
     <message>
-        <location line="-10"/>
         <source>Rec Mode</source>
-        <translation>Режим запи�и</translation>
+        <translation type="obsolete">Режим запи�и</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Normal</source>
-        <translation>�орм.</translation>
+        <translation type="obsolete">�орм.</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Mix</source>
-        <translation>Смешать</translation>
+        <translation type="obsolete">Смешать</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Cycle Rec</source>
-        <translation>Циклич. запи�ь</translation>
+        <translation type="obsolete">Циклич. запи�ь</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>punchin</source>
-        <translation>нач. врезки</translation>
+        <translation type="obsolete">нач. врезки</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>loop</source>
-        <translation>цикл</translation>
+        <translation type="obsolete">цикл</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>punchout</source>
-        <translation>кнц. врезки</translation>
+        <translation type="obsolete">кнц. врезки</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+3"/>
         <source>Punch In</source>
-        <translation>�ачало врезки</translation>
+        <translation type="obsolete">�ачало врезки</translation>
     </message>
     <message>
-        <location line="-2"/>
-        <location line="+3"/>
         <source>Loop</source>
-        <translation>Цикл</translation>
+        <translation type="obsolete">Цикл</translation>
     </message>
     <message>
-        <location line="-2"/>
-        <location line="+3"/>
         <source>Punch Out</source>
-        <translation>Конец врезки</translation>
+        <translation type="obsolete">Конец врезки</translation>
     </message>
     <message>
-        <location line="+33"/>
         <source>Left Mark</source>
-        <translation>Левый маркер</translation>
+        <translation type="obsolete">Левый маркер</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Right Mark</source>
-        <translation>Правый маркер</translation>
+        <translation type="obsolete">Правый маркер</translation>
     </message>
     <message>
-        <location line="+47"/>
         <source>rewind to start</source>
-        <translation>перемотать к началу</translation>
+        <translation type="obsolete">перемотать к началу</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>rewind</source>
-        <translation>перемотать назад</translation>
+        <translation type="obsolete">перемотать назад</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>forward</source>
-        <translation>перемотать вперёд</translation>
+        <translation type="obsolete">перемотать вперёд</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>stop</source>
-        <translation>о�тановить</translation>
+        <translation type="obsolete">о�тановить</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>play</source>
-        <translation>во�произве�ти</translation>
+        <translation type="obsolete">во�произве�ти</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>record</source>
-        <translation>запи�ать</translation>
+        <translation type="obsolete">запи�ать</translation>
     </message>
     <message>
-        <location line="+28"/>
         <source>AC</source>
-        <translation>AC</translation>
+        <translation type="obsolete">AC</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>quantize during record</source>
-        <translation>квантовать при запи�и</translation>
+        <translation type="obsolete">квантовать при запи�и</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Click</source>
-        <translation>Метр.</translation>
+        <translation type="obsolete">Метр.</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>metronom click on/off</source>
-        <translation>Метроном вкл/выкл</translation>
+        <translation type="obsolete">Метроном вкл/выкл</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Sync</source>
-        <translation>Синхр.</translation>
+        <translation type="obsolete">Синхр.</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>external sync on/off</source>
-        <translation>Вкл/выкл внешн. �инхр.</translation>
+        <translation type="obsolete">Вкл/выкл внешн. �инхр.</translation>
     </message>
     <message>
-        <location line="+45"/>
         <source>Master</source>
-        <translation>Ма�тер</translation>
+        <translation type="obsolete">Ма�тер</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>use master track</source>
-        <translation>и�пользовать ма�тер-трек</translation>
+        <translation type="obsolete">и�пользовать ма�тер-трек</translation>
     </message>
     <message>
-        <location line="-43"/>
         <source>Jack</source>
-        <translation>Jack</translation>
+        <translation type="obsolete">Jack</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Jack transport sync on/off</source>
-        <translation>Синхр. тран�порта &quot;Jack&quot; вкл/выкл</translation>
+        <translation type="obsolete">Синхр. тран�порта &quot;Jack&quot; вкл/выкл</translation>
     </message>
 </context>
 <context>
@@ -16662,139 +20274,104 @@ Robert Jonsson
         <translation type="obsolete">weTools</translation>
     </message>
     <message>
-        <location filename="../../muse/waveedit/waveedit.cpp" line="+196"/>
         <source>Solo</source>
-        <translation>Соло</translation>
+        <translation type="obsolete">Соло</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Cursor</source>
-        <translation>Кур�ор</translation>
+        <translation type="obsolete">Кур�ор</translation>
     </message>
     <message>
-        <location line="-115"/>
         <source>&amp;Edit</source>
-        <translation>&amp;Правка</translation>
+        <translation type="obsolete">&amp;Правка</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Func&amp;tions</source>
-        <translation>Фу&amp;нкции</translation>
+        <translation type="obsolete">Фу&amp;нкции</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>200%</source>
-        <translation>200%</translation>
+        <translation type="obsolete">200%</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>150%</source>
-        <translation>150%</translation>
+        <translation type="obsolete">150%</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>75%</source>
-        <translation>75%</translation>
+        <translation type="obsolete">75%</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>50%</source>
-        <translation>50%</translation>
+        <translation type="obsolete">50%</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>25%</source>
-        <translation>25%</translation>
+        <translation type="obsolete">25%</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Other</source>
-        <translation>Другой</translation>
+        <translation type="obsolete">Другой</translation>
     </message>
     <message>
-        <location line="-22"/>
         <source>&amp;Gain</source>
-        <translation>&amp;У�иление</translation>
+        <translation type="obsolete">&amp;У�иление</translation>
     </message>
     <message>
-        <location line="+30"/>
         <source>&amp;Copy</source>
-        <translation type="unfinished">С&amp;копировать</translation>
+        <translation type="obsolete">С&amp;копировать</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>C&amp;ut</source>
-        <translation type="unfinished">&amp;Вырезать</translation>
+        <translation type="obsolete">&amp;Вырезать</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Paste</source>
-        <translation type="unfinished">&amp;В�тавить</translation>
+        <translation type="obsolete">&amp;В�тавить</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Edit in E&amp;xternal Editor</source>
-        <translation>Редактировать во &amp;внешнем редакторе</translation>
+        <translation type="obsolete">Редактировать во &amp;внешнем редакторе</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Mute Selection</source>
-        <translation>Заглушить выделенное</translation>
+        <translation type="obsolete">Заглушить выделенное</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Normalize Selection</source>
-        <translation>�ормализовать выделенное</translation>
+        <translation type="obsolete">�ормализовать выделенное</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Fade In Selection</source>
-        <translation>�ара�тание звука в выделенном</translation>
+        <translation type="obsolete">�ара�тание звука в выделенном</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Fade Out Selection</source>
-        <translation>Затихание звука в выделенном</translation>
+        <translation type="obsolete">Затихание звука в выделенном</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Reverse Selection</source>
-        <translation>Перевернуть выделенное</translation>
+        <translation type="obsolete">Перевернуть выделенное</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Select &amp;All</source>
-        <translation>Выделить &amp;В�ё</translation>
+        <translation type="obsolete">Выделить &amp;В�ё</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Deselect All</source>
-        <translation>&amp;Убрать выделение</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+23"/>
-        <source>WaveEdit tools</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&amp;Убрать выделение</translation>
     </message>
     <message>
-        <location line="-34"/>
         <source>Select</source>
-        <translation>Выделить</translation>
+        <translation type="obsolete">Выделить</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Wave edit tools</source>
-        <translation>Ин�трументы редактировани� Wave</translation>
+        <translation type="obsolete">Ин�трументы редактировани� Wave</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>transport</source>
-        <translation>тран�порт</translation>
+        <translation type="obsolete">тран�порт</translation>
     </message>
     <message>
         <source>Pianoroll tools</source>
@@ -16839,39 +20416,207 @@ Robert Jonsson
 <context>
     <name>WaveView</name>
     <message>
-        <location filename="../../muse/waveedit/waveview.cpp" line="+373"/>
         <source>MusE - file size changed</source>
-        <translation>MusE - размер файла изменил��</translation>
+        <translation type="obsolete">MusE - размер файла изменил��</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>When editing in external editor - you should not change the filesize
 since it must fit the selected region.
 
 Missing data is muted</source>
-        <translation>При редактировании во внешнем редакторе - не измен�йте размер файла
+        <translation type="obsolete">При редактировании во внешнем редакторе - не измен�йте размер файла
 так как он должен �оответ�твовать выбранной обла�ти.
 
 Утер�нные данные заглушены</translation>
     </message>
     <message>
-        <location line="-15"/>
         <source>MusE - external editor failed</source>
-        <translation>MusE - ошибка запу�ка внешнего редактора</translation>
+        <translation type="obsolete">MusE - ошибка запу�ка внешнего редактора</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>MusE was unable to launch the external editor
 check if the editor setting in:
 Global Settings-&gt;Audio:External Waveditor
 is set to a valid editor.</source>
-        <translation>&quot;MusE&quot; не может запу�тить внешний редактор.
+        <translation type="obsolete">&quot;MusE&quot; не может запу�тить внешний редактор.
 Проверте, дей�твительно ли в:
 Общие на�тройки-&gt;�удио:Внешний редактор
 выбран правильный редактор.</translation>
     </message>
 </context>
 <context>
+    <name>file_patterns</name>
+    <message>
+        <location filename="../../muse/globals.cpp" line="+120"/>
+        <source>Midi/Kar (*.mid *.MID *.kar *.KAR *.mid.gz *.mid.bz2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi (*.mid *.MID *.mid.gz *.mid.bz2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Karaoke (*.kar *.KAR *.kar.gz *.kar.bz2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+24"/>
+        <location line="+11"/>
+        <location line="+7"/>
+        <location line="+9"/>
+        <location line="+15"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+8"/>
+        <location line="+6"/>
+        <location line="+8"/>
+        <location line="+8"/>
+        <source>All Files (*)</source>
+        <translation type="unfinished">В�е файлы (*)</translation>
+    </message>
+    <message>
+        <location line="-95"/>
+        <source>Midi (*.mid)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Karaoke (*.kar)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>all known files (*.med *.med.gz *.med.bz2 *.mid *.midi *.kar)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>med Files (*.med *.med.gz *.med.bz2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+8"/>
+        <source>Uncompressed med Files (*.med)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-7"/>
+        <location line="+8"/>
+        <source>gzip compressed med Files (*.med.gz)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-7"/>
+        <location line="+8"/>
+        <source>bzip2 compressed med Files (*.med.bz2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-7"/>
+        <source>mid Files (*.mid *.midi *.kar *.MID *.MIDI *.KAR)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>(*.jpg *.gif *.png)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>(*.jpg)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>(*.gif)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>(*.png)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>part Files (*.mpt *.mpt.gz *.mpt.bz2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>part Files (*.mpt)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>gzip compressed part Files (*.mpt.gz)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>bzip2 compressed part Files (*.mpt.bz2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Presets (*.pre *.pre.gz *.pre.bz2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Presets (*.pre)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>gzip compressed presets (*.pre.gz)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>bzip2 compressed presets (*.pre.bz2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Presets (*.map *.map.gz *.map.bz2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Presets (*.map)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>gzip compressed presets (*.map.gz)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>bzip2 compressed presets (*.map.bz2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Wave/Binary (*.wav *.ogg *.bin)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Wave (*.wav *.ogg)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Binary (*.bin)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>freeverb</name>
     <message>
         <location filename="../plugins/1050.ui" line="+20"/>
@@ -17164,4 +20909,878 @@ is set to a valid editor.</source>
         <translation>Ра�ширенное �терео</translation>
     </message>
 </context>
+<context>
+    <name>shortcuts</name>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="+54"/>
+        <source>Transport: Start playback from current location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Toggle metronome</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Stop Playback</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Goto Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Play, Stop, Rewind</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Goto left marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Goto right marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Toggle Loop section</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Toggle Record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Clear all rec enabled tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Toggle fullscreen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit: Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Copy in range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Redo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Paste (with dialog)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>File: New project</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>File: Open from disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>File: Save project</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>File: Open recent file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>File: Save as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>File: Load template</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>File: Import midi file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>File: Export midi file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>File: Import midi part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>File: Import audio file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>File: Quit MusE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit: Select parts on track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Open pianoroll</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Open drumeditor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Open listeditor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Open waveeditor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Open graphical mastertrack editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Open list mastertrack editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Open midi transformer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add midi track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add drum track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add wave track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add audio output</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add audio group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add audio input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add audio aux</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Structure: Global cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Structure: Global insert</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Structure: Global split</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Structure: Cut events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>View: Open mixer #1 window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>View: Open mixer #2 window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>View: Toggle transport window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>View: Toggle bigtime window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>View: Open marker window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Settings: Follow song by page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Follow song off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Follow song continuous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Settings: Global configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Configure shortcuts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Configure metronome</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Midi sync configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Midi file import/export configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Appearance settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Midi ports / Soft Synth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Audio subsystem configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Midi: Edit midi instruments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi: Open midi input transform</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi: Open midi input filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi: Midi input transpose</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi: Midi remote control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Midi: Random rhythm generator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Midi: Reset midi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi: Init midi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi: Midi local off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Audio: Bounce audio to track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Audio: Bounce audio to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Audio: Restart audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Automation: Mixer automation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Automation: Take mixer snapshot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Automation: Clear mixer automation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Help: Open Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Help: Toggle whatsthis mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit: Edit selected part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select nearest part on track above</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Add nearest part on track above</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select nearest part on track below</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Add nearest part on track below</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit: Insert empty measure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit: Paste as clones</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Paste as clones (with dialog)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select track above</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Select track below</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Midi: Transpose</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit: Select all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select none</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Invert Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select events/parts inside locators</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select events/parts outside locators</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select previous part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select next part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select nearest part/event to the left or move cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Add nearest part/event to the left to selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select nearest part/event to the right or move cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Add nearest part/event to the right to selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Set locators to selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Increase pitch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Decrease pitch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Increase event position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Decrease event position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>View: Zoom in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>View: Zoom out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>View: Goto Current Position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+1"/>
+        <source>View: Scroll left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Edit: Set Fixed Length on Midi Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Quantize</source>
+        <translation type="unfinished">Квантовать</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Modify Note Length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Modify Velocity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Crescendo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Thin Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Erase Event</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Delete Overlaps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Note Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Move Clock</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Copy Measure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Erase Measure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Delete Measure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Create Measure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Change Event Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool: Pointer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tool: Pencil</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tool: Eraser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Tool: Line Draw</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Tool: Cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add note velocity 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add note velocity 2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add note velocity 3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add note velocity 4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cursor step size: larger</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cursor step size: smaller</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Instrument/Cursor up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Instrument/Cursor down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Tool: Scissor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tool: Glue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tool: Mute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Transport: Increase current position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Decrease current position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Transport: Increase current position, no snap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Decrease current position, no snap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Quantize: Set quantize to 1/1 note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantize: Set quantize to 1/2 note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantize: Set quantize to 1/4 note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantize: Set quantize to 1/8 note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantize: Set quantize to 1/16 note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantize: Set quantize to 1/32 note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantize: Set quantize to 1/64 note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Quantize: Toggle triol quantization</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantize: Toggle punctuation quantization</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantize: Toggle punctuation quantization (2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Insert at location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit: Increase length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Decrease length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Insert Note</source>
+        <translation type="unfinished">В�тавить ноту</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert SysEx</source>
+        <translation type="unfinished">В�тавить SysEx</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert Ctrl</source>
+        <translation type="unfinished">В�тавить кнтрл</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert Meta</source>
+        <translation type="unfinished">В�тавить Meta</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert Channel Aftertouch</source>
+        <translation type="unfinished">В�тавить Channel Aftertouch</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert Key Aftertouch</source>
+        <translation type="unfinished">В�тавить Key Aftertouch</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Insert Tempo</source>
+        <translation type="unfinished">В�тавить темп</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert Signature</source>
+        <translation type="unfinished">В�тавить размер</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Change Event Position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit Event Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Goto Next Marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Goto Prev Marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/muse2/share/locale/muse_sv_SE.ts b/muse2/share/locale/muse_sv_SE.ts
index 16a3d37b..0bf20ae7 100644
--- a/muse2/share/locale/muse_sv_SE.ts
+++ b/muse2/share/locale/muse_sv_SE.ts
@@ -4,9 +4,8 @@
 <context>
     <name>@default</name>
     <message>
-        <location filename="../../muse/transport.cpp" line="+46"/>
         <source>Click this button to enable recording</source>
-        <translation>Klicka här för att spela in</translation>
+        <translation type="obsolete">Klicka här för att spela in</translation>
     </message>
     <message>
         <source>sets amount of quantization:
@@ -17,42 +16,36 @@
 100 - full kvantisering</translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/tools.cpp" line="+33"/>
         <source>select Pointer Tool:
 with the pointer tool you can:
   select parts
   move parts
   copy parts</source>
-        <translation>välj pek-verktyg:
+        <translation type="obsolete">välj pek-verktyg:
 med pekverktyget kan du:
  välja parter
  flytta parter
  kopiera parter</translation>
     </message>
     <message>
-        <location filename="../../muse/transport.cpp" line="+1"/>
         <source>Click this button to stop playback</source>
-        <translation>Klicka här för att stoppa uppspelning</translation>
+        <translation type="obsolete">Klicka här för att stoppa uppspelning</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Click this button to start playback</source>
-        <translation>Klicka här för att starta uppspelning</translation>
+        <translation type="obsolete">Klicka här för att starta uppspelning</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Click this button to rewind to start position</source>
-        <translation>Klicka här för att spola tillbaks till början</translation>
+        <translation type="obsolete">Klicka här för att spola tillbaks till början</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Click this button to rewind</source>
-        <translation>Klicka här för att flytta markören bakåt</translation>
+        <translation type="obsolete">Klicka här för att flytta markören bakåt</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Click this button to forward current play position</source>
-        <translation>Klicka här för att flytta markören framåt</translation>
+        <translation type="obsolete">Klicka här för att flytta markören framåt</translation>
     </message>
     <message>
         <source>don&apos;t quantize notes above this tick limit</source>
@@ -63,438 +56,245 @@ med pekverktyget kan du:
         <translation type="obsolete">Kvantisera &quot;note len&quot; som standard</translation>
     </message>
     <message>
-        <location filename="../../muse/app.cpp" line="+89"/>
         <source>Click this button to open a &lt;em&gt;new song&lt;/em&gt;.&lt;br&gt;You can also select the &lt;b&gt;Open command&lt;/b&gt; from the File menu.</source>
-        <translation>Klicka här för att öppna en &lt;em&gt;ny sång&lt;/em&gt;.&lt;br&gt;Du kan också välja menyvalet &lt;b&gt;Öppna&lt;/b&gt; från Arkivmenyn.</translation>
+        <translation type="obsolete">Klicka här för att öppna en &lt;em&gt;ny sång&lt;/em&gt;.&lt;br&gt;Du kan också välja menyvalet &lt;b&gt;Öppna&lt;/b&gt; från Arkivmenyn.</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Click this button to save the song you are editing.  You will be prompted for a file name.
 You can also select the Save command from the File menu.</source>
-        <translation>Klicka här för att spara den sång du håller på att redigera. En förfrågan om filnamn kommer att ställas.
+        <translation type="obsolete">Klicka här för att spara den sång du håller på att redigera. En förfrågan om filnamn kommer att ställas.
 Du kan också välja menyalternativet Spara från Arkivmenyn.</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Create New Song</source>
-        <translation>Ny sång</translation>
+        <translation type="obsolete">Ny sång</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>loop between left mark and right mark</source>
-        <translation>loopa mellan vänster och höger markering</translation>
+        <translation type="obsolete">loopa mellan vänster och höger markering</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>record starts at left mark</source>
-        <translation>inspelning börjar vid vänster markering</translation>
+        <translation type="obsolete">inspelning börjar vid vänster markering</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>record stops at right mark</source>
-        <translation>inspelning slutar vid höger markering</translation>
+        <translation type="obsolete">inspelning slutar vid höger markering</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>rewind to start position</source>
-        <translation>spola tillbaka till startposition</translation>
+        <translation type="obsolete">spola tillbaka till startposition</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>rewind current position</source>
-        <translation>flytta markör bakåt</translation>
+        <translation type="obsolete">flytta markör bakåt</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>move current position</source>
-        <translation>flytta markör</translation>
+        <translation type="obsolete">flytta markör</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>stop sequencer</source>
-        <translation>stoppa sequencer</translation>
+        <translation type="obsolete">stoppa sequencer</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>start sequencer play</source>
-        <translation>starta sequenceruppspelning</translation>
+        <translation type="obsolete">starta sequenceruppspelning</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>to record press record and then play</source>
-        <translation>för att spela in, tryck på record och sedan play</translation>
+        <translation type="obsolete">för att spela in, tryck på record och sedan play</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>send note off to all midi channels</source>
-        <translation>skicka note-off till alla midi kanaler</translation>
+        <translation type="obsolete">skicka note-off till alla midi kanaler</translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/tools.cpp" line="+5"/>
         <source>select Pencil Tool:
 with the pencil tool you can:
   create new parts
   modify length of parts</source>
-        <translation>välj Pennverktyg:
+        <translation type="obsolete">välj Pennverktyg:
 med pennverktyget kan du:
   skapa parter
   ändra längden på parter
 </translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>select Delete Tool:
 with the delete tool you can delete parts</source>
-        <translation>välj Suddverktyg:
+        <translation type="obsolete">välj Suddverktyg:
 med suddverktyget kan du ta bort parter</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>select Cut Tool:
 with the cut tool you can split a part</source>
-        <translation>välj Delningsverktyg: 
+        <translation type="obsolete">välj Delningsverktyg: 
 med delningsverktyget kan du dela på parter</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>select Glue Tool:
 with the glue tool you can glue two parts</source>
-        <translation>välj Limverktyg:
+        <translation type="obsolete">välj Limverktyg:
 med limverktyget kan du limma ihop två parter</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>select Score Tool:
 </source>
-        <translation>välj Partiturverktyg:
+        <translation type="obsolete">välj Partiturverktyg:
 </translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>select Quantize Tool:
 insert display quantize event</source>
-        <translation>välj Kvantiseringsverktyg:
+        <translation type="obsolete">välj Kvantiseringsverktyg:
 sätt in kvantiseringshändelser</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>select Drawing Tool</source>
-        <translation>välj Ritverktyg
+        <translation type="obsolete">välj Ritverktyg
 </translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>select Muting Tool:
 click on part to mute/unmute</source>
-        <translation>välj Tystningsverktyg:
+        <translation type="obsolete">välj Tystningsverktyg:
 klicka på en part för att Tysta/Avtysta</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Manipulate automation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Cursor tool</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>pointer</source>
-        <translation>pekare</translation>
+        <translation type="obsolete">pekare</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>pencil</source>
-        <translation>penna</translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>edit automation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>cursor</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">penna</translation>
     </message>
     <message>
         <source>rubber</source>
         <translation type="obsolete">sudd</translation>
     </message>
     <message>
-        <location line="-7"/>
         <source>cutter</source>
-        <translation>delare</translation>
+        <translation type="obsolete">delare</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>score</source>
-        <translation>partitur</translation>
+        <translation type="obsolete">partitur</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>glue</source>
-        <translation>lim</translation>
+        <translation type="obsolete">lim</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>quantize</source>
-        <translation>kvantisering</translation>
+        <translation type="obsolete">kvantisering</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>draw</source>
-        <translation>rita</translation>
+        <translation type="obsolete">rita</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>mute parts</source>
-        <translation>tysta parter</translation>
+        <translation type="obsolete">tysta parter</translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="+155"/>
-        <location filename="../../muse/master/masteredit.cpp" line="+155"/>
-        <location filename="../../muse/widgets/comboQuant.cpp" line="+40"/>
-        <location line="+1"/>
-        <location line="+1"/>
-        <location filename="../../muse/widgets/tb1.cpp" line="+48"/>
-        <location line="+1"/>
-        <location line="+1"/>
         <source>Off</source>
-        <translation>Av</translation>
+        <translation type="obsolete">Av</translation>
     </message>
     <message>
         <source>All Files (*)</source>
         <translation type="obsolete">Alla filer (*)</translation>
     </message>
     <message>
-        <location filename="../../muse/helper.cpp" line="+242"/>
-        <source>MESS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>DSSI</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+9"/>
-        <source>FST</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
+        <location filename="../../muse/helper.cpp" line="+185"/>
         <source>Add Midi Track</source>
         <translation type="unfinished">Lägg till Midispår</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>Add Drum Track</source>
         <translation type="unfinished">Lägg till Trumspår</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>Add Wave Track</source>
         <translation type="unfinished">Lägg till Wavespår</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+7"/>
         <source>Add Audio Output</source>
         <translation type="unfinished">Lägg till Ljudutgång</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+7"/>
         <source>Add Audio Group</source>
         <translation type="unfinished">Lägg till Ljudgrupp</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+7"/>
         <source>Add Audio Input</source>
         <translation type="unfinished">Lägg till Ljudingång</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+7"/>
         <source>Add Aux Send</source>
         <translation type="unfinished">Lägg till Aux-Send</translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/tools.cpp" line="-6"/>
         <source>eraser</source>
-        <translation type="unfinished">sudd</translation>
+        <translation type="obsolete">sudd</translation>
     </message>
     <message>
-        <location filename="../../muse/helper.cpp" line="+7"/>
+        <location line="+9"/>
         <source>Add Synth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="+0"/>
         <source>Bar</source>
-        <translation type="unfinished">Takt</translation>
-    </message>
-    <message>
-        <location filename="../../muse/confmport.cpp" line="+729"/>
-        <source> Jack</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+46"/>
-        <source>ALSA:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
-        <source>SYNTH:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
-        <source>JACK:</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Takt</translation>
     </message>
     <message>
-        <location filename="../../muse/driver/alsamidi.cpp" line="+209"/>
-        <location filename="../../muse/driver/jackmidi.cpp" line="+290"/>
-        <location filename="../../muse/midiport.cpp" line="+1138"/>
-        <location filename="../../muse/track.cpp" line="+799"/>
-        <location line="+16"/>
-        <location line="+30"/>
+        <location filename="../../muse/midiport.cpp" line="+1190"/>
         <source>Route</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location filename="../../muse/driver/jackmidi.cpp" line="+2"/>
-        <location filename="../../muse/track.cpp" line="-28"/>
-        <location line="+37"/>
-        <source> channel=&quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <location filename="../../muse/driver/jackmidi.cpp" line="+3"/>
-        <location filename="../../muse/midiport.cpp" line="+7"/>
-        <location filename="../../muse/track.cpp" line="-48"/>
-        <location line="+60"/>
+        <location line="+7"/>
         <source>dest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location filename="../../muse/driver/jackmidi.cpp" line="+2"/>
-        <source> devtype=&quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <location filename="../../muse/driver/jackmidi.cpp" line="-20"/>
-        <location line="+23"/>
-        <location filename="../../muse/track.cpp" line="-42"/>
-        <location line="+48"/>
-        <source> type=&quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location line="+1"/>
-        <location filename="../../muse/driver/jackmidi.cpp" line="-22"/>
-        <location line="+23"/>
-        <location filename="../../muse/midiport.cpp" line="+1"/>
-        <location filename="../../muse/track.cpp" line="-65"/>
-        <location line="+18"/>
-        <location line="+53"/>
         <source> name=&quot;%1&quot;/</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/driver/jackmidi.cpp" line="-26"/>
-        <location filename="../../muse/track.cpp" line="-56"/>
-        <source>source</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/midictrl.cpp" line="+242"/>
         <source>Velocity</source>
-        <translation type="unfinished">Hastighet</translation>
-    </message>
-    <message>
-        <location filename="../../muse/midiport.cpp" line="-807"/>
-        <source>&lt;none&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+801"/>
-        <location filename="../../muse/track.cpp" line="-21"/>
-        <location line="+48"/>
-        <source> channelMask=&quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/osc.cpp" line="+1320"/>
-        <source>dssi_synth</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+87"/>
-        <source>ladspa_efx</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/track.cpp" line="+8"/>
-        <source> channels=&quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source> remch=&quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+17"/>
-        <source> mport=&quot;%1&quot;/</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../muse/widgets/visibletracks.cpp" line="+35"/>
-        <location line="+9"/>
-        <source>Show wave tracks</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Hastighet</translation>
     </message>
     <message>
-        <location line="-8"/>
-        <location line="+9"/>
-        <source>Show group tracks</source>
+        <location line="-857"/>
+        <source>Warning: No output devices!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-8"/>
-        <location line="+9"/>
-        <source>Show aux tracks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-8"/>
-        <location line="+9"/>
-        <source>Show input tracks</source>
+        <location line="+5"/>
+        <source>Open midi config...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-8"/>
-        <location line="+9"/>
-        <source>Show output tracks</source>
+        <location line="+23"/>
+        <source>Empty ports</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-8"/>
-        <location line="+9"/>
-        <source>Show midi tracks</source>
+        <location line="+22"/>
+        <source>&lt;none&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-8"/>
-        <location line="+9"/>
-        <source>Show synth tracks</source>
+        <location line="+801"/>
+        <source> channelMask=&quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -573,79 +373,8 @@ Published under the GNU Public License</source>
         <translation type="obsolete">audioeditor bakgrundsfärg</translation>
     </message>
     <message>
-        <location filename="../../muse/appearance.cpp" line="+769"/>
         <source>MusE: load image</source>
-        <translation>MusE: ladda bild</translation>
-    </message>
-    <message>
-        <location line="-639"/>
-        <source>Main application font, and default font for any
- controls not defined here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>For small controls like mixer strips.
-Also timescale small numbers, arranger part name overlay,
- and effects rack.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Midi track info panel. Transport controls.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Controller graph and S/X buttons. Large numbers for time
- and tempo scale, and time signature.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Time scale markers.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>List editor: meta event edit dialog multi-line edit box.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Mixer label font. Auto-font-sizing up to chosen font size.
-Word-breaking but only with spaces.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Maximum mixer label auto-font-sizing font size.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Global opacity (opposite of transparency).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Standard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Custom</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+958"/>
-        <source>Select style sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Qt style sheets (*.qss)</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">MusE: ladda bild</translation>
     </message>
 </context>
 <context>
@@ -1416,29 +1145,12 @@ Word-breaking but only with spaces.</source>
 <context>
     <name>ClipListEdit</name>
     <message>
-        <location filename="../../muse/cliplist/cliplist.cpp" line="+127"/>
         <source>MusE: Clip List Editor</source>
-        <translation type="unfinished">MusE: Clip-listredigerare</translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Undo/Redo tools</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">MusE: Clip-listredigerare</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>panic</source>
-        <translation type="unfinished">panik</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>transport</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">panik</translation>
     </message>
 </context>
 <context>
@@ -1510,7 +1222,7 @@ Word-breaking but only with spaces.</source>
 <context>
     <name>ConfigMidiFileBase</name>
     <message>
-        <location filename="../../muse/widgets/configmidifilebase.ui" line="+193"/>
+        <location filename="../../muse/widgets/configmidifilebase.ui" line="+202"/>
         <source>&amp;OK</source>
         <translation type="unfinished">&amp;Ok</translation>
     </message>
@@ -1530,7 +1242,7 @@ Word-breaking but only with spaces.</source>
         <translation type="unfinished">1 (flera spår)</translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-52"/>
         <source>Format:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1550,12 +1262,12 @@ Word-breaking but only with spaces.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+64"/>
         <source>Division:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-20"/>
+        <location line="-36"/>
         <source>Copyright:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1564,17 +1276,17 @@ Word-breaking but only with spaces.</source>
         <translation type="obsolete">Slå på utbyggt smf-format</translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-91"/>
         <source>MusE: Config Midi File Import/Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+15"/>
         <source>Import:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+9"/>
         <source>Split tracks into &amp;parts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1584,12 +1296,12 @@ Word-breaking but only with spaces.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-6"/>
         <source>Split tracks into parts, or one single part</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+22"/>
         <source>Export:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1609,7 +1321,12 @@ Word-breaking but only with spaces.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+33"/>
+        <source>Note: Format 0 uses the FIRST midi track&apos;s name/comment in the arranger</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Save space by replacing note-offs with &amp;zero velocity note-ons</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1686,20 +1403,16 @@ Word-breaking but only with spaces.</source>
 <context>
     <name>CtrlPanel</name>
     <message>
-        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="+94"/>
         <source>select controller</source>
-        <translation>välj controller</translation>
+        <translation type="obsolete">välj controller</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>remove panel</source>
-        <translation>ta bort panel</translation>
+        <translation type="obsolete">ta bort panel</translation>
     </message>
     <message>
-        <location line="+463"/>
-        <location line="+236"/>
         <source>Velocity</source>
-        <translation>Hastighet</translation>
+        <translation type="obsolete">Hastighet</translation>
     </message>
     <message>
         <source>Pitch</source>
@@ -1710,67 +1423,18 @@ Word-breaking but only with spaces.</source>
         <translation type="obsolete">annat ...</translation>
     </message>
     <message>
-        <location line="-186"/>
         <source>add new ...</source>
-        <translation type="unfinished">lägg till ny...</translation>
-    </message>
-    <message>
-        <location line="-528"/>
-        <source>S</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>X</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">lägg till ny...</translation>
     </message>
     <message>
-        <location line="+18"/>
-        <source>manual adjust</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+9"/>
-        <source>double click on/off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
         <source>off</source>
-        <translation type="unfinished">av</translation>
-    </message>
-    <message>
-        <location line="+653"/>
-        <location line="+58"/>
-        <source>Instrument-defined</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-43"/>
-        <location line="+21"/>
-        <source>Add ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-17"/>
-        <source>Others</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+65"/>
-        <source>Edit instrument ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+46"/>
-        <source>Common Controls</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">av</translation>
     </message>
 </context>
 <context>
     <name>DeicsOnzeGui</name>
     <message>
-        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="+1904"/>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="+1906"/>
         <location line="+389"/>
         <source>Delete preset</source>
         <translation type="unfinished">Ta bort preset</translation>
@@ -3569,402 +3233,155 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
 <context>
     <name>DrumEdit</name>
     <message>
-        <location filename="../../muse/midiedit/drumedit.cpp" line="+181"/>
         <source>&amp;File</source>
-        <translation>&amp;Arkiv</translation>
+        <translation type="obsolete">&amp;Arkiv</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Load Map</source>
-        <translation>Ladda mappning</translation>
+        <translation type="obsolete">Ladda mappning</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Save Map</source>
-        <translation>Spara Mappning</translation>
+        <translation type="obsolete">Spara Mappning</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>&amp;Edit</source>
-        <translation>&amp;Redigera</translation>
+        <translation type="obsolete">&amp;Redigera</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Cut</source>
-        <translation>Klipp ut</translation>
+        <translation type="obsolete">Klipp ut</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Copy</source>
-        <translation>Kopiera</translation>
+        <translation type="obsolete">Kopiera</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Paste</source>
-        <translation>Klistra in</translation>
+        <translation type="obsolete">Klistra in</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Delete Events</source>
-        <translation>Ta bort händelser</translation>
+        <translation type="obsolete">Ta bort händelser</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Select All</source>
-        <translation>Välj Allt</translation>
+        <translation type="obsolete">Välj Allt</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Select None</source>
-        <translation>Välj Ingen</translation>
+        <translation type="obsolete">Välj Ingen</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Invert</source>
-        <translation>Invertera</translation>
+        <translation type="obsolete">Invertera</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Inside Loop</source>
-        <translation>I loop</translation>
+        <translation type="obsolete">I loop</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Outside Loop</source>
-        <translation>Utanför loop</translation>
+        <translation type="obsolete">Utanför loop</translation>
     </message>
     <message>
-        <location line="-7"/>
         <source>&amp;Select</source>
-        <translation>&amp;Välj</translation>
+        <translation type="obsolete">&amp;Välj</translation>
     </message>
     <message>
-        <location line="+81"/>
         <source>Load Drummap</source>
-        <translation>Ladda trummappning</translation>
+        <translation type="obsolete">Ladda trummappning</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Store Drummap</source>
-        <translation>Spara trummappning</translation>
+        <translation type="obsolete">Spara trummappning</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Step Record</source>
-        <translation>Stegvis inspelning</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Midi Input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+50"/>
-        <source>ctrl</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Stegvis inspelning</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Add Controller View</source>
-        <translation>Lägg till Controller vy</translation>
-    </message>
-    <message>
-        <location line="+57"/>
-        <source>M</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Lägg till Controller vy</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Sound</source>
-        <translation>Ljud</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>QNT</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>E-Note</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Ljud</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Len</source>
-        <translation type="unfinished">Längd</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>A-Note</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Ch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>LV1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>LV2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>LV3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>LV4</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Längd</translation>
     </message>
     <message>
         <source>drummaps</source>
         <translation type="obsolete">trummappningar</translation>
     </message>
     <message>
-        <location line="+373"/>
         <source>Muse: Load Drum Map</source>
-        <translation>Muse: Ladda trummappning</translation>
+        <translation type="obsolete">Muse: Ladda trummappning</translation>
     </message>
     <message>
-        <location line="+53"/>
         <source>MusE: Store Drum Map</source>
-        <translation>MusE: Spara trummappning</translation>
+        <translation type="obsolete">MusE: Spara trummappning</translation>
     </message>
     <message>
-        <location line="-620"/>
         <source>Set Fixed Length</source>
-        <translation type="unfinished">Sätt fast längd</translation>
+        <translation type="obsolete">Sätt fast längd</translation>
     </message>
     <message>
         <source>&amp;Functions</source>
         <translation type="obsolete">&amp;Funktioner</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Modify Velocity</source>
-        <translation type="unfinished">Modifiera Velocity</translation>
+        <translation type="obsolete">Modifiera Velocity</translation>
     </message>
     <message>
-        <location line="-148"/>
-        <location line="+21"/>
         <source>mute instrument</source>
-        <translation type="unfinished">tysta instrument</translation>
+        <translation type="obsolete">tysta instrument</translation>
     </message>
     <message>
-        <location line="-20"/>
-        <location line="+21"/>
         <source>sound name</source>
-        <translation type="unfinished">ljudnamn</translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <location line="+21"/>
-        <source>volume percent</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">ljudnamn</translation>
     </message>
     <message>
-        <location line="-20"/>
-        <location line="+21"/>
         <source>quantisation</source>
-        <translation type="unfinished">kvantisering</translation>
+        <translation type="obsolete">kvantisering</translation>
     </message>
     <message>
-        <location line="-20"/>
-        <location line="+21"/>
         <source>this input note triggers the sound</source>
-        <translation type="unfinished">denna in-not triggar ljudet</translation>
+        <translation type="obsolete">denna in-not triggar ljudet</translation>
     </message>
     <message>
-        <location line="-20"/>
-        <location line="+21"/>
         <source>note length</source>
-        <translation type="unfinished">notlängd</translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <location line="+21"/>
-        <source>this is the note which is played</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <source>output channel (hold ctl to affect all rows)</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">notlängd</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+21"/>
         <source>output port</source>
-        <translation type="unfinished">utgångsport</translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <location line="+21"/>
-        <source>shift + control key: draw velocity level 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <location line="+21"/>
-        <source>control key: draw velocity level 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <location line="+21"/>
-        <source>shift key: draw velocity level 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-20"/>
-        <location line="+21"/>
-        <source>draw velocity level 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-5"/>
-        <source>output channel (ctl: affect all rows)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+46"/>
-        <source>Reset GM Map</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <source>Copy events in range</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Paste (with Dialog)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+29"/>
-        <source>Previous Part</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Next Part</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
-        <source>Fu&amp;nctions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Re-order list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Crescendo/Decrescendo</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">utgångsport</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Quantize</source>
-        <translation type="unfinished">Kvantisera</translation>
+        <translation type="obsolete">Kvantisera</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Erase Event</source>
-        <translation type="unfinished">Ta bort Händelse</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Move Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Delete Overlaps</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>&amp;Plugins</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Drum tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+37"/>
-        <source>cursor tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Set step size for cursor edit</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Ta bort Händelse</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>panic</source>
-        <translation type="unfinished">panik</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>transport</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+84"/>
-        <source>Vol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+461"/>
-        <source>Drum map</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Reset the drum map with GM defaults?</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">panik</translation>
     </message>
 </context>
 <context>
     <name>EditCAfterDialog</name>
     <message>
-        <location filename="../../muse/liste/editevent.cpp" line="+443"/>
-        <source>MusE: Enter Channel Aftertouch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
         <source>Time Position</source>
-        <translation type="unfinished">Tidsposition</translation>
+        <translation type="obsolete">Tidsposition</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Pressure</source>
-        <translation type="unfinished">Tryck</translation>
+        <translation type="obsolete">Tryck</translation>
     </message>
 </context>
 <context>
@@ -4097,14 +3514,8 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
 <context>
     <name>EditEventDialog</name>
     <message>
-        <location filename="../../muse/liste/editevent.cpp" line="-261"/>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
         <source>Cancel</source>
-        <translation type="unfinished">Avbryt</translation>
+        <translation type="obsolete">Avbryt</translation>
     </message>
 </context>
 <context>
@@ -4168,180 +3579,20 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
 <context>
     <name>EditInstrument</name>
     <message>
-        <location filename="../../muse/instruments/editinstrument.cpp" line="+311"/>
-        <location line="+34"/>
-        <source>MusE: Create file failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+33"/>
         <source>MusE: Write File failed</source>
-        <translation type="unfinished">MusE: Misslyckades med att skriva Fil</translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <location line="+12"/>
-        <location line="+280"/>
-        <location line="+12"/>
-        <source>MusE:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-303"/>
-        <location line="+292"/>
-        <source>The user instrument directory
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-292"/>
-        <location line="+292"/>
-        <source>
-does not exist yet. Create it now?
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-291"/>
-        <location line="+292"/>
-        <source>(You can change the user instruments directory at Settings-&gt;Global Settings-&gt;Midi)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-282"/>
-        <location line="+292"/>
-        <source>Unable to create user instrument directory
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-244"/>
-        <location line="+266"/>
-        <source>MusE: Save Instrument Definition</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-265"/>
-        <location line="+266"/>
-        <source>Instrument Definition (*.idf)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-154"/>
-        <location line="+29"/>
-        <source>MusE: Save instrument as</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-29"/>
-        <source>Enter a new unique instrument name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+30"/>
-        <source>The user instrument:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>
-already exists. This will overwrite its .idf instrument file.
-Are you sure?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+525"/>
-        <source>MusE: Bad instrument name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Please choose a unique instrument name.
-(The name might be used by a hidden instrument.)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+136"/>
-        <source>MusE: Bad patch name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Please choose a unique patch name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
-        <source>MusE: Bad patchgroup name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Please choose a unique patchgroup name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+526"/>
-        <source>MusE: Bad controller name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Please choose a unique controller name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1287"/>
-        <location line="+12"/>
-        <source>MusE: Cannot add common controller</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-11"/>
-        <source>A controller named </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <location line="+12"/>
-        <source> already exists.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>A controller number </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+283"/>
-        <location line="+5"/>
-        <source>MusE</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-4"/>
-        <location line="+5"/>
-        <source>The current Instrument contains unsaved data
-Save Current Instrument?</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">MusE: Misslyckades med att skriva Fil</translation>
     </message>
     <message>
-        <location line="-3"/>
-        <location line="+5"/>
         <source>&amp;Save</source>
-        <translation type="unfinished">&amp;Spara</translation>
+        <translation type="obsolete">&amp;Spara</translation>
     </message>
     <message>
-        <location line="-5"/>
-        <location line="+5"/>
         <source>&amp;Nosave</source>
-        <translation type="unfinished">&amp;Inte spara</translation>
+        <translation type="obsolete">&amp;Inte spara</translation>
     </message>
     <message>
-        <location line="-5"/>
         <source>&amp;Abort</source>
-        <translation type="unfinished">&amp;Avbryt</translation>
+        <translation type="obsolete">&amp;Avbryt</translation>
     </message>
 </context>
 <context>
@@ -5081,24 +4332,20 @@ Typically, set to 127/127, or an unused
 <context>
     <name>EditMetaDialog</name>
     <message>
-        <location filename="../../muse/liste/editevent.cpp" line="+118"/>
         <source>MusE: Enter Meta Event</source>
-        <translation>MusE: Mata in Meta Händelse</translation>
+        <translation type="obsolete">MusE: Mata in Meta Händelse</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Time Position</source>
-        <translation>Tidsposition</translation>
+        <translation type="obsolete">Tidsposition</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Meta Type</source>
-        <translation>Metatyp</translation>
+        <translation type="obsolete">Metatyp</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Enter Hex</source>
-        <translation>Mata in Hex</translation>
+        <translation type="obsolete">Mata in Hex</translation>
     </message>
 </context>
 <context>
@@ -5170,24 +4417,20 @@ Typically, set to 127/127, or an unused
 <context>
     <name>EditPAfterDialog</name>
     <message>
-        <location filename="../../muse/liste/editevent.cpp" line="+176"/>
         <source>MusE: Enter Poly Aftertouch</source>
-        <translation>MusE: Mata in Poly Aftertouch</translation>
+        <translation type="obsolete">MusE: Mata in Poly Aftertouch</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Time Position</source>
-        <translation>Tidsposition</translation>
+        <translation type="obsolete">Tidsposition</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Pitch</source>
-        <translation>Tonhöjd</translation>
+        <translation type="obsolete">Tonhöjd</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Pressure</source>
-        <translation type="unfinished">Tryck</translation>
+        <translation type="obsolete">Tryck</translation>
     </message>
 </context>
 <context>
@@ -5613,13 +4856,46 @@ Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+13"/>
         <source>Allows some popup menus to stay open.
 Otherwise, hold Ctrl to keep them open.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+11"/>
+        <source>In some areas, the middle mouse button decreases
+values, while the right button increases. Users without a
+middle mouse button can select this option to make the
+left button behave like the middle button in such areas.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Use left mouse button for decreasing values</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Shift + Right click sets left range marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Allow adding hidden tracks in track list menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Unhide tracks when adding hidden tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>GUI Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>MDI-subwindowness and sharing menus</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5659,7 +4935,7 @@ Otherwise, hold Ctrl to keep them open.</source>
         <translation>&amp;Avbryt</translation>
     </message>
     <message>
-        <location line="-924"/>
+        <location line="-1024"/>
         <source>Audio</source>
         <translation type="unfinished">Ljud</translation>
     </message>
@@ -5781,16 +5057,11 @@ Otherwise, hold Ctrl to keep them open.</source>
 (Tick/Sek)</translation>
     </message>
     <message>
-        <location line="+212"/>
-        <source>GUI</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Help Browser:</source>
         <translation type="obsolete">Hjälpläsare:</translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+230"/>
         <source>GUI Refresh Rate</source>
         <translation>GUI-uppdateringsfrekvens</translation>
     </message>
@@ -6130,7 +5401,12 @@ Adjusts responsiveness of audio controls and
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+41"/>
+        <source>GUI Behaviour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+44"/>
         <source>Use old-style stop shortcut:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6153,139 +5429,68 @@ Adjusts responsiveness of audio controls and
 <context>
     <name>LMaster</name>
     <message>
-        <location filename="../../muse/master/lmaster.cpp" line="+147"/>
         <source>MusE: Mastertrack</source>
-        <translation>MusE: Masterspår</translation>
-    </message>
-    <message>
-        <location line="+57"/>
-        <source>Tempo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Timesig</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">MusE: Masterspår</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>new tempo</source>
-        <translation>nytt tempo</translation>
+        <translation type="obsolete">nytt tempo</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>new signature</source>
-        <translation>ny signatur</translation>
+        <translation type="obsolete">ny signatur</translation>
     </message>
     <message>
-        <location line="+26"/>
-        <source>Meter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
         <source>Time</source>
-        <translation>Tid</translation>
+        <translation type="obsolete">Tid</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Type</source>
-        <translation>Typ</translation>
+        <translation type="obsolete">Typ</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Value</source>
-        <translation>Värde</translation>
+        <translation type="obsolete">Värde</translation>
     </message>
     <message>
-        <location line="-77"/>
         <source>&amp;Edit</source>
-        <translation type="unfinished">&amp;Redigera</translation>
+        <translation type="obsolete">&amp;Redigera</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Insert Tempo</source>
-        <translation type="unfinished">Sätt in tempo</translation>
+        <translation type="obsolete">Sätt in tempo</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Insert Signature</source>
-        <translation type="unfinished">Sätt in signatur</translation>
+        <translation type="obsolete">Sätt in signatur</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Insert Key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
         <source>Edit Positon</source>
-        <translation type="unfinished">Editera position</translation>
+        <translation type="obsolete">Editera position</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Edit Value</source>
-        <translation type="unfinished">Editera värde</translation>
+        <translation type="obsolete">Editera värde</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Delete Event</source>
-        <translation type="unfinished">Ta bort event</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Ta bort event</translation>
     </message>
     <message>
-        <location line="+23"/>
-        <source>Undo/Redo tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>new key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
         <source>panic</source>
-        <translation type="unfinished">panik</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>transport</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">panik</translation>
     </message>
     <message>
-        <location line="+408"/>
         <source>Reposition of the initial tempo and signature events is not allowed</source>
-        <translation type="unfinished">Ompositionering av initalt tempo och/eller signaturevent är inte tillåtet</translation>
+        <translation type="obsolete">Ompositionering av initalt tempo och/eller signaturevent är inte tillåtet</translation>
     </message>
     <message>
-        <location line="+54"/>
-        <source>MusE: List Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
         <source>Input error, conversion not OK or value out of range</source>
-        <translation type="unfinished">Inmatningsfel, konvertering felaktig eller värde utanför område</translation>
+        <translation type="obsolete">Inmatningsfel, konvertering felaktig eller värde utanför område</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Reposition of tempo and signature events to start position is not allowed!</source>
-        <translation type="unfinished">Ompositionering av tempo och/eller signaturevent till startposition är inte tillåtet</translation>
-    </message>
-    <message>
-        <location line="-495"/>
-        <source>Edit tools</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Ompositionering av tempo och/eller signaturevent till startposition är inte tillåtet</translation>
     </message>
 </context>
 <context>
@@ -6358,36 +5563,32 @@ Adjusts responsiveness of audio controls and
         <translation type="obsolete">Mata in Not</translation>
     </message>
     <message>
-        <location filename="../../muse/liste/listedit.cpp" line="+468"/>
         <source>insert Note</source>
-        <translation>Mata in Not</translation>
+        <translation type="obsolete">Mata in Not</translation>
     </message>
     <message>
         <source>Insert SysEx</source>
         <translation type="obsolete">Mata in SysEx</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>insert SysEx</source>
-        <translation>Mata in SysEx</translation>
+        <translation type="obsolete">Mata in SysEx</translation>
     </message>
     <message>
         <source>Insert Ctrl</source>
         <translation type="obsolete">Mata in Ctrl</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>insert Ctrl</source>
-        <translation>Mata in Ctrl</translation>
+        <translation type="obsolete">Mata in Ctrl</translation>
     </message>
     <message>
         <source>Insert Meta</source>
         <translation type="obsolete">Mata in Meta</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>insert Meta</source>
-        <translation>Mata in Meta</translation>
+        <translation type="obsolete">Mata in Meta</translation>
     </message>
     <message>
         <source>Insert Pitch</source>
@@ -6402,43 +5603,36 @@ Adjusts responsiveness of audio controls and
         <translation type="obsolete">Mata in Aftertouch för kanal</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>insert Channel Aftertouch</source>
-        <translation>Mata in Aftertouch för kanal</translation>
+        <translation type="obsolete">Mata in Aftertouch för kanal</translation>
     </message>
     <message>
         <source>Insert Key Aftertouch</source>
         <translation type="obsolete">Mata in Key Aftertouch</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>insert Poly Aftertouch</source>
-        <translation>Mata in Poly Aftertouch</translation>
+        <translation type="obsolete">Mata in Poly Aftertouch</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>&amp;Edit</source>
-        <translation>&amp;Redigera</translation>
+        <translation type="obsolete">&amp;Redigera</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Cut</source>
-        <translation>Klipp ut</translation>
+        <translation type="obsolete">Klipp ut</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Copy</source>
-        <translation>Kopiera</translation>
+        <translation type="obsolete">Kopiera</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Paste</source>
-        <translation>Klistra in</translation>
+        <translation type="obsolete">Klistra in</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Delete Events</source>
-        <translation>Ta bort Händelser</translation>
+        <translation type="obsolete">Ta bort Händelser</translation>
     </message>
     <message>
         <source>List Tools</source>
@@ -6449,74 +5643,24 @@ Adjusts responsiveness of audio controls and
         <translation type="obsolete">Inmatningsverktyg</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Undo/Redo tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
         <source>panic</source>
-        <translation type="unfinished">panik</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>transport</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
-        <source>Tick</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">panik</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Bar</source>
-        <translation type="unfinished">Takt</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Ch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Val A</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Val B</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Val C</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Takt</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Len</source>
-        <translation type="unfinished">Längd</translation>
+        <translation type="obsolete">Längd</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Comment</source>
-        <translation>Kommentar</translation>
-    </message>
-    <message>
-        <location line="-38"/>
-        <source>Insert tools</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Kommentar</translation>
     </message>
     <message>
-        <location line="+32"/>
         <source>Type</source>
-        <translation type="unfinished">Typ</translation>
+        <translation type="obsolete">Typ</translation>
     </message>
 </context>
 <context>
@@ -6562,269 +5706,28 @@ Adjusts responsiveness of audio controls and
         <translation type="obsolete">MusE: Midiporttabell</translation>
     </message>
     <message>
-        <location filename="../../muse/confmport.cpp" line="+236"/>
-        <source>Port</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>GUI</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Instrument</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location line="+1"/>
         <source>Device Name</source>
-        <translation>Enhetsnamn</translation>
+        <translation type="obsolete">Enhetsnamn</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>State</source>
-        <translation>Status</translation>
+        <translation type="obsolete">Status</translation>
     </message>
     <message>
         <source>unknown</source>
         <translation type="obsolete">okänd</translation>
     </message>
     <message>
-        <location line="-8"/>
-        <source>I</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>O</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-715"/>
-        <source>MusE: bad device name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-254"/>
-        <location line="+176"/>
-        <source>Default input connections</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-175"/>
-        <location line="+66"/>
-        <source>Are you sure you want to apply to all existing midi tracks now?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-1"/>
-        <location line="+148"/>
-        <source>Default output connections</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-37"/>
-        <location line="+38"/>
-        <source>Setting will apply to new midi tracks.
-Do you want to apply to all existing midi tracks now?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+40"/>
-        <source>please choose a unique device name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+72"/>
-        <location line="+860"/>
-        <source>in</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-837"/>
-        <location line="+828"/>
-        <source>out</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-772"/>
-        <source>Show first aliases</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Show second aliases</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+130"/>
-        <location line="+42"/>
-        <source>Toggle all</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-38"/>
-        <location line="+43"/>
-        <source>Change all tracks now</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+43"/>
-        <source>Create</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source> device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+229"/>
-        <location line="+29"/>
         <source>Port Number</source>
-        <translation type="unfinished">Portnummer</translation>
-    </message>
-    <message>
-        <location line="-28"/>
-        <source>Enable gui</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Enable reading</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Enable writing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Port instrument</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Midi device name. Click to edit (Jack)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Connections from Jack Midi outputs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Connections to Jack Midi inputs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Auto-connect these channels to new midi tracks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Auto-connect new midi tracks to these channels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Auto-connect new midi tracks to this channel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>Auto-connect these channels, on this port, to new midi tracks.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Connect new midi tracks to these channels, on this port.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Connect new midi tracks to this channel, on this port.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-45"/>
-        <source>Device state</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+15"/>
-        <source>Enable gui for device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Enable reading from device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Enable writing to device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Name of the midi device associated with this port number. Click to edit Jack midi name.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Portnummer</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Instrument connected to port</source>
-        <translation type="unfinished">Instrument kopplat till denna port</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Connections from Jack Midi output ports</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Connections to Jack Midi input ports</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Instrument kopplat till denna port</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>State: result of opening the device</source>
-        <translation type="unfinished">Status: resultat av öppning av enhet</translation>
-    </message>
-    <message>
-        <location line="+47"/>
-        <source>In routes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Out routes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Def in ch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Def out ch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+86"/>
-        <source>&lt;unknown&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+87"/>
-        <location line="+74"/>
-        <source>&lt;none&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Status: resultat av öppning av enhet</translation>
     </message>
 </context>
 <context>
@@ -6885,23 +5788,20 @@ Do you want to apply to all existing midi tracks now?</source>
 <context>
     <name>MarkerView</name>
     <message>
-        <location filename="../../muse/marker/markerview.cpp" line="+173"/>
         <source>MusE: Marker</source>
-        <translation>MusE: Markör</translation>
+        <translation type="obsolete">MusE: Markör</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>add marker</source>
-        <translation>lägg till markör</translation>
+        <translation type="obsolete">lägg till markör</translation>
     </message>
     <message>
         <source>Add Marker</source>
         <translation type="obsolete">Lägg till Markör</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>delete marker</source>
-        <translation>ta bort markör</translation>
+        <translation type="obsolete">ta bort markör</translation>
     </message>
     <message>
         <source>Delete Marker</source>
@@ -6912,67 +5812,39 @@ Do you want to apply to all existing midi tracks now?</source>
         <translation type="obsolete">&amp;Arkiv</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>&amp;Edit</source>
-        <translation>&amp;Redigera</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Undo/Redo tools</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&amp;Redigera</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>panic</source>
-        <translation type="unfinished">panik</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>transport</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">panik</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Bar:Beat:Tick</source>
-        <translation>Takt:Slag:Tick</translation>
+        <translation type="obsolete">Takt:Slag:Tick</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Hr:Mn:Sc:Fr:Sf</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
         <source>Lock</source>
-        <translation>LÃ¥s</translation>
+        <translation type="obsolete">LÃ¥s</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Text</source>
-        <translation type="unfinished">Text</translation>
+        <translation type="obsolete">Text</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Marker Properties</source>
-        <translation>Markörinställningar</translation>
+        <translation type="obsolete">Markörinställningar</translation>
     </message>
     <message>
-        <location line="-40"/>
         <source>edit tools</source>
-        <translation type="unfinished">redigeringsverktyg</translation>
+        <translation type="obsolete">redigeringsverktyg</translation>
     </message>
 </context>
 <context>
     <name>MasterEdit</name>
     <message>
-        <location filename="../../muse/master/masteredit.cpp" line="-56"/>
         <source>MusE: Mastertrack</source>
-        <translation>MusE: Masterspår</translation>
+        <translation type="obsolete">MusE: Masterspår</translation>
     </message>
     <message>
         <source>edit tools</source>
@@ -6987,83 +5859,44 @@ Do you want to apply to all existing midi tracks now?</source>
         <translation type="obsolete">använd master track</translation>
     </message>
     <message>
-        <location line="+39"/>
-        <source>Info</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
         <source>Cursor</source>
-        <translation type="unfinished">Markör</translation>
+        <translation type="obsolete">Markör</translation>
     </message>
     <message>
         <source>Off</source>
         <translation type="obsolete">Av</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Snap</source>
-        <translation>Fäst vid</translation>
+        <translation type="obsolete">Fäst vid</translation>
     </message>
     <message>
-        <location line="-10"/>
         <source>time at cursor position</source>
-        <translation>tid vid markörposition</translation>
-    </message>
-    <message>
-        <location line="-41"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Undo/Redo tools</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">tid vid markörposition</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>panic</source>
-        <translation type="unfinished">panik</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>transport</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">panik</translation>
     </message>
     <message>
-        <location line="+30"/>
         <source>tempo at cursor position</source>
-        <translation>tempo vid markörposition</translation>
+        <translation type="obsolete">tempo vid markörposition</translation>
     </message>
     <message>
-        <location line="+15"/>
-        <source>CurPos </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
         <source>tempo at current position</source>
-        <translation>tempo vid nuvarande position</translation>
+        <translation type="obsolete">tempo vid nuvarande position</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>time signature at current position</source>
-        <translation>time signature vid nuvarande position</translation>
+        <translation type="obsolete">time signature vid nuvarande position</translation>
     </message>
     <message>
-        <location line="-39"/>
         <source>Enable</source>
-        <translation type="unfinished">Aktivera</translation>
+        <translation type="obsolete">Aktivera</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Enable usage of master track</source>
-        <translation type="unfinished">Aktivera användning av masterspår</translation>
-    </message>
-    <message>
-        <location line="-5"/>
-        <source>Enable master</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Aktivera användning av masterspår</translation>
     </message>
 </context>
 <context>
@@ -7560,10 +6393,8 @@ som vanliga controllers i MusE.</translation>
 <context>
     <name>MidiInputTransformDialog</name>
     <message>
-        <location filename="../../muse/mplugins/midiitransform.cpp" line="+718"/>
-        <location line="+2"/>
         <source>New</source>
-        <translation type="unfinished">Ny</translation>
+        <translation type="obsolete">Ny</translation>
     </message>
 </context>
 <context>
@@ -8258,6 +7089,11 @@ Enabled inputs in the list will
         <source>Send sync delay</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+24"/>
+        <source>Note: Sync delay and MTC sync currently not fully implemeted</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MidiTrackInfoBase</name>
@@ -8889,10 +7725,8 @@ inspelning:
 <context>
     <name>MidiTransformerDialog</name>
     <message>
-        <location filename="../../muse/miditransform.cpp" line="+263"/>
-        <location line="+2"/>
         <source>New</source>
-        <translation>Ny</translation>
+        <translation type="obsolete">Ny</translation>
     </message>
 </context>
 <context>
@@ -9733,705 +8567,799 @@ misslyckades:</translation>
 <context>
     <name>MusEApp::MusE</name>
     <message>
-        <location filename="../../muse/app.cpp" line="+46"/>
-        <location line="+16"/>
-        <source>Failed to start audio!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-15"/>
-        <source>Was not able to start audio, check if jack is running.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <source>Timeout waiting for audio to run. Check if jack is running.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+219"/>
         <source>Und&amp;o</source>
-        <translation type="unfinished">&amp;Ã…ngra</translation>
+        <translation type="obsolete">&amp;Ã…ngra</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Re&amp;do</source>
-        <translation type="unfinished">&amp;Gör om</translation>
+        <translation type="obsolete">&amp;Gör om</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>undo last change to song</source>
-        <translation type="unfinished">ångra sista ändring i sång</translation>
+        <translation type="obsolete">ångra sista ändring i sång</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>redo last undo</source>
-        <translation type="unfinished">gör om sista ångring</translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Loop</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Punchin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Punchout</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Start</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">gör om sista ångring</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Rewind</source>
-        <translation type="unfinished">Flytta tillbaka</translation>
+        <translation type="obsolete">Flytta tillbaka</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Forward</source>
-        <translation type="unfinished">Frammåt</translation>
+        <translation type="obsolete">Frammåt</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Stop</source>
-        <translation type="unfinished">Stopp</translation>
+        <translation type="obsolete">Stopp</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Play</source>
-        <translation type="unfinished">Spela</translation>
+        <translation type="obsolete">Spela</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Record</source>
-        <translation type="unfinished">Spela in</translation>
+        <translation type="obsolete">Spela in</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <location line="+232"/>
         <source>Panic</source>
-        <translation type="unfinished">Panik</translation>
+        <translation type="obsolete">Panik</translation>
     </message>
     <message>
-        <location line="-220"/>
         <source>&amp;New</source>
-        <translation type="unfinished">&amp;Ny</translation>
+        <translation type="obsolete">&amp;Ny</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Open</source>
-        <translation type="unfinished">&amp;Öppna</translation>
+        <translation type="obsolete">&amp;Öppna</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Open &amp;Recent</source>
-        <translation type="unfinished">&amp;Nyligen öppnade</translation>
+        <translation type="obsolete">&amp;Nyligen öppnade</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location line="+1005"/>
-        <location line="+1207"/>
         <source>&amp;Save</source>
-        <translation type="unfinished">&amp;Spara</translation>
+        <translation type="obsolete">&amp;Spara</translation>
     </message>
     <message>
-        <location line="-2207"/>
         <source>Save &amp;As</source>
-        <translation type="unfinished">S&amp;para som</translation>
+        <translation type="obsolete">S&amp;para som</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Import Midifile</source>
-        <translation type="unfinished">Importera midifil</translation>
+        <translation type="obsolete">Importera midifil</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Export Midifile</source>
-        <translation type="unfinished">Exportera midifil</translation>
+        <translation type="obsolete">Exportera midifil</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Import Part</source>
-        <translation type="unfinished">Importera Part</translation>
+        <translation type="obsolete">Importera Part</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location filename="../../muse/wave.cpp" line="+827"/>
         <source>Import Wave File</source>
-        <translation type="unfinished">Importera ljudfil</translation>
+        <translation type="obsolete">Importera ljudfil</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Find unused wave files</source>
-        <translation type="unfinished"></translation>
+        <source>&amp;Quit</source>
+        <translation type="obsolete">A&amp;vsluta</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>&amp;Quit</source>
-        <translation type="unfinished">A&amp;vsluta</translation>
+        <source>Transport Panel</source>
+        <translation type="obsolete">Transportpanel</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Song Info</source>
-        <translation type="unfinished"></translation>
+        <source>Bigtime Window</source>
+        <translation type="obsolete">Bigtime fönster</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Transport Panel</source>
-        <translation type="unfinished">Transportpanel</translation>
+        <source>Marker View</source>
+        <translation type="obsolete">Markörvy</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Bigtime Window</source>
-        <translation type="unfinished">Bigtime fönster</translation>
+        <source>Transpose</source>
+        <translation type="obsolete">Transponera</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Mixer A</source>
-        <translation type="unfinished"></translation>
+        <source>Midi Remote Control</source>
+        <translation type="obsolete">Midi-fjärrkontroll</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Mixer B</source>
-        <translation type="unfinished"></translation>
+        <source>Reset Instr.</source>
+        <translation type="obsolete">Resetta Instr.</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Cliplist</source>
-        <translation type="unfinished"></translation>
+        <source>Local Off</source>
+        <translation type="obsolete">lokal av</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Marker View</source>
-        <translation type="unfinished">Markörvy</translation>
+        <source>Bounce to Track</source>
+        <translation type="obsolete">Bounce till Spår</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Arranger View</source>
-        <translation type="unfinished"></translation>
+        <source>Bounce to File</source>
+        <translation type="obsolete">Bounce till Fil</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Fullscreen</source>
-        <translation type="unfinished"></translation>
+        <source>Restart Audio</source>
+        <translation type="obsolete">Starta om Audio</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>&amp;Plugins</source>
-        <translation type="unfinished"></translation>
+        <source>Mixer Automation</source>
+        <translation type="obsolete">Mixerautomation</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Edit Instrument</source>
-        <translation type="unfinished"></translation>
+        <source>Take Snapshot</source>
+        <translation type="obsolete">Ta ett snapshot</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Input Plugins</source>
-        <translation type="unfinished"></translation>
+        <source>Clear Automation Data</source>
+        <translation type="obsolete">Rensa automationsdata</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Transpose</source>
-        <translation type="unfinished">Transponera</translation>
+        <source>Global Settings</source>
+        <translation type="obsolete">Globala Inställningar</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Midi Input Transform</source>
-        <translation type="unfinished"></translation>
+        <source>Configure Shortcuts</source>
+        <translation type="obsolete">Konfigurera kortkommandon</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Midi Input Filter</source>
-        <translation type="unfinished"></translation>
+        <source>Follow Song</source>
+        <translation type="obsolete">följ sång</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Midi Remote Control</source>
-        <translation type="unfinished">Midi-fjärrkontroll</translation>
+        <source>Don&apos;t Follow Song</source>
+        <translation type="obsolete">följ inte Sång</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Rhythm Generator</source>
-        <translation type="unfinished"></translation>
+        <source>Follow Page</source>
+        <translation type="obsolete">följ sida</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Reset Instr.</source>
-        <translation type="unfinished">Resetta Instr.</translation>
+        <source>Follow Continuous</source>
+        <translation type="obsolete">följ kontinuerligt</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Init Instr.</source>
-        <translation type="unfinished"></translation>
+        <source>Metronome</source>
+        <translation type="obsolete">Metronom</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Local Off</source>
-        <translation type="unfinished">lokal av</translation>
+        <source>Midi Sync</source>
+        <translation type="obsolete">Midi Synk</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Bounce to Track</source>
-        <translation type="unfinished">Bounce till Spår</translation>
+        <source>Appearance Settings</source>
+        <translation type="obsolete">Utseendeinställningar</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Bounce to File</source>
-        <translation type="unfinished">Bounce till Fil</translation>
+        <source>Midi Ports / Soft Synth</source>
+        <translation type="obsolete">Midiportar / Mjukvarusyntar</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Restart Audio</source>
-        <translation type="unfinished">Starta om Audio</translation>
+        <source>&amp;MusE Homepage</source>
+        <translation type="obsolete">M&amp;usEs hemsida</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Mixer Automation</source>
-        <translation type="unfinished">Mixerautomation</translation>
+        <source>&amp;Report Bug...</source>
+        <translation type="obsolete">&amp;Rapportera fel...</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Take Snapshot</source>
-        <translation type="unfinished">Ta ett snapshot</translation>
+        <source>&amp;About MusE</source>
+        <translation type="obsolete">&amp;Om MusE</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Clear Automation Data</source>
-        <translation type="unfinished">Rensa automationsdata</translation>
+        <source>&amp;File</source>
+        <translation type="obsolete">&amp;Arkiv</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Cascade</source>
-        <translation type="unfinished"></translation>
+        <source>&amp;Audio</source>
+        <translation type="obsolete">L&amp;jud</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Tile</source>
-        <translation type="unfinished"></translation>
+        <source>&amp;Help</source>
+        <translation type="obsolete">&amp;Hjälp</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>In rows</source>
-        <translation type="unfinished"></translation>
+        <source>Cannot read template</source>
+        <translation type="obsolete">Kan inte läsa mall</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>In columns</source>
-        <translation type="unfinished"></translation>
+        <source>File open error</source>
+        <translation type="obsolete">Fel vid öppning av fil</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Global Settings</source>
-        <translation type="unfinished">Globala Inställningar</translation>
+        <source>File read error</source>
+        <translation type="obsolete">Fel vid läsning av fil</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Configure Shortcuts</source>
-        <translation type="unfinished">Konfigurera kortkommandon</translation>
+        <source>MusE: Song: </source>
+        <translation type="obsolete">MusE: SÃ¥ng:</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Follow Song</source>
-        <translation type="unfinished">följ sång</translation>
+        <source>MusE: load project</source>
+        <translation type="obsolete">MusE: Öppna projekt</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Don&apos;t Follow Song</source>
-        <translation type="unfinished">följ inte Sång</translation>
+        <source>MusE: load template</source>
+        <translation type="obsolete">MusE: ladda mall</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Follow Page</source>
-        <translation type="unfinished">följ sida</translation>
+        <source>MusE: Write File failed</source>
+        <translation type="obsolete">MusE: Misslyckades med att skriva Fil</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Follow Continuous</source>
-        <translation type="unfinished">följ kontinuerligt</translation>
+        <source>The current Project contains unsaved data
+Save Current Project?</source>
+        <translation type="obsolete">Det nuvarande Projektet innehåller osparade ändringar
+Spara nuvarande Projekt?</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Metronome</source>
-        <translation type="unfinished">Metronom</translation>
+        <source>&amp;Cancel</source>
+        <translation type="obsolete">&amp;Avbryt</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Midi Sync</source>
-        <translation type="unfinished">Midi Synk</translation>
+        <source>MusE: Save As</source>
+        <translation type="obsolete">MusE: Spara Som</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Midi File Import/Export</source>
-        <translation type="unfinished"></translation>
+        <source>Nothing to edit</source>
+        <translation type="obsolete">Inget att redigera</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Appearance Settings</source>
-        <translation type="unfinished">Utseendeinställningar</translation>
+        <source>MusE: Bounce to Track</source>
+        <translation type="obsolete">MusE: Bounce till Spår</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Midi Ports / Soft Synth</source>
-        <translation type="unfinished">Midiportar / Mjukvarusyntar</translation>
+        <source>MusE: Bounce to File</source>
+        <translation type="obsolete">MusE: Bounce till fil</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>&amp;Manual</source>
-        <translation type="unfinished"></translation>
+        <source>set left/right marker for bounce range</source>
+        <translation type="obsolete">sätt vänster och höger markör till bounce-område</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>&amp;MusE Homepage</source>
-        <translation type="unfinished">M&amp;usEs hemsida</translation>
+        <source>The current Project contains unsaved data
+Load overwrites current Project:
+Save Current Project?</source>
+        <translation type="obsolete">Det nuvarande Projektet innehåller osparade ändringar
+Öppning skriver över nuvarande Projekt
+Spara nuvarande Projekt?</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>&amp;Report Bug...</source>
-        <translation type="unfinished">&amp;Rapportera fel...</translation>
+        <source>&amp;Abort</source>
+        <translation type="obsolete">&amp;Avbryt</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>&amp;About MusE</source>
-        <translation type="unfinished">&amp;Om MusE</translation>
+        <source>MusE: Export Midi</source>
+        <translation type="obsolete">MusE: Exportera Midi</translation>
     </message>
     <message>
-        <location line="+99"/>
-        <source>File Buttons</source>
-        <translation type="unfinished"></translation>
+        <source>no help found at: </source>
+        <translation type="obsolete">ingen h jälp hittad vid:</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Undo/Redo</source>
-        <translation type="unfinished"></translation>
+        <source>MusE: Open Help</source>
+        <translation type="obsolete">Muse: Arkiv hjälp</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Transport</source>
-        <translation type="unfinished"></translation>
+        <source>MusE: Import Midi</source>
+        <translation type="obsolete">MusE: Importera Midi</translation>
     </message>
     <message>
-        <location line="+55"/>
-        <source>&amp;File</source>
-        <translation type="unfinished">&amp;Arkiv</translation>
+        <source>Add midi file to current project?
+</source>
+        <translation type="obsolete">Lägg midifil till nuvarande projekt?</translation>
     </message>
     <message>
-        <location line="+29"/>
-        <source>&amp;View</source>
-        <translation type="unfinished"></translation>
+        <source>&amp;Add to Project</source>
+        <translation type="obsolete">&amp;Lägg till projekt</translation>
     </message>
     <message>
-        <location line="+19"/>
-        <source>&amp;Midi</source>
-        <translation type="unfinished"></translation>
+        <source>&amp;Replace</source>
+        <translation type="obsolete">&amp;Ersätt</translation>
     </message>
     <message>
-        <location line="+29"/>
-        <source>&amp;Audio</source>
-        <translation type="unfinished">L&amp;jud</translation>
+        <source>reading midifile
+  </source>
+        <translation type="obsolete">läser midifil</translation>
     </message>
     <message>
-        <location line="+14"/>
-        <source>A&amp;utomation</source>
-        <translation type="unfinished"></translation>
+        <source>
+failed: </source>
+        <translation type="obsolete">
+misslyckades:</translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>&amp;Windows</source>
-        <translation type="unfinished"></translation>
+        <source>MusE: load part</source>
+        <translation type="obsolete">MusE: ladda part</translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>MusE Se&amp;ttings</source>
-        <translation type="unfinished"></translation>
+        <source>No track selected for import</source>
+        <translation type="obsolete">Inget spår valt för import</translation>
     </message>
     <message>
-        <location line="+23"/>
-        <source>&amp;Help</source>
-        <translation type="unfinished">&amp;Hjälp</translation>
+        <source>&amp;Yes</source>
+        <translation type="obsolete">&amp;Ja</translation>
     </message>
     <message>
-        <location line="+268"/>
-        <source>Cannot read template</source>
-        <translation type="unfinished">Kan inte läsa mall</translation>
+        <source>&amp;No</source>
+        <translation type="obsolete">&amp;Nej</translation>
     </message>
+</context>
+<context>
+    <name>MusEArranger::Arranger</name>
     <message>
-        <location line="+31"/>
-        <source>File open error</source>
-        <translation type="unfinished">Fel vid öppning av fil</translation>
+        <source>Enable Recording</source>
+        <translation type="obsolete">Slå på Inspelning</translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>File read error</source>
-        <translation type="unfinished">Fel vid läsning av fil</translation>
+        <source>Solo Indicator</source>
+        <translation type="obsolete">Solo-Indikator</translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>Unknown File Format: </source>
-        <translation type="unfinished"></translation>
+        <source>Track Type</source>
+        <translation type="obsolete">Spårtyp</translation>
     </message>
     <message>
-        <location line="+130"/>
-        <location line="+408"/>
-        <location line="+895"/>
-        <source>MusE: Song: </source>
-        <translation type="unfinished">MusE: SÃ¥ng:</translation>
+        <source>Track Name</source>
+        <translation type="obsolete">Spårnamn</translation>
     </message>
     <message>
-        <location line="-1269"/>
-        <source>MusE: load project</source>
-        <translation type="unfinished">MusE: Öppna projekt</translation>
+        <source>Time Lock</source>
+        <translation type="obsolete">Tidlås</translation>
     </message>
     <message>
-        <location line="+14"/>
-        <source>MusE: load template</source>
-        <translation type="unfinished">MusE: ladda mall</translation>
+        <source>Arranger</source>
+        <translation type="obsolete">Arrangerare</translation>
     </message>
     <message>
-        <location line="+62"/>
-        <source>MusE: Write File failed</source>
-        <translation type="unfinished">MusE: Misslyckades med att skriva Fil</translation>
+        <source>Cursor</source>
+        <translation type="obsolete">Markör</translation>
     </message>
     <message>
-        <location line="+38"/>
-        <source>The current Project contains unsaved data
-Save Current Project?</source>
-        <translation type="unfinished">Det nuvarande Projektet innehåller osparade ändringar
-Spara nuvarande Projekt?</translation>
+        <source>Snap</source>
+        <translation type="obsolete">Fäst vid</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location line="+1207"/>
-        <source>S&amp;kip</source>
-        <translation type="unfinished"></translation>
+        <source>Len</source>
+        <translation type="obsolete">Längd</translation>
     </message>
     <message>
-        <location line="-1207"/>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished">&amp;Avbryt</translation>
+        <source>Type</source>
+        <translation type="obsolete">Typ</translation>
     </message>
     <message>
-        <location line="+236"/>
-        <location line="+13"/>
-        <source>MusE: Save As</source>
-        <translation type="unfinished">MusE: Spara Som</translation>
+        <source>midi song type</source>
+        <translation type="obsolete">typ av midsång</translation>
     </message>
     <message>
-        <location line="+57"/>
-        <location line="+161"/>
-        <source>Nothing to edit</source>
-        <translation type="unfinished">Inget att redigera</translation>
+        <source>Pitch</source>
+        <translation type="obsolete">Tonhöjd</translation>
     </message>
     <message>
-        <location line="+474"/>
-        <location line="+10"/>
-        <location line="+31"/>
-        <location line="+34"/>
-        <location line="+8"/>
-        <source>MusE: Bounce to Track</source>
-        <translation type="unfinished">MusE: Bounce till Spår</translation>
+        <source>TrackInfo</source>
+        <translation type="obsolete">Spårinfo</translation>
     </message>
     <message>
-        <location line="-82"/>
-        <source>No wave tracks found</source>
-        <translation type="unfinished"></translation>
+        <source>Track</source>
+        <translation type="obsolete">Spår</translation>
     </message>
+</context>
+<context>
+    <name>MusEArranger::ArrangerView</name>
     <message>
-        <location line="+10"/>
-        <location line="+105"/>
-        <source>No audio output tracks found</source>
-        <translation type="unfinished"></translation>
+        <source>panic</source>
+        <translation type="obsolete">panik</translation>
     </message>
     <message>
-        <location line="-74"/>
-        <source>Select one audio output track,
-and one target wave track</source>
-        <translation type="unfinished"></translation>
+        <source>C&amp;ut</source>
+        <translation type="obsolete">Klipp &amp;ut</translation>
     </message>
     <message>
-        <location line="+34"/>
-        <source>Select one target wave track</source>
-        <translation type="unfinished"></translation>
+        <source>&amp;Copy</source>
+        <translation type="obsolete">&amp;Kopiera</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Select one target wave track,
-and one audio output track</source>
-        <translation type="unfinished"></translation>
+        <source>&amp;Paste</source>
+        <translation type="obsolete">K&amp;listra in</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location line="+25"/>
-        <source>MusE: Bounce to File</source>
-        <translation type="unfinished">MusE: Bounce till fil</translation>
+        <source>Delete Selected Tracks</source>
+        <translation type="obsolete">Ta bort valda spår</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Select one audio output track</source>
-        <translation type="unfinished"></translation>
+        <source>Add Track</source>
+        <translation type="obsolete">Lägg Till Spår</translation>
     </message>
     <message>
-        <location line="+39"/>
-        <source>MusE: Bounce</source>
-        <translation type="unfinished"></translation>
+        <source>Select</source>
+        <translation type="obsolete">Välj</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>set left/right marker for bounce range</source>
-        <translation type="unfinished">sätt vänster och höger markör till bounce-område</translation>
+        <source>Select &amp;All</source>
+        <translation type="obsolete">Markera &amp;Allt</translation>
     </message>
     <message>
-        <location line="+82"/>
-        <source>The current Project contains unsaved data
-Load overwrites current Project:
-Save Current Project?</source>
-        <translation type="unfinished">Det nuvarande Projektet innehåller osparade ändringar
-Öppning skriver över nuvarande Projekt
-Spara nuvarande Projekt?</translation>
+        <source>&amp;Deselect All</source>
+        <translation type="obsolete">A&amp;vmarkera Allt</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location filename="../../muse/importmidi.cpp" line="+86"/>
-        <source>&amp;Abort</source>
-        <translation type="unfinished">&amp;Avbryt</translation>
+        <source>Invert &amp;Selection</source>
+        <translation type="obsolete">Invertera &amp;Markering</translation>
     </message>
     <message>
-        <location filename="../../muse/exportmidi.cpp" line="+143"/>
-        <source>MusE: Export Midi</source>
-        <translation type="unfinished">MusE: Exportera Midi</translation>
+        <source>&amp;Inside Loop</source>
+        <translation type="obsolete">&amp;I Loop</translation>
     </message>
     <message>
-        <location filename="../../muse/help.cpp" line="+50"/>
-        <source>no help found at: </source>
-        <translation type="unfinished">ingen h jälp hittad vid:</translation>
+        <source>&amp;Outside Loop</source>
+        <translation type="obsolete">&amp;Utanför Loop</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>MusE: Open Help</source>
-        <translation type="unfinished">Muse: Arkiv hjälp</translation>
+        <source>All &amp;Parts on Track</source>
+        <translation type="obsolete">Alla &amp;Parter i spår</translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Unable to launch help</source>
+        <source>Score</source>
+        <translation type="obsolete">Partitur</translation>
+    </message>
+    <message>
+        <source>Pianoroll</source>
+        <translation type="obsolete">Pianorulle</translation>
+    </message>
+    <message>
+        <source>Drums</source>
+        <translation type="obsolete">Trummor</translation>
+    </message>
+    <message>
+        <source>List</source>
+        <translation type="obsolete">Lista</translation>
+    </message>
+    <message>
+        <source>Wave</source>
+        <translation type="obsolete">Wave</translation>
+    </message>
+    <message>
+        <source>Mastertrack</source>
+        <translation type="obsolete">Masterspår</translation>
+    </message>
+    <message>
+        <source>Graphic</source>
+        <translation type="obsolete">Grafik</translation>
+    </message>
+    <message>
+        <source>Midi &amp;Transform</source>
+        <translation type="obsolete">Midi &amp;Transform</translation>
+    </message>
+    <message>
+        <source>Global Cut</source>
+        <translation type="obsolete">Globalt klipp</translation>
+    </message>
+    <message>
+        <source>Global Insert</source>
+        <translation type="obsolete">Global insättning</translation>
+    </message>
+    <message>
+        <source>Global Split</source>
+        <translation type="obsolete">Global delning</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="obsolete">&amp;Redigera</translation>
+    </message>
+    <message>
+        <source>&amp;Structure</source>
+        <translation type="obsolete">&amp;Struktur</translation>
+    </message>
+    <message>
+        <source>Functions</source>
+        <translation type="obsolete">Funktioner</translation>
+    </message>
+    <message>
+        <source>Transpose</source>
+        <translation type="obsolete">Transponera</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="obsolete">Ny</translation>
+    </message>
+</context>
+<context>
+    <name>MusEArranger::PartCanvas</name>
+    <message>
+        <source>Cannot copy/move/clone to different Track-Type</source>
+        <translation type="obsolete">Kan inte kopiera/flytta/klona till annan Spårtyp</translation>
+    </message>
+    <message>
+        <source>C&amp;ut</source>
+        <translation type="obsolete">Klipp &amp;ut</translation>
+    </message>
+    <message>
+        <source>&amp;Copy</source>
+        <translation type="obsolete">&amp;Kopiera</translation>
+    </message>
+    <message>
+        <source>rename</source>
+        <translation type="obsolete">byt namn</translation>
+    </message>
+    <message>
+        <source>color</source>
+        <translation type="obsolete">färg</translation>
+    </message>
+    <message>
+        <source>delete</source>
+        <translation type="obsolete">ta bort</translation>
+    </message>
+    <message>
+        <source>split</source>
+        <translation type="obsolete">dela</translation>
+    </message>
+    <message>
+        <source>glue</source>
+        <translation type="obsolete">lim</translation>
+    </message>
+    <message>
+        <source>de-clone</source>
+        <translation type="obsolete">häv kloning</translation>
+    </message>
+    <message>
+        <source>wave edit</source>
+        <translation type="obsolete">wave redigering</translation>
+    </message>
+    <message>
+        <source>MusE: save part</source>
+        <translation type="obsolete">MusE: spara part</translation>
+    </message>
+    <message>
+        <source>Cannot paste: multiple tracks selected</source>
+        <translation type="obsolete">Kan inte klistra in: flera spår valda</translation>
+    </message>
+    <message>
+        <source>Cannot paste: no track selected</source>
+        <translation type="obsolete">Kan inte klistra in: inget spår valt</translation>
+    </message>
+    <message>
+        <source>Can only paste to midi/drum track</source>
+        <translation type="obsolete">Kan endast klistra in på midi/trummspår</translation>
+    </message>
+    <message>
+        <source>Can only paste to wave track</source>
+        <translation type="obsolete">Kan endast klistra till wavespår</translation>
+    </message>
+    <message>
+        <source>Cannot paste: wrong data type</source>
+        <translation type="obsolete">Kan inte klistra in: fel datatyp</translation>
+    </message>
+</context>
+<context>
+    <name>MusEArranger::TList</name>
+    <message>
+        <source>MusE: bad trackname</source>
+        <translation type="obsolete">MusE: dåligt spårnamn</translation>
+    </message>
+    <message>
+        <source>please choose a unique track name</source>
+        <translation type="obsolete">vänligen välj ett unikt spårnamn</translation>
+    </message>
+    <message>
+        <source>Update drummap?</source>
+        <translation type="obsolete">Updatera trum-map?</translation>
+    </message>
+    <message>
+        <source>Do you want to use same port for all instruments in the drummap?</source>
+        <translation type="obsolete">Vill du använda samma port för alla instrument i trum-map:en?</translation>
+    </message>
+    <message>
+        <source>&amp;Yes</source>
+        <translation type="obsolete">&amp;Ja</translation>
+    </message>
+    <message>
+        <source>&amp;No</source>
+        <translation type="obsolete">&amp;Nej</translation>
+    </message>
+    <message>
+        <source>show gui</source>
+        <translation type="obsolete">visa gui</translation>
+    </message>
+    <message>
+        <source>Delete Track</source>
+        <translation type="obsolete">Ta bort spår</translation>
+    </message>
+    <message>
+        <source>Midi</source>
+        <translation type="obsolete">Midi</translation>
+    </message>
+    <message>
+        <source>Drum</source>
+        <translation type="obsolete">Trumma</translation>
+    </message>
+    <message>
+        <source>Do you want to use same port and channel for all instruments in the drummap?</source>
+        <translation type="obsolete">Vill du använda samma port och kanal för alla instrument i trummap:en?</translation>
+    </message>
+</context>
+<context>
+    <name>MusECore::Song</name>
+    <message>
+        <location filename="../../muse/song.cpp" line="+2233"/>
+        <source>Jack shutdown!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>For some reason MusE has to launch the default
-browser on your machine.</source>
+        <source>Jack has detected a performance problem which has lead to
+MusE being disconnected.
+This could happen due to a number of reasons:
+- a performance issue with your particular setup.
+- a bug in MusE (or possibly in another connected software).
+- a random hiccup which might never occur again.
+- jack was voluntary stopped by you or someone else
+- jack crashed
+If there is a persisting problem you are much welcome to discuss it
+on the MusE mailinglist.
+(there is information about joining the mailinglist on the MusE
+ homepage which is available through the help menu)
+
+To proceed check the status of Jack and try to restart it and then .
+click on the Restart button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/importmidi.cpp" line="-12"/>
-        <source>MusE: Import Midi</source>
-        <translation type="unfinished">MusE: Importera Midi</translation>
+        <location line="+186"/>
+        <location line="+179"/>
+        <source>Automation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-177"/>
+        <source>previous event</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>next event</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
-        <source>Add midi file to current project?
-</source>
-        <translation type="unfinished">Lägg midifil till nuvarande projekt?</translation>
+        <location line="+169"/>
+        <source>set event</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>&amp;Add to Project</source>
-        <translation type="unfinished">&amp;Lägg till projekt</translation>
+        <location line="-167"/>
+        <location line="+169"/>
+        <source>add event</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>&amp;Replace</source>
-        <translation type="unfinished">&amp;Ersätt</translation>
+        <location line="-165"/>
+        <location line="+170"/>
+        <source>erase event</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
-        <source>reading midifile
-  </source>
-        <translation type="unfinished">läser midifil</translation>
+        <location line="-166"/>
+        <source>erase range</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>
-failed: </source>
-        <translation type="unfinished">
-misslyckades:</translation>
+        <location line="+4"/>
+        <source>clear automation</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+356"/>
-        <source>Import part is only valid for midi and wave tracks!</source>
+        <location line="+33"/>
+        <source>Clear all controller events?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>MusE: load part</source>
-        <translation type="unfinished">MusE: ladda part</translation>
+        <location line="+0"/>
+        <source>&amp;Ok</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <source>No track selected for import</source>
-        <translation type="unfinished">Inget spår valt för import</translation>
+        <location line="+0"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Avbryt</translation>
     </message>
     <message>
-        <location line="+121"/>
-        <source> out of </source>
+        <location line="+878"/>
+        <source>MusE - external script failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source> parts</source>
+        <source>MusE was unable to launch the script, error message:
+%1</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::Appearance</name>
     <message>
-        <location line="+0"/>
-        <source> part</source>
+        <location filename="../../muse/appearance.cpp" line="+132"/>
+        <source>Main application font, and default font for any
+ controls not defined here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source> could not be imported.
-Likely the track is the wrong type.</source>
+        <source>For small controls like mixer strips.
+Also timescale small numbers, arranger part name overlay,
+ and effects rack.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../muse/wave.cpp" line="-6"/>
-        <source>to import an audio file you have first to selecta wave track</source>
+        <location line="+1"/>
+        <source>Midi track info panel. Transport controls.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
-        <source>Import Wavefile</source>
+        <location line="+1"/>
+        <source>Controller graph and S/X buttons. Large numbers for time
+ and tempo scale, and time signature.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>This wave file has a samplerate of %1,
-as opposed to current setting %2.
-Do you still want to import it?</source>
+        <source>Time scale markers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>&amp;Yes</source>
-        <translation type="unfinished">&amp;Ja</translation>
+        <location line="+1"/>
+        <source>List editor: meta event edit dialog multi-line edit box.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mixer label font. Auto-font-sizing up to chosen font size.
+Word-breaking but only with spaces.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Maximum mixer label auto-font-sizing font size.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Global opacity (opposite of transparency).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Standard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Custom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+624"/>
+        <source>MusE: load image</source>
+        <translation type="unfinished">MusE: ladda bild</translation>
+    </message>
+    <message>
+        <location line="+334"/>
+        <source>Select style sheet</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
-        <source>&amp;No</source>
-        <translation type="unfinished">&amp;Nej</translation>
+        <source>Qt style sheets (*.qss)</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MusEArranger::Arranger</name>
+    <name>MusEGui::Arranger</name>
     <message>
-        <location filename="../../muse/arranger/arranger.cpp" line="-74"/>
+        <location filename="../../muse/arranger/arranger.cpp" line="+81"/>
         <source>Enable Recording</source>
         <translation type="unfinished">Slå på Inspelning</translation>
     </message>
@@ -10548,7 +9476,17 @@ Right-click to show GUI.</source>
         <translation type="unfinished">Markör</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+10"/>
+        <source>Off</source>
+        <translation type="unfinished">Av</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Bar</source>
+        <translation type="unfinished">Takt</translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Snap</source>
         <translation type="unfinished">Fäst vid</translation>
     </message>
@@ -10682,7 +9620,7 @@ Right-click to show GUI.</source>
     </message>
 </context>
 <context>
-    <name>MusEArranger::ArrangerView</name>
+    <name>MusEGui::ArrangerView</name>
     <message>
         <location filename="../../muse/arranger/arrangerview.cpp" line="+83"/>
         <source>MusE: Arranger</source>
@@ -10704,7 +9642,7 @@ Right-click to show GUI.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+31"/>
         <source>C&amp;ut</source>
         <translation type="unfinished">Klipp &amp;ut</translation>
     </message>
@@ -10810,12 +9748,12 @@ Right-click to show GUI.</source>
     </message>
     <message>
         <location line="+3"/>
-        <source>all parts in one staff</source>
+        <source>all tracks in one staff</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>one staff per part</source>
+        <source>one staff per track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -10875,6 +9813,21 @@ Right-click to show GUI.</source>
         <translation type="unfinished">Global delning</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Global Cut - selected tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Global Insert - selected tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Global Split - selected tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+8"/>
         <source>&amp;Edit</source>
         <translation type="unfinished">&amp;Redigera</translation>
@@ -10885,7 +9838,7 @@ Right-click to show GUI.</source>
         <translation type="unfinished">&amp;Struktur</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+11"/>
         <source>Functions</source>
         <translation type="unfinished">Funktioner</translation>
     </message>
@@ -10945,485 +9898,1106 @@ Right-click to show GUI.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+308"/>
+        <location line="+314"/>
         <location line="+6"/>
         <source>New</source>
         <translation type="unfinished">Ny</translation>
     </message>
 </context>
 <context>
-    <name>MusEArranger::PartCanvas</name>
+    <name>MusEGui::AudioMixerApp</name>
     <message>
-        <location filename="../../muse/arranger/pcanvas.cpp" line="+346"/>
-        <source>Cannot copy/move/clone to different Track-Type</source>
-        <translation type="unfinished">Kan inte kopiera/flytta/klona till annan Spårtyp</translation>
+        <location filename="../../muse/mixer/amixer.cpp" line="+171"/>
+        <source>&amp;Create</source>
+        <translation type="unfinished">&amp;Skapa</translation>
     </message>
     <message>
-        <location line="+261"/>
-        <source>C&amp;ut</source>
-        <translation type="unfinished">Klipp &amp;ut</translation>
+        <location line="+4"/>
+        <source>&amp;View</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>&amp;Copy</source>
-        <translation type="unfinished">&amp;Kopiera</translation>
+        <location line="+1"/>
+        <source>Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Show Midi Tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show Drum Tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show Wave Tracks</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+6"/>
-        <source>s&amp;elect </source>
+        <source>Show Inputs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>clones</source>
+        <location line="+1"/>
+        <source>Show Outputs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>rename</source>
-        <translation type="unfinished">byt namn</translation>
+        <location line="+1"/>
+        <source>Show Groups</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>color</source>
-        <translation type="unfinished">färg</translation>
+        <location line="+1"/>
+        <source>Show Auxs</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>delete</source>
-        <translation type="unfinished">ta bort</translation>
+        <location line="+1"/>
+        <source>Show Synthesizers</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::AudioStrip</name>
     <message>
-        <location line="+2"/>
-        <source>split</source>
-        <translation type="unfinished">dela</translation>
+        <location filename="../../muse/mixer/astrip.cpp" line="+667"/>
+        <source>panorama</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>glue</source>
-        <translation type="unfinished">lim</translation>
+        <source>aux send level</source>
+        <translation type="unfinished">aux send nivå</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Pan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+87"/>
+        <source>1/2 channel</source>
+        <translation type="unfinished">1/2 kanal</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Pre</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>pre fader - post fader</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+70"/>
+        <source>dB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>mute</source>
+        <translation type="unfinished">tysta</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>record downmix</source>
+        <translation type="unfinished">spela in nermixning</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>de-clone</source>
-        <translation type="unfinished">häv kloning</translation>
+        <location line="+4"/>
+        <source>solo mode</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
         <location line="+7"/>
-        <location line="+7"/>
-        <source>save part to disk</source>
+        <source>off</source>
+        <translation type="unfinished">av</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>iR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-2"/>
-        <source>wave edit</source>
-        <translation type="unfinished">wave redigering</translation>
+        <location line="+2"/>
+        <source>input routing</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>file info</source>
+        <location line="+8"/>
+        <source>oR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
-        <source>MusE: save part</source>
-        <translation type="unfinished">MusE: spara part</translation>
+        <location line="+2"/>
+        <source>output routing</source>
+        <translation type="unfinished">utgångsrouting</translation>
     </message>
     <message>
-        <location line="+18"/>
-        <source>Part name</source>
+        <location line="+13"/>
+        <source>Off</source>
+        <translation type="unfinished">Av</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Read</source>
+        <translation type="unfinished">Läs</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Touch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Files</source>
+        <location line="+1"/>
+        <source>Write</source>
+        <translation type="unfinished">Skriv</translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>automation type</source>
+        <translation type="unfinished">automationstyp</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::BigTime</name>
+    <message>
+        <location filename="../../muse/widgets/bigtime.cpp" line="+62"/>
+        <source>format display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2090"/>
-        <source> out of </source>
+        <location line="+17"/>
+        <source>bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source> parts</source>
+        <source>beat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source> part</source>
+        <location line="+1"/>
+        <location line="+6"/>
+        <source>tick</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-4"/>
+        <source>minute</source>
+        <translation type="unfinished">minut</translation>
+    </message>
+    <message>
         <location line="+1"/>
-        <source> could not be pasted.
-Likely the selected track is the wrong type.</source>
+        <source>second</source>
+        <translation type="unfinished">sekund</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+3"/>
+        <source>frame</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
-        <source>Cannot paste: multiple tracks selected</source>
-        <translation type="unfinished">Kan inte klistra in: flera spår valda</translation>
+        <location line="-2"/>
+        <source>subframe</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>MusE: Bigtime</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::ClipListEdit</name>
+    <message>
+        <location filename="../../muse/cliplist/cliplist.cpp" line="+130"/>
+        <source>MusE: Clip List Editor</source>
+        <translation type="unfinished">MusE: Clip-listredigerare</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Undo/Redo tools</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>panic</source>
+        <translation type="unfinished">panik</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>transport</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Window &amp;Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::ComboQuant</name>
+    <message>
+        <location filename="../../muse/widgets/comboQuant.cpp" line="+40"/>
+        <location line="+1"/>
+        <location line="+1"/>
+        <source>Off</source>
+        <translation type="unfinished">Av</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::CtrlPanel</name>
+    <message>
+        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="+91"/>
+        <source>S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>select controller</source>
+        <translation type="unfinished">välj controller</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>X</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>remove panel</source>
+        <translation type="unfinished">ta bort panel</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>manual adjust</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
-        <source>Cannot paste: no track selected</source>
-        <translation type="unfinished">Kan inte klistra in: inget spår valt</translation>
+        <source>double click on/off</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Can only paste to midi/drum track</source>
-        <translation type="unfinished">Kan endast klistra in på midi/trummspår</translation>
+        <location line="+1"/>
+        <source>off</source>
+        <translation type="unfinished">av</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>Can only paste to wave track</source>
-        <translation type="unfinished">Kan endast klistra till wavespår</translation>
+        <location line="+443"/>
+        <location line="+236"/>
+        <source>Velocity</source>
+        <translation type="unfinished">Hastighet</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>Can only paste to midi or wave track</source>
+        <location line="-186"/>
+        <source>add new ...</source>
+        <translation type="unfinished">lägg till ny...</translation>
+    </message>
+    <message>
+        <location line="+163"/>
+        <location line="+58"/>
+        <source>Instrument-defined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Cannot paste: wrong data type</source>
-        <translation type="unfinished">Kan inte klistra in: fel datatyp</translation>
+        <location line="-43"/>
+        <location line="+21"/>
+        <source>Add ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-17"/>
+        <source>Others</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Edit instrument ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Common Controls</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MusEArranger::TList</name>
+    <name>MusEGui::DrumEdit</name>
     <message>
-        <location filename="../../muse/arranger/tlist.cpp" line="+362"/>
-        <source>&lt;none&gt;</source>
+        <location filename="../../muse/midiedit/drumedit.cpp" line="+114"/>
+        <location line="+21"/>
+        <source>mute instrument</source>
+        <translation type="unfinished">tysta instrument</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>sound name</source>
+        <translation type="unfinished">ljudnamn</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>volume percent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
-        <source>no clef</source>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>quantisation</source>
+        <translation type="unfinished">kvantisering</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>this input note triggers the sound</source>
+        <translation type="unfinished">denna in-not triggar ljudet</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>note length</source>
+        <translation type="unfinished">notlängd</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>this is the note which is played</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Treble</source>
+        <location line="-20"/>
+        <source>output channel (hold ctl to affect all rows)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Bass</source>
+        <location line="+1"/>
+        <source>output port (hold ctl to affect all rows)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Grand</source>
+        <location line="+1"/>
+        <location line="+21"/>
+        <source>shift + control key: draw velocity level 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>MusE: bad trackname</source>
-        <translation type="unfinished">MusE: dåligt spårnamn</translation>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>control key: draw velocity level 2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>shift key: draw velocity level 3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location line="+21"/>
+        <source>draw velocity level 4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-5"/>
+        <source>output channel (ctl: affect all rows)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>please choose a unique track name</source>
-        <translation type="unfinished">vänligen välj ett unikt spårnamn</translation>
+        <source>output port (ctl: affect all rows)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+157"/>
-        <location line="+1143"/>
-        <source>Update drummap?</source>
-        <translation type="unfinished">Updatera trum-map?</translation>
+        <location line="+43"/>
+        <source>&amp;File</source>
+        <translation type="unfinished">&amp;Arkiv</translation>
     </message>
     <message>
-        <location line="-1142"/>
-        <source>Do you want to use same port for all instruments in the drummap?</source>
-        <translation type="unfinished">Vill du använda samma port för alla instrument i trum-map:en?</translation>
+        <location line="+2"/>
+        <source>Load Map</source>
+        <translation type="unfinished">Ladda mappning</translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+1143"/>
-        <source>&amp;Yes</source>
-        <translation type="unfinished">&amp;Ja</translation>
+        <source>Save Map</source>
+        <translation type="unfinished">Spara Mappning</translation>
     </message>
     <message>
-        <location line="-1143"/>
-        <location line="+1143"/>
-        <source>&amp;No</source>
-        <translation type="unfinished">&amp;Nej</translation>
+        <location line="+1"/>
+        <source>Reset GM Map</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1066"/>
-        <location line="+55"/>
-        <source>show gui</source>
-        <translation type="unfinished">visa gui</translation>
+        <location line="+10"/>
+        <source>&amp;Edit</source>
+        <translation type="unfinished">&amp;Redigera</translation>
     </message>
     <message>
-        <location line="-46"/>
-        <location line="+55"/>
-        <source>show native gui</source>
+        <location line="+4"/>
+        <source>Cut</source>
+        <translation type="unfinished">Klipp ut</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy</source>
+        <translation type="unfinished">Kopiera</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy events in range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+338"/>
-        <source>Treble clef</source>
+        <location line="+1"/>
+        <source>Paste</source>
+        <translation type="unfinished">Klistra in</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Paste (with Dialog)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Delete Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>&amp;Select</source>
+        <translation type="unfinished">&amp;Välj</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select All</source>
+        <translation type="unfinished">Välj Allt</translation>
+    </message>
+    <message>
         <location line="+1"/>
-        <source>Bass clef</source>
+        <source>Select None</source>
+        <translation type="unfinished">Välj Ingen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Invert</source>
+        <translation type="unfinished">Invertera</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Inside Loop</source>
+        <translation type="unfinished">I loop</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Outside Loop</source>
+        <translation type="unfinished">Utanför loop</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Previous Part</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Grand Staff</source>
+        <source>Next Part</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
-        <source>Viewable automation</source>
+        <location line="+19"/>
+        <source>Fu&amp;nctions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+131"/>
-        <source>Delete Track</source>
-        <translation type="unfinished">Ta bort spår</translation>
+        <location line="+4"/>
+        <source>Re-order list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Set Fixed Length</source>
+        <translation type="unfinished">Sätt fast längd</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Track Comment</source>
+        <source>Modify Velocity</source>
+        <translation type="unfinished">Modifiera Velocity</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Crescendo/Decrescendo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantize</source>
+        <translation type="unfinished">Kvantisera</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Erase Event</source>
+        <translation type="unfinished">Ta bort Händelse</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Move Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Delete Overlaps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>&amp;Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
-        <source>Insert Track</source>
+        <source>Window &amp;Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+445"/>
-        <source>Midi</source>
-        <translation type="unfinished">Midi</translation>
+        <location line="+11"/>
+        <source>Drum tools</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Drum</source>
-        <translation type="unfinished">Trumma</translation>
+        <location line="+4"/>
+        <source>Load Drummap</source>
+        <translation type="unfinished">Ladda trummappning</translation>
     </message>
     <message>
-        <location line="+50"/>
-        <source>Do you want to use same port and channel for all instruments in the drummap?</source>
-        <translation type="unfinished">Vill du använda samma port och kanal för alla instrument i trummap:en?</translation>
+        <location line="+6"/>
+        <source>Store Drummap</source>
+        <translation type="unfinished">Spara trummappning</translation>
     </message>
-</context>
-<context>
-    <name>MusEDialog::PasteDialog</name>
-    <message numerus="yes">
-        <location filename="../../muse/widgets/pastedialog.cpp" line="+81"/>
-        <source>%n quarter(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-        </translation>
+    <message>
+        <location line="+12"/>
+        <source>Step Record</source>
+        <translation type="unfinished">Stegvis inspelning</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>quarter</source>
+        <location line="+6"/>
+        <source>Midi Input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>quarters</source>
+        <location line="+9"/>
+        <source>cursor tools</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MusEDialog::PasteEventsDialog</name>
-    <message numerus="yes">
-        <location filename="../../muse/widgets/pasteeventsdialog.cpp" line="+95"/>
-        <source>%n quarter(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-        </translation>
+    <message>
+        <location line="+5"/>
+        <source>Set step size for cursor edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>panic</source>
+        <translation type="unfinished">panik</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>transport</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>ctrl</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <source>quarter</source>
+        <source>Add Controller View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>quarters</source>
+        <location line="+57"/>
+        <source>M</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MusEMixer::AudioMixerApp</name>
     <message>
-        <location filename="../../muse/mixer/amixer.cpp" line="+171"/>
-        <source>&amp;Create</source>
-        <translation type="unfinished">&amp;Skapa</translation>
+        <location line="+1"/>
+        <source>Sound</source>
+        <translation type="unfinished">Ljud</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>&amp;View</source>
+        <location line="+1"/>
+        <source>Vol</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Routing</source>
+        <source>QNT</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Show Midi Tracks</source>
+        <location line="+1"/>
+        <source>E-Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Show Drum Tracks</source>
+        <source>Len</source>
+        <translation type="unfinished">Längd</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>A-Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Show Wave Tracks</source>
+        <source>Ch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Show Inputs</source>
+        <location line="+1"/>
+        <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Show Outputs</source>
+        <source>LV1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Show Groups</source>
+        <source>LV2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Show Auxs</source>
+        <source>LV3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Show Synthesizers</source>
+        <source>LV4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+377"/>
+        <source>Muse: Load Drum Map</source>
+        <translation type="unfinished">Muse: Ladda trummappning</translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>MusE: Store Drum Map</source>
+        <translation type="unfinished">MusE: Spara trummappning</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Drum map</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reset the drum map with GM defaults?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MusEMixer::AudioStrip</name>
+    <name>MusEGui::EditCAfterDialog</name>
     <message>
-        <location filename="../../muse/mixer/astrip.cpp" line="+645"/>
-        <source>panorama</source>
+        <location filename="../../muse/liste/editevent.cpp" line="+445"/>
+        <source>MusE: Enter Channel Aftertouch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>aux send level</source>
-        <translation type="unfinished">aux send nivå</translation>
+        <source>Time Position</source>
+        <translation type="unfinished">Tidsposition</translation>
     </message>
     <message>
-        <location line="+23"/>
-        <source>Pan</source>
+        <location line="+4"/>
+        <source>Pressure</source>
+        <translation type="unfinished">Tryck</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::EditEventDialog</name>
+    <message>
+        <location line="-261"/>
+        <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
-        <source>1/2 channel</source>
-        <translation type="unfinished">1/2 kanal</translation>
+        <location line="+2"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Avbryt</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::EditInstrument</name>
+    <message>
+        <location filename="../../muse/instruments/editinstrument.cpp" line="+312"/>
+        <location line="+34"/>
+        <source>MusE: Create file failed</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+33"/>
+        <source>MusE: Write File failed</source>
+        <translation type="unfinished">MusE: Misslyckades med att skriva Fil</translation>
+    </message>
+    <message>
+        <location line="+32"/>
         <location line="+12"/>
-        <source>Pre</source>
+        <location line="+280"/>
+        <location line="+12"/>
+        <source>MusE:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-303"/>
+        <location line="+292"/>
+        <source>The user instrument directory
+%1
+does not exist yet. Create it now?
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-291"/>
+        <location line="+292"/>
+        <source>(You can change the user instruments directory at Settings-&gt;Global Settings-&gt;Midi)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-282"/>
+        <location line="+292"/>
+        <source>Unable to create user instrument directory &apos;%1&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-244"/>
+        <location line="+266"/>
+        <source>MusE: Save Instrument Definition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-265"/>
+        <location line="+266"/>
+        <source>Instrument Definition (*.idf)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-154"/>
+        <location line="+29"/>
+        <source>MusE: Save instrument as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-29"/>
+        <source>Enter a new unique instrument name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>The user instrument &apos;%1&apos; already exists. This will overwrite its .idf instrument file.
+Are you sure?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+526"/>
+        <source>MusE: Bad instrument name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>pre fader - post fader</source>
+        <source>Please choose a unique instrument name.
+(The name might be used by a hidden instrument.)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
-        <source>dB</source>
+        <location line="+136"/>
+        <source>MusE: Bad patch name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
-        <source>record</source>
+        <location line="+1"/>
+        <source>Please choose a unique patch name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
-        <source>mute</source>
-        <translation type="unfinished">tysta</translation>
+        <location line="+22"/>
+        <source>MusE: Bad patchgroup name</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
-        <source>record downmix</source>
-        <translation type="unfinished">spela in nermixning</translation>
+        <location line="+1"/>
+        <source>Please choose a unique patchgroup name</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location line="+4"/>
-        <source>solo mode</source>
+        <location line="+526"/>
+        <source>MusE: Bad controller name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>Please choose a unique controller name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1287"/>
         <location line="+12"/>
-        <source>off</source>
-        <translation type="unfinished">av</translation>
+        <source>MusE: Cannot add common controller</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
-        <source>iR</source>
+        <location line="-11"/>
+        <source>A controller named &apos;%1&apos; already exists.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>input routing</source>
+        <location line="+12"/>
+        <source>A controller number %1 already exists.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>oR</source>
+        <location line="+283"/>
+        <location line="+5"/>
+        <source>MusE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-4"/>
+        <location line="+5"/>
+        <source>The current Instrument contains unsaved data
+Save Current Instrument?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-3"/>
+        <location line="+5"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished">&amp;Spara</translation>
+    </message>
+    <message>
+        <location line="-5"/>
+        <location line="+5"/>
+        <source>&amp;Nosave</source>
+        <translation type="unfinished">&amp;Inte spara</translation>
+    </message>
+    <message>
+        <location line="-5"/>
+        <source>&amp;Abort</source>
+        <translation type="unfinished">&amp;Avbryt</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::EditMetaDialog</name>
+    <message>
+        <location filename="../../muse/liste/editevent.cpp" line="+118"/>
+        <source>MusE: Enter Meta Event</source>
+        <translation type="unfinished">MusE: Mata in Meta Händelse</translation>
+    </message>
+    <message>
         <location line="+2"/>
-        <source>output routing</source>
-        <translation type="unfinished">utgångsrouting</translation>
+        <source>Time Position</source>
+        <translation type="unfinished">Tidsposition</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Meta Type</source>
+        <translation type="unfinished">Metatyp</translation>
     </message>
     <message>
         <location line="+12"/>
-        <source>Off</source>
-        <translation type="unfinished">Av</translation>
+        <source>Enter Hex</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::EditPAfterDialog</name>
+    <message>
+        <location line="+176"/>
+        <source>MusE: Enter Poly Aftertouch</source>
+        <translation type="unfinished">MusE: Mata in Poly Aftertouch</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Time Position</source>
+        <translation type="unfinished">Tidsposition</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Pitch</source>
+        <translation type="unfinished">Tonhöjd</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Pressure</source>
+        <translation type="unfinished">Tryck</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::EditToolBar</name>
+    <message>
+        <location filename="../../muse/widgets/tools.cpp" line="+33"/>
+        <source>select Pointer Tool:
+with the pointer tool you can:
+  select parts
+  move parts
+  copy parts</source>
+        <translation type="unfinished">välj pek-verktyg:
+med pekverktyget kan du:
+ välja parter
+ flytta parter
+ kopiera parter</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>select Pencil Tool:
+with the pencil tool you can:
+  create new parts
+  modify length of parts</source>
+        <translation type="unfinished">välj Pennverktyg:
+med pennverktyget kan du:
+  skapa parter
+  ändra längden på parter
+</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>select Delete Tool:
+with the delete tool you can delete parts</source>
+        <translation type="unfinished">välj Suddverktyg:
+med suddverktyget kan du ta bort parter</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>select Cut Tool:
+with the cut tool you can split a part</source>
+        <translation type="unfinished">välj Delningsverktyg: 
+med delningsverktyget kan du dela på parter</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>select Glue Tool:
+with the glue tool you can glue two parts</source>
+        <translation type="unfinished">välj Limverktyg:
+med limverktyget kan du limma ihop två parter</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>select Score Tool:
+</source>
+        <translation type="unfinished">välj Partiturverktyg:
+</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Read</source>
-        <translation type="unfinished">Läs</translation>
+        <source>select Quantize Tool:
+insert display quantize event</source>
+        <translation type="unfinished">välj Kvantiseringsverktyg:
+sätt in kvantiseringshändelser</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>select Drawing Tool</source>
+        <translation type="unfinished">välj Ritverktyg
+</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Touch</source>
+        <source>select Muting Tool:
+click on part to mute/unmute</source>
+        <translation type="unfinished">välj Tystningsverktyg:
+klicka på en part för att Tysta/Avtysta</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Manipulate automation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Write</source>
-        <translation type="unfinished">Skriv</translation>
+        <source>Cursor tool</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>automation type</source>
-        <translation type="unfinished">automationstyp</translation>
+        <location line="+3"/>
+        <source>pointer</source>
+        <translation type="unfinished">pekare</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>pencil</source>
+        <translation type="unfinished">penna</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>eraser</source>
+        <translation type="unfinished">sudd</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>cutter</source>
+        <translation type="unfinished">delare</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>score</source>
+        <translation type="unfinished">partitur</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>glue</source>
+        <translation type="unfinished">lim</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>quantize</source>
+        <translation type="unfinished">kvantisering</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>draw</source>
+        <translation type="unfinished">rita</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>mute parts</source>
+        <translation type="unfinished">tysta parter</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>edit automation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Edit Tools</source>
+        <translation type="unfinished">Redigeringsverktyg</translation>
     </message>
 </context>
 <context>
-    <name>MusEMixer::EffectRack</name>
+    <name>MusEGui::EffectRack</name>
     <message>
         <location filename="../../muse/mixer/rack.cpp" line="+193"/>
         <source>effect rack</source>
@@ -11491,193 +11065,835 @@ Likely the selected track is the wrong type.</source>
     </message>
 </context>
 <context>
-    <name>MusEMixer::MidiStrip</name>
+    <name>MusEGui::GlobalSettingsConfig</name>
     <message>
-        <location filename="../../muse/mixer/mstrip.cpp" line="+109"/>
-        <location line="+121"/>
-        <location line="+158"/>
-        <source>off</source>
-        <translation type="unfinished">av</translation>
+        <location filename="../../muse/widgets/genset.cpp" line="+561"/>
+        <source>Selects instruments directory</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::Header</name>
     <message>
-        <location line="-278"/>
-        <location line="+122"/>
-        <source>double click on/off</source>
+        <location filename="../../muse/widgets/header.cpp" line="+164"/>
+        <source>Track Info Columns</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MusEGui::LMaster</name>
+    <message>
+        <location filename="../../muse/master/lmaster.cpp" line="+158"/>
+        <source>MusE: Mastertrack</source>
+        <translation type="unfinished">MusE: Masterspår</translation>
+    </message>
     <message>
-        <location line="-42"/>
-        <source>VariationSend</source>
+        <location line="+13"/>
+        <source>&amp;Edit</source>
+        <translation type="unfinished">&amp;Redigera</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Insert Tempo</source>
+        <translation type="unfinished">Sätt in tempo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert Signature</source>
+        <translation type="unfinished">Sätt in signatur</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Var</source>
+        <location line="+1"/>
+        <source>Edit Positon</source>
+        <translation type="unfinished">Editera position</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit Value</source>
+        <translation type="unfinished">Editera värde</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Delete Event</source>
+        <translation type="unfinished">Ta bort event</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Window &amp;Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Undo/Redo tools</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit tools</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tempo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>ReverbSend</source>
+        <source>Timesig</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Rev</source>
+        <location line="+1"/>
+        <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>ChorusSend</source>
+        <source>new tempo</source>
+        <translation type="unfinished">nytt tempo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>new signature</source>
+        <translation type="unfinished">ny signatur</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>new key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Cho</source>
+        <location line="+5"/>
+        <source>panic</source>
+        <translation type="unfinished">panik</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>transport</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
-        <source>dB</source>
+        <location line="+16"/>
+        <source>Meter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>Time</source>
+        <translation type="unfinished">Tid</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Type</source>
+        <translation type="unfinished">Typ</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Value</source>
+        <translation type="unfinished">Värde</translation>
+    </message>
+    <message>
+        <location line="+391"/>
+        <source>Reposition of the initial tempo and signature events is not allowed</source>
+        <translation type="unfinished">Ompositionering av initalt tempo och/eller signaturevent är inte tillåtet</translation>
+    </message>
+    <message>
         <location line="+54"/>
-        <source>Pan/Balance</source>
-        <translation type="unfinished">Pan/Balans</translation>
+        <source>MusE: List Editor</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Pan</source>
+        <location line="+1"/>
+        <source>Input error, conversion not OK or value out of range</source>
+        <translation type="unfinished">Inmatningsfel, konvertering felaktig eller värde utanför område</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Reposition of tempo and signature events to start position is not allowed!</source>
+        <translation type="unfinished">Ompositionering av tempo och/eller signaturevent till startposition är inte tillåtet</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::ListEdit</name>
+    <message>
+        <location filename="../../muse/liste/listedit.cpp" line="+477"/>
+        <source>insert Note</source>
+        <translation type="unfinished">Mata in Not</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>insert SysEx</source>
+        <translation type="unfinished">Mata in SysEx</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>insert Ctrl</source>
+        <translation type="unfinished">Mata in Ctrl</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>insert Meta</source>
+        <translation type="unfinished">Mata in Meta</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>insert Channel Aftertouch</source>
+        <translation type="unfinished">Mata in Aftertouch för kanal</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>insert Poly Aftertouch</source>
+        <translation type="unfinished">Mata in Poly Aftertouch</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&amp;Edit</source>
+        <translation type="unfinished">&amp;Redigera</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Cut</source>
+        <translation type="unfinished">Klipp ut</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Copy</source>
+        <translation type="unfinished">Kopiera</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Paste</source>
+        <translation type="unfinished">Klistra in</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Delete Events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>record</source>
+        <location line="+10"/>
+        <source>Window &amp;Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>mute</source>
-        <translation type="unfinished">tysta</translation>
+        <location line="+7"/>
+        <source>Undo/Redo tools</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>solo mode</source>
+        <location line="+4"/>
+        <source>Insert tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+67"/>
-        <source>iR</source>
+        <location line="+4"/>
+        <source>panic</source>
+        <translation type="unfinished">panik</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>transport</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>input routing</source>
+        <location line="+22"/>
+        <source>Tick</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>oR</source>
+        <location line="+1"/>
+        <source>Bar</source>
+        <translation type="unfinished">Takt</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Type</source>
+        <translation type="unfinished">Typ</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>output routing</source>
-        <translation type="unfinished">utgångsrouting</translation>
+        <location line="+1"/>
+        <source>Val A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Val B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Val C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Len</source>
+        <translation type="unfinished">Längd</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Comment</source>
+        <translation type="unfinished">Kommentar</translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::BigTime</name>
+    <name>MusEGui::MPConfig</name>
     <message>
-        <location filename="../../muse/widgets/bigtime.cpp" line="+60"/>
-        <source>format display</source>
+        <location filename="../../muse/confmport.cpp" line="+101"/>
+        <location line="+176"/>
+        <source>Default input connections</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>bar</source>
+        <location line="-175"/>
+        <location line="+66"/>
+        <source>Are you sure you want to apply to all existing midi tracks now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>beat</source>
+        <location line="-1"/>
+        <location line="+148"/>
+        <source>Default output connections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-37"/>
+        <location line="+38"/>
+        <source>Setting will apply to new midi tracks.
+Do you want to apply to all existing midi tracks now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>MusE: bad device name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>please choose a unique device name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+72"/>
+        <location line="+859"/>
+        <source>in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-836"/>
+        <location line="+827"/>
+        <source>out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-771"/>
+        <source>Show first aliases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+6"/>
-        <source>tick</source>
+        <source>Show second aliases</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-4"/>
-        <source>minute</source>
-        <translation type="unfinished">minut</translation>
+        <location line="+130"/>
+        <location line="+42"/>
+        <source>Toggle all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-38"/>
+        <location line="+43"/>
+        <source>Change all tracks now</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Create Jack device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+229"/>
+        <location line="+29"/>
+        <source>Port Number</source>
+        <translation type="unfinished">Portnummer</translation>
+    </message>
+    <message>
+        <location line="-28"/>
+        <source>Enable gui</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>second</source>
-        <translation type="unfinished">sekund</translation>
+        <source>Enable reading</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable writing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Port instrument</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi device name. Click to edit (Jack)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Connections from Jack Midi outputs</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Connections to Jack Midi inputs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Auto-connect these channels to new midi tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+3"/>
-        <source>frame</source>
+        <source>Auto-connect new midi tracks to these channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-2"/>
-        <source>subframe</source>
+        <location line="+2"/>
+        <source>Auto-connect new midi tracks to this channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <source>MusE: Bigtime</source>
+        <location line="+2"/>
+        <source>Device state</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Enable gui for device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Enable reading from device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Enable writing to device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Name of the midi device associated with this port number. Click to edit Jack midi name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Instrument connected to port</source>
+        <translation type="unfinished">Instrument kopplat till denna port</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Connections from Jack Midi output ports</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Connections to Jack Midi input ports</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Auto-connect these channels, on this port, to new midi tracks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Connect new midi tracks to these channels, on this port.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Connect new midi tracks to this channel, on this port.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>State: result of opening the device</source>
+        <translation type="unfinished">Status: resultat av öppning av enhet</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>GUI</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>I</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>O</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Instrument</source>
+        <translation type="unfinished">Instrument</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Device Name</source>
+        <translation type="unfinished">Enhetsnamn</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>In routes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Out routes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Def in ch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Def out ch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>State</source>
+        <translation type="unfinished">Status</translation>
+    </message>
+    <message>
+        <location line="+84"/>
+        <source>&lt;unknown&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+87"/>
+        <location line="+71"/>
+        <source>&lt;none&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::EditToolBar</name>
+    <name>MusEGui::MTScale</name>
     <message>
-        <location filename="../../muse/widgets/tools.cpp" line="+17"/>
-        <source>Edit Tools</source>
-        <translation type="unfinished">Redigeringsverktyg</translation>
+        <location filename="../../muse/widgets/mtscale.cpp" line="+44"/>
+        <source>bar scale</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::GlobalSettingsConfig</name>
+    <name>MusEGui::MTScaleFlo</name>
     <message>
-        <location filename="../../muse/widgets/genset.cpp" line="+546"/>
-        <source>Selects instruments directory</source>
+        <location filename="../../muse/widgets/mtscale_flo.cpp" line="+44"/>
+        <source>bar scale</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::Header</name>
+    <name>MusEGui::MarkerView</name>
     <message>
-        <location filename="../../muse/widgets/header.cpp" line="+164"/>
-        <source>Track Info Columns</source>
+        <location filename="../../muse/marker/markerview.cpp" line="+175"/>
+        <source>MusE: Marker</source>
+        <translation type="unfinished">MusE: Markör</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>add marker</source>
+        <translation type="unfinished">lägg till markör</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>delete marker</source>
+        <translation type="unfinished">ta bort markör</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>&amp;Edit</source>
+        <translation type="unfinished">&amp;Redigera</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Window &amp;Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Undo/Redo tools</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>edit tools</source>
+        <translation type="unfinished">redigeringsverktyg</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>panic</source>
+        <translation type="unfinished">panik</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>transport</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Bar:Beat:Tick</source>
+        <translation type="unfinished">Takt:Slag:Tick</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hr:Mn:Sc:Fr:Sf</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>Lock</source>
+        <translation type="unfinished">LÃ¥s</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Text</source>
+        <translation type="unfinished">Text</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Marker Properties</source>
+        <translation type="unfinished">Markörinställningar</translation>
+    </message>
 </context>
 <context>
-    <name>MusEWidget::MTScale</name>
+    <name>MusEGui::MasterEdit</name>
     <message>
-        <location filename="../../muse/widgets/mtscale.cpp" line="+44"/>
-        <source>bar scale</source>
+        <location filename="../../muse/master/masteredit.cpp" line="+107"/>
+        <source>MusE: Mastertrack</source>
+        <translation type="unfinished">MusE: Masterspår</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Window &amp;Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Undo/Redo tools</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>panic</source>
+        <translation type="unfinished">panik</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>transport</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Enable master</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Enable</source>
+        <translation type="unfinished">Aktivera</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable usage of master track</source>
+        <translation type="unfinished">Aktivera användning av masterspår</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+2"/>
+        <source>Cursor</source>
+        <translation type="unfinished">Markör</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>time at cursor position</source>
+        <translation type="unfinished">tid vid markörposition</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>tempo at cursor position</source>
+        <translation type="unfinished">tempo vid markörposition</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Off</source>
+        <translation type="unfinished">Av</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Bar</source>
+        <translation type="unfinished">Takt</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Snap</source>
+        <translation type="unfinished">Fäst vid</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>CurPos </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>tempo at current position</source>
+        <translation type="unfinished">tempo vid nuvarande position</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>time signature at current position</source>
+        <translation type="unfinished">time signature vid nuvarande position</translation>
+    </message>
 </context>
 <context>
-    <name>MusEWidget::MTScaleFlo</name>
+    <name>MusEGui::MidiInputTransformDialog</name>
     <message>
-        <location filename="../../muse/widgets/mtscale_flo.cpp" line="+44"/>
-        <source>bar scale</source>
+        <location filename="../../muse/mplugins/midiitransform.cpp" line="+953"/>
+        <location line="+2"/>
+        <source>New</source>
+        <translation type="unfinished">Ny</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::MidiStrip</name>
+    <message>
+        <location filename="../../muse/mixer/mstrip.cpp" line="+110"/>
+        <location line="+121"/>
+        <location line="+137"/>
+        <source>off</source>
+        <translation type="unfinished">av</translation>
+    </message>
+    <message>
+        <location line="-257"/>
+        <location line="+122"/>
+        <source>double click on/off</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="-42"/>
+        <source>VariationSend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Var</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>ReverbSend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Rev</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>ChorusSend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Cho</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>dB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Pan/Balance</source>
+        <translation type="unfinished">Pan/Balans</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Pan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>mute</source>
+        <translation type="unfinished">tysta</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>solo mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
+        <source>iR</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>input routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>oR</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>output routing</source>
+        <translation type="unfinished">utgångsrouting</translation>
+    </message>
 </context>
 <context>
-    <name>MusEWidget::MidiSyncConfig</name>
+    <name>MusEGui::MidiSyncConfig</name>
     <message>
         <location filename="../../muse/widgets/midisyncimpl.cpp" line="+58"/>
         <location line="+29"/>
@@ -12001,24 +12217,796 @@ Apply sync settings?</source>
     </message>
 </context>
 <context>
-    <name>MusEWidget::MidiTrackInfo</name>
+    <name>MusEGui::MidiTrackInfo</name>
     <message>
-        <location filename="../../muse/widgets/mtrackinfo.cpp" line="+319"/>
-        <location line="+1046"/>
+        <location filename="../../muse/widgets/mtrackinfo.cpp" line="+335"/>
+        <location line="+1068"/>
         <source>&lt;unknown&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::MixdownFileDialog</name>
+    <name>MusEGui::MidiTransformerDialog</name>
     <message>
-        <location filename="../../muse/widgets/mixdowndialog.cpp" line="+118"/>
+        <location filename="../../muse/miditransform.cpp" line="+464"/>
+        <location line="+2"/>
+        <source>New</source>
+        <translation type="unfinished">Ny</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::MixdownFileDialog</name>
+    <message>
+        <location filename="../../muse/widgets/mixdowndialog.cpp" line="+122"/>
         <source>Wave Files (*.wav);;All Files (*)</source>
         <translation type="unfinished">Ljudfiler (*.wav);;Alla filer (*)</translation>
     </message>
 </context>
 <context>
-    <name>MusEWidget::NoteInfo</name>
+    <name>MusEGui::MusE</name>
+    <message>
+        <location filename="../../muse/app.cpp" line="+137"/>
+        <location line="+16"/>
+        <source>Failed to start audio!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-15"/>
+        <source>Was not able to start audio, check if jack is running.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Timeout waiting for audio to run. Check if jack is running.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+220"/>
+        <source>Und&amp;o</source>
+        <translation type="unfinished">&amp;Ã…ngra</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Re&amp;do</source>
+        <translation type="unfinished">&amp;Gör om</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>undo last change to song</source>
+        <translation type="unfinished">ångra sista ändring i sång</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>redo last undo</source>
+        <translation type="unfinished">gör om sista ångring</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Loop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>loop between left mark and right mark</source>
+        <translation type="unfinished">loopa mellan vänster och höger markering</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Punchin</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>record starts at left mark</source>
+        <translation type="unfinished">inspelning börjar vid vänster markering</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Punchout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>record stops at right mark</source>
+        <translation type="unfinished">inspelning slutar vid höger markering</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>rewind to start position</source>
+        <translation type="unfinished">spola tillbaka till startposition</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Rewind</source>
+        <translation type="unfinished">Flytta tillbaka</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>rewind current position</source>
+        <translation type="unfinished">flytta markör bakåt</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Forward</source>
+        <translation type="unfinished">Frammåt</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>move current position</source>
+        <translation type="unfinished">flytta markör</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Stop</source>
+        <translation type="unfinished">Stopp</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop sequencer</source>
+        <translation type="unfinished">stoppa sequencer</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Play</source>
+        <translation type="unfinished">Spela</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>start sequencer play</source>
+        <translation type="unfinished">starta sequenceruppspelning</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Record</source>
+        <translation type="unfinished">Spela in</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>to record press record and then play</source>
+        <translation type="unfinished">för att spela in, tryck på record och sedan play</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+238"/>
+        <source>Panic</source>
+        <translation type="unfinished">Panik</translation>
+    </message>
+    <message>
+        <location line="-236"/>
+        <source>send note off to all midi channels</source>
+        <translation type="unfinished">skicka note-off till alla midi kanaler</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>&amp;New</source>
+        <translation type="unfinished">&amp;Ny</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+1"/>
+        <source>Create New Song</source>
+        <translation type="unfinished">Ny sång</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Open</source>
+        <translation type="unfinished">&amp;Öppna</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+2"/>
+        <source>Click this button to open a &lt;em&gt;new song&lt;/em&gt;.&lt;br&gt;You can also select the &lt;b&gt;Open command&lt;/b&gt; from the File menu.</source>
+        <translation type="unfinished">Klicka här för att öppna en &lt;em&gt;ny sång&lt;/em&gt;.&lt;br&gt;Du kan också välja menyvalet &lt;b&gt;Öppna&lt;/b&gt; från Arkivmenyn.</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Open &amp;Recent</source>
+        <translation type="unfinished">&amp;Nyligen öppnade</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+1030"/>
+        <location line="+1255"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished">&amp;Spara</translation>
+    </message>
+    <message>
+        <location line="-2283"/>
+        <location line="+3"/>
+        <source>Click this button to save the song you are editing.  You will be prompted for a file name.
+You can also select the Save command from the File menu.</source>
+        <translation type="unfinished">Klicka här för att spara den sång du håller på att redigera. En förfrågan om filnamn kommer att ställas.
+Du kan också välja menyalternativet Spara från Arkivmenyn.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Save &amp;As</source>
+        <translation type="unfinished">S&amp;para som</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Import Midifile</source>
+        <translation type="unfinished">Importera midifil</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Export Midifile</source>
+        <translation type="unfinished">Exportera midifil</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Import Part</source>
+        <translation type="unfinished">Importera Part</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../../muse/wave.cpp" line="+1158"/>
+        <source>Import Wave File</source>
+        <translation type="unfinished">Importera ljudfil</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Find unused wave files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Quit</source>
+        <translation type="unfinished">A&amp;vsluta</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Song Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Transport Panel</source>
+        <translation type="unfinished">Transportpanel</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Bigtime Window</source>
+        <translation type="unfinished">Bigtime fönster</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Mixer A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Mixer B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cliplist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Marker View</source>
+        <translation type="unfinished">Markörvy</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Arranger View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Fullscreen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Plugins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit Instrument</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Input Plugins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Transpose</source>
+        <translation type="unfinished">Transponera</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi Input Transform</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi Input Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi Remote Control</source>
+        <translation type="unfinished">Midi-fjärrkontroll</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Rhythm Generator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Reset Instr.</source>
+        <translation type="unfinished">Resetta Instr.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Init Instr.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Local Off</source>
+        <translation type="unfinished">lokal av</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Bounce to Track</source>
+        <translation type="unfinished">Bounce till Spår</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bounce to File</source>
+        <translation type="unfinished">Bounce till Fil</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Restart Audio</source>
+        <translation type="unfinished">Starta om Audio</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Mixer Automation</source>
+        <translation type="unfinished">Mixerautomation</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Take Snapshot</source>
+        <translation type="unfinished">Ta ett snapshot</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Clear Automation Data</source>
+        <translation type="unfinished">Rensa automationsdata</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Cascade</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>In rows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>In columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Global Settings</source>
+        <translation type="unfinished">Globala Inställningar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Configure Shortcuts</source>
+        <translation type="unfinished">Konfigurera kortkommandon</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Follow Song</source>
+        <translation type="unfinished">följ sång</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Don&apos;t Follow Song</source>
+        <translation type="unfinished">följ inte Sång</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Follow Page</source>
+        <translation type="unfinished">följ sida</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Follow Continuous</source>
+        <translation type="unfinished">följ kontinuerligt</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Metronome</source>
+        <translation type="unfinished">Metronom</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi Sync</source>
+        <translation type="unfinished">Midi Synk</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi File Import/Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Appearance Settings</source>
+        <translation type="unfinished">Utseendeinställningar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi Ports / Soft Synth</source>
+        <translation type="unfinished">Midiportar / Mjukvarusyntar</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>&amp;Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;MusE Homepage</source>
+        <translation type="unfinished">M&amp;usEs hemsida</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Report Bug...</source>
+        <translation type="unfinished">&amp;Rapportera fel...</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;About MusE</source>
+        <translation type="unfinished">&amp;Om MusE</translation>
+    </message>
+    <message>
+        <location line="+99"/>
+        <source>File Buttons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Undo/Redo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Transport</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>&amp;File</source>
+        <translation type="unfinished">&amp;Arkiv</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>&amp;View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>&amp;Midi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>&amp;Audio</source>
+        <translation type="unfinished">L&amp;jud</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>A&amp;utomation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&amp;Windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>MusE Se&amp;ttings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>&amp;Help</source>
+        <translation type="unfinished">&amp;Hjälp</translation>
+    </message>
+    <message>
+        <location line="+289"/>
+        <source>Cannot read template</source>
+        <translation type="unfinished">Kan inte läsa mall</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>File open error</source>
+        <translation type="unfinished">Fel vid öppning av fil</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>File read error</source>
+        <translation type="unfinished">Fel vid läsning av fil</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Unknown File Format: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+130"/>
+        <location line="+437"/>
+        <location line="+914"/>
+        <source>MusE: Song: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-1317"/>
+        <source>MusE: load project</source>
+        <translation type="unfinished">MusE: Öppna projekt</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>MusE: load template</source>
+        <translation type="unfinished">MusE: ladda mall</translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>MusE: Write File failed</source>
+        <translation type="unfinished">MusE: Misslyckades med att skriva Fil</translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>The current Project contains unsaved data
+Save Current Project?</source>
+        <translation type="unfinished">Det nuvarande Projektet innehåller osparade ändringar
+Spara nuvarande Projekt?</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+1255"/>
+        <source>S&amp;kip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-1255"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Avbryt</translation>
+    </message>
+    <message>
+        <location line="+265"/>
+        <location line="+13"/>
+        <source>MusE: Save As</source>
+        <translation type="unfinished">MusE: Spara Som</translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <location line="+160"/>
+        <source>Nothing to edit</source>
+        <translation type="unfinished">Inget att redigera</translation>
+    </message>
+    <message>
+        <location line="+494"/>
+        <location line="+10"/>
+        <location line="+31"/>
+        <location line="+34"/>
+        <location line="+8"/>
+        <source>MusE: Bounce to Track</source>
+        <translation type="unfinished">MusE: Bounce till Spår</translation>
+    </message>
+    <message>
+        <location line="-82"/>
+        <source>No wave tracks found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+105"/>
+        <source>No audio output tracks found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-74"/>
+        <source>Select one audio output track,
+and one target wave track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <source>Select one target wave track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Select one target wave track,
+and one audio output track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <location line="+25"/>
+        <source>MusE: Bounce to File</source>
+        <translation type="unfinished">MusE: Bounce till fil</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Select one audio output track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>MusE: Bounce</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>set left/right marker for bounce range</source>
+        <translation type="unfinished">sätt vänster och höger markör till bounce-område</translation>
+    </message>
+    <message>
+        <location line="+82"/>
+        <source>The current Project contains unsaved data
+Load overwrites current Project:
+Save Current Project?</source>
+        <translation type="unfinished">Det nuvarande Projektet innehåller osparade ändringar
+Öppning skriver över nuvarande Projekt
+Spara nuvarande Projekt?</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location filename="../../muse/importmidi.cpp" line="+85"/>
+        <source>&amp;Abort</source>
+        <translation type="unfinished">&amp;Avbryt</translation>
+    </message>
+    <message>
+        <location filename="../../muse/exportmidi.cpp" line="+147"/>
+        <source>MusE: Export Midi</source>
+        <translation type="unfinished">MusE: Exportera Midi</translation>
+    </message>
+    <message>
+        <location filename="../../muse/help.cpp" line="+50"/>
+        <source>no help found at: </source>
+        <translation type="unfinished">ingen h jälp hittad vid:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>MusE: Open Help</source>
+        <translation type="unfinished">Muse: Arkiv hjälp</translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>Unable to launch help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>For some reason MusE has to launch the default
+browser on your machine.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/importmidi.cpp" line="-12"/>
+        <source>MusE: Import Midi</source>
+        <translation type="unfinished">MusE: Importera Midi</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Add midi file to current project?
+</source>
+        <translation type="unfinished">Lägg midifil till nuvarande projekt?</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Add to Project</source>
+        <translation type="unfinished">&amp;Lägg till projekt</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Replace</source>
+        <translation type="unfinished">&amp;Ersätt</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>reading midifile
+  </source>
+        <translation type="unfinished">läser midifil</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>
+failed: </source>
+        <translation type="unfinished">
+misslyckades:</translation>
+    </message>
+    <message>
+        <location line="+357"/>
+        <source>Import part is only valid for midi and wave tracks!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>MusE: load part</source>
+        <translation type="unfinished">MusE: ladda part</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>No track selected for import</source>
+        <translation type="unfinished">Inget spår valt för import</translation>
+    </message>
+    <message numerus="yes">
+        <location line="+121"/>
+        <source>%n part(s) out of %1 could not be imported.
+Likely the selected track is the wrong type.</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location line="+1"/>
+        <source>%n part(s) could not be imported.
+Likely the selected track is the wrong type.</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <location filename="../../muse/wave.cpp" line="-6"/>
+        <source>to import an audio file you have first to selecta wave track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Import Wavefile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>This wave file has a samplerate of %1,
+as opposed to current setting %2.
+Do you still want to import it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>&amp;Yes</source>
+        <translation type="unfinished">&amp;Ja</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>&amp;No</source>
+        <translation type="unfinished">&amp;Nej</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::NoteInfo</name>
     <message>
         <location filename="../../muse/widgets/noteinfo.cpp" line="+44"/>
         <source>Note Info</source>
@@ -12051,35 +13039,556 @@ Apply sync settings?</source>
     </message>
 </context>
 <context>
-    <name>MusEWidget::RoutePopupMenu</name>
+    <name>MusEGui::PartCanvas</name>
+    <message>
+        <location filename="../../muse/arranger/pcanvas.cpp" line="+355"/>
+        <source>Cannot copy/move/clone to different Track-Type</source>
+        <translation type="unfinished">Kan inte kopiera/flytta/klona till annan Spårtyp</translation>
+    </message>
+    <message>
+        <location line="+280"/>
+        <source>C&amp;ut</source>
+        <translation type="unfinished">Klipp &amp;ut</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Copy</source>
+        <translation type="unfinished">&amp;Kopiera</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>s&amp;elect </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>clones</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>rename</source>
+        <translation type="unfinished">byt namn</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>color</source>
+        <translation type="unfinished">färg</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>delete</source>
+        <translation type="unfinished">ta bort</translation>
+    </message>
     <message>
-        <location filename="../../muse/widgets/routepopup.cpp" line="+223"/>
         <location line="+2"/>
-        <location line="+125"/>
+        <source>split</source>
+        <translation type="unfinished">dela</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>glue</source>
+        <translation type="unfinished">lim</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>de-clone</source>
+        <translation type="unfinished">häv kloning</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <source>save part to disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-2"/>
+        <source>wave edit</source>
+        <translation type="unfinished">wave redigering</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>file info</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+88"/>
+        <source>MusE: save part</source>
+        <translation type="unfinished">MusE: spara part</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>Part name: %1
+Files:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <location line="+2136"/>
+        <source>%n part(s) out of %1 could not be pasted.
+Likely the selected track is the wrong type.</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location line="+1"/>
+        <source>%n part(s) could not be pasted.
+Likely the selected track is the wrong type.</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Cannot paste: multiple tracks selected</source>
+        <translation type="unfinished">Kan inte klistra in: flera spår valda</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Cannot paste: no track selected</source>
+        <translation type="unfinished">Kan inte klistra in: inget spår valt</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Can only paste to midi/drum track</source>
+        <translation type="unfinished">Kan endast klistra in på midi/trummspår</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Can only paste to wave track</source>
+        <translation type="unfinished">Kan endast klistra till wavespår</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Can only paste to midi or wave track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Cannot paste: wrong data type</source>
+        <translation type="unfinished">Kan inte klistra in: fel datatyp</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::PasteDialog</name>
+    <message numerus="yes">
+        <location filename="../../muse/widgets/pastedialog.cpp" line="+81"/>
+        <source>%n quarter(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>%1 quarter</source>
+        <comment>for floating-point arguments like 1.5</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>%1 quarters</source>
+        <comment>for floating-point arguments like 1.5</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::PasteEventsDialog</name>
+    <message numerus="yes">
+        <location filename="../../muse/widgets/pasteeventsdialog.cpp" line="+95"/>
+        <source>%n quarter(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>%1 quarter</source>
+        <comment>for floating-point arguments like 1.5</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>%1 quarters</source>
+        <comment>for floating-point arguments like 1.5</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::PianoRoll</name>
+    <message>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="+100"/>
+        <source>&amp;Edit</source>
+        <translation type="unfinished">&amp;Redigera</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>C&amp;ut</source>
+        <translation type="unfinished">Klipp &amp;ut</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Copy</source>
+        <translation type="unfinished">&amp;Kopiera</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Copy events in range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Paste</source>
+        <translation type="unfinished">K&amp;listra in</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Paste (with dialog)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Delete &amp;Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>&amp;Select</source>
+        <translation type="unfinished">&amp;Välj</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select &amp;All</source>
+        <translation type="unfinished">Markera &amp;Allt</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Deselect All</source>
+        <translation type="unfinished">A&amp;vmarkera Allt</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Invert &amp;Selection</source>
+        <translation type="unfinished">Invertera &amp;Markering</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>&amp;Inside Loop</source>
+        <translation type="unfinished">&amp;I Loop</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Outside Loop</source>
+        <translation type="unfinished">&amp;Utanför Loop</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&amp;Previous Part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Next Part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Fu&amp;nctions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Quantize</source>
+        <translation type="unfinished">Kvantisera</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Modify Note Length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Modify Velocity</source>
+        <translation type="unfinished">Modifiera Velocity</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Crescendo/Decrescendo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Transpose</source>
+        <translation type="unfinished">Transponera</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Erase Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Move Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Set Fixed Length</source>
+        <translation type="unfinished">Sätt fast längd</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Delete Overlaps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Legato</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Plugins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Window &amp;Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Event Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>&amp;Blue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Pitch colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Velocity colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Pianoroll tools</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Step Record</source>
+        <translation type="unfinished">Stegvis inspelning</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Midi Input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Play Events</source>
+        <translation type="unfinished">Spela Händelser</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>panic</source>
+        <translation type="unfinished">panik</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>transport</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>ctrl</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Add Controller View</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::PluginDialog</name>
+    <message>
+        <location filename="../../muse/plugin.cpp" line="+3137"/>
+        <source>MusE: select plugin</source>
+        <translation type="unfinished">MusE: välj plugin</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Lib</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Label</source>
+        <translation type="unfinished">Etikett</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Name</source>
+        <translation type="unfinished">Namn</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>AI</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>AO</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>CI</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>CO</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Maker</source>
+        <translation type="unfinished">Upphovsman</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copyright</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Avbryt</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Mono and Stereo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Stereo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Mono</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Show All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Select which types of plugins should be visible in the list.&lt;br&gt;Note that using mono plugins on stereo tracks is not a problem, two will be used in parallell.&lt;br&gt;Also beware that the &apos;all&apos; alternative includes plugins that probably not are usable by MusE.</source>
+        <translation type="unfinished">Välj vilka typer av plugins som skall vara synliga i listan.&lt;br&gt;Notera att användning av mono plugins på ett stereospår inte är något problem, två instanser kommer&lt;br&gt; att att användas parallellt. Var också medveten om att &apos;alla&apos; alternativet inkluderar plugins som MusE antagligen inte kan använda.</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Search in &apos;Label&apos; and &apos;Name&apos;:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::PluginGui</name>
+    <message>
+        <location line="+207"/>
+        <source>File Buttons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Load Preset</source>
+        <translation type="unfinished">Öppna Preset</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Save Preset</source>
+        <translation type="unfinished">Spara Preset</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location line="+3"/>
+        <source>bypass plugin</source>
+        <translation type="unfinished">koppla ur plugin</translation>
+    </message>
+    <message>
+        <location line="+554"/>
+        <source>MusE: load preset</source>
+        <translation type="unfinished">MusE: öppna preset</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Error reading preset. Might not be right type for this plugin</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>MusE: save preset</source>
+        <translation type="unfinished">MusE: spara preset</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::RoutePopupMenu</name>
+    <message>
+        <location filename="../../muse/widgets/routepopup.cpp" line="+230"/>
+        <location line="+2"/>
+        <location line="+132"/>
         <location line="+78"/>
         <location line="+57"/>
-        <location line="+53"/>
-        <location line="+682"/>
+        <location line="+60"/>
+        <location line="+685"/>
         <location line="+85"/>
         <source>Channel</source>
         <translation type="unfinished">Kanal</translation>
     </message>
     <message>
-        <location line="-274"/>
-        <location line="+224"/>
+        <location line="-270"/>
+        <location line="+220"/>
         <location line="+85"/>
         <source>Soloing chain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-307"/>
-        <location line="+224"/>
+        <location line="-303"/>
+        <location line="+220"/>
         <source>Audio returns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-185"/>
-        <source>Warning: No midi input devices!</source>
+        <location line="-182"/>
+        <source>Warning: No input devices!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -12088,7 +13597,7 @@ Apply sync settings?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+42"/>
         <location line="+33"/>
         <source>&lt;none&gt;</source>
         <translation type="unfinished"></translation>
@@ -12115,9 +13624,315 @@ Apply sync settings?</source>
     </message>
 </context>
 <context>
-    <name>MusEWidget::ScrollScale</name>
+    <name>MusEGui::ScoreCanvas</name>
+    <message>
+        <location filename="../../muse/midiedit/scoreedit.cpp" line="+1313"/>
+        <source>Treble</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Bass</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Grand Staff</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove staff</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2471"/>
+        <source>Ambiguous part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There are two or more possible parts you could add the note to, but none matches the selected part. Please select the destination part by clicking on any note belonging to it and try again, or add a new stave containing only the destination part.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>No part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There are no parts you could add the note to.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::ScoreEdit</name>
+    <message>
+        <location line="-3557"/>
+        <source>Undo/Redo tools</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Step recording tools</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Step Record</source>
+        <translation type="unfinished">Stegvis inspelning</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>panic</source>
+        <translation type="unfinished">panik</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>transport</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Note settings</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <location filename="../../muse/widgets/scrollscale.cpp" line="+316"/>
+        <location line="+3"/>
+        <source>Note length:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>last</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <location line="+1"/>
+        <location line="+325"/>
+        <source>Apply to new notes:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-324"/>
+        <location line="+328"/>
+        <source>Apply to selected notes:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-321"/>
+        <source>Velocity:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Off-Velocity:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Quantisation settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Quantisation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Pixels per whole:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>&amp;Edit</source>
+        <translation type="unfinished">&amp;Redigera</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>C&amp;ut</source>
+        <translation type="unfinished">Klipp &amp;ut</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Copy</source>
+        <translation type="unfinished">&amp;Kopiera</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Copy events in range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Paste</source>
+        <translation type="unfinished">K&amp;listra in</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Paste (with dialog)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Delete &amp;Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>&amp;Select</source>
+        <translation type="unfinished">&amp;Välj</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select &amp;All</source>
+        <translation type="unfinished">Markera &amp;Allt</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Deselect All</source>
+        <translation type="unfinished">A&amp;vmarkera Allt</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Invert &amp;Selection</source>
+        <translation type="unfinished">Invertera &amp;Markering</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>&amp;Inside Loop</source>
+        <translation type="unfinished">&amp;I Loop</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Outside Loop</source>
+        <translation type="unfinished">&amp;Utanför Loop</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Fu&amp;nctions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Quantize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Change note &amp;length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Change note &amp;velocity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Crescendo/Decrescendo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transpose</source>
+        <translation type="unfinished">Transponera</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Erase Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Move Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Set Fixed Length</source>
+        <translation type="unfinished">Sätt fast längd</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Delete Overlaps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Legato</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Window &amp;Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Note head &amp;colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Black</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Velocity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Set up &amp;preamble</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Display &amp;key signature</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Display &amp;time signature</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Set Score &amp;name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+224"/>
+        <location line="+1"/>
+        <source>Enter the new score title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Changing score title failed:
+the selected title is not unique</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::ScrollScale</name>
+    <message>
+        <location filename="../../muse/widgets/scrollscale.cpp" line="+318"/>
         <source>next page</source>
         <translation type="unfinished">nästa sida</translation>
     </message>
@@ -12133,7 +13948,7 @@ Apply sync settings?</source>
     </message>
 </context>
 <context>
-    <name>MusEWidget::ShortcutCaptureDialog</name>
+    <name>MusEGui::ShortcutCaptureDialog</name>
     <message>
         <location filename="../../muse/widgets/shortcutcapturedialog.cpp" line="+55"/>
         <source>Ok</source>
@@ -12146,8 +13961,8 @@ Apply sync settings?</source>
     </message>
     <message>
         <location line="+52"/>
-        <source>Shortcut conflicts with </source>
-        <translation type="unfinished">Kortkommando konfliktar med</translation>
+        <source>Shortcut conflicts with %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
@@ -12156,7 +13971,7 @@ Apply sync settings?</source>
     </message>
 </context>
 <context>
-    <name>MusEWidget::SigScale</name>
+    <name>MusEGui::SigScale</name>
     <message>
         <location filename="../../muse/widgets/sigscale.cpp" line="+44"/>
         <source>signature scale</source>
@@ -12164,9 +13979,155 @@ Apply sync settings?</source>
     </message>
 </context>
 <context>
-    <name>MusEWidget::Toolbar1</name>
+    <name>MusEGui::Strip</name>
+    <message>
+        <location filename="../../muse/mixer/strip.cpp" line="+314"/>
+        <source>Remove track?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::TList</name>
+    <message>
+        <location filename="../../muse/arranger/tlist.cpp" line="+373"/>
+        <source>&lt;none&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>no clef</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Treble</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Bass</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Grand</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>MusE: bad trackname</source>
+        <translation type="unfinished">MusE: dåligt spårnamn</translation>
+    </message>
     <message>
-        <location filename="../../muse/widgets/tb1.cpp" line="+21"/>
+        <location line="+1"/>
+        <source>please choose a unique track name</source>
+        <translation type="unfinished">vänligen välj ett unikt spårnamn</translation>
+    </message>
+    <message>
+        <location line="+172"/>
+        <location line="+1149"/>
+        <source>Update drummap?</source>
+        <translation type="unfinished">Updatera trum-map?</translation>
+    </message>
+    <message>
+        <location line="-1148"/>
+        <source>Do you want to use same port for all instruments in the drummap?</source>
+        <translation type="unfinished">Vill du använda samma port för alla instrument i trum-map:en?</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+1149"/>
+        <source>&amp;Yes</source>
+        <translation type="unfinished">&amp;Ja</translation>
+    </message>
+    <message>
+        <location line="-1149"/>
+        <location line="+1149"/>
+        <source>&amp;No</source>
+        <translation type="unfinished">&amp;Nej</translation>
+    </message>
+    <message>
+        <location line="-1074"/>
+        <location line="+55"/>
+        <source>show gui</source>
+        <translation type="unfinished">visa gui</translation>
+    </message>
+    <message>
+        <location line="-46"/>
+        <location line="+55"/>
+        <source>show native gui</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+346"/>
+        <source>Treble clef</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bass clef</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Grand Staff</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Viewable automation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+131"/>
+        <source>Delete Track</source>
+        <translation type="unfinished">Ta bort spår</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Track Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Insert Track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+445"/>
+        <source>Midi</source>
+        <translation type="unfinished">Midi</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Drum</source>
+        <translation type="unfinished">Trumma</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Do you want to use same port and channel for all instruments in the drummap?</source>
+        <translation type="unfinished">Vill du använda samma port och kanal för alla instrument i trummap:en?</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::TempoSig</name>
+    <message>
+        <location filename="../../muse/transport.cpp" line="+149"/>
+        <source>Tempo/Sig</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::Toolbar1</name>
+    <message>
+        <location filename="../../muse/widgets/tb1.cpp" line="+47"/>
+        <location line="+1"/>
+        <location line="+1"/>
+        <source>Off</source>
+        <translation type="unfinished">Av</translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>Solo</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12182,7 +14143,80 @@ Apply sync settings?</source>
     </message>
 </context>
 <context>
-    <name>MusEWidget::TrackComment</name>
+    <name>MusEGui::TopWin</name>
+    <message>
+        <location filename="../../muse/cobject.cpp" line="+64"/>
+        <source>As subwindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Shares tools and menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Fullscreen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+468"/>
+        <source>Piano roll</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>List editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Drum editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Master track editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Master track list editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Wave editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Clip list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Marker view</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Score editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Arranger</source>
+        <translation type="unfinished">Arrangerare</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&lt;unknown toplevel type&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::TrackComment</name>
     <message>
         <location filename="../../muse/widgets/comment.cpp" line="+58"/>
         <source>MusE: Track Comment</source>
@@ -12195,14 +14229,628 @@ Apply sync settings?</source>
     </message>
 </context>
 <context>
-    <name>MusEWidget::VisibleTracks</name>
+    <name>MusEGui::Transport</name>
+    <message>
+        <location filename="../../muse/transport.cpp" line="+105"/>
+        <source>Overdub</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+15"/>
+        <source>Replace</source>
+        <translation type="unfinished">Ersätt</translation>
+    </message>
+    <message>
+        <location line="-10"/>
+        <source>Rec Mode</source>
+        <translation type="unfinished">Recläge</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mix</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Cycle Rec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>punchin</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>loop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>punchout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+3"/>
+        <source>Punch In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-2"/>
+        <location line="+3"/>
+        <source>Loop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-2"/>
+        <location line="+3"/>
+        <source>Punch Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Left Mark</source>
+        <translation type="unfinished">Vänster Markering</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Right Mark</source>
+        <translation type="unfinished">Höger Markering</translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>rewind to start</source>
+        <translation type="unfinished">flytta tillbaka till början</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Click this button to rewind to start position</source>
+        <translation type="unfinished">Klicka här för att spola tillbaks till början</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>rewind</source>
+        <translation type="unfinished">flytta tillbaka</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Click this button to rewind</source>
+        <translation type="unfinished">Klicka här för att flytta markören bakåt</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>forward</source>
+        <translation type="unfinished">frammåt</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Click this button to forward current play position</source>
+        <translation type="unfinished">Klicka här för att flytta markören framåt</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>stop</source>
+        <translation type="unfinished">stopp</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Click this button to stop playback</source>
+        <translation type="unfinished">Klicka här för att stoppa uppspelning</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>play</source>
+        <translation type="unfinished">spela</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Click this button to start playback</source>
+        <translation type="unfinished">Klicka här för att starta uppspelning</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Click this button to enable recording</source>
+        <translation type="unfinished">Klicka här för att spela in</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>AC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>quantize during record</source>
+        <translation type="unfinished">kvantisera under inspelning</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Click</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>metronom click on/off</source>
+        <translation type="unfinished">metronomklick av/på</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Sync</source>
+        <translation type="unfinished">Synk</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>external sync on/off</source>
+        <translation type="unfinished">externsynk. av/på</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Jack</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Jack transport sync on/off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Master</source>
+        <translation type="unfinished">Master</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>use master track</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::VisibleTracks</name>
+    <message>
+        <location filename="../../muse/widgets/visibletracks.cpp" line="+36"/>
+        <location line="+9"/>
+        <source>Show wave tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-8"/>
+        <location line="+9"/>
+        <source>Show group tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-8"/>
+        <location line="+9"/>
+        <source>Show aux tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-8"/>
+        <location line="+9"/>
+        <source>Show input tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <location filename="../../muse/widgets/visibletracks.cpp" line="+9"/>
+        <location line="-8"/>
+        <location line="+9"/>
+        <source>Show output tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-8"/>
+        <location line="+9"/>
+        <source>Show midi tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-8"/>
+        <location line="+9"/>
+        <source>Show synth tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
         <source>Visible track types</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>MusEGui::WaveEdit</name>
+    <message>
+        <location filename="../../muse/waveedit/waveedit.cpp" line="+91"/>
+        <source>&amp;Edit</source>
+        <translation type="unfinished">&amp;Redigera</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Func&amp;tions</source>
+        <translation type="unfinished">Funk&amp;tioner</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Gain</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Other</source>
+        <translation type="unfinished">Andra</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>&amp;Copy</source>
+        <translation type="unfinished">&amp;Kopiera</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>C&amp;ut</source>
+        <translation type="unfinished">Klipp &amp;ut</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Paste</source>
+        <translation type="unfinished">K&amp;listra in</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Edit in E&amp;xternal Editor</source>
+        <translation type="unfinished">Editera i e&amp;xtern redigerare</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Mute Selection</source>
+        <translation type="unfinished">Tysta markering</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Normalize Selection</source>
+        <translation type="unfinished">Normalisera markering</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Fade In Selection</source>
+        <translation type="unfinished">Tona in markering</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Fade Out Selection</source>
+        <translation type="unfinished">Tona ut Markering</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Reverse Selection</source>
+        <translation type="unfinished">Reversera markering</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select</source>
+        <translation type="unfinished">Välj</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select &amp;All</source>
+        <translation type="unfinished">Markera &amp;Allt</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Deselect All</source>
+        <translation type="unfinished">A&amp;vmarkera Allt</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Window &amp;Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Wave edit tools</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>transport</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>WaveEdit tools</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Solo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Cursor</source>
+        <translation type="unfinished">Markör</translation>
+    </message>
+</context>
+<context>
+    <name>MusEGui::WaveView</name>
+    <message>
+        <location filename="../../muse/waveedit/waveview.cpp" line="+996"/>
+        <source>MusE - external editor failed</source>
+        <translation type="unfinished">MusE - fel med extern redigerare </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>MusE was unable to launch the external editor
+check if the editor setting in:
+Global Settings-&gt;Audio:External Waveditor
+is set to a valid editor.</source>
+        <translation type="unfinished">MusE kunde inte starta extern redigerare
+kontrollera om inställningarna i:
+Globala inställningar-&gt;Ljud:Extern ljudredigerare
+är satt till en giltig redigerarbinär</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>MusE - file size changed</source>
+        <translation type="unfinished">MusE - filstorleken har förändrats</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>When editing in external editor - you should not change the filesize
+since it must fit the selected region.
+
+Missing data is muted</source>
+        <translation type="unfinished">Vid editering i extern editor - bör du inte ändra filstorleken
+eftersom den måste passa i regionen.
+
+Saknat data tystas</translation>
+    </message>
+</context>
+<context>
+    <name>MusEMixer::AudioMixerApp</name>
+    <message>
+        <source>&amp;Create</source>
+        <translation type="obsolete">&amp;Skapa</translation>
+    </message>
+</context>
+<context>
+    <name>MusEMixer::AudioStrip</name>
+    <message>
+        <source>aux send level</source>
+        <translation type="obsolete">aux send nivå</translation>
+    </message>
+    <message>
+        <source>1/2 channel</source>
+        <translation type="obsolete">1/2 kanal</translation>
+    </message>
+    <message>
+        <source>mute</source>
+        <translation type="obsolete">tysta</translation>
+    </message>
+    <message>
+        <source>record downmix</source>
+        <translation type="obsolete">spela in nermixning</translation>
+    </message>
+    <message>
+        <source>off</source>
+        <translation type="obsolete">av</translation>
+    </message>
+    <message>
+        <source>output routing</source>
+        <translation type="obsolete">utgångsrouting</translation>
+    </message>
+    <message>
+        <source>Off</source>
+        <translation type="obsolete">Av</translation>
+    </message>
+    <message>
+        <source>Read</source>
+        <translation type="obsolete">Läs</translation>
+    </message>
+    <message>
+        <source>Write</source>
+        <translation type="obsolete">Skriv</translation>
+    </message>
+    <message>
+        <source>automation type</source>
+        <translation type="obsolete">automationstyp</translation>
+    </message>
+</context>
+<context>
+    <name>MusEMixer::EffectRack</name>
+    <message>
+        <source>effect rack</source>
+        <translation type="obsolete">effektrack</translation>
+    </message>
+    <message>
+        <source>new</source>
+        <translation type="obsolete">ny</translation>
+    </message>
+    <message>
+        <source>change</source>
+        <translation type="obsolete">ändra</translation>
+    </message>
+    <message>
+        <source>move up</source>
+        <translation type="obsolete">flytta upp</translation>
+    </message>
+    <message>
+        <source>move down</source>
+        <translation type="obsolete">flytta ner</translation>
+    </message>
+    <message>
+        <source>remove</source>
+        <translation type="obsolete">ta bort</translation>
+    </message>
+    <message>
+        <source>show gui</source>
+        <translation type="obsolete">visa gui</translation>
+    </message>
+    <message>
+        <source>Replace effect</source>
+        <translation type="obsolete">Byt effekt</translation>
+    </message>
+    <message>
+        <source>Do you really want to replace the effect %1?</source>
+        <translation type="obsolete">Vill du verkligen ersätta effekten %1?</translation>
+    </message>
+</context>
+<context>
+    <name>MusEMixer::MidiStrip</name>
+    <message>
+        <source>off</source>
+        <translation type="obsolete">av</translation>
+    </message>
+    <message>
+        <source>Pan/Balance</source>
+        <translation type="obsolete">Pan/Balans</translation>
+    </message>
+    <message>
+        <source>mute</source>
+        <translation type="obsolete">tysta</translation>
+    </message>
+    <message>
+        <source>output routing</source>
+        <translation type="obsolete">utgångsrouting</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::BigTime</name>
+    <message>
+        <source>minute</source>
+        <translation type="obsolete">minut</translation>
+    </message>
+    <message>
+        <source>second</source>
+        <translation type="obsolete">sekund</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::EditToolBar</name>
+    <message>
+        <source>Edit Tools</source>
+        <translation type="obsolete">Redigeringsverktyg</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::MidiSyncConfig</name>
+    <message>
+        <source>Port Number</source>
+        <translation type="obsolete">Portnummer</translation>
+    </message>
+    <message>
+        <source>Name of the midi device associated with this port number</source>
+        <translation type="obsolete">Namn på midienhet associerad med detta portnummer</translation>
+    </message>
+    <message>
+        <source>Device Name</source>
+        <translation type="obsolete">Enhetsnamn</translation>
+    </message>
+    <message>
+        <source>&amp;No</source>
+        <translation type="obsolete">&amp;Nej</translation>
+    </message>
+    <message>
+        <source>&amp;Abort</source>
+        <translation type="obsolete">&amp;Avbryt</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::MixdownFileDialog</name>
+    <message>
+        <source>Wave Files (*.wav);;All Files (*)</source>
+        <translation type="obsolete">Ljudfiler (*.wav);;Alla filer (*)</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::NoteInfo</name>
+    <message>
+        <source>Note Info</source>
+        <translation type="obsolete">Notinfo</translation>
+    </message>
+    <message>
+        <source>Len</source>
+        <translation type="obsolete">Längd</translation>
+    </message>
+    <message>
+        <source>Pitch</source>
+        <translation type="obsolete">Tonhöjd</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::RoutePopupMenu</name>
+    <message>
+        <source>Channel</source>
+        <translation type="obsolete">Kanal</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::ScrollScale</name>
+    <message>
+        <source>next page</source>
+        <translation type="obsolete">nästa sida</translation>
+    </message>
+    <message>
+        <source>previous page</source>
+        <translation type="obsolete">förra sidan</translation>
+    </message>
+    <message>
+        <source>current page number</source>
+        <translation type="obsolete">nuvarande sidnummer</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::ShortcutCaptureDialog</name>
+    <message>
+        <source>Cancel</source>
+        <translation type="obsolete">Avbryt</translation>
+    </message>
+    <message>
+        <source>Shortcut conflicts with </source>
+        <translation type="obsolete">Kortkommando konfliktar med</translation>
+    </message>
+    <message>
+        <source>Undefined</source>
+        <translation type="obsolete">Odefinierad</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::SigScale</name>
+    <message>
+        <source>signature scale</source>
+        <translation type="obsolete">signaturskala</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::Toolbar1</name>
+    <message>
+        <source>Cursor</source>
+        <translation type="obsolete">Markör</translation>
+    </message>
+    <message>
+        <source>Snap</source>
+        <translation type="obsolete">Fäst vid</translation>
+    </message>
+</context>
+<context>
+    <name>MusEWidget::TrackComment</name>
+    <message>
+        <source>MusE: Track Comment</source>
+        <translation type="obsolete">MusE: Spårkommentar</translation>
+    </message>
+    <message>
+        <source>Track Comment:</source>
+        <translation type="obsolete">Spårkommentar:</translation>
+    </message>
+</context>
+<context>
     <name>NewPreset</name>
     <message>
         <source>New preset</source>
@@ -12715,9 +15363,8 @@ to be expanded by more than </source>
 <context>
     <name>PianoRoll</name>
     <message>
-        <location filename="../../muse/midiedit/pianoroll.cpp" line="+97"/>
         <source>&amp;Edit</source>
-        <translation>&amp;Redigera</translation>
+        <translation type="obsolete">&amp;Redigera</translation>
     </message>
     <message>
         <source>Cut</source>
@@ -12756,9 +15403,8 @@ to be expanded by more than </source>
         <translation type="obsolete">Utanför loop</translation>
     </message>
     <message>
-        <location line="+34"/>
         <source>&amp;Select</source>
-        <translation>&amp;Välj</translation>
+        <translation type="obsolete">&amp;Välj</translation>
     </message>
     <message>
         <source>blue</source>
@@ -12809,14 +15455,12 @@ to be expanded by more than </source>
         <translation type="obsolete">Modifiera Gate Time</translation>
     </message>
     <message>
-        <location line="+52"/>
         <source>Modify Velocity</source>
-        <translation>Modifiera Velocity</translation>
+        <translation type="obsolete">Modifiera Velocity</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Transpose</source>
-        <translation>Transponera</translation>
+        <translation type="obsolete">Transponera</translation>
     </message>
     <message>
         <source>Thin Out</source>
@@ -12855,334 +15499,122 @@ to be expanded by more than </source>
         <translation type="obsolete">Verktyg Pianorulle</translation>
     </message>
     <message>
-        <location line="+77"/>
         <source>Step Record</source>
-        <translation>Stegvis inspelning</translation>
+        <translation type="obsolete">Stegvis inspelning</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Midi Input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
         <source>Play Events</source>
-        <translation>Spela Händelser</translation>
+        <translation type="obsolete">Spela Händelser</translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>ctrl</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
         <source>Add Controller View</source>
-        <translation>Lägg till Controller Vy</translation>
+        <translation type="obsolete">Lägg till Controller Vy</translation>
     </message>
     <message>
-        <location line="-118"/>
         <source>Set Fixed Length</source>
-        <translation type="unfinished">Sätt fast längd</translation>
+        <translation type="obsolete">Sätt fast längd</translation>
     </message>
     <message>
-        <location line="-100"/>
         <source>C&amp;ut</source>
-        <translation type="unfinished">Klipp &amp;ut</translation>
+        <translation type="obsolete">Klipp &amp;ut</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Copy</source>
-        <translation type="unfinished">&amp;Kopiera</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Copy events in range</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&amp;Kopiera</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Paste</source>
-        <translation type="unfinished">K&amp;listra in</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>&amp;Paste (with dialog)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Delete &amp;Events</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">K&amp;listra in</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Select &amp;All</source>
-        <translation type="unfinished">Markera &amp;Allt</translation>
+        <translation type="obsolete">Markera &amp;Allt</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Deselect All</source>
-        <translation type="unfinished">A&amp;vmarkera Allt</translation>
+        <translation type="obsolete">A&amp;vmarkera Allt</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Invert &amp;Selection</source>
-        <translation type="unfinished">Invertera &amp;Markering</translation>
+        <translation type="obsolete">Invertera &amp;Markering</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>&amp;Inside Loop</source>
-        <translation type="unfinished">&amp;I Loop</translation>
+        <translation type="obsolete">&amp;I Loop</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Outside Loop</source>
-        <translation type="unfinished">&amp;Utanför Loop</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>&amp;Previous Part</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>&amp;Next Part</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Fu&amp;nctions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+54"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>&amp;Event Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>&amp;Blue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>&amp;Pitch colors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>&amp;Velocity colors</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&amp;Utanför Loop</translation>
     </message>
     <message>
-        <location line="-68"/>
         <source>Quantize</source>
-        <translation type="unfinished">Kvantisera</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Modify Note Length</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Crescendo/Decrescendo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Erase Events</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Move Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Delete Overlaps</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Legato</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>&amp;Plugins</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+46"/>
-        <source>Pianoroll tools</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Kvantisera</translation>
     </message>
     <message>
-        <location line="+26"/>
         <source>panic</source>
-        <translation type="unfinished">panik</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>transport</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">panik</translation>
     </message>
 </context>
 <context>
     <name>PluginDialog</name>
     <message>
-        <location filename="../../muse/plugin.cpp" line="+3095"/>
         <source>MusE: select plugin</source>
-        <translation>MusE: välj plugin</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Lib</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">MusE: välj plugin</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Label</source>
-        <translation>Etikett</translation>
+        <translation type="obsolete">Etikett</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Name</source>
-        <translation type="unfinished">Namn</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>AI</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>AO</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>CI</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>CO</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>id</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Namn</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Maker</source>
-        <translation>Upphovsman</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Copyright</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Upphovsman</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
         <source>Cancel</source>
-        <translation>Avbryt</translation>
+        <translation type="obsolete">Avbryt</translation>
     </message>
     <message>
         <source>Stereo and Mono</source>
         <translation type="obsolete">Stereo och mono</translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Stereo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Mono</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>All</source>
         <translation type="obsolete">Alla</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Select which types of plugins should be visible in the list.&lt;br&gt;Note that using mono plugins on stereo tracks is not a problem, two will be used in parallell.&lt;br&gt;Also beware that the &apos;all&apos; alternative includes plugins that probably not are usable by MusE.</source>
-        <translation type="unfinished">Välj vilka typer av plugins som skall vara synliga i listan.&lt;br&gt;Notera att användning av mono plugins på ett stereospår inte är något problem, två instanser kommer&lt;br&gt; att att användas parallellt. Var också medveten om att &apos;alla&apos; alternativet inkluderar plugins som MusE antagligen inte kan använda.</translation>
-    </message>
-    <message>
-        <location line="-28"/>
-        <source>Mono and Stereo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+15"/>
-        <source>Show All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
-        <source>Search in &apos;Label&apos; and &apos;Name&apos;:</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Välj vilka typer av plugins som skall vara synliga i listan.&lt;br&gt;Notera att användning av mono plugins på ett stereospår inte är något problem, två instanser kommer&lt;br&gt; att att användas parallellt. Var också medveten om att &apos;alla&apos; alternativet inkluderar plugins som MusE antagligen inte kan använda.</translation>
     </message>
 </context>
 <context>
     <name>PluginGui</name>
     <message>
-        <location line="+207"/>
         <source>File Buttons</source>
-        <translation>Arkiv Knappar</translation>
+        <translation type="obsolete">Arkiv Knappar</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Load Preset</source>
-        <translation>Öppna Preset</translation>
+        <translation type="obsolete">Öppna Preset</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Save Preset</source>
-        <translation>Spara Preset</translation>
+        <translation type="obsolete">Spara Preset</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <location line="+3"/>
         <source>bypass plugin</source>
-        <translation>koppla ur plugin</translation>
+        <translation type="obsolete">koppla ur plugin</translation>
     </message>
     <message>
-        <location line="+554"/>
         <source>MusE: load preset</source>
-        <translation>MusE: öppna preset</translation>
+        <translation type="obsolete">MusE: öppna preset</translation>
     </message>
     <message>
-        <location line="+66"/>
         <source>MusE: save preset</source>
-        <translation>MusE: spara preset</translation>
-    </message>
-    <message>
-        <location line="-41"/>
-        <source>Error reading preset. Might not be right type for this plugin</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">MusE: spara preset</translation>
     </message>
 </context>
 <context>
@@ -13385,19 +15817,18 @@ används inte för tillfället</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../../muse/helper.cpp" line="-49"/>
         <source>Other</source>
-        <translation type="unfinished">Andra</translation>
+        <translation type="obsolete">Andra</translation>
     </message>
     <message>
-        <location filename="../../muse/functions.cpp" line="+242"/>
-        <location line="+159"/>
+        <location filename="../../muse/functions.cpp" line="+244"/>
+        <location line="+160"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-159"/>
-        <location line="+159"/>
+        <location line="-160"/>
+        <location line="+160"/>
         <source>Please first select the range for crescendo with the loop markers.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13409,7 +15840,7 @@ används inte för tillfället</translation>
         <translation type="obsolete">Hastighet</translation>
     </message>
     <message>
-        <location filename="../../muse/instruments/minstrument.cpp" line="+72"/>
+        <location filename="../../muse/instruments/minstrument.cpp" line="+73"/>
         <location filename="../../muse/liste/editevent.cpp" line="-418"/>
         <source>Cannot convert sysex string</source>
         <translation>Kan inte konvertera sysex-sträng</translation>
@@ -13426,12 +15857,12 @@ används inte för tillfället</translation>
         <translation type="unfinished">generell midi</translation>
     </message>
     <message>
-        <location filename="../../muse/miditransform.cpp" line="+92"/>
+        <location filename="../../muse/miditransform.cpp" line="-231"/>
         <source>new</source>
         <translation>ny</translation>
     </message>
     <message>
-        <location filename="../../muse/wave.cpp" line="-677"/>
+        <location filename="../../muse/wave.cpp" line="-1006"/>
         <source>create peakfile for </source>
         <translation>skapa &quot;peak&quot;-fil</translation>
     </message>
@@ -13440,7 +15871,7 @@ används inte för tillfället</translation>
         <translation type="obsolete">Kan inte transformera ej tomt spår</translation>
     </message>
     <message>
-        <location filename="../../muse/widgets/filedialog.cpp" line="+80"/>
+        <location filename="../../muse/widgets/filedialog.cpp" line="+81"/>
         <source>MusE: get file name</source>
         <translation>MusE: hämta filnamn</translation>
     </message>
@@ -13466,7 +15897,15 @@ skapa?</translation>
         <translation type="obsolete">Avbryt</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+1"/>
+        <source>The directory
+%1
+does not exist.
+Create it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>MusE: create directory</source>
         <translation>MusE: skapa katalog</translation>
     </message>
@@ -13476,10 +15915,23 @@ skapa?</translation>
         <translation>misslyckades med att skapa katalog</translation>
     </message>
     <message>
-        <location line="+396"/>
+        <location line="+399"/>
+        <source>File
+%1
+exists. Overwrite?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Open File
+%1
+failed: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>File
 </source>
-        <translation>Arkiv</translation>
+        <translation type="obsolete">Arkiv</translation>
     </message>
     <message>
         <source>
@@ -13487,7 +15939,7 @@ exists</source>
         <translation type="obsolete">existerar</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="-19"/>
         <source>MusE: write</source>
         <translation>MusE: skriv</translation>
     </message>
@@ -13500,26 +15952,24 @@ exists</source>
         <translation type="obsolete">Avsluta</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Open File
 </source>
-        <translation>Öppna fil</translation>
+        <translation type="obsolete">Öppna fil</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>
 failed: </source>
-        <translation>
+        <translation type="obsolete">
 misslyckades:</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+20"/>
         <source>MusE: Open File</source>
         <translation>MusE: Öppna fil</translation>
     </message>
     <message>
-        <location filename="../../muse/route.cpp" line="+1041"/>
-        <location line="+37"/>
+        <location filename="../../muse/route.cpp" line="+792"/>
+        <location line="+25"/>
         <source>None</source>
         <translation type="unfinished">Ingen</translation>
     </message>
@@ -13540,29 +15990,10 @@ misslyckades:</translation>
         <translation type="obsolete">Grupp</translation>
     </message>
     <message>
-        <location filename="../../muse/waveedit/waveview.cpp" line="+632"/>
+        <location filename="../../muse/waveedit/waveview.cpp" line="-374"/>
         <source>No selection. Ignoring</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../../muse/widgets/filedialog.cpp" line="-440"/>
-        <source>The directory
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>
-does not exist.
-Create it?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+404"/>
-        <source>
-exists. Overwrite?</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QuantBase</name>
@@ -13638,7 +16069,12 @@ exists. Overwrite?</source>
     </message>
     <message>
         <location line="+5"/>
-        <source>Quarter</source>
+        <source>4th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>4th Triplet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -13648,15 +16084,30 @@ exists. Overwrite?</source>
     </message>
     <message>
         <location line="+5"/>
+        <source>8th Triplet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>16th</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
+        <source>16th Triplet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>32th</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
+        <source>32th Triplet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+8"/>
         <source>Swing:</source>
         <translation type="unfinished"></translation>
@@ -14346,49 +16797,6 @@ i MusEs lista över definierade controllers</translation>
     </message>
 </context>
 <context>
-    <name>ScoreCanvas</name>
-    <message>
-        <location filename="../../muse/midiedit/scoreedit.cpp" line="+1245"/>
-        <source>Treble</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Bass</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Grand Staff</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Remove staff</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2467"/>
-        <source>Ambiguous part</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There are two or more possible parts you could add the note to, but none matches the selected part. Please select the destination part by clicking on any note belonging to it and try again, or add a new stave containing only the destination part.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>No part</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There are no parts you could add the note to.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>ScoreConfig</name>
     <message>
         <source>Staff Settings: </source>
@@ -14446,251 +16854,60 @@ i MusEs lista över definierade controllers</translation>
 <context>
     <name>ScoreEdit</name>
     <message>
-        <location line="-3493"/>
-        <source>Undo/Redo tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Step recording tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>Step Record</source>
-        <translation type="unfinished">Stegvis inspelning</translation>
+        <translation type="obsolete">Stegvis inspelning</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>panic</source>
-        <translation type="unfinished">panik</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>transport</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Note settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Note length:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>last</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+37"/>
-        <source>Velocity:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Off-Velocity:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>Quantisation settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Quantisation:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>Pixels per whole:</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">panik</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>&amp;Edit</source>
-        <translation type="unfinished">&amp;Redigera</translation>
+        <translation type="obsolete">&amp;Redigera</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>C&amp;ut</source>
-        <translation type="unfinished">Klipp &amp;ut</translation>
+        <translation type="obsolete">Klipp &amp;ut</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Copy</source>
-        <translation type="unfinished">&amp;Kopiera</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Copy events in range</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&amp;Kopiera</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Paste</source>
-        <translation type="unfinished">K&amp;listra in</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Paste (with dialog)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Delete &amp;Events</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">K&amp;listra in</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>&amp;Select</source>
-        <translation type="unfinished">&amp;Välj</translation>
+        <translation type="obsolete">&amp;Välj</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Select &amp;All</source>
-        <translation type="unfinished">Markera &amp;Allt</translation>
+        <translation type="obsolete">Markera &amp;Allt</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Deselect All</source>
-        <translation type="unfinished">A&amp;vmarkera Allt</translation>
+        <translation type="obsolete">A&amp;vmarkera Allt</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Invert &amp;Selection</source>
-        <translation type="unfinished">Invertera &amp;Markering</translation>
+        <translation type="obsolete">Invertera &amp;Markering</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>&amp;Inside Loop</source>
-        <translation type="unfinished">&amp;I Loop</translation>
+        <translation type="obsolete">&amp;I Loop</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Outside Loop</source>
-        <translation type="unfinished">&amp;Utanför Loop</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Fu&amp;nctions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>&amp;Quantize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Change note &amp;length</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Change note &amp;velocity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Crescendo/Decrescendo</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&amp;Utanför Loop</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Transpose</source>
-        <translation type="unfinished">Transponera</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Erase Events</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Move Notes</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Transponera</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Set Fixed Length</source>
-        <translation type="unfinished">Sätt fast längd</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Delete Overlaps</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Legato</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Note head &amp;colors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>&amp;Black</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>&amp;Velocity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>&amp;Part</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Set up &amp;preamble</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Display &amp;key signature</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Display &amp;time signature</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Set Score &amp;name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+216"/>
-        <location line="+1"/>
-        <source>Enter the new score title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Changing score title failed:
-the selected title is not unique</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Sätt fast längd</translation>
     </message>
 </context>
 <context>
@@ -14828,12 +17045,12 @@ the selected title is not unique</source>
         <translation type="unfinished">Konfigurera tangentbordskortkommando</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>Shortcut Category</source>
         <translation type="unfinished">Kortkommandokategori</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+24"/>
         <source>Description</source>
         <translation type="unfinished">Beskrivning</translation>
     </message>
@@ -14843,7 +17060,7 @@ the selected title is not unique</source>
         <translation type="unfinished">Kortkommando</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+35"/>
         <source>&amp;Clear</source>
         <translation type="unfinished">&amp;Rensa</translation>
     </message>
@@ -14909,97 +17126,8 @@ the selected title is not unique</source>
 <context>
     <name>Song</name>
     <message>
-        <location filename="../../muse/song.cpp" line="+2412"/>
-        <source>Jack shutdown!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Jack has detected a performance problem which has lead to
-MusE being disconnected.
-This could happen due to a number of reasons:
-- a performance issue with your particular setup.
-- a bug in MusE (or possibly in another connected software).
-- a random hiccup which might never occur again.
-- jack was voluntary stopped by you or someone else
-- jack crashed
-If there is a persisting problem you are much welcome to discuss it
-on the MusE mailinglist.
-(there is information about joining the mailinglist on the MusE
- homepage which is available through the help menu)
-
-To proceed check the status of Jack and try to restart it and then .
-click on the Restart button.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+198"/>
-        <source>previous event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>next event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <location line="+183"/>
-        <source>set event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-181"/>
-        <location line="+183"/>
-        <source>add event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-179"/>
-        <location line="+184"/>
-        <source>erase event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-180"/>
-        <source>erase range</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>clear automation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+33"/>
-        <source>Clear all controller events?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>&amp;Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
         <source>&amp;Cancel</source>
-        <translation type="unfinished">&amp;Avbryt</translation>
-    </message>
-    <message>
-        <location line="+1134"/>
-        <source>MusE - external script failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>MusE was unable to launch the script, error message:
- </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-1200"/>
-        <source>Automation:</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&amp;Avbryt</translation>
     </message>
 </context>
 <context>
@@ -15049,12 +17177,11 @@ click on the Restart button.</source>
 <context>
     <name>SynthConfigBase</name>
     <message>
-        <location filename="../../muse/widgets/synthconfigbase.ui" line="+14"/>
         <source>MusE: Synth Configuration</source>
-        <translation>MusE: Syntinställningar</translation>
+        <translation type="obsolete">MusE: Syntinställningar</translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location filename="../../muse/widgets/synthconfigbase.ui" line="+94"/>
         <source>Soft Synthesizer</source>
         <translation>Mjukvarusynt</translation>
     </message>
@@ -15064,18 +17191,18 @@ click on the Restart button.</source>
         <translation>Arkiv</translation>
     </message>
     <message>
-        <location line="-115"/>
+        <location line="-120"/>
         <source>Instances</source>
         <translation>Instanser</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location line="+115"/>
+        <location line="+125"/>
         <source>Name</source>
         <translation>Namn</translation>
     </message>
     <message>
-        <location line="-17"/>
+        <location line="-22"/>
         <source>list of available software synthesizers</source>
         <translation type="unfinished">lista med tillgängliga mjukvarusyntar</translation>
     </message>
@@ -15095,12 +17222,23 @@ click on the Restart button.</source>
         <translation type="unfinished">Midiport</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="-26"/>
+        <source>Midi Port and Soft Synth Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location line="+110"/>
+        <source>Type</source>
+        <translation type="unfinished">Typ</translation>
+    </message>
+    <message>
+        <location line="-67"/>
         <source>Midi connections</source>
         <translation type="unfinished">Midikopplingar</translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="+72"/>
         <source>Inst</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15226,14 +17364,6 @@ ljudfilerna skall hamna.</translation>
     </message>
 </context>
 <context>
-    <name>TempoSig</name>
-    <message>
-        <location filename="../../muse/transport.cpp" line="+103"/>
-        <source>Tempo/Sig</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>Toolbar1</name>
     <message>
         <source>Cursor</source>
@@ -15271,74 +17401,8 @@ ljudfilerna skall hamna.</translation>
 <context>
     <name>TopWin</name>
     <message>
-        <location filename="../../muse/cobject.cpp" line="+61"/>
-        <source>As subwindow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Shares tools and menu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Fullscreen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+418"/>
-        <source>Piano roll</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>List editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Drum editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Master track editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Master track list editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Wave editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Clip list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Marker view</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Score editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
         <source>Arranger</source>
-        <translation type="unfinished">Arrangerare</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>&lt;unknown toplevel type&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Arrangerare</translation>
     </message>
 </context>
 <context>
@@ -15355,158 +17419,68 @@ ljudfilerna skall hamna.</translation>
 <context>
     <name>Transport</name>
     <message>
-        <location filename="../../muse/transport.cpp" line="+105"/>
-        <source>Overdub</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <location line="+15"/>
         <source>Replace</source>
-        <translation>Ersätt</translation>
+        <translation type="obsolete">Ersätt</translation>
     </message>
     <message>
-        <location line="-10"/>
         <source>Rec Mode</source>
-        <translation>Recläge</translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Normal</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Recläge</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Mix</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Cycle Rec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <source>punchin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>loop</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>punchout</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <location line="+3"/>
-        <source>Punch In</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-2"/>
-        <location line="+3"/>
-        <source>Loop</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-2"/>
-        <location line="+3"/>
-        <source>Punch Out</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+33"/>
         <source>Left Mark</source>
-        <translation>Vänster Markering</translation>
+        <translation type="obsolete">Vänster Markering</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Right Mark</source>
-        <translation>Höger Markering</translation>
+        <translation type="obsolete">Höger Markering</translation>
     </message>
     <message>
-        <location line="+47"/>
         <source>rewind to start</source>
-        <translation>flytta tillbaka till början</translation>
+        <translation type="obsolete">flytta tillbaka till början</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>rewind</source>
-        <translation>flytta tillbaka</translation>
+        <translation type="obsolete">flytta tillbaka</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>forward</source>
-        <translation>frammåt</translation>
+        <translation type="obsolete">frammåt</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>stop</source>
-        <translation>stopp</translation>
+        <translation type="obsolete">stopp</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>play</source>
-        <translation>spela</translation>
+        <translation type="obsolete">spela</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>record</source>
-        <translation>spela in</translation>
-    </message>
-    <message>
-        <location line="+28"/>
-        <source>AC</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">spela in</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>quantize during record</source>
-        <translation>kvantisera under inspelning</translation>
+        <translation type="obsolete">kvantisera under inspelning</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Click</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location line="+0"/>
         <source>metronom click on/off</source>
-        <translation>metronomklick av/på</translation>
+        <translation type="obsolete">metronomklick av/på</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Sync</source>
-        <translation>Synk</translation>
+        <translation type="obsolete">Synk</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>external sync on/off</source>
-        <translation>externsynk. av/på</translation>
+        <translation type="obsolete">externsynk. av/på</translation>
     </message>
     <message>
-        <location line="+45"/>
         <source>Master</source>
-        <translation>Master</translation>
+        <translation type="obsolete">Master</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>use master track</source>
-        <translation>använder masterspår</translation>
-    </message>
-    <message>
-        <location line="-43"/>
-        <source>Jack</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Jack transport sync on/off</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">använder masterspår</translation>
     </message>
 </context>
 <context>
@@ -15943,139 +17917,68 @@ Robert Jonsson
         <translation type="obsolete">Normalisera</translation>
     </message>
     <message>
-        <location filename="../../muse/waveedit/waveedit.cpp" line="+196"/>
-        <source>Solo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
         <source>Cursor</source>
-        <translation>Markör</translation>
+        <translation type="obsolete">Markör</translation>
     </message>
     <message>
-        <location line="-115"/>
         <source>&amp;Edit</source>
-        <translation type="unfinished">&amp;Redigera</translation>
+        <translation type="obsolete">&amp;Redigera</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Func&amp;tions</source>
-        <translation type="unfinished">Funk&amp;tioner</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>200%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>150%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>75%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>50%</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Funk&amp;tioner</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>25%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
         <source>Other</source>
-        <translation type="unfinished">Andra</translation>
-    </message>
-    <message>
-        <location line="-22"/>
-        <source>&amp;Gain</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Andra</translation>
     </message>
     <message>
-        <location line="+30"/>
         <source>&amp;Copy</source>
-        <translation type="unfinished">&amp;Kopiera</translation>
+        <translation type="obsolete">&amp;Kopiera</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>C&amp;ut</source>
-        <translation type="unfinished">Klipp &amp;ut</translation>
+        <translation type="obsolete">Klipp &amp;ut</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Paste</source>
-        <translation type="unfinished">K&amp;listra in</translation>
+        <translation type="obsolete">K&amp;listra in</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Edit in E&amp;xternal Editor</source>
-        <translation type="unfinished">Editera i e&amp;xtern redigerare</translation>
+        <translation type="obsolete">Editera i e&amp;xtern redigerare</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Mute Selection</source>
-        <translation type="unfinished">Tysta markering</translation>
+        <translation type="obsolete">Tysta markering</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Normalize Selection</source>
-        <translation type="unfinished">Normalisera markering</translation>
+        <translation type="obsolete">Normalisera markering</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Fade In Selection</source>
-        <translation type="unfinished">Tona in markering</translation>
+        <translation type="obsolete">Tona in markering</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Fade Out Selection</source>
-        <translation type="unfinished">Tona ut Markering</translation>
+        <translation type="obsolete">Tona ut Markering</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Reverse Selection</source>
-        <translation type="unfinished">Reversera markering</translation>
+        <translation type="obsolete">Reversera markering</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Select &amp;All</source>
-        <translation type="unfinished">Markera &amp;Allt</translation>
+        <translation type="obsolete">Markera &amp;Allt</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Deselect All</source>
-        <translation type="unfinished">A&amp;vmarkera Allt</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Window &amp;Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+23"/>
-        <source>WaveEdit tools</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">A&amp;vmarkera Allt</translation>
     </message>
     <message>
-        <location line="-34"/>
         <source>Select</source>
-        <translation type="unfinished">Välj</translation>
-    </message>
-    <message>
-        <location line="+17"/>
-        <source>Wave edit tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+9"/>
-        <source>transport</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Välj</translation>
     </message>
 </context>
 <context>
@@ -16108,39 +18011,207 @@ Robert Jonsson
 <context>
     <name>WaveView</name>
     <message>
-        <location filename="../../muse/waveedit/waveview.cpp" line="+359"/>
         <source>MusE - external editor failed</source>
-        <translation type="unfinished">MusE - fel med extern redigerare </translation>
+        <translation type="obsolete">MusE - fel med extern redigerare </translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>MusE was unable to launch the external editor
 check if the editor setting in:
 Global Settings-&gt;Audio:External Waveditor
 is set to a valid editor.</source>
-        <translation type="unfinished">MusE kunde inte starta extern redigerare
+        <translation type="obsolete">MusE kunde inte starta extern redigerare
 kontrollera om inställningarna i:
 Globala inställningar-&gt;Ljud:Extern ljudredigerare
 är satt till en giltig redigerarbinär</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>MusE - file size changed</source>
-        <translation type="unfinished">MusE - filstorleken har förändrats</translation>
+        <translation type="obsolete">MusE - filstorleken har förändrats</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>When editing in external editor - you should not change the filesize
 since it must fit the selected region.
 
 Missing data is muted</source>
-        <translation type="unfinished">Vid editering i extern editor - bör du inte ändra filstorleken
+        <translation type="obsolete">Vid editering i extern editor - bör du inte ändra filstorleken
 eftersom den måste passa i regionen.
 
 Saknat data tystas</translation>
     </message>
 </context>
 <context>
+    <name>file_patterns</name>
+    <message>
+        <location filename="../../muse/globals.cpp" line="+120"/>
+        <source>Midi/Kar (*.mid *.MID *.kar *.KAR *.mid.gz *.mid.bz2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi (*.mid *.MID *.mid.gz *.mid.bz2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Karaoke (*.kar *.KAR *.kar.gz *.kar.bz2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+24"/>
+        <location line="+11"/>
+        <location line="+7"/>
+        <location line="+9"/>
+        <location line="+15"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+8"/>
+        <location line="+6"/>
+        <location line="+8"/>
+        <location line="+8"/>
+        <source>All Files (*)</source>
+        <translation type="unfinished">Alla filer (*)</translation>
+    </message>
+    <message>
+        <location line="-95"/>
+        <source>Midi (*.mid)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Karaoke (*.kar)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>all known files (*.med *.med.gz *.med.bz2 *.mid *.midi *.kar)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>med Files (*.med *.med.gz *.med.bz2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+8"/>
+        <source>Uncompressed med Files (*.med)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-7"/>
+        <location line="+8"/>
+        <source>gzip compressed med Files (*.med.gz)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-7"/>
+        <location line="+8"/>
+        <source>bzip2 compressed med Files (*.med.bz2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-7"/>
+        <source>mid Files (*.mid *.midi *.kar *.MID *.MIDI *.KAR)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>(*.jpg *.gif *.png)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>(*.jpg)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>(*.gif)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>(*.png)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>part Files (*.mpt *.mpt.gz *.mpt.bz2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>part Files (*.mpt)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>gzip compressed part Files (*.mpt.gz)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>bzip2 compressed part Files (*.mpt.bz2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Presets (*.pre *.pre.gz *.pre.bz2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Presets (*.pre)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>gzip compressed presets (*.pre.gz)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>bzip2 compressed presets (*.pre.bz2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Presets (*.map *.map.gz *.map.bz2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Presets (*.map)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>gzip compressed presets (*.map.gz)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>bzip2 compressed presets (*.map.bz2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Wave/Binary (*.wav *.ogg *.bin)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Wave (*.wav *.ogg)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Binary (*.bin)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>freeverb</name>
     <message>
         <source>Rooom Size</source>
@@ -16433,4 +18504,878 @@ Saknat data tystas</translation>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>shortcuts</name>
+    <message>
+        <location filename="../../muse/shortcuts.cpp" line="+54"/>
+        <source>Transport: Start playback from current location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Toggle metronome</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Stop Playback</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Goto Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Play, Stop, Rewind</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Goto left marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Goto right marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Toggle Loop section</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Toggle Record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Clear all rec enabled tracks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Toggle fullscreen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit: Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Copy in range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Redo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Paste (with dialog)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>File: New project</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>File: Open from disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>File: Save project</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>File: Open recent file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>File: Save as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>File: Load template</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>File: Import midi file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>File: Export midi file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>File: Import midi part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>File: Import audio file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>File: Quit MusE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit: Select parts on track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Open pianoroll</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Open drumeditor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Open listeditor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Open waveeditor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Open graphical mastertrack editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Open list mastertrack editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Open midi transformer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add midi track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add drum track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add wave track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add audio output</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add audio group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add audio input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add audio aux</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Structure: Global cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Structure: Global insert</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Structure: Global split</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Structure: Cut events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>View: Open mixer #1 window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>View: Open mixer #2 window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>View: Toggle transport window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>View: Toggle bigtime window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>View: Open marker window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Settings: Follow song by page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Follow song off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Follow song continuous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Settings: Global configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Configure shortcuts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Configure metronome</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Midi sync configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Midi file import/export configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Appearance settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Midi ports / Soft Synth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Settings: Audio subsystem configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Midi: Edit midi instruments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi: Open midi input transform</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi: Open midi input filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi: Midi input transpose</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi: Midi remote control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Midi: Random rhythm generator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Midi: Reset midi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi: Init midi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Midi: Midi local off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Audio: Bounce audio to track</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Audio: Bounce audio to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Audio: Restart audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Automation: Mixer automation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Automation: Take mixer snapshot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Automation: Clear mixer automation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Help: Open Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Help: Toggle whatsthis mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit: Edit selected part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select nearest part on track above</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Add nearest part on track above</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select nearest part on track below</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Add nearest part on track below</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit: Insert empty measure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit: Paste as clones</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Paste as clones (with dialog)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Select track above</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Select track below</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Midi: Transpose</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Edit: Select all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select none</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Invert Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select events/parts inside locators</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select events/parts outside locators</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select previous part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select next part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select nearest part/event to the left or move cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Add nearest part/event to the left to selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Select nearest part/event to the right or move cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Add nearest part/event to the right to selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Set locators to selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Increase pitch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Decrease pitch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Increase event position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Decrease event position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>View: Zoom in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>View: Zoom out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>View: Goto Current Position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+1"/>
+        <source>View: Scroll left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Edit: Set Fixed Length on Midi Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Quantize</source>
+        <translation type="unfinished">Kvantisera</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Modify Note Length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Modify Velocity</source>
+        <translation type="unfinished">Modifiera Velocity</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Crescendo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Thin Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Erase Event</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Delete Overlaps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Note Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Move Clock</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Copy Measure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Erase Measure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Delete Measure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Create Measure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Change Event Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tool: Pointer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tool: Pencil</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tool: Eraser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Tool: Line Draw</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Tool: Cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add note velocity 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add note velocity 2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add note velocity 3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add note velocity 4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cursor step size: larger</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cursor step size: smaller</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Instrument/Cursor up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Instrument/Cursor down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Tool: Scissor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tool: Glue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tool: Mute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Transport: Increase current position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Decrease current position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Transport: Increase current position, no snap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Transport: Decrease current position, no snap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Quantize: Set quantize to 1/1 note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantize: Set quantize to 1/2 note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantize: Set quantize to 1/4 note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantize: Set quantize to 1/8 note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantize: Set quantize to 1/16 note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantize: Set quantize to 1/32 note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantize: Set quantize to 1/64 note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Quantize: Toggle triol quantization</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantize: Toggle punctuation quantization</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantize: Toggle punctuation quantization (2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Insert at location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit: Increase length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit: Decrease length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Insert Note</source>
+        <translation type="unfinished">Mata in Not</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert SysEx</source>
+        <translation type="unfinished">Mata in SysEx</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert Ctrl</source>
+        <translation type="unfinished">Mata in Ctrl</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert Meta</source>
+        <translation type="unfinished">Mata in Meta</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert Channel Aftertouch</source>
+        <translation type="unfinished">Mata in Aftertouch för kanal</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert Key Aftertouch</source>
+        <translation type="unfinished">Mata in Key Aftertouch</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Insert Tempo</source>
+        <translation type="unfinished">Sätt in tempo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert Signature</source>
+        <translation type="unfinished">Sätt in signatur</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Change Event Position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Edit Event Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Insert Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Goto Next Marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Goto Prev Marker</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/muse2/share/plugins/1050.ui b/muse2/share/plugins/1050.ui
index bc478810..cd3f8689 100644
--- a/muse2/share/plugins/1050.ui
+++ b/muse2/share/plugins/1050.ui
@@ -43,7 +43,7 @@
     </widget>
    </item>
    <item row="1" column="2">
-    <widget class="Slider" name="P1slider" native="true">
+    <widget class="MusEGui::Slider" name="P1slider" native="true">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
        <horstretch>10</horstretch>
@@ -59,7 +59,7 @@
     </widget>
    </item>
    <item row="0" column="1">
-    <widget class="DoubleLabel" name="P0label" native="true">
+    <widget class="MusEGui::DoubleLabel" name="P0label" native="true">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
        <horstretch>0</horstretch>
@@ -87,7 +87,7 @@
     </widget>
    </item>
    <item row="1" column="1">
-    <widget class="DoubleLabel" name="P1label" native="true">
+    <widget class="MusEGui::DoubleLabel" name="P1label" native="true">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
        <horstretch>0</horstretch>
@@ -131,7 +131,7 @@
     </widget>
    </item>
    <item row="2" column="2">
-    <widget class="Slider" name="P2slider" native="true">
+    <widget class="MusEGui::Slider" name="P2slider" native="true">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
        <horstretch>10</horstretch>
@@ -147,7 +147,7 @@
     </widget>
    </item>
    <item row="2" column="1">
-    <widget class="DoubleLabel" name="P2label" native="true">
+    <widget class="MusEGui::DoubleLabel" name="P2label" native="true">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
        <horstretch>0</horstretch>
@@ -191,7 +191,7 @@
     </widget>
    </item>
    <item row="0" column="2">
-    <widget class="Slider" name="P0slider" native="true">
+    <widget class="MusEGui::Slider" name="P0slider" native="true">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
        <horstretch>10</horstretch>
@@ -211,12 +211,12 @@
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
-   <class>Slider</class>
+   <class>MusEGui::Slider</class>
    <extends>QWidget</extends>
    <header>slider.h</header>
   </customwidget>
   <customwidget>
-   <class>DoubleLabel</class>
+   <class>MusEGui::DoubleLabel</class>
    <extends>QWidget</extends>
    <header>doublelabel.h</header>
   </customwidget>
diff --git a/muse2/share/plugins/2142.ui b/muse2/share/plugins/2142.ui
index 82b9b73d..a1ee7def 100644
--- a/muse2/share/plugins/2142.ui
+++ b/muse2/share/plugins/2142.ui
@@ -37,7 +37,7 @@
     </widget>
    </item>
    <item row="0" column="1">
-    <widget class="DoubleLabel" name="P0label" native="true">
+    <widget class="MusEGui::DoubleLabel" name="P0label" native="true">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
        <horstretch>0</horstretch>
@@ -65,7 +65,7 @@
     </widget>
    </item>
    <item row="1" column="1">
-    <widget class="DoubleLabel" name="P1label" native="true">
+    <widget class="MusEGui::DoubleLabel" name="P1label" native="true">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
        <horstretch>0</horstretch>
@@ -106,7 +106,7 @@
     </widget>
    </item>
    <item row="2" column="1">
-    <widget class="DoubleLabel" name="P2label" native="true">
+    <widget class="MusEGui::DoubleLabel" name="P2label" native="true">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
        <horstretch>0</horstretch>
@@ -147,7 +147,7 @@
     </widget>
    </item>
    <item row="1" column="2" colspan="2">
-    <widget class="Slider" name="P1Slider" native="true">
+    <widget class="MusEGui::Slider" name="P1Slider" native="true">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
        <horstretch>10</horstretch>
@@ -166,7 +166,7 @@
     </widget>
    </item>
    <item row="2" column="2" colspan="2">
-    <widget class="Slider" name="P2Slider" native="true">
+    <widget class="MusEGui::Slider" name="P2Slider" native="true">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
        <horstretch>10</horstretch>
@@ -185,7 +185,7 @@
     </widget>
    </item>
    <item row="0" column="2" colspan="2">
-    <widget class="Slider" name="P0Slider" native="true">
+    <widget class="MusEGui::Slider" name="P0Slider" native="true">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
        <horstretch>10</horstretch>
@@ -478,12 +478,12 @@
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
-   <class>DoubleLabel</class>
+   <class>MusEGui::DoubleLabel</class>
    <extends>QWidget</extends>
    <header>doublelabel.h</header>
   </customwidget>
   <customwidget>
-   <class>Slider</class>
+   <class>MusEGui::Slider</class>
    <extends>QWidget</extends>
    <header>slider.h</header>
   </customwidget>
diff --git a/muse2/share/templates/MusE.cfg b/muse2/share/templates/MusE.cfg
index b95593d0..b64d9029 100644
--- a/muse2/share/templates/MusE.cfg
+++ b/muse2/share/templates/MusE.cfg
@@ -14,7 +14,6 @@
     <dummyAudioSampleRate>44100</dummyAudioSampleRate>
     <minControlProcessPeriod>64</minControlProcessPeriod>
     <guiRefresh>20</guiRefresh>
-    <userInstrumentsDir>/home/flo/.config/MusE/instruments</userInstrumentsDir>
     <extendedMidi>1</extendedMidi>
     <midiExportDivision>384</midiExportDivision>
     <guiDivision>384</guiDivision>
diff --git a/muse2/share/templates/audio.med b/muse2/share/templates/audio.med
index 27a3a79f..df4463ff 100644
--- a/muse2/share/templates/audio.med
+++ b/muse2/share/templates/audio.med
@@ -9,13 +9,6 @@
     <midiFilterCtrl2>0</midiFilterCtrl2>
     <midiFilterCtrl3>0</midiFilterCtrl3>
     <midiFilterCtrl4>0</midiFilterCtrl4>
-    <waveTracksVisible>1</waveTracksVisible>
-    <auxTracksVisible>1</auxTracksVisible>
-    <groupTracksVisible>1</groupTracksVisible>
-    <midiTracksVisible>1</midiTracksVisible>
-    <inputTracksVisible>1</inputTracksVisible>
-    <outputTracksVisible>1</outputTracksVisible>
-    <synthTracksVisible>1</synthTracksVisible>
     <mtctype>1</mtctype>
     <mtcoffset>00:00:00:00:00</mtcoffset>
     <sendClockDelay>1</sendClockDelay>
@@ -24,21 +17,10 @@
     <extSync>0</extSync>
     <bigtimeVisible>0</bigtimeVisible>
     <transportVisible>0</transportVisible>
-    <markerVisible>0</markerVisible>
-    <geometryMain x="0" y="0" w="1024" h="691"></geometryMain>
-    <geometryTransport x="0" y="0" w="100" h="30"></geometryTransport>
+    <geometryMain x="0" y="0" w="878" h="468"></geometryMain>
+    <geometryTransport x="0" y="0" w="607" h="86"></geometryTransport>
     <mixer1Visible>0</mixer1Visible>
     <mixer2Visible>0</mixer2Visible>
-    <arranger>
-      <info>1</info>
-      <split>418 600 </split>
-      <list>
-        <header> -1 9 8 7 6 5 4 3 2 1 0 </header>
-        </list>
-      <xpos>0</xpos>
-      <xmag>266</xmag>
-      <ypos>0</ypos>
-      </arranger>
     <sequencer>
       <metronom>
         <premeasures>2</premeasures>
@@ -292,68 +274,6 @@
           </channel>
         </midiport>
       </sequencer>
-    <drumedit>
-      <raster>96</raster>
-      <dlistwidth>126</dlistwidth>
-      <dcanvaswidth>753</dcanvaswidth>
-      <topwin>
-        <width>934</width>
-        <height>488</height>
-        <nonshared_toolbars>000000ff00000000fd00000000000003ae0000019e00000004000000040000000800000008fc00000002000000020000000400000014004400720075006d00200074006f006f006c00730100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c007301000000f5ffffffff000000000000000000000012007400720061006e00730070006f007200740100000198ffffffff00000000000000000000000a00700061006e0069006301000002be000000f8000000000000000000000002000000030000000c0063007500720073006f00720100000000ffffffff0000000000000000000000260050006f0073002f0053006e00610070002f0053006f006c006f002d0074006f006f006c00730100000081ffffffff000000000000000000000012004e006f0074006500200049006e0066006f01000001a90000020d0000000000000000</nonshared_toolbars>
-        <shared_toolbars>000000ff00000000fd00000000000004000000024d00000004000000040000000800000008fc0000000200000002000000050000001800460069006c006500200042007500740074006f006e007301000000000000008c000000000000000000000014004400720075006d00200074006f006f006c0073010000008cffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000181ffffffff000000000000000000000012007400720061006e00730070006f007200740100000224ffffffff00000000000000000000000a00700061006e00690063010000034a000000b6000000000000000000000002000000030000000c0063007500720073006f00720100000000ffffffff0000000000000000000000260050006f0073002f0053006e00610070002f0053006f006c006f002d0074006f006f006c00730100000081ffffffff000000000000000000000012004e006f0074006500200049006e0066006f01000001a9000002570000000000000000</shared_toolbars>
-        <shares_when_free>0</shares_when_free>
-        <shares_when_subwin>1</shares_when_subwin>
-        <default_subwin>0</default_subwin>
-        </topwin>
-      </drumedit>
-    <pianoroll>
-      <raster>96</raster>
-      <colormode>0</colormode>
-      <topwin>
-        <width>852</width>
-        <height>460</height>
-        <nonshared_toolbars>000000ff00000000fd000000000000035c0000018200000004000000040000000800000008fc0000000200000002000000040000001e005000690061006e006f0072006f006c006c00200074006f006f006c00730100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c007301000000ae00000098000000000000000000000012007400720061006e00730070006f007200740100000146ffffffff00000000000000000000000a00700061006e00690063010000026c000000f800000000000000000000000200000002000000260050006f0073002f0053006e00610070002f0053006f006c006f002d0074006f006f006c00730100000000ffffffff000000000000000000000012004e006f0074006500200049006e0066006f0100000152000002120000000000000000</nonshared_toolbars>
-        <shared_toolbars>000000ff00000000fd00000000000004000000024d00000004000000040000000800000008fc0000000200000002000000050000001800460069006c006500200042007500740074006f006e007301000000000000008c00000000000000000000001e005000690061006e006f0072006f006c006c00200074006f006f006c0073010000008cffffffff000000000000000000000014004500640069007400200054006f006f006c0073010000013affffffff000000000000000000000012007400720061006e00730070006f0072007401000001bfffffffff00000000000000000000000a00700061006e0069006301000002e50000011b00000000000000000000000200000002000000260050006f0073002f0053006e00610070002f0053006f006c006f002d0074006f006f006c00730100000000ffffffff000000000000000000000012004e006f0074006500200049006e0066006f0100000152000002ae0000000000000000</shared_toolbars>
-        <shares_when_free>0</shares_when_free>
-        <shares_when_subwin>1</shares_when_subwin>
-        <default_subwin>0</default_subwin>
-        </topwin>
-      </pianoroll>
-    <scoreedit>
-      <topwin>
-        <width>867</width>
-        <height>544</height>
-        <nonshared_toolbars>000000ff00000000fd000000000000036b000001e300000004000000040000000800000008fc0000000200000002000000060000001e0055006e0064006f002f005200650064006f00200074006f006f006c00730100000000ffffffff00000000000000000000002800530074006500700020007200650063006f007200640069006e006700200074006f006f006c00730100000049ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000074ffffffff00000000000000000000002a005100750061006e007400690073006100740069006f006e002000730065007400740069006e0067007301000000dbffffffff000000000000000000000012007400720061006e00730070006f007200740100000203ffffffff00000000000000000000000a00700061006e006900630100000329000000420000000000000000000000020000000100000022004e006500770020006e006f00740065002000730065007400740069006e006700730100000000ffffffff0000000000000000</nonshared_toolbars>
-        <shared_toolbars>000000ff00000000fd00000000000004000000025900000004000000040000000800000008fc0000000200000002000000060000001800460069006c006500200042007500740074006f006e007301000000000000008c00000000000000000000001e0055006e0064006f002f005200650064006f00200074006f006f006c0073010000008cffffffff00000000000000000000002800530074006500700020007200650063006f007200640069006e006700200074006f006f006c007301000000d5ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000100ffffffff000000000000000000000012007400720061006e00730070006f007200740100000167ffffffff00000000000000000000000a00700061006e00690063010000028d000001730000000000000000000000020000000200000022004e006500770020006e006f00740065002000730065007400740069006e006700730100000000ffffffff00000000000000000000002a005100750061006e007400690073006100740069006f006e002000730065007400740069006e0067007301000002650000019b0000000000000000</shared_toolbars>
-        <shares_when_free>0</shares_when_free>
-        <shares_when_subwin>1</shares_when_subwin>
-        <default_subwin>0</default_subwin>
-        </topwin>
-      </scoreedit>
-    <masteredit>
-      <raster>0</raster>
-      <topwin>
-        <width>784</width>
-        <height>544</height>
-        <nonshared_toolbars>000000ff00000000fd0000000000000318000001ce00000004000000040000000800000008fc0000000200000002000000040000001e0055006e0064006f002f005200650064006f00200074006f006f006c00730100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000049ffffffff000000000000000000000012007400720061006e00730070006f0072007401000000b0ffffffff00000000000000000000000a00700061006e0069006301000001d600000142000000000000000000000002000000020000001a0045006e00610062006c00650020006d006100730074006500720100000000ffffffff0000000000000000000000080049006e0066006f010000005d000002bb0000000000000000</nonshared_toolbars>
-        <shared_toolbars>000000ff00000000fd00000000000004000000024500000004000000040000000800000008fc0000000200000002000000050000001800460069006c006500200042007500740074006f006e007301000000000000008c00000000000000000000001e0055006e0064006f002f005200650064006f00200074006f006f006c0073010000008cffffffff000000000000000000000014004500640069007400200054006f006f006c007301000000d500000071000000000000000000000012007400720061006e00730070006f007200740100000146ffffffff00000000000000000000000a00700061006e00690063010000026c00000194000000000000000000000002000000020000001a0045006e00610062006c00650020006d006100730074006500720100000000ffffffff0000000000000000000000080049006e0066006f010000005d000003a30000000000000000</shared_toolbars>
-        <shares_when_free>0</shares_when_free>
-        <shares_when_subwin>1</shares_when_subwin>
-        <default_subwin>0</default_subwin>
-        </topwin>
-      </masteredit>
-    <waveedit>
-      <bgcolor r="200" g="200" b="200"></bgcolor>
-      <topwin>
-        <width>760</width>
-        <height>460</height>
-        <nonshared_toolbars>000000ff00000000fd0000000000000300000001ac00000004000000040000000800000008fc0000000100000002000000030000001e00570061007600650020006500640069007400200074006f006f006c00730100000000ffffffff00000000000000000000001c0057006100760065004500640069007400200074006f006f006c00730100000049ffffffff000000000000000000000012007400720061006e00730070006f007200740100000184ffffffff0000000000000000</nonshared_toolbars>
-        <shared_toolbars>000000ff00000000fd00000000000004000000027700000004000000040000000800000008fc0000000100000002000000040000001800460069006c006500200042007500740074006f006e007301000000000000008c00000000000000000000001e00570061007600650020006500640069007400200074006f006f006c0073010000008cffffffff00000000000000000000001c0057006100760065004500640069007400200074006f006f006c007301000000d5ffffffff000000000000000000000012007400720061006e00730070006f007200740100000210ffffffff0000000000000000</shared_toolbars>
-        <shares_when_free>0</shares_when_free>
-        <shares_when_subwin>1</shares_when_subwin>
-        <default_subwin>0</default_subwin>
-        </topwin>
-      </waveedit>
     <dialogs>
       <mod_len>
         <range>1</range>
@@ -444,6 +364,47 @@
     <len>0</len>
     <follow>1</follow>
     <sampleRate>44100</sampleRate>
+    <AudioOutput>
+      <name>Out 1</name>
+      <record>0</record>
+      <mute>0</mute>
+      <solo>0</solo>
+      <off>0</off>
+      <channels>2</channels>
+      <height>20</height>
+      <locked>1</locked>
+      <selected>1</selected>
+      <prefader>0</prefader>
+      <sendMetronome>0</sendMetronome>
+      <automation>0</automation>
+      <controller id="0" cur="1.02164" color="#ff0000" visible="0">
+        </controller>
+      <controller id="1" cur="0" color="#ff0000" visible="0">
+        </controller>
+      <controller id="2" cur="0" color="#0000ff" visible="0">
+        </controller>
+      </AudioOutput>
+    <AudioInput>
+      <name>Input 1</name>
+      <record>0</record>
+      <mute>1</mute>
+      <solo>0</solo>
+      <off>0</off>
+      <channels>2</channels>
+      <height>20</height>
+      <locked>1</locked>
+      <prefader>0</prefader>
+      <sendMetronome>0</sendMetronome>
+      <automation>0</automation>
+      <auxSend idx="0">0</auxSend>
+      <auxSend idx="1">0</auxSend>
+      <controller id="0" cur="1.02164" color="#ff0000" visible="0">
+        </controller>
+      <controller id="1" cur="0" color="#ff0000" visible="0">
+        </controller>
+      <controller id="2" cur="0" color="#0000ff" visible="0">
+        </controller>
+      </AudioInput>
     <wavetrack>
       <name>Track 1</name>
       <record>0</record>
@@ -453,13 +414,12 @@
       <channels>1</channels>
       <height>20</height>
       <locked>0</locked>
-      <selected>1</selected>
       <prefader>0</prefader>
       <sendMetronome>0</sendMetronome>
-      <automation>1</automation>
+      <automation>0</automation>
       <auxSend idx="0">0</auxSend>
       <auxSend idx="1">0</auxSend>
-      <controller id="0" cur="0" color="#ff0000" visible="0">
+      <controller id="0" cur="1.02164" color="#ff0000" visible="0">
         </controller>
       <controller id="1" cur="0" color="#ff0000" visible="0">
         </controller>
@@ -477,10 +437,10 @@
       <locked>1</locked>
       <prefader>0</prefader>
       <sendMetronome>0</sendMetronome>
-      <automation>1</automation>
+      <automation>0</automation>
       <auxSend idx="0">0</auxSend>
       <auxSend idx="1">0</auxSend>
-      <controller id="0" cur="0" color="#ff0000" visible="0">
+      <controller id="0" cur="1.02164" color="#ff0000" visible="0">
         </controller>
       <controller id="1" cur="0" color="#ff0000" visible="0">
         </controller>
@@ -498,10 +458,10 @@
       <locked>0</locked>
       <prefader>0</prefader>
       <sendMetronome>0</sendMetronome>
-      <automation>1</automation>
+      <automation>0</automation>
       <auxSend idx="0">0</auxSend>
       <auxSend idx="1">0</auxSend>
-      <controller id="0" cur="0" color="#ff0000" visible="0">
+      <controller id="0" cur="1.02164" color="#ff0000" visible="0">
         </controller>
       <controller id="1" cur="0" color="#ff0000" visible="0">
         </controller>
@@ -519,10 +479,10 @@
       <locked>0</locked>
       <prefader>0</prefader>
       <sendMetronome>0</sendMetronome>
-      <automation>1</automation>
+      <automation>0</automation>
       <auxSend idx="0">0</auxSend>
       <auxSend idx="1">0</auxSend>
-      <controller id="0" cur="0" color="#ff0000" visible="0">
+      <controller id="0" cur="1.02164" color="#ff0000" visible="0">
         </controller>
       <controller id="1" cur="0" color="#ff0000" visible="0">
         </controller>
@@ -540,10 +500,10 @@
       <locked>1</locked>
       <prefader>0</prefader>
       <sendMetronome>0</sendMetronome>
-      <automation>1</automation>
+      <automation>0</automation>
       <auxSend idx="0">0</auxSend>
       <auxSend idx="1">0</auxSend>
-      <controller id="0" cur="0" color="#ff0000" visible="0">
+      <controller id="0" cur="1.02164" color="#ff0000" visible="0">
         </controller>
       <controller id="1" cur="0" color="#ff0000" visible="0">
         </controller>
@@ -561,10 +521,10 @@
       <locked>0</locked>
       <prefader>0</prefader>
       <sendMetronome>0</sendMetronome>
-      <automation>1</automation>
+      <automation>0</automation>
       <auxSend idx="0">0</auxSend>
       <auxSend idx="1">0</auxSend>
-      <controller id="0" cur="0" color="#ff0000" visible="0">
+      <controller id="0" cur="1.02164" color="#ff0000" visible="0">
         </controller>
       <controller id="1" cur="0" color="#ff0000" visible="0">
         </controller>
@@ -582,8 +542,8 @@
       <locked>1</locked>
       <prefader>0</prefader>
       <sendMetronome>0</sendMetronome>
-      <automation>1</automation>
-      <controller id="0" cur="0" color="#ff0000" visible="0">
+      <automation>0</automation>
+      <controller id="0" cur="1.02164" color="#ff0000" visible="0">
         </controller>
       <controller id="1" cur="0" color="#ff0000" visible="0">
         </controller>
@@ -601,54 +561,70 @@
       <locked>1</locked>
       <prefader>0</prefader>
       <sendMetronome>0</sendMetronome>
-      <automation>1</automation>
-      <controller id="0" cur="0" color="#ff0000" visible="0">
+      <automation>0</automation>
+      <controller id="0" cur="1.02164" color="#ff0000" visible="0">
         </controller>
       <controller id="1" cur="0" color="#ff0000" visible="0">
         </controller>
       <controller id="2" cur="0" color="#0000ff" visible="0">
         </controller>
       </AudioAux>
-    <AudioInput>
-      <name>Input 1</name>
-      <record>0</record>
-      <mute>1</mute>
-      <solo>0</solo>
-      <off>0</off>
-      <channels>2</channels>
-      <height>20</height>
-      <locked>1</locked>
-      <prefader>0</prefader>
-      <sendMetronome>0</sendMetronome>
-      <automation>1</automation>
-      <auxSend idx="0">0</auxSend>
-      <auxSend idx="1">0</auxSend>
-      <controller id="0" cur="0" color="#ff0000" visible="0">
-        </controller>
-      <controller id="1" cur="0" color="#ff0000" visible="0">
-        </controller>
-      <controller id="2" cur="0" color="#0000ff" visible="0">
-        </controller>
-      </AudioInput>
-    <AudioOutput>
-      <name>Out 1</name>
-      <record>0</record>
-      <mute>0</mute>
-      <solo>0</solo>
-      <off>0</off>
-      <channels>2</channels>
-      <height>20</height>
-      <locked>1</locked>
-      <prefader>0</prefader>
-      <sendMetronome>0</sendMetronome>
-      <automation>1</automation>
-      <controller id="0" cur="0" color="#ff0000" visible="0">
-        </controller>
-      <controller id="1" cur="0" color="#ff0000" visible="0">
-        </controller>
-      <controller id="2" cur="0" color="#0000ff" visible="0">
-        </controller>
-      </AudioOutput>
+    <Route channel="0">
+      <source name="Out 1"/>
+      <dest type="1" name="system:playback_1"/>
+      </Route>
+    <Route channel="1">
+      <source name="Out 1"/>
+      <dest type="1" name="system:playback_2"/>
+      </Route>
+    <Route channel="0">
+      <source type="1" name="system:capture_1"/>
+      <dest name="Input 1"/>
+      </Route>
+    <Route channel="1">
+      <source type="1" name="system:capture_2"/>
+      <dest name="Input 1"/>
+      </Route>
+    <Route>
+      <source name="Input 1"/>
+      <dest name="Track 1"/>
+      </Route>
+    <Route>
+      <source name="Input 1"/>
+      <dest name="Track 2"/>
+      </Route>
+    <Route>
+      <source name="Input 1"/>
+      <dest name="Track 3"/>
+      </Route>
+    <Route>
+      <source name="Input 1"/>
+      <dest name="Track 4"/>
+      </Route>
+    <Route>
+      <source name="Track 1"/>
+      <dest name="Group 1"/>
+      </Route>
+    <Route>
+      <source name="Track 2"/>
+      <dest name="Group 1"/>
+      </Route>
+    <Route>
+      <source name="Track 3"/>
+      <dest name="Group 2"/>
+      </Route>
+    <Route>
+      <source name="Track 4"/>
+      <dest name="Group 2"/>
+      </Route>
+    <Route>
+      <source name="Group 1"/>
+      <dest name="Out 1"/>
+      </Route>
+    <Route>
+      <source name="Group 2"/>
+      <dest name="Out 1"/>
+      </Route>
     <tempolist fix="500000">
       <tempo at="21474837">
         <tick>0</tick>
@@ -675,11 +651,24 @@
     <arrangerview>
       <topwin>
         <is_subwin>1</is_subwin>
-        <geometry_state>01d9d0cb000100000000000000000000000003ff000002440000000000000000fffffffefffffffe000000000200</geometry_state>
+        <x>0</x>
+        <y>0</y>
+        <width>850</width>
+        <height>382</height>
         <shares_menu>1</shares_menu>
         <toolbars>000000ff00000000fd00000000000000000000000000000004000000040000000800000008fc00000000</toolbars>
         </topwin>
       <tool>1</tool>
+      <arranger>
+        <info>1</info>
+        <split>370 477 </split>
+        <list>
+          <header> 7 9 8 6 5 4 3 2 1 0 </header>
+          </list>
+        <xpos>0</xpos>
+        <xmag>266</xmag>
+        <ypos>0</ypos>
+        </arranger>
       </arrangerview>
     </toplevels>
   </muse>
diff --git a/muse2/share/templates/default.med b/muse2/share/templates/default.med
index 2c13e64f..49ccbc02 100644
--- a/muse2/share/templates/default.med
+++ b/muse2/share/templates/default.med
@@ -9,13 +9,6 @@
     <midiFilterCtrl2>0</midiFilterCtrl2>
     <midiFilterCtrl3>0</midiFilterCtrl3>
     <midiFilterCtrl4>0</midiFilterCtrl4>
-    <waveTracksVisible>1</waveTracksVisible>
-    <auxTracksVisible>1</auxTracksVisible>
-    <groupTracksVisible>1</groupTracksVisible>
-    <midiTracksVisible>1</midiTracksVisible>
-    <inputTracksVisible>1</inputTracksVisible>
-    <outputTracksVisible>1</outputTracksVisible>
-    <synthTracksVisible>1</synthTracksVisible>
     <mtctype>1</mtctype>
     <mtcoffset>00:00:00:00:00</mtcoffset>
     <sendClockDelay>1</sendClockDelay>
@@ -24,21 +17,8 @@
     <extSync>0</extSync>
     <bigtimeVisible>0</bigtimeVisible>
     <transportVisible>0</transportVisible>
-    <markerVisible>0</markerVisible>
-    <geometryMain x="0" y="0" w="1024" h="691"></geometryMain>
-    <geometryTransport x="0" y="0" w="100" h="30"></geometryTransport>
     <mixer1Visible>0</mixer1Visible>
     <mixer2Visible>0</mixer2Visible>
-    <arranger>
-      <info>1</info>
-      <split>418 600 </split>
-      <list>
-        <header> -1 9 8 7 6 5 4 3 2 1 0 </header>
-        </list>
-      <xpos>0</xpos>
-      <xmag>266</xmag>
-      <ypos>0</ypos>
-      </arranger>
     <sequencer>
       <metronom>
         <premeasures>2</premeasures>
@@ -292,68 +272,6 @@
           </channel>
         </midiport>
       </sequencer>
-    <drumedit>
-      <raster>96</raster>
-      <dlistwidth>126</dlistwidth>
-      <dcanvaswidth>753</dcanvaswidth>
-      <topwin>
-        <width>934</width>
-        <height>488</height>
-        <nonshared_toolbars>000000ff00000000fd00000000000003ae0000019e00000004000000040000000800000008fc00000002000000020000000400000014004400720075006d00200074006f006f006c00730100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c007301000000f5ffffffff000000000000000000000012007400720061006e00730070006f007200740100000198ffffffff00000000000000000000000a00700061006e0069006301000002be000000f8000000000000000000000002000000030000000c0063007500720073006f00720100000000ffffffff0000000000000000000000260050006f0073002f0053006e00610070002f0053006f006c006f002d0074006f006f006c00730100000081ffffffff000000000000000000000012004e006f0074006500200049006e0066006f01000001a90000020d0000000000000000</nonshared_toolbars>
-        <shared_toolbars>000000ff00000000fd00000000000004000000024d00000004000000040000000800000008fc0000000200000002000000050000001800460069006c006500200042007500740074006f006e007301000000000000008c000000000000000000000014004400720075006d00200074006f006f006c0073010000008cffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000181ffffffff000000000000000000000012007400720061006e00730070006f007200740100000224ffffffff00000000000000000000000a00700061006e00690063010000034a000000b6000000000000000000000002000000030000000c0063007500720073006f00720100000000ffffffff0000000000000000000000260050006f0073002f0053006e00610070002f0053006f006c006f002d0074006f006f006c00730100000081ffffffff000000000000000000000012004e006f0074006500200049006e0066006f01000001a9000002570000000000000000</shared_toolbars>
-        <shares_when_free>0</shares_when_free>
-        <shares_when_subwin>1</shares_when_subwin>
-        <default_subwin>0</default_subwin>
-        </topwin>
-      </drumedit>
-    <pianoroll>
-      <raster>96</raster>
-      <colormode>0</colormode>
-      <topwin>
-        <width>852</width>
-        <height>460</height>
-        <nonshared_toolbars>000000ff00000000fd000000000000035c0000018200000004000000040000000800000008fc0000000200000002000000040000001e005000690061006e006f0072006f006c006c00200074006f006f006c00730100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c007301000000ae00000098000000000000000000000012007400720061006e00730070006f007200740100000146ffffffff00000000000000000000000a00700061006e00690063010000026c000000f800000000000000000000000200000002000000260050006f0073002f0053006e00610070002f0053006f006c006f002d0074006f006f006c00730100000000ffffffff000000000000000000000012004e006f0074006500200049006e0066006f0100000152000002120000000000000000</nonshared_toolbars>
-        <shared_toolbars>000000ff00000000fd00000000000004000000024d00000004000000040000000800000008fc0000000200000002000000050000001800460069006c006500200042007500740074006f006e007301000000000000008c00000000000000000000001e005000690061006e006f0072006f006c006c00200074006f006f006c0073010000008cffffffff000000000000000000000014004500640069007400200054006f006f006c0073010000013affffffff000000000000000000000012007400720061006e00730070006f0072007401000001bfffffffff00000000000000000000000a00700061006e0069006301000002e50000011b00000000000000000000000200000002000000260050006f0073002f0053006e00610070002f0053006f006c006f002d0074006f006f006c00730100000000ffffffff000000000000000000000012004e006f0074006500200049006e0066006f0100000152000002ae0000000000000000</shared_toolbars>
-        <shares_when_free>0</shares_when_free>
-        <shares_when_subwin>1</shares_when_subwin>
-        <default_subwin>0</default_subwin>
-        </topwin>
-      </pianoroll>
-    <scoreedit>
-      <topwin>
-        <width>867</width>
-        <height>544</height>
-        <nonshared_toolbars>000000ff00000000fd000000000000036b000001e300000004000000040000000800000008fc0000000200000002000000060000001e0055006e0064006f002f005200650064006f00200074006f006f006c00730100000000ffffffff00000000000000000000002800530074006500700020007200650063006f007200640069006e006700200074006f006f006c00730100000049ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000074ffffffff00000000000000000000002a005100750061006e007400690073006100740069006f006e002000730065007400740069006e0067007301000000dbffffffff000000000000000000000012007400720061006e00730070006f007200740100000203ffffffff00000000000000000000000a00700061006e006900630100000329000000420000000000000000000000020000000100000022004e006500770020006e006f00740065002000730065007400740069006e006700730100000000ffffffff0000000000000000</nonshared_toolbars>
-        <shared_toolbars>000000ff00000000fd00000000000004000000025900000004000000040000000800000008fc0000000200000002000000060000001800460069006c006500200042007500740074006f006e007301000000000000008c00000000000000000000001e0055006e0064006f002f005200650064006f00200074006f006f006c0073010000008cffffffff00000000000000000000002800530074006500700020007200650063006f007200640069006e006700200074006f006f006c007301000000d5ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000100ffffffff000000000000000000000012007400720061006e00730070006f007200740100000167ffffffff00000000000000000000000a00700061006e00690063010000028d000001730000000000000000000000020000000200000022004e006500770020006e006f00740065002000730065007400740069006e006700730100000000ffffffff00000000000000000000002a005100750061006e007400690073006100740069006f006e002000730065007400740069006e0067007301000002650000019b0000000000000000</shared_toolbars>
-        <shares_when_free>0</shares_when_free>
-        <shares_when_subwin>1</shares_when_subwin>
-        <default_subwin>0</default_subwin>
-        </topwin>
-      </scoreedit>
-    <masteredit>
-      <raster>0</raster>
-      <topwin>
-        <width>784</width>
-        <height>544</height>
-        <nonshared_toolbars>000000ff00000000fd0000000000000318000001ce00000004000000040000000800000008fc0000000200000002000000040000001e0055006e0064006f002f005200650064006f00200074006f006f006c00730100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000049ffffffff000000000000000000000012007400720061006e00730070006f0072007401000000b0ffffffff00000000000000000000000a00700061006e0069006301000001d600000142000000000000000000000002000000020000001a0045006e00610062006c00650020006d006100730074006500720100000000ffffffff0000000000000000000000080049006e0066006f010000005d000002bb0000000000000000</nonshared_toolbars>
-        <shared_toolbars>000000ff00000000fd00000000000004000000024500000004000000040000000800000008fc0000000200000002000000050000001800460069006c006500200042007500740074006f006e007301000000000000008c00000000000000000000001e0055006e0064006f002f005200650064006f00200074006f006f006c0073010000008cffffffff000000000000000000000014004500640069007400200054006f006f006c007301000000d500000071000000000000000000000012007400720061006e00730070006f007200740100000146ffffffff00000000000000000000000a00700061006e00690063010000026c00000194000000000000000000000002000000020000001a0045006e00610062006c00650020006d006100730074006500720100000000ffffffff0000000000000000000000080049006e0066006f010000005d000003a30000000000000000</shared_toolbars>
-        <shares_when_free>0</shares_when_free>
-        <shares_when_subwin>1</shares_when_subwin>
-        <default_subwin>0</default_subwin>
-        </topwin>
-      </masteredit>
-    <waveedit>
-      <bgcolor r="200" g="200" b="200"></bgcolor>
-      <topwin>
-        <width>760</width>
-        <height>460</height>
-        <nonshared_toolbars>000000ff00000000fd0000000000000300000001ac00000004000000040000000800000008fc0000000100000002000000030000001e00570061007600650020006500640069007400200074006f006f006c00730100000000ffffffff00000000000000000000001c0057006100760065004500640069007400200074006f006f006c00730100000049ffffffff000000000000000000000012007400720061006e00730070006f007200740100000184ffffffff0000000000000000</nonshared_toolbars>
-        <shared_toolbars>000000ff00000000fd00000000000004000000027700000004000000040000000800000008fc0000000100000002000000040000001800460069006c006500200042007500740074006f006e007301000000000000008c00000000000000000000001e00570061007600650020006500640069007400200074006f006f006c0073010000008cffffffff00000000000000000000001c0057006100760065004500640069007400200074006f006f006c007301000000d5ffffffff000000000000000000000012007400720061006e00730070006f007200740100000210ffffffff0000000000000000</shared_toolbars>
-        <shares_when_free>0</shares_when_free>
-        <shares_when_subwin>1</shares_when_subwin>
-        <default_subwin>0</default_subwin>
-        </topwin>
-      </waveedit>
     <dialogs>
       <mod_len>
         <range>1</range>
@@ -464,6 +382,14 @@
       <controller id="2" cur="0" color="#ff0000" visible="0">
         </controller>
       </AudioOutput>
+    <Route channel="1">
+      <source name="Out 1"/>
+      <dest type="1" name="system:playback_2"/>
+      </Route>
+    <Route channel="0">
+      <source name="Out 1"/>
+      <dest type="1" name="system:playback_1"/>
+      </Route>
     <tempolist fix="500000">
       <tempo at="21474837">
         <tick>0</tick>
@@ -490,11 +416,25 @@
     <arrangerview>
       <topwin>
         <is_subwin>1</is_subwin>
-        <geometry_state>01d9d0cb000100000000000000000000000003ff000002440000000000000000000003ff00000244000000000000</geometry_state>
+        <x>0</x>
+        <y>0</y>
+        <width>850</width>
+        <height>382</height>
         <shares_menu>1</shares_menu>
         <toolbars>000000ff00000000fd00000000000000000000000000000004000000040000000800000008fc00000000</toolbars>
         </topwin>
       <tool>1</tool>
+      <arranger>
+        <info>1</info>
+        <split>440 407 </split>
+        <list>
+          <header> 7 9 8 6 5 4 3 2 1 0 </header>
+          </list>
+        <xpos>0</xpos>
+        <xmag>266</xmag>
+        <ypos>0</ypos>
+        </arranger>
       </arrangerview>
     </toplevels>
   </muse>
+  
\ No newline at end of file
diff --git a/muse2/share/templates/midiGM.med b/muse2/share/templates/midiGM.med
index b2da48e4..54ec99a0 100644
--- a/muse2/share/templates/midiGM.med
+++ b/muse2/share/templates/midiGM.med
@@ -9,13 +9,6 @@
     <midiFilterCtrl2>0</midiFilterCtrl2>
     <midiFilterCtrl3>0</midiFilterCtrl3>
     <midiFilterCtrl4>0</midiFilterCtrl4>
-    <waveTracksVisible>1</waveTracksVisible>
-    <auxTracksVisible>1</auxTracksVisible>
-    <groupTracksVisible>1</groupTracksVisible>
-    <midiTracksVisible>1</midiTracksVisible>
-    <inputTracksVisible>1</inputTracksVisible>
-    <outputTracksVisible>1</outputTracksVisible>
-    <synthTracksVisible>1</synthTracksVisible>
     <mtctype>1</mtctype>
     <mtcoffset>00:00:00:00:00</mtcoffset>
     <sendClockDelay>1</sendClockDelay>
@@ -24,21 +17,10 @@
     <extSync>0</extSync>
     <bigtimeVisible>0</bigtimeVisible>
     <transportVisible>0</transportVisible>
-    <markerVisible>0</markerVisible>
-    <geometryMain x="0" y="0" w="1024" h="691"></geometryMain>
-    <geometryTransport x="0" y="0" w="100" h="30"></geometryTransport>
+    <geometryMain x="0" y="0" w="878" h="468"></geometryMain>
+    <geometryTransport x="0" y="0" w="607" h="86"></geometryTransport>
     <mixer1Visible>0</mixer1Visible>
     <mixer2Visible>0</mixer2Visible>
-    <arranger>
-      <info>1</info>
-      <split>418 600 </split>
-      <list>
-        <header> -1 9 8 7 6 5 4 3 2 1 0 </header>
-        </list>
-      <xpos>0</xpos>
-      <xmag>266</xmag>
-      <ypos>0</ypos>
-      </arranger>
     <sequencer>
       <metronom>
         <premeasures>2</premeasures>
@@ -340,68 +322,6 @@
           </channel>
         </midiport>
       </sequencer>
-    <drumedit>
-      <raster>96</raster>
-      <dlistwidth>126</dlistwidth>
-      <dcanvaswidth>753</dcanvaswidth>
-      <topwin>
-        <width>934</width>
-        <height>488</height>
-        <nonshared_toolbars>000000ff00000000fd00000000000003ae0000019e00000004000000040000000800000008fc00000002000000020000000400000014004400720075006d00200074006f006f006c00730100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c007301000000f5ffffffff000000000000000000000012007400720061006e00730070006f007200740100000198ffffffff00000000000000000000000a00700061006e0069006301000002be000000f8000000000000000000000002000000030000000c0063007500720073006f00720100000000ffffffff0000000000000000000000260050006f0073002f0053006e00610070002f0053006f006c006f002d0074006f006f006c00730100000081ffffffff000000000000000000000012004e006f0074006500200049006e0066006f01000001a90000020d0000000000000000</nonshared_toolbars>
-        <shared_toolbars>000000ff00000000fd00000000000004000000024d00000004000000040000000800000008fc0000000200000002000000050000001800460069006c006500200042007500740074006f006e007301000000000000008c000000000000000000000014004400720075006d00200074006f006f006c0073010000008cffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000181ffffffff000000000000000000000012007400720061006e00730070006f007200740100000224ffffffff00000000000000000000000a00700061006e00690063010000034a000000b6000000000000000000000002000000030000000c0063007500720073006f00720100000000ffffffff0000000000000000000000260050006f0073002f0053006e00610070002f0053006f006c006f002d0074006f006f006c00730100000081ffffffff000000000000000000000012004e006f0074006500200049006e0066006f01000001a9000002570000000000000000</shared_toolbars>
-        <shares_when_free>0</shares_when_free>
-        <shares_when_subwin>1</shares_when_subwin>
-        <default_subwin>0</default_subwin>
-        </topwin>
-      </drumedit>
-    <pianoroll>
-      <raster>96</raster>
-      <colormode>0</colormode>
-      <topwin>
-        <width>852</width>
-        <height>460</height>
-        <nonshared_toolbars>000000ff00000000fd000000000000035c0000018200000004000000040000000800000008fc0000000200000002000000040000001e005000690061006e006f0072006f006c006c00200074006f006f006c00730100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c007301000000ae00000098000000000000000000000012007400720061006e00730070006f007200740100000146ffffffff00000000000000000000000a00700061006e00690063010000026c000000f800000000000000000000000200000002000000260050006f0073002f0053006e00610070002f0053006f006c006f002d0074006f006f006c00730100000000ffffffff000000000000000000000012004e006f0074006500200049006e0066006f0100000152000002120000000000000000</nonshared_toolbars>
-        <shared_toolbars>000000ff00000000fd00000000000004000000024d00000004000000040000000800000008fc0000000200000002000000050000001800460069006c006500200042007500740074006f006e007301000000000000008c00000000000000000000001e005000690061006e006f0072006f006c006c00200074006f006f006c0073010000008cffffffff000000000000000000000014004500640069007400200054006f006f006c0073010000013affffffff000000000000000000000012007400720061006e00730070006f0072007401000001bfffffffff00000000000000000000000a00700061006e0069006301000002e50000011b00000000000000000000000200000002000000260050006f0073002f0053006e00610070002f0053006f006c006f002d0074006f006f006c00730100000000ffffffff000000000000000000000012004e006f0074006500200049006e0066006f0100000152000002ae0000000000000000</shared_toolbars>
-        <shares_when_free>0</shares_when_free>
-        <shares_when_subwin>1</shares_when_subwin>
-        <default_subwin>0</default_subwin>
-        </topwin>
-      </pianoroll>
-    <scoreedit>
-      <topwin>
-        <width>867</width>
-        <height>544</height>
-        <nonshared_toolbars>000000ff00000000fd000000000000036b000001e300000004000000040000000800000008fc0000000200000002000000060000001e0055006e0064006f002f005200650064006f00200074006f006f006c00730100000000ffffffff00000000000000000000002800530074006500700020007200650063006f007200640069006e006700200074006f006f006c00730100000049ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000074ffffffff00000000000000000000002a005100750061006e007400690073006100740069006f006e002000730065007400740069006e0067007301000000dbffffffff000000000000000000000012007400720061006e00730070006f007200740100000203ffffffff00000000000000000000000a00700061006e006900630100000329000000420000000000000000000000020000000100000022004e006500770020006e006f00740065002000730065007400740069006e006700730100000000ffffffff0000000000000000</nonshared_toolbars>
-        <shared_toolbars>000000ff00000000fd00000000000004000000025900000004000000040000000800000008fc0000000200000002000000060000001800460069006c006500200042007500740074006f006e007301000000000000008c00000000000000000000001e0055006e0064006f002f005200650064006f00200074006f006f006c0073010000008cffffffff00000000000000000000002800530074006500700020007200650063006f007200640069006e006700200074006f006f006c007301000000d5ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000100ffffffff000000000000000000000012007400720061006e00730070006f007200740100000167ffffffff00000000000000000000000a00700061006e00690063010000028d000001730000000000000000000000020000000200000022004e006500770020006e006f00740065002000730065007400740069006e006700730100000000ffffffff00000000000000000000002a005100750061006e007400690073006100740069006f006e002000730065007400740069006e0067007301000002650000019b0000000000000000</shared_toolbars>
-        <shares_when_free>0</shares_when_free>
-        <shares_when_subwin>1</shares_when_subwin>
-        <default_subwin>0</default_subwin>
-        </topwin>
-      </scoreedit>
-    <masteredit>
-      <raster>0</raster>
-      <topwin>
-        <width>784</width>
-        <height>544</height>
-        <nonshared_toolbars>000000ff00000000fd0000000000000318000001ce00000004000000040000000800000008fc0000000200000002000000040000001e0055006e0064006f002f005200650064006f00200074006f006f006c00730100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000049ffffffff000000000000000000000012007400720061006e00730070006f0072007401000000b0ffffffff00000000000000000000000a00700061006e0069006301000001d600000142000000000000000000000002000000020000001a0045006e00610062006c00650020006d006100730074006500720100000000ffffffff0000000000000000000000080049006e0066006f010000005d000002bb0000000000000000</nonshared_toolbars>
-        <shared_toolbars>000000ff00000000fd00000000000004000000024500000004000000040000000800000008fc0000000200000002000000050000001800460069006c006500200042007500740074006f006e007301000000000000008c00000000000000000000001e0055006e0064006f002f005200650064006f00200074006f006f006c0073010000008cffffffff000000000000000000000014004500640069007400200054006f006f006c007301000000d500000071000000000000000000000012007400720061006e00730070006f007200740100000146ffffffff00000000000000000000000a00700061006e00690063010000026c00000194000000000000000000000002000000020000001a0045006e00610062006c00650020006d006100730074006500720100000000ffffffff0000000000000000000000080049006e0066006f010000005d000003a30000000000000000</shared_toolbars>
-        <shares_when_free>0</shares_when_free>
-        <shares_when_subwin>1</shares_when_subwin>
-        <default_subwin>0</default_subwin>
-        </topwin>
-      </masteredit>
-    <waveedit>
-      <bgcolor r="200" g="200" b="200"></bgcolor>
-      <topwin>
-        <width>760</width>
-        <height>460</height>
-        <nonshared_toolbars>000000ff00000000fd0000000000000300000001ac00000004000000040000000800000008fc0000000100000002000000030000001e00570061007600650020006500640069007400200074006f006f006c00730100000000ffffffff00000000000000000000001c0057006100760065004500640069007400200074006f006f006c00730100000049ffffffff000000000000000000000012007400720061006e00730070006f007200740100000184ffffffff0000000000000000</nonshared_toolbars>
-        <shared_toolbars>000000ff00000000fd00000000000004000000027700000004000000040000000800000008fc0000000100000002000000040000001800460069006c006500200042007500740074006f006e007301000000000000008c00000000000000000000001e00570061007600650020006500640069007400200074006f006f006c0073010000008cffffffff00000000000000000000001c0057006100760065004500640069007400200074006f006f006c007301000000d5ffffffff000000000000000000000012007400720061006e00730070006f007200740100000210ffffffff0000000000000000</shared_toolbars>
-        <shares_when_free>0</shares_when_free>
-        <shares_when_subwin>1</shares_when_subwin>
-        <default_subwin>0</default_subwin>
-        </topwin>
-      </waveedit>
     <dialogs>
       <mod_len>
         <range>1</range>
@@ -644,11 +564,24 @@
     <arrangerview>
       <topwin>
         <is_subwin>1</is_subwin>
-        <geometry_state>01d9d0cb000100000000000000000000000003ff000002440000000000000000000003ff00000244000000000000</geometry_state>
+        <x>0</x>
+        <y>0</y>
+        <width>850</width>
+        <height>382</height>
         <shares_menu>1</shares_menu>
         <toolbars>000000ff00000000fd00000000000000000000000000000004000000040000000800000008fc00000000</toolbars>
         </topwin>
       <tool>1</tool>
+      <arranger>
+        <info>1</info>
+        <split>557 290 </split>
+        <list>
+          <header> 7 9 8 6 5 4 3 2 1 0 </header>
+          </list>
+        <xpos>0</xpos>
+        <xmag>266</xmag>
+        <ypos>0</ypos>
+        </arranger>
       </arrangerview>
     </toplevels>
   </muse>
diff --git a/muse2/share/templates/monorecord.med b/muse2/share/templates/monorecord.med
index dfcc2c78..4651a7eb 100644
--- a/muse2/share/templates/monorecord.med
+++ b/muse2/share/templates/monorecord.med
@@ -9,13 +9,6 @@
     <midiFilterCtrl2>0</midiFilterCtrl2>
     <midiFilterCtrl3>0</midiFilterCtrl3>
     <midiFilterCtrl4>0</midiFilterCtrl4>
-    <waveTracksVisible>1</waveTracksVisible>
-    <auxTracksVisible>1</auxTracksVisible>
-    <groupTracksVisible>1</groupTracksVisible>
-    <midiTracksVisible>1</midiTracksVisible>
-    <inputTracksVisible>1</inputTracksVisible>
-    <outputTracksVisible>1</outputTracksVisible>
-    <synthTracksVisible>1</synthTracksVisible>
     <mtctype>1</mtctype>
     <mtcoffset>00:00:00:00:00</mtcoffset>
     <sendClockDelay>1</sendClockDelay>
@@ -24,21 +17,10 @@
     <extSync>0</extSync>
     <bigtimeVisible>0</bigtimeVisible>
     <transportVisible>0</transportVisible>
-    <markerVisible>0</markerVisible>
-    <geometryMain x="0" y="0" w="1024" h="691"></geometryMain>
-    <geometryTransport x="0" y="0" w="100" h="30"></geometryTransport>
+    <geometryMain x="0" y="0" w="878" h="468"></geometryMain>
+    <geometryTransport x="0" y="0" w="607" h="86"></geometryTransport>
     <mixer1Visible>0</mixer1Visible>
     <mixer2Visible>0</mixer2Visible>
-    <arranger>
-      <info>1</info>
-      <split>418 600 </split>
-      <list>
-        <header> -1 9 8 7 6 5 4 3 2 1 0 </header>
-        </list>
-      <xpos>0</xpos>
-      <xmag>266</xmag>
-      <ypos>0</ypos>
-      </arranger>
     <sequencer>
       <metronom>
         <premeasures>2</premeasures>
@@ -291,69 +273,400 @@
             </controller>
           </channel>
         </midiport>
+      <midiport idx="1">
+        <instrument>generic midi</instrument>
+        <channel idx="0">
+          <controller id="7">
+            </controller>
+          <controller id="10">
+            </controller>
+          <controller id="262145">
+            </controller>
+          </channel>
+        <channel idx="1">
+          <controller id="7">
+            </controller>
+          <controller id="10">
+            </controller>
+          <controller id="262145">
+            </controller>
+          </channel>
+        <channel idx="2">
+          <controller id="7">
+            </controller>
+          <controller id="10">
+            </controller>
+          <controller id="262145">
+            </controller>
+          </channel>
+        <channel idx="3">
+          <controller id="7">
+            </controller>
+          <controller id="10">
+            </controller>
+          <controller id="262145">
+            </controller>
+          </channel>
+        <channel idx="4">
+          <controller id="7">
+            </controller>
+          <controller id="10">
+            </controller>
+          <controller id="262145">
+            </controller>
+          </channel>
+        <channel idx="5">
+          <controller id="7">
+            </controller>
+          <controller id="10">
+            </controller>
+          <controller id="262145">
+            </controller>
+          </channel>
+        <channel idx="6">
+          <controller id="7">
+            </controller>
+          <controller id="10">
+            </controller>
+          <controller id="262145">
+            </controller>
+          </channel>
+        <channel idx="7">
+          <controller id="7">
+            </controller>
+          <controller id="10">
+            </controller>
+          <controller id="262145">
+            </controller>
+          </channel>
+        <channel idx="8">
+          <controller id="7">
+            </controller>
+          <controller id="10">
+            </controller>
+          <controller id="262145">
+            </controller>
+          </channel>
+        <channel idx="9">
+          <controller id="7">
+            </controller>
+          <controller id="10">
+            </controller>
+          <controller id="262145">
+            </controller>
+          </channel>
+        <channel idx="10">
+          <controller id="7">
+            </controller>
+          <controller id="10">
+            </controller>
+          <controller id="262145">
+            </controller>
+          </channel>
+        <channel idx="11">
+          <controller id="7">
+            </controller>
+          <controller id="10">
+            </controller>
+          <controller id="262145">
+            </controller>
+          </channel>
+        <channel idx="12">
+          <controller id="7">
+            </controller>
+          <controller id="10">
+            </controller>
+          <controller id="262145">
+            </controller>
+          </channel>
+        <channel idx="13">
+          <controller id="7">
+            </controller>
+          <controller id="10">
+            </controller>
+          <controller id="262145">
+            </controller>
+          </channel>
+        <channel idx="14">
+          <controller id="7">
+            </controller>
+          <controller id="10">
+            </controller>
+          <controller id="262145">
+            </controller>
+          </channel>
+        <channel idx="15">
+          <controller id="7">
+            </controller>
+          <controller id="10">
+            </controller>
+          <controller id="262145">
+            </controller>
+          </channel>
+        </midiport>
+      <midiport idx="2">
+        <instrument>generic midi</instrument>
+        <channel idx="0">
+          <controller id="7">
+            </controller>
+          <controller id="10">
+            </controller>
+          <controller id="262145">
+            </controller>
+          </channel>
+        <channel idx="1">
+          <controller id="7">
+            </controller>
+          <controller id="10">
+            </controller>
+          <controller id="262145">
+            </controller>
+          </channel>
+        <channel idx="2">
+          <controller id="7">
+            </controller>
+          <controller id="10">
+            </controller>
+          <controller id="262145">
+            </controller>
+          </channel>
+        <channel idx="3">
+          <controller id="7">
+            </controller>
+          <controller id="10">
+            </controller>
+          <controller id="262145">
+            </controller>
+          </channel>
+        <channel idx="4">
+          <controller id="7">
+            </controller>
+          <controller id="10">
+            </controller>
+          <controller id="262145">
+            </controller>
+          </channel>
+        <channel idx="5">
+          <controller id="7">
+            </controller>
+          <controller id="10">
+            </controller>
+          <controller id="262145">
+            </controller>
+          </channel>
+        <channel idx="6">
+          <controller id="7">
+            </controller>
+          <controller id="10">
+            </controller>
+          <controller id="262145">
+            </controller>
+          </channel>
+        <channel idx="7">
+          <controller id="7">
+            </controller>
+          <controller id="10">
+            </controller>
+          <controller id="262145">
+            </controller>
+          </channel>
+        <channel idx="8">
+          <controller id="7">
+            </controller>
+          <controller id="10">
+            </controller>
+          <controller id="262145">
+            </controller>
+          </channel>
+        <channel idx="9">
+          <controller id="7">
+            </controller>
+          <controller id="10">
+            </controller>
+          <controller id="262145">
+            </controller>
+          </channel>
+        <channel idx="10">
+          <controller id="7">
+            </controller>
+          <controller id="10">
+            </controller>
+          <controller id="262145">
+            </controller>
+          </channel>
+        <channel idx="11">
+          <controller id="7">
+            </controller>
+          <controller id="10">
+            </controller>
+          <controller id="262145">
+            </controller>
+          </channel>
+        <channel idx="12">
+          <controller id="7">
+            </controller>
+          <controller id="10">
+            </controller>
+          <controller id="262145">
+            </controller>
+          </channel>
+        <channel idx="13">
+          <controller id="7">
+            </controller>
+          <controller id="10">
+            </controller>
+          <controller id="262145">
+            </controller>
+          </channel>
+        <channel idx="14">
+          <controller id="7">
+            </controller>
+          <controller id="10">
+            </controller>
+          <controller id="262145">
+            </controller>
+          </channel>
+        <channel idx="15">
+          <controller id="7">
+            </controller>
+          <controller id="10">
+            </controller>
+          <controller id="262145">
+            </controller>
+          </channel>
+        </midiport>
+      <midiport idx="3">
+        <instrument>generic midi</instrument>
+        <channel idx="0">
+          <controller id="7">
+            </controller>
+          <controller id="10">
+            </controller>
+          <controller id="262145">
+            </controller>
+          </channel>
+        <channel idx="1">
+          <controller id="7">
+            </controller>
+          <controller id="10">
+            </controller>
+          <controller id="262145">
+            </controller>
+          </channel>
+        <channel idx="2">
+          <controller id="7">
+            </controller>
+          <controller id="10">
+            </controller>
+          <controller id="262145">
+            </controller>
+          </channel>
+        <channel idx="3">
+          <controller id="7">
+            </controller>
+          <controller id="10">
+            </controller>
+          <controller id="262145">
+            </controller>
+          </channel>
+        <channel idx="4">
+          <controller id="7">
+            </controller>
+          <controller id="10">
+            </controller>
+          <controller id="262145">
+            </controller>
+          </channel>
+        <channel idx="5">
+          <controller id="7">
+            </controller>
+          <controller id="10">
+            </controller>
+          <controller id="262145">
+            </controller>
+          </channel>
+        <channel idx="6">
+          <controller id="7">
+            </controller>
+          <controller id="10">
+            </controller>
+          <controller id="262145">
+            </controller>
+          </channel>
+        <channel idx="7">
+          <controller id="7">
+            </controller>
+          <controller id="10">
+            </controller>
+          <controller id="262145">
+            </controller>
+          </channel>
+        <channel idx="8">
+          <controller id="7">
+            </controller>
+          <controller id="10">
+            </controller>
+          <controller id="262145">
+            </controller>
+          </channel>
+        <channel idx="9">
+          <controller id="7">
+            </controller>
+          <controller id="10">
+            </controller>
+          <controller id="262145">
+            </controller>
+          </channel>
+        <channel idx="10">
+          <controller id="7">
+            </controller>
+          <controller id="10">
+            </controller>
+          <controller id="262145">
+            </controller>
+          </channel>
+        <channel idx="11">
+          <controller id="7">
+            </controller>
+          <controller id="10">
+            </controller>
+          <controller id="262145">
+            </controller>
+          </channel>
+        <channel idx="12">
+          <controller id="7">
+            </controller>
+          <controller id="10">
+            </controller>
+          <controller id="262145">
+            </controller>
+          </channel>
+        <channel idx="13">
+          <controller id="7">
+            </controller>
+          <controller id="10">
+            </controller>
+          <controller id="262145">
+            </controller>
+          </channel>
+        <channel idx="14">
+          <controller id="7">
+            </controller>
+          <controller id="10">
+            </controller>
+          <controller id="262145">
+            </controller>
+          </channel>
+        <channel idx="15">
+          <controller id="7">
+            </controller>
+          <controller id="10">
+            </controller>
+          <controller id="262145">
+            </controller>
+          </channel>
+        </midiport>
       </sequencer>
-    <drumedit>
-      <raster>96</raster>
-      <dlistwidth>126</dlistwidth>
-      <dcanvaswidth>753</dcanvaswidth>
-      <topwin>
-        <width>934</width>
-        <height>488</height>
-        <nonshared_toolbars>000000ff00000000fd00000000000003ae0000019e00000004000000040000000800000008fc00000002000000020000000400000014004400720075006d00200074006f006f006c00730100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c007301000000f5ffffffff000000000000000000000012007400720061006e00730070006f007200740100000198ffffffff00000000000000000000000a00700061006e0069006301000002be000000f8000000000000000000000002000000030000000c0063007500720073006f00720100000000ffffffff0000000000000000000000260050006f0073002f0053006e00610070002f0053006f006c006f002d0074006f006f006c00730100000081ffffffff000000000000000000000012004e006f0074006500200049006e0066006f01000001a90000020d0000000000000000</nonshared_toolbars>
-        <shared_toolbars>000000ff00000000fd00000000000004000000024d00000004000000040000000800000008fc0000000200000002000000050000001800460069006c006500200042007500740074006f006e007301000000000000008c000000000000000000000014004400720075006d00200074006f006f006c0073010000008cffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000181ffffffff000000000000000000000012007400720061006e00730070006f007200740100000224ffffffff00000000000000000000000a00700061006e00690063010000034a000000b6000000000000000000000002000000030000000c0063007500720073006f00720100000000ffffffff0000000000000000000000260050006f0073002f0053006e00610070002f0053006f006c006f002d0074006f006f006c00730100000081ffffffff000000000000000000000012004e006f0074006500200049006e0066006f01000001a9000002570000000000000000</shared_toolbars>
-        <shares_when_free>0</shares_when_free>
-        <shares_when_subwin>1</shares_when_subwin>
-        <default_subwin>0</default_subwin>
-        </topwin>
-      </drumedit>
-    <pianoroll>
-      <raster>96</raster>
-      <colormode>0</colormode>
-      <topwin>
-        <width>852</width>
-        <height>460</height>
-        <nonshared_toolbars>000000ff00000000fd000000000000035c0000018200000004000000040000000800000008fc0000000200000002000000040000001e005000690061006e006f0072006f006c006c00200074006f006f006c00730100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c007301000000ae00000098000000000000000000000012007400720061006e00730070006f007200740100000146ffffffff00000000000000000000000a00700061006e00690063010000026c000000f800000000000000000000000200000002000000260050006f0073002f0053006e00610070002f0053006f006c006f002d0074006f006f006c00730100000000ffffffff000000000000000000000012004e006f0074006500200049006e0066006f0100000152000002120000000000000000</nonshared_toolbars>
-        <shared_toolbars>000000ff00000000fd00000000000004000000024d00000004000000040000000800000008fc0000000200000002000000050000001800460069006c006500200042007500740074006f006e007301000000000000008c00000000000000000000001e005000690061006e006f0072006f006c006c00200074006f006f006c0073010000008cffffffff000000000000000000000014004500640069007400200054006f006f006c0073010000013affffffff000000000000000000000012007400720061006e00730070006f0072007401000001bfffffffff00000000000000000000000a00700061006e0069006301000002e50000011b00000000000000000000000200000002000000260050006f0073002f0053006e00610070002f0053006f006c006f002d0074006f006f006c00730100000000ffffffff000000000000000000000012004e006f0074006500200049006e0066006f0100000152000002ae0000000000000000</shared_toolbars>
-        <shares_when_free>0</shares_when_free>
-        <shares_when_subwin>1</shares_when_subwin>
-        <default_subwin>0</default_subwin>
-        </topwin>
-      </pianoroll>
-    <scoreedit>
-      <topwin>
-        <width>867</width>
-        <height>544</height>
-        <nonshared_toolbars>000000ff00000000fd000000000000036b000001e300000004000000040000000800000008fc0000000200000002000000060000001e0055006e0064006f002f005200650064006f00200074006f006f006c00730100000000ffffffff00000000000000000000002800530074006500700020007200650063006f007200640069006e006700200074006f006f006c00730100000049ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000074ffffffff00000000000000000000002a005100750061006e007400690073006100740069006f006e002000730065007400740069006e0067007301000000dbffffffff000000000000000000000012007400720061006e00730070006f007200740100000203ffffffff00000000000000000000000a00700061006e006900630100000329000000420000000000000000000000020000000100000022004e006500770020006e006f00740065002000730065007400740069006e006700730100000000ffffffff0000000000000000</nonshared_toolbars>
-        <shared_toolbars>000000ff00000000fd00000000000004000000025900000004000000040000000800000008fc0000000200000002000000060000001800460069006c006500200042007500740074006f006e007301000000000000008c00000000000000000000001e0055006e0064006f002f005200650064006f00200074006f006f006c0073010000008cffffffff00000000000000000000002800530074006500700020007200650063006f007200640069006e006700200074006f006f006c007301000000d5ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000100ffffffff000000000000000000000012007400720061006e00730070006f007200740100000167ffffffff00000000000000000000000a00700061006e00690063010000028d000001730000000000000000000000020000000200000022004e006500770020006e006f00740065002000730065007400740069006e006700730100000000ffffffff00000000000000000000002a005100750061006e007400690073006100740069006f006e002000730065007400740069006e0067007301000002650000019b0000000000000000</shared_toolbars>
-        <shares_when_free>0</shares_when_free>
-        <shares_when_subwin>1</shares_when_subwin>
-        <default_subwin>0</default_subwin>
-        </topwin>
-      </scoreedit>
-    <masteredit>
-      <raster>0</raster>
-      <topwin>
-        <width>784</width>
-        <height>544</height>
-        <nonshared_toolbars>000000ff00000000fd0000000000000318000001ce00000004000000040000000800000008fc0000000200000002000000040000001e0055006e0064006f002f005200650064006f00200074006f006f006c00730100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000049ffffffff000000000000000000000012007400720061006e00730070006f0072007401000000b0ffffffff00000000000000000000000a00700061006e0069006301000001d600000142000000000000000000000002000000020000001a0045006e00610062006c00650020006d006100730074006500720100000000ffffffff0000000000000000000000080049006e0066006f010000005d000002bb0000000000000000</nonshared_toolbars>
-        <shared_toolbars>000000ff00000000fd00000000000004000000024500000004000000040000000800000008fc0000000200000002000000050000001800460069006c006500200042007500740074006f006e007301000000000000008c00000000000000000000001e0055006e0064006f002f005200650064006f00200074006f006f006c0073010000008cffffffff000000000000000000000014004500640069007400200054006f006f006c007301000000d500000071000000000000000000000012007400720061006e00730070006f007200740100000146ffffffff00000000000000000000000a00700061006e00690063010000026c00000194000000000000000000000002000000020000001a0045006e00610062006c00650020006d006100730074006500720100000000ffffffff0000000000000000000000080049006e0066006f010000005d000003a30000000000000000</shared_toolbars>
-        <shares_when_free>0</shares_when_free>
-        <shares_when_subwin>1</shares_when_subwin>
-        <default_subwin>0</default_subwin>
-        </topwin>
-      </masteredit>
-    <waveedit>
-      <bgcolor r="200" g="200" b="200"></bgcolor>
-      <topwin>
-        <width>760</width>
-        <height>460</height>
-        <nonshared_toolbars>000000ff00000000fd0000000000000300000001ac00000004000000040000000800000008fc0000000100000002000000030000001e00570061007600650020006500640069007400200074006f006f006c00730100000000ffffffff00000000000000000000001c0057006100760065004500640069007400200074006f006f006c00730100000049ffffffff000000000000000000000012007400720061006e00730070006f007200740100000184ffffffff0000000000000000</nonshared_toolbars>
-        <shared_toolbars>000000ff00000000fd00000000000004000000027700000004000000040000000800000008fc0000000100000002000000040000001800460069006c006500200042007500740074006f006e007301000000000000008c00000000000000000000001e00570061007600650020006500640069007400200074006f006f006c0073010000008cffffffff00000000000000000000001c0057006100760065004500640069007400200074006f006f006c007301000000d5ffffffff000000000000000000000012007400720061006e00730070006f007200740100000210ffffffff0000000000000000</shared_toolbars>
-        <shares_when_free>0</shares_when_free>
-        <shares_when_subwin>1</shares_when_subwin>
-        <default_subwin>0</default_subwin>
-        </topwin>
-      </waveedit>
     <dialogs>
       <mod_len>
         <range>1</range>
@@ -444,15 +757,15 @@
     <len>0</len>
     <follow>1</follow>
     <sampleRate>44100</sampleRate>
-    <wavetrack>
-      <name>Track 1</name>
-      <record>1</record>
+    <AudioOutput>
+      <name>Out 1</name>
+      <record>0</record>
       <mute>0</mute>
       <solo>0</solo>
       <off>0</off>
       <channels>1</channels>
       <height>20</height>
-      <locked>0</locked>
+      <locked>1</locked>
       <prefader>0</prefader>
       <sendMetronome>0</sendMetronome>
       <automation>0</automation>
@@ -462,7 +775,7 @@
         </controller>
       <controller id="2" cur="0" color="#0000ff" visible="0">
         </controller>
-      </wavetrack>
+      </AudioOutput>
     <AudioInput>
       <name>Input 1</name>
       <record>0</record>
@@ -472,7 +785,6 @@
       <channels>1</channels>
       <height>20</height>
       <locked>1</locked>
-      <selected>1</selected>
       <prefader>0</prefader>
       <sendMetronome>0</sendMetronome>
       <automation>0</automation>
@@ -483,33 +795,42 @@
       <controller id="2" cur="0" color="#0000ff" visible="0">
         </controller>
       </AudioInput>
-    <AudioOutput>
-      <name>Out 1</name>
-      <record>0</record>
+    <wavetrack>
+      <name>Track 1</name>
+      <record>1</record>
       <mute>0</mute>
       <solo>0</solo>
       <off>0</off>
       <channels>1</channels>
       <height>20</height>
-      <locked>1</locked>
+      <locked>0</locked>
+      <selected>1</selected>
       <prefader>0</prefader>
       <sendMetronome>0</sendMetronome>
       <automation>0</automation>
-      <controller id="0" cur="1.30152" color="#ff0000" visible="0">
+      <controller id="0" cur="1.02164" color="#ff0000" visible="0">
         </controller>
       <controller id="1" cur="0" color="#ff0000" visible="0">
         </controller>
       <controller id="2" cur="0" color="#0000ff" visible="0">
         </controller>
-      </AudioOutput>
-    <Route>
-      <source name="Input 1"/>
-      <dest name="Out 1"/>
+      </wavetrack>
+    <Route channel="0">
+      <source name="Out 1"/>
+      <dest type="1" name="system:playback_1"/>
+      </Route>
+    <Route channel="0">
+      <source type="1" name="system:capture_1"/>
+      <dest name="Input 1"/>
       </Route>
     <Route>
       <source name="Input 1"/>
       <dest name="Track 1"/>
       </Route>
+    <Route>
+      <source name="Track 1"/>
+      <dest name="Out 1"/>
+      </Route>
     <tempolist fix="500000">
       <tempo at="21474837">
         <tick>0</tick>
@@ -536,11 +857,24 @@
     <arrangerview>
       <topwin>
         <is_subwin>1</is_subwin>
-        <geometry_state>01d9d0cb000100000000000000000000000003ff000002440000000000000000000003ff00000244000000000000</geometry_state>
+        <x>0</x>
+        <y>0</y>
+        <width>850</width>
+        <height>382</height>
         <shares_menu>1</shares_menu>
         <toolbars>000000ff00000000fd00000000000000000000000000000004000000040000000800000008fc00000000</toolbars>
         </topwin>
       <tool>1</tool>
+      <arranger>
+        <info>1</info>
+        <split>557 290 </split>
+        <list>
+          <header> 7 9 8 6 5 4 3 2 1 0 </header>
+          </list>
+        <xpos>0</xpos>
+        <xmag>266</xmag>
+        <ypos>0</ypos>
+        </arranger>
       </arrangerview>
     </toplevels>
   </muse>
diff --git a/muse2/share/templates/synti.med b/muse2/share/templates/synti.med
index 1198359c..e242e775 100644
--- a/muse2/share/templates/synti.med
+++ b/muse2/share/templates/synti.med
@@ -9,13 +9,6 @@
     <midiFilterCtrl2>0</midiFilterCtrl2>
     <midiFilterCtrl3>0</midiFilterCtrl3>
     <midiFilterCtrl4>0</midiFilterCtrl4>
-    <waveTracksVisible>1</waveTracksVisible>
-    <auxTracksVisible>1</auxTracksVisible>
-    <groupTracksVisible>1</groupTracksVisible>
-    <midiTracksVisible>1</midiTracksVisible>
-    <inputTracksVisible>1</inputTracksVisible>
-    <outputTracksVisible>1</outputTracksVisible>
-    <synthTracksVisible>1</synthTracksVisible>
     <mtctype>1</mtctype>
     <mtcoffset>00:00:00:00:00</mtcoffset>
     <sendClockDelay>1</sendClockDelay>
@@ -24,21 +17,10 @@
     <extSync>0</extSync>
     <bigtimeVisible>0</bigtimeVisible>
     <transportVisible>0</transportVisible>
-    <markerVisible>0</markerVisible>
-    <geometryMain x="0" y="0" w="1024" h="691"></geometryMain>
-    <geometryTransport x="0" y="0" w="100" h="30"></geometryTransport>
+    <geometryMain x="0" y="0" w="878" h="468"></geometryMain>
+    <geometryTransport x="0" y="0" w="607" h="86"></geometryTransport>
     <mixer1Visible>0</mixer1Visible>
     <mixer2Visible>0</mixer2Visible>
-    <arranger>
-      <info>1</info>
-      <split>418 600 </split>
-      <list>
-        <header> -1 9 8 7 6 5 4 3 2 1 0 </header>
-        </list>
-      <xpos>0</xpos>
-      <xmag>266</xmag>
-      <ypos>0</ypos>
-      </arranger>
     <sequencer>
       <metronom>
         <premeasures>2</premeasures>
@@ -430,7 +412,7 @@
           </channel>
         </midiport>
       <midiport idx="2">
-        <instrument>General Midi</instrument>
+        <instrument>generic midi</instrument>
         <channel idx="0">
           <controller id="7">
             </controller>
@@ -695,68 +677,6 @@
           </channel>
         </midiport>
       </sequencer>
-    <drumedit>
-      <raster>96</raster>
-      <dlistwidth>126</dlistwidth>
-      <dcanvaswidth>753</dcanvaswidth>
-      <topwin>
-        <width>934</width>
-        <height>488</height>
-        <nonshared_toolbars>000000ff00000000fd00000000000003ae0000019e00000004000000040000000800000008fc00000002000000020000000400000014004400720075006d00200074006f006f006c00730100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c007301000000f5ffffffff000000000000000000000012007400720061006e00730070006f007200740100000198ffffffff00000000000000000000000a00700061006e0069006301000002be000000f8000000000000000000000002000000030000000c0063007500720073006f00720100000000ffffffff0000000000000000000000260050006f0073002f0053006e00610070002f0053006f006c006f002d0074006f006f006c00730100000081ffffffff000000000000000000000012004e006f0074006500200049006e0066006f01000001a90000020d0000000000000000</nonshared_toolbars>
-        <shared_toolbars>000000ff00000000fd00000000000004000000024d00000004000000040000000800000008fc0000000200000002000000050000001800460069006c006500200042007500740074006f006e007301000000000000008c000000000000000000000014004400720075006d00200074006f006f006c0073010000008cffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000181ffffffff000000000000000000000012007400720061006e00730070006f007200740100000224ffffffff00000000000000000000000a00700061006e00690063010000034a000000b6000000000000000000000002000000030000000c0063007500720073006f00720100000000ffffffff0000000000000000000000260050006f0073002f0053006e00610070002f0053006f006c006f002d0074006f006f006c00730100000081ffffffff000000000000000000000012004e006f0074006500200049006e0066006f01000001a9000002570000000000000000</shared_toolbars>
-        <shares_when_free>0</shares_when_free>
-        <shares_when_subwin>1</shares_when_subwin>
-        <default_subwin>0</default_subwin>
-        </topwin>
-      </drumedit>
-    <pianoroll>
-      <raster>96</raster>
-      <colormode>0</colormode>
-      <topwin>
-        <width>852</width>
-        <height>460</height>
-        <nonshared_toolbars>000000ff00000000fd000000000000035c0000018200000004000000040000000800000008fc0000000200000002000000040000001e005000690061006e006f0072006f006c006c00200074006f006f006c00730100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c007301000000ae00000098000000000000000000000012007400720061006e00730070006f007200740100000146ffffffff00000000000000000000000a00700061006e00690063010000026c000000f800000000000000000000000200000002000000260050006f0073002f0053006e00610070002f0053006f006c006f002d0074006f006f006c00730100000000ffffffff000000000000000000000012004e006f0074006500200049006e0066006f0100000152000002120000000000000000</nonshared_toolbars>
-        <shared_toolbars>000000ff00000000fd00000000000004000000024d00000004000000040000000800000008fc0000000200000002000000050000001800460069006c006500200042007500740074006f006e007301000000000000008c00000000000000000000001e005000690061006e006f0072006f006c006c00200074006f006f006c0073010000008cffffffff000000000000000000000014004500640069007400200054006f006f006c0073010000013affffffff000000000000000000000012007400720061006e00730070006f0072007401000001bfffffffff00000000000000000000000a00700061006e0069006301000002e50000011b00000000000000000000000200000002000000260050006f0073002f0053006e00610070002f0053006f006c006f002d0074006f006f006c00730100000000ffffffff000000000000000000000012004e006f0074006500200049006e0066006f0100000152000002ae0000000000000000</shared_toolbars>
-        <shares_when_free>0</shares_when_free>
-        <shares_when_subwin>1</shares_when_subwin>
-        <default_subwin>0</default_subwin>
-        </topwin>
-      </pianoroll>
-    <scoreedit>
-      <topwin>
-        <width>867</width>
-        <height>544</height>
-        <nonshared_toolbars>000000ff00000000fd000000000000036b000001e300000004000000040000000800000008fc0000000200000002000000060000001e0055006e0064006f002f005200650064006f00200074006f006f006c00730100000000ffffffff00000000000000000000002800530074006500700020007200650063006f007200640069006e006700200074006f006f006c00730100000049ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000074ffffffff00000000000000000000002a005100750061006e007400690073006100740069006f006e002000730065007400740069006e0067007301000000dbffffffff000000000000000000000012007400720061006e00730070006f007200740100000203ffffffff00000000000000000000000a00700061006e006900630100000329000000420000000000000000000000020000000100000022004e006500770020006e006f00740065002000730065007400740069006e006700730100000000ffffffff0000000000000000</nonshared_toolbars>
-        <shared_toolbars>000000ff00000000fd00000000000004000000025900000004000000040000000800000008fc0000000200000002000000060000001800460069006c006500200042007500740074006f006e007301000000000000008c00000000000000000000001e0055006e0064006f002f005200650064006f00200074006f006f006c0073010000008cffffffff00000000000000000000002800530074006500700020007200650063006f007200640069006e006700200074006f006f006c007301000000d5ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000100ffffffff000000000000000000000012007400720061006e00730070006f007200740100000167ffffffff00000000000000000000000a00700061006e00690063010000028d000001730000000000000000000000020000000200000022004e006500770020006e006f00740065002000730065007400740069006e006700730100000000ffffffff00000000000000000000002a005100750061006e007400690073006100740069006f006e002000730065007400740069006e0067007301000002650000019b0000000000000000</shared_toolbars>
-        <shares_when_free>0</shares_when_free>
-        <shares_when_subwin>1</shares_when_subwin>
-        <default_subwin>0</default_subwin>
-        </topwin>
-      </scoreedit>
-    <masteredit>
-      <raster>0</raster>
-      <topwin>
-        <width>784</width>
-        <height>544</height>
-        <nonshared_toolbars>000000ff00000000fd0000000000000318000001ce00000004000000040000000800000008fc0000000200000002000000040000001e0055006e0064006f002f005200650064006f00200074006f006f006c00730100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000049ffffffff000000000000000000000012007400720061006e00730070006f0072007401000000b0ffffffff00000000000000000000000a00700061006e0069006301000001d600000142000000000000000000000002000000020000001a0045006e00610062006c00650020006d006100730074006500720100000000ffffffff0000000000000000000000080049006e0066006f010000005d000002bb0000000000000000</nonshared_toolbars>
-        <shared_toolbars>000000ff00000000fd00000000000004000000024500000004000000040000000800000008fc0000000200000002000000050000001800460069006c006500200042007500740074006f006e007301000000000000008c00000000000000000000001e0055006e0064006f002f005200650064006f00200074006f006f006c0073010000008cffffffff000000000000000000000014004500640069007400200054006f006f006c007301000000d500000071000000000000000000000012007400720061006e00730070006f007200740100000146ffffffff00000000000000000000000a00700061006e00690063010000026c00000194000000000000000000000002000000020000001a0045006e00610062006c00650020006d006100730074006500720100000000ffffffff0000000000000000000000080049006e0066006f010000005d000003a30000000000000000</shared_toolbars>
-        <shares_when_free>0</shares_when_free>
-        <shares_when_subwin>1</shares_when_subwin>
-        <default_subwin>0</default_subwin>
-        </topwin>
-      </masteredit>
-    <waveedit>
-      <bgcolor r="200" g="200" b="200"></bgcolor>
-      <topwin>
-        <width>760</width>
-        <height>460</height>
-        <nonshared_toolbars>000000ff00000000fd0000000000000300000001ac00000004000000040000000800000008fc0000000100000002000000030000001e00570061007600650020006500640069007400200074006f006f006c00730100000000ffffffff00000000000000000000001c0057006100760065004500640069007400200074006f006f006c00730100000049ffffffff000000000000000000000012007400720061006e00730070006f007200740100000184ffffffff0000000000000000</nonshared_toolbars>
-        <shared_toolbars>000000ff00000000fd00000000000004000000027700000004000000040000000800000008fc0000000100000002000000040000001800460069006c006500200042007500740074006f006e007301000000000000008c00000000000000000000001e00570061007600650020006500640069007400200074006f006f006c0073010000008cffffffff00000000000000000000001c0057006100760065004500640069007400200074006f006f006c007301000000d5ffffffff000000000000000000000012007400720061006e00730070006f007200740100000210ffffffff0000000000000000</shared_toolbars>
-        <shares_when_free>0</shares_when_free>
-        <shares_when_subwin>1</shares_when_subwin>
-        <default_subwin>0</default_subwin>
-        </topwin>
-      </waveedit>
     <dialogs>
       <mod_len>
         <range>1</range>
@@ -830,7 +750,7 @@
     <info></info>
     <showinfo>1</showinfo>
     <automation>0</automation>
-    <cpos>12288</cpos>
+    <cpos>0</cpos>
     <rpos>0</rpos>
     <lpos>0</lpos>
     <master>1</master>
@@ -847,6 +767,25 @@
     <len>18432</len>
     <follow>1</follow>
     <sampleRate>44100</sampleRate>
+    <AudioOutput>
+      <name>Out 1</name>
+      <record>0</record>
+      <mute>0</mute>
+      <solo>0</solo>
+      <off>0</off>
+      <channels>2</channels>
+      <height>20</height>
+      <locked>0</locked>
+      <prefader>0</prefader>
+      <sendMetronome>0</sendMetronome>
+      <automation>0</automation>
+      <controller id="0" cur="1.02164" color="#ff0000" visible="0">
+        </controller>
+      <controller id="1" cur="0" color="#ff0000" visible="0">
+        </controller>
+      <controller id="2" cur="0" color="#0000ff" visible="0">
+        </controller>
+      </AudioOutput>
     <miditrack>
       <name>Track 1</name>
       <record>0</record>
@@ -856,6 +795,7 @@
       <channels>0</channels>
       <height>20</height>
       <locked>0</locked>
+      <selected>1</selected>
       <device>0</device>
       <channel>0</channel>
       <locked>0</locked>
@@ -870,30 +810,10 @@
       <part>
         <name>Track 1</name>
         <poslen tick="0" len="18432" />
-        <selected>1</selected>
+        <selected>0</selected>
         <color>0</color>
         </part>
       </miditrack>
-    <AudioOutput>
-      <name>Out 1</name>
-      <record>0</record>
-      <mute>0</mute>
-      <solo>0</solo>
-      <off>0</off>
-      <channels>2</channels>
-      <height>20</height>
-      <locked>0</locked>
-      <selected>1</selected>
-      <prefader>0</prefader>
-      <sendMetronome>0</sendMetronome>
-      <automation>0</automation>
-      <controller id="0" cur="1.02164" color="#ff0000" visible="0">
-        </controller>
-      <controller id="1" cur="0" color="#ff0000" visible="0">
-        </controller>
-      <controller id="2" cur="0" color="#0000ff" visible="0">
-        </controller>
-      </AudioOutput>
     <SynthI>
       <name>fluid-1</name>
       <record>0</record>
@@ -906,12 +826,13 @@
       <prefader>0</prefader>
       <sendMetronome>0</sendMetronome>
       <automation>0</automation>
-      <controller id="0" cur="1.41091" color="#ff0000" visible="0">
+      <controller id="0" cur="1.02164" color="#ff0000" visible="0">
         </controller>
       <controller id="1" cur="0" color="#ff0000" visible="0">
         </controller>
       <controller id="2" cur="0" color="#0000ff" visible="0">
         </controller>
+      <synthType>MESS</synthType>
       <class>fluid</class>
       <label>fluid</label>
       <port>1</port>
@@ -932,15 +853,16 @@
       <automation>0</automation>
       <controller id="0" cur="1.02164" color="#ff0000" visible="0">
         </controller>
-      <controller id="1" cur="-0.04" color="#ff0000" visible="0">
+      <controller id="1" cur="0" color="#ff0000" visible="0">
         </controller>
       <controller id="2" cur="0" color="#0000ff" visible="0">
         </controller>
+      <synthType>MESS</synthType>
       <class>organ</class>
       <label>Organ</label>
       <port>0</port>
       <nativeGuiVisible>0</nativeGuiVisible>
-      <nativeGeometry x="6" y="27" w="458" h="340"></nativeGeometry>
+      <nativeGeometry x="3" y="23" w="460" h="364"></nativeGeometry>
       <curProgram bankH="0" bankL="0" prog="0"/>
       <midistate version="2">
         <event type="2" datalen="75">
@@ -964,17 +886,18 @@
       <prefader>0</prefader>
       <sendMetronome>0</sendMetronome>
       <automation>0</automation>
-      <controller id="0" cur="0" color="#ff0000" visible="0">
+      <controller id="0" cur="1.02164" color="#ff0000" visible="0">
         </controller>
       <controller id="1" cur="0" color="#ff0000" visible="0">
         </controller>
       <controller id="2" cur="0" color="#0000ff" visible="0">
         </controller>
+      <synthType>MESS</synthType>
       <class>vam</class>
       <label>vam</label>
       <port>3</port>
       <nativeGuiVisible>0</nativeGuiVisible>
-      <nativeGeometry x="6" y="179" w="696" h="503"></nativeGeometry>
+      <nativeGeometry x="0" y="0" w="696" h="533"></nativeGeometry>
       <curProgram bankH="0" bankL="0" prog="0"/>
       <midistate version="2">
         <event type="2" datalen="131">
@@ -990,6 +913,14 @@
           </event>
         </midistate>
       </SynthI>
+    <Route channel="0">
+      <source name="Out 1"/>
+      <dest type="1" name="system:playback_1"/>
+      </Route>
+    <Route channel="1">
+      <source name="Out 1"/>
+      <dest type="1" name="system:playback_2"/>
+      </Route>
     <Route channel="0" channels="2">
       <source name="fluid-1"/>
       <dest name="Out 1"/>
@@ -1044,11 +975,24 @@
     <arrangerview>
       <topwin>
         <is_subwin>1</is_subwin>
-        <geometry_state>01d9d0cb000100000000000000000000000003ff000002440000000000000000000003ff00000244000000000000</geometry_state>
+        <x>0</x>
+        <y>0</y>
+        <width>850</width>
+        <height>382</height>
         <shares_menu>1</shares_menu>
         <toolbars>000000ff00000000fd00000000000000000000000000000004000000040000000800000008fc00000000</toolbars>
         </topwin>
       <tool>1</tool>
+      <arranger>
+        <info>1</info>
+        <split>370 477 </split>
+        <list>
+          <header> 7 9 8 6 5 4 3 2 1 0 </header>
+          </list>
+        <xpos>0</xpos>
+        <xmag>266</xmag>
+        <ypos>0</ypos>
+        </arranger>
       </arrangerview>
     </toplevels>
   </muse>
diff --git a/muse2/synti/fluid/CMakeLists.txt b/muse2/synti/fluid/CMakeLists.txt
index 5be44593..3789a745 100644
--- a/muse2/synti/fluid/CMakeLists.txt
+++ b/muse2/synti/fluid/CMakeLists.txt
@@ -73,7 +73,6 @@ set (FILES_TO_TRANSLATE
 set_target_properties ( fluid
       PROPERTIES PREFIX ""
       COMPILE_FLAGS "-fvisibility=hidden -include ${PROJECT_BINARY_DIR}/all-pic.h"
-      LINK_FLAGS "${FLUIDSYN_LDFLAGS}"   # "-lfluidsynth"
       )
 
 ##
@@ -82,12 +81,7 @@ set_target_properties ( fluid
 target_link_libraries(fluid
       synti
       ${QT_LIBRARIES}
-      # Can't do this. FLUIDSYN_LIBRARIES = fluidsynth, which is the name 
-      # of our fluidsynth.so shared synthesizer library.
-      # This caused ../fluidsynth/fluidsynth.so to appear in the link line.
-      # ${FLUIDSYN_LIBRARIES}
-      # Try giving full path: Nope, path is empty!
-      # ${FLUIDSYN_LIBRARY_DIRS}/${FLUIDSYN_LIBRARIES}
+      ${FLUIDSYN_LIBRARIES}
       )
 
 ##
diff --git a/muse2/synti/fluidsynth/CMakeLists.txt b/muse2/synti/fluidsynth/CMakeLists.txt
index db96341f..8ac178be 100644
--- a/muse2/synti/fluidsynth/CMakeLists.txt
+++ b/muse2/synti/fluidsynth/CMakeLists.txt
@@ -54,7 +54,7 @@ file (GLOB fluidsynth_source_files
 ##
 ## Define target
 ##
-add_library ( fluidsynth SHARED 
+add_library ( fluid_synth SHARED 
       ${fluidsynth_source_files}
       ${fluidsynth_mocs}
       ${fluidsynth_uis}
@@ -78,30 +78,24 @@ set (FILES_TO_TRANSLATE
 #   libfluidsynth.so
 # - use precompiled header files
 #
-set_target_properties ( fluidsynth 
+set_target_properties ( fluid_synth 
       PROPERTIES PREFIX ""
       COMPILE_FLAGS "-fvisibility=hidden -include ${PROJECT_BINARY_DIR}/all-pic.h"
-      LINK_FLAGS "${FLUIDSYN_LDFLAGS}"   # "-lfluidsynth"
       )
 
-
 ##
 ## Linkage
 ##
-target_link_libraries(fluidsynth
+target_link_libraries(fluid_synth
       synti
       ${QT_LIBRARIES}
-      # Can't do this here, since FLUIDSYN_LIBRARIES evaluates 
-      # to 'fluidsynth', the same name as our target.
-      # ${FLUIDSYN_LIBRARIES}
-      # Try giving full path:  Nope, path is empty!
-      #${FLUIDSYN_LIBRARY_DIRS}/${FLUIDSYN_LIBRARIES}
+      ${FLUIDSYN_LIBRARIES}
       )
 
 ##
 ## Install location
 ##
-install( TARGETS fluidsynth 
+install( TARGETS fluid_synth 
       DESTINATION ${MusE_SYNTHI_DIR}
       )
 install( FILES README.txt TODO
diff --git a/muse2/synti/vam/vam.cpp b/muse2/synti/vam/vam.cpp
index 7928aec2..713d8a59 100644
--- a/muse2/synti/vam/vam.cpp
+++ b/muse2/synti/vam/vam.cpp
@@ -26,7 +26,6 @@
 // 02111-1301, USA or point your web browser to http://www.gnu.org.
 //=========================================================
 
-#include <assert.h>
 #include <cmath>
 #include <stdio.h>
 #include <list>