merged with trunk and adapted new functions

162 files changed, 23582 insertions, 10535 deletions

diff --git a/muse2/ChangeLog b/muse2/ChangeLog
index fce03eb0..1af47f28 100644
--- a/muse2/ChangeLog
+++ b/muse2/ChangeLog
@@ -1,3 +1,87 @@
+02.06.2011:
+        - the score editor now allows batch-movements, that is,
+          you can transpose or move the whole selection and not
+          only single notes (flo93)
+        - the functions now return as boolean, if they have triggered
+          undo (flo93)
+30.05.2011:
+        - implemented cut,copy'n'paste and the "select foo" entries in the score editor (flo93)
+        - added select_foo() functions to functions.cpp (flo93)
+        - removed "midi in" button from score editor (flo93)
+        - added a spinbox to the arranger's "Ch:" column (flo93)
+29.05.2011:
+        - moved cut,copy'n'paste to functions.cpp, removed unneccessary duplication (flo93)
+        - changed behaviour of paste: now the pasted, not the original notes are selected (flo93)
+28.05.2011:
+        - fixed dragging and resizing of track header, also changed default index of new 
+          sections, they should appear last now (rj)
+        - fixed the buggy bugfix of the "invalid Part*s" bug (flo93)
+27.05.2011:
+        - fixed bug in scoreeditor: invalid Part*s are now not used any more (flo93)
+        - applied some hunks of the patch sent in by WillyFoobar (flo93)
+25.05.2011:
+        - Added midiin and steprec buttons again (flo93)
+        - Added step-rec-support for drum edit and score edit (flo93)
+        - put step-rec-stuff into its own class (flo93)
+        - moved clefTypes out of scoreedit.h to prevent compile-horror (flo93)
+        - Declared struct Route as QMetaType to make it a QVariant type. (Tim)
+        - Moved: All routing popup menu stuff from app, astrip, mstrip, mtrackinfo into
+           new class RoutePopupMenu, *massively* cleaning up those 4 files. 
+          Used the new Route QVariant type as action data instead of integers. 
+        - Moved MenuTitleItem definitions from astrip.cpp into it's own menutitleitem.cpp (Tim)  
+        - Added to settings: "Make popup menus stay open. Otherwise hold Ctrl." (Tim)   
+          To avoid showing new users non-standard behaviour, the default is off!
+24.05.2011:
+        - Awl::PitchEdit now can be set with the musical keyboard (flo93)
+        - fixed y-stretch (flo93)
+        - cleaned up step-rec and midi-in buttons and stuff (flo93)
+        - steprec now supports a "insert rest" key, which can be set (flo93)
+          under Midi -> Input Plugins -> Remote Control
+        - song->midiNote now also delivers note off events (flo93)
+        - fixed pitch-spinbox (flo93)
+        - removed auto-resize from tracklist-header (rj)
+        - removed channel from track list for a drum track and grayed it out in track info (rj)
+        - fixed samplerate warning from templates (rj)
+23.05.2011:   (all changes made by flo93, except one)
+    Function-related changes:
+        - made all the stuff in the "functions" menu global
+        - added crescendo, legato functions, improved erase function
+        - removed unneccessary _to and _quant* - stuff from piano roll and drum edit
+          this also involved changing the Toolbar1 
+        - changed behaviour for step-recording: the note-length is now the "raster"-
+          value instead of the "quant"-value
+        - changed behaviour for scripts: the "quant"-parameter they get isn't the
+          quant-combo's setting, but the snap-combo's now
+        - removed unneccessary short cuts: SHRT_OVER_QUANTIZE etc. instead added
+          SHRT_QUANTIZE
+
+    Score-Editor-related changes:
+        - using the proper AL::raster functions in the score editor
+        - added support for selections to the score editor
+        - distance between staves is now automatically increased if neccessary
+        - fixed "change pitch freezes scoreeditor"-bug
+        - added clef-combobox to midi tracks (rj and flo)
+        - don't install the *.mf files any more
+        - added a modified MTScale to the score editor
+        
+    Other Stuff:
+        - speeded up importing midi massively
+        - when step-recording, chords can now be entered with only the musical keyboard
+        - swapped ctrl and shift behaviour to make muse accord to standards
+        - toolbar states are now saved
+        - improved "cakewalk" mode for arranger: added y-stretch and drawing some controllers 
+        - added line tool to drum editor
+        - added "reorder list" function to drum roll
+        - changed ctrl-edit's behaviour when control key is pressed
+        
+20.05.2011:
+        - Popup menus: If stay-open mode, space triggers item and double-click simulates return (closing). (Tim)
+19.05.2011:
+        * Feature: Popup menus now auto-scroll if too large to fit on desktop. (p4.0.25 Tim)
+          Added auto-scroll to my class PopupMenu. Added selectable stay-open. TODO: Use it more, where needed.
+        - Changed midi track info patch popup behaviour. Now stays open for auditioning patches. (Tim)
+        - Changed editor 'ctrl' controller popups. Split instrument/other (+ common controls!) + show ctrl numbers. (Tim)
+          TODO: Add custom (R)NRPN dialog to 'other' section.
 15.05.2011:
         - Changed mouse wheel behaviour in graphical editors except the score editor (rj)
             * wheel scrolls left-right
diff --git a/muse2/awl/midimeter.h b/muse2/awl/midimeter.h
index 2b0d3518..929e648c 100644
--- a/muse2/awl/midimeter.h
+++ b/muse2/awl/midimeter.h
@@ -31,8 +31,9 @@ namespace Awl {
 
 class MidiMeter : public Slider
       {
-      Q_PROPERTY(int meterWidth READ meterWidth WRITE setMeterWidth)
       Q_OBJECT
+      Q_PROPERTY(int meterWidth READ meterWidth WRITE setMeterWidth)
+      
 
       double meterval;
       int _meterWidth;
diff --git a/muse2/awl/midimslider.h b/muse2/awl/midimslider.h
index a2a2bdaf..a363348a 100644
--- a/muse2/awl/midimslider.h
+++ b/muse2/awl/midimslider.h
@@ -31,8 +31,9 @@ namespace Awl {
 
 class MidiMeterSlider : public Slider
       {
-      Q_PROPERTY(int meterWidth READ meterWidth WRITE setMeterWidth)
       Q_OBJECT
+      Q_PROPERTY(int meterWidth READ meterWidth WRITE setMeterWidth)
+      
 
       double meterval;
       int _meterWidth;
diff --git a/muse2/awl/mslider.h b/muse2/awl/mslider.h
index 4ae888b1..15dd8a7e 100644
--- a/muse2/awl/mslider.h
+++ b/muse2/awl/mslider.h
@@ -32,9 +32,10 @@ namespace Awl {
 
 class MeterSlider : public VolSlider
       {
+      Q_OBJECT
       Q_PROPERTY(int meterWidth READ meterWidth WRITE setMeterWidth)
       Q_PROPERTY(int channel READ channel WRITE setChannel)
-      Q_OBJECT
+      
 
       int _channel;
       std::vector<double> meterval;
diff --git a/muse2/awl/pitchedit.cpp b/muse2/awl/pitchedit.cpp
index 93f4b310..6bae2f5b 100644
--- a/muse2/awl/pitchedit.cpp
+++ b/muse2/awl/pitchedit.cpp
@@ -25,6 +25,8 @@
 
 #include <QKeyEvent>
 
+extern QObject* song; // TODO FINDME this is a really dirty hack!
+
 namespace Awl {
 
 //---------------------------------------------------------
@@ -36,6 +38,7 @@ PitchEdit::PitchEdit(QWidget* parent)
       {
       setRange(0, 127);
       deltaMode = false;
+      connect(song, SIGNAL(midiNote(int, int)), SLOT(midiNote(int,int)));
       }
 
 //---------------------------------------------------------
@@ -54,7 +57,7 @@ void PitchEdit::keyPressEvent(QKeyEvent* ev)
 //   mapValueToText
 //---------------------------------------------------------
 
-QString PitchEdit::mapValueToText(int v)
+QString PitchEdit::textFromValue(int v) const
       {
       if (deltaMode) {
             QString s;
@@ -69,7 +72,7 @@ QString PitchEdit::mapValueToText(int v)
 //   mapTextToValue
 //---------------------------------------------------------
 
-int PitchEdit::mapTextToValue(bool* ok)
+int PitchEdit::valueFromText(bool* ok) const
       {
 printf("AwlPitchEdit: mapTextToValue: not impl.\n");
       if (ok)
@@ -89,5 +92,14 @@ void PitchEdit::setDeltaMode(bool val)
       else
             setRange(0, 127);
       }
+
+void PitchEdit::midiNote(int pitch, int velo)
+{
+	if (hasFocus() && velo)
+	  setValue(pitch);
+}
+
+
 }
 
+
diff --git a/muse2/awl/pitchedit.h b/muse2/awl/pitchedit.h
index bdcfc4c4..1512ec8d 100644
--- a/muse2/awl/pitchedit.h
+++ b/muse2/awl/pitchedit.h
@@ -37,8 +37,8 @@ class PitchEdit : public QSpinBox {
       bool deltaMode;
 
    protected:
-      virtual QString mapValueToText(int v);
-      virtual int mapTextToValue(bool* ok);
+      virtual QString textFromValue(int v) const;
+      virtual int valueFromText(bool* ok) const;
       virtual void keyPressEvent(QKeyEvent*);
 
    signals:
@@ -48,6 +48,9 @@ class PitchEdit : public QSpinBox {
    public:
       PitchEdit(QWidget* parent);
       void setDeltaMode(bool);
+   
+   private slots:
+      void midiNote(int pitch, int velo);
       };
 }
 
diff --git a/muse2/awl/pitchlabel.h b/muse2/awl/pitchlabel.h
index e5c34dba..a09d1ced 100644
--- a/muse2/awl/pitchlabel.h
+++ b/muse2/awl/pitchlabel.h
@@ -30,9 +30,11 @@ namespace Awl {
 //---------------------------------------------------------
 
 class PitchLabel : public QLabel {
+      Q_OBJECT
+    
       bool _pitchMode;
       int _value;
-      Q_OBJECT
+      
 
    protected:
       QSize sizeHint() const;
diff --git a/muse2/awl/sigedit.cpp b/muse2/awl/sigedit.cpp
index 984a209b..0ff40de9 100644
--- a/muse2/awl/sigedit.cpp
+++ b/muse2/awl/sigedit.cpp
@@ -159,7 +159,7 @@ QAbstractSpinBox::StepEnabled SigEdit::stepEnabled() const
 //   fixup
 //---------------------------------------------------------
 
-void SigEdit::fixup(QString& input) const
+void SigEdit::fixup(QString& /*input*/) const
       {
 //      printf("fixup <%s>\n", input.toLatin1().constData());
       }
diff --git a/muse2/awl/tempolabel.h b/muse2/awl/tempolabel.h
index df9abfcd..b7df6b56 100644
--- a/muse2/awl/tempolabel.h
+++ b/muse2/awl/tempolabel.h
@@ -30,9 +30,10 @@ namespace Awl {
 //---------------------------------------------------------
 
 class TempoLabel : public QLabel {
+      Q_OBJECT
       double _value;
 
-      Q_OBJECT
+      
 
    protected:
       QSize sizeHint() const;
diff --git a/muse2/muse.pro b/muse2/muse.pro
index 364ab42b..4f19f2b4 100644
--- a/muse2/muse.pro
+++ b/muse2/muse.pro
@@ -686,3 +686,10 @@ QT += xml  qt3support
 #The following line was inserted by qt3to4
 CONFIG += uic3
 
+TRANSLATIONS = \
+share/locale/muse_de.ts \
+share/locale/muse_es.ts \
+share/locale/muse_fr.ts \
+share/locale/muse_pl.ts \
+share/locale/muse_ru.ts \
+share/locale/muse_sv_SE.ts
diff --git a/muse2/muse/CMakeLists.txt b/muse2/muse/CMakeLists.txt
index e6a90a59..cea95083 100644
--- a/muse2/muse/CMakeLists.txt
+++ b/muse2/muse/CMakeLists.txt
@@ -63,6 +63,7 @@ QT4_WRAP_CPP ( muse_moc_headers
       song.h 
       transport.h 
       value.h 
+      steprec.h 
       )
 
 ##
@@ -135,6 +136,7 @@ file (GLOB core_source_files
       waveevent.cpp 
       wavetrack.cpp 
       xml.cpp
+      steprec.cpp
       )
 file (GLOB main_source_files
       main.cpp
diff --git a/muse2/muse/app.cpp b/muse2/muse/app.cpp
index adac840a..72cdad6a 100644
--- a/muse2/muse/app.cpp
+++ b/muse2/muse/app.cpp
@@ -43,7 +43,7 @@
 #include "mixdowndialog.h"
 #include "pianoroll.h"
 #include "scoreedit.h"
-#include "popupmenu.h"
+#include "routepopup.h"
 #include "shortcutconfig.h"
 #include "songinfo.h"
 #include "ticksynth.h"
@@ -93,7 +93,6 @@ static QString* projectList[PROJECT_LIST_LEN];
 extern void initMidiSynth();
 extern void exitJackAudio();
 extern void exitDummyAudio();
-// p3.3.39
 extern void exitOSC();
 
 #ifdef HAVE_LASH
@@ -809,7 +808,6 @@ MusE::MusE(int argc, char** argv) : QMainWindow()
       editInstrument        = 0;
       routingPopupMenu      = 0;
       progress              = 0;
-      //routingPopupView      = 0;
       
       appName               = QString("MusE");
       setWindowTitle(appName);
@@ -1658,7 +1656,6 @@ void MusE::initMidiDevices()
       
       audio->msgInitMidiDevices();
       
-      // Added by T356
       //audio->msgIdle(false);
       }
 
@@ -1815,7 +1812,7 @@ void MusE::loadProjectFile1(const QString& name, bool songTemplate, bool loadAll
                   }
             else {
                   Xml xml(f);
-                  read(xml, !loadAll);
+                  read(xml, !loadAll, songTemplate);
                   bool fileError = ferror(f);
                   popenFlag ? pclose(f) : fclose(f);
                   if (fileError) {
@@ -2080,7 +2077,7 @@ bool MusE::save(const QString& name, bool overwriteWarn)
       if (ferror(f)) {
             QString s = "Write File\n" + name + "\nfailed: "
                //+ strerror(errno);
-               + QString(strerror(errno));                 // p4.0.0
+               + QString(strerror(errno));                 
             QMessageBox::critical(this,
                tr("MusE: Write File failed"), s);
             popenFlag? pclose(f) : fclose(f);
@@ -2172,10 +2169,10 @@ void MusE::closeEvent(QCloseEvent* event)
         printf("MusE: Exiting Metronome\n");
       exitMetronome();
       
-      // p3.3.47
-      // Make sure to clear the menu, which deletes any sub menus.
+      // 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
       if(routingPopupMenu)
-        routingPopupMenu->clear();
+        delete routingPopupMenu;     
       #if 0
       if(routingPopupView)
       {
@@ -2201,10 +2198,8 @@ void MusE::closeEvent(QCloseEvent* event)
             d.remove(f.completeBaseName() + ".wca");
             }
       
-      // Added by Tim. p3.3.14
-      
 #ifdef HAVE_LASH
-      // Disconnect gracefully from LASH.
+      // Disconnect gracefully from LASH. Tim. p3.3.14
       if(lash_client)
       {
         if(debugMsg)
@@ -2292,1080 +2287,18 @@ void MusE::showTransport(bool flag)
 
 //---------------------------------------------------------
 //   getRoutingPopupMenu
+//   Get the special common routing popup menu. Used (so far) 
+//    by audio strip, midi strip, and midi trackinfo.
 //---------------------------------------------------------
 
-PopupMenu* MusE::getRoutingPopupMenu()
+RoutePopupMenu* MusE::getRoutingPopupMenu()
 {
   if(!routingPopupMenu)
-    routingPopupMenu = new PopupMenu(this);
+    routingPopupMenu = new RoutePopupMenu(this);
   return routingPopupMenu;
 }
 
 //---------------------------------------------------------
-//   updateRouteMenus
-//---------------------------------------------------------
-
-void MusE::updateRouteMenus(Track* track, QObject* master)    
-{
-      // NOTE: The purpose of this routine is to make sure the items actually reflect
-      //  the routing status. 
-      // In case for some reason a route could not be added (or removed). 
-      // Then the item will be properly un-checked (or checked) here.
-      
-      //if(!track || track != gRoutingPopupMenuMaster || track->type() == Track::AUDIO_AUX)
-      //if(!track || track->type() == Track::AUDIO_AUX)
-      if(!track || gRoutingPopupMenuMaster != master)  // p3.3.50
-        return;
-        
-      PopupMenu* pup = getRoutingPopupMenu();
-      
-      if(pup->actions().isEmpty())
-        return;
-        
-      if(!pup->isVisible())
-        return;
-        
-      //AudioTrack* t = (AudioTrack*)track;
-      RouteList* rl = gIsOutRoutingPopupMenu ? track->outRoutes() : track->inRoutes();
-
-      iRouteMenuMap imm = gRoutingMenuMap.begin();
-      for(; imm != gRoutingMenuMap.end(); ++imm) 
-      {
-        // p3.3.50 Ignore the 'toggle' items.
-        if(imm->second.type == Route::MIDI_PORT_ROUTE && 
-           //imm->first >= (MIDI_PORTS * MIDI_CHANNELS) && imm->first < (MIDI_PORTS * MIDI_CHANNELS + MIDI_PORTS))   
-           imm->second.channel == (1 << MIDI_CHANNELS) - 1)  // p4.0.14 See if all channels are set, rather than using ID.
-          continue;
-          
-        
-        // p4.0.14 TODO FIXME Couldn't quite figure out the logic yet. It should be possible (I hope). 
-        // But not really required for now, as per above note.
-        if(gIsOutRoutingPopupMenu && track->isMidiTrack() &&
-          imm->second.type == Route::TRACK_ROUTE && imm->second.track->type() == Track::AUDIO_INPUT)
-          return;
-        #if 0
-        printf("imm route:\n");  
-        imm->second.dump();
-        if(track->isMidiTrack())
-        {
-          if(imm->second.type == Route::TRACK_ROUTE && imm->second.track->type() == Track::AUDIO_INPUT)
-          {
-            Route &aRoute = imm->second;
-            int chbit = aRoute.channel;
-            ///Route bRoute(track, chbit);
-            ///int mdidx = bRoute.midiPort;
-            int port = ((MidiTrack*)track)->outPort();
-            if(port < 0 || port >= MIDI_PORTS)
-              continue;
-            int tchbit = 1 << ((MidiTrack*)track)->outChannel();
-            
-            MidiPort* mp = &midiPorts[port];
-            
-            ///Route bRoute(port, chbit);
-            
-            //int chmask = 0;                   
-            bool found = false;
-            RouteList* mprl = gIsOutRoutingPopupMenu ? mp->outRoutes() : mp->inRoutes();
-            iRoute ir = mprl->begin();
-            for(; ir != mprl->end(); ++ir) 
-            {
-              printf("mp route:\n");  
-              ir->dump(); 
-              ///if(aRoute.type == Route::TRACK_ROUTE)                                     // Is the map route a track route?
-              {
-                if(ir->type == Route::TRACK_ROUTE && ir->track == aRoute.track)  // Is the track route a midi port route?
-                  //&& (ir->channel & chbit) == chbit)               
-                  //&& (ir->channel & tchbit))               // Is the exact channel mask bit(s) set?
-                {
-                  printf("track matches\n");  
-                  if(ir->channel & tchbit)
-                  {
-                    found = true;
-                    printf("found: bit matches\n");  
-                  }  
-                  break;
-                }
-              }
-              ///else
-              ///if(*ir == aRoute)
-              ///{
-                //found = true;
-              ///  break;
-              ///}
-            }
-            //pup->setItemChecked(imm->first, found);
-            //printf("MusE::updateRouteMenus setItemChecked\n");
-            // TODO: MusE-2: Convert this, fastest way is to change the routing map, otherwise this requires a lookup.
-            //if(pup->isItemChecked(imm->first) != (irl != rl->end()))
-            //  pup->setItemChecked(imm->first, irl != rl->end());
-            QAction* act = pup->findActionFromData(imm->first);  
-            //printf("set act checked to:%d\n", ir != mprl->end());  
-            //if(act && act->isChecked() != (ir != mprl->end()))
-            //  act->setChecked(ir != mprl->end());
-            printf("set act checked to:%d\n", found);  
-            if(act && act->isChecked() != found)
-              act->setChecked(found);
-            
-            //return;
-          }
-        }
-        #endif
-        
-        //bool found = false;
-        iRoute irl = rl->begin();
-        for(; irl != rl->end(); ++irl) 
-        {
-          if(imm->second.type == Route::MIDI_PORT_ROUTE)                                     // p3.3.50 Is the map route a midi port route?
-          {
-            if(irl->type == Route::MIDI_PORT_ROUTE && irl->midiPort == imm->second.midiPort  // Is the track route a midi port route?
-               && (irl->channel & imm->second.channel) == imm->second.channel)               // Is the exact channel mask bit(s) set?
-            {
-              //found = true;
-              break;
-            }
-          }
-          else
-          if(*irl == imm->second)
-          {
-            //found = true;
-            break;
-          }
-        }
-        //pup->setItemChecked(imm->first, found);
-        //printf("MusE::updateRouteMenus setItemChecked\n");
-        // TODO: MusE-2: Convert this, fastest way is to change the routing map, otherwise this requires a lookup.
-        //if(pup->isItemChecked(imm->first) != (irl != rl->end()))
-        //  pup->setItemChecked(imm->first, irl != rl->end());
-        QAction* act = pup->findActionFromData(imm->first);  
-        if(act && act->isChecked() != (irl != rl->end()))
-          act->setChecked(irl != rl->end());
-      }
-}      
-      
-//---------------------------------------------------------
-//   routingPopupMenuActivated
-//---------------------------------------------------------
-
-void MusE::routingPopupMenuActivated(Track* track, int n)
-{
-      //if(!track || (track != gRoutingPopupMenuMaster))
-      if(!track)
-        return;
-        
-      if(track->isMidiTrack())
-      {
-        PopupMenu* pup = getRoutingPopupMenu();
-        
-        if(pup->actions().isEmpty())
-          return;
-          
-        //MidiTrack* t = (MidiTrack*)track;
-        RouteList* rl = gIsOutRoutingPopupMenu ? track->outRoutes() : track->inRoutes();
-        
-        if(n == -1) 
-          return;
-        
-        if(!gIsOutRoutingPopupMenu && n == 0)      // p4.0.17
-        {
-          muse->configMidiPorts();
-          return;
-        }
-        
-        iRouteMenuMap imm = gRoutingMenuMap.find(n);
-        if(imm == gRoutingMenuMap.end())
-          return;
-        
-        // Support Midi Port to Audio Input track routes. p4.0.14 Tim.
-        if(imm->second.type == Route::TRACK_ROUTE)
-        {
-          //if(gIsOutRoutingPopupMenu)    // Try to avoid splitting like this. 
-          {
-            Route &aRoute = imm->second;
-            int chbit = aRoute.channel;
-            int port = ((MidiTrack*)track)->outPort();
-            if(port < 0 || port >= MIDI_PORTS)
-              return;
-            
-            MidiPort* mp = &midiPorts[port];
-            ///MidiDevice* md = mp->device();
-            
-            // This is desirable, but could lead to 'hidden' routes unless we add more support
-            //  such as removing the existing routes when user changes flags.
-            // So for now, just list all valid ports whether read or write.
-            ///if(!md)
-            ///  return;
-            ///if(!(md->rwFlags() & (gIsOutRoutingPopupMenu ? 1 : 2)))
-            ///  return;
-            
-            //int channel = ((MidiTrack*)track->outChannel();
-            Route bRoute(port, chbit);
-            
-            int chmask = 0;                   
-            RouteList* mprl = gIsOutRoutingPopupMenu ? mp->outRoutes() : mp->inRoutes();
-            iRoute ir = mprl->begin();
-            for (; ir != mprl->end(); ++ir) 
-            {
-              if(ir->type == Route::TRACK_ROUTE && ir->track == aRoute.track)    // Is there already a route to this port?
-              {
-                    chmask = ir->channel;  // Grab the channel mask.
-                    break;
-              }      
-            }
-            //if (iir != rl->end()) 
-            if ((chmask & chbit) == chbit)             // Is the channel's bit(s) set?
-            {
-              // disconnect
-              if(gIsOutRoutingPopupMenu)
-                audio->msgRemoveRoute(bRoute, aRoute);
-              else
-                audio->msgRemoveRoute(aRoute, bRoute);
-            }
-            else 
-            {
-              // connect
-              if(gIsOutRoutingPopupMenu)
-                audio->msgAddRoute(bRoute, aRoute);
-              else
-                audio->msgAddRoute(aRoute, bRoute);
-            }
-            
-            audio->msgUpdateSoloStates();
-            song->update(SC_ROUTE);
-            
-          }
-          return;
-        }
-        
-        
-        if(imm->second.type != Route::MIDI_PORT_ROUTE)
-          return;
-        Route &aRoute = imm->second;
-        int chbit = aRoute.channel;
-        Route bRoute(track, chbit);
-        int mdidx = aRoute.midiPort;
-
-        MidiPort* mp = &midiPorts[mdidx];
-        MidiDevice* md = mp->device();
-        //if(!md)    // Removed p4.0.17 Allow connections to ports with no device.
-        //  return;
-        
-        //if(!(md->rwFlags() & 2))
-        //if(!(md->rwFlags() & (gIsOutRoutingPopupMenu ? 1 : 2)))
-        if(md && !(md->rwFlags() & (gIsOutRoutingPopupMenu ? 1 : 2)))   // p4.0.17
-          return;
-        
-        int chmask = 0;                   
-        iRoute iir = rl->begin();
-        for (; iir != rl->end(); ++iir) 
-        {
-          //if(*iir == (dst ? bRoute : aRoute))
-          //if(*iir == aRoute)
-          if(iir->type == Route::MIDI_PORT_ROUTE && iir->midiPort == mdidx)    // p3.3.50 Is there already a route to this port?
-          {
-                chmask = iir->channel;  // p3.3.50 Grab the channel mask.
-                break;
-          }      
-        }
-        //if (iir != rl->end()) 
-        if ((chmask & chbit) == chbit)             // p3.3.50 Is the channel's bit(s) set?
-        {
-          // disconnect
-          if(gIsOutRoutingPopupMenu)
-            audio->msgRemoveRoute(bRoute, aRoute);
-          else
-            audio->msgRemoveRoute(aRoute, bRoute);
-        }
-        else 
-        {
-          // connect
-          if(gIsOutRoutingPopupMenu)
-            audio->msgAddRoute(bRoute, aRoute);
-          else
-            audio->msgAddRoute(aRoute, bRoute);
-        }
-        
-        audio->msgUpdateSoloStates();
-        song->update(SC_ROUTE);
-      }
-      else
-      {
-        // TODO: Try to move code from AudioStrip::routingPopupMenuActivated into here.
-        
-        /*
-        PopupMenu* pup = getRoutingPopupMenu();
-        
-        printf("MusE::routingPopupMenuActivated audio n:%d count:%d\n", n, pup->count());
-        
-        if(pup->count() == 0)
-          return;
-          
-        AudioTrack* t = (AudioTrack*)track;
-        RouteList* rl = gIsOutRoutingPopupMenu ? t->outRoutes() : t->inRoutes();
-        
-        //QPoint ppt = QCursor::pos();
-        
-        if(n == -1) 
-        {
-          //printf("MusE::routingPopupMenuActivated audio n = -1 deleting popup...\n");
-          printf("MusE::routingPopupMenuActivated audio n = -1\n");
-          ///delete pup;
-          ///pup = 0;
-          return;
-        }
-        else
-        //if(n == 0)
-        //{
-          //printf("MusE::routingPopupMenuActivated audio n = 0 = tearOffHandle\n");
-          //oR->setDown(false);     
-        //  return;
-        //}
-        //else
-        {
-            if(gIsOutRoutingPopupMenu)
-            {  
-              QString s(pup->text(n));
-              
-              //printf("AudioStrip::routingPopupMenuActivated audio text:%s\n", s.toLatin1().constData());
-              
-              if(track->type() == Track::AUDIO_OUTPUT)
-              {
-                ///delete orpup;
-                
-                int chan = n & 0xf;
-                
-                //Route srcRoute(t, -1);
-                //Route srcRoute(t, chan, chans);
-                //Route srcRoute(t, chan, 1);
-                Route srcRoute(t, chan);
-                
-                //Route dstRoute(s, true, -1);
-                Route dstRoute(s, true, -1, Route::JACK_ROUTE);
-                //Route dstRoute(s, true, 0, Route::JACK_ROUTE);
-    
-                //srcRoute.channel = dstRoute.channel = chan;
-                dstRoute.channel = chan;
-                //dstRoute.channels = 1;
-    
-                // check if route src->dst exists:
-                iRoute irl = rl->begin();
-                for (; irl != rl->end(); ++irl) {
-                      if (*irl == dstRoute)
-                            break;
-                      }
-                if (irl != rl->end()) {
-                      // disconnect if route exists
-                      audio->msgRemoveRoute(srcRoute, dstRoute);
-                      }
-                else {
-                      // connect if route does not exist
-                      audio->msgAddRoute(srcRoute, dstRoute);
-                      }
-                audio->msgUpdateSoloStates();
-                song->update(SC_ROUTE);
-                
-                // p3.3.47
-                //pup->popup(ppt, 0);
-                
-                //oR->setDown(false);   
-                return;
-                
-                // p3.3.46
-                ///goto _redisplay;
-              }
-              
-              iRouteMenuMap imm = gRoutingMenuMap.find(n);
-              if(imm == gRoutingMenuMap.end())
-              {  
-                ///delete orpup;
-                //oR->setDown(false);     // orpup->exec() catches mouse release event
-                return;
-              }  
-              
-              //int chan = n >> 16;
-              //int chans = (chan >> 15) + 1; // Bit 31 MSB: Mono or stereo.
-              //chan &= 0xffff;
-              //int chan = imm->second.channel;
-              //int chans = imm->second.channels; 
-              
-              //Route srcRoute(t, -1);
-              //srcRoute.remoteChannel = chan;
-              //Route srcRoute(t, chan, chans);
-              Route srcRoute(t, imm->second.channel, imm->second.channels);
-              //Route srcRoute(t, imm->second.channel);
-              srcRoute.remoteChannel = imm->second.remoteChannel;
-              
-              //Route dstRoute(s, true, -1);
-              //Route dstRoute(s, true, -1, Route::TRACK_ROUTE);
-              Route &dstRoute = imm->second;
-  
-              // check if route src->dst exists:
-              iRoute irl = rl->begin();
-              for (; irl != rl->end(); ++irl) {
-                    if (*irl == dstRoute)
-                          break;
-                    }
-              if (irl != rl->end()) {
-                    // disconnect if route exists
-                    audio->msgRemoveRoute(srcRoute, dstRoute);
-                    }
-              else {
-                    // connect if route does not exist
-                    audio->msgAddRoute(srcRoute, dstRoute);
-                    }
-              audio->msgUpdateSoloStates();
-              song->update(SC_ROUTE);
-                
-              // p3.3.46
-              //oR->setDown(false);     
-              ///goto _redisplay;
-              
-              // p3.3.47
-              //pup->popup(ppt, 0);
-            }  
-            else
-            {
-              QString s(pup->text(n));
-              
-              if(track->type() == Track::AUDIO_INPUT)
-              {
-                ///delete pup;
-                int chan = n & 0xf;
-                
-                Route srcRoute(s, false, -1, Route::JACK_ROUTE);
-                Route dstRoute(t, chan);
-                
-                srcRoute.channel = chan;
-                
-                iRoute irl = rl->begin();
-                for(; irl != rl->end(); ++irl) 
-                {
-                  if(*irl == srcRoute)
-                    break;
-                }
-                if(irl != rl->end()) 
-                  // disconnect
-                  audio->msgRemoveRoute(srcRoute, dstRoute);
-                else 
-                  // connect
-                  audio->msgAddRoute(srcRoute, dstRoute);
-                
-                audio->msgUpdateSoloStates();
-                song->update(SC_ROUTE);
-                //iR->setDown(false);     // pup->exec() catches mouse release event
-                return;
-                
-                // p3.3.46
-                ///goto _redisplay;
-              }
-              
-              iRouteMenuMap imm = gRoutingMenuMap.find(n);
-              if(imm == gRoutingMenuMap.end())
-              {  
-                //delete pup;
-                //iR->setDown(false);     // pup->exec() catches mouse release event
-                return;
-              }  
-              
-              //int chan = n >> 16;
-              //int chans = (chan >> 15) + 1; // Bit 31 MSB: Mono or stereo.
-              //chan &= 0xffff;
-              //int chan = imm->second.channel;
-              //int chans = imm->second.channels; 
-              
-              //Route srcRoute(s, false, -1);
-              //Route srcRoute(s, false, -1, Route::TRACK_ROUTE);
-              Route &srcRoute = imm->second;
-              
-              //Route dstRoute(t, -1);
-              //Route dstRoute(t, chan, chans);
-              Route dstRoute(t, imm->second.channel, imm->second.channels);
-              //Route dstRoute(t, imm->second.channel);
-              dstRoute.remoteChannel = imm->second.remoteChannel;
-  
-              iRoute irl = rl->begin();
-              for (; irl != rl->end(); ++irl) {
-                    if (*irl == srcRoute)
-                          break;
-                    }
-              if (irl != rl->end()) {
-                    // disconnect
-                    audio->msgRemoveRoute(srcRoute, dstRoute);
-                    }
-              else {
-                    // connect
-                    audio->msgAddRoute(srcRoute, dstRoute);
-                    }
-              audio->msgUpdateSoloStates();
-              song->update(SC_ROUTE);
-              
-              // p3.3.46
-              //iR->setDown(false);     
-              ///goto _redisplay;
-              
-              
-              
-              
-            }
-                
-        }
-       */
-       
-      }
-      //else
-      //{
-      //}
-}
-
-//---------------------------------------------------------
-//   routingPopupMenuAboutToHide
-//---------------------------------------------------------
-
-void MusE::routingPopupMenuAboutToHide()
-{
-      // Hmm, can't do this? Sub-menus stay open with this. Re-arranged, testing... Nope.
-      //PopupMenu* pup = muse->getRoutingPopupMenu();
-      //pup->disconnect();
-      //pup->clear();
-      
-      gRoutingMenuMap.clear();
-      gRoutingPopupMenuMaster = 0;
-}
-
-//---------------------------------------------------------
-//   prepareRoutingPopupMenu
-//---------------------------------------------------------
-
-PopupMenu* MusE::prepareRoutingPopupMenu(Track* track, bool dst)
-{
-  if(!track)
-    return 0;
-    
-  if(track->isMidiTrack())
-  {
-    RouteList* rl = dst ? track->outRoutes() : track->inRoutes();
-    //Route dst(track, -1);
-  
-    PopupMenu* pup = getRoutingPopupMenu();
-    pup->disconnect();
-    //connect(pup, SIGNAL(activated(int)), SLOT(routingPopupMenuActivated(int)));
-    //connect(pup, SIGNAL(aboutToHide()), SLOT(routingPopupMenuAboutToHide()));
-      
-    pup->clear();
-    gRoutingMenuMap.clear();
-    
-    int gid = 0;
-    QAction* act = 0;
-    
-    if(dst)   
-    {
-      // Support Midi Port to Audio Input track routes. p4.0.14 Tim.
-      int port = ((MidiTrack*)track)->outPort();
-      if(port >= 0 && port < MIDI_PORTS)
-      {
-        MidiPort* mp = &midiPorts[port];
-        
-        // p4.0.17 Do not list synth devices! Requiring valid device is desirable, 
-        //  but could lead to 'hidden' routes unless we add more support
-        //  such as removing the existing routes when user changes flags.
-        // So for now, just list all valid ports whether read or write.
-        if(mp->device() && !mp->device()->isSynti())  
-        {
-          RouteList* mprl = mp->outRoutes();
-          int chbits = 1 << ((MidiTrack*)track)->outChannel();
-          //MidiDevice* md = mp->device();
-          //if(!md)
-          //  continue;
-          
-          pup->addSeparator();
-          pup->addAction(new MenuTitleItem(tr("Soloing chain"), pup)); 
-          PopupMenu* subp = new PopupMenu(pup);
-          subp->setTitle(tr("Audio returns")); 
-          pup->addMenu(subp);
-          
-          InputList* al = song->inputs();
-          for (iAudioInput i = al->begin(); i != al->end(); ++i) 
-          {
-            Track* t = *i;
-            QString s(t->name());
-            
-            act = subp->addAction(s);
-            act->setData(gid);
-            act->setCheckable(true);
-            
-            Route r(t, chbits);
-            
-            gRoutingMenuMap.insert( pRouteMenuMap(gid, r) );
-            
-            for(iRoute ir = mprl->begin(); ir != mprl->end(); ++ir) 
-            {
-              if(ir->type == Route::TRACK_ROUTE && ir->track == t && (ir->channel & chbits))
-              {
-                act->setChecked(true);
-                break;
-              }  
-            }
-            ++gid;      
-          }
-        }     
-      }  
-    }
-    else
-    {
-      // Warn if no devices available. Add an item to open midi config. p4.0.17 
-      int pi = 0;
-      for( ; pi < MIDI_PORTS; ++pi)
-      {
-        MidiDevice* md = midiPorts[pi].device();
-        if(md && !md->isSynti() && (md->rwFlags() & 2))
-          break;
-      }
-      if(pi == MIDI_PORTS)
-      {
-        act = pup->addAction(tr("Warning: No midi input devices!"));
-        act->setCheckable(false);
-        act->setData(-1);
-        pup->addSeparator();
-      }
-      act = pup->addAction(QIcon(*settings_midiport_softsynthsIcon), tr("Open midi config..."));
-      act->setCheckable(false);
-      act->setData(gid);
-      pup->addSeparator();
-      ++gid;
-      
-      pup->addAction(new MenuTitleItem("Midi input ports", pup)); 
-      
-      for(int i = 0; i < MIDI_PORTS; ++i)
-      {
-        // NOTE: Could possibly list all devices, bypassing ports, but no, let's stick with ports.
-        MidiPort* mp = &midiPorts[i];
-        MidiDevice* md = mp->device();
-        //if(!md)
-        //  continue;
-        
-        // p4.0.17 Do not list synth devices!
-        if(md && md->isSynti())
-          continue;
-          
-        if(md && !(md->rwFlags() & 2))
-          continue;
-          
-        //printf("MusE::prepareRoutingPopupMenu adding submenu portnum:%d\n", i);
-        
-        // MusE-2: Check this - needed with QMenu? Help says no. No - verified, it actually causes double triggers!
-        //connect(subp, SIGNAL(triggered(QAction*)), pup, SIGNAL(triggered(QAction*)));
-        //connect(subp, SIGNAL(aboutToHide()), pup, SIGNAL(aboutToHide()));
-        
-        int chanmask = 0;
-        // p3.3.50 To reduce number of routes required, from one per channel to just one containing a channel mask. 
-        // Look for the first route to this midi port. There should always be only a single route for each midi port, now.
-        iRoute ir = rl->begin();
-        for( ; ir != rl->end(); ++ir)   
-        {
-          if(ir->type == Route::MIDI_PORT_ROUTE && ir->midiPort == i) 
-          {
-            // We have a route to the midi port. Grab the channel mask.
-            chanmask = ir->channel;
-            break;
-          }
-        }
-        // p4.0.17 List ports with no device, but with routes to this track, in the main popup.
-        if(!md && ir == rl->end())
-          continue;
-        
-        PopupMenu* subp = new PopupMenu(pup);
-        subp->setTitle(QString("%1:").arg(i+1) + (md ? md->name() : tr("<none>"))); 
-        
-        for(int ch = 0; ch < MIDI_CHANNELS; ++ch) 
-        {
-          act = subp->addAction(QString("Channel %1").arg(ch+1));
-          act->setCheckable(true);
-          act->setData(gid);
-          
-          int chbit = 1 << ch;
-          Route srcRoute(i, chbit);    // p3.3.50 In accordance with new channel mask, use the bit position.
-          
-          gRoutingMenuMap.insert( pRouteMenuMap(gid, srcRoute) );
-          
-          if(chanmask & chbit)                  // p3.3.50 Is the channel already set? Show item check mark.
-            act->setChecked(true);
-          
-          ++gid;  
-        }
-        //gid = MIDI_PORTS * MIDI_CHANNELS + i;           // Make sure each 'toggle' item gets a unique id.
-        act = subp->addAction(tr("Toggle all"));
-        //act->setCheckable(true);
-        act->setData(gid);
-        Route togRoute(i, (1 << MIDI_CHANNELS) - 1);    // Set all channel bits.
-        gRoutingMenuMap.insert( pRouteMenuMap(gid, togRoute) );
-        ++gid;
-        pup->addMenu(subp);
-      }
-      
-      #if 0
-      // p4.0.17 List ports with no device and no in routes, in a separate popup.
-      PopupMenu* morep = new PopupMenu(pup);
-      morep->setTitle(tr("More...")); 
-      for(int i = 0; i < MIDI_PORTS; ++i)
-      {
-        MidiPort* mp = &midiPorts[i];
-        if(mp->device())
-          continue;
-        
-        PopupMenu* subp = new PopupMenu(morep);
-        subp->setTitle(QString("%1:").arg(i) + tr("<none>")); 
-        
-        // MusE-2: Check this - needed with QMenu? Help says no. No - verified, it actually causes double triggers!
-        //connect(subp, SIGNAL(triggered(QAction*)), pup, SIGNAL(triggered(QAction*)));
-        //connect(subp, SIGNAL(aboutToHide()), pup, SIGNAL(aboutToHide()));
-        
-        iRoute ir = rl->begin();
-        for( ; ir != rl->end(); ++ir)   
-        {
-          if(ir->type == Route::MIDI_PORT_ROUTE && ir->midiPort == i) 
-            break;
-        }
-        if(ir != rl->end())
-          continue;
-        
-        for(int ch = 0; ch < MIDI_CHANNELS; ++ch) 
-        {
-          act = subp->addAction(QString("Channel %1").arg(ch+1));
-          act->setCheckable(true);
-          act->setData(gid);
-          
-          int chbit = 1 << ch;
-          Route srcRoute(i, chbit);    // In accordance with new channel mask, use the bit position.
-          
-          gRoutingMenuMap.insert( pRouteMenuMap(gid, srcRoute) );
-          
-          //if(chanmask & chbit)                  // Is the channel already set? Show item check mark.
-          //  act->setChecked(true);
-          
-          ++gid;  
-        }
-        //gid = MIDI_PORTS * MIDI_CHANNELS + i;           // Make sure each 'toggle' item gets a unique id.
-        act = subp->addAction(QString("Toggle all"));
-        //act->setCheckable(true);
-        act->setData(gid);
-        Route togRoute(i, (1 << MIDI_CHANNELS) - 1);    // Set all channel bits.
-        gRoutingMenuMap.insert( pRouteMenuMap(gid, togRoute) );
-        ++gid;
-        morep->addMenu(subp);
-      }      
-      pup->addMenu(morep);
-      #endif
-      
-    }
-        
-    if(pup->actions().isEmpty())
-    {
-      gRoutingPopupMenuMaster = 0;
-      //pup->clear();
-      //pup->disconnect();
-      gRoutingMenuMap.clear();
-      //oR->setDown(false);     
-      return 0;
-    }
-    
-    gIsOutRoutingPopupMenu = dst;
-    return pup;
-  }
-  
-  return 0;
-}
-
-#if 0
-//---------------------------------------------------------
-//   getRoutingPopupView
-//---------------------------------------------------------
-
-PopupView* MusE::getRoutingPopupView()
-{
-  if(!routingPopupView)
-    //routingPopupView = new PopupView(this);
-    routingPopupView = new PopupView();
-  return routingPopupView;
-}
-
-//---------------------------------------------------------
-//   routingPopupViewActivated
-//---------------------------------------------------------
-
-void MusE::routingPopupViewActivated(Track* track, int n)
-{
-      //if(!track || (track != gRoutingPopupMenuMaster))
-      if(!track)
-        return;
-        
-      if(track->isMidiTrack())
-      {
-        PopupView* pup = getRoutingPopupView();
-        
-        //printf("MusE::routingPopupMenuActivated midi n:%d count:%d\n", n, pup->count());
-        
-        if(pup->model()->rowCount() == 0)
-          return;
-          
-        //MidiTrack* t = (MidiTrack*)track;
-        RouteList* rl = gIsOutRoutingPopupMenu ? track->outRoutes() : track->inRoutes();
-        
-        if(n == -1) 
-          return;
-          
-        iRouteMenuMap imm = gRoutingMenuMap.find(n);
-        if(imm == gRoutingMenuMap.end())
-          return;
-        if(imm->second.type != Route::MIDI_PORT_ROUTE)
-          return;
-        Route &aRoute = imm->second;
-        int chbit = aRoute.channel;
-        Route bRoute(track, chbit);
-        int mdidx = aRoute.midiPort;
-
-        MidiPort* mp = &midiPorts[mdidx];
-        MidiDevice* md = mp->device();
-        if(!md)
-          return;
-        
-        //if(!(md->rwFlags() & 2))
-        if(!(md->rwFlags() & (gIsOutRoutingPopupMenu ? 1 : 2)))
-          return;
-        
-        int chmask = 0;                   
-        iRoute iir = rl->begin();
-        for (; iir != rl->end(); ++iir) 
-        {
-          //if(*iir == (dst ? bRoute : aRoute))
-          //if(*iir == aRoute)
-          if(iir->type == Route::MIDI_PORT_ROUTE && iir->midiPort == mdidx)    // p3.3.50 Is there already a route to this port?
-          {
-                chmask = iir->channel;  // p3.3.50 Grab the channel mask.
-                break;
-          }      
-        }
-        //if (iir != rl->end()) 
-        if ((chmask & chbit) == chbit)             // p3.3.50 Is the channel's bit(s) set?
-        {
-          // disconnect
-          if(gIsOutRoutingPopupMenu)
-            audio->msgRemoveRoute(bRoute, aRoute);
-          else
-            audio->msgRemoveRoute(aRoute, bRoute);
-        }
-        else 
-        {
-          // connect
-          if(gIsOutRoutingPopupMenu)
-            audio->msgAddRoute(bRoute, aRoute);
-          else
-            audio->msgAddRoute(aRoute, bRoute);
-        }
-        
-        audio->msgUpdateSoloStates();
-        song->update(SC_ROUTE);
-      }
-      else
-      {
-        // TODO: Try to move code from AudioStrip::routingPopupMenuActivated into here.
-      }
-      //else
-      //{
-      //}
-}
-
-//---------------------------------------------------------
-//   prepareRoutingPopupView
-//---------------------------------------------------------
-
-PopupView* MusE::prepareRoutingPopupView(Track* track, bool dst)
-{
-  if(!track)
-    return 0;
-    
-  //QPoint ppt = QCursor::pos();
-  
-  if(track->isMidiTrack())
-  {
-  
-    //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);
-      
-      PopupView* pup = getRoutingPopupView();
-      pup->disconnect();
-      //connect(pup, SIGNAL(activated(int)), SLOT(routingPopupMenuActivated(int)));
-      //connect(pup, SIGNAL(aboutToHide()), SLOT(routingPopupMenuAboutToHide()));
-        
-      ///pup->setCheckable(true);
-      
-      int gid = 0;
-      //int n;    
-      
-    // 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();
-      gRoutingMenuMap.clear();
-      gid = 0;
-      
-      //MidiInPortList* tl = 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 with ports.
-        MidiPort* mp = &midiPorts[i];
-        MidiDevice* md = mp->device();
-        if(!md)
-          continue;
-        
-        if(!(md->rwFlags() & (dst ? 1 : 2)))
-          continue;
-          
-        //printf("MusE::prepareRoutingPopupMenu adding submenu portnum:%d\n", i);
-        
-        //QMenu* m = menu->addMenu(track->name());
-        //QPopupMenu* subp = new QPopupMenu(parent);
-        //PopupMenu* subp = new PopupMenu(this);
-        QStandardItem* subp = new QStandardItem(QT_TRANSLATE_NOOP("@default", md->name()));
-///        connect(subp, SIGNAL(activated(int)), pup, SIGNAL(activated(int)));
-        //connect(subp, SIGNAL(aboutToHide()), pup, SIGNAL(aboutToHide()));
-        
-        int chanmask = 0;
-        // p3.3.50 To reduce number of routes required, from one per channel to just one containing a channel mask. 
-        // Look for the first route to this midi port. There should always be only a single route for each midi port, now.
-        for(iRoute ir = rl->begin(); ir != rl->end(); ++ir)   
-        {
-          if(ir->type == Route::MIDI_PORT_ROUTE && ir->midiPort == i) 
-          {
-            // We have a route to the midi port. Grab the channel mask.
-            chanmask = ir->channel;
-            break;
-          }
-        }
-        
-        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("MusE::prepareRoutingPopupMenu inserting gid:%d\n", gid);
-          
-///          subp->insertItem(QString("Channel %1").arg(ch+1), gid);
-          QStandardItem* sti = new QStandardItem(QString("Channel %1").arg(ch+1));
-          sti->setCheckable(true);
-          sti->setData(gid);
-          subp->appendRow(sti);
-          
-          //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);
-          //Route srcRoute(i, ch);     // p3.3.49 New: Midi port route.
-          int chbit = 1 << ch;
-          Route srcRoute(i, chbit);    // p3.3.50 In accordance with new channel mask, use the bit position.
-          
-          gRoutingMenuMap.insert( pRouteMenuMap(gid, srcRoute) );
-          
-          //for(iRoute ir = rl->begin(); ir != rl->end(); ++ir)   // p3.3.50 Removed.
-          //{
-            //if(*ir == dst) 
-          //  if(*ir == srcRoute) 
-          //  {
-          //    subp->setItemChecked(id, true);
-          //    break;
-          //  }
-          //}
-          if(chanmask & chbit)                  // p3.3.50 Is the channel already set? Show item check mark.
-///            subp->setItemChecked(gid, true);
-            sti->setCheckState(Qt::Checked);
-        }
-        //subp->insertItem(QString("Toggle all"), 1000+i);
-        // p3.3.50 One route with all channel bits set.
-        gid = MIDI_PORTS * MIDI_CHANNELS + i;           // Make sure each 'toggle' item gets a unique id.
-///        subp->insertItem(QString("Toggle all"), gid);      
-        QStandardItem* sti = new QStandardItem(QString("Toggle all"));
-        sti->setData(gid);
-        subp->appendRow(sti);
-        
-        Route togRoute(i, (1 << MIDI_CHANNELS) - 1);    // Set all channel bits.
-        gRoutingMenuMap.insert( pRouteMenuMap(gid, togRoute) );
-        
-///        pup->insertItem(QT_TRANSLATE_NOOP("@default", md->name()), subp);
-        pup->model()->appendRow(subp);
-        pup->updateView();
-      }
-          
-      /*
-      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 (!checkAudioDevice()) return;
-            std::list<QString> ol = 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->addSeparator();
-      }
-      */
-      
-///      if(pup->count() == 0)
-      if(pup->model()->rowCount() == 0)
-      {
-        ///delete pup;
-        gRoutingPopupMenuMaster = 0;
-        //pup->clear();
-        //pup->disconnect();
-        gRoutingMenuMap.clear();
-        //oR->setDown(false);     
-        return 0;
-      }
-      
-      gIsOutRoutingPopupMenu = dst;
-      return pup;
-    }
-    
-    return 0;
-}
-#endif
-
-//---------------------------------------------------------
 //   saveAs
 //---------------------------------------------------------
 
diff --git a/muse2/muse/app.h b/muse2/muse/app.h
index 70aac8fc..256154e2 100644
--- a/muse2/muse/app.h
+++ b/muse2/muse/app.h
@@ -36,8 +36,7 @@ class Transport;
 class BigTime;
 class Arranger;
 class Instrument;
-class PopupMenu;
-class PopupView;
+class RoutePopupMenu;
 class Track;
 class PrinterConfig;
 class MidiSyncConfig;
@@ -69,8 +68,6 @@ class ScoreEdit;
 
 #define MENU_ADD_SYNTH_ID_BASE 0x1000
 
-
-
 //---------------------------------------------------------
 //   MusE
 //---------------------------------------------------------
@@ -164,10 +161,8 @@ class MusE : public QMainWindow
       QMenu* menu_functions, *menuScriptPlugins;
       QMenu* select, *master, *midiEdit, *addTrack;
 
-      // Special 'stay-open' menu for routes.
-      PopupMenu* routingPopupMenu; 
-      //PopupView* routingPopupView; 
-
+      // Special common menu for routes. Used (so far) by audio and midi strip, and midi trackinfo.
+      RoutePopupMenu* routingPopupMenu; 
 
       QMenu* follow;
       QMenu* midiInputPlugins;
@@ -195,7 +190,7 @@ class MusE : public QMainWindow
       QMenu* openRecent;
       
       bool readMidi(FILE*);
-      void read(Xml& xml, bool skipConfig);
+      void read(Xml& xml, bool skipConfig, bool isTemplate);
       void processTrack(MidiTrack* track);
 
       void write(Xml& xml) const;
@@ -286,7 +281,7 @@ class MusE : public QMainWindow
 
       void startMidiTransformer();
       void writeGlobalConfiguration() const;
-      void startEditInstrument();
+      //void startEditInstrument();
       void startClipList(bool);
       
       void openRecentMenu();
@@ -337,7 +332,6 @@ class MusE : public QMainWindow
    private:
       void adjustGlobalLists(int startPos, int diff);
 
-     
    public slots:
       bool saveAs();
       void bounceToFile(AudioOutput* ao = 0);
@@ -357,8 +351,7 @@ class MusE : public QMainWindow
       void importMidi(const QString &file);
       void setUsedTool(int);
       void showDidYouKnowDialog();
-      
-      void routingPopupMenuAboutToHide();
+      void startEditInstrument();
       void configMidiPorts();
 
    public:
@@ -370,7 +363,6 @@ class MusE : public QMainWindow
       bool importMidi(const QString name, bool merge);
       void kbAccel(int);
       void changeConfig(bool writeFlag);
-
       void seqStop();
       bool seqStart();
       void setHeartBeat();
@@ -383,18 +375,8 @@ class MusE : public QMainWindow
       QWidget* bigtimeWindow();
       bool importWaveToTrack(QString& name, unsigned tick=0, Track* track=NULL);
       void importPartToTrack(QString& filename, unsigned tick, Track* track);
-
       void showTransport(bool flag);
-
-      // Special 'stay-open' menu for routes.
-      PopupMenu* getRoutingPopupMenu();
-      PopupMenu* prepareRoutingPopupMenu(Track* /*track*/, bool /*dst*/);
-      void routingPopupMenuActivated(Track* /*track*/, int /*id*/);
-      void updateRouteMenus(Track* /*track*/, QObject* /*master*/);
-      // Testing...
-      //PopupView* getRoutingPopupView();
-      //PopupView* prepareRoutingPopupView(Track* /*track*/, bool /*dst*/);
-      //void routingPopupViewActivated(Track* /*track*/, int /*id*/);
+      RoutePopupMenu* getRoutingPopupMenu();
       
 #ifdef HAVE_LASH
       void lash_idle_cb ();
diff --git a/muse2/muse/appearance.h b/muse2/muse/appearance.h
index ef99adbe..ec266f8e 100644
--- a/muse2/muse/appearance.h
+++ b/muse2/muse/appearance.h
@@ -15,6 +15,10 @@ class GlobalConfigValues;
 //---------------------------------------------------------
 
 class Appearance : public QDialog, public Ui::AppearanceDialogBase {
+  
+    Q_OBJECT
+    
+ private:
       Arranger* arr;
       QColor* color;
       GlobalConfigValues* config;
@@ -24,7 +28,7 @@ class Appearance : public QDialog, public Ui::AppearanceDialogBase {
       QTreeWidgetItem* lastSelectedBgItem;
       QTreeWidgetItem* lastSelectedColorItem;
 
-      Q_OBJECT
+      
       void updateFonts();
       void updateColor();
 
diff --git a/muse2/muse/arranger/arranger.cpp b/muse2/muse/arranger/arranger.cpp
index d74bed78..e1205d6f 100644
--- a/muse2/muse/arranger/arranger.cpp
+++ b/muse2/muse/arranger/arranger.cpp
@@ -69,6 +69,7 @@ void Arranger::setHeaderToolTips()
       header->setToolTip(COL_OPORT,      tr("Midi output port or synth midi port"));
       header->setToolTip(COL_TIMELOCK,   tr("Time Lock"));
       header->setToolTip(COL_AUTOMATION, tr("Automation parameter selection"));
+      header->setToolTip(COL_CLEF,       tr("Notation clef"));
       }
 
 
@@ -87,6 +88,7 @@ void Arranger::setHeaderWhatsThis()
       header->setWhatsThis(COL_OCHANNEL, tr("Midi/drum track: Output channel number.\nAudio track: Channels.\nMid/right-click to change."));
       header->setWhatsThis(COL_OPORT,    tr("Midi/drum track: Output port.\nSynth track: Assigned midi port.\nLeft-click to change.\nRight-click to show GUI."));
       header->setWhatsThis(COL_TIMELOCK, tr("Time lock"));
+      header->setToolTip(COL_CLEF,       tr("Notation clef. Select this tracks notation clef."));
       }
 
 //---------------------------------------------------------
@@ -290,6 +292,7 @@ Arranger::Arranger(QMainWindow* parent, const char* name)
       header->setColumnLabel(tr("Ch"), COL_OCHANNEL, 30);
       header->setColumnLabel(tr("T"), COL_TIMELOCK, fm1.width('T')+fw);
       header->setColumnLabel(tr("Automation"), COL_AUTOMATION, 75);
+      header->setColumnLabel(tr("Clef"), COL_CLEF, 75);
       header->setResizeMode(COL_RECORD, QHeaderView::Fixed);
       header->setResizeMode(COL_MUTE, QHeaderView::Fixed);
       header->setResizeMode(COL_SOLO, QHeaderView::Fixed);
@@ -299,6 +302,7 @@ Arranger::Arranger(QMainWindow* parent, const char* name)
       header->setResizeMode(COL_OCHANNEL, QHeaderView::Fixed);
       header->setResizeMode(COL_TIMELOCK, QHeaderView::Fixed);
       header->setResizeMode(COL_AUTOMATION, QHeaderView::Interactive);
+      header->setResizeMode(COL_CLEF, QHeaderView::Interactive);
 
       setHeaderToolTips();
       setHeaderWhatsThis();
diff --git a/muse2/muse/arranger/pcanvas.cpp b/muse2/muse/arranger/pcanvas.cpp
index 006b9333..d65b8957 100644
--- a/muse2/muse/arranger/pcanvas.cpp
+++ b/muse2/muse/arranger/pcanvas.cpp
@@ -1624,7 +1624,7 @@ void PartCanvas::drawMidiPart(QPainter& p, const QRect&, EventList* events, Midi
                   int hoffset = (mt->height() - th ) / 2; // offset from bottom
 
                   if (ctrl_type == CTRL_PITCH)
-                    p.drawLine(t, hoffset + r.y() + th/2, t, hoffset + r.y() + val*th/8192/2 + th/2);
+                    p.drawLine(t, hoffset + r.y() + th/2, t, hoffset + r.y() - val*th/8192/2 + th/2);
             }
       }
 
@@ -1641,7 +1641,7 @@ void PartCanvas::drawMidiPart(QPainter& p, const QRect&, EventList* events, Midi
                   int hoffset = (mt->height() - th ) / 2; // offset from bottom
 
                   if (ctrl_type == 10)
-                    p.drawLine(t, hoffset + r.y() + val*th/127, t, hoffset + r.y() + th);
+                    p.drawLine(t, hoffset + r.y() + th - val*th/127, t, hoffset + r.y() + th);
             }
       }
 
@@ -1658,7 +1658,7 @@ void PartCanvas::drawMidiPart(QPainter& p, const QRect&, EventList* events, Midi
                   int hoffset = (mt->height() - th ) / 2; // offset from bottom
 
                   if (ctrl_type == 7)
-                    p.drawLine(t, hoffset + r.y() + val*th/127, t, hoffset + r.y() + th);
+                    p.drawLine(t, hoffset + r.y() + th - val*th/127, t, hoffset + r.y() + th);
             }
       }
 
@@ -1690,7 +1690,7 @@ void PartCanvas::drawMidiPart(QPainter& p, const QRect&, EventList* events, Midi
       
       if (config.canvasShowPartType & 4) //y-stretch?
       {
-        for (iEvent i = events->begin(); i != ito; ++i)
+        for (iEvent i = events->begin(); i != events->end(); ++i)
         {
           if (i->second.type()==Note)
           {
@@ -1725,6 +1725,19 @@ void PartCanvas::drawMidiPart(QPainter& p, const QRect&, EventList* events, Midi
           lowest_pitch--;
           highest_pitch++;
         }
+        
+        if (heavyDebugMsg)
+        {
+            if (!isdrum)
+                printf("DEBUG: arranger: cakewalk enabled, y-stretching from %i to %i. eventlist=%p\n",lowest_pitch, highest_pitch, events);
+            else
+            {
+                printf("DEBUG: arranger: cakewalk enabled, y-stretching drums: ");;
+                for (map<int,int>::iterator it=y_mapper.begin(); it!=y_mapper.end(); it++)
+                    printf("%i ", it->first);
+                printf("; eventlist=%p\n",events); 
+            }
+        }
       }
       else
       {
@@ -1734,6 +1747,8 @@ void PartCanvas::drawMidiPart(QPainter& p, const QRect&, EventList* events, Midi
         if (isdrum)
           for (int cnt=0;cnt<127;cnt++)
             y_mapper[cnt]=cnt;
+        
+        if (heavyDebugMsg) printf("DEBUG: arranger: cakewalk enabled, y-stretch disabled\n");
       }
 
       p.setPen(QColor(color_brightness,color_brightness,color_brightness));      
diff --git a/muse2/muse/arranger/pcanvas.h b/muse2/muse/arranger/pcanvas.h
index e48af2d4..18e47426 100644
--- a/muse2/muse/arranger/pcanvas.h
+++ b/muse2/muse/arranger/pcanvas.h
@@ -57,6 +57,7 @@ class CtrlVal;
 //---------------------------------------------------------
 
 class PartCanvas : public Canvas {
+      Q_OBJECT
       int* _raster;
       TrackList* tracks;
 
@@ -69,7 +70,7 @@ class PartCanvas : public Canvas {
       AutomationObject automation;
 
       //std::vector<TrackAutomationView*> automationViews;
-      Q_OBJECT
+      
       virtual void keyPress(QKeyEvent*);
       virtual void mousePress(QMouseEvent*);
       virtual void mouseMove(QMouseEvent* event);
diff --git a/muse2/muse/arranger/tlist.cpp b/muse2/muse/arranger/tlist.cpp
index 4b531607..4f050c46 100644
--- a/muse2/muse/arranger/tlist.cpp
+++ b/muse2/muse/arranger/tlist.cpp
@@ -11,7 +11,7 @@
 
 #include <QKeyEvent>
 #include <QLineEdit>
-#include <QMenu>
+//#include <QMenu>
 #include <QMessageBox>
 #include <QMouseEvent>
 #include <QPainter>
@@ -21,6 +21,7 @@
 #include <QScrollBar>
 #include <QWheelEvent>
 #include <QIcon>
+#include <QSpinBox>
 
 #include "popupmenu.h"
 #include "globals.h"
@@ -44,6 +45,7 @@
 #include "midiedit/drummap.h"
 #include "synth.h"
 #include "config.h"
+#include "popupmenu.h"
 
 #ifdef DSSI_SUPPORT
 #include "dssihost.h"
@@ -230,13 +232,15 @@ void TList::paint(const QRect& r)
 
                   switch (section) {
                         case COL_RECORD:
-                              if (track->canRecord()) {
+                              if (track->canRecord() && !header->isSectionHidden(COL_RECORD)) {
                                     drawCenteredPixmap(p,
                                        track->recordFlag() ? record_on_Icon : record_off_Icon, r);
                                     }
                               break;
                         case COL_CLASS:
                               {
+                              if (header->isSectionHidden(COL_CLASS))
+                                break;
                               const QPixmap* pm = 0;
                               switch(type) {
                                     case Track::MIDI:
@@ -297,7 +301,11 @@ void TList::paint(const QRect& r)
                               {
                               QString s;
                               int n;
-                              if (track->isMidiTrack()) {
+                              if (track->isMidiTrack() && track->type() == Track::DRUM) {
+                                    p.drawText(r, Qt::AlignVCenter|Qt::AlignHCenter, "-");
+                                    break;
+                              }
+                              else if (track->isMidiTrack()) {
                                     n = ((MidiTrack*)track)->outChannel() + 1;
                                     }
                               else {
@@ -356,6 +364,18 @@ void TList::paint(const QRect& r)
                               p.drawText(r, Qt::AlignVCenter|Qt::AlignLeft, s);
                               }
                               break;
+                        case COL_CLEF:
+                              if (track->isMidiTrack()) {
+                                QString s = tr("no clef");
+                                if (((MidiTrack*)track)->getClef() == trebleClef)
+                                  s=tr("Treble");
+                                else if (((MidiTrack*)track)->getClef() == bassClef)
+                                  s=tr("Bass");
+                                else if (((MidiTrack*)track)->getClef() == grandStaff)
+                                  s=tr("Grand");
+                                p.drawText(r, Qt::AlignVCenter|Qt::AlignLeft, s);
+                              }
+                              break;
                         default:
                               break;
                         }
@@ -419,6 +439,20 @@ void TList::returnPressed()
       setFocus();
       }
 
+void TList::chanValueChanged(int val)
+{
+  Track* track = editTrack->clone(false);
+  ((MidiTrack*)editTrack)->setOutChannel(val-1);
+  audio->msgChangeTrack(track, editTrack);
+}
+
+void TList::chanValueFinished()
+{
+  editTrack = 0;
+  chan_edit->hide();
+  setFocus();
+}
+
 //---------------------------------------------------------
 //   adjustScrollbar
 //---------------------------------------------------------
@@ -472,7 +506,7 @@ void TList::mouseDoubleClickEvent(QMouseEvent* ev)
             if (section == COL_NAME) {
                   editTrack = t;
                   if (editor == 0) {
-		    editor = new QLineEdit(this);
+                        editor = new QLineEdit(this);
                         /*connect(editor, SIGNAL(returnPressed()),
                            SLOT(returnPressed()));*/
                         editor->setFrame(true);
@@ -483,6 +517,25 @@ void TList::mouseDoubleClickEvent(QMouseEvent* ev)
                   editMode = true;
                   editor->show();
                   }
+            else if (section == COL_OCHANNEL) {
+                  if (t->isMidiTrack() && t->type() != Track::DRUM)
+                  {
+                      editTrack=t;
+                      if (chan_edit==0) {
+                            chan_edit=new QSpinBox(this);
+                            chan_edit->setMinimum(1);
+                            chan_edit->setMaximum(16);
+                            connect(chan_edit, SIGNAL(valueChanged(int)), SLOT(chanValueChanged(int)));
+                            connect(chan_edit, SIGNAL(editingFinished()), SLOT(chanValueFinished()));
+                            }
+                      chan_edit->setValue(((MidiTrack*)editTrack)->outChannel()+1);
+                      int w=colw;
+                      if (w < chan_edit->sizeHint().width()) w=chan_edit->sizeHint().width();
+                      chan_edit->setGeometry(colx, coly, w, colh);
+                      chan_edit->show();
+                      chan_edit->setFocus();
+                      }
+                  }
             else
                   mousePressEvent(ev);
             }
@@ -883,9 +936,11 @@ void TList::changeAutomationColor(QAction* act)
 //---------------------------------------------------------
 //   colorMenu
 //---------------------------------------------------------
-QMenu* TList::colorMenu(QColor c, int id)
+//QMenu* TList::colorMenu(QColor c, int id)
+PopupMenu* TList::colorMenu(QColor c, int id)
 {
-  QMenu * m = new QMenu(this);
+  //QMenu * m = new QMenu(this);
+  PopupMenu * m = new PopupMenu(this);  //, true);  TODO
   for (int i = 0; i< 6; i++) {
     QPixmap pix(10,10);
     QPainter p(&pix);
@@ -1054,11 +1109,39 @@ void TList::mousePressEvent(QMouseEvent* ev)
       mode = START_DRAG;
 
       switch (col) {
+              case COL_CLEF:
+                if (t->isMidiTrack()) {
+                  QMenu* p = new QMenu;
+                  p->addAction(tr("Treble clef"))->setData(0);
+                  p->addAction(tr("Bass clef"))->setData(1);
+                  p->addAction(tr("Grand Staff"))->setData(2);
+
+                  // Show the menu
+                  QAction* act = p->exec(ev->globalPos(), 0);
+                  if (act) {
+                    switch (act->data().toInt()) {
+                      case 0:
+                        ((MidiTrack*)t)->setClef(trebleClef);
+                        break;
+                      case 1:
+                        ((MidiTrack*)t)->setClef(bassClef);
+                        break;
+                      case 2:
+                        ((MidiTrack*)t)->setClef(grandStaff);
+                        break;
+                      default:
+                        break;
+                    }
+                  }
+                  delete p;
+                }
+
+                break;
               case COL_AUTOMATION:
                 {
                 if (!t->isMidiTrack()) {
                     editAutomation = t;
-                    PopupMenu* p = new PopupMenu();
+                    PopupMenu* p = new PopupMenu(true);
                     p->disconnect();
                     p->clear();
                     p->setTitle(tr("Viewable automation"));
@@ -1075,12 +1158,11 @@ void TList::mousePressEvent(QMouseEvent* ev)
                       int data = cl->id() * 256; // shift 8 bits
                       data += 150; // illegal color > 100
                       act->setData(data);
-                      QMenu *m = colorMenu(cl->color(), cl->id());
+                      //QMenu *m = colorMenu(cl->color(), cl->id());
+                      PopupMenu *m = colorMenu(cl->color(), cl->id());
                       act->setMenu(m);
                     }
                     connect(p, SIGNAL(triggered(QAction*)), SLOT(changeAutomation(QAction*)));
-                    //connect(p, SIGNAL(aboutToHide()), muse, SLOT(routingPopupMenuAboutToHide()));
-                    //p->popup(QCursor::pos());
                     p->exec(QCursor::pos());
 
                     delete p;
@@ -1236,8 +1318,10 @@ void TList::mousePressEvent(QMouseEvent* ev)
                     {
                       MidiTrack* mt = dynamic_cast<MidiTrack*>(t);
                       if (mt == 0)
-                      break;
-                    
+                        break;
+                      if (mt->type() == Track::DRUM)
+                        break;
+
                       int channel = mt->outChannel();
                       channel += delta;
                       if(channel >= MIDI_CHANNELS)
@@ -1511,6 +1595,9 @@ void TList::wheelEvent(QWheelEvent* ev)
             case COL_OCHANNEL:
                   if (t->isMidiTrack()) {
                         MidiTrack* mt = (MidiTrack*)t;
+                        if (mt && mt->type() == Track::DRUM)
+                            break;
+
                         int channel = mt->outChannel() + delta;
 
                         if (channel >= MIDI_CHANNELS)
diff --git a/muse2/muse/arranger/tlist.h b/muse2/muse/arranger/tlist.h
index 8bebef95..607ca8c0 100644
--- a/muse2/muse/arranger/tlist.h
+++ b/muse2/muse/arranger/tlist.h
@@ -14,12 +14,14 @@
 
 class QKeyEvent;
 class QLineEdit;
+class QSpinBox;
 class QMouseEvent;
 class QPaintEvent;
 class QResizeEvent;
 class QScrollBar;
 class QWheelEvent;
-class QMenu;
+//class QMenu;
+class PopupMenu;
 
 class ScrollScale;
 class Track;
@@ -36,6 +38,7 @@ enum TrackColumn {
       COL_OCHANNEL,
       COL_TIMELOCK,
       COL_AUTOMATION,
+      COL_CLEF,
       COL_NONE = -1
       };
 
@@ -55,6 +58,7 @@ class TList : public QWidget {
       Header* header;
       QScrollBar* _scroll;
       QLineEdit* editor;
+      QSpinBox* chan_edit;
       Track* editTrack;
       Track* editAutomation;
 
@@ -85,10 +89,13 @@ class TList : public QWidget {
       void classesPopupMenu(Track*, int x, int y);
       TrackList getRecEnabledTracks();
       void setHeaderToolTips();
-      QMenu* colorMenu(QColor c, int id);
+      //QMenu* colorMenu(QColor c, int id);
+      PopupMenu* colorMenu(QColor c, int id);
 
    private slots:
       void returnPressed();
+      void chanValueChanged(int);
+      void chanValueFinished();
       void songChanged(int flags);
       void changeAutomation(QAction*);
       void changeAutomationColor(QAction*);
diff --git a/muse2/muse/audioconvert.cpp b/muse2/muse/audioconvert.cpp
index 552b5e95..ced8e703 100644
--- a/muse2/muse/audioconvert.cpp
+++ b/muse2/muse/audioconvert.cpp
@@ -5,7 +5,8 @@
 //
 //  (C) Copyright 1999-2009 Werner Schweer (ws@seh.de)
 //
-//  Audio converter module created by Tim terminator356
+//  Audio converter module created by Tim
+//  (C) Copyright 2009-2011 Tim E. Real (terminator356 A T sourceforge D O T net)
 //=========================================================
 
 #include <math.h>
diff --git a/muse2/muse/audioconvert.h b/muse2/muse/audioconvert.h
index 039af912..0933de60 100644
--- a/muse2/muse/audioconvert.h
+++ b/muse2/muse/audioconvert.h
@@ -5,7 +5,8 @@
 //
 //  (C) Copyright 1999-2009 Werner Schweer (ws@seh.de)
 //
-//  Audio converter module created by Tim terminator356
+//  Audio converter module created by Tim 
+//  (C) Copyright 2009-2011 Tim E. Real (terminator356 A T sourceforge D O T net)
 //=========================================================
 
 #ifndef __AUDIOCONVERT_H__
diff --git a/muse2/muse/audiotrack.cpp b/muse2/muse/audiotrack.cpp
index c427a55c..b004638f 100644
--- a/muse2/muse/audiotrack.cpp
+++ b/muse2/muse/audiotrack.cpp
@@ -34,6 +34,7 @@ bool WaveTrack::_isVisible=true;
 // Jack often shuts down during file save, causing the routes to be lost in the file.
 // cacheJackRouteNames() is ONLY called from MusE::save() in app.cpp
 // Update: Not required any more because the real problem was Jack RT priority, which has been fixed.
+// Keep this around for now. It may come in handy if we want to preserve route names with dummy audio driver!
 /*
 typedef std::multimap <const int, QString> jackRouteNameMap;
 std::map <const AudioTrack*, jackRouteNameMap > jackRouteNameCache;
diff --git a/muse2/muse/cleftypes.h b/muse2/muse/cleftypes.h
new file mode 100644
index 00000000..8c14a6d3
--- /dev/null
+++ b/muse2/muse/cleftypes.h
@@ -0,0 +1,13 @@
+//=========================================================
+//  MusE
+//  Linux Music Editor
+//  cleftypes.h
+//  (C) Copyright 2011 Florian Jung (flo93@users.sourceforge.net)
+//=========================================================
+
+#ifndef __CLEFTYPES_H__
+#define __CLEFTYPES_H__
+
+enum clefTypes { trebleClef, bassClef, grandStaff };
+
+#endif
diff --git a/muse2/muse/cliplist/cliplist.cpp b/muse2/muse/cliplist/cliplist.cpp
index 967c608d..96636463 100644
--- a/muse2/muse/cliplist/cliplist.cpp
+++ b/muse2/muse/cliplist/cliplist.cpp
@@ -235,7 +235,7 @@ void ClipListEdit::clipSelectionChanged()
             editor->start->setEnabled(false);
             editor->len->setEnabled(false);
             return;
-#if 0
+/*
             }
       editor->start->setEnabled(true);
       editor->len->setEnabled(true);
@@ -246,7 +246,7 @@ void ClipListEdit::clipSelectionChanged()
       len.setFrame(curClip.lenFrame());
       editor->start->setValue(pos);
       editor->len->setValue(len);
-#endif
+*/
       }
 
 //---------------------------------------------------------
diff --git a/muse2/muse/conf.cpp b/muse2/muse/conf.cpp
index e7eef503..89cdd04d 100644
--- a/muse2/muse/conf.cpp
+++ b/muse2/muse/conf.cpp
@@ -481,6 +481,8 @@ static void readSeqConfiguration(Xml& xml)
                               rcGotoLeftMarkNote = xml.parseInt();
                         else if (tag == "rcPlay")
                               rcPlayNote = xml.parseInt();
+                        else if (tag == "rcSteprec")
+                              rcSteprecNote = xml.parseInt();
                         else
                               xml.unknown("Seq");
                         break;
@@ -946,6 +948,9 @@ void readConfiguration(Xml& xml, bool readOnlySequencer)
                               config.projectStoreInFolder = xml.parseInt();
                         else if (tag == "useProjectSaveDialog")
                               config.useProjectSaveDialog = xml.parseInt();
+                        else if (tag == "popupsDefaultStayOpen")
+                              config.popupsDefaultStayOpen = xml.parseInt();
+
                         else
                               xml.unknown("configuration");
                         break;
@@ -1061,6 +1066,7 @@ static void writeSeqConfiguration(int level, Xml& xml, bool writePortInfo)
       xml.intTag(level, "rcRecord",   rcRecordNote);
       xml.intTag(level, "rcGotoLeft", rcGotoLeftMarkNote);
       xml.intTag(level, "rcPlay",     rcPlayNote);
+      xml.intTag(level, "rcSteprec",     rcSteprecNote);
 
       if (writePortInfo) {
             //
@@ -1214,7 +1220,6 @@ void MusE::writeGlobalConfiguration(int level, Xml& xml) const
       xml.intTag(level, "midiFilterCtrl2", midiFilterCtrl2);
       xml.intTag(level, "midiFilterCtrl3", midiFilterCtrl3);
       xml.intTag(level, "midiFilterCtrl4", midiFilterCtrl4);
-      // Removed by Tim. p3.3.6
       
       //xml.intTag(level, "txDeviceId", txDeviceId);
       //xml.intTag(level, "rxDeviceId", rxDeviceId);
@@ -1223,7 +1228,8 @@ void MusE::writeGlobalConfiguration(int level, Xml& xml) const
       xml.strTag(level, "externalWavEditor", config.externalWavEditor);
       xml.intTag(level, "useOldStyleStopShortCut", config.useOldStyleStopShortCut);
       xml.intTag(level, "moveArmedCheckBox", config.moveArmedCheckBox);
-
+      xml.intTag(level, "popupsDefaultStayOpen", config.popupsDefaultStayOpen);
+      
       //for (int i = 0; i < 6; ++i) {
       for (int i = 0; i < NUM_FONTS; ++i) {
             char buffer[32];
@@ -1276,39 +1282,8 @@ void MusE::writeGlobalConfiguration(int level, Xml& xml) const
       xml.colorTag(level, "auxTrackBg",    config.auxTrackBg);
       xml.colorTag(level, "synthTrackBg",  config.synthTrackBg);
 
-      // Changed by Tim. p3.3.6
-      
+      // Removed by Tim. p3.3.6
       //xml.intTag(level, "txSyncPort", txSyncPort);
-      /*
-      // To keep old muse versions happy...
-      bool mcsync = mmc = mtc = false;
-      for(int sp = 0; sp < MIDI_PORTS; ++sp)
-      {
-        MidiSyncTxPort* txPort = &midiSyncTxPorts[sp];
-        if(txPort->doMCSync() || txPort->doMMC() || txPort->doMTC())
-        {
-          if(txPort->doMCSync())
-            mcsync = true;
-          if(txPort->doMMC())
-            mmc = true;
-          if(txPort->doMTC())
-            mtc = true;
-          xml.intTag(level, "txSyncPort", sp);
-          break;
-        }  
-      }
-      */
-      
-      // Added by Tim. p3.3.6
-      
-      //xml.tag(level++, "midiSyncInfo");
-      //for(iMidiDevice id = midiDevices.begin(); id != midiDevices.end(); ++id) 
-      //{
-      //  MidiDevice* md = *id;
-      //  (*id)->syncInfo().write(level, xml, md);
-      //}      
-      //xml.etag(level, "midiSyncInfo");
-
       //xml.intTag(level, "rxSyncPort", rxSyncPort);
       xml.intTag(level, "mtctype", mtcType);
       xml.nput(level, "<mtcoffset>%02d:%02d:%02d:%02d:%02d</mtcoffset>\n",
diff --git a/muse2/muse/confmport.cpp b/muse2/muse/confmport.cpp
index 8c27d9eb..8b323fc1 100644
--- a/muse2/muse/confmport.cpp
+++ b/muse2/muse/confmport.cpp
@@ -507,7 +507,7 @@ void MPConfig::rbClicked(QTableWidgetItem* item)
                         //Route dst(*ip, true, i);
                         //Route rt(*ip, (dev->rwFlags() & 1), -1, Route::JACK_ROUTE);
                         Route rt(*ip, (col == DEVCOL_OUTROUTES), -1, Route::JACK_ROUTE);   
-                        for(iRoute ir = rl->begin(); ir != rl->end(); ++ir) 
+                        for(ciRoute ir = rl->begin(); ir != rl->end(); ++ir) 
                         {
                           if (*ir == rt) 
                           {
@@ -553,7 +553,7 @@ void MPConfig::rbClicked(QTableWidgetItem* item)
                         Route srcRoute(dev, -1);
                         Route dstRoute(s, true, -1, Route::JACK_ROUTE);
             
-                        iRoute iir = rl->begin();
+                        ciRoute iir = rl->begin();
                         for(; iir != rl->end(); ++iir) 
                         {
                           if(*iir == dstRoute)
@@ -573,7 +573,7 @@ void MPConfig::rbClicked(QTableWidgetItem* item)
                         Route srcRoute(s, false, -1, Route::JACK_ROUTE);
                         Route dstRoute(dev, -1);
             
-                        iRoute iir = rl->begin();
+                        ciRoute iir = rl->begin();
                         for(; iir != rl->end(); ++iir) 
                         {
                           if(*iir == srcRoute)
@@ -609,7 +609,7 @@ void MPConfig::rbClicked(QTableWidgetItem* item)
                   return;
                   #else
                   {
-                    defpup = new PopupMenu(this);
+                    defpup = new PopupMenu(this, true);
                     defpup->addAction(new MenuTitleItem("Channel", defpup)); 
                     QAction* act = 0;
                     int chbits = midiPorts[no].defaultInChannels();
@@ -649,7 +649,7 @@ void MPConfig::rbClicked(QTableWidgetItem* item)
                   return;
                   #else
                   {
-                    defpup = new PopupMenu(this);
+                    defpup = new PopupMenu(this, true);
                     defpup->addAction(new MenuTitleItem("Channel", defpup)); 
                     QAction* act = 0;
                     int chbits = midiPorts[no].defaultOutChannels();
diff --git a/muse2/muse/confmport.h b/muse2/muse/confmport.h
index 3c139ee2..6901035a 100644
--- a/muse2/muse/confmport.h
+++ b/muse2/muse/confmport.h
@@ -28,6 +28,7 @@ class Xml;
 //---------------------------------------------------------
 
 class MPConfig : public QDialog, Ui::SynthConfigBase {
+      Q_OBJECT
       QMenu* instrPopup;
       //QMenu* popup;
       PopupMenu* defpup;
@@ -36,7 +37,7 @@ class MPConfig : public QDialog, Ui::SynthConfigBase {
       void setToolTip(QTableWidgetItem *item, int col);
       void addItem(int row, int col, QTableWidgetItem *item, QTableWidget *table);
 
-      Q_OBJECT
+      
 
    private slots:
       void rbClicked(QTableWidgetItem*);
diff --git a/muse2/muse/ctrl/ctrlcanvas.h b/muse2/muse/ctrl/ctrlcanvas.h
index 300cac19..e6864003 100644
--- a/muse2/muse/ctrl/ctrlcanvas.h
+++ b/muse2/muse/ctrl/ctrlcanvas.h
@@ -81,6 +81,8 @@ class CEventList: public std::list<CEvent*> {
 //---------------------------------------------------------
 
 class CtrlCanvas : public View {
+      Q_OBJECT
+    
       MidiEditor* editor;
       MidiTrack* curTrack;
       MidiPart* curPart;
@@ -120,7 +122,7 @@ class CtrlCanvas : public View {
       void pdrawItems(QPainter&, const QRect&, const MidiPart*, bool, bool);
       void partControllers(const MidiPart*, int, int*, int*, MidiController**, MidiCtrlValList**);
       
-      Q_OBJECT
+      
 
    protected:
       enum DragMode { DRAG_OFF, DRAG_NEW, DRAG_MOVE_START, DRAG_MOVE,
diff --git a/muse2/muse/ctrl/ctrledit.cpp b/muse2/muse/ctrl/ctrledit.cpp
index 8842ba97..c4e33822 100644
--- a/muse2/muse/ctrl/ctrledit.cpp
+++ b/muse2/muse/ctrl/ctrledit.cpp
@@ -69,7 +69,8 @@ void CtrlEdit::writeStatus(int level, Xml& xml)
       {
       if (canvas->controller()) {
             xml.tag(level++, "ctrledit");
-            xml.strTag(level, "ctrl", canvas->controller()->name());
+            //xml.strTag(level, "ctrl", canvas->controller()->name());
+            xml.intTag(level, "ctrlnum", canvas->controller()->num());
             xml.tag(level, "/ctrledit");
             }
       }
@@ -89,6 +90,8 @@ void CtrlEdit::readStatus(Xml& xml)
                         return;
                   case Xml::TagStart:
                         if (tag == "ctrl") {
+                              xml.parse1();  // Obsolete. 
+                              /*
                               QString name = xml.parse1();
                               int portno = canvas->track()->outPort();
                               MidiPort* port = &midiPorts[portno];
@@ -101,6 +104,11 @@ void CtrlEdit::readStatus(Xml& xml)
                                           break;
                                           }
                                     }
+                              */      
+                              }
+                        else if (tag == "ctrlnum") {
+                              int num = xml.parseInt();
+                              canvas->setController(num);
                               }
                         else
                               xml.unknown("CtrlEdit");
diff --git a/muse2/muse/ctrl/ctrledit.h b/muse2/muse/ctrl/ctrledit.h
index eec235b1..c5f5935e 100644
--- a/muse2/muse/ctrl/ctrledit.h
+++ b/muse2/muse/ctrl/ctrledit.h
@@ -24,10 +24,11 @@ class Xml;
 //---------------------------------------------------------
 
 class CtrlEdit : public QWidget {
+      Q_OBJECT
       CtrlCanvas* canvas;
       CtrlPanel* panel;
 
-      Q_OBJECT
+      
 
    private slots:
       void destroy();
diff --git a/muse2/muse/ctrl/ctrlpanel.cpp b/muse2/muse/ctrl/ctrlpanel.cpp
index 9e990861..b23ce855 100644
--- a/muse2/muse/ctrl/ctrlpanel.cpp
+++ b/muse2/muse/ctrl/ctrlpanel.cpp
@@ -11,7 +11,8 @@
 #include "ctrlpanel.h"
 #include "ctrlcanvas.h"
 
-#include <QMenu>
+//#include <QMenu>
+#include <QAction>
 #include <QPushButton>
 #include <QSizePolicy>
 #include <QHBoxLayout>
@@ -20,10 +21,12 @@
 
 #include <math.h>
 
+#include "app.h"
 #include "globals.h"
 #include "midictrl.h"
 #include "instruments/minstrument.h"
 #include "midiport.h"
+#include "mididev.h"
 #include "xml.h"
 #include "icons.h"
 #include "event.h"
@@ -37,6 +40,8 @@
 #include "doublelabel.h"
 #include "midi.h"
 #include "audio.h"
+#include "menutitleitem.h"
+#include "popupmenu.h"
 
 //---------------------------------------------------------
 //   CtrlPanel
@@ -47,6 +52,8 @@ CtrlPanel::CtrlPanel(QWidget* parent, MidiEditor* e, const char* name)
       {
       setObjectName(name);
       inHeartBeat = true;
+      //ctrlMainPop = 0;
+      //ctrlSubPop = 0;
       editor = e;
       setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
       QVBoxLayout* vbox = new QVBoxLayout;
@@ -514,6 +521,7 @@ void CtrlPanel::setHeight(int h)
       setFixedHeight(h);
       }
 
+#if 0
 struct CI {
             QString s;
             bool used;
@@ -673,6 +681,261 @@ void CtrlPanel::ctrlPopup()
             }
       }
 
+#else               // p4.0.25 Tim
+struct CI {
+            int num;
+            QString s;
+            bool used;
+            bool instrument;
+            CI(int n, const QString& ss, bool u, bool i) : num(n), s(ss), used(u), instrument(i) {}
+            };
+
+void CtrlPanel::ctrlPopup()
+      {
+      //---------------------------------------------------
+      // build list of midi controllers for current
+      // MidiPort/channel
+      //---------------------------------------------------
+
+      PartList* parts  = editor->parts();
+      Part* part       = editor->curCanvasPart();
+      MidiTrack* track = (MidiTrack*)(part->track());
+      int channel      = track->outChannel();
+      MidiPort* port   = &midiPorts[track->outPort()];
+      int curDrumInstrument = editor->curDrumInstrument();
+      bool isDrum      = track->type() == Track::DRUM;
+      MidiInstrument* instr = port->instrument();
+      MidiControllerList* mcl = instr->controller();
+
+      MidiCtrlValListList* cll = port->controller();
+      int min = channel << 24;
+      int max = min + 0x1000000;
+
+      std::list<CI> sList;
+      typedef std::list<CI>::iterator isList;
+
+      for (iMidiCtrlValList i = cll->lower_bound(min); i != cll->lower_bound(max); ++i) {
+            MidiCtrlValList* cl = i->second;
+            MidiController* c   = port->midiController(cl->num());
+            // dont show drum specific controller if not a drum track
+            if ((c->num() & 0xff) == 0xff) {
+                  if (!isDrum)
+                        continue;
+                  // only show controller for curDrumInstrument:
+                  if ((cl->num() & 0xff) != drumMap[curDrumInstrument].anote) {
+                        continue;
+                        }
+                  }
+            isList i = sList.begin();
+            for (; i != sList.end(); ++i) {
+                  //if (i->s == c->name())
+                  if (i->num == c->num())
+                        break;
+                  }
+            if (i == sList.end()) {
+                  bool used = false;
+                  for (iPart ip = parts->begin(); ip != parts->end(); ++ip) {
+                        EventList* el = ip->second->events();
+                        for (iEvent ie = el->begin(); ie != el->end(); ++ie) {
+                              Event e = ie->second;
+                              if ((e.type() == Controller) && (e.dataA() == cl->num())) {
+                                    used = true;
+                                    break;
+                                    }
+                              }
+                        if (used)
+                              break;
+                        }
+                  //sList.push_back(CI(c->name(), used));
+                  bool isinstr = ( mcl->find(c->num()) != mcl->end() );
+                  int cnum = c->num();
+                  // Need to distinguish between global default controllers and 
+                  //  instrument defined controllers. Instrument takes priority over global
+                  //  ie they 'overtake' definition of a global controller such that the
+                  //  global def is no longer available.
+                  sList.push_back(CI(cnum, 
+                                  isinstr ? midiCtrlNumString(cnum, true) + c->name() : midiCtrlName(cnum, true), 
+                                  used, isinstr));
+                  }
+            }
+      
+      PopupMenu* ctrlMainPop = new PopupMenu;
+      
+      //ctrlMainPop->addSeparator();
+      ctrlMainPop->addAction(new MenuTitleItem(tr("Instrument-defined"), ctrlMainPop));
+      
+      //ctrlMainPop->addAction(QIcon(*configureIcon), tr("Add ..."))->setData(max + 1);
+      
+      // Add instrument-defined controllers.
+      for (isList i = sList.begin(); i != sList.end(); ++i) 
+      {
+        if(!i->instrument)
+          continue;
+        if (i->used)
+          ctrlMainPop->addAction(QIcon(*greendotIcon), i->s)->setData(i->num);
+        else
+          ctrlMainPop->addAction(i->s)->setData(i->num);
+      }
+
+      ctrlMainPop->addAction(QIcon(*configureIcon), tr("Add ..."))->setData(max + 1);
+      //ctrlMainPop->addAction(QIcon(*midi_edit_instrumentIcon), tr("Edit instruments"))->setData(max + 2);
+
+      ctrlMainPop->addSeparator();
+      ctrlMainPop->addAction(new MenuTitleItem(tr("Others"), ctrlMainPop));
+      
+      //ctrlMainPop->addAction(QIcon(*configureIcon), tr("Add ..."))->setData(max + 3);
+      
+      ctrlMainPop->addAction(tr("Velocity"))->setData(max);
+      
+      // Add global default controllers (all controllers not found in instrument).
+      for (isList i = sList.begin(); i != sList.end(); ++i) 
+      {
+        if(i->instrument)
+          continue;
+        if (i->used)
+          ctrlMainPop->addAction(QIcon(*greendotIcon), i->s)->setData(i->num);
+        else
+          ctrlMainPop->addAction(i->s)->setData(i->num);
+      }
+      
+      ctrlMainPop->addAction(QIcon(*configureIcon), tr("Add ..."))->setData(max + 3);
+
+      //connect(ctrlMainPop, SIGNAL(hovered(QAction*)), SLOT(ctrlMainPopHovered(QAction*)));
+      
+      QAction *act = ctrlMainPop->exec(selCtrl->mapToGlobal(QPoint(0,0)));
+      selCtrl->setDown(false);
+      
+      if (!act)
+      {
+        delete ctrlMainPop;
+        return;
+      }
+      
+      int rv = act->data().toInt();
+      delete ctrlMainPop;
+      
+      if (rv == max) {    // special case velocity
+            emit controllerChanged(CTRL_VELOCITY);
+            }
+      else if (rv == max + 1) {  // add new instrument controller
+            
+            PopupMenu * ctrlSubPop = new PopupMenu(this);
+            ctrlSubPop->addAction(new MenuTitleItem(tr("Instrument-defined"), ctrlSubPop));
+            
+            //
+            // populate popup with all controllers available for
+            // current instrument
+            //
+            
+            //ctrlSubPop->addAction(QIcon(*midi_edit_instrumentIcon), tr("Edit instruments"))->setData(max + 2);
+            
+            for (iMidiController ci = mcl->begin(); ci != mcl->end(); ++ci)
+            {
+                int num = ci->second->num();
+                if((num & 0xff) == 0xff)
+                {
+                  // dont show drum specific controller if not a drum track
+                  if(!isDrum)
+                    continue;
+                  num = (num & ~0xff) + drumMap[curDrumInstrument].anote;
+                }    
+
+                if(cll->find(channel, num) == cll->end())
+                  ctrlSubPop->addAction(midiCtrlNumString(num, true) + ci->second->name())->setData(num);
+            }
+            
+            // Don't allow editing instrument if it's a synth
+            if(!port->device() || port->device()->deviceType() != MidiDevice::SYNTH_MIDI)
+              ctrlSubPop->addAction(QIcon(*midi_edit_instrumentIcon), tr("Edit instrument ..."))->setData(max + 2);
+            
+            //connect(ctrlSubPop, SIGNAL(hovered(QAction*)), SLOT(ctrlSubPopHovered(QAction*)));
+            
+            QAction *act2 = ctrlSubPop->exec(selCtrl->mapToGlobal(QPoint(0,0)));
+            if (act2) 
+            {
+              int rv2 = act2->data().toInt();
+              
+              if (rv2 == max + 2)            // edit instrument
+                muse->startEditInstrument();
+              else                           // select new instrument control
+              {
+                MidiController* c;
+                for (iMidiController ci = mcl->begin(); ci != mcl->end(); ++ci) 
+                {
+                      c = ci->second;
+                      int num = c->num();
+                      if (isDrum && ((num & 0xff) == 0xff))
+                        num = (num & ~0xff) + drumMap[curDrumInstrument].anote;
+                      
+                      if(num != rv2)
+                        continue;
+                        
+                      if(cll->find(channel, num) == cll->end())
+                      {
+                        MidiCtrlValList* vl = new MidiCtrlValList(num);
+                        
+                        cll->add(channel, vl);
+                        emit controllerChanged(c->num());
+                        //song->update(SC_MIDI_CONTROLLER_ADD);
+                      }
+                      else 
+                        emit controllerChanged(c->num());
+                      break;
+                }
+              }  
+            }
+            delete ctrlSubPop;   
+            }
+      
+      //else if (rv == max + 2)             // edit instrument
+      //      muse->startEditInstrument();
+      
+      else if (rv == max + 3) {             // add new other controller
+            PopupMenu* ctrlSubPop = new PopupMenu(this);
+            ctrlSubPop->addAction(new MenuTitleItem(tr("Common Controls"), ctrlSubPop));
+            
+            for(int num = 0; num < 127; ++num)
+              if(cll->find(channel, num) == cll->end())
+                ctrlSubPop->addAction(midiCtrlName(num, true))->setData(num);
+            QAction *act2 = ctrlSubPop->exec(selCtrl->mapToGlobal(QPoint(0,0)));
+            if (act2) {
+                  int rv2 = act2->data().toInt();
+                  int num = rv2;
+                  if (isDrum && ((num & 0xff) == 0xff))
+                    num = (num & ~0xff) + drumMap[curDrumInstrument].anote;
+                  if(cll->find(channel, num) == cll->end())
+                  {
+                    MidiCtrlValList* vl = new MidiCtrlValList(num);
+                    
+                    cll->add(channel, vl);
+                    emit controllerChanged(rv2);
+                    //song->update(SC_MIDI_CONTROLLER_ADD);
+                  }
+                  else 
+                    emit controllerChanged(rv2);
+                  }
+            delete ctrlSubPop;   
+            }
+      else {                           // Select a control
+            //QString s = act->text();
+            iMidiCtrlValList i = cll->begin();
+            for (; i != cll->end(); ++i) {
+                  MidiCtrlValList* cl = i->second;
+                  MidiController* c   = port->midiController(cl->num());
+                  //if (c->name() == s) {
+                  if (c->num() == rv) {
+                        emit controllerChanged(c->num());
+                        break;
+                        }
+                  }
+            if (i == cll->end()) {
+                  //printf("CtrlPanel: controller %s not found!", s.toLatin1().constData());
+                  printf("CtrlPanel: controller number %d not found!", rv);
+                  }
+            }
+      }
+#endif
+
 //---------------------------------------------------------
 //   ctrlRightClicked
 //---------------------------------------------------------
diff --git a/muse2/muse/ctrl/ctrlpanel.h b/muse2/muse/ctrl/ctrlpanel.h
index a0e5f915..3f6de205 100644
--- a/muse2/muse/ctrl/ctrlpanel.h
+++ b/muse2/muse/ctrl/ctrlpanel.h
@@ -12,7 +12,6 @@
 
 class MidiController;
 
-class QMenu;
 class QPushButton;
 
 class MidiEditor;
@@ -26,7 +25,9 @@ class MidiTrack;
 //---------------------------------------------------------
 
 class CtrlPanel: public QWidget {
-      ///QMenu* pop;
+      Q_OBJECT
+    
+      //QMenu* pop;
       QPushButton* selCtrl;
       MidiEditor* editor;
       
@@ -38,7 +39,7 @@ class CtrlPanel: public QWidget {
       DoubleLabel* _dl;
       int _val;
       
-      Q_OBJECT
+      
 
    signals:
       void destroyPanel();
diff --git a/muse2/muse/driver/jack.cpp b/muse2/muse/driver/jack.cpp
index f70cf3d3..c4d7a8ca 100644
--- a/muse2/muse/driver/jack.cpp
+++ b/muse2/muse/driver/jack.cpp
@@ -711,7 +711,7 @@ void JackAudioDevice::connectJackMidiPorts()
       if(port)                          // 
       {
         RouteList* rl = md->outRoutes();
-        for (iRoute r = rl->begin(); r != rl->end(); ++r) 
+        for (ciRoute r = rl->begin(); r != rl->end(); ++r) 
           connect(port, r->jackPort);
       }    
     }
@@ -724,7 +724,7 @@ void JackAudioDevice::connectJackMidiPorts()
       if(port)                          //
       {
         RouteList* rl = md->inRoutes();
-        for (iRoute r = rl->begin(); r != rl->end(); ++r) 
+        for (ciRoute r = rl->begin(); r != rl->end(); ++r) 
           connect(r->jackPort, port);
       }    
     }    
@@ -915,7 +915,7 @@ void JackAudioDevice::graphChanged()
                   // the "right" amount
                   for (int i = 0;i < 20;i++) {
                         erased = false;
-                        for (iRoute irl = rl->begin(); irl != rl->end(); ++irl) {
+                        for (ciRoute irl = rl->begin(); irl != rl->end(); ++irl) {
                               if (irl->channel != channel)
                                     continue;
                               QString name = irl->name();
@@ -953,7 +953,7 @@ void JackAudioDevice::graphChanged()
                         const char** pn = ports;
                         while (*pn) {
                               bool found = false;
-                              for (iRoute irl = rl->begin(); irl != rl->end(); ++irl) {
+                              for (ciRoute irl = rl->begin(); irl != rl->end(); ++irl) {
                                     if (irl->channel != channel)
                                           continue;
                                     QString name = irl->name();
@@ -1002,7 +1002,7 @@ void JackAudioDevice::graphChanged()
                   // the "right" amount
                   for (int i = 0; i < 20 ; i++) {
                         erased = false;
-                        for (iRoute irl = rl->begin(); irl != rl->end(); ++irl) {
+                        for (ciRoute irl = rl->begin(); irl != rl->end(); ++irl) {
                               if (irl->channel != channel)
                                     continue;
                               QString name = irl->name();
@@ -1039,7 +1039,7 @@ void JackAudioDevice::graphChanged()
                         const char** pn = ports;
                         while (*pn) {
                               bool found = false;
-                              for (iRoute irl = rl->begin(); irl != rl->end(); ++irl) {
+                              for (ciRoute irl = rl->begin(); irl != rl->end(); ++irl) {
                                     if (irl->channel != channel)
                                           continue;
                                     QString name = irl->name();
@@ -1113,7 +1113,7 @@ void JackAudioDevice::graphChanged()
                       for (int i = 0; i < 20 ; i++) 
                       {
                             erased = false;
-                            for (iRoute irl = rl->begin(); irl != rl->end(); ++irl) {
+                            for (ciRoute irl = rl->begin(); irl != rl->end(); ++irl) {
                                   //if (irl->channel != channel)
                                   //      continue;
                                   QString name = irl->name();
@@ -1155,7 +1155,7 @@ void JackAudioDevice::graphChanged()
                             const char** pn = ports;
                             while (*pn) {
                                   bool found = false;
-                                  for (iRoute irl = rl->begin(); irl != rl->end(); ++irl) {
+                                  for (ciRoute irl = rl->begin(); irl != rl->end(); ++irl) {
                                         //if (irl->channel != channel)
                                         //      continue;
                                         QString name = irl->name();
@@ -1212,7 +1212,7 @@ void JackAudioDevice::graphChanged()
                       for (int i = 0; i < 20 ; i++) 
                       {
                             erased = false;
-                            for (iRoute irl = rl->begin(); irl != rl->end(); ++irl) {
+                            for (ciRoute irl = rl->begin(); irl != rl->end(); ++irl) {
                                   //if (irl->channel != channel)
                                   //      continue;
                                   QString name = irl->name();
@@ -1253,7 +1253,7 @@ void JackAudioDevice::graphChanged()
                             const char** pn = ports;
                             while (*pn) {
                                   bool found = false;
-                                  for (iRoute irl = rl->begin(); irl != rl->end(); ++irl) {
+                                  for (ciRoute irl = rl->begin(); irl != rl->end(); ++irl) {
                                         //if (irl->channel != channel)
                                         //      continue;
                                         QString name = irl->name();
@@ -1473,7 +1473,7 @@ void JackAudioDevice::start(int /*priority*/)
             for (int ch = 0; ch < channel; ++ch) {
                   RouteList* rl = ai->inRoutes();
                   void* port = ai->jackPort(ch);
-                  for (iRoute ir = rl->begin(); ir != rl->end(); ++ir) {
+                  for (ciRoute ir = rl->begin(); ir != rl->end(); ++ir) {
                         if (ir->channel == ch)
                               connect(ir->jackPort, port);
                         }
@@ -1486,7 +1486,7 @@ void JackAudioDevice::start(int /*priority*/)
             for (int ch = 0; ch < channel; ++ch) {
                   RouteList* rl = ai->outRoutes();
                   void* port = ai->jackPort(ch);
-                  for (iRoute r = rl->begin(); r != rl->end(); ++r) {
+                  for (ciRoute r = rl->begin(); r != rl->end(); ++r) {
                         if (r->channel == ch) {
                               connect(port, r->jackPort);
                               }
diff --git a/muse2/muse/driver/jackmidi.cpp b/muse2/muse/driver/jackmidi.cpp
index c950e096..1765fabb 100644
--- a/muse2/muse/driver/jackmidi.cpp
+++ b/muse2/muse/driver/jackmidi.cpp
@@ -974,13 +974,17 @@ void MidiJackDevice::recordEvent(MidiRecordEvent& event)
             }
 
       //
-      // transfer noteOn events to gui for step recording and keyboard
-      // remote control
+      // transfer noteOn and Off events to gui for step recording and keyboard
+      // remote control (changed by flo93: added noteOff-events)
       //
       if (typ == ME_NOTEON) {
             int pv = ((event.dataA() & 0xff)<<8) + (event.dataB() & 0xff);
             song->putEvent(pv);
             }
+      else if (typ == ME_NOTEOFF) {
+            int pv = ((event.dataA() & 0xff)<<8) + (0x00); //send an event with velo=0
+            song->putEvent(pv);
+            }
       
       //if(_recordFifo.put(MidiPlayEvent(event)))
       //  printf("MidiJackDevice::recordEvent: fifo overflow\n");
diff --git a/muse2/muse/dssihost.cpp b/muse2/muse/dssihost.cpp
index 49a63643..2384ed02 100644
--- a/muse2/muse/dssihost.cpp
+++ b/muse2/muse/dssihost.cpp
@@ -37,7 +37,7 @@
 
 #include <QDir>
 #include <QFileInfo>
-#include <QMenu>
+//#include <QMenu>
 
 #include "dssihost.h"
 #include "synth.h"
@@ -61,6 +61,8 @@
 #include "globaldefs.h"
 //#include "al/dsp.h"
 #include "gconfig.h"
+#include "popupmenu.h"
+
 
 /*
 static lo_server_thread serverThread;
@@ -3388,7 +3390,7 @@ const char* DssiSynthIF::getPatchName(int /*chan*/, int prog, MType /*type*/, bo
 //---------------------------------------------------------
 
 //void DssiSynthIF::populatePatchPopup(QMenu* menu, int)
-void DssiSynthIF::populatePatchPopup(QMenu* menu, int /*ch*/, MType /*type*/, bool /*drum*/)
+void DssiSynthIF::populatePatchPopup(PopupMenu* menu, int /*ch*/, MType /*type*/, bool /*drum*/)
       {
       // The plugin can change the programs, patches etc.
       // So make sure we're up to date by calling queryPrograms.
diff --git a/muse2/muse/dssihost.h b/muse2/muse/dssihost.h
index 096c84c7..b917bbf6 100644
--- a/muse2/muse/dssihost.h
+++ b/muse2/muse/dssihost.h
@@ -42,7 +42,8 @@
 
 #include "plugin.h"
 
-#include <QMenu>
+//#include <QMenu>
+#include "popupmenu.h"
 
 #define DSSI_PARAMSAVE_VERSION_MAJOR  0
 #define DSSI_PARAMSAVE_VERSION_MINOR  1
@@ -199,7 +200,8 @@ class DssiSynthIF : public SynthIF, public PluginIBase
       virtual const char* getPatchName(int, int, MType, bool);
       
       //virtual void populatePatchPopup(QMenu*, int);
-      virtual void populatePatchPopup(QMenu*, int, MType, bool);
+      //virtual void populatePatchPopup(QMenu*, int, MType, bool);
+      virtual void populatePatchPopup(PopupMenu*, int, MType, bool);
       
       //virtual void write(Xml& xml) const;
       virtual void write(int level, Xml& xml) const;
diff --git a/muse2/muse/functions.cpp b/muse2/muse/functions.cpp
index ba16640c..4a65d19c 100644
--- a/muse2/muse/functions.cpp
+++ b/muse2/muse/functions.cpp
@@ -13,9 +13,19 @@
 #include "audio.h"
 #include "gconfig.h"
 
+#include <values.h>
 #include <iostream>
-
+#include <errno.h>
+#include <values.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/mman.h>
+
+#include <QMimeData>
+#include <QByteArray>
+#include <QDrag>
 #include <QMessageBox>
+#include <QClipboard>
 
 using namespace std;
 
@@ -28,6 +38,7 @@ Setlen* set_notelen_dialog=NULL;
 Move* move_notes_dialog=NULL;
 Transpose* transpose_dialog=NULL;
 Crescendo* crescendo_dialog=NULL;
+Legato* legato_dialog=NULL;
 
 void init_function_dialogs(QWidget* parent)
 {
@@ -40,6 +51,7 @@ void init_function_dialogs(QWidget* parent)
 	move_notes_dialog = new Move(parent);
 	transpose_dialog = new Transpose(parent);
 	crescendo_dialog = new Crescendo(parent);
+	legato_dialog = new Legato(parent);
 }
 
 set<Part*> partlist_to_set(PartList* pl)
@@ -52,6 +64,13 @@ set<Part*> partlist_to_set(PartList* pl)
 	return result;
 }
 
+set<Part*> part_to_set(Part* p)
+{
+	set<Part*> result;
+	result.insert(p);
+	return result;
+}
+
 bool is_relevant(const Event& event, const Part* part, int range)
 {
 	unsigned tick;
@@ -109,7 +128,8 @@ bool quantize_notes(const set<Part*>& parts)
 		return false;
 		
 	quantize_notes(parts, quantize_dialog->range, (config.division*4)/(1<<quantize_dialog->raster_power2),
-	               quantize_dialog->strength, quantize_dialog->swing, quantize_dialog->threshold);
+	               quantize_dialog->quant_len, quantize_dialog->strength, quantize_dialog->swing,
+	               quantize_dialog->threshold);
 	
 	return true;
 }
@@ -119,7 +139,8 @@ bool erase_notes(const set<Part*>& parts)
 	if (!erase_dialog->exec())
 		return false;
 		
-	erase_notes(parts,erase_dialog->range);
+	erase_notes(parts,erase_dialog->range, erase_dialog->velo_threshold, erase_dialog->velo_thres_used, 
+	                                       erase_dialog->len_threshold, erase_dialog->len_thres_used );
 	
 	return true;
 }
@@ -180,9 +201,19 @@ bool crescendo(const set<Part*>& parts)
 	return true;
 }
 
+bool legato(const set<Part*>& parts)
+{
+	if (!legato_dialog->exec())
+		return false;
+		
+	legato(parts,legato_dialog->range, legato_dialog->min_len, !legato_dialog->allow_shortening);
+	
+	return true;
+}
+
 
 
-void modify_velocity(const set<Part*>& parts, int range, int rate, int offset)
+bool modify_velocity(const set<Part*>& parts, int range, int rate, int offset)
 {
 	map<Event*, Part*> events = get_events(parts, range);
 	Undo operations;
@@ -212,12 +243,13 @@ void modify_velocity(const set<Part*>& parts, int range, int rate, int offset)
 			}
 		}
 		
-		if (!operations.empty())
-			song->applyOperationGroup(operations);
+		return song->applyOperationGroup(operations);
 	}
+	else
+		return false;
 }
 
-void modify_off_velocity(const set<Part*>& parts, int range, int rate, int offset)
+bool modify_off_velocity(const set<Part*>& parts, int range, int rate, int offset)
 {
 	map<Event*, Part*> events = get_events(parts, range);
 	Undo operations;
@@ -247,12 +279,13 @@ void modify_off_velocity(const set<Part*>& parts, int range, int rate, int offse
 			}
 		}
 
-		if (!operations.empty())
-			song->applyOperationGroup(operations);
+		return song->applyOperationGroup(operations);
 	}
+	else
+		return false;
 }
 
-void modify_notelen(const set<Part*>& parts, int range, int rate, int offset)
+bool modify_notelen(const set<Part*>& parts, int range, int rate, int offset)
 {
 	map<Event*, Part*> events = get_events(parts, range);
 	Undo operations;
@@ -280,14 +313,15 @@ void modify_notelen(const set<Part*>& parts, int range, int rate, int offset)
 			}
 		}
 		
-		if (!operations.empty())
-			song->applyOperationGroup(operations);
+		return song->applyOperationGroup(operations);
 	}
+	else
+		return false;
 }
 
-void set_notelen(const set<Part*>& parts, int range, int len)
+bool set_notelen(const set<Part*>& parts, int range, int len)
 {
-	modify_notelen(parts, range, 0, len);
+	return modify_notelen(parts, range, 0, len);
 }
 
 unsigned quantize_tick(unsigned tick, unsigned raster, int swing)
@@ -312,7 +346,7 @@ unsigned quantize_tick(unsigned tick, unsigned raster, int swing)
 		return tick_dest3;
 }
 
-void quantize_notes(const set<Part*>& parts, int range, int raster, int strength, int swing, int threshold)
+bool quantize_notes(const set<Part*>& parts, int range, int raster, bool quant_len, int strength, int swing, int threshold)
 {
 	map<Event*, Part*> events = get_events(parts, range);
 	Undo operations;
@@ -336,7 +370,7 @@ void quantize_notes(const set<Part*>& parts, int range, int raster, int strength
 			unsigned end_tick = begin_tick + len;
 			int len_diff = quantize_tick(end_tick, raster, swing) - end_tick;
 				
-			if (abs(len_diff) > threshold)
+			if ((abs(len_diff) > threshold) && quant_len)
 				len = len + len_diff*strength/100;
 
 			if (len <= 0)
@@ -352,12 +386,13 @@ void quantize_notes(const set<Part*>& parts, int range, int raster, int strength
 			}
 		}
 		
-		if (!operations.empty())
-			song->applyOperationGroup(operations);
+		return song->applyOperationGroup(operations);
 	}
+	else
+		return false;
 }
 
-void erase_notes(const set<Part*>& parts, int range)
+bool erase_notes(const set<Part*>& parts, int range, int velo_threshold, bool velo_thres_used, int len_threshold, bool len_thres_used)
 {
 	map<Event*, Part*> events = get_events(parts, range);
 	Undo operations;
@@ -369,15 +404,19 @@ void erase_notes(const set<Part*>& parts, int range)
 			Event& event=*(it->first);
 			Part* part=it->second;
 
-			operations.push_back(UndoOp(UndoOp::DeleteEvent, event, part, false, false));
+			if ( (!velo_thres_used && !len_thres_used) ||
+			     (velo_thres_used && event.velo() < velo_threshold) ||
+			     (len_thres_used && int(event.lenTick()) < len_threshold) )
+				operations.push_back(UndoOp(UndoOp::DeleteEvent, event, part, false, false));
 		}
 		
-		if (!operations.empty())
-			song->applyOperationGroup(operations);
+		return song->applyOperationGroup(operations);
 	}
+	else
+		return false;
 }
 
-void transpose_notes(const set<Part*>& parts, int range, signed int halftonesteps)
+bool transpose_notes(const set<Part*>& parts, int range, signed int halftonesteps)
 {
 	map<Event*, Part*> events = get_events(parts, range);
 	Undo operations;
@@ -397,12 +436,13 @@ void transpose_notes(const set<Part*>& parts, int range, signed int halftonestep
 			operations.push_back(UndoOp(UndoOp::ModifyEvent, newEvent, event, part, false, false));
 		}
 		
-		if (!operations.empty())
-			song->applyOperationGroup(operations);
+		return song->applyOperationGroup(operations);
 	}
+	else
+		return false;
 }
 
-void crescendo(const set<Part*>& parts, int range, int start_val, int end_val, bool absolute)
+bool crescendo(const set<Part*>& parts, int range, int start_val, int end_val, bool absolute)
 {
 	map<Event*, Part*> events = get_events(parts, range);
 	Undo operations;
@@ -434,12 +474,13 @@ void crescendo(const set<Part*>& parts, int range, int start_val, int end_val, b
 			operations.push_back(UndoOp(UndoOp::ModifyEvent, newEvent, event, part, false, false));
 		}
 		
-		if (!operations.empty())
-			song->applyOperationGroup(operations);
+		return song->applyOperationGroup(operations);
 	}
+	else
+		return false;
 }
 
-void move_notes(const set<Part*>& parts, int range, signed int ticks) //TODO FINDMICH: safety checks
+bool move_notes(const set<Part*>& parts, int range, signed int ticks) //TODO: clipping
 {
 	map<Event*, Part*> events = get_events(parts, range);
 	Undo operations;
@@ -450,18 +491,36 @@ void move_notes(const set<Part*>& parts, int range, signed int ticks) //TODO FIN
 		{
 			Event& event=*(it->first);
 			Part* part=it->second;
+			bool del=false;
 
 			Event newEvent = event.clone();
-			newEvent.setTick(event.tick()+ticks);
-			operations.push_back(UndoOp(UndoOp::ModifyEvent, newEvent, event, part, false, false));
+			if ((signed)event.tick()+ticks < 0) //don't allow moving before the part's begin
+				newEvent.setTick(0);
+			else
+				newEvent.setTick(event.tick()+ticks);
+			
+			if (newEvent.endTick() > part->lenTick()) //if exceeding the part's end, clip
+			{
+				if (part->lenTick() > newEvent.tick())
+					newEvent.setLenTick(part->lenTick() - newEvent.tick());
+				else
+					del=true; //if the new length would be <= 0, erase the note
+			}
+			
+			if (del==false)
+				operations.push_back(UndoOp(UndoOp::ModifyEvent, newEvent, event, part, false, false));
+			else
+				operations.push_back(UndoOp(UndoOp::DeleteEvent, event, part, false, false));
 		}
 		
-		if (!operations.empty())
-			song->applyOperationGroup(operations);
+		return song->applyOperationGroup(operations);
 	}
+	else
+		return false;
 }
 
-void delete_overlaps(const set<Part*>& parts, int range)
+
+bool delete_overlaps(const set<Part*>& parts, int range)
 {
 	map<Event*, Part*> events = get_events(parts, range);
 	Undo operations;
@@ -510,11 +569,266 @@ void delete_overlaps(const set<Part*>& parts, int range)
 			}
 		}
 		
-		if (!operations.empty())
-			song->applyOperationGroup(operations);
+		return song->applyOperationGroup(operations);
+	}
+	else
+		return false;
+}
+
+bool legato(const set<Part*>& parts, int range, int min_len, bool dont_shorten)
+{
+	map<Event*, Part*> events = get_events(parts, range);
+	Undo operations;
+	
+	if (min_len<=0) min_len=1;
+	
+	if (!events.empty())
+	{
+		for (map<Event*, Part*>::iterator it1=events.begin(); it1!=events.end(); it1++)
+		{
+			Event& event1=*(it1->first);
+			Part* part1=it1->second;
+			
+			unsigned len=MAXINT;
+			// we may NOT optimize by letting it2 start at (it1 +1); this optimisation
+			// is only allowed when events was sorted by time. it is, however, sorted
+			// randomly by pointer.
+			for (map<Event*, Part*>::iterator it2=events.begin(); it2!=events.end(); it2++)
+			{
+				Event& event2=*(it2->first);
+				Part* part2=it2->second;
+				
+				bool relevant = (event2.tick() >= event1.tick() + min_len);
+				if (dont_shorten)
+					relevant = relevant && (event2.tick() >= event1.endTick());
+				
+				if ( (part1->events()==part2->events()) &&  // part1 and part2 are the same or are duplicates
+				      relevant &&                           // they're not too near (respect min_len and dont_shorten)
+				     (event2.tick()-event1.tick() < len ) ) // that's the nearest relevant following note
+					len=event2.tick()-event1.tick();
+			}
+			
+			if (len==MAXINT) len=event1.lenTick(); // if no following note was found, keep the length
+			
+			if (event1.lenTick() != len)
+			{
+				Event new_event1 = event1.clone();
+				new_event1.setLenTick(len);
+				
+				operations.push_back(UndoOp(UndoOp::ModifyEvent, new_event1, event1, part1, false, false));
+			}
+		}
+		
+		return song->applyOperationGroup(operations);
+	}
+	else
+		return false;
+}
+
+
+
+void copy_notes(const set<Part*>& parts, int range)
+{
+	QMimeData* drag = selected_events_to_mime(parts,range);
+
+	if (drag)
+		QApplication::clipboard()->setMimeData(drag, QClipboard::Clipboard);
+}
+
+void paste_notes(Part* dest_part)
+{
+	QString tmp="x-muse-eventlist"; // QClipboard::text() expects a QString&, not a QString :(
+	QString s = QApplication::clipboard()->text(tmp, QClipboard::Clipboard);  // TODO CHECK Tim.
+	paste_at(dest_part, s, song->cpos());
+}
+
+QMimeData* selected_events_to_mime(const set<Part*>& parts, int range)
+{
+	map<Event*, Part*> events=get_events(parts,range);
+
+	//---------------------------------------------------
+	//   generate event list from selected events
+	//---------------------------------------------------
+
+	EventList el;
+	unsigned startTick = MAXINT; //will be the tick of the first event or MAXINT if no events are there
+
+	for (map<Event*, Part*>::iterator it=events.begin(); it!=events.end(); it++)
+	{
+		Event& e   = *it->first;
+		
+		if (e.tick() < startTick)
+			startTick = e.tick();
+			
+		el.add(e);
+	}
+
+	//---------------------------------------------------
+	//    write events as XML into tmp file
+	//---------------------------------------------------
+
+	FILE* tmp = tmpfile();
+	if (tmp == 0) 
+	{
+		fprintf(stderr, "EventCanvas::getTextDrag() fopen failed: %s\n", strerror(errno));
+		return 0;
+	}
+	
+	Xml xml(tmp);
+	int level = 0;
+	
+	xml.tag(level++, "eventlist");
+	for (ciEvent e = el.begin(); e != el.end(); ++e)
+		e->second.write(level, xml, -startTick);
+	xml.etag(--level, "eventlist");
+
+	//---------------------------------------------------
+	//    read tmp file into drag Object
+	//---------------------------------------------------
+
+	fflush(tmp);
+	struct stat f_stat;
+	if (fstat(fileno(tmp), &f_stat) == -1)
+	{
+		fprintf(stderr, "PianoCanvas::copy() fstat failed:<%s>\n",
+		strerror(errno));
+		fclose(tmp);
+		return 0;
+	}
+	int n = f_stat.st_size;
+	char* fbuf  = (char*)mmap(0, n+1, PROT_READ|PROT_WRITE,
+	MAP_PRIVATE, fileno(tmp), 0);
+	fbuf[n] = 0;
+
+	QByteArray data(fbuf);
+	QMimeData* md = new QMimeData();
+
+	md->setData("text/x-muse-eventlist", data);
+
+	munmap(fbuf, n);
+	fclose(tmp);
+
+	return md;
+}
+
+void paste_at(Part* dest_part, const QString& pt, int pos)
+{
+	Undo operations;
+	
+	Xml xml(pt.toLatin1().constData());
+	for (;;) 
+	{
+		Xml::Token token = xml.parse();
+		const QString& tag = xml.s1();
+		switch (token) 
+		{
+			case Xml::Error:
+			case Xml::End:
+				goto end_of_paste_at;
+				
+			case Xml::TagStart:
+				if (tag == "eventlist")
+				{
+					EventList el;
+					el.read(xml, "eventlist", true);
+					for (iEvent i = el.begin(); i != el.end(); ++i)
+					{
+						Event e = i->second;
+						int tick = e.tick() + pos - dest_part->tick();
+						if (tick<0)
+						{
+							printf("ERROR: trying to add event before current part!\n");
+							goto end_of_paste_at;
+						}
+
+						e.setTick(tick);
+						e.setSelected(true);
+						int diff = e.endTick()-dest_part->lenTick();
+						if (diff > 0) // too short part? extend it
+						{
+							Part* newPart = dest_part->clone();
+							newPart->setLenTick(newPart->lenTick()+diff);
+							// Indicate no undo, and do port controller values but not clone parts. 
+							operations.push_back(UndoOp(UndoOp::ModifyPart,dest_part, newPart, true, false)); //FINDMICHJETZT oder andersrum?
+							dest_part = newPart; // reassign TODO FINDME does this work, or has dest_part to be a nonconst reference?
+						}
+						// Indicate no undo, and do not do port controller values and clone parts. 
+						operations.push_back(UndoOp(UndoOp::AddEvent,e, dest_part, false, false));
+					}
+					song->applyOperationGroup(operations);
+					goto end_of_paste_at;
+				}
+				else
+				xml.unknown("pasteAt");
+				break;
+				
+			case Xml::Attribut:
+			case Xml::TagEnd:
+			default:
+				break;
+		}
 	}
+	
+	end_of_paste_at:
+	song->update(SC_SELECTION);
+}
+
+void select_all(const std::set<Part*>& parts)
+{
+	for (set<Part*>::iterator part=parts.begin(); part!=parts.end(); part++)
+		for (iEvent ev_it=(*part)->events()->begin(); ev_it!=(*part)->events()->end(); ev_it++)
+		{
+			Event& event=ev_it->second;
+			event.setSelected(true);
+		}
+	song->update(SC_SELECTION);
 }
 
+void select_none(const std::set<Part*>& parts)
+{
+	for (set<Part*>::iterator part=parts.begin(); part!=parts.end(); part++)
+		for (iEvent ev_it=(*part)->events()->begin(); ev_it!=(*part)->events()->end(); ev_it++)
+		{
+			Event& event=ev_it->second;
+			event.setSelected(false);
+		}
+	song->update(SC_SELECTION);
+}
+
+void select_invert(const std::set<Part*>& parts)
+{
+	for (set<Part*>::iterator part=parts.begin(); part!=parts.end(); part++)
+		for (iEvent ev_it=(*part)->events()->begin(); ev_it!=(*part)->events()->end(); ev_it++)
+		{
+			Event& event=ev_it->second;
+			event.setSelected(!event.selected());
+		}
+	song->update(SC_SELECTION);
+}
+
+void select_in_loop(const std::set<Part*>& parts)
+{
+	select_none(parts);
+	for (set<Part*>::iterator part=parts.begin(); part!=parts.end(); part++)
+		for (iEvent ev_it=(*part)->events()->begin(); ev_it!=(*part)->events()->end(); ev_it++)
+		{
+			Event& event=ev_it->second;
+			event.setSelected((event.tick()>=song->lpos() && event.endTick()<=song->rpos()));
+		}
+	song->update(SC_SELECTION);
+}
+
+void select_not_in_loop(const std::set<Part*>& parts)
+{
+	select_none(parts);
+	for (set<Part*>::iterator part=parts.begin(); part!=parts.end(); part++)
+		for (iEvent ev_it=(*part)->events()->begin(); ev_it!=(*part)->events()->end(); ev_it++)
+		{
+			Event& event=ev_it->second;
+			event.setSelected(!(event.tick()>=song->lpos() && event.endTick()<=song->rpos()));
+		}
+	song->update(SC_SELECTION);
+}
 
 
 void read_function_dialog_config(Xml& xml)
@@ -554,6 +868,8 @@ void read_function_dialog_config(Xml& xml)
 					transpose_dialog->read_configuration(xml);
 				else if (tag == "crescendo")
 					crescendo_dialog->read_configuration(xml);
+				else if (tag == "legato")
+					legato_dialog->read_configuration(xml);
 				else
 					xml.unknown("function_dialogs");
 				break;
@@ -581,6 +897,7 @@ void write_function_dialog_config(int level, Xml& xml)
 	move_notes_dialog->write_configuration(level, xml);
 	transpose_dialog->write_configuration(level, xml);
 	crescendo_dialog->write_configuration(level, xml);
+	legato_dialog->write_configuration(level, xml);
 
 	xml.tag(level, "/dialogs");
 }
diff --git a/muse2/muse/functions.h b/muse2/muse/functions.h
index 2b6dc711..bc2bb8f4 100644
--- a/muse2/muse/functions.h
+++ b/muse2/muse/functions.h
@@ -17,10 +17,13 @@
 #include "widgets/function_dialogs/setlen.h"
 #include "widgets/function_dialogs/move.h"
 #include "widgets/function_dialogs/deloverlaps.h"
+#include "widgets/function_dialogs/legato.h"
 
 #include <set>
 #include "part.h"
 
+class QString;
+class QMimeData;
 
 extern GateTime* gatetime_dialog;
 extern Velocity* velocity_dialog;
@@ -31,24 +34,27 @@ extern Setlen* set_notelen_dialog;
 extern Move* move_notes_dialog;
 extern Transpose* transpose_dialog;
 extern Crescendo* crescendo_dialog;
+extern Legato* legato_dialog;
 
 void init_function_dialogs(QWidget* parent);
 
 
 std::set<Part*> partlist_to_set(PartList* pl);
+std::set<Part*> part_to_set(Part* p);
 std::map<Event*, Part*> get_events(const std::set<Part*>& parts, int range);
 
 //these functions simply do their job, non-interactively
-void modify_velocity(const std::set<Part*>& parts, int range, int rate, int offset=0);
-void modify_off_velocity(const std::set<Part*>& parts, int range, int rate, int offset=0);
-void modify_notelen(const std::set<Part*>& parts, int range, int rate, int offset=0);
-void quantize_notes(const std::set<Part*>& parts, int range, int raster, int strength=100, int swing=0, int threshold=0);
-void erase_notes(const std::set<Part*>& parts, int range);
-void delete_overlaps(const std::set<Part*>& parts, int range);
-void set_notelen(const std::set<Part*>& parts, int range, int len);
-void move_notes(const std::set<Part*>& parts, int range, signed int ticks);
-void transpose_notes(const std::set<Part*>& parts, int range, signed int halftonesteps);
-void crescendo(const std::set<Part*>& parts, int range, int start_val, int end_val, bool absolute);
+bool modify_velocity(const std::set<Part*>& parts, int range, int rate, int offset=0);
+bool modify_off_velocity(const std::set<Part*>& parts, int range, int rate, int offset=0);
+bool modify_notelen(const std::set<Part*>& parts, int range, int rate, int offset=0);
+bool quantize_notes(const std::set<Part*>& parts, int range, int raster, bool len=false, int strength=100, int swing=0, int threshold=0);
+bool erase_notes(const std::set<Part*>& parts, int range, int velo_threshold=0, bool velo_thres_used=false, int len_threshold=0, bool len_thres_used=false);
+bool delete_overlaps(const std::set<Part*>& parts, int range);
+bool set_notelen(const std::set<Part*>& parts, int range, int len);
+bool move_notes(const std::set<Part*>& parts, int range, signed int ticks);
+bool transpose_notes(const std::set<Part*>& parts, int range, signed int halftonesteps);
+bool crescendo(const std::set<Part*>& parts, int range, int start_val, int end_val, bool absolute);
+bool legato(const std::set<Part*>& parts, int range, int min_len=1, bool dont_shorten=false);
 
 
 //the below functions automatically open the dialog
@@ -62,8 +68,21 @@ bool transpose_notes(const std::set<Part*>& parts);
 bool crescendo(const std::set<Part*>& parts);
 bool erase_notes(const std::set<Part*>& parts);
 bool delete_overlaps(const std::set<Part*>& parts);
+bool legato(const std::set<Part*>& parts);
 
 
+//functions for copy'n'paste
+void copy_notes(const std::set<Part*>& parts, int range);
+void paste_notes(Part* dest_part);
+QMimeData* selected_events_to_mime(const std::set<Part*>& parts, int range);
+void paste_at(Part* dest_part, const QString& pt, int pos);
+
+//functions for selections
+void select_all(const std::set<Part*>& parts);
+void select_none(const std::set<Part*>& parts);
+void select_invert(const std::set<Part*>& parts);
+void select_in_loop(const std::set<Part*>& parts);
+void select_not_in_loop(const std::set<Part*>& parts);
 
 //functions for reading and writing default values
 class Xml;
diff --git a/muse2/muse/gconfig.cpp b/muse2/muse/gconfig.cpp
index 4d22ad4c..49a6d572 100644
--- a/muse2/muse/gconfig.cpp
+++ b/muse2/muse/gconfig.cpp
@@ -168,6 +168,7 @@ GlobalConfigValues config = {
       QString("./"),                // projectBaseFolder
       true,                         // projectStoreInFolder
       true,                         // useProjectSaveDialog
-      64                            // minControlProcessPeriod
+      64,                           // minControlProcessPeriod
+      false                         // popupsDefaultStayOpen
     };
 
diff --git a/muse2/muse/gconfig.h b/muse2/muse/gconfig.h
index cd236b36..acf39782 100644
--- a/muse2/muse/gconfig.h
+++ b/muse2/muse/gconfig.h
@@ -143,6 +143,7 @@ struct GlobalConfigValues {
       bool projectStoreInFolder;
       bool useProjectSaveDialog;
       unsigned long minControlProcessPeriod;
+      bool popupsDefaultStayOpen;
       };
 
 extern GlobalConfigValues config;
diff --git a/muse2/muse/globals.cpp b/muse2/muse/globals.cpp
index f8ae4454..7f346f87 100644
--- a/muse2/muse/globals.cpp
+++ b/muse2/muse/globals.cpp
@@ -347,12 +347,9 @@ unsigned char rcStopNote = 28;
 unsigned char rcRecordNote = 31;
 unsigned char rcGotoLeftMarkNote = 33;
 unsigned char rcPlayNote = 29;
+unsigned char rcSteprecNote = 36;
 bool automation = true;
 
-QObject* gRoutingPopupMenuMaster = 0;
-RouteMenuMap gRoutingMenuMap;
-bool gIsOutRoutingPopupMenu = false;
-
 uid_t euid, ruid;  // effective user id, real user id
 
 bool midiSeqRunning = false;
diff --git a/muse2/muse/globals.h b/muse2/muse/globals.h
index 894f1baf..cee5e815 100644
--- a/muse2/muse/globals.h
+++ b/muse2/muse/globals.h
@@ -13,7 +13,6 @@
 
 #include "value.h"
 #include "mtc.h"
-#include "route.h"
 
 #include <unistd.h>
 
@@ -167,19 +166,11 @@ extern unsigned char rcStopNote;
 extern unsigned char rcRecordNote;
 extern unsigned char rcGotoLeftMarkNote;
 extern unsigned char rcPlayNote;
+extern unsigned char rcSteprecNote;
 
 extern bool midiSeqRunning;
 extern bool automation;
 
-class QObject;
-// Which audio strip, midi strip, or midi track info strip
-//  was responsible for popping up the routing menu.
-extern QObject* gRoutingPopupMenuMaster;
-// Map of routing popup menu item IDs to Routes.
-extern RouteMenuMap gRoutingMenuMap;
-// Whether the routes popup was shown by clicking the output routes button, or input routes button.
-extern bool gIsOutRoutingPopupMenu;
-
 // p3.3.55
 #define JACK_MIDI_OUT_PORT_SUFFIX "_out"
 #define JACK_MIDI_IN_PORT_SUFFIX  "_in"
diff --git a/muse2/muse/helper.cpp b/muse2/muse/helper.cpp
index 605d6f5c..be45e048 100644
--- a/muse2/muse/helper.cpp
+++ b/muse2/muse/helper.cpp
@@ -6,6 +6,9 @@
 //=========================================================
 
 #include "helper.h"
+#include "part.h"
+#include "track.h"
+#include "song.h"
 
 extern bool hIsB;
 static const char* vall[] = {
@@ -38,3 +41,20 @@ QString pitch2string(int v)
       }
 
 
+
+
+Part* partFromSerialNumber(int serial)
+{
+	TrackList* tl = song->tracks();
+	for (iTrack it = tl->begin(); it != tl->end(); ++it)
+	{
+		PartList* pl = (*it)->parts();
+		iPart ip;
+		for (ip = pl->begin(); ip != pl->end(); ++ip)
+			if (ip->second->sn() == serial)
+				return ip->second;
+	}
+	
+	printf("ERROR: partFromSerialNumber(%i) wasn't able to find an appropriate part!\n",serial);
+	return NULL;
+}
diff --git a/muse2/muse/helper.h b/muse2/muse/helper.h
index f772ebf6..109ecbee 100644
--- a/muse2/muse/helper.h
+++ b/muse2/muse/helper.h
@@ -10,7 +10,11 @@
 
 #include <QString>
 
+class Part;
+
 extern QString pitch2string(int v);
 
+Part* partFromSerialNumber(int serial);
+
 #endif
 
diff --git a/muse2/muse/instruments/minstrument.cpp b/muse2/muse/instruments/minstrument.cpp
index 4fde7bf3..10cb3ec2 100644
--- a/muse2/muse/instruments/minstrument.cpp
+++ b/muse2/muse/instruments/minstrument.cpp
@@ -11,7 +11,7 @@
 #include <QAction>
 #include <QDir>
 #include <QFileInfo>
-#include <QMenu>
+//#include <QMenu>
 #include <QMessageBox>
 
 #include "minstrument.h"
@@ -25,6 +25,7 @@
 #include "mpevent.h"
 #include "midictrl.h"
 #include "gconfig.h"
+#include "popupmenu.h"
 
 MidiInstrumentList midiInstruments;
 MidiInstrument* genericMidiInstrument;
@@ -881,7 +882,7 @@ QString MidiInstrument::getPatchName(int channel, int prog, MType mode, bool dru
 //   populatePatchPopup
 //---------------------------------------------------------
 
-void MidiInstrument::populatePatchPopup(QMenu* menu, int chan, MType songType, bool drum)
+void MidiInstrument::populatePatchPopup(PopupMenu* menu, int chan, MType songType, bool drum)
       {
       menu->clear();
       int mask = 0;
@@ -905,7 +906,9 @@ void MidiInstrument::populatePatchPopup(QMenu* menu, int chan, MType songType, b
       if (pg.size() > 1) {
             for (ciPatchGroup i = pg.begin(); i != pg.end(); ++i) {
                   PatchGroup* pgp = *i;
-                  QMenu* pm = menu->addMenu(pgp->name);
+                  //QMenu* pm = menu->addMenu(pgp->name);
+                  PopupMenu* pm = new PopupMenu(pgp->name, menu, menu->stayOpen());  // Use the parent stayOpen here.
+                  menu->addMenu(pm);
                   pm->setFont(config.fonts[0]);
                   const PatchList& pl = pgp->patches;
                   for (ciPatch ipl = pl.begin(); ipl != pl.end(); ++ipl) {
diff --git a/muse2/muse/instruments/minstrument.h b/muse2/muse/instruments/minstrument.h
index a8fb1168..15942537 100644
--- a/muse2/muse/instruments/minstrument.h
+++ b/muse2/muse/instruments/minstrument.h
@@ -14,7 +14,8 @@
 #include <vector>
 
 class MidiPort;
-class QMenu;
+//class QMenu;
+class PopupMenu;
 class MidiPlayEvent;
 class Xml;
 class EventList;
@@ -118,7 +119,8 @@ class MidiInstrument {
 
       virtual void reset(int, MType);
       virtual QString getPatchName(int,int,MType,bool);
-      virtual void populatePatchPopup(QMenu*, int, MType, bool);
+      //virtual void populatePatchPopup(QMenu*, int, MType, bool);
+      virtual void populatePatchPopup(PopupMenu*, int, MType, bool);
       void read(Xml&);
       void write(int level, Xml&);
       
diff --git a/muse2/muse/liste/editevent.cpp b/muse2/muse/liste/editevent.cpp
index b162a3e6..fd74d5d3 100644
--- a/muse2/muse/liste/editevent.cpp
+++ b/muse2/muse/liste/editevent.cpp
@@ -12,7 +12,7 @@
 #include <QGridLayout>
 #include <QLabel>
 #include <QListWidget>
-#include <QMenu>
+//#include <QMenu>
 #include <QMessageBox>
 #include <QPushButton>
 #include <QRadioButton>
@@ -36,6 +36,7 @@
 #include "midiedit/drummap.h"
 #include "instruments/minstrument.h"
 #include "midi.h"
+#include "popupmenu.h"
 
 //---------------------------------------------------------
 //   string2qhex
@@ -679,7 +680,8 @@ EditCtrlDialog::EditCtrlDialog(int tick, const Event& event,
 
 void EditCtrlDialog::newController()
       {
-      QMenu* pup = new QMenu(this);
+      //QMenu* pup = new QMenu(this);
+      PopupMenu* pup = new PopupMenu(this);
       //pup->setCheckable(this);//not necessary in Qt4
       //
       // populate popup with all controllers available for
@@ -715,7 +717,9 @@ void EditCtrlDialog::newController()
                           cll->add(channel, vl);
                           //song->update(SC_MIDI_CONTROLLER_ADD);
                         }
-                        for (int idx = 0; ;++idx) {
+                        //for (int idx = 0; ;++idx) {
+                        int idx = 0;
+                        for (; idx < ctrlList->count() ;++idx) {   // p4.0.25 Fix segfault 
 			  QString str = ctrlList->item(idx)->text();
                               if (s == str)
                               {
@@ -723,13 +727,20 @@ void EditCtrlDialog::newController()
                                     ctrlListClicked(ctrlList->item(idx));
                                     break;
                               }      
-                              if (str.isNull()) {
-                                    ctrlList->addItem(s);
-                                    ctrlList->item(idx)->setSelected(true);
-                                    ctrlListClicked(ctrlList->item(idx));
-                                    break;
-                                    }
+                              //if (str.isNull()) {
+                              //      ctrlList->addItem(s);
+                              //      ctrlList->item(idx)->setSelected(true);
+                              //      ctrlListClicked(ctrlList->item(idx));
+                              //      break;
+                              //      }
                               }
+                        if (idx >= ctrlList->count()) {                       // p4.0.25 Fix segfault 
+                              ctrlList->addItem(s);
+                              ctrlList->item(idx)->setSelected(true);
+                              ctrlListClicked(ctrlList->item(idx));
+                              break;
+                              }
+                              
                               
                         break;
                         }
@@ -844,7 +855,8 @@ void EditCtrlDialog::instrPopup()
       MidiInstrument* instr = midiPorts[port].instrument();
       
       ///instr->populatePatchPopup(pop, channel, song->mtype(), track->type() == Track::DRUM);
-      QMenu* pup = new QMenu(this);
+      //QMenu* pup = new QMenu(this);
+      PopupMenu* pup = new PopupMenu(this);
       instr->populatePatchPopup(pup, channel, song->mtype(), track->type() == Track::DRUM);
 
       ///if(pop->actions().count() == 0)
diff --git a/muse2/muse/liste/listedit.h b/muse2/muse/liste/listedit.h
index 5cf60a59..397a5e08 100644
--- a/muse2/muse/liste/listedit.h
+++ b/muse2/muse/liste/listedit.h
@@ -32,6 +32,8 @@ class Xml;
 //---------------------------------------------------------
 
 class ListEdit : public MidiEditor {
+      Q_OBJECT
+    
       QTreeWidget* liste;
       QMenu* menuEdit;
       QActionGroup* insertItems;
@@ -43,7 +45,7 @@ class ListEdit : public MidiEditor {
 
       enum { CMD_DELETE };
 
-      Q_OBJECT
+      
       virtual void closeEvent(QCloseEvent*);
       virtual void keyPressEvent(QKeyEvent*);
       void initShortcuts();
diff --git a/muse2/muse/marker/markerview.h b/muse2/muse/marker/markerview.h
index a271873c..5ad4f4bd 100644
--- a/muse2/muse/marker/markerview.h
+++ b/muse2/muse/marker/markerview.h
@@ -49,6 +49,8 @@ class MarkerItem : public QTreeWidgetItem {
 //---------------------------------------------------------
 
 class MarkerView : public TopWin {
+      Q_OBJECT
+    
       QTreeWidget* table;
       QLineEdit* editName;
       ///PosEdit* editSMPTE;
@@ -58,7 +60,7 @@ class MarkerView : public TopWin {
       QToolButton* lock;
       QToolBar* tools;
       
-      Q_OBJECT
+      
       virtual void closeEvent(QCloseEvent*);
 
    private slots:
diff --git a/muse2/muse/master/lmaster.h b/muse2/muse/master/lmaster.h
index 150e8236..b2919b23 100644
--- a/muse2/muse/master/lmaster.h
+++ b/muse2/muse/master/lmaster.h
@@ -114,13 +114,15 @@ class LMasterSigEventItem : public LMasterLViewItem {
 //---------------------------------------------------------
 
 class LMaster : public MidiEditor {
+      Q_OBJECT
+    
       QTreeWidget* view;
       QToolBar* tools;
       QMenu* menuEdit;
 
       enum { CMD_DELETE, CMD_INSERT_SIG, CMD_INSERT_TEMPO, CMD_EDIT_BEAT, CMD_EDIT_VALUE, CMD_INSERT_KEY };
 
-      Q_OBJECT
+      
       virtual void closeEvent(QCloseEvent*);
       void updateList();
       void insertTempo(const TEvent*);
diff --git a/muse2/muse/master/master.h b/muse2/muse/master/master.h
index 52040aeb..2415b15e 100644
--- a/muse2/muse/master/master.h
+++ b/muse2/muse/master/master.h
@@ -26,6 +26,7 @@ class ScrollScale;
 //---------------------------------------------------------
 
 class Master : public View {
+      Q_OBJECT
       enum DragMode { DRAG_OFF, DRAG_NEW, DRAG_MOVE_START, DRAG_MOVE,
             DRAG_DELETE, DRAG_COPY_START, DRAG_COPY,
             DRAG_RESIZE, DRAG_LASSO_START, DRAG_LASSO
@@ -37,7 +38,7 @@ class Master : public View {
       DragMode drag;
       MidiEditor* editor;
 
-      Q_OBJECT
+      
       virtual void pdraw(QPainter&, const QRect&);
       virtual void viewMouseMoveEvent(QMouseEvent* event);
       virtual void leaveEvent(QEvent*e);
diff --git a/muse2/muse/master/masteredit.h b/muse2/muse/master/masteredit.h
index 59a5ab05..b2b06291 100644
--- a/muse2/muse/master/masteredit.h
+++ b/muse2/muse/master/masteredit.h
@@ -40,6 +40,8 @@ class TempoLabel;
 //---------------------------------------------------------
 
 class MasterEdit : public MidiEditor {
+      Q_OBJECT
+    
       Master* canvas;
       ScrollScale* hscroll;
       ScrollScale* vscroll;
@@ -62,7 +64,7 @@ class MasterEdit : public MidiEditor {
       static int _widthInit, _heightInit;
       static QByteArray _toolbarInit;
 
-      Q_OBJECT
+      
       virtual void closeEvent(QCloseEvent*);
       virtual void resizeEvent(QResizeEvent*);
       virtual void focusOutEvent(QFocusEvent*);
diff --git a/muse2/muse/master/tscale.h b/muse2/muse/master/tscale.h
index 35fa39f2..d7ce86c9 100644
--- a/muse2/muse/master/tscale.h
+++ b/muse2/muse/master/tscale.h
@@ -15,8 +15,9 @@
 //---------------------------------------------------------
 
 class TScale : public View {
-      double curTempo;
       Q_OBJECT
+        
+      double curTempo;
 
       virtual void viewMouseMoveEvent(QMouseEvent* event);
       virtual void leaveEvent(QEvent*e);
diff --git a/muse2/muse/midictrl.cpp b/muse2/muse/midictrl.cpp
index 66f8d87e..4cf1886a 100644
--- a/muse2/muse/midictrl.cpp
+++ b/muse2/muse/midictrl.cpp
@@ -139,15 +139,85 @@ void initMidiController()
       }
 
 //---------------------------------------------------------
+//   midiCtrlNumString
+//---------------------------------------------------------
+
+QString midiCtrlNumString(int ctrl, bool fullyQualified)
+{
+      int h = (ctrl >> 8) & 0xff;
+      int l = ctrl & 0xff;
+      QString s1 = QString("%1").arg(h);
+      QString s2 = ( l == 0xff ? QString("* ") : QString("%1 ").arg(l) );
+      MidiController::ControllerType type = midiControllerType(ctrl);
+      switch (type)
+      {
+        case MidiController::Controller7:
+          if(fullyQualified)
+            return s2;
+          else  
+            return QString();
+        case MidiController::Controller14:
+          return s1 + QString("CF") + s2;
+        case MidiController::RPN:
+          return s1 + QString("R") + s2;
+        case MidiController::NRPN:
+          return s1 + QString("N") + s2;
+        case MidiController::Pitch:    // Don't show internal controller numbers. 
+          return QString();
+        case MidiController::Program:
+          return QString();
+        case MidiController::Velo:
+          return QString();
+        case MidiController::RPN14:
+          return s1 + QString("RF") + s2;
+        case MidiController::NRPN14:
+          return s1 + QString("NF") + s2;
+      }
+      return s1 + QString("?") + s2;
+}
+
+//---------------------------------------------------------
 //   midiCtrlName
 //---------------------------------------------------------
 
-QString midiCtrlName(int ctrl)
+QString midiCtrlName(int ctrl, bool fullyQualified)
+{
+      //if (ctrl < 0x10000)
+      //      return QString(ctrlName[ctrl]);
+      //return QString("?N?");
+      
+      // p4.0.25 Tim
+      int h = (ctrl >> 8) & 0xff;
+      int l = ctrl & 0xff;
+      QString s1 = QString("%1").arg(h);
+      QString s2 = ( l == 0xff ? QString("*") : QString("%1").arg(l) );
+      MidiController::ControllerType type = midiControllerType(ctrl);
+      switch (type)
       {
-      if (ctrl < 0x10000)
-            return QString(ctrlName[ctrl]);
-      return QString("?N?");
+        case MidiController::Controller7:
+          if(fullyQualified)
+            return s2 + QString(" ") + QString(ctrlName[l]);
+          else  
+            return QString(ctrlName[l]);
+        case MidiController::Controller14:
+          return s1 + QString("CF") + s2;
+        case MidiController::RPN:
+          return s1 + QString("R") + s2;
+        case MidiController::NRPN:
+          return s1 + QString("N") + s2;
+        case MidiController::Pitch:
+          return QString("Pitch");
+        case MidiController::Program:
+          return QString("Program");
+        case MidiController::Velo:
+          return QString("Velocity");
+        case MidiController::RPN14:
+          return s1 + QString("RF") + s2;
+        case MidiController::NRPN14:
+          return s1 + QString("NF") + s2;
       }
+      return s1 + QString("?") + s2;
+}
 
 //---------------------------------------------------------
 //   MidiController
diff --git a/muse2/muse/midictrl.h b/muse2/muse/midictrl.h
index 27f8e7be..3b18ba91 100644
--- a/muse2/muse/midictrl.h
+++ b/muse2/muse/midictrl.h
@@ -243,7 +243,8 @@ extern MidiController::ControllerType midiControllerType(int num);
 
 extern const QString& int2ctrlType(int n);
 extern MidiController::ControllerType ctrlType2Int(const QString& s);
-extern QString midiCtrlName(int ctrl);
+extern QString midiCtrlName(int ctrl, bool fullyQualified = false);
+extern QString midiCtrlNumString(int ctrl, bool fullyQualified = false);
 extern MidiController veloCtrl;
 
 
diff --git a/muse2/muse/mididev.cpp b/muse2/muse/mididev.cpp
index b5445b71..b13f571b 100644
--- a/muse2/muse/mididev.cpp
+++ b/muse2/muse/mididev.cpp
@@ -315,7 +315,7 @@ void MidiDevice::recordEvent(MidiRecordEvent& event)
 
       if (filterEvent(event, midiRecordType, false))
             return;
-      
+
       if (!applyMidiInputTransformation(event)) {
             if (midiInputTrace)
                   printf("   midi input transformation: event filtered\n");
@@ -323,13 +323,17 @@ void MidiDevice::recordEvent(MidiRecordEvent& event)
             }
 
       //
-      // transfer noteOn events to gui for step recording and keyboard
-      // remote control
+      // transfer noteOn and Off events to gui for step recording and keyboard
+      // remote control (changed by flo93: added noteOff-events)
       //
       if (typ == ME_NOTEON) {
             int pv = ((event.dataA() & 0xff)<<8) + (event.dataB() & 0xff);
             song->putEvent(pv);
             }
+      else if (typ == ME_NOTEOFF) {
+            int pv = ((event.dataA() & 0xff)<<8) + (0x00); //send an event with velo=0
+            song->putEvent(pv);
+            }
       
       ///if(_recBufFlipped)
       ///  _recordEvents2.add(event);     // add event to secondary list of recorded events
diff --git a/muse2/muse/midiedit/dcanvas.cpp b/muse2/muse/midiedit/dcanvas.cpp
index 61e98aea..92e514af 100644
--- a/muse2/muse/midiedit/dcanvas.cpp
+++ b/muse2/muse/midiedit/dcanvas.cpp
@@ -34,6 +34,7 @@
 #include "audio.h"
 #include "shortcuts.h"
 #include "icons.h"
+#include "functions.h"
 
 #define CARET   10
 #define CARET2   5
@@ -88,7 +89,11 @@ DrumCanvas::DrumCanvas(MidiEditor* pr, QWidget* parent, int sx,
       setVirt(false);
       cursorPos= QPoint(0,0);
       _stepSize=1;
+      
+      steprec=new StepRec(NULL);
+      
       songChanged(SC_TRACK_INSERTED);
+      connect(song, SIGNAL(midiNote(int, int)), SLOT(midiNote(int,int)));
       }
 
 //---------------------------------------------------------
@@ -538,26 +543,7 @@ int DrumCanvas::pitch2y(int pitch) const
 
 void DrumCanvas::cmd(int cmd)
       {
-      switch(cmd) {
-            case CMD_CUT:
-                  copy();
-                  song->startUndo();
-                  for (iCItem i = items.begin(); i != items.end(); ++i) {
-                        if (!i->second->isSelected())
-                              continue;
-                        DEvent* e = (DEvent*)(i->second);
-                        Event event = e->event();
-                        // Indicate no undo, and do not do port controller values and clone parts. 
-                        audio->msgDeleteEvent(event, e->part(), false, false, false);
-                        }
-                  song->endUndo(SC_EVENT_REMOVED);
-                  break;
-            case CMD_COPY:
-                  copy();
-                  break;
-            case CMD_PASTE:
-                  paste();
-                  break;
+      switch (cmd) {
             case CMD_SELECT_ALL:     // select all
                   for (iCItem k = items.begin(); k != items.end(); ++k) {
                         if (!k->second->isSelected())
@@ -698,41 +684,12 @@ void DrumCanvas::cmd(int cmd)
 
 
 //---------------------------------------------------------
-//   copy
-//    cut copy paste
-//---------------------------------------------------------
-
-void DrumCanvas::copy()
-      {
-      QMimeData* md = getTextDrag();
-      
-      if (md)
-            QApplication::clipboard()->setMimeData(md, QClipboard::Clipboard);
-      }
-
-
-//---------------------------------------------------------
-//   paste
-//    paste events
-//---------------------------------------------------------
-
-void DrumCanvas::paste()
-      {
-      QString stype("x-muse-eventlist");
-      
-      //QString s = QApplication::clipboard()->text(stype, QClipboard::Selection);  
-      QString s = QApplication::clipboard()->text(stype, QClipboard::Clipboard);  // TODO CHECK Tim.
-      
-      pasteAt(s, song->cpos());
-      }
-
-//---------------------------------------------------------
 //   startDrag
 //---------------------------------------------------------
 
 void DrumCanvas::startDrag(CItem* /* item*/, bool copymode)
       {
-      QMimeData* md = getTextDrag();
+      QMimeData* md = selected_events_to_mime(partlist_to_set(editor->parts()), 1);
       
       if (md) {
             // "Note that setMimeData() assigns ownership of the QMimeData object to the QDrag object. 
@@ -788,6 +745,10 @@ void DrumCanvas::keyPressed(int index, int velocity)
       // play note:
       MidiPlayEvent e(0, port, channel, 0x90, pitch, velocity);
       audio->msgPlayMidiEvent(&e);
+
+      if (_steprec && pos[0] >= start_tick && pos[0] < end_tick && curPart)
+				steprec->record(curPart,index,drumMap[index].len,editor->raster(),velocity,globalKeyState&Qt::ControlModifier,globalKeyState&Qt::ShiftModifier);
+            
       }
 
 //---------------------------------------------------------
@@ -818,7 +779,7 @@ void DrumCanvas::mapChanged(int spitch, int dpitch)
       
       typedef std::vector< std::pair<Part*, Event*> >::iterator idel_ev;
       typedef std::vector< std::pair<Part*, Event> >::iterator iadd_ev;
-            
+      
       MidiTrackList* tracks = song->midis();
       for (ciMidiTrack t = tracks->begin(); t != tracks->end(); t++) {
             MidiTrack* curTrack = *t;
@@ -1163,3 +1124,19 @@ void DrumCanvas::moveAwayUnused()
 		used.erase(it++);
 	}
 }
+
+
+//---------------------------------------------------------
+//   midiNote
+//---------------------------------------------------------
+void DrumCanvas::midiNote(int pitch, int velo)
+      {
+      if (debugMsg) printf("DrumCanvas::midiNote: pitch=%i, velo=%i\n", pitch, velo);
+
+      if (_midiin && _steprec && curPart
+         && !audio->isPlaying() && velo && pos[0] >= start_tick
+         && pos[0] < end_tick
+         && !(globalKeyState & Qt::AltModifier)) {
+					 steprec->record(curPart,drumInmap[pitch],drumMap[(int)drumInmap[pitch]].len,editor->raster(),velo,globalKeyState&Qt::ControlModifier,globalKeyState&Qt::ShiftModifier);
+         }
+      }
diff --git a/muse2/muse/midiedit/dcanvas.h b/muse2/muse/midiedit/dcanvas.h
index cc3b8fff..868113a6 100644
--- a/muse2/muse/midiedit/dcanvas.h
+++ b/muse2/muse/midiedit/dcanvas.h
@@ -10,6 +10,7 @@
 
 #include "ecanvas.h"
 #include "song.h"
+#include "steprec.h"
 
 #define TH 18
 
@@ -40,12 +41,15 @@ class PianoRoll;
 //---------------------------------------------------------
 
 class DrumCanvas : public EventCanvas {
-
+      Q_OBJECT
+      
+      StepRec* steprec;
+      
       // Cursor tool position
       QPoint cursorPos;
       int _stepSize;
 
-      Q_OBJECT
+      
       virtual void drawCanvas(QPainter&, const QRect&);
       virtual void drawItem(QPainter&, const CItem*, const QRect&);
       void drawTopItem(QPainter& p, const QRect& rect);
@@ -61,8 +65,6 @@ class DrumCanvas : public EventCanvas {
 
       int y2pitch(int y) const;
       int pitch2y(int pitch) const;
-      void copy();
-      void paste();
       void startDrag(CItem*, bool copymode);
       void dragEnterEvent(QDragEnterEvent* event);
       void dragMoveEvent(QDragMoveEvent*);
@@ -75,6 +77,9 @@ class DrumCanvas : public EventCanvas {
    signals:
       void newWidth(int);
 
+   private slots:
+      void midiNote(int pitch, int velo);
+      
    public slots:
       void mapChanged(int, int);
       void keyPressed(int, int);
diff --git a/muse2/muse/midiedit/dlist.cpp b/muse2/muse/midiedit/dlist.cpp
index 0b8bf3aa..66922e83 100644
--- a/muse2/muse/midiedit/dlist.cpp
+++ b/muse2/muse/midiedit/dlist.cpp
@@ -23,7 +23,6 @@
 #include "song.h"
 #include "scrollscale.h"
 
-
 //---------------------------------------------------------
 //   draw
 //---------------------------------------------------------
@@ -244,7 +243,7 @@ void DList::viewMousePressEvent(QMouseEvent* ev)
                         dm->mute = !dm->mute;
                   break;
             case COL_PORT:
-                  if (button == Qt::RightButton) {
+                  if ((button == Qt::RightButton) || (button == Qt::LeftButton)) {
                         bool changeAll = ev->modifiers() & Qt::ControlModifier;
                         devicesPopupMenu(dm, mapx(x), mapy(pitch * TH), changeAll);
                         }
@@ -296,7 +295,6 @@ void DList::viewMousePressEvent(QMouseEvent* ev)
                     if(val != dm->anote)
                     {
                       audio->msgIdle(true);
-                      //audio->msgRemapPortDrumCtlEvents(pitch, val, -1, -1);
                       song->remapPortDrumCtrlEvents(pitch, val, -1, -1);
                       audio->msgIdle(false);
                       dm->anote = val;
@@ -372,24 +370,7 @@ void DList::viewMousePressEvent(QMouseEvent* ev)
             case COL_NAME:
                   emit keyPressed(pitch, 100); //Mapping done on other side, send index
                   break;
-#if 0
-            case COL_CHANNEL:
-                  {
-                  int channel = t->channel();
-                  if (button == Qt::RightButton) {
-                        if (channel < 15)
-                              ++channel;
-                        }
-                  else if (button == Qt::MidButton) {
-                        if (channel > 0)
-                              --channel;
-                        }
-                  if (channel != t->channel()) {
-                        t->setChannel(channel);
-                        emit channelChanged();
-                        }
-                  }
-#endif
+
             default:
                   break;
             }
@@ -409,10 +390,13 @@ void DList::viewMouseDoubleClickEvent(QMouseEvent* ev)
       int section = header->logicalIndexAt(x);
 
       if ((section == COL_NAME || section == COL_VOL || section == COL_LEN || section == COL_LV1 ||
-         section == COL_LV2 || section == COL_LV3 || section == COL_LV4) && (ev->button() == Qt::LeftButton))
+         section == COL_LV2 || section == COL_LV3 || section == COL_LV4 || section == COL_CHANNEL ||
+         section == COL_QNT) && (ev->button() == Qt::LeftButton))
          {
            lineEdit(pitch, section);
          }
+      else if ((section == COL_ANOTE || section == COL_ENOTE) && (ev->button() == Qt::LeftButton))
+        pitchEdit(pitch, section);
       else
             viewMousePressEvent(ev);
       }
@@ -467,6 +451,14 @@ void DList::lineEdit(int line, int section)
                   case COL_LV4:
                   editor->setText(QString::number(dm->lv4));
                   break;
+
+                  case COL_QNT:
+                  editor->setText(QString::number(dm->quant));
+                  break;
+
+                  case COL_CHANNEL:
+                  editor->setText(QString::number(dm->channel+1));
+                  break;
             }
 
             editor->end(false);
@@ -479,6 +471,40 @@ void DList::lineEdit(int line, int section)
 
      }
 
+//---------------------------------------------------------
+//   pitchEdit
+//---------------------------------------------------------
+void DList::pitchEdit(int line, int section)
+      {
+            DrumMap* dm = &drumMap[line];
+            editEntry = dm;
+            if (pitch_editor == 0) {
+                  pitch_editor = new DPitchEdit(this);
+                  connect(pitch_editor, SIGNAL(editingFinished()),
+                     SLOT(pitchEdited()));
+                  pitch_editor->setFrame(true);
+                  }
+            int colx = mapx(header->sectionPosition(section));
+            int colw = rmapx(header->sectionSize(section));
+            int coly = mapy(line * TH);
+            int colh = rmapy(TH);
+            selectedColumn = section; //Store selected column to have an idea of which one was selected when return is pressed
+            switch (section) {
+                  case COL_ENOTE:
+                  pitch_editor->setValue(dm->enote);
+                  break;
+
+                  case COL_ANOTE:
+                  pitch_editor->setValue(dm->anote);
+                  break;
+            }
+
+            pitch_editor->setGeometry(colx, coly, colw, colh);
+            pitch_editor->show();
+            pitch_editor->setFocus();
+
+     }
+
 
 //---------------------------------------------------------
 //   x2col
@@ -534,22 +560,35 @@ void DList::returnPressed()
       {
             ///val = atoi(editor->text().ascii());
             val = atoi(editor->text().toAscii().constData());
-            if (selectedColumn != COL_LEN) 
+            
+            switch (selectedColumn)
             {
-              if(selectedColumn == COL_VOL)
-              {
+              case COL_VOL:
                   if (val > 200) //Check bounds for volume
                   val = 200;
                   if (val < 0)
                   val = 0;
-              }
-              else
-              {
+                  break;
+                  
+              case COL_LV1:
+              case COL_LV2:
+              case COL_LV3:
+              case COL_LV4:
                   if (val > 127) //Check bounds for lv1-lv4 values
                   val = 127;
                   if (val < 0)
                   val = 0;
-              }    
+                  break;
+                  
+              case COL_CHANNEL:
+                  val--;
+                  if (val >= 16)
+                  val = 15;
+                  if (val < 0)
+                  val = 0;
+                  break;
+                  
+              default: break;
             }  
       }     
 
@@ -583,6 +622,14 @@ void DList::returnPressed()
                   editEntry->lv4 = val;
                   break;
 
+            case COL_QNT:
+                  editEntry->quant = val;
+                  break;
+
+            case COL_CHANNEL:
+                  editEntry->channel = val;
+                  break;
+
             default:
                   printf("Return pressed in unknown column\n");
                   break;
@@ -595,6 +642,52 @@ void DList::returnPressed()
       }
 
 //---------------------------------------------------------
+//   pitchValueChanged
+//---------------------------------------------------------
+
+void DList::pitchEdited()
+{
+      int val=pitch_editor->value();
+      int pitch=(editEntry-drumMap);
+      
+      switch(selectedColumn) {
+            case COL_ANOTE:
+                    if(val != editEntry->anote)
+                    {
+                      audio->msgIdle(true);
+                      song->remapPortDrumCtrlEvents(pitch, val, -1, -1);
+                      audio->msgIdle(false);
+                      editEntry->anote = val;
+                      song->update(SC_DRUMMAP);
+                    }
+                  break;
+
+            case COL_ENOTE:
+                  //Check if there is any other drumMap with the same inmap value (there should be one (and only one):-)
+                  //If so, switch the inmap between the instruments
+                  for (int i=0; i<DRUM_MAPSIZE; i++) {
+                        if (drumMap[i].enote == val && &drumMap[i] != editEntry) {
+                              drumInmap[int(editEntry->enote)] = i;
+                              drumMap[i].enote = editEntry->enote;
+                              break;
+                              }
+                        }
+                  //TODO: Set all the notes on the track with pitch=dm->enote to pitch=val
+                  editEntry->enote = val;
+                  drumInmap[val] = pitch;
+                  break;
+            default:
+                  printf("Value changed in unknown column\n");
+                  break;
+            }
+      selectedColumn = -1;
+      pitch_editor->hide();
+      editEntry = 0;
+      setFocus();
+      redraw();
+      }
+
+//---------------------------------------------------------
 //   moved
 //---------------------------------------------------------
 
@@ -641,6 +734,7 @@ DList::DList(QHeaderView* h, QWidget* parent, int ymag)
       setFocusPolicy(Qt::StrongFocus);
       drag = NORMAL;
       editor = 0;
+      pitch_editor = 0;
       editEntry = 0;
       // always select a drum instrument
       currentlySelected = &drumMap[0];
@@ -696,9 +790,9 @@ void DList::viewMouseReleaseEvent(QMouseEvent* ev)
             emit mapChanged(sPitch, dPitch); //Track pitch change done in canvas
             }
       drag = NORMAL;
-//??      redraw();
-      if (editEntry)
-            editor->setFocus();
+//??      redraw();          //commented out NOT by flo93; was already commented out
+//      if (editEntry)            //removed by flo93; seems to work without it
+//            editor->setFocus(); //and causes segfaults after adding the pitchedits
       int x = ev->x();
       int y = ev->y();
       bool shift = ev->modifiers() & Qt::ShiftModifier;
diff --git a/muse2/muse/midiedit/dlist.h b/muse2/muse/midiedit/dlist.h
index f57b7501..00f21c55 100644
--- a/muse2/muse/midiedit/dlist.h
+++ b/muse2/muse/midiedit/dlist.h
@@ -11,6 +11,7 @@
 #include <QKeyEvent>
 #include <QLineEdit>
 
+#include "awl/pitchedit.h"
 #include "view.h"
 
 #define TH  18                // normal Track-hight
@@ -46,13 +47,35 @@ class DLineEdit: public QLineEdit
 };
 
 //---------------------------------------------------------
+//   DPitchEdit
+//---------------------------------------------------------
+class DPitchEdit: public Awl::PitchEdit
+{
+    public:
+      DPitchEdit(QWidget* parent) : PitchEdit(parent) {}
+      virtual ~DPitchEdit() {};
+      
+      virtual void keyPressEvent(QKeyEvent* keyItem) {
+            if ((keyItem->key() == Qt::Key_Escape) || (keyItem->key() == Qt::Key_Return)) {
+                parentWidget()->setFocus();
+                hide();
+                }
+            else
+               PitchEdit::keyPressEvent(keyItem);
+            }
+};
+
+//---------------------------------------------------------
 //   DList
 //---------------------------------------------------------
 
 class DList : public View {
+      Q_OBJECT
+    
       QHeaderView* header;
       ScrollScale* scroll;
       QLineEdit* editor;
+      DPitchEdit* pitch_editor;
       DrumMap* editEntry;
       DrumMap* currentlySelected;
       int selectedColumn;
@@ -71,12 +94,13 @@ class DList : public View {
 
       int x2col(int x) const;
       void devicesPopupMenu(DrumMap* t, int x, int y, bool changeAll);
-      Q_OBJECT
+      
       //void setCurDrumInstrument(int n);
 
    private slots:
       void sizeChange(int, int, int);
       void returnPressed();
+      void pitchEdited();
       void moved(int, int, int);
 
    signals:
@@ -91,6 +115,7 @@ class DList : public View {
       void songChanged(int);
    public:
       void lineEdit(int line, int section);
+      void pitchEdit(int line, int section);
       void setCurDrumInstrument(int n);
       DList(QHeaderView*, QWidget* parent, int ymag);
       ~DList();
diff --git a/muse2/muse/midiedit/drumedit.cpp b/muse2/muse/midiedit/drumedit.cpp
index 9e64d7a7..1e678432 100644
--- a/muse2/muse/midiedit/drumedit.cpp
+++ b/muse2/muse/midiedit/drumedit.cpp
@@ -302,7 +302,7 @@ DrumEdit::DrumEdit(PartList* pl, QWidget* parent, const char* name, unsigned ini
       midiin->setIcon(*midiinIcon);
       midiin->setCheckable(true);
       tools->addWidget(midiin);
-
+      
       
       tools2 = new EditToolBar(this, drumeditTools);
       addToolBar(tools2);
@@ -903,12 +903,27 @@ void DrumEdit::reset()
 void DrumEdit::cmd(int cmd)
       {
       switch(cmd) {
+            case DrumCanvas::CMD_CUT:
+                  copy_notes(partlist_to_set(parts()), 1);
+                  erase_notes(partlist_to_set(parts()), 1);
+                  break;
+            case DrumCanvas::CMD_COPY: copy_notes(partlist_to_set(parts()), 1); break;
+            case DrumCanvas::CMD_PASTE: 
+                  ((DrumCanvas*)canvas)->cmd(DrumCanvas::CMD_SELECT_NONE);
+                  paste_notes(canvas->part());
+                  break;
             case DrumCanvas::CMD_LOAD: load(); break;
             case DrumCanvas::CMD_SAVE: save(); break;
             case DrumCanvas::CMD_RESET: reset(); break;
             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: quantize_notes(partlist_to_set(parts())); break;
+            case DrumCanvas::CMD_QUANTIZE:
+                  if (quantize_dialog->exec())
+                        quantize_notes(partlist_to_set(parts()), quantize_dialog->range, 
+                                       (config.division*4)/(1<<quantize_dialog->raster_power2),
+                                       /* 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 30fe8487..64390cd9 100644
--- a/muse2/muse/midiedit/drumedit.h
+++ b/muse2/muse/midiedit/drumedit.h
@@ -49,6 +49,8 @@ class SNode;
 //---------------------------------------------------------
 
 class DrumEdit : public MidiEditor {
+      Q_OBJECT
+    
       Event selEvent;
       MidiPart* selPart;
       int selTick;
@@ -79,7 +81,7 @@ class DrumEdit : public MidiEditor {
       QAction *sallAction, *snoneAction, *invAction, *inAction , *outAction;
       QAction *prevAction, *nextAction;
 
-      Q_OBJECT
+      
       void initShortcuts();
 
       virtual void closeEvent(QCloseEvent*);
diff --git a/muse2/muse/midiedit/ecanvas.cpp b/muse2/muse/midiedit/ecanvas.cpp
index 9ce84147..ef47e0d6 100644
--- a/muse2/muse/midiedit/ecanvas.cpp
+++ b/muse2/muse/midiedit/ecanvas.cpp
@@ -25,6 +25,7 @@
 #include "event.h"
 #include "shortcuts.h"
 #include "audio.h"
+#include "functions.h"
 
 //---------------------------------------------------------
 //   EventCanvas
@@ -364,137 +365,6 @@ void EventCanvas::keyPress(QKeyEvent* event)
             event->ignore();
       }
 
-//---------------------------------------------------------
-//   getTextDrag
-//---------------------------------------------------------
-
-//QDrag* EventCanvas::getTextDrag(QWidget* parent)
-QMimeData* EventCanvas::getTextDrag()
-      {
-      //---------------------------------------------------
-      //   generate event list from selected events
-      //---------------------------------------------------
-
-      EventList el;
-      unsigned startTick = MAXINT;
-      for (iCItem i = items.begin(); i != items.end(); ++i) {
-            if (!i->second->isSelected())
-                  continue;
-            ///NEvent* ne = (NEvent*)(i->second);
-            CItem* ne = i->second;
-            Event e   = ne->event();
-            if (startTick == MAXINT)
-                  startTick = e.tick();
-            el.add(e);
-            }
-
-      //---------------------------------------------------
-      //    write events as XML into tmp file
-      //---------------------------------------------------
-
-      FILE* tmp = tmpfile();
-      if (tmp == 0) {
-            fprintf(stderr, "EventCanvas::getTextDrag() fopen failed: %s\n",
-               strerror(errno));
-            return 0;
-            }
-      Xml xml(tmp);
-
-      int level = 0;
-      xml.tag(level++, "eventlist");
-      for (ciEvent e = el.begin(); e != el.end(); ++e)
-            e->second.write(level, xml, -startTick);
-      xml.etag(--level, "eventlist");
-
-      //---------------------------------------------------
-      //    read tmp file into drag Object
-      //---------------------------------------------------
-
-      fflush(tmp);
-      struct stat f_stat;
-      if (fstat(fileno(tmp), &f_stat) == -1) {
-            fprintf(stderr, "PianoCanvas::copy() fstat failes:<%s>\n",
-               strerror(errno));
-            fclose(tmp);
-            return 0;
-            }
-      int n = f_stat.st_size;
-      char* fbuf  = (char*)mmap(0, n+1, PROT_READ|PROT_WRITE,
-         MAP_PRIVATE, fileno(tmp), 0);
-      fbuf[n] = 0;
-      
-      QByteArray data(fbuf);
-      QMimeData* md = new QMimeData();
-      //QDrag* drag = new QDrag(parent);
-      
-      md->setData("text/x-muse-eventlist", data);
-      //drag->setMimeData(md);
-      
-      munmap(fbuf, n);
-      fclose(tmp);
-      
-      //return drag;
-      return md;
-      }
-
-//---------------------------------------------------------
-//   pasteAt
-//---------------------------------------------------------
-
-void EventCanvas::pasteAt(const QString& pt, int pos)
-      {
-      QByteArray ba = pt.toLatin1();
-      const char* p = ba.constData();
-      Xml xml(p);
-      for (;;) {
-            Xml::Token token = xml.parse();
-            const QString& tag = xml.s1();
-            switch (token) {
-                  case Xml::Error:
-                  case Xml::End:
-                        return;
-                  case Xml::TagStart:
-                        if (tag == "eventlist") {
-                              Undo operations;
-                              EventList* el = new EventList();
-                              el->read(xml, "eventlist", true);
-                              int modified = SC_EVENT_INSERTED;
-                              for (iEvent i = el->begin(); i != el->end(); ++i) {
-                                    Event e = i->second;
-                                    int tick = e.tick() + pos - curPart->tick();
-                                    if (tick<0) {
-                                            printf("ERROR: trying to add event before current part!\n");
-                                            delete el;
-                                            return;
-                                            }
-
-                                    e.setTick(tick);
-                                    int diff = e.endTick()-curPart->lenTick();
-                                    if (diff > 0)  {// too short part? extend it
-                                            Part* newPart = curPart->clone();
-                                            newPart->setLenTick(newPart->lenTick()+diff);
-                                            // Do port controller values but not clone parts. 
-                                            operations.push_back(UndoOp(UndoOp::ModifyPart, curPart, newPart, true, false));
-                                            modified=modified|SC_PART_MODIFIED;
-                                            curPart = newPart; // reassign
-                                            }
-                                    // Do not do port controller values and clone parts. 
-                                    operations.push_back(UndoOp(UndoOp::AddEvent, e, curPart, false, false));
-                                    }
-                              song->applyOperationGroup(operations);
-                              delete el;
-                              return;
-                              }
-                        else
-                              xml.unknown("pasteAt");
-                        break;
-                  case Xml::Attribut:
-                  case Xml::TagEnd:
-                  default:
-                        break;
-                  }
-            }
-      }
 
 //---------------------------------------------------------
 //   dropEvent
@@ -515,7 +385,7 @@ void EventCanvas::viewDropEvent(QDropEvent* event)
             int x = editor->rasterVal(event->pos().x());
             if (x < 0)
                   x = 0;
-            pasteAt(text, x);
+            paste_at(curPart, text, x);
             //event->accept();  // TODO
             }
       else {
diff --git a/muse2/muse/midiedit/ecanvas.h b/muse2/muse/midiedit/ecanvas.h
index b3275607..b847f0f9 100644
--- a/muse2/muse/midiedit/ecanvas.h
+++ b/muse2/muse/midiedit/ecanvas.h
@@ -80,9 +80,6 @@ class EventCanvas : public Canvas {
       void range(int* s, int* e) const { *s = start_tick; *e = end_tick; }
       void playEvents(bool flag) { _playEvents = flag; }
       void selectAtTick(unsigned int tick);
-      //QDrag* getTextDrag(QWidget* parent);
-      QMimeData* getTextDrag();
-      void pasteAt(const QString& pt, int pos);
       void viewDropEvent(QDropEvent* event);
       virtual void modifySelected(NoteInfo::ValType, int) {}
       virtual void keyPress(QKeyEvent*);
diff --git a/muse2/muse/midiedit/piano.h b/muse2/muse/midiedit/piano.h
index 35106d64..f8deec52 100644
--- a/muse2/muse/midiedit/piano.h
+++ b/muse2/muse/midiedit/piano.h
@@ -23,6 +23,8 @@ class QPixmap;
 
 class Piano : public View
       {
+      Q_OBJECT
+    
       int curPitch;
       QPixmap* octave;
       QPixmap* c_keys[10];
@@ -34,7 +36,7 @@ class Piano : public View
       bool shift;
       int button;
 
-      Q_OBJECT
+      
       int y2pitch(int) const;
       int pitch2y(int) const;
       void viewMouseMoveEvent(QMouseEvent* event);
diff --git a/muse2/muse/midiedit/pianoroll.cpp b/muse2/muse/midiedit/pianoroll.cpp
index 9105a446..b2fe55ee 100644
--- a/muse2/muse/midiedit/pianoroll.cpp
+++ b/muse2/muse/midiedit/pianoroll.cpp
@@ -198,11 +198,11 @@ PianoRoll::PianoRoll(PartList* pl, QWidget* parent, const char* name, unsigned i
       mapper->setMapping(funcTransposeAction, PianoCanvas::CMD_TRANSPOSE);
       connect(funcTransposeAction, SIGNAL(triggered()), mapper, SLOT(map()));
             
-      funcEraseEventAction = menuFunctions->addAction(tr("Erase Event"));
+      funcEraseEventAction = menuFunctions->addAction(tr("Erase Events"));
       mapper->setMapping(funcEraseEventAction, PianoCanvas::CMD_ERASE_EVENT);
       connect(funcEraseEventAction, SIGNAL(triggered()), mapper, SLOT(map()));
       
-      funcNoteShiftAction = menuFunctions->addAction(tr("Note Shift"));
+      funcNoteShiftAction = menuFunctions->addAction(tr("Move Notes"));
       mapper->setMapping(funcNoteShiftAction, PianoCanvas::CMD_NOTE_SHIFT);
       connect(funcNoteShiftAction, SIGNAL(triggered()), mapper, SLOT(map()));
             
@@ -213,7 +213,12 @@ PianoRoll::PianoRoll(PartList* pl, QWidget* parent, const char* name, unsigned i
       funcDelOverlapsAction = menuFunctions->addAction(tr("Delete Overlaps"));
       mapper->setMapping(funcDelOverlapsAction, PianoCanvas::CMD_DELETE_OVERLAPS);
       connect(funcDelOverlapsAction, SIGNAL(triggered()), mapper, SLOT(map()));
-      
+
+      QAction* funcLegatoAction = menuFunctions->addAction(tr("Legato"));
+      mapper->setMapping(funcLegatoAction, PianoCanvas::CMD_LEGATO);
+      connect(funcLegatoAction, SIGNAL(triggered()), mapper, SLOT(map()));
+            
+                  
       menuPlugins = menuBar()->addMenu(tr("&Plugins"));
       song->populateScriptMenu(menuPlugins, this);
 
@@ -600,6 +605,15 @@ void PianoRoll::cmd(int cmd)
       {
 			switch (cmd)
 						{
+            case PianoCanvas::CMD_CUT:
+                  copy_notes(partlist_to_set(parts()), 1);
+                  erase_notes(partlist_to_set(parts()), 1);
+                  break;
+            case PianoCanvas::CMD_COPY: copy_notes(partlist_to_set(parts()), 1); break;
+            case PianoCanvas::CMD_PASTE: 
+                              ((PianoCanvas*)canvas)->cmd(PianoCanvas::CMD_SELECT_NONE);
+                              paste_notes(canvas->part());
+                              break;
 						case PianoCanvas::CMD_MODIFY_GATE_TIME: modify_notelen(partlist_to_set(parts())); break;
 						case PianoCanvas::CMD_MODIFY_VELOCITY: modify_velocity(partlist_to_set(parts())); break;
 						case PianoCanvas::CMD_CRESCENDO: crescendo(partlist_to_set(parts())); break;
@@ -610,6 +624,7 @@ void PianoRoll::cmd(int cmd)
 						case PianoCanvas::CMD_NOTE_SHIFT: move_notes(partlist_to_set(parts())); break;
 						case PianoCanvas::CMD_FIXED_LEN: set_notelen(partlist_to_set(parts())); break;
 						case PianoCanvas::CMD_DELETE_OVERLAPS: delete_overlaps(partlist_to_set(parts())); break;
+						case PianoCanvas::CMD_LEGATO: legato(partlist_to_set(parts())); break;
 						
 						default: ((PianoCanvas*)canvas)->cmd(cmd);
 					  }
diff --git a/muse2/muse/midiedit/pianoroll.h b/muse2/muse/midiedit/pianoroll.h
index 58c2487a..1f53254d 100644
--- a/muse2/muse/midiedit/pianoroll.h
+++ b/muse2/muse/midiedit/pianoroll.h
@@ -51,6 +51,8 @@ class QScrollArea;
 //---------------------------------------------------------
 
 class PianoRoll : public MidiEditor {
+      Q_OBJECT
+    
       Event selEvent;
       MidiPart* selPart;
       int selTick;
@@ -125,7 +127,7 @@ class PianoRoll : public MidiEditor {
       //QScrollBar* infoScroll;
       QScrollArea* infoScroll;
 
-      Q_OBJECT
+      
       void initShortcuts();
       void setEventColorMode(int);
       QWidget* genToolbar(QWidget* parent);
diff --git a/muse2/muse/midiedit/prcanvas.cpp b/muse2/muse/midiedit/prcanvas.cpp
index 05fe8252..091582ef 100644
--- a/muse2/muse/midiedit/prcanvas.cpp
+++ b/muse2/muse/midiedit/prcanvas.cpp
@@ -15,6 +15,8 @@
 #include <QDropEvent>
 #include <QMouseEvent>
 
+#include <set>
+
 #include <values.h>
 #include <stdio.h>
 #include <math.h>
@@ -84,14 +86,10 @@ PianoCanvas::PianoCanvas(MidiEditor* pr, QWidget* parent, int sx, int sy)
       {
       colorMode = 0;
       playedPitch = -1;
+      for (int i=0;i<128;i++) noteHeldDown[i]=false;
       
-      chordTimer = new QTimer(this);
-      chordTimer->setSingleShot(true);
-      chordTimer->setInterval(CHORD_TIMEOUT);
-      chordTimer->stop();
+      steprec=new StepRec(noteHeldDown);
       
-      connect(chordTimer, SIGNAL(timeout()), SLOT(chordTimerTimedOut()));
-
       songChanged(SC_TRACK_INSERTED);
       connect(song, SIGNAL(midiNote(int, int)), SLOT(midiNote(int,int)));
       }
@@ -669,28 +667,10 @@ void PianoCanvas::pianoPressed(int pitch, int velocity, bool shift)
       // play note:
       MidiPlayEvent e(0, port, channel, 0x90, pitch, velocity);
       audio->msgPlayMidiEvent(&e);
-
-      if (_steprec && pos[0] >= start_tick && pos[0] < end_tick) {
-         if (curPart) {
-            int len  = editor->raster();
-            unsigned tick = pos[0] - curPart->tick(); //CDW
-            if (shift)
-                  tick -= editor->rasterStep(tick);
-            Event e(Note);
-            e.setTick(tick);
-            e.setPitch(pitch);
-            e.setVelo(127);
-            e.setLenTick(len);
-            // Indicate do undo, and do not do port controller values and clone parts. 
-            audio->msgAddEvent(e, curPart, true, false, false);
-            tick += editor->rasterStep(tick) + curPart->tick();
-            if (tick != song->cpos()) {
-                  Pos p(tick, true);
-                  song->setPos(0, p, true, false, true);
-                  }
-            }
+      
+      if (_steprec && pos[0] >= start_tick && pos[0] < end_tick && curPart) {
+				 steprec->record(curPart,pitch,editor->raster(),editor->raster(),velocity,globalKeyState&Qt::ControlModifier,shift);
          }
-            
       }
 
 //---------------------------------------------------------
@@ -796,16 +776,6 @@ void PianoCanvas::drawCanvas(QPainter& p, const QRect& rect)
 void PianoCanvas::cmd(int cmd)
       {
       switch (cmd) {
-            case CMD_CUT:
-                  copy();
-                  erase_notes(partlist_to_set(editor->parts()),1); //FINDMICH is this correct? or must i do this on current_part?
-                  break;
-            case CMD_COPY:
-                  copy();
-                  break;
-            case CMD_PASTE:
-                  paste();
-                  break;
             case CMD_SELECT_ALL:     // select all
                   for (iCItem k = items.begin(); k != items.end(); ++k) {
                         if (!k->second->isSelected())
@@ -904,125 +874,40 @@ void PianoCanvas::cmd(int cmd)
 //---------------------------------------------------------
 //   midiNote
 //---------------------------------------------------------
-
 void PianoCanvas::midiNote(int pitch, int velo)
       {
-      if (_midiin && _steprec && curPart
-         && !audio->isPlaying() && velo && pos[0] >= start_tick
-         && pos[0] < end_tick
-         && !(globalKeyState & Qt::AltModifier)) {
-					  chordTimer->stop();
-					  
-					  //len has been changed by flo: set to raster() instead of quant()
-					  //reason: the quant-toolbar has been removed; the flexibility you
-					  //lose with this can be re-gained by applying a "modify note len"
-					  //on the notes you have entered.
-            unsigned int len   = editor->raster();//prevent compiler warning: comparison singed/unsigned
-            unsigned tick      = pos[0]; //CDW
-            unsigned starttick = tick;
-
-            //
-            // extend len of last note?
-            //
-            EventList* events = curPart->events();
-            if (globalKeyState & Qt::ControlModifier) {
-                  for (iEvent i = events->begin(); i != events->end(); ++i) {
-                        Event ev = i->second;
-                        if (!ev.isNote())
-                              continue;
-                        if (ev.pitch() == pitch && ((ev.tick() + ev.lenTick()) == /*(int)*/starttick)) {
-                              Event e = ev.clone();
-                              e.setLenTick(ev.lenTick() + editor->rasterStep(starttick));
-                              // Indicate do undo, and do not do port controller values and clone parts. 
-                              audio->msgChangeEvent(ev, e, curPart, true, false, false);
-                              
-                              if (! (globalKeyState & Qt::ShiftModifier)) {
-                                    chordTimer_setToTick = tick + editor->rasterStep(tick);
-                                    chordTimer->start();
-                                    }
-                              return;
-                              }
-                        }
-                  }
+      if (debugMsg) printf("PianoCanvas::midiNote: pitch=%i, velo=%i\n", pitch, velo);
 
-            //
-            // if we already entered the note, delete it
-            //
-            EventRange range = events->equal_range(tick);
-            for (iEvent i = range.first; i != range.second; ++i) {
-                  Event ev = i->second;
-                  if (ev.isNote() && ev.pitch() == pitch) {
-                        // Indicate do undo, and do not do port controller values and clone parts. 
-                        audio->msgDeleteEvent(ev, curPart, true, false, false);
-
-                        if (! (globalKeyState & Qt::ShiftModifier)) {
-                              chordTimer_setToTick = tick + editor->rasterStep(tick);
-                              chordTimer->start();
-                              }
-                        
-                        return;
-                        }
-                  }
-            Event e(Note);
-            e.setTick(tick - curPart->tick());
-            e.setPitch(pitch);
-            e.setVelo(velo);
-            e.setLenTick(len);
-            // Indicate do undo, and do not do port controller values and clone parts. 
-            audio->msgAddEvent(e, curPart, true, false, false);
-            
-            if (! (globalKeyState & Qt::ShiftModifier)) {
-                  chordTimer_setToTick = tick + editor->rasterStep(tick);
-                  chordTimer->start();
-                  }
-            }
-      }
-
-void PianoCanvas::chordTimerTimedOut()
-{
-	if (chordTimer_setToTick != song->cpos())
-	{
-		Pos p(chordTimer_setToTick, true);
-		song->setPos(0, p, true, false, true);
-	}
-}
-
-//---------------------------------------------------------
-//   copy
-//    cut copy paste
-//---------------------------------------------------------
+      if (velo)
+        noteHeldDown[pitch]=true;
+      else
+        noteHeldDown[pitch]=false;
 
-void PianoCanvas::copy()
+      if (heavyDebugMsg)
       {
-      //QDrag* drag = getTextDrag();
-      QMimeData* drag = getTextDrag();
-      
-      if (drag)
-            QApplication::clipboard()->setMimeData(drag, QClipboard::Clipboard);
+        printf("  held down notes are: ");
+        for (int i=0;i<128;i++)
+          if (noteHeldDown[i])
+            printf("%i ",i);
+        printf("\n");
       }
-
-//---------------------------------------------------------
-//   paste
-//    paste events
-//---------------------------------------------------------
-
-void PianoCanvas::paste()
-      {
-      QString stype("x-muse-eventlist");
-      
-      //QString s = QApplication::clipboard()->text(stype, QClipboard::Selection);
-      QString s = QApplication::clipboard()->text(stype, QClipboard::Clipboard);  // TODO CHECK Tim.
       
-      pasteAt(s, song->cpos());
+      if (_midiin && _steprec && curPart
+         && !audio->isPlaying() && velo && pos[0] >= start_tick
+         && pos[0] < end_tick
+         && !(globalKeyState & Qt::AltModifier)) {
+					 steprec->record(curPart,pitch,editor->raster(),editor->raster(),velo,globalKeyState&Qt::ControlModifier,globalKeyState&Qt::ShiftModifier);
+         }
       }
 
+
 //---------------------------------------------------------
 //   startDrag
 //---------------------------------------------------------
 
 void PianoCanvas::startDrag(CItem* /* item*/, bool copymode)
       {
-      QMimeData* md = getTextDrag();
+      QMimeData* md = selected_events_to_mime(partlist_to_set(editor->parts()), 1);
       
       if (md) {
             // "Note that setMimeData() assigns ownership of the QMimeData object to the QDrag object. 
diff --git a/muse2/muse/midiedit/prcanvas.h b/muse2/muse/midiedit/prcanvas.h
index 7c77b229..c6e47c9e 100644
--- a/muse2/muse/midiedit/prcanvas.h
+++ b/muse2/muse/midiedit/prcanvas.h
@@ -17,6 +17,8 @@
 #include <QDragLeaveEvent>
 #include <QTimer>
 
+#include "steprec.h"
+
 #define KH        13
 
 //---------------------------------------------------------
@@ -38,13 +40,16 @@ class QRect;
 //---------------------------------------------------------
 
 class PianoCanvas : public EventCanvas {
+      Q_OBJECT
+    
       int colorMode;
       int playedPitch;
       
-      QTimer* chordTimer;
-      unsigned chordTimer_setToTick;
+      bool noteHeldDown[128];
+      
+      StepRec* steprec;
 
-      Q_OBJECT
+      
       virtual void viewMouseDoubleClickEvent(QMouseEvent*);
       virtual void drawItem(QPainter&, const CItem*, const QRect&);
       void drawTopItem(QPainter &p, const QRect &rect);
@@ -64,8 +69,6 @@ class PianoCanvas : public EventCanvas {
       int y2pitch(int) const;
       int pitch2y(int) const;
       virtual void drawCanvas(QPainter&, const QRect&);
-      void copy();
-      void paste();
       virtual void itemPressed(const CItem*);
       virtual void itemReleased(const CItem*, const QPoint&);
       virtual void itemMoved(const CItem*, const QPoint&);
@@ -74,7 +77,6 @@ class PianoCanvas : public EventCanvas {
 
    private slots:
       void midiNote(int pitch, int velo);
-      void chordTimerTimedOut();
 
    signals:
       void quantChanged(int);
@@ -96,7 +98,7 @@ class PianoCanvas : public EventCanvas {
          CMD_TRANSPOSE, CMD_THIN_OUT, CMD_ERASE_EVENT,
          CMD_NOTE_SHIFT, CMD_MOVE_CLOCK, CMD_COPY_MEASURE,
          CMD_ERASE_MEASURE, CMD_DELETE_MEASURE, CMD_CREATE_MEASURE,
-         CMD_FIXED_LEN, CMD_DELETE_OVERLAPS
+         CMD_FIXED_LEN, CMD_DELETE_OVERLAPS, CMD_LEGATO
          };
 
       PianoCanvas(MidiEditor*, QWidget*, int, int);
diff --git a/muse2/muse/midiedit/scoreedit.cpp b/muse2/muse/midiedit/scoreedit.cpp
index 7f7382f4..0eb61554 100644
--- a/muse2/muse/midiedit/scoreedit.cpp
+++ b/muse2/muse/midiedit/scoreedit.cpp
@@ -51,13 +51,13 @@ using namespace std;
 #include "icons.h"
 #include "audio.h"
 #include "functions.h"
-
+#include "helper.h"
 #include "cmd.h"
 #include "sig.h"
 #include "song.h"
+#include "shortcuts.h"
 
 //#include "../ctrl/ctrledit.h"
-//#include "shortcuts.h"
 
 
 string IntToStr(int i);
@@ -211,6 +211,16 @@ ScoreEdit::ScoreEdit(QWidget* parent, const char* name, unsigned initPos)
 	undo_tools->addActions(undoRedo->actions());
 	addToolBar(undo_tools);
 
+	QToolBar* steprec_tools=addToolBar(tr("Step recording tools"));
+	steprec_tools->setObjectName("Step recording tools");
+	srec  = new QToolButton();
+	srec->setToolTip(tr("Step Record"));
+	srec->setIcon(*steprecIcon);
+	srec->setCheckable(true);
+	steprec_tools->addWidget(srec);
+	connect(srec, SIGNAL(toggled(bool)), score_canvas, SLOT(set_steprec(bool)));
+
+
 	edit_tools = new EditToolBar(this, PointerTool | PencilTool | RubberTool);
 	addToolBar(edit_tools);
 	edit_tools->set(PointerTool);
@@ -323,9 +333,59 @@ ScoreEdit::ScoreEdit(QWidget* parent, const char* name, unsigned initPos)
 	quant_toolbar->addWidget(px_per_whole_spinbox);
 	px_per_whole_spinbox->setValue(300);
 
+	QMenu* edit_menu = menuBar()->addMenu(tr("&Edit"));      
+
+		edit_menu->addActions(undoRedo->actions());
+		edit_menu->addSeparator();
+
+		cut_action = edit_menu->addAction(QIcon(*editcutIconSet), tr("C&ut"));
+		menu_mapper->setMapping(cut_action, CMD_CUT);
+		connect(cut_action, SIGNAL(triggered()), menu_mapper, SLOT(map()));
+
+		copy_action = edit_menu->addAction(QIcon(*editcopyIconSet), tr("&Copy"));
+		menu_mapper->setMapping(copy_action, CMD_COPY);
+		connect(copy_action, SIGNAL(triggered()), menu_mapper, SLOT(map()));
+
+		paste_action = edit_menu->addAction(QIcon(*editpasteIconSet), tr("&Paste"));
+		menu_mapper->setMapping(paste_action, CMD_PASTE);
+		connect(paste_action, SIGNAL(triggered()), menu_mapper, SLOT(map()));
+
+		edit_menu->addSeparator();
+
+		del_action = edit_menu->addAction(tr("Delete &Events"));
+		menu_mapper->setMapping(del_action, CMD_DEL);
+		connect(del_action, SIGNAL(triggered()), menu_mapper, SLOT(map()));
+
+		edit_menu->addSeparator();
+
+		QMenu* select_menu = edit_menu->addMenu(QIcon(*selectIcon), tr("&Select"));
+
+			select_all_action = select_menu->addAction(QIcon(*select_allIcon), tr("Select &All"));
+			menu_mapper->setMapping(select_all_action, CMD_SELECT_ALL);
+			connect(select_all_action, SIGNAL(triggered()), menu_mapper, SLOT(map()));
+
+			select_none_action = select_menu->addAction(QIcon(*select_deselect_allIcon), tr("&Deselect All"));
+			menu_mapper->setMapping(select_none_action, CMD_SELECT_NONE);
+			connect(select_none_action, SIGNAL(triggered()), menu_mapper, SLOT(map()));
+
+			select_invert_action = select_menu->addAction(QIcon(*select_invert_selectionIcon), tr("Invert &Selection"));
+			menu_mapper->setMapping(select_invert_action, CMD_SELECT_INVERT);
+			connect(select_invert_action, SIGNAL(triggered()), menu_mapper, SLOT(map()));
+
+			select_menu->addSeparator();
+
+			select_iloop_action = select_menu->addAction(QIcon(*select_inside_loopIcon), tr("&Inside Loop"));
+			menu_mapper->setMapping(select_iloop_action, CMD_SELECT_ILOOP);
+			connect(select_iloop_action, SIGNAL(triggered()), menu_mapper, SLOT(map()));
+
+			select_oloop_action = select_menu->addAction(QIcon(*select_outside_loopIcon), tr("&Outside Loop"));
+			menu_mapper->setMapping(select_oloop_action, CMD_SELECT_OLOOP);
+			connect(select_oloop_action, SIGNAL(triggered()), menu_mapper, SLOT(map()));
+
+
 	QMenu* settings_menu = menuBar()->addMenu(tr("&Settings"));      
 
-		QMenu* color_menu = settings_menu->addMenu(tr("Note head &colors"));
+		color_menu = settings_menu->addMenu(tr("Note head &colors"));
 			color_actions = new QActionGroup(this);
 			color_black_action = color_menu->addAction(tr("&Black"), menu_mapper, SLOT(map()));
 			color_velo_action =  color_menu->addAction(tr("&Velocity"), menu_mapper, SLOT(map()));
@@ -361,14 +421,36 @@ ScoreEdit::ScoreEdit(QWidget* parent, const char* name, unsigned initPos)
 
   QMenu* functions_menu = menuBar()->addMenu(tr("&Functions"));      
 	
-		QAction* func_quantize_action = functions_menu->addAction(tr("&Quantize"), menu_mapper, SLOT(map()));
-		QAction* func_notelen_action = functions_menu->addAction(tr("Change note &length"), menu_mapper, SLOT(map()));
-		QAction* func_velocity_action = functions_menu->addAction(tr("Change note &velocity"), menu_mapper, SLOT(map()));
-		QAction* func_cresc_action = functions_menu->addAction(tr("Crescendo/Decrescendo"), menu_mapper, SLOT(map()));
+		func_quantize_action = functions_menu->addAction(tr("&Quantize"), menu_mapper, SLOT(map()));
+		func_notelen_action = functions_menu->addAction(tr("Change note &length"), menu_mapper, SLOT(map()));
+		func_velocity_action = functions_menu->addAction(tr("Change note &velocity"), menu_mapper, SLOT(map()));
+		func_cresc_action = functions_menu->addAction(tr("Crescendo/Decrescendo"), menu_mapper, SLOT(map()));
+		func_transpose_action = functions_menu->addAction(tr("Transpose"), menu_mapper, SLOT(map()));
+		func_erase_action = functions_menu->addAction(tr("Erase Events"), menu_mapper, SLOT(map()));
+		func_move_action = functions_menu->addAction(tr("Move Notes"), menu_mapper, SLOT(map()));
+		func_fixed_len_action = functions_menu->addAction(tr("Set Fixed Length"), menu_mapper, SLOT(map()));
+		func_del_overlaps_action = functions_menu->addAction(tr("Delete Overlaps"), menu_mapper, SLOT(map()));
+		func_legato_action = functions_menu->addAction(tr("Legato"), menu_mapper, SLOT(map()));
 		menu_mapper->setMapping(func_quantize_action, CMD_QUANTIZE);
 		menu_mapper->setMapping(func_notelen_action, CMD_NOTELEN);
 		menu_mapper->setMapping(func_velocity_action, CMD_VELOCITY);
 		menu_mapper->setMapping(func_cresc_action, CMD_CRESCENDO);
+		menu_mapper->setMapping(func_transpose_action, CMD_TRANSPOSE);
+		menu_mapper->setMapping(func_erase_action, CMD_ERASE);
+		menu_mapper->setMapping(func_move_action, CMD_MOVE);
+		menu_mapper->setMapping(func_fixed_len_action, CMD_FIXED_LEN);
+		menu_mapper->setMapping(func_del_overlaps_action, CMD_DELETE_OVERLAPS);
+		menu_mapper->setMapping(func_legato_action, CMD_LEGATO);
+	
+	init_shortcuts();
+	
+	connect(muse, SIGNAL(configChanged()), SLOT(init_shortcuts()));
+
+	QClipboard* cb = QApplication::clipboard();
+	connect(cb, SIGNAL(dataChanged()), SLOT(clipboard_changed()));
+	
+	clipboard_changed();
+	selection_changed();
 
 	if (!default_toolbar_state.isEmpty())
 		restoreState(default_toolbar_state);
@@ -387,6 +469,32 @@ ScoreEdit::ScoreEdit(QWidget* parent, const char* name, unsigned initPos)
 	apply_velo=true;
 }
 
+void ScoreEdit::init_shortcuts()
+{
+	cut_action->setShortcut(shortcuts[SHRT_CUT].key);
+	copy_action->setShortcut(shortcuts[SHRT_COPY].key);
+	paste_action->setShortcut(shortcuts[SHRT_PASTE].key);
+	del_action->setShortcut(shortcuts[SHRT_DELETE].key);
+
+	select_all_action->setShortcut(shortcuts[SHRT_SELECT_ALL].key); 
+	select_none_action->setShortcut(shortcuts[SHRT_SELECT_NONE].key);
+	select_invert_action->setShortcut(shortcuts[SHRT_SELECT_INVERT].key);
+	select_iloop_action->setShortcut(shortcuts[SHRT_SELECT_ILOOP].key);
+	select_oloop_action->setShortcut(shortcuts[SHRT_SELECT_OLOOP].key);
+
+	color_menu->menuAction()->setShortcut(shortcuts[SHRT_EVENT_COLOR].key);
+
+	func_quantize_action->setShortcut(shortcuts[SHRT_QUANTIZE].key);
+	func_notelen_action->setShortcut(shortcuts[SHRT_MODIFY_GATE_TIME].key);
+	func_velocity_action->setShortcut(shortcuts[SHRT_MODIFY_VELOCITY].key);
+	func_transpose_action->setShortcut(shortcuts[SHRT_TRANSPOSE].key);
+	func_erase_action->setShortcut(shortcuts[SHRT_ERASE_EVENT].key);
+	func_move_action->setShortcut(shortcuts[SHRT_NOTE_SHIFT].key);
+	func_fixed_len_action->setShortcut(shortcuts[SHRT_FIXED_LEN].key);
+	func_del_overlaps_action->setShortcut(shortcuts[SHRT_DELETE_OVERLAPS].key);
+}
+
+
 void ScoreEdit::add_parts(PartList* pl, bool all_in_one)
 {
 	score_canvas->add_staves(pl, all_in_one);
@@ -482,6 +590,8 @@ void ScoreEdit::song_changed(int flags)
 			if (velo>=0) velo_spinbox->setValue(velo);
 			if (velo_off>=0) velo_off_spinbox->setValue(velo_off);
 		}
+	
+		selection_changed();
 	}
 }
 
@@ -568,16 +678,51 @@ void ScoreEdit::menu_command(int cmd)
 		}
 		break;
 		
+		case CMD_SELECT_ALL: select_all(score_canvas->get_all_parts()); break;
+		case CMD_SELECT_NONE: select_none(score_canvas->get_all_parts()); break;
+		case CMD_SELECT_INVERT: select_invert(score_canvas->get_all_parts()); break;
+		case CMD_SELECT_ILOOP: select_in_loop(score_canvas->get_all_parts()); break;
+		case CMD_SELECT_OLOOP: select_not_in_loop(score_canvas->get_all_parts()); break;
+
+		case CMD_CUT:
+			copy_notes(score_canvas->get_all_parts(), 1);
+			erase_notes(score_canvas->get_all_parts(), 1);
+			break;
+		case CMD_COPY: copy_notes(score_canvas->get_all_parts(), 1); break;
+		case CMD_PASTE: 
+			menu_command(CMD_SELECT_NONE); 
+			paste_notes(score_canvas->get_selected_part());
+			break;
 		case CMD_QUANTIZE: quantize_notes(score_canvas->get_all_parts()); break;
 		case CMD_VELOCITY: modify_velocity(score_canvas->get_all_parts()); break;
 		case CMD_CRESCENDO: crescendo(score_canvas->get_all_parts()); break;
 		case CMD_NOTELEN: modify_notelen(score_canvas->get_all_parts()); break;
-		
+		case CMD_TRANSPOSE: transpose_notes(score_canvas->get_all_parts()); break;
+		case CMD_ERASE: erase_notes(score_canvas->get_all_parts()); break;
+		case CMD_DEL: erase_notes(score_canvas->get_all_parts(),1); break;
+		case CMD_MOVE: move_notes(score_canvas->get_all_parts()); break;
+		case CMD_FIXED_LEN: set_notelen(score_canvas->get_all_parts()); break;
+		case CMD_DELETE_OVERLAPS: delete_overlaps(score_canvas->get_all_parts()); break;
+		case CMD_LEGATO: legato(score_canvas->get_all_parts()); break;
+	
 		default: 
 			score_canvas->menu_command(cmd);
 	}
 }
 
+void ScoreEdit::clipboard_changed()
+{
+	paste_action->setEnabled(QApplication::clipboard()->mimeData()->hasFormat(QString("text/x-muse-eventlist")));
+}
+
+void ScoreEdit::selection_changed()
+{
+	bool flag = !get_events(score_canvas->get_all_parts(),1).empty();
+	cut_action->setEnabled(flag);
+	copy_action->setEnabled(flag);
+	del_action->setEnabled(flag);
+}
+
 
 //duplicated from songfile.cpp's MusE::readPart(); the only differences: 
 //"none" is supported and tag_name is settable
@@ -604,9 +749,11 @@ Part* read_part(Xml& xml, QString tag_name="part")
 					else
 					{
 						sscanf(tag.toLatin1().constData(), "%d:%d", &trackIdx, &partIdx);
+						if (debugMsg) cout << "read_part: trackIdx="<<trackIdx<<", partIdx="<<partIdx;
 						Track* track = song->tracks()->index(trackIdx);
 						if (track)
 							part = track->parts()->find(partIdx);
+						if (debugMsg) cout << ", track="<<track<<", part="<<part<<endl;
 					}
 				}
 				break;
@@ -656,12 +803,15 @@ void staff_t::read_status(Xml& xml)
 
 			case Xml::TagEnd:
 				if (tag == "staff")
-					return;
+					goto staff_readstatus_end;
 
 			default:
 				break;
 		}
 	}
+	
+	staff_readstatus_end:
+	update_part_indices();
 }
 
 
@@ -695,6 +845,7 @@ void ScoreEdit::writeStatus(int level, Xml& xml) const
 
 	xml.strTag(level, "name", name);
 	xml.intTag(level, "tool", edit_tools->curTool());
+	xml.intTag(level, "steprec", srec->isChecked());
 	xml.intTag(level, "quantPower", score_canvas->quant_power2());
 	xml.intTag(level, "pxPerWhole", score_canvas->pixels_per_whole());
 	xml.intTag(level, "newNoteVelo", velo_spinbox->value());
@@ -787,6 +938,8 @@ void ScoreEdit::readStatus(Xml& xml)
 					set_name(xml.parse1());
 				else if (tag == "tool") 
 					edit_tools->set(xml.parseInt());
+				else if (tag == "steprec") 
+					srec->setChecked(xml.parseInt());
 				else if (tag == "quantPower") 
 					quant_combobox->setCurrentIndex(xml.parseInt()-1);
 				else if (tag == "pxPerWhole") 
@@ -911,55 +1064,101 @@ void ScoreEdit::write_configuration(int level, Xml& xml)
 
 void ScoreCanvas::add_staves(PartList* pl, bool all_in_one)
 {
-	staff_t staff(this);
-
-	if (all_in_one)
+	if (!pl->empty())
 	{
-		staff.parts.clear();
-		for (ciPart part_it=pl->begin(); part_it!=pl->end(); part_it++)
-			staff.parts.insert(part_it->second);
-		staff.cleanup_parts();
-
-		staff.type=GRAND_TOP; //FINDME_INITCLEF
-		staff.clef=VIOLIN;
-		staves.push_back(staff);
-
-		staff.type=GRAND_BOTTOM;
-		staff.clef=BASS;
-		staves.push_back(staff);		
-	}
-	else
-	{
-		set<Track*> tracks;
-		for (ciPart it=pl->begin(); it!=pl->end(); it++)
-			tracks.insert(it->second->track());
-		
-		TrackList* tracklist = song->tracks();
-		// this loop is used for inserting track-staves in the
-		// correct order. simply iterating through tracks's contents
-		// would sort after the pointer values, i.e. randomly
-		for (ciTrack track_it=tracklist->begin(); track_it!=tracklist->end(); track_it++)
-			if (tracks.find(*track_it)!=tracks.end())
+		staff_t staff(this);
+
+		if (all_in_one)
+		{
+			clefTypes clef=((MidiTrack*)pl->begin()->second->track())->getClef();
+			
+			staff.parts.clear();
+			for (ciPart part_it=pl->begin(); part_it!=pl->end(); part_it++)
 			{
-				staff.parts.clear();
-				for (ciPart part_it=pl->begin(); part_it!=pl->end(); part_it++)
-					if (part_it->second->track() == *track_it)
-						staff.parts.insert(part_it->second);
-				staff.cleanup_parts();
-				
-				staff.type=GRAND_TOP; //FINDME_INITCLEF
-				staff.clef=VIOLIN;
-				staves.push_back(staff);
+				if (((MidiTrack*)part_it->second->track())->getClef() != clef)
+					clef=grandStaff;
+					
+				staff.parts.insert(part_it->second);
+			}
+			staff.cleanup_parts();
+			staff.update_part_indices();
 
-				staff.type=GRAND_BOTTOM;
-				staff.clef=BASS;
-				staves.push_back(staff);
+			switch (clef)
+			{
+				case trebleClef:
+					staff.type=NORMAL;
+					staff.clef=VIOLIN;
+					staves.push_back(staff);
+					break;
+
+				case bassClef:
+					staff.type=NORMAL;
+					staff.clef=BASS;
+					staves.push_back(staff);
+					break;
+
+				case grandStaff:
+					staff.type=GRAND_TOP;
+					staff.clef=VIOLIN;
+					staves.push_back(staff);
+
+					staff.type=GRAND_BOTTOM;
+					staff.clef=BASS;
+					staves.push_back(staff);		
+					break;
 			}
+		}
+		else
+		{
+			set<Track*> tracks;
+			for (ciPart it=pl->begin(); it!=pl->end(); it++)
+				tracks.insert(it->second->track());
+			
+			TrackList* tracklist = song->tracks();
+			// this loop is used for inserting track-staves in the
+			// correct order. simply iterating through tracks's contents
+			// would sort after the pointer values, i.e. randomly
+			for (ciTrack track_it=tracklist->begin(); track_it!=tracklist->end(); track_it++)
+				if (tracks.find(*track_it)!=tracks.end())
+				{
+					staff.parts.clear();
+					for (ciPart part_it=pl->begin(); part_it!=pl->end(); part_it++)
+						if (part_it->second->track() == *track_it)
+							staff.parts.insert(part_it->second);
+					staff.cleanup_parts();
+					staff.update_part_indices();
+					
+					switch (((MidiTrack*)(*track_it))->getClef())
+					{
+						case trebleClef:
+							staff.type=NORMAL;
+							staff.clef=VIOLIN;
+							staves.push_back(staff);
+							break;
+
+						case bassClef:
+							staff.type=NORMAL;
+							staff.clef=BASS;
+							staves.push_back(staff);
+							break;
+
+						case grandStaff:
+							staff.type=GRAND_TOP;
+							staff.clef=VIOLIN;
+							staves.push_back(staff);
+
+							staff.type=GRAND_BOTTOM;
+							staff.clef=BASS;
+							staves.push_back(staff);		
+							break;
+					}
+				}
+		}
+		
+		cleanup_staves();
+		fully_recalculate();
+		recalc_staff_pos();
 	}
-	
-	cleanup_staves();
-	fully_recalculate();
-	recalc_staff_pos();
 }
 
 
@@ -973,17 +1172,21 @@ ScoreCanvas::ScoreCanvas(ScoreEdit* pr, QWidget* parent_widget) : View(parent_wi
 	
 	init_pixmaps();
 	
+	srec=false;
+	for (int i=0;i<128;i++) held_notes[i]=false;
+	steprec=new StepRec(held_notes);
+	connect(song, SIGNAL(midiNote(int, int)), SLOT(midi_note(int,int)));
+	
 	x_pos=0;
 	x_left=0;
 	y_pos=0;
 	have_lasso=false;
+	inserting=false;
 	dragging=false;
 	drag_cursor_changed=false;
 	mouse_erases_notes=false;
 	mouse_inserts_notes=true;
-	
 	undo_started=false;
-	undo_flags=0;
 	
 	selected_part=NULL;
 	
@@ -1155,6 +1358,8 @@ void ScoreCanvas::merge_staves(list<staff_t>::iterator dest, list<staff_t>::iter
 		dest->parts.insert(src->parts.begin(), src->parts.end());
 	}
 	
+	dest->update_part_indices();
+	
 	remove_staff(src);
 
 	fully_recalculate();
@@ -1223,6 +1428,26 @@ void ScoreCanvas::fully_recalculate()
 
 void ScoreCanvas::song_changed(int flags)
 {
+	if (flags & (SC_PART_MODIFIED | SC_PART_REMOVED | SC_PART_INSERTED | SC_TRACK_REMOVED))
+	{
+		update_parts();
+		
+		if (flags & (SC_PART_REMOVED | SC_TRACK_REMOVED))
+		{
+			for (list<staff_t>::iterator it=staves.begin(); it!=staves.end(); it++)
+				it->cleanup_parts();
+			
+			cleanup_staves();
+
+			for (list<staff_t>::iterator it=staves.begin(); it!=staves.end(); it++)
+				it->recalculate();
+
+			recalc_staff_pos();
+
+			redraw();
+		}
+	}
+	
 	if (flags & (SC_PART_MODIFIED |
 	             SC_EVENT_INSERTED | SC_EVENT_MODIFIED | SC_EVENT_REMOVED |
 	             SC_SIG  | SC_KEY) )
@@ -1238,26 +1463,6 @@ void ScoreCanvas::song_changed(int flags)
 		emit canvas_width_changed(canvas_width());
 	}
 	
-	if (flags & SC_PART_REMOVED)
-	{
-		bool something_changed=false;
-		
-		for (list<staff_t>::iterator it=staves.begin(); it!=staves.end(); it++)
-		{
-			if (it->cleanup_parts())
-				something_changed=true;
-		}
-		
-		cleanup_staves();
-
-		for (list<staff_t>::iterator it=staves.begin(); it!=staves.end(); it++)
-			it->recalculate();
-
-		recalc_staff_pos();
-
-		redraw();
-	}
-
 	if (flags & SC_SELECTION)
 	{
 		redraw();
@@ -3312,10 +3517,9 @@ int ScoreCanvas::y_to_pitch(int y, int t, clef_t clef)
 
 void ScoreCanvas::mousePressEvent (QMouseEvent* event)
 {
-	keystate=((QInputEvent*)event)->modifiers();
-	
+	keystate=event->modifiers();
 	bool ctrl=keystate & Qt::ControlModifier;
-	
+
 	// den errechneten tick immer ABrunden!
 	// denn der "bereich" eines schlags geht von schlag_begin bis nächsterschlag_begin-1
 	// noten werden aber genau in die mitte dieses bereiches gezeichnet
@@ -3325,10 +3529,6 @@ void ScoreCanvas::mousePressEvent (QMouseEvent* event)
 	int y=event->y() + y_pos - staff_it->y_draw;
 	int x=event->x()+x_pos-x_left;
 	int tick=flo_quantize_floor(x_to_tick(x), quant_ticks());
-	
-	if (event->button()==Qt::LeftButton)
-		if (!ctrl)
-			deselect_all();
 
 	if (staff_it!=staves.end())
 	{
@@ -3389,7 +3589,7 @@ void ScoreCanvas::mousePressEvent (QMouseEvent* event)
 				int this_begin=tick;
 				int this_end=this_begin+calc_len(set_it->len, set_it->dots);
 				
-				selected_part=set_it->source_part;
+				set_selected_part(set_it->source_part);
 				
 				//that's the only note corresponding to the event?
 				if (this_begin==total_begin && this_end==total_end)
@@ -3419,9 +3619,10 @@ void ScoreCanvas::mousePressEvent (QMouseEvent* event)
 				
 				
 				
+				clicked_event_ptr=set_it->source_event;
 				dragged_event=*set_it->source_event;
+				original_dragged_event=dragged_event.clone();
 				dragged_event_part=set_it->source_part;
-				dragged_event_original_pitch=dragged_event.pitch();
 				
 				if ((mouse_erases_notes) || (event->button()==Qt::MidButton)) //erase?
 				{
@@ -3429,14 +3630,9 @@ void ScoreCanvas::mousePressEvent (QMouseEvent* event)
 				}
 				else if (event->button()==Qt::LeftButton) //edit?
 				{
-					set_it->source_event->setSelected(!set_it->source_event->selected());
-					song_changed(SC_SELECTION);
-					
 					setMouseTracking(true);		
 					dragging=true;
 					drag_cursor_changed=false;
-					undo_started=false;
-					undo_flags=SC_EVENT_MODIFIED;
 				}
 			}
 			else //we found nothing?
@@ -3468,11 +3664,9 @@ void ScoreCanvas::mousePressEvent (QMouseEvent* event)
 							if (relative_tick<0)
 								cerr << "ERROR: THIS SHOULD NEVER HAPPEN: relative_tick is negative!" << endl;
 							song->startUndo();
-							undo_started=true;
-							undo_flags=SC_EVENT_INSERTED | SC_EVENT_MODIFIED;
-							//stopping undo at the end of this function is unneccessary
-							//because we'll begin a drag right after it. finishing
-							//this drag will stop undo as well (in mouseReleaseEvent)
+
+							if (!ctrl)
+								deselect_all();
 							
 							Event newevent(Note);
 							newevent.setPitch(y_to_pitch(y,tick, staff_it->clef));
@@ -3481,7 +3675,7 @@ void ScoreCanvas::mousePressEvent (QMouseEvent* event)
 							newevent.setTick(relative_tick);
 							newevent.setLenTick((new_len>0)?new_len:last_len);
 							newevent.setSelected(true);
-							
+
 							if (flo_quantize(newevent.lenTick(), quant_ticks()) <= 0)
 							{
 								newevent.setLenTick(quant_ticks());
@@ -3499,7 +3693,7 @@ void ScoreCanvas::mousePressEvent (QMouseEvent* event)
 							
 							dragged_event_part=curr_part;
 							dragged_event=newevent;
-							dragged_event_original_pitch=newevent.pitch();
+							original_dragged_event=dragged_event.clone();
 
 							mouse_down_pos=event->pos();
 							mouse_operation=NO_OP;
@@ -3509,9 +3703,12 @@ void ScoreCanvas::mousePressEvent (QMouseEvent* event)
 
 							setMouseTracking(true);	
 							dragging=true;
+							inserting=true;
 							drag_cursor_changed=true;
 							setCursor(Qt::SizeAllCursor);
-							//song->startUndo(); unneccessary because we have started it already above
+							
+							song->endUndo(SC_EVENT_INSERTED);
+							song->update(SC_SELECTION);
 						}
 					}
 					else // !mouse_inserts_notes. open a lasso
@@ -3525,16 +3722,16 @@ void ScoreCanvas::mousePressEvent (QMouseEvent* event)
 				}			
 		}
 	}
-
-	if (event->button()==Qt::LeftButton)
-		song->update(SC_SELECTION);
 }
 
 void ScoreCanvas::mouseReleaseEvent (QMouseEvent* event)
 {
+	keystate=event->modifiers();
+	bool ctrl=keystate & Qt::ControlModifier;
+	
 	if (dragging && event->button()==Qt::LeftButton)
 	{
-		if ((mouse_operation==LENGTH) || (mouse_operation==BEGIN)) //also BEGIN can change the len by clipping
+		if (mouse_operation==LENGTH)
 		{
 			if (flo_quantize(dragged_event.lenTick(), quant_ticks()) <= 0)
 			{
@@ -3545,15 +3742,29 @@ void ScoreCanvas::mouseReleaseEvent (QMouseEvent* event)
 			{
 				last_len=flo_quantize(dragged_event.lenTick(), quant_ticks());
 			}
+			
+			if (undo_started)
+				song->endUndo(SC_EVENT_MODIFIED | SC_EVENT_REMOVED);
 		}
+
 		
-		if (undo_started)
-			song->endUndo(undo_flags);
+		if (mouse_operation==NO_OP && !inserting)
+		{
+			if (event->button()==Qt::LeftButton)
+				if (!ctrl)
+					deselect_all();
+
+			clicked_event_ptr->setSelected(!clicked_event_ptr->selected());
+
+			song->update(SC_SELECTION);
+		}
 		
 		setMouseTracking(false);
 		unsetCursor();
+		inserting=false;
 		dragging=false;
 		drag_cursor_changed=false;
+		undo_started=false;
 		
 		x_scroll_speed=0; x_scroll_pos=0;
 	}
@@ -3583,6 +3794,9 @@ void ScoreCanvas::mouseReleaseEvent (QMouseEvent* event)
 
 	if (have_lasso && event->button()==Qt::LeftButton)
 	{
+		if (!ctrl)
+			deselect_all();
+		
 		set<Event*> already_processed;
 		
 		for (list<staff_t>::iterator it=staves.begin(); it!=staves.end(); it++)
@@ -3600,6 +3814,9 @@ void ScoreCanvas::mouseReleaseEvent (QMouseEvent* event)
 
 void ScoreCanvas::mouseMoveEvent (QMouseEvent* event)
 {
+	keystate=event->modifiers();
+	bool ctrl=keystate & Qt::ControlModifier;
+
 	if (dragging)
 	{
 		int dx=event->x()-mouse_down_pos.x();
@@ -3630,6 +3847,22 @@ void ScoreCanvas::mouseMoveEvent (QMouseEvent* event)
 				mouse_operation=PITCH;
 				setCursor(Qt::SizeVerCursor);
 			}
+			
+			if (mouse_operation!=NO_OP)
+			{
+				if (!inserting && clicked_event_ptr->selected()==false)
+				{
+					if (!ctrl)
+						deselect_all();
+					
+					clicked_event_ptr->setSelected(true);
+					
+					song->update(SC_SELECTION);
+				}
+				
+				old_pitch=-1;
+				old_dest_tick=MAXINT;
+			}
 		}
 
 		int new_pitch;
@@ -3640,70 +3873,41 @@ void ScoreCanvas::mouseMoveEvent (QMouseEvent* event)
 				break;
 				
 			case PITCH:
-				if (debugMsg) cout << "changing pitch, delta="<<nearbyint((float)dy/PITCH_DELTA)<<endl;
-				new_pitch=dragged_event_original_pitch - nearbyint((float)dy/PITCH_DELTA);
+				if (heavyDebugMsg) cout << "trying to change pitch, delta="<<-nearbyint((float)dy/PITCH_DELTA)<<endl;
+				new_pitch=original_dragged_event.pitch() - nearbyint((float)dy/PITCH_DELTA);
 				
 				if (new_pitch < 0) new_pitch=0;
 				if (new_pitch > 127) new_pitch=127;
 				
-				if (dragged_event.pitch()!=new_pitch)
+				if (new_pitch != old_pitch)
 				{
-					if (!undo_started)
-					{
-						song->startUndo();
-						undo_started=true;
-					}
-					
-					Event tmp=dragged_event.clone();
-					tmp.setPitch(new_pitch);
-					
-					audio->msgChangeEvent(dragged_event, tmp, dragged_event_part, false, false, false);
-					dragged_event=tmp;
-					
-					fully_recalculate();	
+					if (debugMsg) cout << "changing pitch, delta="<<new_pitch-original_dragged_event.pitch()<<endl;
+					if (undo_started) song->undo();
+					undo_started=transpose_notes(part_to_set(dragged_event_part),1, new_pitch-original_dragged_event.pitch());
+					old_pitch=new_pitch;
 				}
 				
 				break;
 			
 			case BEGIN:
-				if (dragged_event.tick()+dragged_event_part->tick() != unsigned(tick))
 				{
-					if (!undo_started)
-					{
-						song->startUndo();
-						undo_started=true;
-					}
-
-					Event tmp=dragged_event.clone();
 					signed relative_tick=tick-signed(dragged_event_part->tick());
+					unsigned dest_tick;
 					
 					if (relative_tick >= 0)
-						tmp.setTick(relative_tick);
+						dest_tick=relative_tick;
 					else
 					{
-						tmp.setTick(0);
+						dest_tick=0;
 						if (debugMsg) cout << "not moving note before begin of part; setting it directly to the begin" << endl;
 					}
 
-					if (tmp.endTick() > dragged_event_part->lenTick())
+					if (dest_tick != old_dest_tick)
 					{
-						signed new_len=dragged_event_part->lenTick() - tmp.tick();
-						if (new_len>=0)
-						{
-							tmp.setLenTick(dragged_event_part->lenTick() - tmp.tick());
-							if (debugMsg) cout << "moved note would exceed its part; clipping length to " << tmp.lenTick() << endl;
-						}
-						else
-						{
-							tmp.setLenTick(0);
-							if (debugMsg) cout << "moved note would exceed its part; clipping length to 0 (actually negative)" << endl;
-						}
+						if (undo_started) song->undo();
+						undo_started=move_notes(part_to_set(dragged_event_part),1, (signed)dest_tick-original_dragged_event.tick());
+						old_dest_tick=dest_tick;
 					}
-					
-					audio->msgChangeEvent(dragged_event, tmp, dragged_event_part, false, false, false);
-					dragged_event=tmp;
-					
-					fully_recalculate();	
 				}
 				
 				break;
@@ -4007,6 +4211,7 @@ void ScoreCanvas::menu_command(int cmd)
 		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;
+		
 		default: 
 			cerr << "ERROR: ILLEGAL FUNCTION CALL: ScoreCanvas::menu_command called with unknown command ("<<cmd<<")"<<endl;
 	}
@@ -4123,14 +4328,6 @@ void ScoreCanvas::deselect_all()
 	song->update(SC_SELECTION);
 }
 
-void ScoreCanvas::keyPressEvent(QKeyEvent* event)
-{
-	if (event->key()==Qt::Key_Delete)
-	{
-		erase_notes(get_all_parts(), 1); // 1 means "all selected"
-	}
-}
-
 bool staff_t::cleanup_parts()
 {
 	bool did_something=false;
@@ -4162,6 +4359,7 @@ bool staff_t::cleanup_parts()
 			it++;
 	}
 	
+	if (did_something) update_part_indices();
 	return did_something;
 }
 
@@ -4191,6 +4389,48 @@ void staff_t::apply_lasso(QRect rect, set<Event*>& already_processed)
 			}
 }
 
+void ScoreCanvas::set_steprec(bool flag)
+{
+	srec=flag;
+}
+
+void ScoreCanvas::midi_note(int pitch, int velo)
+{
+	if (velo)
+		held_notes[pitch]=true;
+	else
+		held_notes[pitch]=false;
+
+	if ( srec && selected_part && !audio->isPlaying() && velo )
+		steprec->record(selected_part,pitch,quant_ticks(),quant_ticks(),velo,globalKeyState&Qt::ControlModifier,globalKeyState&Qt::ShiftModifier);
+}
+
+
+
+void ScoreCanvas::update_parts()
+{
+	if (selected_part!=NULL) //if it's null, let it be null
+		selected_part=partFromSerialNumber(selected_part_index);
+	
+	for (list<staff_t>::iterator it=staves.begin(); it!=staves.end(); it++)
+		it->update_parts();
+}
+
+void staff_t::update_parts()
+{
+	parts.clear();
+	
+	for (set<int>::iterator it=part_indices.begin(); it!=part_indices.end(); it++)
+		parts.insert(partFromSerialNumber(*it));
+}
+
+void staff_t::update_part_indices()
+{
+	part_indices.clear();
+	
+	for (set<Part*>::iterator it=parts.begin(); it!=parts.end(); it++)
+		part_indices.insert((*it)->sn());
+}
 
 //the following assertions are made:
 //  pix_quarter.width() == pix_half.width()
@@ -4221,29 +4461,29 @@ void staff_t::apply_lasso(QRect rect, set<Event*>& already_processed)
  *   o rename stuff: UndoOp -> Operation, Undo -> OpList,
  *                   UndoType -> OpType, iUndoOp, riUndoOp -> iOperation,
  *                   undo.cpp/.h -> operations.cpp/.h
+ *   o either remove these "hidden notes", or deal with them in the score editor
+ *   o investigate with valgrind
+ *   o controller view in score editor
+ *   o deal with expanding parts
+ *   o fix sigedit boxes
+ *   o mid-click in pianoroll: change to "delete", or initiate drag and drop between windows?
  * 
  * 
  *   o drum list: scroll while dragging
  * 
  * IMPORTANT TODO
- *   o add a select-clef-toolbox for tracks
- *   o respect the track's clef (has to be implemented first in muse)
  *   o do partial recalculating; recalculating can take pretty long
  *     (0,5 sec) when displaying a whole song in scores
  *   o transpose etc. must also transpose key-pressure events
  *   o transpose: support in-key-transpose
- *   o legato: extend length to next note
- *   o delete: add velo and len threshold
  *   o thin out: remove unneeded ctrl messages
  *
  * less important stuff
- *   o controller view in score editor
  *   o quantize-templates (everything is forced into a specified
  *                         rhythm)
  *   o part-templates (you specify some notes and a control-chord;
  *                     the notes are set according to the chord then)
  *   o add functions like set velo, mod/set velo-off
- *   o deal with expanding parts
  *   o use bars instead of flags over groups of 8ths / 16ths etc
  *   o support different keys in different tracks at the same time
  *       calc_pos_add_list and calc_item_pos will be affected by this
@@ -4260,6 +4500,7 @@ void staff_t::apply_lasso(QRect rect, set<Event*>& already_processed)
  *   o refuse to resize so that width gets smaller or equal than x_left
  *   o draw a margin around notes which are in a bright color
  *   o support drum tracks (x-note-heads etc.)
+ *   o drum list: scroll while dragging: probably unneccessary with the "reorder list" function
  * 
  * 
  * stuff for the other muse developers
@@ -4271,8 +4512,6 @@ void staff_t::apply_lasso(QRect rect, set<Event*>& already_processed)
  *      ( (2+2+3)/4 or (3+2+2)/4 instead of 7/4 )
  *   o maybe do expanding parts inside the msgChangeEvent or
  *     msgNewEvent functions (see my e-mail)
- *
- *   o make quantize and other stuff faster (by assymetric communication)
  */
 
 
diff --git a/muse2/muse/midiedit/scoreedit.h b/muse2/muse/midiedit/scoreedit.h
index 4004452f..e7302a46 100644
--- a/muse2/muse/midiedit/scoreedit.h
+++ b/muse2/muse/midiedit/scoreedit.h
@@ -22,6 +22,7 @@
 #include <QActionGroup>
 #include <QGridLayout>
 #include <QByteArray>
+#include <QToolButton>
 
 #include <values.h>
 #include "noteinfo.h"
@@ -32,6 +33,9 @@
 #include "part.h"
 #include "keyevent.h"
 #include "mtscale_flo.h"
+#include "steprec.h"
+#include "cleftypes.h"
+#include "helper.h"
 
 #include <set>
 #include <map>
@@ -58,7 +62,12 @@ enum {CMD_COLOR_BLACK, CMD_COLOR_VELO, CMD_COLOR_PART,
       CMD_NOTELEN_1, CMD_NOTELEN_2, CMD_NOTELEN_4, CMD_NOTELEN_8,
       CMD_NOTELEN_16, CMD_NOTELEN_32, CMD_NOTELEN_LAST,
       
-      CMD_QUANTIZE, CMD_VELOCITY, CMD_CRESCENDO, CMD_NOTELEN };
+      CMD_QUANTIZE, CMD_VELOCITY, CMD_CRESCENDO, CMD_NOTELEN, CMD_TRANSPOSE,
+      CMD_ERASE, CMD_MOVE, CMD_FIXED_LEN, CMD_DELETE_OVERLAPS, CMD_LEGATO,
+      CMD_CUT, CMD_COPY, CMD_PASTE, CMD_DEL,
+      CMD_SELECT_ALL, CMD_SELECT_NONE, CMD_SELECT_INVERT,
+      CMD_SELECT_ILOOP, CMD_SELECT_OLOOP};
+
 
 class ScoreCanvas;
 class EditToolBar;
@@ -70,7 +79,6 @@ class EditToolBar;
 class ScoreEdit : public TopWin
 {
 	Q_OBJECT
-
 	private:
 		virtual void closeEvent(QCloseEvent*);
 		virtual void resizeEvent(QResizeEvent*);
@@ -106,6 +114,32 @@ class ScoreEdit : public TopWin
 		QAction* color_black_action;
 		QAction* color_velo_action;
 		QAction* color_part_action;
+
+		QMenu* color_menu;
+		
+		QAction* cut_action;
+		QAction* copy_action;
+		QAction* paste_action;
+		QAction* del_action;
+		
+		QAction* select_all_action;
+		QAction* select_none_action;
+		QAction* select_invert_action;
+		QAction* select_iloop_action;
+		QAction* select_oloop_action;
+
+		QAction* func_quantize_action;
+		QAction* func_notelen_action;
+		QAction* func_velocity_action;
+		QAction* func_cresc_action;
+		QAction* func_transpose_action;
+		QAction* func_erase_action;
+		QAction* func_move_action;
+		QAction* func_fixed_len_action;
+		QAction* func_del_overlaps_action;
+		QAction* func_legato_action;
+
+		QToolButton* srec;
 		
 		QScrollBar* xscroll;
 		QScrollBar* yscroll;
@@ -129,6 +163,9 @@ class ScoreEdit : public TopWin
 		void menu_command(int);
 		void velo_box_changed();
 		void velo_off_box_changed();
+		void init_shortcuts();
+		void selection_changed();
+		void clipboard_changed();
 		
 	signals:
 		void deleted(unsigned long);
@@ -481,6 +518,7 @@ enum staff_mode_t
 struct staff_t
 {
 	set<Part*> parts;
+	set<int> part_indices;
 	ScoreEventList eventlist;
 	ScoreItemList itemlist;
 	
@@ -524,6 +562,7 @@ struct staff_t
 		clef=clef_;
 		parts=parts_;
 		parent=parent_;
+		update_part_indices();
 	}
 	
 	bool cleanup_parts();
@@ -532,6 +571,9 @@ struct staff_t
 	
 	void read_status(Xml& xml);
 	void write_status(int level, Xml& xml) const;
+	
+	void update_parts(); //re-populates the set<Part*> from the set<int>
+	void update_part_indices(); //re-populates the set<int> from the set<Part*>
 };
 
 list<int> calc_accidentials(key_enum key, clef_t clef, key_enum next_key=KEY_C);
@@ -612,6 +654,8 @@ class ScoreCanvas : public View
 		
 		list<staff_t> staves;
 		
+		StepRec* steprec;
+		
 		// the drawing area is split into a "preamble" containing clef,
 		// key and time signature, and the "item's area" containing the
 		// actual items (notes, bars, rests, etc.)
@@ -633,6 +677,8 @@ class ScoreCanvas : public View
 		float y_scroll_pos;
 
 		Part* selected_part;
+		int selected_part_index;
+		
 		int last_len;
 		int new_len; //when zero or negative, last_len is used
 
@@ -651,20 +697,26 @@ class ScoreCanvas : public View
 		bool mouse_erases_notes;
 		bool mouse_inserts_notes;
 		
+		bool inserting;
 		bool dragging;
 		bool drag_cursor_changed;
 		Part* dragged_event_part;
 		Event dragged_event;
-		int dragged_event_original_pitch;
+		Event original_dragged_event;
+		Event* clicked_event_ptr;
+		
+		int old_pitch;
+		unsigned old_dest_tick;
 		
 		bool have_lasso;
 		QPoint lasso_start;
 		QRect lasso;
 
 		bool undo_started;
-		int undo_flags;
-		
+		bool temp_undo;
 		
+		bool srec;
+		bool held_notes[128];
 
 		enum {COLOR_MODE_BLACK, COLOR_MODE_PART, COLOR_MODE_VELO} coloring_mode;
 		bool preamble_contains_keysig;
@@ -692,6 +744,7 @@ class ScoreCanvas : public View
 		void config_changed();
 		
 		void deselect_all();
+		void midi_note(int pitch, int velo);
 
    public slots:
       void x_scroll_event(int);
@@ -711,7 +764,10 @@ class ScoreCanvas : public View
 
 			void set_velo(int);
 			void set_velo_off(int);
-	
+
+			void set_steprec(bool);
+			
+			void update_parts(); //re-populates the set<Part*>s from the set<int>s
 	signals:
 			void xscroll_changed(int);
 			void yscroll_changed(int);
@@ -731,7 +787,6 @@ class ScoreCanvas : public View
 		virtual void mouseMoveEvent (QMouseEvent* event);
 		virtual void mouseReleaseEvent (QMouseEvent* event);
 		virtual void resizeEvent(QResizeEvent*);
-		virtual void keyPressEvent(QKeyEvent* event);
 		
 	public:
 		ScoreCanvas(ScoreEdit*, QWidget*);
@@ -755,7 +810,7 @@ class ScoreCanvas : public View
 		void set_last_len(int l) {last_len=l;}
 		
 		Part* get_selected_part() {return selected_part;}
-		void set_selected_part(Part* p) {selected_part=p;}
+		void set_selected_part(Part* p) {selected_part=p; if (selected_part) selected_part_index=selected_part->sn();}
 		
 		set<Part*> get_all_parts();
 		
diff --git a/muse2/muse/mixer/amixer.h b/muse2/muse/mixer/amixer.h
index f8e365c3..ca8a3f4c 100644
--- a/muse2/muse/mixer/amixer.h
+++ b/muse2/muse/mixer/amixer.h
@@ -62,6 +62,8 @@ class ScrollArea : public QScrollArea
 //---------------------------------------------------------
 
 class AudioMixerApp : public QMainWindow {
+      Q_OBJECT
+    
       //QString name;
       MixerConfig* cfg;
       StripList stripList;
@@ -84,7 +86,7 @@ class AudioMixerApp : public QMainWindow {
       QAction* showAuxTracksId;
       QAction* showSyntiTracksId;
 
-      Q_OBJECT
+      
 
       virtual void closeEvent(QCloseEvent*);
       void addStrip(Track*, int);
diff --git a/muse2/muse/mixer/astrip.cpp b/muse2/muse/mixer/astrip.cpp
index 265061ad..5644e6eb 100644
--- a/muse2/muse/mixer/astrip.cpp
+++ b/muse2/muse/mixer/astrip.cpp
@@ -48,33 +48,8 @@
 #include "gconfig.h"
 #include "ttoolbutton.h"
 #include "menutitleitem.h"
-#include "popupmenu.h"
-
-//---------------------------------------------------------
-//   MenuTitleItem
-//---------------------------------------------------------
-
-MenuTitleItem::MenuTitleItem(const QString& ss, QWidget* parent)
-  : QWidgetAction(parent)
-      {
-        s = ss;
-        // Don't allow to click on it.
-        setEnabled(false);
-        // Just to be safe, set to -1 instead of default 0.
-        setData(-1);
-      }
-
-QWidget* MenuTitleItem::createWidget(QWidget *parent)
-{
-  QLabel* l = new QLabel(s, parent);
-  l->setAlignment(Qt::AlignCenter);
-  l->setAutoFillBackground(true);
-  //QPalette palette;
-  //palette.setColor(label->backgroundRole(), c);
-  //l->setPalette(palette);
-  l->setBackgroundRole(QPalette::Dark);
-  return l;
-}
+//#include "popupmenu.h"
+#include "routepopup.h"
 
 /*
 //---------------------------------------------------------
@@ -145,14 +120,6 @@ void AudioStrip::songChanged(int val)
       if (val & SC_CHANNELS)
         updateChannels();
       
-      // p3.3.47
-      // Update the routing popup menu if anything relevant changed.
-      if (val & (SC_ROUTE | SC_CHANNELS | SC_CONFIG))
-      { 
-        //updateRouteMenus();
-        muse->updateRouteMenus(track, this);      // p3.3.50 Use this handy shared routine.
-      }
-      
       // Catch when label font, or configuration min slider and meter values change.
       if (val & SC_CONFIG)
       {
@@ -215,7 +182,6 @@ void AudioStrip::songChanged(int val)
       if (val & SC_TRACK_MODIFIED)
       {
             setLabelText();
-            // Added by Tim. p3.3.9
             setLabelFont();
             
       }      
@@ -1007,898 +973,14 @@ AudioStrip::AudioStrip(QWidget* parent, AudioTrack* at)
       }
 
 //---------------------------------------------------------
-//   addMenuItem
-//---------------------------------------------------------
-
-static int addMenuItem(AudioTrack* track, Track* route_track, PopupMenu* lb, int id, RouteMenuMap& mm, int channel, int channels, bool isOutput)
-{
-  // totalInChannels is only used by syntis.
-  int toch = ((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;
-  
-  // Don't add the last stray mono route if the track is stereo.
-  //if(route_track->channels() > 1 && (channel+1 == chans))
-  //  return id;
-    
-  RouteList* rl = isOutput ? track->outRoutes() : track->inRoutes();
-  
-  QAction* act;
-  
-  QString s(route_track->name());
-  
-  act = lb->addAction(s);
-  act->setData(id);
-  act->setCheckable(true);
-  
-  int ach = channel;
-  int bch = -1;
-  
-  Route r(route_track, isOutput ? ach : bch, channels);
-  
-  r.remoteChannel = isOutput ? bch : ach;
-  
-  mm.insert( pRouteMenuMap(id, r) );
-  
-  for(iRoute ir = rl->begin(); ir != rl->end(); ++ir) 
-  {
-    if(ir->type == Route::TRACK_ROUTE && ir->track == route_track && ir->remoteChannel == r.remoteChannel)
-    {
-      int tcompch = r.channel;
-      if(tcompch == -1)
-        tcompch = 0;
-      int tcompchs = r.channels;
-      if(tcompchs == -1)
-        tcompchs = isOutput ? track->channels() : route_track->channels();
-      
-      int compch = ir->channel;
-      if(compch == -1)
-        compch = 0;
-      int compchs = ir->channels;
-      if(compchs == -1)
-        compchs = isOutput ? track->channels() : ir->track->channels();
-      
-      if(compch == tcompch && compchs == tcompchs) 
-      {
-        act->setChecked(true);
-        break;
-      }
-    }  
-  }
-  return ++id;      
-}
-
-//---------------------------------------------------------
-//   addAuxPorts
-//---------------------------------------------------------
-
-static int addAuxPorts(AudioTrack* t, PopupMenu* lb, int id, RouteMenuMap& mm, int channel, int channels, bool isOutput)
-      {
-      AuxList* al = song->auxs();
-      for (iAudioAux i = al->begin(); i != al->end(); ++i) {
-            Track* track = *i;
-            if (t == track)
-                  continue;
-            id = addMenuItem(t, track, lb, id, mm, channel, channels, isOutput);
-            }
-      return id;      
-      }
-
-//---------------------------------------------------------
-//   addInPorts
-//---------------------------------------------------------
-
-static int addInPorts(AudioTrack* t, PopupMenu* lb, int id, RouteMenuMap& mm, int channel, int channels, bool isOutput)
-      {
-      InputList* al = song->inputs();
-      for (iAudioInput i = al->begin(); i != al->end(); ++i) {
-            Track* track = *i;
-            if (t == track)
-                  continue;
-            id = addMenuItem(t, track, lb, id, mm, channel, channels, isOutput);
-            }
-      return id;      
-      }
-
-//---------------------------------------------------------
-//   addOutPorts
-//---------------------------------------------------------
-
-static int addOutPorts(AudioTrack* t, PopupMenu* lb, int id, RouteMenuMap& mm, int channel, int channels, bool isOutput)
-      {
-      OutputList* al = song->outputs();
-      for (iAudioOutput i = al->begin(); i != al->end(); ++i) {
-            Track* track = *i;
-            if (t == track)
-                  continue;
-            id = addMenuItem(t, track, lb, id, mm, channel, channels, isOutput);
-            }
-      return id;      
-      }
-
-//---------------------------------------------------------
-//   addGroupPorts
-//---------------------------------------------------------
-
-static int addGroupPorts(AudioTrack* t, PopupMenu* lb, int id, RouteMenuMap& mm, int channel, int channels, bool isOutput)
-      {
-      GroupList* al = song->groups();
-      for (iAudioGroup i = al->begin(); i != al->end(); ++i) {
-            Track* track = *i;
-            if (t == track)
-                  continue;
-            id = addMenuItem(t, track, lb, id, mm, channel, channels, isOutput);
-            }
-      return id;      
-      }
-
-//---------------------------------------------------------
-//   addWavePorts
-//---------------------------------------------------------
-
-static int addWavePorts(AudioTrack* t, PopupMenu* lb, int id, RouteMenuMap& mm, int channel, int channels, bool isOutput)
-      {
-      WaveTrackList* al = song->waves();
-      for (iWaveTrack i = al->begin(); i != al->end(); ++i) {
-            Track* track = *i;
-            if (t == track)
-                  continue;
-            id = addMenuItem(t, track, lb, id, mm, channel, channels, isOutput);
-            }
-      return id;      
-      }
-
-//---------------------------------------------------------
-//   addSyntiPorts
-//---------------------------------------------------------
-
-static int addSyntiPorts(AudioTrack* t, PopupMenu* lb, int id, 
-                         RouteMenuMap& mm, int channel, int channels, bool isOutput)
-{
-      RouteList* rl = isOutput ? t->outRoutes() : t->inRoutes();
-      
-      QAction* act;
-      
-      SynthIList* al = song->syntis();
-      for (iSynthI i = al->begin(); i != al->end(); ++i) 
-      {
-            Track* track = *i;
-            if (t == track)
-                  continue;
-            int toch = ((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;
-            
-            // totalInChannels is only used by syntis.
-            int chans = (!isOutput || track->type() != Track::AUDIO_SOFTSYNTH) ? toch : ((AudioTrack*)track)->totalInChannels();
-            
-            int tchans = (channels != -1) ? channels: t->channels();
-            if(tchans == 2)
-            {
-              // Ignore odd numbered left-over mono channel.
-              //chans = chans & ~1;
-              //if(chans != 0)
-                chans -= 1;
-            }
-            
-            if(chans > 0)
-            {
-              PopupMenu* chpup = new PopupMenu(lb);
-              chpup->setTitle(track->name());
-              for(int ch = 0; ch < chans; ++ch)
-              {
-                char buffer[128];
-                if(tchans == 2)
-                  snprintf(buffer, 128, "%s %d,%d", chpup->tr("Channel").toLatin1().constData(), ch+1, ch+2);
-                else  
-                  snprintf(buffer, 128, "%s %d", chpup->tr("Channel").toLatin1().constData(), ch+1);
-                act = chpup->addAction(QString(buffer));
-                act->setData(id);
-                act->setCheckable(true);
-                
-                int ach = (channel == -1) ? ch : channel;
-                int bch = (channel == -1) ? -1 : ch;
-                
-                Route rt(track, (t->type() != Track::AUDIO_SOFTSYNTH || isOutput) ? ach : bch, tchans);
-                //Route rt(track, ch);
-                //rt.remoteChannel = -1;
-                rt.remoteChannel = (t->type() != Track::AUDIO_SOFTSYNTH || isOutput) ? bch : ach;
-                
-                mm.insert( pRouteMenuMap(id, rt) );
-                
-                for(iRoute ir = rl->begin(); ir != rl->end(); ++ir) 
-                {
-                  if(ir->type == Route::TRACK_ROUTE && ir->track == track && ir->remoteChannel == rt.remoteChannel)
-                  {
-                    int tcompch = rt.channel;
-                    if(tcompch == -1)
-                      tcompch = 0;
-                    int tcompchs = rt.channels;
-                    if(tcompchs == -1)
-                      tcompchs = isOutput ? t->channels() : track->channels();
-                    
-                    int compch = ir->channel;
-                    if(compch == -1)
-                      compch = 0;
-                    int compchs = ir->channels;
-                    if(compchs == -1)
-                      compchs = isOutput ? t->channels() : ir->track->channels();
-                    
-                    if(compch == tcompch && compchs == tcompchs) 
-                    {
-                      act->setChecked(true);
-                      break;
-                    }
-                  }
-                }  
-                ++id;
-              }
-            
-              lb->addMenu(chpup);
-            }
-      }
-      return id;      
-}
-
-//---------------------------------------------------------
-//   addMultiChannelOutPorts
-//---------------------------------------------------------
-
-static int addMultiChannelPorts(AudioTrack* t, PopupMenu* pup, int id, RouteMenuMap& mm, bool isOutput)
-{
-  int toch = t->totalOutChannels();
-  // If track channels = 1, it must be a mono synth. And synti channels cannot be changed by user.
-  if(t->channels() == 1)
-    toch = 1;
-  
-  // Number of allocated buffers is always MAX_CHANNELS or more, even if _totalOutChannels is less. 
-  // totalInChannels is only used by syntis.
-  int chans = (isOutput || t->type() != Track::AUDIO_SOFTSYNTH) ? toch : t->totalInChannels();
-
-  if(chans > 1)
-    pup->addAction(new MenuTitleItem("<Mono>", pup)); 
-  
-  //
-  // If it's more than one channel, create a sub-menu. If it's just one channel, don't bother with a sub-menu...
-  //
-
-  PopupMenu* chpup = pup;
-  
-  for(int ch = 0; ch < chans; ++ch)
-  {
-    // If more than one channel, create the sub-menu.
-    if(chans > 1)
-      chpup = new PopupMenu(pup);
-    
-    if(isOutput)
-    {
-      switch(t->type()) 
-      {
-        
-        case Track::AUDIO_INPUT:
-              //id = addWavePorts(t, chpup, id, mm, ch, 1, isOutput);  // Rem p4.0.20
-        case Track::WAVE:
-        case Track::AUDIO_GROUP:
-        case Track::AUDIO_SOFTSYNTH:
-        case Track::AUDIO_AUX:        // p4.0.20
-              id = addWavePorts(t, chpup, id, mm, ch, 1, isOutput);
-              id = addOutPorts(t, chpup, id, mm, ch, 1, isOutput);
-              id = addGroupPorts(t, chpup, id, mm, ch, 1, isOutput);
-              id = addSyntiPorts(t, chpup, id, mm, ch, 1, isOutput);
-              //break;                                                // Rem p4.0.20
-        //case Track::AUDIO_AUX:                                      //
-              //id = addOutPorts(t, chpup, id, mm, ch, 1, isOutput);  //
-              break;
-        default:
-              break;
-      }
-    }
-    else
-    {
-      switch(t->type()) 
-      {
-        
-        case Track::AUDIO_OUTPUT:
-              id = addWavePorts(t, chpup, id, mm, ch, 1, isOutput);
-              id = addInPorts(t, chpup, id, mm, ch, 1, isOutput);
-              id = addGroupPorts(t, chpup, id, mm, ch, 1, isOutput);
-              id = addAuxPorts(t, chpup, id, mm, ch, 1, isOutput);
-              id = addSyntiPorts(t, chpup, id, mm, ch, 1, isOutput);
-              break;
-        case Track::WAVE:
-              //id = addInPorts(t, chpup, id, mm, ch, 1, isOutput);    // Rem p4.0.20
-              //break;
-        case Track::AUDIO_SOFTSYNTH:
-        case Track::AUDIO_GROUP:
-              id = addWavePorts(t, chpup, id, mm, ch, 1, isOutput);
-              id = addInPorts(t, chpup, id, mm, ch, 1, isOutput);
-              id = addGroupPorts(t, chpup, id, mm, ch, 1, isOutput);
-              id = addAuxPorts(t, chpup, id, mm, ch, 1, isOutput);     // p4.0.20
-              id = addSyntiPorts(t, chpup, id, mm, ch, 1, isOutput);
-              break;
-        default:
-              break;
-      }
-    }
-      
-    // If more than one channel, add the created sub-menu.
-    if(chans > 1)
-    {
-      char buffer[128];
-      snprintf(buffer, 128, "%s %d", pup->tr("Channel").toLatin1().constData(), ch+1);
-      chpup->setTitle(QString(buffer));
-      pup->addMenu(chpup);
-    }  
-  } 
-       
-  // For stereo listing, ignore odd numbered left-over channels.
-  chans -= 1;
-  if(chans > 0)
-  {
-    // Ignore odd numbered left-over channels.
-    //int schans = (chans & ~1) - 1;
-    
-    pup->addSeparator();
-    pup->addAction(new MenuTitleItem("<Stereo>", pup));
-  
-    //
-    // If it's more than two channels, create a sub-menu. If it's just two channels, don't bother with a sub-menu...
-    //
-    
-    chpup = pup;
-    if(chans <= 2)
-      // Just do one iteration.
-      chans = 1;
-    
-    for(int ch = 0; ch < chans; ++ch)
-    {
-      // If more than two channels, create the sub-menu.
-      if(chans > 2)
-        chpup = new PopupMenu(pup);
-      
-      if(isOutput)
-      {
-        switch(t->type()) 
-        {
-          case Track::AUDIO_INPUT:
-                //id = addWavePorts(t, chpup, id, mm, ch, 2, isOutput);   // Rem p4.0.20
-          case Track::WAVE:
-          case Track::AUDIO_GROUP:
-          case Track::AUDIO_SOFTSYNTH:
-          case Track::AUDIO_AUX:                                          // p4.0.20
-                id = addWavePorts(t, chpup, id, mm, ch, 2, isOutput);     // p4.0.20
-                id = addOutPorts(t, chpup, id, mm, ch, 2, isOutput);
-                id = addGroupPorts(t, chpup, id, mm, ch, 2, isOutput);
-                id = addSyntiPorts(t, chpup, id, mm, ch, 2, isOutput);
-                break;
-          //case Track::AUDIO_AUX:                                         // Rem p4.0.20
-          //      id = addOutPorts(t, chpup, id, mm, ch, 2, isOutput);
-          //      break;
-          default:
-                break;
-        }
-      }    
-      else
-      {
-        switch(t->type()) 
-        {
-          case Track::AUDIO_OUTPUT:
-                id = addWavePorts(t, chpup, id, mm, ch, 2, isOutput);
-                id = addInPorts(t, chpup, id, mm, ch, 2, isOutput);
-                id = addGroupPorts(t, chpup, id, mm, ch, 2, isOutput);
-                id = addAuxPorts(t, chpup, id, mm, ch, 2, isOutput);
-                id = addSyntiPorts(t, chpup, id, mm, ch, 2, isOutput);
-                break;
-          case Track::WAVE:
-                //id = addInPorts(t, chpup, id, mm, ch, 2, isOutput);   // Rem p4.0.20
-                //break;
-          case Track::AUDIO_SOFTSYNTH:
-          case Track::AUDIO_GROUP:
-                id = addWavePorts(t, chpup, id, mm, ch, 2, isOutput);
-                id = addInPorts(t, chpup, id, mm, ch, 2, isOutput);
-                id = addGroupPorts(t, chpup, id, mm, ch, 2, isOutput);
-                id = addAuxPorts(t, chpup, id, mm, ch, 2, isOutput);     // p4.0.20
-                id = addSyntiPorts(t, chpup, id, mm, ch, 2, isOutput);
-                break;
-          default:
-                break;
-        }
-      }
-      
-      // If more than two channels, add the created sub-menu.
-      if(chans > 2)
-      {
-        char buffer[128];
-        snprintf(buffer, 128, "%s %d,%d", pup->tr("Channel").toLatin1().constData(), ch+1, ch+2);
-        chpup->setTitle(QString(buffer));
-        pup->addMenu(chpup);
-      }  
-    } 
-  }
-  
-  return id;
-}
-
-//---------------------------------------------------------
-//   nonSyntiTrackAddSyntis
-//---------------------------------------------------------
-
-static int nonSyntiTrackAddSyntis(AudioTrack* t, PopupMenu* lb, int id, RouteMenuMap& mm, bool isOutput)
-{
-      RouteList* rl = isOutput ? t->outRoutes() : t->inRoutes();
-      
-      QAction* act;
-      SynthIList* al = song->syntis();
-      for (iSynthI i = al->begin(); i != al->end(); ++i) 
-      {
-            Track* track = *i;
-            if (t == track)
-                  continue;
-            
-            int toch = ((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;
-            
-            // totalInChannels is only used by syntis.
-            int chans = (!isOutput || track->type() != Track::AUDIO_SOFTSYNTH) ? toch : ((AudioTrack*)track)->totalInChannels();
-            
-            //int schans = synti->channels();
-            //if(schans < chans)
-            //  chans = schans;
-//            int tchans = (channels != -1) ? channels: t->channels();
-//            if(tchans == 2)
-//            {
-              // Ignore odd numbered left-over mono channel.
-              //chans = chans & ~1;
-              //if(chans != 0)
-//                chans -= 1;
-//            }
-            //int tchans = (channels != -1) ? channels: t->channels();
-            
-            if(chans > 0)
-            {
-              PopupMenu* chpup = new PopupMenu(lb);
-              chpup->setTitle(track->name());
-              if(chans > 1)
-                chpup->addAction(new MenuTitleItem("<Mono>", chpup));
-              
-              for(int ch = 0; ch < chans; ++ch)
-              {
-                char buffer[128];
-                snprintf(buffer, 128, "%s %d", chpup->tr("Channel").toLatin1().constData(), ch+1);
-                act = chpup->addAction(QString(buffer));
-                act->setData(id);
-                act->setCheckable(true);
-                
-                int ach = ch;
-                int bch = -1;
-                
-                Route rt(track, isOutput ? bch : ach, 1);
-                
-                rt.remoteChannel = isOutput ? ach : bch;
-                
-                mm.insert( pRouteMenuMap(id, rt) );
-                
-                for(iRoute ir = rl->begin(); ir != rl->end(); ++ir) 
-                {
-                  if(ir->type == Route::TRACK_ROUTE && ir->track == track && ir->remoteChannel == rt.remoteChannel)
-                  {
-                    int tcompch = rt.channel;
-                    if(tcompch == -1)
-                      tcompch = 0;
-                    int tcompchs = rt.channels;
-                    if(tcompchs == -1)
-                      tcompchs = isOutput ? t->channels() : track->channels();
-                    
-                    int compch = ir->channel;
-                    if(compch == -1)
-                      compch = 0;
-                    int compchs = ir->channels;
-                    if(compchs == -1)
-                      compchs = isOutput ? t->channels() : ir->track->channels();
-                    
-                    if(compch == tcompch && compchs == tcompchs) 
-                    {
-                      act->setChecked(true);
-                      break;
-                    }
-                  }
-                }
-                ++id;
-              }
-            
-              chans -= 1;
-              if(chans > 0)
-              {
-                // Ignore odd numbered left-over channels.
-                //int schans = (chans & ~1) - 1;
-                
-                chpup->addSeparator();
-                chpup->addAction(new MenuTitleItem("<Stereo>", chpup)); 
-              
-                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);
-                  act = chpup->addAction(QString(buffer));
-                  act->setData(id);
-                  act->setCheckable(true);
-                  
-                  int ach = ch;
-                  int bch = -1;
-                  
-                  Route rt(track, isOutput ? bch : ach, 2);
-                  
-                  rt.remoteChannel = isOutput ? ach : bch;
-                  
-                  mm.insert( pRouteMenuMap(id, rt) );
-                  
-                  for(iRoute ir = rl->begin(); ir != rl->end(); ++ir) 
-                  {
-                    if(ir->type == Route::TRACK_ROUTE && ir->track == track && ir->remoteChannel == rt.remoteChannel)
-                    {
-                      int tcompch = rt.channel;
-                      if(tcompch == -1)
-                        tcompch = 0;
-                      int tcompchs = rt.channels;
-                      if(tcompchs == -1)
-                        tcompchs = isOutput ? t->channels() : track->channels();
-                      
-                      int compch = ir->channel;
-                      if(compch == -1)
-                        compch = 0;
-                      int compchs = ir->channels;
-                      if(compchs == -1)
-                        compchs = isOutput ? t->channels() : ir->track->channels();
-                      
-                      if(compch == tcompch && compchs == tcompchs) 
-                      {
-                        act->setChecked(true);
-                        break;
-                      }
-                    }  
-                  }
-                  ++id;
-                }
-              }
-              
-              lb->addMenu(chpup);
-            }
-      }
-      return id;      
-}
-
-//---------------------------------------------------------
-//   addMidiPorts
-//---------------------------------------------------------
-
-static int addMidiPorts(AudioTrack* t, PopupMenu* pup, int id, RouteMenuMap& mm, bool isOutput)
-{
-  QAction* act;
-  for(int i = 0; i < MIDI_PORTS; ++i)
-  {
-    MidiPort* mp = &midiPorts[i];
-    MidiDevice* md = mp->device();
-    
-    // This is desirable, but could lead to 'hidden' routes unless we add more support
-    //  such as removing the existing routes when user changes flags.
-    // So for now, just list all valid ports whether read or write.
-    if(!md)
-      continue;
-    //if(!(md->rwFlags() & (isOutput ? 1 : 2)))
-    //  continue;
-          
-    // p4.0.17 Do not list synth devices!
-    if(md->isSynti())
-      continue;
-          
-   RouteList* rl = isOutput ? t->outRoutes() : t->inRoutes();
-    
-    PopupMenu* subp = new PopupMenu(pup);
-    subp->setTitle(md->name()); 
-    
-    int chanmask = 0;
-    // To reduce number of routes required, from one per channel to just one containing a channel mask. 
-    // Look for the first route to this midi port. There should always be only a single route for each midi port, now.
-    for(iRoute ir = rl->begin(); ir != rl->end(); ++ir)   
-    {
-      if(ir->type == Route::MIDI_PORT_ROUTE && ir->midiPort == i) 
-      {
-        // We have a route to the midi port. Grab the channel mask.
-        chanmask = ir->channel;
-        break;
-      }
-    }
-    
-    for(int ch = 0; ch < MIDI_CHANNELS; ++ch) 
-    {
-      act = subp->addAction(QString("Channel %1").arg(ch+1));
-      act->setCheckable(true);
-      act->setData(id);
-      
-      int chbit = 1 << ch;
-      Route srcRoute(i, chbit);    // In accordance with new channel mask, use the bit position.
-      
-      mm.insert( pRouteMenuMap(id, srcRoute) );
-      
-      if(chanmask & chbit)                  // Is the channel already set? Show item check mark.
-        act->setChecked(true);
-      
-      ++id;
-    }
-    
-    //gid = MIDI_PORTS * MIDI_CHANNELS + i;           // Make sure each 'toggle' item gets a unique id.
-    act = subp->addAction(QString("Toggle all"));
-    //act->setCheckable(true);
-    act->setData(id);
-    Route togRoute(i, (1 << MIDI_CHANNELS) - 1);    // Set all channel bits.
-    mm.insert( pRouteMenuMap(id, togRoute) );
-    ++id;
-    
-    pup->addMenu(subp);
-  }    
-  return id;      
-}
-
-//---------------------------------------------------------
-//   routingPopupMenuActivated
-//---------------------------------------------------------
-
-void AudioStrip::routingPopupMenuActivated(QAction* act)
-{
-      if(!track || gRoutingPopupMenuMaster != this || track->isMidiTrack())
-        return;
-      
-      PopupMenu* pup = muse->getRoutingPopupMenu();
-      
-      if(pup->actions().isEmpty())
-        return;
-        
-      AudioTrack* t = (AudioTrack*)track;
-      RouteList* rl = gIsOutRoutingPopupMenu ? t->outRoutes() : t->inRoutes();
-      
-      int n = act->data().toInt();
-      if (n == -1) 
-        return;
-      
-      iRouteMenuMap imm = gRoutingMenuMap.find(n);
-      if(imm == gRoutingMenuMap.end())
-        return;
-        
-      if(gIsOutRoutingPopupMenu)
-      {  
-        Route srcRoute(t, imm->second.channel, imm->second.channels);
-        srcRoute.remoteChannel = imm->second.remoteChannel;
-        
-        Route &dstRoute = imm->second;
-
-        // check if route src->dst exists:
-        iRoute irl = rl->begin();
-        for (; irl != rl->end(); ++irl) {
-              if (*irl == dstRoute)
-                    break;
-              }
-        if (irl != rl->end()) {
-              // disconnect if route exists
-              audio->msgRemoveRoute(srcRoute, dstRoute);
-              }
-        else {
-              // connect if route does not exist
-              audio->msgAddRoute(srcRoute, dstRoute);
-              }
-        audio->msgUpdateSoloStates();
-        song->update(SC_ROUTE);
-      }  
-      else
-      {
-        Route &srcRoute = imm->second;
-        
-        // Support Midi Port to Audio Input routes. p4.0.14 Tim.
-        if(track->type() == Track::AUDIO_INPUT && srcRoute.type == Route::MIDI_PORT_ROUTE)
-        {
-          int chbit = srcRoute.channel;
-          Route dstRoute(t, chbit);
-          int mdidx = srcRoute.midiPort;
-          int chmask = 0;                   
-          iRoute iir = rl->begin();
-          for (; iir != rl->end(); ++iir) 
-          {
-            if(iir->type == Route::MIDI_PORT_ROUTE && iir->midiPort == mdidx)    // Is there already a route to this port?
-            {
-              chmask = iir->channel;  // Grab the channel mask.
-              break;
-            }      
-          }
-          
-          if ((chmask & chbit) == chbit)             // Is the channel's bit(s) set?
-          {
-            //printf("astrip: removing src route ch:%d dst route ch:%d\n", srcRoute.channel, dstRoute.channel); 
-            audio->msgRemoveRoute(srcRoute, dstRoute);
-          }
-          else 
-          {
-            //printf("astrip: adding src route ch:%d dst route ch:%d\n", srcRoute.channel, dstRoute.channel); 
-            audio->msgAddRoute(srcRoute, dstRoute);
-          }
-          
-          audio->msgUpdateSoloStates();
-          song->update(SC_ROUTE);
-          return;
-        }
-        
-        Route dstRoute(t, imm->second.channel, imm->second.channels);
-        dstRoute.remoteChannel = imm->second.remoteChannel;
-
-        iRoute irl = rl->begin();
-        for (; irl != rl->end(); ++irl) {
-              if (*irl == srcRoute)
-                    break;
-              }
-        if (irl != rl->end()) {
-              // disconnect
-              audio->msgRemoveRoute(srcRoute, dstRoute);
-              }
-        else {
-              // connect
-              audio->msgAddRoute(srcRoute, dstRoute);
-              }
-        audio->msgUpdateSoloStates();
-        song->update(SC_ROUTE);
-      }
-}
-
-//---------------------------------------------------------
 //   iRoutePressed
 //---------------------------------------------------------
 
 void AudioStrip::iRoutePressed()
       {
-      //if(track->isMidiTrack() || (track->type() == Track::AUDIO_AUX) || (track->type() == Track::AUDIO_SOFTSYNTH))
-      if(!track || track->isMidiTrack() || track->type() == Track::AUDIO_AUX)
-      {
-        gRoutingPopupMenuMaster = 0;
-        return;
-      }
-        
-      QPoint ppt = QCursor::pos();
-      
-      PopupMenu* pup = muse->getRoutingPopupMenu();
-      pup->disconnect();
-      
-      AudioTrack* t = (AudioTrack*)track;
-      RouteList* irl = t->inRoutes();
-
-      QAction* act = 0;
-      int gid = 0;
-      //int id = 0;
-      
-      pup->clear();
-      gRoutingMenuMap.clear();
-      gid = 0;
-      
-      switch(track->type()) 
-      {
-        case Track::AUDIO_INPUT:
-        {
-          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);
-            pup->addAction(titel); 
-  
-            if(!checkAudioDevice())
-            { 
-              gRoutingPopupMenuMaster = 0;
-              pup->clear();
-              gRoutingMenuMap.clear();
-              iR->setDown(false);     
-              return;
-            }
-            std::list<QString> ol = audioDevice->outputPorts();
-            for(std::list<QString>::iterator ip = ol.begin(); ip != ol.end(); ++ip) 
-            {
-              //id = gid * 16 + i;        // IDs removed p4.0.14 Tim.
-              act = pup->addAction(*ip);
-              //act->setData(id);
-              act->setData(gid);
-              act->setCheckable(true);
-              
-              Route dst(*ip, true, i, Route::JACK_ROUTE);
-              //gRoutingMenuMap.insert( pRouteMenuMap(id, dst) );
-              gRoutingMenuMap.insert( pRouteMenuMap(gid, dst) );
-              ++gid;
-              for(iRoute ir = irl->begin(); ir != irl->end(); ++ir) 
-              {
-                if(*ir == dst) 
-                {
-                  act->setChecked(true);
-                  break;
-                }
-              }
-            }
-            if(i+1 != channel)
-              pup->addSeparator();
-          }
-          
-          // p4.0.14
-          //
-          // Display using separate menus for midi ports and audio outputs:
-          //
-          pup->addSeparator();
-          pup->addAction(new MenuTitleItem(tr("Soloing chain"), pup)); 
-          PopupMenu* subp = new PopupMenu(pup);
-          subp->setTitle(tr("Audio sends")); 
-          pup->addMenu(subp);
-          gid = addOutPorts(t, subp, gid, gRoutingMenuMap, -1, -1, false);  
-          subp = new PopupMenu(pup);
-          subp->setTitle(tr("Midi port sends")); 
-          pup->addMenu(subp);
-          addMidiPorts(t, subp, gid, gRoutingMenuMap, false);
-          //
-          // Display all in the same menu:
-          //
-          //pup->addAction(new MenuTitleItem(tr("Audio sends"), pup)); 
-          //gid = addOutPorts(t, pup, gid, gRoutingMenuMap, -1, -1, false);  
-          //pup->addSeparator();
-          //pup->addAction(new MenuTitleItem(tr("Midi sends"), pup)); 
-          //addMidiPorts(t, pup, gid, gRoutingMenuMap, false);
-        }
-        break;
-        //case Track::AUDIO_OUTPUT:
-        //case Track::WAVE:
-        //case Track::AUDIO_GROUP:
-        
-        case Track::AUDIO_OUTPUT:
-              gid = addWavePorts( t, pup, gid, gRoutingMenuMap, -1, -1, false);
-              gid = addInPorts(   t, pup, gid, gRoutingMenuMap, -1, -1, false);
-              gid = addGroupPorts(t, pup, gid, gRoutingMenuMap, -1, -1, false);
-              gid = addAuxPorts(  t, pup, gid, gRoutingMenuMap, -1, -1, false);
-              gid = nonSyntiTrackAddSyntis(t, pup, gid, gRoutingMenuMap, false);
-              break;
-        case Track::WAVE:
-              gid = addWavePorts( t, pup, gid, gRoutingMenuMap, -1, -1, false);  // p4.0.20
-              gid = addInPorts(   t, pup, gid, gRoutingMenuMap, -1, -1, false);
-              gid = addGroupPorts(t, pup, gid, gRoutingMenuMap, -1, -1, false);  //
-              gid = addAuxPorts(  t, pup, gid, gRoutingMenuMap, -1, -1, false);  //
-              gid = nonSyntiTrackAddSyntis(t, pup, gid, gRoutingMenuMap, false); //
-              break;
-        case Track::AUDIO_GROUP:
-              gid = addWavePorts( t, pup, gid, gRoutingMenuMap, -1, -1, false);
-              gid = addInPorts(   t, pup, gid, gRoutingMenuMap, -1, -1, false);
-              gid = addGroupPorts(t, pup, gid, gRoutingMenuMap, -1, -1, false);
-              gid = addAuxPorts(  t, pup, gid, gRoutingMenuMap, -1, -1, false);  // p4.0.20
-              gid = nonSyntiTrackAddSyntis(t, pup, gid, gRoutingMenuMap, false);
-              break;
-        
-        case Track::AUDIO_SOFTSYNTH:
-              gid = addMultiChannelPorts(t, pup, gid, gRoutingMenuMap, false);
-              break;
-        default:
-              gRoutingPopupMenuMaster = 0;
-              pup->clear();
-              gRoutingMenuMap.clear();
-              iR->setDown(false);     
-              return;
-      }  
-      
-      if(pup->actions().isEmpty())
-      {
-        gRoutingPopupMenuMaster = 0;
-        gRoutingMenuMap.clear();
-        iR->setDown(false);     
-        return;
-      }
-      
-      gIsOutRoutingPopupMenu = false;
-      gRoutingPopupMenuMaster = this;
-      connect(pup, SIGNAL(triggered(QAction*)), SLOT(routingPopupMenuActivated(QAction*)));
-      connect(pup, SIGNAL(aboutToHide()), muse, SLOT(routingPopupMenuAboutToHide()));
-      pup->popup(ppt);
+      RoutePopupMenu* pup = muse->getRoutingPopupMenu();
       iR->setDown(false);     
+      pup->exec(QCursor::pos(), track, false);
       }
       
 //---------------------------------------------------------
@@ -1907,136 +989,8 @@ void AudioStrip::iRoutePressed()
 
 void AudioStrip::oRoutePressed()
 {
-      if(!track || track->isMidiTrack())
-      {
-        gRoutingPopupMenuMaster = 0;
-        return;
-      }
-        
-      QPoint ppt = QCursor::pos();
-      
-      PopupMenu* pup = muse->getRoutingPopupMenu();
-      pup->disconnect();
-      
-      AudioTrack* t = (AudioTrack*)track;
-      RouteList* orl = t->outRoutes();
-
-      QAction* act = 0;
-      int gid = 0;
-      //int id = 0;
-      
-      pup->clear();
-      gRoutingMenuMap.clear();
-      gid = 0;
-      
-      switch(track->type()) 
-      {
-        case Track::AUDIO_OUTPUT:
-        {
-          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);
-            pup->addAction(titel); 
-  
-            if(!checkAudioDevice())
-            { 
-              gRoutingPopupMenuMaster = 0;
-              pup->clear();
-              gRoutingMenuMap.clear();
-              oR->setDown(false);     
-              return;
-            }
-            std::list<QString> ol = audioDevice->inputPorts();
-            for(std::list<QString>::iterator ip = ol.begin(); ip != ol.end(); ++ip) 
-            {
-              //id = gid * 16 + i;        // IDs removed p4.0.14 Tim.
-              act = pup->addAction(*ip);
-              //act->setData(id);
-              act->setData(gid);
-              act->setCheckable(true);
-              
-              Route dst(*ip, true, i, Route::JACK_ROUTE);
-              //gRoutingMenuMap.insert( pRouteMenuMap(id, dst) );
-              gRoutingMenuMap.insert( pRouteMenuMap(gid, dst) );
-              ++gid;
-              for(iRoute ir = orl->begin(); ir != orl->end(); ++ir) 
-              {
-                if(*ir == dst) 
-                {
-                  act->setChecked(true);
-                  break;
-                }
-              }
-            }
-            if(i+1 != channel)
-              pup->addSeparator();
-          }      
-          
-          // p4.0.14
-          //
-          // Display using separate menu for audio inputs:
-          //
-          pup->addSeparator();
-          pup->addAction(new MenuTitleItem(tr("Soloing chain"), pup)); 
-          PopupMenu* subp = new PopupMenu(pup);
-          subp->setTitle(tr("Audio returns")); 
-          pup->addMenu(subp);
-          gid = addInPorts(t, subp, gid, gRoutingMenuMap, -1, -1, true);  
-          //
-          // Display all in the same menu:
-          //
-          //pup->addSeparator();
-          //MenuTitleItem* title = new MenuTitleItem(tr("Audio returns"), pup);
-          //pup->addAction(title); 
-          //gid = addInPorts(t, pup, gid, gRoutingMenuMap, -1, -1, true);  
-        }
-        break;
-        //case Track::AUDIO_INPUT:
-        //case Track::WAVE:
-        //case Track::AUDIO_GROUP:
-
-        case Track::AUDIO_SOFTSYNTH:
-              gid = addMultiChannelPorts(t, pup, gid, gRoutingMenuMap, true);
-        break;
-        
-        case Track::AUDIO_INPUT:
-              //gid = addWavePorts(        t, pup, gid, gRoutingMenuMap, -1, -1, true);  // Rem p4.0.20
-        case Track::WAVE:
-        case Track::AUDIO_GROUP:
-        case Track::AUDIO_AUX:
-        //case Track::AUDIO_SOFTSYNTH:
-              gid = addWavePorts(        t, pup, gid, gRoutingMenuMap, -1, -1, true);  // p4.0.20
-              gid = addOutPorts(         t, pup, gid, gRoutingMenuMap, -1, -1, true);
-              gid = addGroupPorts(       t, pup, gid, gRoutingMenuMap, -1, -1, true);
-              gid = nonSyntiTrackAddSyntis(t, pup, gid, gRoutingMenuMap, true);
-        break;
-        //case Track::AUDIO_AUX:
-        //      gid = addOutPorts(         t, pup, gid, gRoutingMenuMap, -1, -1, true);
-        //break;
-        
-        default:
-              gRoutingPopupMenuMaster = 0;
-              pup->clear();
-              gRoutingMenuMap.clear();
-              oR->setDown(false);     
-              return;
-      }
-      
-      if(pup->actions().isEmpty())
-      {
-        gRoutingPopupMenuMaster = 0;
-        gRoutingMenuMap.clear();
-        oR->setDown(false);     
-        return;
-      }
-      
-      gIsOutRoutingPopupMenu = true;
-      gRoutingPopupMenuMaster = this;
-      connect(pup, SIGNAL(triggered(QAction*)), SLOT(routingPopupMenuActivated(QAction*)));
-      connect(pup, SIGNAL(aboutToHide()), muse, SLOT(routingPopupMenuAboutToHide()));
-      pup->popup(ppt);
+      RoutePopupMenu* pup = muse->getRoutingPopupMenu();
       oR->setDown(false);     
+      pup->exec(QCursor::pos(), track, true);
 }
 
diff --git a/muse2/muse/mixer/astrip.h b/muse2/muse/mixer/astrip.h
index 10d75305..92867033 100644
--- a/muse2/muse/mixer/astrip.h
+++ b/muse2/muse/mixer/astrip.h
@@ -12,7 +12,7 @@
 #include <vector>
 
 #include "strip.h"
-#include "route.h"
+//#include "route.h"
 
 class Slider;
 class Knob;
@@ -20,7 +20,7 @@ class Knob;
 class QToolButton;
 //class QAction;
 //class QPopupMenu;
-class PopupMenu;
+//class PopupMenu;
 class QButton;
 class TransparentToolButton;
 class AudioTrack;
@@ -61,7 +61,6 @@ class AudioStrip : public Strip {
       void updateVolume();
       void updatePan();
       void updateChannels();
-      //void updateRouteMenus();
 
    private slots:
       void stereoToggled(bool);
@@ -69,7 +68,6 @@ class AudioStrip : public Strip {
       void offToggled(bool);
       void iRoutePressed();
       void oRoutePressed();
-      void routingPopupMenuActivated(QAction*);
       void auxChanged(double, int);
       void volumeChanged(double);
       void volumePressed();
diff --git a/muse2/muse/mixer/mstrip.cpp b/muse2/muse/mixer/mstrip.cpp
index 427f9ed6..d773708a 100644
--- a/muse2/muse/mixer/mstrip.cpp
+++ b/muse2/muse/mixer/mstrip.cpp
@@ -43,7 +43,8 @@
 #include "gconfig.h"
 #include "ttoolbutton.h"
 //#include "utils.h"
-#include "popupmenu.h"
+//#include "popupmenu.h"
+#include "routepopup.h"
 
 enum { KNOB_PAN, KNOB_VAR_SEND, KNOB_REV_SEND, KNOB_CHO_SEND };
 
@@ -503,26 +504,17 @@ void MidiStrip::songChanged(int val)
       if (val & SC_TRACK_MODIFIED)
       {
             setLabelText();
-            // Added by Tim. p3.3.9
             setLabelFont();
             
       }      
-      // Added by Tim. p3.3.9
       
-      // Catch when label font changes.
+      // Catch when label font changes. Tim. p3.3.9
       if (val & SC_CONFIG)
       {
         // Set the strip label's font.
         //label->setFont(config.fonts[1]);
         setLabelFont();
       }  
-      
-      // p3.3.47 Update the routing popup menu if anything relevant changes.
-      //if(gRoutingPopupMenuMaster == this && track && (val & (SC_ROUTE | SC_CHANNELS | SC_CONFIG))) 
-      if(val & (SC_ROUTE | SC_CHANNELS | SC_CONFIG))      // p3.3.50
-        // Use this handy shared routine.
-        //muse->updateRouteMenus(track);
-        muse->updateRouteMenus(track, this);              // p3.3.50
     }
 
 //---------------------------------------------------------
@@ -1007,35 +999,14 @@ void MidiStrip::setReverbSend(double val)
       }
       
 //---------------------------------------------------------
-//   routingPopupMenuActivated
-//---------------------------------------------------------
-
-void MidiStrip::routingPopupMenuActivated(QAction* act)
-{
-  if(gRoutingPopupMenuMaster != this || !track || !track->isMidiTrack())
-    return;
-  
-  muse->routingPopupMenuActivated(track, act->data().toInt());
-}
-
-//---------------------------------------------------------
 //   iRoutePressed
 //---------------------------------------------------------
 
 void MidiStrip::iRoutePressed()
 {
-  if(!track || !track->isMidiTrack())
-    return;
-  
-  PopupMenu* pup = muse->prepareRoutingPopupMenu(track, false);
-  if(!pup)
-    return;
-  
-  gRoutingPopupMenuMaster = this;
-  connect(pup, SIGNAL(triggered(QAction*)), SLOT(routingPopupMenuActivated(QAction*)));
-  connect(pup, SIGNAL(aboutToHide()), muse, SLOT(routingPopupMenuAboutToHide()));
-  pup->popup(QCursor::pos());
+  RoutePopupMenu* pup = muse->getRoutingPopupMenu();
   iR->setDown(false);     
+  pup->exec(QCursor::pos(), track, false);
 }
 
 //---------------------------------------------------------
@@ -1044,18 +1015,9 @@ void MidiStrip::iRoutePressed()
 
 void MidiStrip::oRoutePressed()
 {
-  if(!track || !track->isMidiTrack())
-    return;
-  
-  PopupMenu* pup = muse->prepareRoutingPopupMenu(track, true);
-  if(!pup)
-    return;
-  
-  gRoutingPopupMenuMaster = this;
-  connect(pup, SIGNAL(triggered(QAction*)), SLOT(routingPopupMenuActivated(QAction*)));
-  connect(pup, SIGNAL(aboutToHide()), muse, SLOT(routingPopupMenuAboutToHide()));
-  pup->popup(QCursor::pos());
+  RoutePopupMenu* pup = muse->getRoutingPopupMenu();
   oR->setDown(false);     
+  pup->exec(QCursor::pos(), track, true);
 }
 
 
diff --git a/muse2/muse/mixer/mstrip.h b/muse2/muse/mixer/mstrip.h
index 920cca99..39b55d21 100644
--- a/muse2/muse/mixer/mstrip.h
+++ b/muse2/muse/mixer/mstrip.h
@@ -32,9 +32,6 @@ class MidiStrip : public Strip {
       Slider* slider;
       DoubleLabel* sl;
       TransparentToolButton* off;
-      //QToolButton* route;
-      //QToolButton* iR;
-      //QToolButton* oR;
 
       struct KNOB {
             Knob* knob;
@@ -55,11 +52,9 @@ class MidiStrip : public Strip {
       void updateOffState();
    
    private slots:
-      //void routeClicked();
       void offToggled(bool);
       void iRoutePressed();
       void oRoutePressed();
-      void routingPopupMenuActivated(QAction*);
       void setVolume(double);
       void setPan(double);
       void setChorusSend(double);
diff --git a/muse2/muse/mixer/rack.h b/muse2/muse/mixer/rack.h
index 33c846bd..2b1bbb66 100644
--- a/muse2/muse/mixer/rack.h
+++ b/muse2/muse/mixer/rack.h
@@ -24,8 +24,11 @@ class Xml;
 //---------------------------------------------------------
 
 class EffectRack : public QListWidget {
-      AudioTrack* track;
       Q_OBJECT
+    
+    
+      AudioTrack* track;
+      
 
       virtual QSize minimumSizeHint() const;
       virtual QSize sizeHint() const;
diff --git a/muse2/muse/mplugins/mrconfig.cpp b/muse2/muse/mplugins/mrconfig.cpp
index f64384af..1a55c826 100644
--- a/muse2/muse/mplugins/mrconfig.cpp
+++ b/muse2/muse/mplugins/mrconfig.cpp
@@ -26,12 +26,14 @@ MRConfig::MRConfig(QWidget* parent, Qt::WFlags fl)
       sb2->setValue(rcRecordNote);
       sb3->setValue(rcGotoLeftMarkNote);
       sb4->setValue(rcPlayNote);
+      steprec_box->setValue(rcSteprecNote);
 
       connect(b1,  SIGNAL(toggled(bool)), SLOT(setRcEnable(bool)));
       connect(sb1, SIGNAL(valueChanged(int)), SLOT(setRcStopNote(int)));
       connect(sb2, SIGNAL(valueChanged(int)), SLOT(setRcRecordNote(int)));
       connect(sb3, SIGNAL(valueChanged(int)), SLOT(setRcGotoLeftMarkNote(int)));
       connect(sb4, SIGNAL(valueChanged(int)), SLOT(setRcPlayNote(int)));
+      connect(steprec_box, SIGNAL(valueChanged(int)), SLOT(setRcSteprecNote(int)));
       }
 
 //---------------------------------------------------------
@@ -69,3 +71,8 @@ void MRConfig::setRcPlayNote(int val)
       rcPlayNote = val;
       }
 
+void MRConfig::setRcSteprecNote(int val)
+      {
+      rcSteprecNote = val;
+      }
+
diff --git a/muse2/muse/mplugins/mrconfig.h b/muse2/muse/mplugins/mrconfig.h
index e829c15c..5e4b38af 100644
--- a/muse2/muse/mplugins/mrconfig.h
+++ b/muse2/muse/mplugins/mrconfig.h
@@ -32,6 +32,7 @@ class MRConfig : public QWidget, public Ui::MRConfigBase {
       void setRcRecordNote(int);
       void setRcGotoLeftMarkNote(int);
       void setRcPlayNote(int);
+      void setRcSteprecNote(int);
 
    public:
       MRConfig(QWidget* parent=0, Qt::WFlags fl = 0);
diff --git a/muse2/muse/mplugins/mrconfigbase.ui b/muse2/muse/mplugins/mrconfigbase.ui
index ed04c334..18050c78 100644
--- a/muse2/muse/mplugins/mrconfigbase.ui
+++ b/muse2/muse/mplugins/mrconfigbase.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>298</width>
-    <height>249</height>
+    <height>267</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -95,19 +95,29 @@
        </widget>
       </item>
       <item row="0" column="1">
-       <widget class="PitchEdit" name="sb1" native="true"/>
+       <widget class="Awl::PitchEdit" name="sb1"/>
       </item>
       <item row="1" column="1">
-       <widget class="PitchEdit" name="sb2" native="true"/>
+       <widget class="Awl::PitchEdit" name="sb2"/>
       </item>
       <item row="2" column="1">
-       <widget class="PitchEdit" name="sb3" native="true"/>
+       <widget class="Awl::PitchEdit" name="sb3"/>
       </item>
       <item row="3" column="1">
-       <widget class="PitchEdit" name="sb4" native="true"/>
+       <widget class="Awl::PitchEdit" name="sb4"/>
       </item>
-      <item row="0" column="2">
-       <spacer name="Spacer1">
+      <item row="4" column="1">
+       <widget class="Awl::PitchEdit" name="steprec_box"/>
+      </item>
+      <item row="4" column="0">
+       <widget class="QLabel" name="label">
+        <property name="text">
+         <string>Insert rest (step rec) </string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="2">
+       <spacer name="Spacer4">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
@@ -122,8 +132,8 @@
         </property>
        </spacer>
       </item>
-      <item row="1" column="2">
-       <spacer name="Spacer2">
+      <item row="2" column="2">
+       <spacer name="Spacer3">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
@@ -138,8 +148,8 @@
         </property>
        </spacer>
       </item>
-      <item row="2" column="2">
-       <spacer name="Spacer3">
+      <item row="1" column="2">
+       <spacer name="Spacer2">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
@@ -154,8 +164,8 @@
         </property>
        </spacer>
       </item>
-      <item row="3" column="2">
-       <spacer name="Spacer4">
+      <item row="0" column="2">
+       <spacer name="Spacer1">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
@@ -178,9 +188,9 @@
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
-   <class>PitchEdit</class>
-   <extends>QWidget</extends>
-   <header>pitchedit.h</header>
+   <class>Awl::PitchEdit</class>
+   <extends>QSpinBox</extends>
+   <header>awl/pitchedit.h</header>
   </customwidget>
  </customwidgets>
  <includes>
diff --git a/muse2/muse/node.cpp b/muse2/muse/node.cpp
index 114b03d3..06dbbc8d 100644
--- a/muse2/muse/node.cpp
+++ b/muse2/muse/node.cpp
@@ -1264,7 +1264,7 @@ bool AudioTrack::getData(unsigned pos, int channels, unsigned nframes, float** b
       printf("AudioTrack::getData name:%s inRoutes:%d\n", name().toLatin1().constData(), rl->size());
       #endif
       
-      iRoute ir = rl->begin();
+      ciRoute ir = rl->begin();
       if (ir == rl->end())
             return false;
       
diff --git a/muse2/muse/route.cpp b/muse2/muse/route.cpp
index 6f42c1f2..9425f056 100644
--- a/muse2/muse/route.cpp
+++ b/muse2/muse/route.cpp
@@ -187,7 +187,7 @@ void addRoute(Route src, Route dst)
               src.channel = dst.channel;
               //src.channels = dst.channels = 1;
               RouteList* inRoutes = dst.track->inRoutes();
-              for (iRoute i = inRoutes->begin(); i != inRoutes->end(); ++i) 
+              for (ciRoute i = inRoutes->begin(); i != inRoutes->end(); ++i) 
               {
                 if (*i == src)    // route already there
                 {
@@ -226,7 +226,7 @@ void addRoute(Route src, Route dst)
                 //dst.channel = -1;
                 
                 RouteList* routes = dst.device->inRoutes();
-                for (iRoute i = routes->begin(); i != routes->end(); ++i) 
+                for (ciRoute i = routes->begin(); i != routes->end(); ++i) 
                 {
                   if (*i == src)    // route already there
                   {
@@ -284,7 +284,7 @@ void addRoute(Route src, Route dst)
               dst.channel = src.channel;
               //dst.channels = src.channels = 1;
               
-              for (iRoute i = outRoutes->begin(); i != outRoutes->end(); ++i) 
+              for (ciRoute i = outRoutes->begin(); i != outRoutes->end(); ++i) 
               {
                     if (*i == dst)    // route already there
                     {
@@ -312,7 +312,7 @@ void addRoute(Route src, Route dst)
                 //dst.channels = src.channels = 1;
                 
                 RouteList* routes = src.device->outRoutes();
-                for (iRoute i = routes->begin(); i != routes->end(); ++i) 
+                for (ciRoute i = routes->begin(); i != routes->end(); ++i) 
                 {
                   if (*i == dst)    // route already there
                   {
@@ -616,7 +616,7 @@ void addRoute(Route src, Route dst)
             //    dst.channels = src.track->channels();  
             //}
             
-            for (iRoute i = outRoutes->begin(); i != outRoutes->end(); ++i) 
+            for (ciRoute i = outRoutes->begin(); i != outRoutes->end(); ++i) 
             {
                   if (*i == dst)    // route already there
                   // TODO:
@@ -1248,7 +1248,7 @@ bool checkRoute(const QString& s, const QString& d)
                     }
               src.channel = dst.channel;
               RouteList* inRoutes = dst.track->inRoutes();
-              for (iRoute i = inRoutes->begin(); i != inRoutes->end(); ++i) 
+              for (ciRoute i = inRoutes->begin(); i != inRoutes->end(); ++i) 
               {
                     if (*i == src) {   // route already there
                           return false;
@@ -1263,7 +1263,7 @@ bool checkRoute(const QString& s, const QString& d)
               src.channel = -1;
               //dst.channel = -1;
               RouteList* routes = dst.device->inRoutes();
-              for (iRoute i = routes->begin(); i != routes->end(); ++i) 
+              for (ciRoute i = routes->begin(); i != routes->end(); ++i) 
               {
                     if (*i == src) {   // route already there
                           return false;
@@ -1286,7 +1286,7 @@ bool checkRoute(const QString& s, const QString& d)
                     }
               RouteList* outRoutes = src.track->outRoutes();
               dst.channel = src.channel;
-              for (iRoute i = outRoutes->begin(); i != outRoutes->end(); ++i) 
+              for (ciRoute i = outRoutes->begin(); i != outRoutes->end(); ++i) 
               {
                     if (*i == dst) {   // route already there
                           return false;
@@ -1301,7 +1301,7 @@ bool checkRoute(const QString& s, const QString& d)
               //dst.channel = src.channel;
               dst.channel = -1;
               //src.channel = -1;
-              for (iRoute i = routes->begin(); i != routes->end(); ++i) 
+              for (ciRoute i = routes->begin(); i != routes->end(); ++i) 
               {
                     if (*i == dst) {   // route already there
                           return false;
@@ -1314,7 +1314,7 @@ bool checkRoute(const QString& s, const QString& d)
       else if (src.type == Route::MIDI_PORT_ROUTE) // p3.3.49
       {
             RouteList* outRoutes = midiPorts[src.midiPort].outRoutes();
-            for (iRoute i = outRoutes->begin(); i != outRoutes->end(); ++i) 
+            for (ciRoute i = outRoutes->begin(); i != outRoutes->end(); ++i) 
             {
                   if (*i == dst) {   // route already there
                         return false;
@@ -1330,7 +1330,7 @@ bool checkRoute(const QString& s, const QString& d)
             //                       src.device->outRoutes() : src.track->outRoutes();
             RouteList* outRoutes = (src.type == Route::MIDI_DEVICE_ROUTE) ? src.device->outRoutes() : src.track->outRoutes();
             
-            for (iRoute i = outRoutes->begin(); i != outRoutes->end(); ++i) 
+            for (ciRoute i = outRoutes->begin(); i != outRoutes->end(); ++i) 
             {
                   if (*i == dst) {   // route already there
                         return false;
diff --git a/muse2/muse/route.h b/muse2/muse/route.h
index 2f29bcf8..9809352c 100644
--- a/muse2/muse/route.h
+++ b/muse2/muse/route.h
@@ -9,9 +9,10 @@
 #ifndef __ROUTE_H__
 #define __ROUTE_H__
 
+#include <QMetaType>
+
 #include <vector>
 #include <map>
-
 #include "globaldefs.h"
 
 class QString;
@@ -71,6 +72,8 @@ struct Route {
       void dump() const;
       };
 
+// Allow Routes to be a QVariant
+Q_DECLARE_METATYPE(Route) ;
 
 //---------------------------------------------------------
 //   RouteList
@@ -93,11 +96,11 @@ extern bool checkRoute(const QString&, const QString&);
 //   RouteMenuMap
 //---------------------------------------------------------
 
-typedef std::map<int, Route, std::less<int> >::iterator iRouteMenuMap;
-typedef std::map<int, Route, std::less<int> >::const_iterator ciRouteMenuMap;
-typedef std::map<int, Route, std::less<int> > RouteMenuMap;
-typedef std::pair<int, Route> pRouteMenuMap;
-typedef std::pair<iRouteMenuMap, bool > rpRouteMenuMap;
+//typedef std::map<int, Route, std::less<int> >::iterator iRouteMenuMap;
+//typedef std::map<int, Route, std::less<int> >::const_iterator ciRouteMenuMap;
+//typedef std::map<int, Route, std::less<int> > RouteMenuMap;
+//typedef std::pair<int, Route> pRouteMenuMap;
+//typedef std::pair<iRouteMenuMap, bool > rpRouteMenuMap;
 
 #endif
 
diff --git a/muse2/muse/seqmsg.cpp b/muse2/muse/seqmsg.cpp
index 3fb91293..0aa74aaa 100644
--- a/muse2/muse/seqmsg.cpp
+++ b/muse2/muse/seqmsg.cpp
@@ -396,7 +396,7 @@ void Audio::msgSetChannels(AudioTrack* node, int n)
                 else if ((i >= n) && ai->jackPort(i)) 
                 {
                   RouteList* ir = node->inRoutes();
-                  for (iRoute ii = ir->begin(); ii != ir->end(); ++ii) 
+                  for (ciRoute ii = ir->begin(); ii != ir->end(); ++ii) 
                   {
                     Route r = *ii;
                     if ((r.type == Route::JACK_ROUTE) && (r.channel == i)) 
@@ -427,7 +427,7 @@ void Audio::msgSetChannels(AudioTrack* node, int n)
                         else if (i >= n && jp) 
                         {
                               RouteList* ir = node->outRoutes();
-                              for (iRoute ii = ir->begin(); ii != ir->end(); ++ii) 
+                              for (ciRoute ii = ir->begin(); ii != ir->end(); ++ii) 
                               {
                                     Route r = *ii;
                                     if ((r.type == Route::JACK_ROUTE) && (r.channel == i)) 
diff --git a/muse2/muse/song.cpp b/muse2/muse/song.cpp
index f781b8f0..6d0541a3 100644
--- a/muse2/muse/song.cpp
+++ b/muse2/muse/song.cpp
@@ -2926,7 +2926,7 @@ void Song::connectJackRoutes(AudioTrack* track, bool disconnect)
                     for(int ch = 0; ch < ao->channels(); ++ch)
                     {
                         RouteList* ir = ao->outRoutes();
-                        for (iRoute ii = ir->begin(); ii != ir->end(); ++ii)
+                        for (ciRoute ii = ir->begin(); ii != ir->end(); ++ii)
                         {
                             Route r = *ii;
                             if ((r.type == Route::JACK_ROUTE) && (r.channel == ch))
@@ -2959,7 +2959,7 @@ void Song::connectJackRoutes(AudioTrack* track, bool disconnect)
                         for(int ch = 0; ch < ai->channels(); ++ch)
                         {
                             RouteList* ir = ai->inRoutes();
-                            for (iRoute ii = ir->begin(); ii != ir->end(); ++ii)
+                            for (ciRoute ii = ir->begin(); ii != ir->end(); ++ii)
                             {
                                 Route r = *ii;
                                 if ((r.type == Route::JACK_ROUTE) && (r.channel == ch))
@@ -3685,8 +3685,8 @@ void Song::executeScript(const char* scriptfile, PartList* parts, int quant, boo
             //const char* tmp = tmpnam(NULL);
             char tmp[16] = "muse-tmp-XXXXXX";
             int fd = mkstemp(tmp);
-            printf("script input filename=%s\n",tmp);
-            //FILE *fp = fopen(tmp, "w");
+            if (debugMsg)
+              printf("executeScript: script input filename=%s\n",tmp);
             FILE *fp = fdopen(fd , "w");
             MidiPart *part = (MidiPart*)(i->second);
             int partStart = part->endTick()-part->lenTick();
@@ -3717,7 +3717,6 @@ void Song::executeScript(const char* scriptfile, PartList* parts, int quant, boo
             }
             fclose(fp);
 
-//            QString program(scriptfile);
             QStringList arguments;
             arguments << tmp;
 
@@ -3725,64 +3724,58 @@ void Song::executeScript(const char* scriptfile, PartList* parts, int quant, boo
             myProcess->start(scriptfile, arguments);
             myProcess->waitForFinished();
             QByteArray errStr = myProcess->readAllStandardError();
-            if (errStr.size()) {
-              QMessageBox::warning(muse, tr("MusE - external script failed"),
-                                   "Script returned the following error\n"+ QString(errStr));
-              endUndo(SC_EVENT_REMOVED);
-              return;
 
-            } else if (myProcess->exitCode()) {
+            if (myProcess->exitCode()) {
               QMessageBox::warning(muse, tr("MusE - external script failed"),
-                     tr("MusE was unable to launch the script\n")
+                                   tr("MusE was unable to launch the script, error message:\n ")+ QString(errStr)
                      );
               endUndo(SC_EVENT_REMOVED);
               return;
             }
-            else { // d0 the fun55or5!
-                  // TODO: Create a new part, update the entire editor from it, hehh....
+            if (errStr.size()> 0) {
+              printf("script execution produced the following error:\n%s\n", QString(errStr).toLatin1().data());
+            }
+            QFile file(tmp);
+            if ( file.open( QIODevice::ReadOnly ) ) {
+                QTextStream stream( &file );
+                QString line;
+                while ( !stream.atEnd() ) {
+                    line = stream.readLine(); // line of text excluding '\n'
+                    if (line.startsWith("NOTE"))
+                    {
+                        QStringList sl = line.split(" ");
+
+                          Event e(Note);
+                          int tick = sl[1].toInt();
+                          int pitch = sl[2].toInt();
+                          int len = sl[3].toInt();
+                          int velo = sl[4].toInt();
+                          e.setTick(tick);
+                          e.setPitch(pitch);
+                          e.setVelo(velo);
+                          e.setLenTick(len);
+                          // Indicate no undo, and do not do port controller values and clone parts.
+                          audio->msgAddEvent(e, part, false, false, false);
+                    }
+                    if (line.startsWith("CONTROLLER"))
+                    {
+                          QStringList sl = line.split(" ");
+
+                          Event e(Controller);
+                          //int tick = sl[1].toInt();
+                          int a = sl[2].toInt();
+                          int b = sl[3].toInt();
+                          int c = sl[4].toInt();
+                          e.setA(a);
+                          e.setB(b);
+                          e.setB(c);
+                          // Indicate no undo, and do not do port controller values and clone parts.
+                          audio->msgAddEvent(e, part, false, false, false);
+                        }
+                }
+                file.close();
+            }
 
-                  QFile file(tmp);
-                  if ( file.open( QIODevice::ReadOnly ) ) {
-                      QTextStream stream( &file );
-                      QString line;
-                      while ( !stream.atEnd() ) {
-                          line = stream.readLine(); // line of text excluding '\n'
-                          if (line.startsWith("NOTE"))
-                          {
-                              QStringList sl = line.split(" ");
-
-                                Event e(Note);
-                                int tick = sl[1].toInt();
-                                int pitch = sl[2].toInt();
-                                int len = sl[3].toInt();
-                                int velo = sl[4].toInt();
-                                //printf ("tick=%d pitch=%d velo=%d len=%d\n", tick,pitch,velo,len);
-                                e.setTick(tick);
-                                e.setPitch(pitch);
-                                e.setVelo(velo);
-                                e.setLenTick(len);
-                                // Indicate no undo, and do not do port controller values and clone parts.
-                                audio->msgAddEvent(e, part, false, false, false);
-                          }
-                          if (line.startsWith("CONTROLLER"))
-                          {
-                                QStringList sl = line.split(" ");
-
-                                Event e(Controller);
-                                int a = sl[2].toInt();
-                                int b = sl[3].toInt();
-                                int c = sl[4].toInt();
-                                //printf ("tick=%d a=%d b=%d c=%d\n", tick,a,b,c);
-                                e.setA(a);
-                                e.setB(b);
-                                e.setB(c);
-                                // Indicate no undo, and do not do port controller values and clone parts.
-                                audio->msgAddEvent(e, part, false, false, false);
-                              }
-                      }
-                      file.close();
-                  }
-              }
 
       remove(tmp);
       }
diff --git a/muse2/muse/song.h b/muse2/muse/song.h
index 17d70833..fd88b278 100644
--- a/muse2/muse/song.h
+++ b/muse2/muse/song.h
@@ -147,7 +147,7 @@ class Song : public QObject {
       Song(const char* name = 0);
       ~Song();
 
-      void applyOperationGroup(Undo& group, bool doUndo=true);
+      bool applyOperationGroup(Undo& group, bool doUndo=true);
 
       void putEvent(int pv);
       void endMsgCmd();
@@ -164,7 +164,7 @@ class Song : public QObject {
       AudioOutput* bounceOutput;
       void updatePos();
 
-      void read(Xml&);
+      void read(Xml&, bool isTemplate=false);
       void write(int, Xml&) const;
       void writeFont(int level, Xml& xml, const char* name,
          const QFont& font) const;
diff --git a/muse2/muse/songfile.cpp b/muse2/muse/songfile.cpp
index a8134b1d..72cacfaa 100644
--- a/muse2/muse/songfile.cpp
+++ b/muse2/muse/songfile.cpp
@@ -1213,7 +1213,7 @@ void Song::readMarker(Xml& xml)
 //   read
 //---------------------------------------------------------
 
-void Song::read(Xml& xml)
+void Song::read(Xml& xml, bool isTemplate)
       {
       cloneList.clear();
       for (;;) {
@@ -1260,7 +1260,7 @@ void Song::read(Xml& xml)
                               _follow  = FollowMode(xml.parseInt());
                         else if (tag == "sampleRate") {
                               int sRate  = xml.parseInt();
-                              if (audioDevice->deviceType() != AudioDevice::DUMMY_AUDIO && sRate != sampleRate)
+                              if (!isTemplate && audioDevice->deviceType() != AudioDevice::DUMMY_AUDIO && sRate != sampleRate)
                                 QMessageBox::warning(muse,"Wrong sample rate", "The sample rate in this project and the current system setting differs, the project may not work as intended!");
                             }
                         else if (tag == "tempolist") {
@@ -1373,7 +1373,7 @@ void Song::read(Xml& xml)
 //    read song
 //---------------------------------------------------------
 
-void MusE::read(Xml& xml, bool skipConfig)
+void MusE::read(Xml& xml, bool skipConfig, bool isTemplate)
       {
       bool skipmode = true;
       for (;;) {
@@ -1398,7 +1398,7 @@ void MusE::read(Xml& xml, bool skipConfig)
                                     readConfiguration(xml, false);
                         else if (tag == "song")
                         {
-                              song->read(xml);
+                              song->read(xml, isTemplate);
                               audio->msgUpdateSoloStates();
                         }      
                         else if (tag == "midiport")
diff --git a/muse2/muse/steprec.cpp b/muse2/muse/steprec.cpp
new file mode 100644
index 00000000..29cb9540
--- /dev/null
+++ b/muse2/muse/steprec.cpp
@@ -0,0 +1,159 @@
+//=========================================================
+//  MusE
+//  Linux Music Editor
+//  steprec.cpp
+//  (C) Copyright 2011 Florian Jung (flo93@users.sourceforge.net)
+//=========================================================
+
+#include "steprec.h"
+#include "part.h"
+#include "event.h"
+#include "globals.h"
+
+#include "song.h"
+#include "audio.h"
+
+#include <set>
+
+#define CHORD_TIMEOUT 75
+
+StepRec::StepRec(bool* note_held_down_array)
+{
+	note_held_down=note_held_down_array;
+
+	chord_timer=new QTimer(this);
+	chord_timer->setSingleShot(true);
+	chord_timer->setInterval(CHORD_TIMEOUT);
+	chord_timer->stop();
+	connect(chord_timer, SIGNAL(timeout()), SLOT(timeout()));
+}
+
+void StepRec::timeout()
+{
+	if (chord_timer_set_to_tick != song->cpos())
+	{
+		Pos p(chord_timer_set_to_tick, true);
+		song->setPos(0, p, true, false, true);
+	}
+}
+
+void StepRec::record(Part* part, int pitch, int len, int step, int velo, bool ctrl, bool shift)
+{
+	       unsigned tick = song->cpos();
+	       
+         if (pitch!=rcSteprecNote) {
+					  chord_timer->stop();
+					  
+            
+            //
+            // extend len of last note?
+            //
+            EventList* events = part->events();
+            if (ctrl) {
+                  for (iEvent i = events->begin(); i != events->end(); ++i) {
+                        Event ev = i->second;
+                        if (!ev.isNote())
+                              continue;
+                        if (ev.pitch() == pitch && ((ev.tick() + ev.lenTick()) == tick)) {
+                              Event e = ev.clone();
+                              e.setLenTick(ev.lenTick() + len);
+                              // Indicate do undo, and do not do port controller values and clone parts. 
+                              audio->msgChangeEvent(ev, e, part, true, false, false);
+                              
+                              if (!shift) {
+                                    chord_timer_set_to_tick = tick + step;
+                                    chord_timer->start();
+                                    }
+                              return;
+                              }
+                        }
+                  }
+
+            //
+            // if we already entered the note, delete it
+            //
+            EventRange range = events->equal_range(tick);
+            for (iEvent i = range.first; i != range.second; ++i) {
+                  Event ev = i->second;
+                  if (ev.isNote() && ev.pitch() == pitch) {
+                        // Indicate do undo, and do not do port controller values and clone parts. 
+                        //audio->msgDeleteEvent(ev, part);
+                        audio->msgDeleteEvent(ev, part, true, false, false);
+
+                        if (!shift) {
+                              chord_timer_set_to_tick = tick + step;
+                              chord_timer->start();
+                              }
+                        
+                        return;
+                        }
+                  }
+                  
+            Event e(Note);
+            e.setTick(tick - part->tick());
+            e.setPitch(pitch);
+            e.setVelo(velo);
+            e.setLenTick(len);
+            // Indicate do undo, and do not do port controller values and clone parts. 
+            //audio->msgAddEvent(e, part);
+            audio->msgAddEvent(e, part, true, false, false);
+            
+            if (! (globalKeyState & Qt::ShiftModifier)) {
+                  chord_timer_set_to_tick = tick + step;
+                  chord_timer->start();
+                  }
+            }
+         else { // equals if (pitch==rcSteprecNote)
+            bool held_notes=false;
+            if (note_held_down!=NULL)
+            {
+							for (int i=0;i<128;i++)
+								 if (note_held_down[i]) { held_notes=true; break; }
+						}
+						else
+							held_notes=false;
+								 
+            
+            if (held_notes)
+            {
+                chord_timer->stop();
+                
+                // extend len of last note(s)
+                using std::set;
+                
+                set<Event*> extend_set;
+                EventList* events = part->events();
+                for (iEvent i = events->begin(); i != events->end(); ++i) {
+                      Event& ev = i->second;
+                      if (!ev.isNote())
+                            continue;
+
+                      if (note_held_down[ev.pitch()] && ((ev.tick() + ev.lenTick()) == tick))
+                            extend_set.insert(&ev);
+                      }
+                for (set<Event*>::iterator it=extend_set.begin(); it!=extend_set.end(); it++)
+                {
+                    Event& ev=**it;
+                    Event e = ev.clone();
+                    e.setLenTick(ev.lenTick() + len);
+                    // Indicate do undo, and do not do port controller values and clone parts. 
+                    audio->msgChangeEvent(ev, e, part, true, false, false);
+                }
+
+                if (!shift) {
+                      chord_timer_set_to_tick = tick + step;
+                      chord_timer->start();
+                      }
+                return;
+               
+            }
+            else // equals if (!held_notes)
+            {
+              chord_timer->stop();
+
+              //simply proceed, inserting a rest
+              Pos p(song->cpos() + step, true);
+              song->setPos(0, p, true, false, true);
+            }
+            }
+}
diff --git a/muse2/muse/steprec.h b/muse2/muse/steprec.h
new file mode 100644
index 00000000..02eab46c
--- /dev/null
+++ b/muse2/muse/steprec.h
@@ -0,0 +1,35 @@
+//=========================================================
+//  MusE
+//  Linux Music Editor
+//  steprec.h
+//  (C) Copyright 2011 Florian Jung (flo93@users.sourceforge.net)
+//=========================================================
+
+#ifndef __STEPREC_H__
+#define __STEPREC_H__
+
+#include <QObject>
+#include <QTimer>
+
+#include "part.h"
+
+
+class StepRec : public QObject
+{
+	Q_OBJECT
+
+	public:
+		StepRec(bool* note_held_down_array);
+		
+		void record(Part* part,  int pitch, int len, int step, int velo=80, bool ctrl=false, bool shift=false);
+	
+	private slots:
+	  void timeout();
+	
+	private:
+		QTimer* chord_timer;
+		unsigned int chord_timer_set_to_tick; 
+		bool* note_held_down;
+};
+
+#endif
diff --git a/muse2/muse/synth.cpp b/muse2/muse/synth.cpp
index 521c7d63..4f43a02a 100644
--- a/muse2/muse/synth.cpp
+++ b/muse2/muse/synth.cpp
@@ -17,7 +17,7 @@
 #include <dlfcn.h>
 
 #include <QDir>
-#include <QMenu>
+//#include <QMenu>
 
 #include "app.h"
 #include "synth.h"
@@ -35,6 +35,7 @@
 #include "midiseq.h"
 #include "midictrl.h"
 //#include "stringparam.h"
+#include "popupmenu.h"
 
 std::vector<Synth*> synthis;  // array of available synthis
 
@@ -864,7 +865,7 @@ const char* MessSynthIF::getPatchName(int channel, int prog, MType type, bool dr
 //   populatePatchPopup
 //---------------------------------------------------------
 
-void MessSynthIF::populatePatchPopup(QMenu* menu, int ch, MType, bool)
+void MessSynthIF::populatePatchPopup(PopupMenu* menu, int ch, MType, bool)
       {
       menu->clear();
       const MidiPatch* mp = _mess->getPatchInfo(ch, 0);
diff --git a/muse2/muse/synth.h b/muse2/muse/synth.h
index b11ea2d9..88fa70b8 100644
--- a/muse2/muse/synth.h
+++ b/muse2/muse/synth.h
@@ -22,7 +22,8 @@
 
 #include <QFileInfo>
 
-class QMenu;
+//class QMenu;
+class PopupMenu;
 
 //class MidiEvent;
 class MidiPlayEvent;
@@ -147,7 +148,8 @@ class SynthIF {
       virtual void deactivate3() = 0;
       virtual const char* getPatchName(int, int, int, bool) const = 0;
       virtual const char* getPatchName(int, int, MType, bool) = 0;
-      virtual void populatePatchPopup(QMenu*, int, MType, bool) = 0;
+      //virtual void populatePatchPopup(QMenu*, int, MType, bool) = 0;
+      virtual void populatePatchPopup(PopupMenu*, int, MType, bool) = 0;
       virtual void write(int level, Xml& xml) const = 0;
       virtual float getParameter(unsigned long idx) const = 0;        
       virtual void setParameter(unsigned long idx, float value) = 0;  
@@ -231,7 +233,8 @@ class SynthI : public AudioTrack, public MidiDevice,
             return _sif->getPatchName(ch, prog, t, dr);
             }
             
-      virtual void populatePatchPopup(QMenu* m, int i, MType t, bool d) {
+      //virtual void populatePatchPopup(QMenu* m, int i, MType t, bool d) {
+      virtual void populatePatchPopup(PopupMenu* m, int i, MType t, bool d) {
             _sif->populatePatchPopup(m, i, t, d);
             }
       
@@ -313,7 +316,8 @@ class MessSynthIF : public SynthIF {
       virtual void deactivate3();
       virtual const char* getPatchName(int, int, int, bool) const { return ""; }
       virtual const char* getPatchName(int, int, MType, bool);
-      virtual void populatePatchPopup(QMenu*, int, MType, bool);
+      //virtual void populatePatchPopup(QMenu*, int, MType, bool);
+      virtual void populatePatchPopup(PopupMenu*, int, MType, bool);
       virtual void write(int level, Xml& xml) const;
       virtual float getParameter(unsigned long) const { return 0.0; }
       virtual void setParameter(unsigned long, float) {}
diff --git a/muse2/muse/ticksynth.cpp b/muse2/muse/ticksynth.cpp
index c5d3a1e7..7456b856 100644
--- a/muse2/muse/ticksynth.cpp
+++ b/muse2/muse/ticksynth.cpp
@@ -9,7 +9,8 @@
 #include "ticksynth.h"
 #include "default_click.h"
 
-#include <QMenu>
+//#include <QMenu>
+#include "popupmenu.h"
 
 // Added by Tim. p3.3.18
 //#define METRONOME_DEBUG
@@ -90,7 +91,8 @@ class MetronomeSynthIF : public SynthIF
       virtual void deactivate3() {}
       virtual const char* getPatchName(int, int, int, bool) const { return ""; }
       virtual const char* getPatchName(int, int, MType, bool) { return ""; }
-      virtual void populatePatchPopup(QMenu*, int, MType, bool) {};
+      //virtual void populatePatchPopup(QMenu*, int, MType, bool) {};
+      virtual void populatePatchPopup(PopupMenu*, int, MType, bool) {};
       virtual void write(int, Xml&) const {}
       virtual float getParameter(unsigned long) const  { return 0.0; }
       virtual void setParameter(unsigned long, float) {}
diff --git a/muse2/muse/track.cpp b/muse2/muse/track.cpp
index 2a93968d..5f358375 100644
--- a/muse2/muse/track.cpp
+++ b/muse2/muse/track.cpp
@@ -369,6 +369,7 @@ MidiTrack::MidiTrack()
       init();
       _events = new EventList;
       _mpevents = new MPEventList;
+      clefType=trebleClef;
       }
 
 //MidiTrack::MidiTrack(const MidiTrack& mt)
@@ -388,6 +389,7 @@ MidiTrack::MidiTrack(const MidiTrack& mt, bool cloneParts)
       len            = mt.len;
       compression    = mt.compression;
       _recEcho       = mt.recEcho();
+      clefType=trebleClef;
       }
 
 MidiTrack::~MidiTrack()
@@ -894,6 +896,7 @@ void MidiTrack::write(int level, Xml& xml) const
       xml.intTag(level, "len", len);
       xml.intTag(level, "compression", compression);
       xml.intTag(level, "automation", int(automationType()));
+      xml.intTag(level, "clef", int(clefType));
 
       const PartList* pl = cparts();
       for (ciPart p = pl->begin(); p != pl->end(); ++p)
@@ -955,6 +958,8 @@ void MidiTrack::read(Xml& xml)
                               _recEcho = xml.parseInt();
                         else if (tag == "automation")
                               setAutomationType(AutomationType(xml.parseInt()));
+                        else if (tag == "clef")
+                              clefType = (clefTypes)xml.parseInt();
                         else if (Track::readProperties(xml, tag)) {
                               // version 1.0 compatibility:
                               if (tag == "track" && xml.majorVersion() == 1 && xml.minorVersion() == 0)
diff --git a/muse2/muse/track.h b/muse2/muse/track.h
index aec765da..50870166 100644
--- a/muse2/muse/track.h
+++ b/muse2/muse/track.h
@@ -20,6 +20,7 @@
 #include "route.h"
 #include "ctrl.h"
 #include "globaldefs.h"
+#include "cleftypes.h"
 
 class Pipeline;
 class Xml;
@@ -208,6 +209,7 @@ class MidiTrack : public Track {
       EventList* _events;     // tmp Events during midi import
       MPEventList* _mpevents; // tmp Events druring recording
       static bool _isVisible;
+      clefTypes clefType;
 
    public:
       MidiTrack();
@@ -273,6 +275,9 @@ class MidiTrack : public Track {
       virtual bool canRecord() const  { return true; }
       static void setVisible(bool t) { _isVisible = t; }
       static bool visible() { return _isVisible; }
+
+      void setClef(clefTypes i) { clefType = i; }
+      clefTypes getClef() { return clefType; }
       };
 
 //---------------------------------------------------------
diff --git a/muse2/muse/transport.h b/muse2/muse/transport.h
index b2d3facf..ce8dcf1b 100644
--- a/muse2/muse/transport.h
+++ b/muse2/muse/transport.h
@@ -34,10 +34,12 @@ class Pos;
 //---------------------------------------------------------
 
 class TempoSig : public QWidget {
+    Q_OBJECT
+    
       DoubleLabel* l1;
       SigLabel* l2;
       QLabel* l3;
-      Q_OBJECT
+      
 
    private slots:
       void configChanged();
@@ -76,6 +78,8 @@ class TimeLLabel;
 
 class Transport : public QWidget
       {
+      Q_OBJECT
+    
       PosEdit* tl1;           // left mark
       PosEdit* tl2;           // right mark
       PosEdit* time1;         // tick time
@@ -99,9 +103,7 @@ class Transport : public QWidget
 
       Handle *lefthandle, *righthandle;
 
-      Q_OBJECT
-
-   private slots:
+ private slots:
       void cposChanged(const Pos&);
       void cposChanged(int);
       void lposChanged(const Pos&);
diff --git a/muse2/muse/undo.cpp b/muse2/muse/undo.cpp
index 2a11c3dc..c57bb5c1 100644
--- a/muse2/muse/undo.cpp
+++ b/muse2/muse/undo.cpp
@@ -186,6 +186,9 @@ void UndoList::clearDelete()
 
 void Song::startUndo()
       {
+      redoList->clear(); // added by flo93: redo must be invalidated when
+			redoAction->setEnabled(false);     // a new undo is started
+			
       undoList->push_back(Undo());
       updateFlags = 0;
       undoMode = true;
@@ -203,7 +206,7 @@ void Song::endUndo(int flags)
       }
 
 
-void Song::applyOperationGroup(Undo& group, bool doUndo)
+bool Song::applyOperationGroup(Undo& group, bool doUndo)
 {
       if (!group.empty())
       {
@@ -216,7 +219,16 @@ void Song::applyOperationGroup(Undo& group, bool doUndo)
                   undoList->pop_back();
                   undoAction->setEnabled(!undoList->empty());
             }
+            else
+            {
+                  redoList->clear(); // added by flo93: redo must be invalidated when
+                  redoAction->setEnabled(false);     // a new undo is started
+						}
+            
+            return doUndo;
       }
+      else
+            return false;
 }
 
 
diff --git a/muse2/muse/value.h b/muse2/muse/value.h
index 22aa9b5a..e5c74b20 100644
--- a/muse2/muse/value.h
+++ b/muse2/muse/value.h
@@ -18,9 +18,9 @@ class Xml;
 //---------------------------------------------------------
 
 class IValue : public QObject {
-      int val;
-
       Q_OBJECT
+    
+      int val;
 
    signals:
       void valueChanged(int);
@@ -39,9 +39,11 @@ class IValue : public QObject {
 //---------------------------------------------------------
 
 class BValue : public QObject {
+      Q_OBJECT
+    
       bool val;
 
-      Q_OBJECT
+      
 
    signals:
       void valueChanged(bool);
diff --git a/muse2/muse/vst.h b/muse2/muse/vst.h
index d41502e5..bb675c22 100644
--- a/muse2/muse/vst.h
+++ b/muse2/muse/vst.h
@@ -10,7 +10,8 @@
 
 #include "synth.h"
 
-class QMenu;
+//class QMenu;
+class PopupMenu;
 
 struct _FSTHandle;
 struct _FST;
@@ -76,7 +77,8 @@ class VstSynthIF : public SynthIF
       virtual void deactivate3();
       virtual const char* getPatchName(int, int, int, bool) const { return ""; }
       virtual const char* getPatchName(int, int, MType, bool) { return ""; }
-      virtual void populatePatchPopup(QMenu*, int, MType, bool) {};
+      //virtual void populatePatchPopup(QMenu*, int, MType, bool) {};
+      virtual void populatePatchPopup(PopupMenu*, int, MType, bool) {};
       virtual void write(int level, Xml& xml) const;
       virtual float getParameter(unsigned long idx) const;
       virtual void setParameter(unsigned long idx, float value);
diff --git a/muse2/muse/waveedit/waveedit.h b/muse2/muse/waveedit/waveedit.h
index e966a635..1ff8a65b 100644
--- a/muse2/muse/waveedit/waveedit.h
+++ b/muse2/muse/waveedit/waveedit.h
@@ -33,6 +33,8 @@ class QAction;
 //---------------------------------------------------------
 
 class WaveEdit : public MidiEditor {
+      Q_OBJECT
+    
       WaveView* view;
       QSlider* ymag;
       QToolBar* tools;
@@ -49,7 +51,7 @@ class WaveEdit : public MidiEditor {
       static int _widthInit, _heightInit;
       static QByteArray _toolbarInit;
 
-      Q_OBJECT
+      
       virtual void closeEvent(QCloseEvent*);
       virtual void keyPressEvent(QKeyEvent*);
       virtual void resizeEvent(QResizeEvent* ev);
diff --git a/muse2/muse/waveedit/waveview.h b/muse2/muse/waveedit/waveview.h
index c7992952..1a646af9 100644
--- a/muse2/muse/waveedit/waveview.h
+++ b/muse2/muse/waveedit/waveview.h
@@ -34,6 +34,8 @@ typedef std::list<WaveEventSelection>::iterator iWaveSelection;
 //---------------------------------------------------------
 
 class WaveView : public View {
+      Q_OBJECT
+    
       MidiEditor* editor;
       unsigned pos[3];
       int yScale;
@@ -50,7 +52,6 @@ class WaveView : public View {
 
       unsigned selectionStart, selectionStop, dragstartx;
 
-      Q_OBJECT
       virtual void pdraw(QPainter&, const QRect&);
       virtual void draw(QPainter&, const QRect&);
       virtual void viewMousePressEvent(QMouseEvent*);
diff --git a/muse2/muse/waveevent.cpp b/muse2/muse/waveevent.cpp
index 867ce5c8..9f81b7e3 100644
--- a/muse2/muse/waveevent.cpp
+++ b/muse2/muse/waveevent.cpp
@@ -151,7 +151,7 @@ void WaveEventBase::write(int level, Xml& xml, const Pos& offset, bool forcePath
 //off_t WaveEventBase::readAudio(SRC_STATE* src_state, off_t sfCurFrame, unsigned offset, float** buffer, int channel, int n, bool doSeek, bool overwrite)
 //off_t WaveEventBase::readAudio(AudioConverter* audConv, off_t sfCurFrame, unsigned offset, float** buffer, int channel, int n, bool doSeek, bool overwrite)
 // p3.3.33
-void WaveEventBase::readAudio(WavePart* part, unsigned offset, float** buffer, int channel, int n, bool doSeek, bool overwrite)
+void WaveEventBase::readAudio(WavePart* /*part*/, unsigned offset, float** buffer, int channel, int n, bool /*doSeek*/, bool overwrite)
 {
   // Added by Tim. p3.3.17
   #ifdef WAVEEVENT_DEBUG_PRC
diff --git a/muse2/muse/wavetrack.cpp b/muse2/muse/wavetrack.cpp
index fdebc8b8..ad02084c 100644
--- a/muse2/muse/wavetrack.cpp
+++ b/muse2/muse/wavetrack.cpp
@@ -209,7 +209,7 @@ bool WaveTrack::getData(unsigned framePos, int channels, unsigned nframe, float*
       
       if ((song->bounceTrack != this) && !noInRoute()) {
             RouteList* irl = inRoutes();
-            iRoute i = irl->begin();
+            ciRoute i = irl->begin();
             if(i->track->isMidiTrack())
             {
               if(debugMsg)
diff --git a/muse2/muse/widgets/CMakeLists.txt b/muse2/muse/widgets/CMakeLists.txt
index 7589ddf0..a4da398f 100644
--- a/muse2/muse/widgets/CMakeLists.txt
+++ b/muse2/muse/widgets/CMakeLists.txt
@@ -47,6 +47,7 @@ QT4_WRAP_CPP (widget_mocs
       intlabel.h  
       knob.h  
       lcombo.h  
+      menutitleitem.h
       meter.h
       metronome.h  
       midisyncimpl.h  
@@ -63,6 +64,7 @@ QT4_WRAP_CPP (widget_mocs
       # posedit.h  
       poslabel.h  
       projectcreateimpl.h
+      routepopup.h  
       scrollscale.h  
       shortcutcapturedialog.h  
       shortcutconfig.h  
@@ -142,6 +144,7 @@ file (GLOB widgets_source_files
       intlabel.cpp 
       knob.cpp 
       lcombo.cpp 
+      menutitleitem.cpp
       meter.cpp
       metronome.cpp 
       midisyncimpl.cpp 
@@ -159,6 +162,7 @@ file (GLOB widgets_source_files
       # posedit.cpp 
       poslabel.cpp
       projectcreateimpl.cpp 
+      routepopup.cpp 
       scldiv.cpp
       scldraw.cpp
       sclif.cpp
diff --git a/muse2/muse/widgets/bigtime.h b/muse2/muse/widgets/bigtime.h
index bb32cedc..eff0ef92 100644
--- a/muse2/muse/widgets/bigtime.h
+++ b/muse2/muse/widgets/bigtime.h
@@ -13,9 +13,11 @@ class MusE;
 //---------------------------------------------------------
 
 class BigTime : public QWidget {
+      Q_OBJECT
+    
       bool tickmode;
       MusE* seq;
-      Q_OBJECT
+      
 
       bool setString(unsigned);
 
diff --git a/muse2/muse/widgets/comment.h b/muse2/muse/widgets/comment.h
index 688d7b2f..0dbd953b 100644
--- a/muse2/muse/widgets/comment.h
+++ b/muse2/muse/widgets/comment.h
@@ -36,8 +36,10 @@ class Comment : public QWidget, public Ui::CommentBase {
 //---------------------------------------------------------
 
 class TrackComment : public Comment {
-      Track* track;
       Q_OBJECT
+    
+      Track* track;
+      
 
    private:
       virtual void setText(const QString& s);
diff --git a/muse2/muse/widgets/function_dialogs/CMakeLists.txt b/muse2/muse/widgets/function_dialogs/CMakeLists.txt
index 7ddc6bee..db1f3229 100644
--- a/muse2/muse/widgets/function_dialogs/CMakeLists.txt
+++ b/muse2/muse/widgets/function_dialogs/CMakeLists.txt
@@ -30,6 +30,7 @@ QT4_WRAP_CPP (widgets_functiondialogs_mocs
       remove.h
       setlen.h
       transpose.h
+      legato.h
       velocity.h
       )
 
@@ -45,6 +46,7 @@ file (GLOB widgets_functiondialogs_ui_files
       removebase.ui
       setlenbase.ui
       transposebase.ui
+      legatobase.ui
       velocitybase.ui
       )
 
@@ -62,6 +64,7 @@ file (GLOB widgets_functiondialogs_source_files
       remove.cpp
       setlen.cpp
       transpose.cpp
+      legato.cpp
       velocity.cpp
       )
 
diff --git a/muse2/muse/widgets/function_dialogs/crescendo.h b/muse2/muse/widgets/function_dialogs/crescendo.h
index eb00e94f..73a7e088 100644
--- a/muse2/muse/widgets/function_dialogs/crescendo.h
+++ b/muse2/muse/widgets/function_dialogs/crescendo.h
@@ -15,8 +15,9 @@ class Xml;
 
 class Crescendo : public QDialog, public Ui::CrescendoBase
 {
+ 	Q_OBJECT
 	private:
-		Q_OBJECT
+		
 		QButtonGroup* range_group;
 		
 	protected slots:
diff --git a/muse2/muse/widgets/function_dialogs/deloverlaps.h b/muse2/muse/widgets/function_dialogs/deloverlaps.h
index 813192a6..d151d5a5 100644
--- a/muse2/muse/widgets/function_dialogs/deloverlaps.h
+++ b/muse2/muse/widgets/function_dialogs/deloverlaps.h
@@ -15,8 +15,9 @@ class Xml;
 
 class DelOverlaps : public QDialog, public Ui::DelOverlapsBase
 {
+ 	Q_OBJECT
 	private:
-		Q_OBJECT
+		
 		QButtonGroup* range_group;
 		
 	protected slots:
diff --git a/muse2/muse/widgets/function_dialogs/gatetime.h b/muse2/muse/widgets/function_dialogs/gatetime.h
index d2555872..baa5a97b 100644
--- a/muse2/muse/widgets/function_dialogs/gatetime.h
+++ b/muse2/muse/widgets/function_dialogs/gatetime.h
@@ -11,7 +11,6 @@
 #include "ui_gatetimebase.h"
 
 class QButtonGroup;
-class QDialog;
 class Xml;
 
 //---------------------------------------------------------
@@ -19,9 +18,9 @@ class Xml;
 //---------------------------------------------------------
 
 class GateTime : public QDialog, public Ui::GateTimeBase {
+ 	Q_OBJECT
    private:
-      Q_OBJECT
-
+      
       QButtonGroup *rangeGroup;
 
    protected slots:
diff --git a/muse2/muse/widgets/function_dialogs/legato.cpp b/muse2/muse/widgets/function_dialogs/legato.cpp
new file mode 100644
index 00000000..0a181106
--- /dev/null
+++ b/muse2/muse/widgets/function_dialogs/legato.cpp
@@ -0,0 +1,88 @@
+//=========================================================
+//  MusE
+//  Linux Music Editor
+//    $Id: legato.cpp,v 1.1.1.1 2011/05/05 18:51:04 flo93 Exp $
+//  (C) Copyright 2011 Florian Jung (flo93@sourceforge.net)
+//=========================================================
+
+#include <QButtonGroup>
+#include "legato.h"
+#include "xml.h"
+
+Legato::Legato(QWidget* parent)
+	: QDialog(parent)
+{
+	setupUi(this);
+	range_group = new QButtonGroup;
+	range_group->addButton(all_events_button,0);
+	range_group->addButton(selected_events_button,1);
+	range_group->addButton(looped_events_button,2);
+	range_group->addButton(selected_looped_button,3);
+	
+	pull_values();
+}
+
+void Legato::pull_values()
+{
+	range = range_group->checkedId();
+	min_len = len_spinbox->value();
+	allow_shortening = allow_shorten_checkbox->isChecked();
+}
+
+void Legato::accept()
+{
+	pull_values();
+	QDialog::accept();
+}
+
+int Legato::exec()
+{
+	if ((range < 0) || (range > 3)) range=0;
+	
+	range_group->button(range)->setChecked(true);
+	len_spinbox->setValue(min_len);
+	allow_shorten_checkbox->setChecked(allow_shortening);
+	
+	return QDialog::exec();
+}
+
+void Legato::read_configuration(Xml& xml)
+{
+	for (;;)
+	{
+		Xml::Token token = xml.parse();
+		if (token == Xml::Error || token == Xml::End)
+			break;
+			
+		const QString& tag = xml.s1();
+		switch (token)
+		{
+			case Xml::TagStart:
+				if (tag == "range")
+					range=xml.parseInt();
+				else if (tag == "min_len")
+					min_len=xml.parseInt();
+				else if (tag == "allow_shortening")
+					allow_shortening=xml.parseInt();
+				else
+					xml.unknown("Legato");
+				break;
+				
+			case Xml::TagEnd:
+				if (tag == "legato")
+					return;
+				
+			default:
+				break;
+		}
+	}
+}
+
+void Legato::write_configuration(int level, Xml& xml)
+{
+	xml.tag(level++, "legato");
+	xml.intTag(level, "range", range);
+	xml.intTag(level, "min_len", min_len);
+	xml.intTag(level, "allow_shortening", allow_shortening);
+	xml.tag(level, "/legato");
+}
diff --git a/muse2/muse/widgets/function_dialogs/legato.h b/muse2/muse/widgets/function_dialogs/legato.h
new file mode 100644
index 00000000..00831830
--- /dev/null
+++ b/muse2/muse/widgets/function_dialogs/legato.h
@@ -0,0 +1,43 @@
+//=========================================================
+//  MusE
+//  Linux Music Editor
+//    $Id: legato.h,v 1.1.1.1 2011/05/05 18:51:04 flo93 Exp $
+//  (C) Copyright 2011 Florian Jung (flo93@sourceforge.net)
+//=========================================================
+
+#ifndef __LEGATO_H__
+#define __LEGATO_H__
+
+#include "ui_legatobase.h"
+
+class QButtonGroup;
+class Xml;
+
+class Legato : public QDialog, public Ui::LegatoBase
+{
+ 	Q_OBJECT
+	private:
+		
+		QButtonGroup* range_group;
+		
+	protected slots:
+		void accept();
+		void pull_values();
+
+	public:
+		Legato(QWidget* parent = 0);
+
+		int range;
+		int min_len;
+		bool allow_shortening;
+		
+		void read_configuration(Xml& xml);
+		void write_configuration(int level, Xml& xml);
+		
+		
+	public slots:
+		int exec();
+};
+
+#endif
+
diff --git a/muse2/muse/widgets/function_dialogs/legatobase.ui b/muse2/muse/widgets/function_dialogs/legatobase.ui
new file mode 100644
index 00000000..7bc406df
--- /dev/null
+++ b/muse2/muse/widgets/function_dialogs/legatobase.ui
@@ -0,0 +1,233 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>LegatoBase</class>
+ <widget class="QDialog" name="LegatoBase">
+  <property name="enabled">
+   <bool>true</bool>
+  </property>
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>275</width>
+    <height>289</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>MusE: Legato</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <property name="margin">
+    <number>11</number>
+   </property>
+   <item>
+    <widget class="QGroupBox" name="rangeBox">
+     <property name="title">
+      <string>Range</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <property name="spacing">
+       <number>6</number>
+      </property>
+      <property name="margin">
+       <number>11</number>
+      </property>
+      <item>
+       <widget class="QRadioButton" name="all_events_button">
+        <property name="text">
+         <string>All Events</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QRadioButton" name="selected_events_button">
+        <property name="text">
+         <string>Selected Events</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QRadioButton" name="looped_events_button">
+        <property name="text">
+         <string>Looped Events</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QRadioButton" name="selected_looped_button">
+        <property name="text">
+         <string>Selected Looped</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox_2">
+     <property name="title">
+      <string>Settings</string>
+     </property>
+     <property name="flat">
+      <bool>false</bool>
+     </property>
+     <property name="checkable">
+      <bool>false</bool>
+     </property>
+     <layout class="QGridLayout" name="gridLayout">
+      <property name="margin">
+       <number>11</number>
+      </property>
+      <property name="spacing">
+       <number>6</number>
+      </property>
+      <item row="0" column="1">
+       <widget class="QSpinBox" name="len_spinbox">
+        <property name="enabled">
+         <bool>true</bool>
+        </property>
+        <property name="accelerated">
+         <bool>true</bool>
+        </property>
+        <property name="suffix">
+         <string> ticks</string>
+        </property>
+        <property name="minimum">
+         <number>0</number>
+        </property>
+        <property name="maximum">
+         <number>10000</number>
+        </property>
+        <property name="singleStep">
+         <number>1</number>
+        </property>
+        <property name="value">
+         <number>0</number>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_2">
+        <property name="text">
+         <string>Minimum Length</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" colspan="2">
+       <layout class="QHBoxLayout" name="horizontalLayout_3">
+        <item>
+         <widget class="QLabel" name="label">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text">
+           <string>Allow shortening notes</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="allow_shorten_checkbox">
+          <property name="layoutDirection">
+           <enum>Qt::RightToLeft</enum>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <property name="spacing">
+      <number>6</number>
+     </property>
+     <item>
+      <spacer name="Spacer1">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Expanding</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="okButton">
+       <property name="text">
+        <string>OK</string>
+       </property>
+       <property name="autoDefault">
+        <bool>false</bool>
+       </property>
+       <property name="default">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="cancelButton">
+       <property name="text">
+        <string>Cancel</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11"/>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>okButton</sender>
+   <signal>clicked()</signal>
+   <receiver>LegatoBase</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>cancelButton</sender>
+   <signal>clicked()</signal>
+   <receiver>LegatoBase</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/muse2/muse/widgets/function_dialogs/move.h b/muse2/muse/widgets/function_dialogs/move.h
index 4c90a922..5049c567 100644
--- a/muse2/muse/widgets/function_dialogs/move.h
+++ b/muse2/muse/widgets/function_dialogs/move.h
@@ -15,8 +15,9 @@ class Xml;
 
 class Move : public QDialog, public Ui::MoveBase
 {
+ 	Q_OBJECT
 	private:
-		Q_OBJECT
+		
 		QButtonGroup* range_group;
 		
 	protected slots:
diff --git a/muse2/muse/widgets/function_dialogs/quantize.h b/muse2/muse/widgets/function_dialogs/quantize.h
index 399e2545..a857e667 100644
--- a/muse2/muse/widgets/function_dialogs/quantize.h
+++ b/muse2/muse/widgets/function_dialogs/quantize.h
@@ -15,8 +15,9 @@ class Xml;
 
 class Quantize : public QDialog, public Ui::QuantBase
 {
+ 	Q_OBJECT
 	private:
-		Q_OBJECT
+		
 		QButtonGroup* range_group;
 		
 	protected slots:
diff --git a/muse2/muse/widgets/function_dialogs/remove.cpp b/muse2/muse/widgets/function_dialogs/remove.cpp
index 5ad272ab..4a875135 100644
--- a/muse2/muse/widgets/function_dialogs/remove.cpp
+++ b/muse2/muse/widgets/function_dialogs/remove.cpp
@@ -25,6 +25,10 @@ Remove::Remove(QWidget* parent)
 void Remove::pull_values()
 {
 	range = range_group->checkedId();
+	len_thres_used=len_checkbox->isChecked();
+	len_threshold=len_spinbox->value();
+	velo_thres_used=velo_checkbox->isChecked();
+	velo_threshold=velo_spinbox->value();
 }
 
 void Remove::accept()
@@ -38,6 +42,10 @@ int Remove::exec()
 	if ((range < 0) || (range > 3)) range=0;
 	
 	range_group->button(range)->setChecked(true);
+	len_checkbox->setChecked(len_thres_used);
+	len_spinbox->setValue(len_threshold);
+	velo_checkbox->setChecked(velo_thres_used);
+	velo_spinbox->setValue(velo_threshold);
 	
 	return QDialog::exec();
 }
@@ -56,6 +64,14 @@ void Remove::read_configuration(Xml& xml)
 			case Xml::TagStart:
 				if (tag == "range")
 					range=xml.parseInt();
+				else if (tag == "velo_threshold")
+					velo_threshold=xml.parseInt();
+				else if (tag == "velo_thres_used")
+					velo_thres_used=xml.parseInt();
+				else if (tag == "len_threshold")
+					len_threshold=xml.parseInt();
+				else if (tag == "len_thres_used")
+					len_thres_used=xml.parseInt();
 				else
 					xml.unknown("Erase");
 				break;
@@ -74,5 +90,9 @@ void Remove::write_configuration(int level, Xml& xml)
 {
 	xml.tag(level++, "erase");
 	xml.intTag(level, "range", range);
+	xml.intTag(level, "velo_threshold", velo_threshold);
+	xml.intTag(level, "velo_thres_used", velo_thres_used);
+	xml.intTag(level, "len_threshold", len_threshold);
+	xml.intTag(level, "len_thres_used", len_thres_used);
 	xml.tag(level, "/erase");
 }
diff --git a/muse2/muse/widgets/function_dialogs/remove.h b/muse2/muse/widgets/function_dialogs/remove.h
index 5615ed42..33ac3fd0 100644
--- a/muse2/muse/widgets/function_dialogs/remove.h
+++ b/muse2/muse/widgets/function_dialogs/remove.h
@@ -15,8 +15,9 @@ class Xml;
 
 class Remove : public QDialog, public Ui::RemoveBase
 {
+ 	Q_OBJECT
 	private:
-		Q_OBJECT
+		
 		QButtonGroup* range_group;
 		
 	protected slots:
@@ -27,6 +28,10 @@ class Remove : public QDialog, public Ui::RemoveBase
 		Remove(QWidget* parent = 0);
 
 		int range;
+		int velo_threshold;
+		bool velo_thres_used;
+		int len_threshold;
+		bool len_thres_used;
 		
 		void read_configuration(Xml& xml);
 		void write_configuration(int level, Xml& xml);
diff --git a/muse2/muse/widgets/function_dialogs/removebase.ui b/muse2/muse/widgets/function_dialogs/removebase.ui
index 3381795c..79d541cc 100644
--- a/muse2/muse/widgets/function_dialogs/removebase.ui
+++ b/muse2/muse/widgets/function_dialogs/removebase.ui
@@ -10,7 +10,7 @@
     <x>0</x>
     <y>0</y>
     <width>275</width>
-    <height>195</height>
+    <height>443</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -70,6 +70,101 @@
     </widget>
    </item>
    <item>
+    <widget class="QGroupBox" name="groupBox_2">
+     <property name="title">
+      <string>Thresholds</string>
+     </property>
+     <property name="flat">
+      <bool>false</bool>
+     </property>
+     <property name="checkable">
+      <bool>false</bool>
+     </property>
+     <layout class="QGridLayout" name="gridLayout">
+      <property name="margin">
+       <number>11</number>
+      </property>
+      <property name="spacing">
+       <number>6</number>
+      </property>
+      <item row="0" column="1">
+       <widget class="QSpinBox" name="velo_spinbox">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <property name="accelerated">
+         <bool>true</bool>
+        </property>
+        <property name="suffix">
+         <string/>
+        </property>
+        <property name="minimum">
+         <number>0</number>
+        </property>
+        <property name="maximum">
+         <number>127</number>
+        </property>
+        <property name="singleStep">
+         <number>1</number>
+        </property>
+        <property name="value">
+         <number>16</number>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QSpinBox" name="len_spinbox">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <property name="suffix">
+         <string> ticks</string>
+        </property>
+        <property name="maximum">
+         <number>10000</number>
+        </property>
+        <property name="value">
+         <number>12</number>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0">
+       <widget class="QCheckBox" name="velo_checkbox">
+        <property name="text">
+         <string>Velocity</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QCheckBox" name="len_checkbox">
+        <property name="text">
+         <string>Length</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" colspan="2">
+       <widget class="QLabel" name="label">
+        <property name="text">
+         <string>&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:'Sans'; 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;</string>
+        </property>
+        <property name="textFormat">
+         <enum>Qt::AutoText</enum>
+        </property>
+        <property name="wordWrap">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <property name="spacing">
       <number>6</number>
@@ -149,5 +244,37 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>velo_checkbox</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>velo_spinbox</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>83</x>
+     <y>192</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>198</x>
+     <y>193</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>len_checkbox</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>len_spinbox</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>83</x>
+     <y>221</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>198</x>
+     <y>222</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
 </ui>
diff --git a/muse2/muse/widgets/function_dialogs/setlen.h b/muse2/muse/widgets/function_dialogs/setlen.h
index ad66a38b..6a052bdb 100644
--- a/muse2/muse/widgets/function_dialogs/setlen.h
+++ b/muse2/muse/widgets/function_dialogs/setlen.h
@@ -15,8 +15,9 @@ class Xml;
 
 class Setlen : public QDialog, public Ui::SetlenBase
 {
+ 	Q_OBJECT
 	private:
-		Q_OBJECT
+		
 		QButtonGroup* range_group;
 		
 	protected slots:
diff --git a/muse2/muse/widgets/function_dialogs/transpose.h b/muse2/muse/widgets/function_dialogs/transpose.h
index 97dd443e..b85bb827 100644
--- a/muse2/muse/widgets/function_dialogs/transpose.h
+++ b/muse2/muse/widgets/function_dialogs/transpose.h
@@ -15,7 +15,6 @@ class Xml;
 
 class Transpose : public QDialog, public Ui::TransposeBase
 {
-	private:
 		Q_OBJECT
 		QButtonGroup* range_group;
 		
diff --git a/muse2/muse/widgets/function_dialogs/velocity.h b/muse2/muse/widgets/function_dialogs/velocity.h
index cbea4e22..83aac54d 100644
--- a/muse2/muse/widgets/function_dialogs/velocity.h
+++ b/muse2/muse/widgets/function_dialogs/velocity.h
@@ -18,8 +18,9 @@ class Xml;
 //---------------------------------------------------------
 
 class Velocity : public QDialog, public Ui::VelocityBase {
-   private:
       Q_OBJECT
+   private:
+      
       QButtonGroup* rangeGroup;
 
    protected slots:
diff --git a/muse2/muse/widgets/genset.cpp b/muse2/muse/widgets/genset.cpp
index edf3cfda..d8c76874 100644
--- a/muse2/muse/widgets/genset.cpp
+++ b/muse2/muse/widgets/genset.cpp
@@ -151,6 +151,7 @@ Shorter periods are desirable.</string>
       oldStyleStopCheckBox->setChecked(config.useOldStyleStopShortCut);
       moveArmedCheckBox->setChecked(config.moveArmedCheckBox);
       projectSaveCheckBox->setChecked(config.useProjectSaveDialog);
+      popsDefStayOpenCheckBox->setChecked(config.popupsDefaultStayOpen);
       
       //updateSettings();    // TESTING
       
@@ -263,6 +264,7 @@ void GlobalSettingsConfig::updateSettings()
       oldStyleStopCheckBox->setChecked(config.useOldStyleStopShortCut);
       moveArmedCheckBox->setChecked(config.moveArmedCheckBox);
       projectSaveCheckBox->setChecked(config.useProjectSaveDialog);
+      popsDefStayOpenCheckBox->setChecked(config.popupsDefaultStayOpen);
 }
 
 //---------------------------------------------------------
@@ -344,6 +346,7 @@ void GlobalSettingsConfig::apply()
       config.useOldStyleStopShortCut = oldStyleStopCheckBox->isChecked();
       config.moveArmedCheckBox = moveArmedCheckBox->isChecked();
       config.useProjectSaveDialog = projectSaveCheckBox->isChecked();
+      config.popupsDefaultStayOpen = popsDefStayOpenCheckBox->isChecked();
 
       //muse->showMixer(config.mixerVisible);
       muse->showMixer1(config.mixer1Visible);
diff --git a/muse2/muse/widgets/gensetbase.ui b/muse2/muse/widgets/gensetbase.ui
index ca4b97f8..68f3ebb5 100644
--- a/muse2/muse/widgets/gensetbase.ui
+++ b/muse2/muse/widgets/gensetbase.ui
@@ -1333,7 +1333,7 @@ Adjusts responsiveness of audio controls and
             </property>
            </widget>
           </item>
-          <item row="4" column="0">
+          <item row="5" column="0">
            <spacer name="verticalSpacer_2">
             <property name="orientation">
              <enum>Qt::Vertical</enum>
@@ -1346,6 +1346,27 @@ Adjusts responsiveness of audio controls and
             </property>
            </spacer>
           </item>
+          <item row="4" column="0">
+           <widget class="QLabel" name="TextLabel1_3">
+            <property name="toolTip">
+             <string/>
+            </property>
+            <property name="text">
+             <string>Some popup menus stay open (else hold Ctrl)</string>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="1">
+           <widget class="QCheckBox" name="popsDefStayOpenCheckBox">
+            <property name="toolTip">
+             <string>Allows some popup menus to stay open.
+Otherwise, hold Ctrl to keep them open.</string>
+            </property>
+            <property name="text">
+             <string/>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
diff --git a/muse2/muse/widgets/header.cpp b/muse2/muse/widgets/header.cpp
index 16cc374b..c12c8eaf 100644
--- a/muse2/muse/widgets/header.cpp
+++ b/muse2/muse/widgets/header.cpp
@@ -7,46 +7,69 @@
 
 #include "header.h"
 #include "xml.h"
+#include "popupmenu.h"
 
 #include <QStringList>
 #include <QStandardItemModel>
+#include <QMouseEvent>
 
 //---------------------------------------------------------
 //   readStatus
 //---------------------------------------------------------
 
 void Header::readStatus(Xml& xml)
-      {
-      for (;;) {
-            Xml::Token token = xml.parse();
-            const QString& tag = xml.s1();
-            switch (token) {
-                  case Xml::Error:
-                  case Xml::End:
-                        return;
-                  case Xml::Text:
-                        {
-                        //QStringList l = QStringList::split(QString(" "), tag);
-                        QStringList l = tag.split(QString(" "), QString::SkipEmptyParts);
-                        int index = count() -1;
-                        for (QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
-                              int section = visualIndex((*it).toInt());
-                              moveSection(section, index);
-                              --index;
+{
+
+    for (;;) {
+          Xml::Token token = xml.parse();
+          const QString& tag = xml.s1();
+          switch (token) {
+                case Xml::Error:
+                case Xml::End:
+                      return;
+                case Xml::Text:
+                      {
+                          QStringList l = tag.split(QString(" "), QString::SkipEmptyParts);
+                          int index = count() -1;
+                          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);
+                                moveSection(section, index);
+                                if (isHidden)
+                                  hideSection(logialIdx-1);
+                                else
+                                  showSection(logialIdx);
+                                --index;
+                          }
+
+                          // loop again looking for missing indexes
+                          for (int i =0; i < count(); i++) {
+                              bool foundIt=false;
+                              for (QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+                                int id=((*it).toInt());
+                                if ( id == i || i ==1-id )
+                                    foundIt=true;
                               }
-                        }
-                        break;
-                  case Xml::TagStart:
-                        xml.unknown("Header");
-                        break;
-                  case Xml::TagEnd:
-                        if (tag ==objectName())
-                              return;
-                  default:
-                        break;
-                  }
-            }
-      }
+                              if (foundIt == false) {
+                                int section = visualIndex(i);
+                                moveSection(section, i);
+                                //printf("Adding missing i %d index %d section %d!\n", i, index, section);
+                              }
+                          }
+                      }
+                      break;
+                case Xml::TagStart:
+                      xml.unknown("Header");
+                      break;
+                case Xml::TagEnd:
+                      if (tag ==objectName())
+                            return;
+                default:
+                      break;
+                }
+          }
+}
 
 //---------------------------------------------------------
 //   writeStatus
@@ -56,9 +79,13 @@ void Header::writeStatus(int level, Xml& xml) const
       {
       //xml.nput(level, "<%s> ", name());
       xml.nput(level, "<%s> ", Xml::xmlString(objectName()).toLatin1().constData());
-      int n = count() - 1;
-      for (int i = n; i >= 0; --i)
-            xml.nput("%d ", logicalIndex(i));
+      int n = count();
+      for (int i = n; i >= 0; --i) {
+            if (isSectionHidden(logicalIndex(i)))
+              xml.nput("%d ", -logicalIndex(i)-1); // hidden is stored as negative value starting from -1
+            else
+              xml.nput("%d ", logicalIndex(i));
+          }
       //xml.put("</%s>", name());
       xml.put("</%s>", Xml::xmlString(objectName()).toLatin1().constData());
       }
@@ -73,8 +100,9 @@ Header::Header(QWidget* parent, const char* name)
       setObjectName(name);
       itemModel = new QStandardItemModel;
       setModel(itemModel);
-      //setResizeMode(QHeaderView::ResizeToContents);
       setDefaultSectionSize(30);
+      setStretchLastSection(true);
+
       }
 
 //---------------------------------------------------------
@@ -86,7 +114,7 @@ void Header::setColumnLabel(const QString & text, int col, int width )
       QStandardItem *sitem = new QStandardItem(text );
       itemModel->setHorizontalHeaderItem(col, sitem);
       if (width > -1)
-            resizeSection(col, width);
+           resizeSection(col, width);
       }
 
 //---------------------------------------------------------
@@ -109,3 +137,40 @@ void Header::setWhatsThis(int col, const QString &text)
       item->setWhatsThis(text);
       }
 
+void Header::mousePressEvent ( QMouseEvent * e )
+{
+  if (e->button() == Qt::RightButton) {
+
+    PopupMenu* p = new PopupMenu();
+    p->disconnect();
+    p->clear();
+    p->setTitle(tr("Track Info Columns"));
+    QAction* act = 0;
+
+    for(int i=0; i < count(); i++) {
+      act = p->addAction(itemModel->horizontalHeaderItem(logicalIndex(i))->text() +
+                         "\t - "+ itemModel->horizontalHeaderItem(logicalIndex(i))->toolTip());
+
+      act->setCheckable(true);
+      act->setChecked(!isSectionHidden(logicalIndex(i)));
+      int data = logicalIndex(i);
+      act->setData(data);
+    }
+    connect(p, SIGNAL(triggered(QAction*)), SLOT(changeColumns(QAction*)));
+    p->exec(QCursor::pos());
+
+    delete p;
+    return;
+  }
+
+  QHeaderView::mousePressEvent(e);
+
+}
+void Header::changeColumns(QAction *a)
+{
+  int section = a->data().toInt();
+  if (isSectionHidden(section))
+    showSection(section);
+  else
+    hideSection(section);
+}
diff --git a/muse2/muse/widgets/header.h b/muse2/muse/widgets/header.h
index 83680f8a..3e7b73a4 100644
--- a/muse2/muse/widgets/header.h
+++ b/muse2/muse/widgets/header.h
@@ -9,6 +9,7 @@
 #define __HEADER_H__
 
 #include <QHeaderView>
+#include <QAction>
 
 class QStandardItemModel;
 
@@ -26,6 +27,9 @@ class Header : public QHeaderView {
       void setColumnLabel( const QString & s, int col, int width = -1 );
       void setToolTip(int col, const QString &text);
       void setWhatsThis(int col, const QString &text);
+      void mousePressEvent ( QMouseEvent * e );
+    private slots:
+      void changeColumns(QAction* a);
 };
 
 #endif
diff --git a/muse2/muse/widgets/lcombo.h b/muse2/muse/widgets/lcombo.h
index b125fce5..760d4512 100644
--- a/muse2/muse/widgets/lcombo.h
+++ b/muse2/muse/widgets/lcombo.h
@@ -20,8 +20,9 @@ class QString;
 //---------------------------------------------------------
 
 class LabelCombo : public QWidget {
-      QComboBox* box;
       Q_OBJECT
+      QComboBox* box;
+      
 
    signals:
       void activated(int);
diff --git a/muse2/muse/widgets/menutitleitem.cpp b/muse2/muse/widgets/menutitleitem.cpp
new file mode 100644
index 00000000..8769eb02
--- /dev/null
+++ b/muse2/muse/widgets/menutitleitem.cpp
@@ -0,0 +1,48 @@
+//=============================================================================
+//  MusE
+//  Linux Music Editor
+//  (C) Copyright 1999-2001 Werner Schweer (ws@seh.de)
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
+
+#include <QLabel>
+
+#include "menutitleitem.h"
+
+//---------------------------------------------------------
+//   MenuTitleItem
+//---------------------------------------------------------
+
+MenuTitleItem::MenuTitleItem(const QString& ss, QWidget* parent)
+  : QWidgetAction(parent)
+      {
+        s = ss;
+        // Don't allow to click on it.
+        setEnabled(false);
+        // Just to be safe, set to -1 instead of default 0.
+        setData(-1);
+      }
+
+QWidget* MenuTitleItem::createWidget(QWidget *parent)
+{
+  QLabel* l = new QLabel(s, parent);
+  l->setAlignment(Qt::AlignCenter);
+  l->setAutoFillBackground(true);
+  //QPalette palette;
+  //palette.setColor(label->backgroundRole(), c);
+  //l->setPalette(palette);
+  l->setBackgroundRole(QPalette::Dark);
+  return l;
+}
+
diff --git a/muse2/muse/widgets/menutitleitem.h b/muse2/muse/widgets/menutitleitem.h
index 016d4663..20583bd1 100644
--- a/muse2/muse/widgets/menutitleitem.h
+++ b/muse2/muse/widgets/menutitleitem.h
@@ -15,6 +15,10 @@
 //---------------------------------------------------------
 
 class MenuTitleItem : public QWidgetAction { 
+      Q_OBJECT
+   private:
+      
+        
       QString s;
 
    public:
diff --git a/muse2/muse/widgets/meter.h b/muse2/muse/widgets/meter.h
index 2b816040..cced6e7a 100644
--- a/muse2/muse/widgets/meter.h
+++ b/muse2/muse/widgets/meter.h
@@ -17,6 +17,7 @@ class QPainter;
 
 
 class Meter : public QFrame {
+    Q_OBJECT
    public:
       enum MeterType {DBMeter, LinMeter};
    private:
@@ -29,7 +30,7 @@ class Meter : public QFrame {
 
       void drawVU(QPainter& p, int, int, int);
 
-      Q_OBJECT
+      
       void paintEvent(QPaintEvent*);
       void resizeEvent(QResizeEvent*);
       void mousePressEvent(QMouseEvent*);
diff --git a/muse2/muse/widgets/mtrackinfo.cpp b/muse2/muse/widgets/mtrackinfo.cpp
index acdfb42f..6dd02931 100644
--- a/muse2/muse/widgets/mtrackinfo.cpp
+++ b/muse2/muse/widgets/mtrackinfo.cpp
@@ -26,6 +26,7 @@
 #include "app.h"
 #include "route.h"
 #include "popupmenu.h"
+#include "routepopup.h"
 
 //---------------------------------------------------------
 //   setTrack
@@ -44,10 +45,13 @@ void MidiTrackInfo::setTrack(Track* t)
   selected = t;
   
   QPalette pal;
-  if(selected->type() == Track::DRUM)
+  if(selected->type() == Track::DRUM) {
     pal.setColor(trackNameLabel->backgroundRole(), config.drumTrackLabelBg); 
-  else  
-    pal.setColor(trackNameLabel->backgroundRole(), config.midiTrackLabelBg); 
+    iOutputChannel->setEnabled(false);
+  } else  {
+    pal.setColor(trackNameLabel->backgroundRole(), config.midiTrackLabelBg);
+    iOutputChannel->setEnabled(true);
+  }
   trackNameLabel->setPalette(pal);
   
   updateTrackInfo(-1);
@@ -574,33 +578,6 @@ void MidiTrackInfo::iOutputPortChanged(int index)
       }
 
 //---------------------------------------------------------
-//   routingPopupMenuActivated
-//---------------------------------------------------------
-
-//void MidiTrackInfo::routingPopupMenuActivated(int n)
-void MidiTrackInfo::routingPopupMenuActivated(QAction* act)
-{
-  ///if(!midiTrackInfo || gRoutingPopupMenuMaster != midiTrackInfo || !selected || !selected->isMidiTrack())
-  if((gRoutingPopupMenuMaster != this) || !selected || !selected->isMidiTrack())
-    return;
-  muse->routingPopupMenuActivated(selected, act->data().toInt());
-}
-
-#if 0
-//---------------------------------------------------------
-//   routingPopupViewActivated
-//---------------------------------------------------------
-
-void MidiTrackInfo::routingPopupViewActivated(const QModelIndex& mdi)
-{
-  ///if(!midiTrackInfo || gRoutingPopupMenuMaster != midiTrackInfo || !selected || !selected->isMidiTrack())
-  if(gRoutingPopupMenuMaster != this || !selected || !selected->isMidiTrack())
-    return;
-  muse->routingPopupMenuActivated(selected, mdi.data().toInt());
-}
-#endif
-
-//---------------------------------------------------------
 //   inRoutesPressed
 //---------------------------------------------------------
 
@@ -611,44 +588,9 @@ void MidiTrackInfo::inRoutesPressed()
   if(!selected->isMidiTrack())
     return;
   
-  PopupMenu* pup = muse->prepareRoutingPopupMenu(selected, false);
-  //PopupView* pup = muse->prepareRoutingPopupView(selected, false);
-
-  /*
-  QPoint ppt = QCursor::pos();
-  
-  int i = 0;
-  for( ; i < MIDI_PORTS; ++i)
-  {
-    if(midiPorts[i].device() && !midiPorts[pi].device()->isSynti())
-      break;
-  }
-  if(!pup || i == MIDI_PORTS)
-  {
-    int ret = QMessageBox::warning(this, tr("No devices"),
-                                   tr("There are no midi port devices defined.\n"
-                                      "Do you want to open the midi configuration dialog?"),
-                                   QMessageBox::Ok | QMessageBox::Cancel,
-                                   QMessageBox::Ok);
-    if (ret == QMessageBox::Ok) {
-        //printf("open config midi ports\n");
-        muse->configMidiPorts();
-    }
-    if(!pup)
-      return;
-  }
-  */
-  
-  ///gRoutingPopupMenuMaster = midiTrackInfo;
-  gRoutingPopupMenuMaster = this;
-  connect(pup, SIGNAL(triggered(QAction*)), SLOT(routingPopupMenuActivated(QAction*)));
-  //connect(pup, SIGNAL(activated(const QModelIndex&)), SLOT(routingPopupViewActivated(const QModelIndex&)));
-  connect(pup, SIGNAL(aboutToHide()), muse, SLOT(routingPopupMenuAboutToHide()));
-  //connect(pup, SIGNAL(aboutToHide()), muse, SLOT(routingPopupViewAboutToHide()));
-  pup->popup(QCursor::pos());
-  //pup->setVisible(true);
+  RoutePopupMenu* pup = muse->getRoutingPopupMenu();
   iRButton->setDown(false);     
-  return;
+  pup->exec(QCursor::pos(), selected, false);
 }
 
 //---------------------------------------------------------
@@ -662,17 +604,9 @@ void MidiTrackInfo::outRoutesPressed()
   if(!selected->isMidiTrack())
     return;
   
-  PopupMenu* pup = muse->prepareRoutingPopupMenu(selected, true);
-  if(!pup)
-    return;
-  
-  ///gRoutingPopupMenuMaster = midiTrackInfo;
-  gRoutingPopupMenuMaster = this;
-  connect(pup, SIGNAL(triggered(QAction*)), SLOT(routingPopupMenuActivated(QAction*)));
-  connect(pup, SIGNAL(aboutToHide()), muse, SLOT(routingPopupMenuAboutToHide()));
-  pup->popup(QCursor::pos());
+  RoutePopupMenu* pup = muse->getRoutingPopupMenu();
   oRButton->setDown(false);     
-  return;
+  pup->exec(QCursor::pos(), selected, true);
 }
 
 //---------------------------------------------------------
@@ -1036,6 +970,29 @@ void MidiTrackInfo::iPanChanged(int val)
     }
 
 //---------------------------------------------------------
+//   instrPopupActivated
+//---------------------------------------------------------
+
+void MidiTrackInfo::instrPopupActivated(QAction* act)
+{
+  //printf("MidiTrackInfo::instrPopupActivated\n"); 
+  
+  if(act && selected) 
+  {
+    int rv = act->data().toInt();
+    if(rv != -1)
+    {
+      MidiTrack* track = (MidiTrack*)selected;
+      int channel = track->outChannel();
+      int port    = track->outPort();
+      MidiPlayEvent ev(0, port, channel, ME_CONTROLLER, CTRL_PROGRAM, rv);
+      audio->msgPlayMidiEvent(&ev);
+      updateTrackInfo(-1);
+    }  
+  }
+}
+
+//---------------------------------------------------------
 //   instrPopup
 //---------------------------------------------------------
 
@@ -1047,26 +1004,35 @@ void MidiTrackInfo::instrPopup()
       int channel = track->outChannel();
       int port    = track->outPort();
       MidiInstrument* instr = midiPorts[port].instrument();
-      QMenu* pup = new QMenu;
-      ///instr->populatePatchPopup(pop, channel, song->mtype(), track->type() == Track::DRUM);
+      //QMenu* pup = new QMenu;
+      PopupMenu* pup = new PopupMenu(true);
+      
+      //instr->populatePatchPopup(pop, channel, song->mtype(), track->type() == Track::DRUM);
       instr->populatePatchPopup(pup, channel, song->mtype(), track->type() == Track::DRUM);
 
-      ///if(pop->actions().count() == 0)
-      ///  return;
+      //if(pop->actions().count() == 0)
+      //  return;
       if(pup->actions().count() == 0)
       {
         delete pup;
         return;
       }  
       
-      ///QAction *act = pop->exec(iPatch->mapToGlobal(QPoint(10,5)));
+      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) {
-            int rv = act->data().toInt();
-            MidiPlayEvent ev(0, port, channel, ME_CONTROLLER, CTRL_PROGRAM, rv);
-            audio->msgPlayMidiEvent(&ev);
-            updateTrackInfo(-1);
-            }
+      if(act) 
+      {
+        int rv = act->data().toInt();
+        if(rv != -1)
+        {
+          MidiPlayEvent ev(0, port, channel, ME_CONTROLLER, CTRL_PROGRAM, rv);
+          audio->msgPlayMidiEvent(&ev);
+          updateTrackInfo(-1);
+        }  
+      }
             
       delete pup;      
       }
@@ -1275,15 +1241,6 @@ void MidiTrackInfo::updateTrackInfo(int flags)
         return;
       MidiTrack* track = (MidiTrack*)selected;
       
-      // p3.3.47 Update the routing popup menu if anything relevant changes.
-      //if(gRoutingPopupMenuMaster == midiTrackInfo && selected && (flags & (SC_ROUTE | SC_CHANNELS | SC_CONFIG))) 
-      if(flags & (SC_ROUTE | SC_CHANNELS | SC_CONFIG))     // p3.3.50
-        // Use this handy shared routine.
-        //muse->updateRouteMenus(selected);
-        ///muse->updateRouteMenus(selected, midiTrackInfo);   // p3.3.50
-        muse->updateRouteMenus(selected, this); 
-      
-      // Added by Tim. p3.3.9
       setLabelText();
       setLabelFont();
         
diff --git a/muse2/muse/widgets/mtrackinfo.h b/muse2/muse/widgets/mtrackinfo.h
index 4e06f1d0..ed229ad6 100644
--- a/muse2/muse/widgets/mtrackinfo.h
+++ b/muse2/muse/widgets/mtrackinfo.h
@@ -46,8 +46,7 @@ class MidiTrackInfo : public QWidget, public Ui::MidiTrackInfoBase
       void recEchoToggled(bool);
       void inRoutesPressed();
       void outRoutesPressed();
-      void routingPopupMenuActivated(QAction*);
-      //void routingPopupViewActivated(const QModelIndex&);
+      void instrPopupActivated(QAction*);
       
    protected slots:
       virtual void heartBeat();
diff --git a/muse2/muse/widgets/musewidgetsplug.cpp b/muse2/muse/widgets/musewidgetsplug.cpp
index 8cb0b57e..993b0fb8 100644
--- a/muse2/muse/widgets/musewidgetsplug.cpp
+++ b/muse2/muse/widgets/musewidgetsplug.cpp
@@ -190,13 +190,14 @@ GlobalConfigValues config = {
       true,                         // useDenormalBias
       false,                        // useOutputLimiter
       true,                         // showDidYouKnow
-      false,                         // vstInPlace  Enable VST in-place processing
+      false,                        // vstInPlace  Enable VST in-place processing
       44100,                        // Dummy audio preferred sample rate
       512                           // Dummy audio buffer size
       QString("./"),                // projectBaseFolder
       true,                         // projectStoreInFolder
       true,                         // useProjectSaveDialog
-      64                            // minControlProcessPeriod
+      64,                           // minControlProcessPeriod
+      false                         // popupsDefaultStayOpen
       };
 
 //---------------------------------------------------------
diff --git a/muse2/muse/widgets/noteinfo.h b/muse2/muse/widgets/noteinfo.h
index cc8fe16d..64842988 100644
--- a/muse2/muse/widgets/noteinfo.h
+++ b/muse2/muse/widgets/noteinfo.h
@@ -25,6 +25,8 @@ class Pos;
 //---------------------------------------------------------
 
 class NoteInfo : public QToolBar {
+      Q_OBJECT
+    
       ///PosEdit* selTime;
       Awl::PosEdit* selTime;
       QSpinBox* selLen;
@@ -33,7 +35,7 @@ class NoteInfo : public QToolBar {
       QSpinBox* selVelOff;
       bool deltaMode;
 
-      Q_OBJECT
+      
 
    public:
       enum ValType {VAL_TIME, VAL_LEN, VAL_VELON, VAL_VELOFF, VAL_PITCH };
diff --git a/muse2/muse/widgets/pitchlabel.h b/muse2/muse/widgets/pitchlabel.h
index 6372f711..d29a4ee4 100644
--- a/muse2/muse/widgets/pitchlabel.h
+++ b/muse2/muse/widgets/pitchlabel.h
@@ -15,9 +15,11 @@
 //---------------------------------------------------------
 
 class PitchLabel : public QLabel {
+      Q_OBJECT
+    
       bool _pitchMode;
       int _value;
-      Q_OBJECT
+      
 
    protected:
       QSize sizeHint() const;
diff --git a/muse2/muse/widgets/popupmenu.cpp b/muse2/muse/widgets/popupmenu.cpp
index 862bda91..adbe7dd6 100644
--- a/muse2/muse/widgets/popupmenu.cpp
+++ b/muse2/muse/widgets/popupmenu.cpp
@@ -6,25 +6,51 @@
 //  (C) Copyright 1999-2010 Werner Schweer (ws@seh.de)
 //
 //  PopupMenu sub-class of QMenu created by Tim.
+//  (C) Copyright 2010-2011 Tim E. Real (terminator356 A T sourceforge D O T net)
 //=========================================================
 
 //#include <stdio.h>
 #include <QMouseEvent>
+#include <QHoverEvent>
 #include <QAction>
+#include <QPoint>
+#include <QDesktopWidget>
+#include <QApplication>
+//#include <QTimer>
+
 #include <stdio.h>
 //#include <QStandardItemModel>
 
 #include "popupmenu.h"
+#include "gconfig.h"
+#include "route.h"
+ 
  
 //======================
 // PopupMenu
 //======================
 
-PopupMenu::PopupMenu(QWidget* parent) 
-          : QMenu(parent)
+//PopupMenu::PopupMenu() 
+//{
+//  init();
+//}
+
+PopupMenu::PopupMenu(bool stayOpen) 
+          : _stayOpen(stayOpen)
 {
-  // Menus will trigger! Set to make sure our trigger handlers ignore menus.
-  menuAction()->setData(-1);
+  init();
+}
+
+PopupMenu::PopupMenu(QWidget* parent, bool stayOpen) 
+          : QMenu(parent), _stayOpen(stayOpen)
+{
+  init();
+}
+
+PopupMenu::PopupMenu(const QString& title, QWidget* parent, bool stayOpen)
+          : QMenu(title, parent), _stayOpen(stayOpen)
+{
+  init();        
 }
 
 PopupMenu::~PopupMenu()
@@ -32,6 +58,23 @@ PopupMenu::~PopupMenu()
   //printf("PopupMenu::~PopupMenu\n");  
 }
 
+void PopupMenu::init()
+{
+  // Menus will trigger! Set to make sure our trigger handlers ignore menus.
+  menuAction()->setData(-1);
+  
+  //_stayOpen = false;
+  moveDelta = 0;
+  
+  #ifndef POPUP_MENU_DISABLE_AUTO_SCROLL  
+  timer = new QTimer(this);
+  timer->setInterval(100);
+  timer->setSingleShot(false);
+  connect(this, SIGNAL(hovered(QAction*)), SLOT(popHovered(QAction*)));
+  connect(timer, SIGNAL(timeout()), SLOT(timerHandler()));
+  #endif   // POPUP_MENU_DISABLE_AUTO_SCROLL
+}
+
 void PopupMenu::clear()
 {
   QList<QAction*> list = actions();
@@ -41,7 +84,7 @@ void PopupMenu::clear()
     QMenu* menu = act->menu();
     if(menu)
     {
-      menu->clear();
+      menu->clear();    // Recursive.
       act->setMenu(0);  // CHECK: Is this OK?
       delete menu;
     }
@@ -49,9 +92,32 @@ void PopupMenu::clear()
   
   // Now let QT remove and delete this menu's actions.
   QMenu::clear();
+  
+  #ifndef POPUP_MENU_DISABLE_AUTO_SCROLL  
+  connect(this, SIGNAL(hovered(QAction*)), SLOT(popHovered(QAction*)));
+  connect(timer, SIGNAL(timeout()), SLOT(timerHandler()));
+  #endif    // POPUP_MENU_DISABLE_AUTO_SCROLL
 }
 
-QAction* PopupMenu::findActionFromData(QVariant v)
+void PopupMenu::clearAllChecks() const
+{
+  QList<QAction*> list = actions();
+  for(int i = 0; i < list.size(); ++i)
+  {
+    QAction* act = list[i];
+    PopupMenu* menu = static_cast <PopupMenu*>(act->menu());
+    if(menu)
+      menu->clearAllChecks();     // Recursive.
+    if(act->isCheckable())
+    {
+      act->blockSignals(true);
+      act->setChecked(false);
+      act->blockSignals(false);
+    }  
+  }
+}
+
+QAction* PopupMenu::findActionFromData(const QVariant& v) const
 {
   QList<QAction*> list = actions();
   for(int i = 0; i < list.size(); ++i)
@@ -60,52 +126,224 @@ QAction* PopupMenu::findActionFromData(QVariant v)
     PopupMenu* menu = (PopupMenu*)act->menu();
     if(menu)
     {
-      if(QAction* actm = menu->findActionFromData(v))
+      if(QAction* actm = menu->findActionFromData(v))      // Recursive.
         return actm;
     }
+    
+    // "Operator == Compares this QVariant with v and returns true if they are equal, 
+    //   otherwise returns false. In the case of custom types, their equalness operators 
+    //   are not called. Instead the values' addresses are compared."
+    //
+    // Take care of struct Route first. Insert other future custom structures here too !
+    if(act->data().canConvert<Route>() && v.canConvert<Route>())
+    {
+      if(act->data().value<Route>() == v.value<Route>())
+        return act;    
+    }
+    else
     if(act->data() == v)
       return act;
   }
   return 0;
 }
     
-void PopupMenu::mouseReleaseEvent(QMouseEvent *e)
+bool PopupMenu::event(QEvent* event)
 {
-    //Q_D(QMenu);
-    //if (d->mouseEventTaken(e))
-    //    return;
+  //printf("PopupMenu::event type:%d\n", event->type());   
+  
+  switch(event->type())
+  {
+    #ifndef POPUP_MENU_DISABLE_STAY_OPEN  
+    case QEvent::MouseButtonDblClick:
+    {  
+      if(_stayOpen)
+      //if(_stayOpen && config.popupsDefaultStayOpen)
+      {
+        QMouseEvent* e = static_cast<QMouseEvent*>(event);
+        if(e->modifiers() == Qt::NoModifier)
+        {
+          event->accept();
+          // Convert into a return press, which selects the item and closes the menu.
+          // Note that with double click, it's a press followed by release followed by double click.
+          // That would toggle our item twice eg on->off->on, which is hopefully OK.
+          QKeyEvent ke(QEvent::KeyPress, Qt::Key_Return, Qt::NoModifier); 
+          //ke.ignore();   // Pass it on
+          return QMenu::event(&ke);
+        }  
+      }  
+    }  
+    break;
+    case QEvent::KeyPress:
+    {
+      if(_stayOpen)
+      //if(_stayOpen && config.popupsDefaultStayOpen)
+      {
+        QKeyEvent* e = static_cast<QKeyEvent*>(event);
+        if(e->modifiers() == Qt::NoModifier && e->key() == Qt::Key_Space)
+        {
+          QAction* act = activeAction();
+          if(act)
+          {
+            act->trigger();
+            event->accept();
+            return true;    // We handled it.
+          }
+        }  
+      }
+    }
+    break;
+    #endif   // POPUP_MENU_DISABLE_STAY_OPEN
+    
+    #ifndef POPUP_MENU_DISABLE_AUTO_SCROLL  
+    case QEvent::MouseMove:
+    {
+      QMouseEvent* e = static_cast<QMouseEvent*>(event);
+      QPoint globPos = e->globalPos();
+      //QPoint pos = e->pos();
+      int dw = QApplication::desktop()->width();  // We want the whole thing if multiple monitors.
+      
+      //printf("PopupMenu::event MouseMove: pos x:%d y:%d  globPos x:%d y:%d\n", 
+      //      pos.x(), pos.y(), globPos.x(), globPos.y());  
+      
+      /*
+      //QAction* action = actionAt(globPos);
+      QAction* action = actionAt(pos);
+      if(action)
+      { 
+        QRect r = actionGeometry(action);
+        //printf(" act x:%d y:%d w:%d h:%d  popup px:%d py:%d pw:%d ph:%d\n", 
+        //      r.x(), r.y(), r.width(), r.height(), x(), y(), width(), height());  
+              
+        //action->hover();      
+      }
+      */
+      
+      if(x() < 0 && globPos.x() <= 0)   // If on the very first pixel (or beyond)
+      {
+        moveDelta = 32;
+        if(!timer->isActive())
+          timer->start();
+        event->accept();
+        return true;        
+      }  
+      else
+      if(x() + width() >= dw && globPos.x() >= (dw -1))   // If on the very last pixel (or beyond)
+      {
+        moveDelta = -32;
+        if(!timer->isActive())
+          timer->start();
+        event->accept();
+        return true;        
+      }
+        
+      if(timer->isActive())
+          timer->stop();
+      
+      //event->accept();
+      //return true;        
+      
+      event->ignore();               // Pass it on
+      //return QMenu::event(event);  
+    }  
+    break;
+    #endif  // POPUP_MENU_DISABLE_AUTO_SCROLL  
+    
+    default:
+    break;
+  }
+  
+  return QMenu::event(event);
+}
 
-    //d->mouseDown = false;
-    //QAction *action = d->actionAt(e->pos());
-    QAction *action = actionAt(e->pos());
+#ifndef POPUP_MENU_DISABLE_AUTO_SCROLL  
+void PopupMenu::timerHandler()
+{
+  // printf("PopupMenu::timerHandler\n");   
+  
+  //if(!isVisible() || !hasFocus())
+  if(!isVisible())
+  {
+    timer->stop();
+    return;
+  }  
+
+  int dw = QApplication::desktop()->width();  // We want the whole thing if multiple monitors.
+  int nx = x() + moveDelta;
+  if(moveDelta < 0 && nx + width() < dw)
+  {
+    timer->stop();
+    nx = dw - width();
+  }
+  else
+  if(moveDelta > 0 && nx > 0) 
+  {
+    timer->stop();
+    nx = 0;
+  }
+  
+  move(nx, y());  
+}
+
+void PopupMenu::popHovered(QAction* action)
+{
+  //timer->stop();
+  
+  //moveDelta = 0;
+  if(action)
+  {  
+    int dw = QApplication::desktop()->width();  // We want the whole thing if multiple monitors.
     
-    //for(QWidget *caused = this; caused;) {
-    //    if (QMenu *m = qobject_cast<QMenu*>(caused)) {
-    //        QAction *currentAction = d->currentAction;
-    //        if(currentAction && (!currentAction->isEnabled() || currentAction->menu() || currentAction->isSeparator()))
-    //            currentAction = 0;
-    //        caused = m->d_func()->causedPopup.widget;
-    //        if (m->d_func()->eventLoop)
-    //            m->d_func()->syncAction = currentAction; // synchronous operation
-    //    } else {
-    //        break;
-    //    }
-    //}
+    QRect r = actionGeometry(action);
+    //printf("PopupMenu::popHovered x:%d y:%d w:%d h:%d px:%d py:%d pw:%d ph:%d\n", 
+    //       r.x(), r.y(), r.width(), r.height(), x(), y(), width(), height());  
+    //printf("PopupMenu::popHovered x:%d y:%d w:%d h:%d px:%d py:%d pw:%d ph:%d dtw:%d\n", 
+    //      r.x(), r.y(), r.width(), r.height(), x(), y(), width(), height(), dw);  
+    //int x = r.x() + ctrlSubPop->x();
+    if(x() + r.x() < 0)
+      //setGeometry(0, y(), width(), height());      
+      //scroll(-x, 0);      
+      //move(-r.x() + 32, y());   // Allow some of left column to show so that mouse can move over it.  
+      //move(-r.x() + r.width(), y());   // Allow some of left column to show so that mouse can move over it.  
+      //moveDelta = x() - r.x() + 32;
+      move(-r.x(), y());   
+    else
+    if(r.x() + r.width() + x() > dw)
+      //setGeometry(1200 - r.x() - r.width(), y(), width(), height());      
+      //scroll(-x + 1200, 0);      
+      //move(dw - r.x() - r.width() - 32, y());  // Allow some of right column to show so that mouse can move over it.       
+      //move(dw - r.x(), y());  // Allow some of right column to show so that mouse can move over it.       
+      //moveDelta = x() + dw - r.x() - r.width() - 32;
+      move(dw - r.x() - r.width(), y());  
+  }
+      
+  //if(moveDelta == 0)
+  //  timer->stop();
     
-    //if (action && action == d->currentAction) {
-    if (action && action == activeAction() && !action->isSeparator() && action->isEnabled()) 
+}
+#endif    // POPUP_MENU_DISABLE_AUTO_SCROLL
+
+void PopupMenu::mouseReleaseEvent(QMouseEvent *e)
+{
+    #ifdef POPUP_MENU_DISABLE_STAY_OPEN    
+    QMenu::mouseReleaseEvent(e);
+    return;
+    
+    #else
+    // Check for Ctrl to stay open.
+    if(!_stayOpen || (!config.popupsDefaultStayOpen && (e->modifiers() & Qt::ControlModifier) == 0))  
     {
-        //if (action->menu())
-        //    action->menu()->d_func()->setFirstActionActive();
-        //else
-            //d->activateAction(action, QAction::Trigger);
-            action->activate(QAction::Trigger);
-    }
+      QMenu::mouseReleaseEvent(e);
+      return;
+    }  
+    
+    //printf("PopupMenu::mouseReleaseEvent\n");  
+    QAction *action = actionAt(e->pos());
+    if (action && action == activeAction() && !action->isSeparator() && action->isEnabled()) 
+      action->activate(QAction::Trigger);
     else 
-    //if (d->motions > 6) {
-    //    d->hideUpToMenuBar();
-    //  }
       QMenu::mouseReleaseEvent(e);
+      
+    #endif   // POPUP_MENU_DISABLE_STAY_OPEN 
 }
 
 /*
diff --git a/muse2/muse/widgets/popupmenu.h b/muse2/muse/widgets/popupmenu.h
index c06d51f4..e0e7d26f 100644
--- a/muse2/muse/widgets/popupmenu.h
+++ b/muse2/muse/widgets/popupmenu.h
@@ -6,12 +6,21 @@
 //  (C) Copyright 1999-2010 Werner Schweer (ws@seh.de)
 //
 //  PopupMenu sub-class of QMenu created by Tim.
+//  (C) Copyright 2010-2011 Tim E. Real (terminator356 A T sourceforge D O T net)
 //=========================================================
 
 #ifndef __POPUPMENU_H__
 #define __POPUPMENU_H__
 
+// Just in case Qt ever adds these features natively, we would need to turn our features off!
+//#define POPUP_MENU_DISABLE_STAY_OPEN    
+//#define POPUP_MENU_DISABLE_AUTO_SCROLL
+
 #include <QMenu>
+#ifndef POPUP_MENU_DISABLE_AUTO_SCROLL  
+  #include <QTimer>
+#endif
+
 //#include <QMouseEvent>
 //#include <QColumnView>
 
@@ -19,20 +28,41 @@ class QWidget;
 class QMouseEvent;
 class QVariant;
 class QAction;
+class QEvent;
+//class QTimer;
 //class QStandardItemModel;
 
 class PopupMenu : public QMenu
 {
   Q_OBJECT
   
+    bool _stayOpen;
+    #ifndef POPUP_MENU_DISABLE_AUTO_SCROLL  
+    QTimer* timer;
+    #endif
+    int moveDelta;
+    void init();
+    
+  private slots:
+    #ifndef POPUP_MENU_DISABLE_AUTO_SCROLL  
+    void popHovered(QAction*);
+    void timerHandler();
+    #endif
+  
   protected:
     void mouseReleaseEvent(QMouseEvent *);
+    bool event(QEvent*);   
   
   public:
-    PopupMenu(QWidget* parent=0);
+    //PopupMenu();
+    PopupMenu(bool stayOpen);
+    PopupMenu(QWidget* parent=0, bool stayOpen = false);
+    PopupMenu(const QString& title, QWidget* parent = 0, bool stayOpen = false);
     ~PopupMenu();
     void clear();
-    QAction* findActionFromData(QVariant);
+    QAction* findActionFromData(const QVariant&) const;
+    bool stayOpen() const { return _stayOpen; }
+    void clearAllChecks() const;
 };
 
 
diff --git a/muse2/muse/widgets/poslabel.h b/muse2/muse/widgets/poslabel.h
index 29c5297d..7be236ec 100644
--- a/muse2/muse/widgets/poslabel.h
+++ b/muse2/muse/widgets/poslabel.h
@@ -15,10 +15,12 @@
 //---------------------------------------------------------
 
 class PosLabel : public QLabel {
+      Q_OBJECT
+    
       bool _smpte;
       unsigned _tickValue;
       unsigned _sampleValue;
-      Q_OBJECT
+      
 
       void updateValue();
 
diff --git a/muse2/muse/widgets/projectcreateimpl.h b/muse2/muse/widgets/projectcreateimpl.h
index 77547c1a..3ca61e36 100644
--- a/muse2/muse/widgets/projectcreateimpl.h
+++ b/muse2/muse/widgets/projectcreateimpl.h
@@ -6,7 +6,7 @@
 
 class ProjectCreateImpl : public QDialog, Ui::ProjectCreate
 {
-Q_OBJECT
+    Q_OBJECT
 
     QString directoryPath;
 public:
diff --git a/muse2/muse/widgets/routepopup.cpp b/muse2/muse/widgets/routepopup.cpp
new file mode 100644
index 00000000..910d693d
--- /dev/null
+++ b/muse2/muse/widgets/routepopup.cpp
@@ -0,0 +1,1416 @@
+//=========================================================
+//  MusE
+//  Linux Music Editor
+//
+//  RoutePopupMenu.cpp 
+//  (C) Copyright 2011 Tim E. Real (terminator356 A T sourceforge D O T net)
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
+
+#include "app.h"
+#include "routepopup.h"
+#include "midiport.h"
+#include "mididev.h"
+#include "audio.h"
+#include "driver/audiodev.h"
+#include "song.h"
+#include "track.h"
+#include "synth.h"
+#include "route.h"
+#include "icons.h"
+#include "menutitleitem.h"
+#include "popupmenu.h"
+
+//---------------------------------------------------------
+//   addMenuItem
+//---------------------------------------------------------
+
+int RoutePopupMenu::addMenuItem(AudioTrack* track, Track* route_track, PopupMenu* lb, int id, int channel, int channels, bool isOutput)
+{
+  // totalInChannels is only used by syntis.
+  int toch = ((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;
+  
+  // Don't add the last stray mono route if the track is stereo.
+  //if(route_track->channels() > 1 && (channel+1 == chans))
+  //  return id;
+    
+  RouteList* rl = isOutput ? track->outRoutes() : track->inRoutes();
+  
+  QAction* act;
+  
+  QString s(route_track->name());
+  
+  act = lb->addAction(s);
+  act->setCheckable(true);
+  
+  int ach = channel;
+  int bch = -1;
+  
+  Route r(route_track, isOutput ? ach : bch, channels);
+  
+  r.remoteChannel = isOutput ? bch : ach;
+  
+  act->setData(qVariantFromValue(r));   
+  
+  for(ciRoute ir = rl->begin(); ir != rl->end(); ++ir) 
+  {
+    if(ir->type == Route::TRACK_ROUTE && ir->track == route_track && ir->remoteChannel == r.remoteChannel)
+    {
+      int tcompch = r.channel;
+      if(tcompch == -1)
+        tcompch = 0;
+      int tcompchs = r.channels;
+      if(tcompchs == -1)
+        tcompchs = isOutput ? track->channels() : route_track->channels();
+      
+      int compch = ir->channel;
+      if(compch == -1)
+        compch = 0;
+      int compchs = ir->channels;
+      if(compchs == -1)
+        compchs = isOutput ? track->channels() : ir->track->channels();
+      
+      if(compch == tcompch && compchs == tcompchs) 
+      {
+        act->setChecked(true);
+        break;
+      }
+    }  
+  }
+  return ++id;      
+}
+
+//---------------------------------------------------------
+//   addAuxPorts
+//---------------------------------------------------------
+
+int RoutePopupMenu::addAuxPorts(AudioTrack* t, PopupMenu* lb, int id, int channel, int channels, bool isOutput)
+      {
+      AuxList* al = song->auxs();
+      for (iAudioAux i = al->begin(); i != al->end(); ++i) {
+            Track* track = *i;
+            if (t == track)
+                  continue;
+            id = addMenuItem(t, track, lb, id, channel, channels, isOutput);
+            }
+      return id;      
+      }
+
+//---------------------------------------------------------
+//   addInPorts
+//---------------------------------------------------------
+
+int RoutePopupMenu::addInPorts(AudioTrack* t, PopupMenu* lb, int id, int channel, int channels, bool isOutput)
+      {
+      InputList* al = song->inputs();
+      for (iAudioInput i = al->begin(); i != al->end(); ++i) {
+            Track* track = *i;
+            if (t == track)
+                  continue;
+            id = addMenuItem(t, track, lb, id, channel, channels, isOutput);
+            }
+      return id;      
+      }
+
+//---------------------------------------------------------
+//   addOutPorts
+//---------------------------------------------------------
+
+int RoutePopupMenu::addOutPorts(AudioTrack* t, PopupMenu* lb, int id, int channel, int channels, bool isOutput)
+      {
+      OutputList* al = song->outputs();
+      for (iAudioOutput i = al->begin(); i != al->end(); ++i) {
+            Track* track = *i;
+            if (t == track)
+                  continue;
+            id = addMenuItem(t, track, lb, id, channel, channels, isOutput);
+            }
+      return id;      
+      }
+
+//---------------------------------------------------------
+//   addGroupPorts
+//---------------------------------------------------------
+
+int RoutePopupMenu::addGroupPorts(AudioTrack* t, PopupMenu* lb, int id, int channel, int channels, bool isOutput)
+      {
+      GroupList* al = song->groups();
+      for (iAudioGroup i = al->begin(); i != al->end(); ++i) {
+            Track* track = *i;
+            if (t == track)
+                  continue;
+            id = addMenuItem(t, track, lb, id, channel, channels, isOutput);
+            }
+      return id;      
+      }
+
+//---------------------------------------------------------
+//   addWavePorts
+//---------------------------------------------------------
+
+int RoutePopupMenu::addWavePorts(AudioTrack* t, PopupMenu* lb, int id, int channel, int channels, bool isOutput)
+      {
+      WaveTrackList* al = song->waves();
+      for (iWaveTrack i = al->begin(); i != al->end(); ++i) {
+            Track* track = *i;
+            if (t == track)
+                  continue;
+            id = addMenuItem(t, track, lb, id, channel, channels, isOutput);
+            }
+      return id;      
+      }
+
+//---------------------------------------------------------
+//   addSyntiPorts
+//---------------------------------------------------------
+
+int RoutePopupMenu::addSyntiPorts(AudioTrack* t, PopupMenu* lb, int id, 
+                         int channel, int channels, bool isOutput)
+{
+      RouteList* rl = isOutput ? t->outRoutes() : t->inRoutes();
+      
+      QAction* act;
+      
+      SynthIList* al = song->syntis();
+      for (iSynthI i = al->begin(); i != al->end(); ++i) 
+      {
+            Track* track = *i;
+            if (t == track)
+                  continue;
+            int toch = ((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;
+            
+            // totalInChannels is only used by syntis.
+            int chans = (!isOutput || track->type() != Track::AUDIO_SOFTSYNTH) ? toch : ((AudioTrack*)track)->totalInChannels();
+            
+            int tchans = (channels != -1) ? channels: t->channels();
+            if(tchans == 2)
+            {
+              // Ignore odd numbered left-over mono channel.
+              //chans = chans & ~1;
+              //if(chans != 0)
+                chans -= 1;
+            }
+            
+            if(chans > 0)
+            {
+              PopupMenu* chpup = new PopupMenu(lb, true);
+              chpup->setTitle(track->name());
+              for(int ch = 0; ch < chans; ++ch)
+              {
+                char buffer[128];
+                if(tchans == 2)
+                  snprintf(buffer, 128, "%s %d,%d", chpup->tr("Channel").toLatin1().constData(), ch+1, ch+2);
+                else  
+                  snprintf(buffer, 128, "%s %d", chpup->tr("Channel").toLatin1().constData(), ch+1);
+                act = chpup->addAction(QString(buffer));
+                act->setCheckable(true);
+                
+                int ach = (channel == -1) ? ch : channel;
+                int bch = (channel == -1) ? -1 : ch;
+                
+                Route rt(track, (t->type() != Track::AUDIO_SOFTSYNTH || isOutput) ? ach : bch, tchans);
+                rt.remoteChannel = (t->type() != Track::AUDIO_SOFTSYNTH || isOutput) ? bch : ach;
+                
+                act->setData(qVariantFromValue(rt));   
+                
+                for(ciRoute ir = rl->begin(); ir != rl->end(); ++ir) 
+                {
+                  if(ir->type == Route::TRACK_ROUTE && ir->track == track && ir->remoteChannel == rt.remoteChannel)
+                  {
+                    int tcompch = rt.channel;
+                    if(tcompch == -1)
+                      tcompch = 0;
+                    int tcompchs = rt.channels;
+                    if(tcompchs == -1)
+                      tcompchs = isOutput ? t->channels() : track->channels();
+                    
+                    int compch = ir->channel;
+                    if(compch == -1)
+                      compch = 0;
+                    int compchs = ir->channels;
+                    if(compchs == -1)
+                      compchs = isOutput ? t->channels() : ir->track->channels();
+                    
+                    if(compch == tcompch && compchs == tcompchs) 
+                    {
+                      act->setChecked(true);
+                      break;
+                    }
+                  }
+                }  
+                ++id;
+              }
+            
+              lb->addMenu(chpup);
+            }
+      }
+      return id;      
+}
+
+//---------------------------------------------------------
+//   addMultiChannelOutPorts
+//---------------------------------------------------------
+
+int RoutePopupMenu::addMultiChannelPorts(AudioTrack* t, PopupMenu* pup, int id, bool isOutput)
+{
+  int toch = t->totalOutChannels();
+  // If track channels = 1, it must be a mono synth. And synti channels cannot be changed by user.
+  if(t->channels() == 1)
+    toch = 1;
+  
+  // Number of allocated buffers is always MAX_CHANNELS or more, even if _totalOutChannels is less. 
+  // totalInChannels is only used by syntis.
+  int chans = (isOutput || t->type() != Track::AUDIO_SOFTSYNTH) ? toch : t->totalInChannels();
+
+  if(chans > 1)
+    pup->addAction(new MenuTitleItem("<Mono>", pup)); 
+  
+  //
+  // If it's more than one channel, create a sub-menu. If it's just one channel, don't bother with a sub-menu...
+  //
+
+  PopupMenu* chpup = pup;
+  
+  for(int ch = 0; ch < chans; ++ch)
+  {
+    // If more than one channel, create the sub-menu.
+    if(chans > 1)
+      chpup = new PopupMenu(pup, true);
+    
+    if(isOutput)
+    {
+      switch(t->type()) 
+      {
+        
+        case Track::AUDIO_INPUT:
+        case Track::WAVE:
+        case Track::AUDIO_GROUP:
+        case Track::AUDIO_SOFTSYNTH:
+        case Track::AUDIO_AUX:        
+              id = addWavePorts(t, chpup, id, ch, 1, isOutput);
+              id = addOutPorts(t, chpup, id, ch, 1, isOutput);
+              id = addGroupPorts(t, chpup, id, ch, 1, isOutput);
+              id = addSyntiPorts(t, chpup, id, ch, 1, isOutput);
+              break;
+        default:
+              break;
+      }
+    }
+    else
+    {
+      switch(t->type()) 
+      {
+        
+        case Track::AUDIO_OUTPUT:
+              id = addWavePorts(t, chpup, id, ch, 1, isOutput);
+              id = addInPorts(t, chpup, id, ch, 1, isOutput);
+              id = addGroupPorts(t, chpup, id, ch, 1, isOutput);
+              id = addAuxPorts(t, chpup, id, ch, 1, isOutput);
+              id = addSyntiPorts(t, chpup, id, ch, 1, isOutput);
+              break;
+        case Track::WAVE:
+        case Track::AUDIO_SOFTSYNTH:
+        case Track::AUDIO_GROUP:
+              id = addWavePorts(t, chpup, id, ch, 1, isOutput);
+              id = addInPorts(t, chpup, id, ch, 1, isOutput);
+              id = addGroupPorts(t, chpup, id, ch, 1, isOutput);
+              id = addAuxPorts(t, chpup, id, ch, 1, isOutput);     
+              id = addSyntiPorts(t, chpup, id, ch, 1, isOutput);
+              break;
+        default:
+              break;
+      }
+    }
+      
+    // If more than one channel, add the created sub-menu.
+    if(chans > 1)
+    {
+      char buffer[128];
+      snprintf(buffer, 128, "%s %d", pup->tr("Channel").toLatin1().constData(), ch+1);
+      chpup->setTitle(QString(buffer));
+      pup->addMenu(chpup);
+    }  
+  } 
+       
+  // For stereo listing, ignore odd numbered left-over channels.
+  chans -= 1;
+  if(chans > 0)
+  {
+    // Ignore odd numbered left-over channels.
+    //int schans = (chans & ~1) - 1;
+    
+    pup->addSeparator();
+    pup->addAction(new MenuTitleItem("<Stereo>", pup));
+  
+    //
+    // If it's more than two channels, create a sub-menu. If it's just two channels, don't bother with a sub-menu...
+    //
+    
+    chpup = pup;
+    if(chans <= 2)
+      // Just do one iteration.
+      chans = 1;
+    
+    for(int ch = 0; ch < chans; ++ch)
+    {
+      // If more than two channels, create the sub-menu.
+      if(chans > 2)
+        chpup = new PopupMenu(pup, true);
+      
+      if(isOutput)
+      {
+        switch(t->type()) 
+        {
+          case Track::AUDIO_INPUT:
+          case Track::WAVE:
+          case Track::AUDIO_GROUP:
+          case Track::AUDIO_SOFTSYNTH:
+          case Track::AUDIO_AUX:                                          
+                id = addWavePorts(t, chpup, id, ch, 2, isOutput);     
+                id = addOutPorts(t, chpup, id, ch, 2, isOutput);
+                id = addGroupPorts(t, chpup, id, ch, 2, isOutput);
+                id = addSyntiPorts(t, chpup, id, ch, 2, isOutput);
+                break;
+          default:
+                break;
+        }
+      }    
+      else
+      {
+        switch(t->type()) 
+        {
+          case Track::AUDIO_OUTPUT:
+                id = addWavePorts(t, chpup, id, ch, 2, isOutput);
+                id = addInPorts(t, chpup, id, ch, 2, isOutput);
+                id = addGroupPorts(t, chpup, id, ch, 2, isOutput);
+                id = addAuxPorts(t, chpup, id, ch, 2, isOutput);
+                id = addSyntiPorts(t, chpup, id, ch, 2, isOutput);
+                break;
+          case Track::WAVE:
+          case Track::AUDIO_SOFTSYNTH:
+          case Track::AUDIO_GROUP:
+                id = addWavePorts(t, chpup, id, ch, 2, isOutput);
+                id = addInPorts(t, chpup, id, ch, 2, isOutput);
+                id = addGroupPorts(t, chpup, id, ch, 2, isOutput);
+                id = addAuxPorts(t, chpup, id, ch, 2, isOutput);     
+                id = addSyntiPorts(t, chpup, id, ch, 2, isOutput);
+                break;
+          default:
+                break;
+        }
+      }
+      
+      // If more than two channels, add the created sub-menu.
+      if(chans > 2)
+      {
+        char buffer[128];
+        snprintf(buffer, 128, "%s %d,%d", pup->tr("Channel").toLatin1().constData(), ch+1, ch+2);
+        chpup->setTitle(QString(buffer));
+        pup->addMenu(chpup);
+      }  
+    } 
+  }
+  
+  return id;
+}
+
+//---------------------------------------------------------
+//   nonSyntiTrackAddSyntis
+//---------------------------------------------------------
+
+int RoutePopupMenu::nonSyntiTrackAddSyntis(AudioTrack* t, PopupMenu* lb, int id, bool isOutput)
+{
+      RouteList* rl = isOutput ? t->outRoutes() : t->inRoutes();
+      
+      QAction* act;
+      SynthIList* al = song->syntis();
+      for (iSynthI i = al->begin(); i != al->end(); ++i) 
+      {
+            Track* track = *i;
+            if (t == track)
+                  continue;
+            
+            int toch = ((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;
+            
+            // totalInChannels is only used by syntis.
+            int chans = (!isOutput || track->type() != Track::AUDIO_SOFTSYNTH) ? toch : ((AudioTrack*)track)->totalInChannels();
+            
+            //int schans = synti->channels();
+            //if(schans < chans)
+            //  chans = schans;
+//            int tchans = (channels != -1) ? channels: t->channels();
+//            if(tchans == 2)
+//            {
+              // Ignore odd numbered left-over mono channel.
+              //chans = chans & ~1;
+              //if(chans != 0)
+//                chans -= 1;
+//            }
+            //int tchans = (channels != -1) ? channels: t->channels();
+            
+            if(chans > 0)
+            {
+              PopupMenu* chpup = new PopupMenu(lb, true);
+              chpup->setTitle(track->name());
+              if(chans > 1)
+                chpup->addAction(new MenuTitleItem("<Mono>", chpup));
+              
+              for(int ch = 0; ch < chans; ++ch)
+              {
+                char buffer[128];
+                snprintf(buffer, 128, "%s %d", chpup->tr("Channel").toLatin1().constData(), ch+1);
+                act = chpup->addAction(QString(buffer));
+                act->setCheckable(true);
+                
+                int ach = ch;
+                int bch = -1;
+                
+                Route rt(track, isOutput ? bch : ach, 1);
+                
+                rt.remoteChannel = isOutput ? ach : bch;
+                
+                act->setData(qVariantFromValue(rt));   
+                
+                for(ciRoute ir = rl->begin(); ir != rl->end(); ++ir) 
+                {
+                  if(ir->type == Route::TRACK_ROUTE && ir->track == track && ir->remoteChannel == rt.remoteChannel)
+                  {
+                    int tcompch = rt.channel;
+                    if(tcompch == -1)
+                      tcompch = 0;
+                    int tcompchs = rt.channels;
+                    if(tcompchs == -1)
+                      tcompchs = isOutput ? t->channels() : track->channels();
+                    
+                    int compch = ir->channel;
+                    if(compch == -1)
+                      compch = 0;
+                    int compchs = ir->channels;
+                    if(compchs == -1)
+                      compchs = isOutput ? t->channels() : ir->track->channels();
+                    
+                    if(compch == tcompch && compchs == tcompchs) 
+                    {
+                      act->setChecked(true);
+                      break;
+                    }
+                  }
+                }
+                ++id;
+              }
+            
+              chans -= 1;
+              if(chans > 0)
+              {
+                // Ignore odd numbered left-over channels.
+                //int schans = (chans & ~1) - 1;
+                
+                chpup->addSeparator();
+                chpup->addAction(new MenuTitleItem("<Stereo>", chpup)); 
+              
+                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);
+                  act = chpup->addAction(QString(buffer));
+                  act->setCheckable(true);
+                  
+                  int ach = ch;
+                  int bch = -1;
+                  
+                  Route rt(track, isOutput ? bch : ach, 2);
+                  
+                  rt.remoteChannel = isOutput ? ach : bch;
+                  
+                  act->setData(qVariantFromValue(rt));   
+                  
+                  for(ciRoute ir = rl->begin(); ir != rl->end(); ++ir) 
+                  {
+                    if(ir->type == Route::TRACK_ROUTE && ir->track == track && ir->remoteChannel == rt.remoteChannel)
+                    {
+                      int tcompch = rt.channel;
+                      if(tcompch == -1)
+                        tcompch = 0;
+                      int tcompchs = rt.channels;
+                      if(tcompchs == -1)
+                        tcompchs = isOutput ? t->channels() : track->channels();
+                      
+                      int compch = ir->channel;
+                      if(compch == -1)
+                        compch = 0;
+                      int compchs = ir->channels;
+                      if(compchs == -1)
+                        compchs = isOutput ? t->channels() : ir->track->channels();
+                      
+                      if(compch == tcompch && compchs == tcompchs) 
+                      {
+                        act->setChecked(true);
+                        break;
+                      }
+                    }  
+                  }
+                  ++id;
+                }
+              }
+              
+              lb->addMenu(chpup);
+            }
+      }
+      return id;      
+}
+
+//---------------------------------------------------------
+//   addMidiPorts
+//---------------------------------------------------------
+
+int RoutePopupMenu::addMidiPorts(AudioTrack* t, PopupMenu* pup, int id, bool isOutput)
+{
+  QAction* act;
+  for(int i = 0; i < MIDI_PORTS; ++i)
+  {
+    MidiPort* mp = &midiPorts[i];
+    MidiDevice* md = mp->device();
+    
+    // This is desirable, but could lead to 'hidden' routes unless we add more support
+    //  such as removing the existing routes when user changes flags.
+    // So for now, just list all valid ports whether read or write.
+    if(!md)
+      continue;
+    //if(!(md->rwFlags() & (isOutput ? 1 : 2)))
+    //  continue;
+          
+    // Do not list synth devices!
+    if(md->isSynti())
+      continue;
+          
+   RouteList* rl = isOutput ? t->outRoutes() : t->inRoutes();
+    
+    PopupMenu* subp = new PopupMenu(pup, true);
+    subp->setTitle(md->name()); 
+    
+    int chanmask = 0;
+    // To reduce number of routes required, from one per channel to just one containing a channel mask. 
+    // Look for the first route to this midi port. There should always be only a single route for each midi port, now.
+    for(ciRoute ir = rl->begin(); ir != rl->end(); ++ir)   
+    {
+      if(ir->type == Route::MIDI_PORT_ROUTE && ir->midiPort == i) 
+      {
+        // We have a route to the midi port. Grab the channel mask.
+        chanmask = ir->channel;
+        break;
+      }
+    }
+    
+    for(int ch = 0; ch < MIDI_CHANNELS; ++ch) 
+    {
+      act = subp->addAction(QString("Channel %1").arg(ch+1));
+      act->setCheckable(true);
+      
+      int chbit = 1 << ch;
+      Route srcRoute(i, chbit);    // In accordance with channel mask, use the bit position.
+      
+      act->setData(qVariantFromValue(srcRoute));   
+      
+      if(chanmask & chbit)                  // Is the channel already set? Show item check mark.
+        act->setChecked(true);
+      
+      ++id;
+    }
+    
+    //gid = MIDI_PORTS * MIDI_CHANNELS + i;           // Make sure each 'toggle' item gets a unique id.
+    act = subp->addAction(QString("Toggle all"));
+    //act->setCheckable(true);
+    Route togRoute(i, (1 << MIDI_CHANNELS) - 1);    // Set all channel bits.
+    act->setData(qVariantFromValue(togRoute));   
+    ++id;
+    
+    pup->addMenu(subp);
+  }    
+  return id;      
+}
+
+
+//======================
+// RoutePopupMenu
+//======================
+
+RoutePopupMenu::RoutePopupMenu(QWidget* parent, Track* track, bool isOutput) 
+               : _track(track), _isOutMenu(isOutput)
+{
+  _pup = new PopupMenu(parent, true);
+  init();
+}
+
+RoutePopupMenu::RoutePopupMenu(const QString& title, QWidget* parent, Track* track, bool isOutput)
+               : _track(track), _isOutMenu(isOutput)
+{
+  _pup = new PopupMenu(title, parent, true);
+  init();        
+}
+
+RoutePopupMenu::~RoutePopupMenu()
+{
+  //printf("RoutePopupMenu::~RoutePopupMenu\n");  
+  // Make sure to clear which clears and deletes any sub popups.
+  _pup->clear();
+  delete _pup;
+}
+
+void RoutePopupMenu::init()
+{
+  connect(song, SIGNAL(songChanged(int)), SLOT(songChanged(int)));
+}
+
+void RoutePopupMenu::songChanged(int val)
+{
+  if(val & (SC_ROUTE | SC_CHANNELS | SC_CONFIG))     
+    updateRouteMenus();             
+}
+
+void RoutePopupMenu::updateRouteMenus()    
+{
+  // NOTE: The purpose of this routine is to make sure the items actually reflect
+  //  the routing status. 
+  // In case for some reason a route could not be added (or removed). 
+  // Then the item will be properly un-checked (or checked) here.
+  
+  //printf("RoutePopupMenu::updateRouteMenus\n");  
+  
+  if(!_track || !_pup || _pup->actions().isEmpty() || !_pup->isVisible())  
+    return;
+    
+  RouteList* rl = _isOutMenu ? _track->outRoutes() : _track->inRoutes();
+
+  // Clear all the action check marks.
+  _pup->clearAllChecks();    
+    
+  // Take care of Midi Port to Audio Input routes first...  
+  if(_isOutMenu && _track->isMidiTrack())
+  {
+    int port = ((MidiTrack*)_track)->outPort();
+    if(port >= 0 && port < MIDI_PORTS)
+    {
+      MidiPort* mp = &midiPorts[port];
+      RouteList* mprl = mp->outRoutes();
+      for (ciRoute ir = mprl->begin(); ir != mprl->end(); ++ir) 
+      {
+        if(ir->type == Route::TRACK_ROUTE && ir->track && ir->track->type() == Track::AUDIO_INPUT)
+        {
+          for(int ch = 0; ch < MIDI_CHANNELS; ++ch)
+          {
+            int chbits = 1 << ch;
+            if(ir->channel & chbits)
+            {
+              Route r(ir->track, chbits);
+              //printf("RoutePopupMenu::updateRouteMenus MidiPort to AudioInput chbits:%d\n", chbits);  
+              QAction* act = _pup->findActionFromData(qVariantFromValue(r));  
+              if(act)
+                act->setChecked(true);
+            }  
+          }  
+        }  
+      }  
+    }
+  }
+
+  // Now check the ones that are found in the route list.
+  for(ciRoute irl = rl->begin(); irl != rl->end(); ++irl) 
+  {
+    // Do MidiTrack to MidiPort routes...
+    if(irl->type == Route::MIDI_PORT_ROUTE)
+    {
+      //printf("RoutePopupMenu::updateRouteMenus MIDI_PORT_ROUTE\n");  
+      for(int ch = 0; ch < MIDI_CHANNELS; ++ch)
+      {
+        int chbits = 1 << ch;
+        if(irl->channel & chbits)
+        {
+          Route r(irl->midiPort, chbits);
+          QAction* act = _pup->findActionFromData(qVariantFromValue(r));  
+          if(act)
+            act->setChecked(true);
+        }    
+      }    
+    }
+    else
+    // Do all other routes...
+    {
+      //printf("RoutePopupMenu::updateRouteMenus other irl type:%d\n", irl->type);  
+      QAction* act = _pup->findActionFromData(qVariantFromValue(*irl));  
+      if(act)
+        act->setChecked(true);
+    }
+  }
+}      
+
+void RoutePopupMenu::popupActivated(QAction* action)
+{
+      if(!action || !_track || !_pup || _pup->actions().isEmpty())
+        return;
+        
+      if(_track->isMidiTrack())
+      {
+        RouteList* rl = _isOutMenu ? _track->outRoutes() : _track->inRoutes();
+        
+        // Take care of Route data items first...
+        if(qVariantCanConvert<Route>(action->data()))    
+        {
+          Route aRoute = action->data().value<Route>();
+          
+          // Support Midi Port to Audio Input track routes. 
+          if(aRoute.type == Route::TRACK_ROUTE && aRoute.track && aRoute.track->type() == Track::AUDIO_INPUT)
+          {
+            //if(gIsOutRoutingPopupMenu)    // Try to avoid splitting like this. 
+            {
+              int chbit = aRoute.channel;
+              int port = ((MidiTrack*)_track)->outPort();
+              if(port < 0 || port >= MIDI_PORTS)
+                return;
+              
+              MidiPort* mp = &midiPorts[port];
+              //MidiDevice* md = mp->device();
+              
+              // This is desirable, but could lead to 'hidden' routes unless we add more support
+              //  such as removing the existing routes when user changes flags.
+              // So for now, just list all valid ports whether read or write.
+              //if(!md)
+              //  return;
+              //if(!(md->rwFlags() & (gIsOutRoutingPopupMenu ? 1 : 2)))
+              //  return;
+              
+              Route bRoute(port, chbit);
+              
+              int chmask = 0;                   
+              RouteList* mprl = _isOutMenu ? mp->outRoutes() : mp->inRoutes();
+              ciRoute ir = mprl->begin();
+              for (; ir != mprl->end(); ++ir) 
+              {
+                if(ir->type == Route::TRACK_ROUTE && ir->track == aRoute.track)    // Is there already a route to this port?
+                {
+                      chmask = ir->channel;  // Grab the channel mask.
+                      break;
+                }      
+              }
+              if ((chmask & chbit) == chbit)             // Is the channel's bit(s) set?
+              {
+                // disconnect
+                if(_isOutMenu)
+                  audio->msgRemoveRoute(bRoute, aRoute);
+                else
+                  audio->msgRemoveRoute(aRoute, bRoute);
+              }
+              else 
+              {
+                // connect
+                if(_isOutMenu)
+                  audio->msgAddRoute(bRoute, aRoute);
+                else
+                  audio->msgAddRoute(aRoute, bRoute);
+              }
+              
+              audio->msgUpdateSoloStates();
+              song->update(SC_ROUTE);
+              
+            }
+            return;
+          }
+          else if(aRoute.type == Route::MIDI_PORT_ROUTE)
+          {
+            int chbit = aRoute.channel;
+            Route bRoute(_track, chbit);
+            int mdidx = aRoute.midiPort;
+    
+            MidiPort* mp = &midiPorts[mdidx];
+            MidiDevice* md = mp->device();
+            //if(!md)    // Rem. Allow connections to ports with no device.
+            //  return;
+            
+            //if(!(md->rwFlags() & 2))
+            //if(!(md->rwFlags() & (gIsOutRoutingPopupMenu ? 1 : 2)))
+            if(md && !(md->rwFlags() & (_isOutMenu ? 1 : 2)))   
+              return;
+            
+            int chmask = 0;                   
+            ciRoute iir = rl->begin();
+            for (; iir != rl->end(); ++iir) 
+            {
+              if(iir->type == Route::MIDI_PORT_ROUTE && iir->midiPort == mdidx)    // Is there already a route to this port?
+              {
+                    chmask = iir->channel;  // Grab the channel mask.
+                    break;
+              }      
+            }
+            if ((chmask & chbit) == chbit)             // Is the channel's bit(s) set?
+            {
+              // disconnect
+              if(_isOutMenu)
+                audio->msgRemoveRoute(bRoute, aRoute);
+              else
+                audio->msgRemoveRoute(aRoute, bRoute);
+            }
+            else 
+            {
+              // connect
+              if(_isOutMenu)
+                audio->msgAddRoute(bRoute, aRoute);
+              else
+                audio->msgAddRoute(aRoute, bRoute);
+            }
+            
+            audio->msgUpdateSoloStates();
+            song->update(SC_ROUTE);
+          }  
+        }  
+        else
+        // ... now take care of integer data items.
+        if(qVariantCanConvert<int>(action->data()))    
+        {
+          int n = action->data().value<int>();
+          if(!_isOutMenu && n == 0)
+            muse->configMidiPorts();
+          return;  
+        }
+      }
+      else
+      {
+        AudioTrack* t = (AudioTrack*)_track;
+        RouteList* rl = _isOutMenu ? t->outRoutes() : t->inRoutes();
+        
+        if(!qVariantCanConvert<Route>(action->data()))    
+          return;  
+          
+        if(_isOutMenu)
+        {  
+          Route dstRoute = action->data().value<Route>();             
+          Route srcRoute(t, dstRoute.channel, dstRoute.channels);    
+          srcRoute.remoteChannel = dstRoute.remoteChannel;
+  
+          // check if route src->dst exists:
+          ciRoute irl = rl->begin();
+          for (; irl != rl->end(); ++irl) {
+                if (*irl == dstRoute)
+                      break;
+                }
+          if (irl != rl->end()) {
+                // disconnect if route exists
+                audio->msgRemoveRoute(srcRoute, dstRoute);
+                }
+          else {
+                // connect if route does not exist
+                audio->msgAddRoute(srcRoute, dstRoute);
+                }
+          audio->msgUpdateSoloStates();
+          song->update(SC_ROUTE);
+        }  
+        else
+        {
+          Route srcRoute = action->data().value<Route>();             
+          
+          // Support Midi Port to Audio Input routes. 
+          if(_track->type() == Track::AUDIO_INPUT && srcRoute.type == Route::MIDI_PORT_ROUTE)
+          {
+            int chbit = srcRoute.channel;
+            Route dstRoute(t, chbit);
+            int mdidx = srcRoute.midiPort;
+            int chmask = 0;                   
+            ciRoute iir = rl->begin();
+            for (; iir != rl->end(); ++iir) 
+            {
+              if(iir->type == Route::MIDI_PORT_ROUTE && iir->midiPort == mdidx)    // Is there already a route to this port?
+              {
+                chmask = iir->channel;  // Grab the channel mask.
+                break;
+              }      
+            }
+            
+            if ((chmask & chbit) == chbit)             // Is the channel's bit(s) set?
+            {
+              //printf("routingPopupMenuActivated: removing src route ch:%d dst route ch:%d\n", srcRoute.channel, dstRoute.channel); 
+              audio->msgRemoveRoute(srcRoute, dstRoute);
+            }
+            else 
+            {
+              //printf("routingPopupMenuActivated: adding src route ch:%d dst route ch:%d\n", srcRoute.channel, dstRoute.channel); 
+              audio->msgAddRoute(srcRoute, dstRoute);
+            }
+            
+            audio->msgUpdateSoloStates();
+            song->update(SC_ROUTE);
+            return;
+          }
+          
+          Route dstRoute(t, srcRoute.channel, srcRoute.channels);     
+          dstRoute.remoteChannel = srcRoute.remoteChannel;
+  
+          ciRoute irl = rl->begin();
+          for (; irl != rl->end(); ++irl) {
+                if (*irl == srcRoute)
+                      break;
+                }
+          if (irl != rl->end()) {
+                // disconnect
+                audio->msgRemoveRoute(srcRoute, dstRoute);
+                }
+          else {
+                // connect
+                audio->msgAddRoute(srcRoute, dstRoute);
+                }
+          audio->msgUpdateSoloStates();
+          song->update(SC_ROUTE);
+        }
+        
+       
+      }
+      //else
+      //{
+      //}
+}
+
+void RoutePopupMenu::prepare()
+{
+  _pup->disconnect();
+  _pup->clear();
+   
+  if(!_track)
+    return;
+   
+  connect(_pup, SIGNAL(triggered(QAction*)), SLOT(popupActivated(QAction*)));
+  
+  if(_track->isMidiTrack())
+  {
+    RouteList* rl = _isOutMenu ? _track->outRoutes() : _track->inRoutes();
+    
+    int gid = 0;
+    QAction* act = 0;
+    
+    if(_isOutMenu)   
+    {
+      // Support Midi Port to Audio Input track routes. 
+      int port = ((MidiTrack*)_track)->outPort();
+      if(port >= 0 && port < MIDI_PORTS)
+      {
+        MidiPort* mp = &midiPorts[port];
+        
+        // Do not list synth devices! Requiring valid device is desirable, 
+        //  but could lead to 'hidden' routes unless we add more support
+        //  such as removing the existing routes when user changes flags.
+        // So for now, just list all valid ports whether read or write.
+        if(mp->device() && !mp->device()->isSynti())  
+        {
+          RouteList* mprl = mp->outRoutes();
+          int chbits = 1 << ((MidiTrack*)_track)->outChannel();
+          //MidiDevice* md = mp->device();
+          //if(!md)
+          //  continue;
+          
+          _pup->addSeparator();
+          _pup->addAction(new MenuTitleItem(tr("Soloing chain"), _pup)); 
+          PopupMenu* subp = new PopupMenu(_pup, true);
+          subp->setTitle(tr("Audio returns")); 
+          _pup->addMenu(subp);
+          
+          InputList* al = song->inputs();
+          for (ciAudioInput i = al->begin(); i != al->end(); ++i) 
+          {
+            Track* t = *i;
+            QString s(t->name());
+            act = subp->addAction(s);
+            act->setCheckable(true);
+            Route r(t, chbits);
+            act->setData(qVariantFromValue(r));   
+            for(ciRoute ir = mprl->begin(); ir != mprl->end(); ++ir) 
+            {
+              if(ir->type == Route::TRACK_ROUTE && ir->track == t && (ir->channel & chbits))
+              {
+                act->setChecked(true);
+                break;
+              }  
+            }
+            ++gid;      
+          }
+        }     
+      }  
+    }
+    else
+    {
+      // Warn if no devices available. Add an item to open midi config. 
+      int pi = 0;
+      for( ; pi < MIDI_PORTS; ++pi)
+      {
+        MidiDevice* md = midiPorts[pi].device();
+        if(md && !md->isSynti() && (md->rwFlags() & 2))
+          break;
+      }
+      if(pi == MIDI_PORTS)
+      {
+        act = _pup->addAction(tr("Warning: No midi input devices!"));
+        act->setCheckable(false);
+        act->setData(-1);
+        _pup->addSeparator();
+      }
+      act = _pup->addAction(QIcon(*settings_midiport_softsynthsIcon), tr("Open midi config..."));
+      act->setCheckable(false);
+      act->setData(gid);
+      _pup->addSeparator();
+      ++gid;
+      
+      _pup->addAction(new MenuTitleItem("Midi input ports", _pup)); 
+      
+      for(int i = 0; i < MIDI_PORTS; ++i)
+      {
+        // NOTE: Could possibly list all devices, bypassing ports, but no, let's stick with ports.
+        MidiPort* mp = &midiPorts[i];
+        MidiDevice* md = mp->device();
+        //if(!md)
+        //  continue;
+        
+        // Do not list synth devices!
+        if(md && md->isSynti())
+          continue;
+          
+        if(md && !(md->rwFlags() & 2))
+          continue;
+          
+        //printf("MusE::prepareRoutingPopupMenu adding submenu portnum:%d\n", i);
+        
+        int chanmask = 0;
+        // To reduce number of routes required, from one per channel to just one containing a channel mask. 
+        // Look for the first route to this midi port. There should always be only a single route for each midi port, now.
+        ciRoute ir = rl->begin();
+        for( ; ir != rl->end(); ++ir)   
+        {
+          if(ir->type == Route::MIDI_PORT_ROUTE && ir->midiPort == i) 
+          {
+            // We have a route to the midi port. Grab the channel mask.
+            chanmask = ir->channel;
+            break;
+          }
+        }
+        // List ports with no device, but with routes to this track, in the main popup.
+        if(!md && ir == rl->end())
+          continue;
+        
+        PopupMenu* subp = new PopupMenu(_pup, true);
+        subp->setTitle(QString("%1:").arg(i+1) + (md ? md->name() : tr("<none>"))); 
+        
+        for(int ch = 0; ch < MIDI_CHANNELS; ++ch) 
+        {
+          act = subp->addAction(QString("Channel %1").arg(ch+1));
+          act->setCheckable(true);
+          int chbit = 1 << ch;
+          Route srcRoute(i, chbit);    // In accordance with channel mask, use the bit position.
+          act->setData(qVariantFromValue(srcRoute));   
+          if(chanmask & chbit)                  // Is the channel already set? Show item check mark.
+            act->setChecked(true);
+          ++gid;  
+        }
+        //gid = MIDI_PORTS * MIDI_CHANNELS + i;           // Make sure each 'toggle' item gets a unique id.
+        act = subp->addAction(tr("Toggle all"));
+        //act->setCheckable(true);
+        Route togRoute(i, (1 << MIDI_CHANNELS) - 1);    // Set all channel bits.
+        act->setData(qVariantFromValue(togRoute));   
+        ++gid;
+        _pup->addMenu(subp);
+      }
+      
+      #if 0
+      // p4.0.17 List ports with no device and no in routes, in a separate popup.
+      PopupMenu* morep = new PopupMenu(pup, true);
+      morep->setTitle(tr("More...")); 
+      for(int i = 0; i < MIDI_PORTS; ++i)
+      {
+        MidiPort* mp = &midiPorts[i];
+        if(mp->device())
+          continue;
+        
+        PopupMenu* subp = new PopupMenu(morep, true);
+        subp->setTitle(QString("%1:").arg(i) + tr("<none>")); 
+        
+        // MusE-2: Check this - needed with QMenu? Help says no. No - verified, it actually causes double triggers!
+        //connect(subp, SIGNAL(triggered(QAction*)), pup, SIGNAL(triggered(QAction*)));
+        //connect(subp, SIGNAL(aboutToHide()), pup, SIGNAL(aboutToHide()));
+        
+        iRoute ir = rl->begin();
+        for( ; ir != rl->end(); ++ir)   
+        {
+          if(ir->type == Route::MIDI_PORT_ROUTE && ir->midiPort == i) 
+            break;
+        }
+        if(ir != rl->end())
+          continue;
+        
+        for(int ch = 0; ch < MIDI_CHANNELS; ++ch) 
+        {
+          act = subp->addAction(QString("Channel %1").arg(ch+1));
+          act->setCheckable(true);
+          act->setData(gid);
+          
+          int chbit = 1 << ch;
+          Route srcRoute(i, chbit);    // In accordance with new channel mask, use the bit position.
+          
+          gRoutingMenuMap.insert( pRouteMenuMap(gid, srcRoute) );
+          
+          //if(chanmask & chbit)                  // Is the channel already set? Show item check mark.
+          //  act->setChecked(true);
+          
+          ++gid;  
+        }
+        //gid = MIDI_PORTS * MIDI_CHANNELS + i;           // Make sure each 'toggle' item gets a unique id.
+        act = subp->addAction(QString("Toggle all"));
+        //act->setCheckable(true);
+        act->setData(gid);
+        Route togRoute(i, (1 << MIDI_CHANNELS) - 1);    // Set all channel bits.
+        gRoutingMenuMap.insert( pRouteMenuMap(gid, togRoute) );
+        ++gid;
+        morep->addMenu(subp);
+      }      
+      pup->addMenu(morep);
+      #endif
+      
+    }
+    return;
+  }
+  else
+  {
+    AudioTrack* t = (AudioTrack*)_track;
+    int channel = t->channels();
+    if(_isOutMenu)   
+    {
+      RouteList* orl = t->outRoutes();
+
+      QAction* act = 0;
+      int gid = 0;
+      gid = 0;
+      
+      switch(_track->type()) 
+      {
+        case Track::AUDIO_OUTPUT:
+        {
+          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);
+            _pup->addAction(titel); 
+  
+            if(!checkAudioDevice())
+            { 
+              _pup->clear();
+              return;
+            }
+            std::list<QString> ol = audioDevice->inputPorts();
+            for(std::list<QString>::iterator ip = ol.begin(); ip != ol.end(); ++ip) 
+            {
+              act = _pup->addAction(*ip);
+              act->setCheckable(true);
+              
+              Route dst(*ip, true, i, Route::JACK_ROUTE);
+              act->setData(qVariantFromValue(dst));   
+              ++gid;
+              for(ciRoute ir = orl->begin(); ir != orl->end(); ++ir) 
+              {
+                if(*ir == dst) 
+                {
+                  act->setChecked(true);
+                  break;
+                }
+              }
+            }
+            if(i+1 != channel)
+              _pup->addSeparator();
+          }      
+          
+          //
+          // Display using separate menu for audio inputs:
+          //
+          _pup->addSeparator();
+          _pup->addAction(new MenuTitleItem(tr("Soloing chain"), _pup)); 
+          PopupMenu* subp = new PopupMenu(_pup, true);
+          subp->setTitle(tr("Audio returns")); 
+          _pup->addMenu(subp);
+          gid = addInPorts(t, subp, gid, -1, -1, true);  
+          //
+          // Display all in the same menu:
+          //
+          //_pup->addSeparator();
+          //MenuTitleItem* title = new MenuTitleItem(tr("Audio returns"), _pup);
+          //_pup->addAction(title); 
+          //gid = addInPorts(t, _pup, gid, -1, -1, true);  
+        }
+        break;
+        case Track::AUDIO_SOFTSYNTH:
+              gid = addMultiChannelPorts(t, _pup, gid, true);
+        break;
+        
+        case Track::AUDIO_INPUT:
+        case Track::WAVE:
+        case Track::AUDIO_GROUP:
+        case Track::AUDIO_AUX:
+              gid = addWavePorts(        t, _pup, gid, -1, -1, true);  
+              gid = addOutPorts(         t, _pup, gid, -1, -1, true);
+              gid = addGroupPorts(       t, _pup, gid, -1, -1, true);
+              gid = nonSyntiTrackAddSyntis(t, _pup, gid, true);
+        break;
+        default:
+              _pup->clear();
+              return;
+      }
+    }
+    else
+    {
+      if(_track->type() == Track::AUDIO_AUX)
+        return;
+        
+      RouteList* irl = t->inRoutes();
+  
+      QAction* act = 0;
+      int gid = 0;
+      gid = 0;
+      
+      switch(_track->type()) 
+      {
+        case Track::AUDIO_INPUT:
+        {
+          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);
+            _pup->addAction(titel); 
+  
+            if(!checkAudioDevice())
+            { 
+              _pup->clear();
+              return;
+            }
+            std::list<QString> ol = audioDevice->outputPorts();
+            for(std::list<QString>::iterator ip = ol.begin(); ip != ol.end(); ++ip) 
+            {
+              act = _pup->addAction(*ip);
+              act->setCheckable(true);
+              
+              Route dst(*ip, true, i, Route::JACK_ROUTE);
+              act->setData(qVariantFromValue(dst));   
+              ++gid;
+              for(ciRoute ir = irl->begin(); ir != irl->end(); ++ir) 
+              {
+                if(*ir == dst) 
+                {
+                  act->setChecked(true);
+                  break;
+                }
+              }
+            }
+            if(i+1 != channel)
+              _pup->addSeparator();
+          }
+          
+          //
+          // Display using separate menus for midi ports and audio outputs:
+          //
+          _pup->addSeparator();
+          _pup->addAction(new MenuTitleItem(tr("Soloing chain"), _pup)); 
+          PopupMenu* subp = new PopupMenu(_pup, true);
+          subp->setTitle(tr("Audio sends")); 
+          _pup->addMenu(subp);
+          gid = addOutPorts(t, subp, gid, -1, -1, false);  
+          subp = new PopupMenu(_pup, true);
+          subp->setTitle(tr("Midi port sends")); 
+          _pup->addMenu(subp);
+          addMidiPorts(t, subp, gid, false);
+          //
+          // Display all in the same menu:
+          //
+          //_pup->addAction(new MenuTitleItem(tr("Audio sends"), _pup)); 
+          //gid = addOutPorts(t, _pup, gid, -1, -1, false);  
+          //_pup->addSeparator();
+          //_pup->addAction(new MenuTitleItem(tr("Midi sends"), _pup)); 
+          //addMidiPorts(t, _pup, gid, false);
+        }
+        break;
+        case Track::AUDIO_OUTPUT:
+              gid = addWavePorts( t, _pup, gid, -1, -1, false);
+              gid = addInPorts(   t, _pup, gid, -1, -1, false);
+              gid = addGroupPorts(t, _pup, gid, -1, -1, false);
+              gid = addAuxPorts(  t, _pup, gid, -1, -1, false);
+              gid = nonSyntiTrackAddSyntis(t, _pup, gid, false);
+              break;
+        case Track::WAVE:
+              gid = addWavePorts( t, _pup, gid, -1, -1, false);  
+              gid = addInPorts(   t, _pup, gid, -1, -1, false);
+              gid = addGroupPorts(t, _pup, gid, -1, -1, false);  
+              gid = addAuxPorts(  t, _pup, gid, -1, -1, false);  
+              gid = nonSyntiTrackAddSyntis(t, _pup, gid, false); 
+              break;
+        case Track::AUDIO_GROUP:
+              gid = addWavePorts( t, _pup, gid, -1, -1, false);
+              gid = addInPorts(   t, _pup, gid, -1, -1, false);
+              gid = addGroupPorts(t, _pup, gid, -1, -1, false);
+              gid = addAuxPorts(  t, _pup, gid, -1, -1, false);  
+              gid = nonSyntiTrackAddSyntis(t, _pup, gid, false);
+              break;
+        
+        case Track::AUDIO_SOFTSYNTH:
+              gid = addMultiChannelPorts(t, _pup, gid, false);
+              break;
+        default:
+              _pup->clear();
+              return;
+      }  
+    }  
+  }
+}
+
+void RoutePopupMenu::exec(Track* track, bool isOutput)
+{
+  if(track)
+  {
+    _track = track;
+    _isOutMenu = isOutput;
+  }  
+  prepare();
+  _pup->exec();
+}
+
+void RoutePopupMenu::exec(const QPoint& p, Track* track, bool isOutput)
+{
+  if(track)
+  {
+    _track = track;
+    _isOutMenu = isOutput;
+  }  
+  prepare();
+  _pup->exec(p);
+}
+
+void RoutePopupMenu::popup(const QPoint& p, Track* track, bool isOutput)
+{
+  if(track)
+  {
+    _track = track;
+    _isOutMenu = isOutput;
+  }  
+  prepare();
+  _pup->popup(p);
+}
+
diff --git a/muse2/muse/widgets/routepopup.h b/muse2/muse/widgets/routepopup.h
new file mode 100644
index 00000000..6772e8ca
--- /dev/null
+++ b/muse2/muse/widgets/routepopup.h
@@ -0,0 +1,73 @@
+//=========================================================
+//  MusE
+//  Linux Music Editor
+//
+//  RoutePopupMenu.h 
+//  (C) Copyright 2011 Tim E. Real (terminator356 A T sourceforge D O T net)
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
+
+#ifndef __ROUTEPOPUPMENU_H__
+#define __ROUTEPOPUPMENU_H__
+
+#include <QObject>
+
+class Track;
+class AudioTrack;
+class PopupMenu;
+class QWidget;
+class QString;
+class QAction;
+class QPoint;
+
+class RoutePopupMenu : public QObject
+{
+  Q_OBJECT
+  
+    PopupMenu* _pup;
+    Track* _track;
+    // Whether the route popup was shown by clicking the output routes button, or input routes button.
+    bool _isOutMenu;
+    
+    void init();
+    void prepare();
+    
+    int addMenuItem(AudioTrack* track, Track* route_track, PopupMenu* lb, int id, int channel, 
+                    int channels, bool isOutput);
+    int addAuxPorts(AudioTrack* t, PopupMenu* lb, int id, int channel, int channels, bool isOutput);
+    int addInPorts(AudioTrack* t, PopupMenu* lb, int id, int channel, int channels, bool isOutput);
+    int addOutPorts(AudioTrack* t, PopupMenu* lb, int id, int channel, int channels, bool isOutput);
+    int addGroupPorts(AudioTrack* t, PopupMenu* lb, int id, int channel, int channels, bool isOutput);
+    int addWavePorts(AudioTrack* t, PopupMenu* lb, int id, int channel, int channels, bool isOutput);
+    int addSyntiPorts(AudioTrack* t, PopupMenu* lb, int id, int channel, int channels, bool isOutput);
+    int addMultiChannelPorts(AudioTrack* t, PopupMenu* pup, int id, bool isOutput);
+    int nonSyntiTrackAddSyntis(AudioTrack* t, PopupMenu* lb, int id, bool isOutput);
+    int addMidiPorts(AudioTrack* t, PopupMenu* pup, int id, bool isOutput);
+    
+  private slots:
+    void popupActivated(QAction*);
+    void songChanged(int);
+  
+  public:
+    RoutePopupMenu(QWidget* parent = 0, Track* track = 0, bool isOutput = false);
+    RoutePopupMenu(const QString& title, QWidget* parent = 0, Track* track = 0, bool isOutput = false);
+    ~RoutePopupMenu();
+    
+    void updateRouteMenus();
+    void exec(Track* track = 0, bool isOutput = false);
+    void exec(const QPoint& p, Track* track = 0, bool isOutput = false);
+    void popup(const QPoint& p, Track* track = 0, bool isOutput = false);
+};
+
+#endif
diff --git a/muse2/muse/widgets/scrollscale.h b/muse2/muse/widgets/scrollscale.h
index 32043070..67cfe573 100644
--- a/muse2/muse/widgets/scrollscale.h
+++ b/muse2/muse/widgets/scrollscale.h
@@ -21,6 +21,8 @@ class QToolButton;
 //---------------------------------------------------------
 
 class ScrollScale : public QWidget {
+      Q_OBJECT
+    
       QSlider* scale;
       QScrollBar* scroll;
       int minVal, maxVal;
@@ -38,8 +40,7 @@ class ScrollScale : public QWidget {
       double logbase;
 
       virtual void resizeEvent(QResizeEvent*);
-      Q_OBJECT
-
+      
    private slots:
       void pageUp();
       void pageDown();
diff --git a/muse2/muse/widgets/swidget.h b/muse2/muse/widgets/swidget.h
index c5f4fd6a..45f8cad0 100644
--- a/muse2/muse/widgets/swidget.h
+++ b/muse2/muse/widgets/swidget.h
@@ -17,8 +17,9 @@
 //---------------------------------------------------------
 
 class SWidget : public QWidget {
-      virtual void resizeEvent(QResizeEvent*);
       Q_OBJECT
+      virtual void resizeEvent(QResizeEvent*);
+      
 
    signals:
       void heightChanged(int);
diff --git a/muse2/muse/widgets/tb1.h b/muse2/muse/widgets/tb1.h
index ff31593f..3e721e74 100644
--- a/muse2/muse/widgets/tb1.h
+++ b/muse2/muse/widgets/tb1.h
@@ -23,14 +23,15 @@ class LabelCombo;
 //---------------------------------------------------------
 
 class Toolbar1 : public QToolBar {       
+      Q_OBJECT
+    
       QToolButton* solo;
       PosLabel* pos;
       PitchLabel* pitch;
       LabelCombo* raster;
       QTableWidget* rlist;
       bool showPitch;
-      Q_OBJECT
-
+      
    private slots:
       void _rasterChanged(int);
 
diff --git a/muse2/muse/widgets/tempolabel.h b/muse2/muse/widgets/tempolabel.h
index 71aeb4b8..69dc1450 100644
--- a/muse2/muse/widgets/tempolabel.h
+++ b/muse2/muse/widgets/tempolabel.h
@@ -16,9 +16,11 @@
 //---------------------------------------------------------
 
 class TempoLabel : public QLabel {
+      Q_OBJECT
+    
       double _value;
 
-      Q_OBJECT
+      
 
    protected:
       QSize sizeHint() const;
diff --git a/muse2/muse/widgets/tools.h b/muse2/muse/widgets/tools.h
index be479a50..2116b958 100644
--- a/muse2/muse/widgets/tools.h
+++ b/muse2/muse/widgets/tools.h
@@ -46,6 +46,7 @@ extern ToolB toolList[];
 
 class EditToolBar : public QToolBar {
       Q_OBJECT
+    
       Action** actions;
       int nactions;
 
diff --git a/muse2/muse/widgets/unusedwavefiles.h b/muse2/muse/widgets/unusedwavefiles.h
index fd1f524c..e28754de 100644
--- a/muse2/muse/widgets/unusedwavefiles.h
+++ b/muse2/muse/widgets/unusedwavefiles.h
@@ -10,6 +10,7 @@ namespace Ui {
 class UnusedWaveFiles : public QDialog
 {
     Q_OBJECT
+    
     QStringList allWaveFiles;
 public:
     explicit UnusedWaveFiles(QWidget *parent = 0);
diff --git a/muse2/muse/widgets/verticalmeter.h b/muse2/muse/widgets/verticalmeter.h
index 699be1e5..facc8b8c 100644
--- a/muse2/muse/widgets/verticalmeter.h
+++ b/muse2/muse/widgets/verticalmeter.h
@@ -17,6 +17,8 @@ class QMouseEvent;
 class QPainter;
 
 class VerticalMeter : public Meter {
+      Q_OBJECT
+    
    private:
       MeterType mtype;
       bool overflow;
@@ -27,7 +29,7 @@ class VerticalMeter : public Meter {
 
       void drawVU(QPainter& p, int, int, int);
 
-      Q_OBJECT
+      
       void paintEvent(QPaintEvent*);
       void resizeEvent(QResizeEvent*);
 
diff --git a/muse2/muse/widgets/view.h b/muse2/muse/widgets/view.h
index f8b0c90f..f53c4c72 100644
--- a/muse2/muse/widgets/view.h
+++ b/muse2/muse/widgets/view.h
@@ -24,12 +24,14 @@ class QResizeEvent;
 //---------------------------------------------------------
 
 class View : public QWidget {
+    Q_OBJECT
+    
       QPixmap pm;             // for double buffering
       bool pmValid;
       QPixmap bgPixmap;       // background Pixmap
       QBrush brush;
       bool _virt;
-      Q_OBJECT
+      
 
    protected:
       int xorg;
diff --git a/muse2/muse/widgets/visibletracks.cpp b/muse2/muse/widgets/visibletracks.cpp
index e261c274..f6acf206 100644
--- a/muse2/muse/widgets/visibletracks.cpp
+++ b/muse2/muse/widgets/visibletracks.cpp
@@ -87,7 +87,7 @@ void VisibleTracks::updateVisibleTracksButtons()
 
 void VisibleTracks::visibilityChanged(QAction* action)
 {
-      printf("update visibility\n");
+//      printf("update visibility\n");
       switch (((Action*)action)->id()) {
           case 0:
             WaveTrack::setVisible(action->isChecked());
diff --git a/muse2/share/locale/muse_de.ts b/muse2/share/locale/muse_de.ts
index b53d0f5e..768bf89a 100644
--- a/muse2/share/locale/muse_de.ts
+++ b/muse2/share/locale/muse_de.ts
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0">
+<TS version="2.0" language="de_DE">
 <context>
     <name>@default</name>
     <message>
+        <location filename="../../muse/transport.cpp" line="+31"/>
         <source>Click this button to enable recording</source>
         <translation>Auf diese Schaltfläche klicken um in den Modus &quot;Aufnahme&quot; zu gelangen</translation>
     </message>
@@ -11,11 +12,12 @@
         <source>sets amount of quantization:
 0   - no quantization
 100 - full quantization</source>
-        <translation>Quantisierungsstärke einstellen:
+        <translation type="obsolete">Quantisierungsstärke einstellen:
 0 - keine Quantisierung
 100 - volle Quantisierung</translation>
     </message>
     <message>
+        <location filename="../../muse/widgets/tools.cpp" line="+16"/>
         <source>select Pointer Tool:
 with the pointer tool you can:
   select parts
@@ -28,88 +30,107 @@ Dieses Werkzeug ermöglicht:
   Parts kopieren</translation>
     </message>
     <message>
+        <location filename="../../muse/app.cpp" line="+71"/>
         <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>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="+3"/>
         <source>Create New Song</source>
         <translation>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>
     </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>
     </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>
     </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>
     </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>
     </message>
     <message>
         <source>don&apos;t quantize notes above this tick limit</source>
-        <translation>Keine Note länger als die Taktschlagdauer quantisieren</translation>
+        <translation type="obsolete">Keine Note länger als die Taktschlagdauer quantisieren</translation>
     </message>
     <message>
         <source>quantize also note len as default</source>
-        <translation>Auch die Notenlänge als Standard quantisieren</translation>
+        <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>
     </message>
     <message>
+        <location line="+1"/>
         <source>record starts at left mark</source>
         <translation>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>
     </message>
     <message>
+        <location line="+1"/>
         <source>rewind to start position</source>
         <translation>Zur Startposition springen</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>rewind current position</source>
         <translation>Einen Taktschlag rückwärts</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>move current position</source>
         <translation>Einen Taktschlag vorwärts</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>stop sequencer</source>
         <translation>Wiedergabe beenden</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>start sequencer play</source>
         <translation>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>
     </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>
     </message>
     <message>
+        <location filename="../../muse/widgets/tools.cpp" line="+5"/>
         <source>select Pencil Tool:
 with the pencil tool you can:
   create new parts
@@ -120,77 +141,120 @@ Dieses Werkzeug ermöglicht:
   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>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>select Muting Tool:
 click on part to mute/unmute</source>
         <translation>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>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cursor tool</source>
+        <translation>Zeiger-Werkzeug</translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>pointer</source>
         <translation>Zeiger</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>pencil</source>
         <translation>Zeichenstift</translation>
     </message>
     <message>
+        <location line="+2"/>
         <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 Part still</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 filename="../../muse/arranger/arranger.cpp" line="+136"/>
+        <location filename="../../muse/master/masteredit.cpp" line="+127"/>
+        <location filename="../../muse/widgets/comboQuant.cpp" line="+23"/>
+        <location line="+1"/>
+        <location line="+1"/>
+        <location filename="../../muse/widgets/tb1.cpp" line="+31"/>
+        <location line="+1"/>
+        <location line="+1"/>
         <source>Off</source>
         <translation>Aus</translation>
     </message>
@@ -203,130 +267,189 @@ click on part to mute/unmute</source>
         <translation type="obsolete">Alle Dateien (*)</translation>
     </message>
     <message>
+        <location filename="../../muse/app.cpp" line="+645"/>
         <source>Add Midi Track</source>
         <translation>Midispur erzeugen</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Add Drum Track</source>
         <translation>Schlagzeugspur erzeugen</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Add Wave Track</source>
         <translation>Wavespur erzeugen</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Add Audio Output</source>
         <translation>Audioausgang erzeugen</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Add Audio Group</source>
         <translation>Audiogruppe erzeugen</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Add Audio Input</source>
         <translation>Audioeingang erzeugen</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Add Aux Send</source>
         <translation>Aux Send erzeugen</translation>
     </message>
     <message>
+        <location filename="../../muse/widgets/tools.cpp" line="-8"/>
         <source>eraser</source>
         <translation>Radierer</translation>
     </message>
     <message>
+        <location filename="../../muse/app.cpp" line="-66"/>
         <source>MESS</source>
-        <translation type="unfinished"></translation>
+        <translation>MESS</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>DSSI</source>
-        <translation type="unfinished"></translation>
+        <translation>DSSI</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>FST</source>
-        <translation type="unfinished"></translation>
+        <translation>FST</translation>
     </message>
     <message>
+        <location line="+56"/>
+        <location filename="../../muse/arranger/tlist.cpp" line="+970"/>
         <source>Add Synth</source>
-        <translation type="unfinished"></translation>
+        <translation>Synthesizer hinzufügen</translation>
     </message>
     <message>
+        <location filename="../../muse/arranger/arranger.cpp" line="+0"/>
         <source>Bar</source>
-        <translation type="unfinished">Takt</translation>
+        <translation>Takt</translation>
     </message>
     <message>
+        <location filename="../../muse/confmport.cpp" line="+714"/>
         <source> Jack</source>
-        <translation type="unfinished"></translation>
+        <translation>Jack</translation>
     </message>
     <message>
+        <location line="+46"/>
         <source>ALSA:</source>
-        <translation type="unfinished"></translation>
+        <translation>ALSA:</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>SYNTH:</source>
-        <translation type="unfinished"></translation>
+        <translation>SYNTH:</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>JACK:</source>
-        <translation type="unfinished"></translation>
+        <translation>JACK:</translation>
     </message>
     <message>
+        <location filename="../../muse/driver/alsamidi.cpp" line="+225"/>
+        <location filename="../../muse/driver/jackmidi.cpp" line="+737"/>
+        <location filename="../../muse/midiport.cpp" line="+1072"/>
+        <location filename="../../muse/track.cpp" line="+782"/>
+        <location line="+16"/>
+        <location line="+30"/>
         <source>Route</source>
-        <translation type="unfinished">Signalfluss</translation>
+        <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 type="unfinished"></translation>
+        <translation>Kanal=&quot;%1&quot;</translation>
     </message>
     <message>
+        <location line="+34"/>
+        <location filename="../../muse/driver/jackmidi.cpp" line="+36"/>
+        <location filename="../../muse/midiport.cpp" line="+7"/>
+        <location filename="../../muse/track.cpp" line="-48"/>
+        <location line="+60"/>
         <source>dest</source>
-        <translation type="unfinished"></translation>
+        <translation>Ziel</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location filename="../../muse/driver/jackmidi.cpp" line="+2"/>
         <source> devtype=&quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>Gerätetyp=&quot;%1&quot;</translation>
     </message>
     <message>
+        <location line="+3"/>
+        <location filename="../../muse/driver/jackmidi.cpp" line="-61"/>
+        <location line="+64"/>
+        <location filename="../../muse/track.cpp" line="-42"/>
+        <location line="+48"/>
         <source> type=&quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>Typ=&quot;%1&quot;</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location filename="../../muse/driver/jackmidi.cpp" line="-61"/>
+        <location line="+64"/>
+        <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>
+        <translation>Name=&quot;%1&quot;</translation>
     </message>
     <message>
+        <location filename="../../muse/driver/jackmidi.cpp" line="-69"/>
+        <location filename="../../muse/track.cpp" line="-56"/>
         <source>source</source>
-        <translation type="unfinished"></translation>
+        <translation>Quelle</translation>
     </message>
     <message>
+        <location filename="../../muse/midictrl.cpp" line="+227"/>
         <source>Velocity</source>
-        <translation type="unfinished">Velocity</translation>
+        <translation>Anschlag</translation>
     </message>
     <message>
+        <location filename="../../muse/midiport.cpp" line="-756"/>
         <source>&lt;none&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;kein&gt;</translation>
     </message>
     <message>
+        <location line="+750"/>
+        <location filename="../../muse/track.cpp" line="-21"/>
+        <location line="+48"/>
         <source> channelMask=&quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>KanalMaske=&quot;%1&quot;</translation>
     </message>
     <message>
+        <location filename="../../muse/osc.cpp" line="+1316"/>
         <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>
+        <translation>Kanäle=&quot;%1&quot;</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>
@@ -334,6 +457,7 @@ click on part to mute/unmute</source>
 <context>
     <name>AboutBox</name>
     <message>
+        <location filename="../../muse/widgets/aboutbox.ui" line="+14"/>
         <source>AboutBox</source>
         <translation>Projektinformation</translation>
     </message>
@@ -342,10 +466,12 @@ click on part to mute/unmute</source>
         <translation type="obsolete">Zurück zu MusE!</translation>
     </message>
     <message>
+        <location line="+37"/>
         <source>Version 2 pre-alpha</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>(C) Copyright 1999-2010 Werner Schweer and others.
 See http://www.muse-sequencer.org for new versions and
 more information.
@@ -354,10 +480,12 @@ Published under the GNU Public License</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>&amp;Keep On Rocking!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+K</source>
         <translation type="unfinished"></translation>
     </message>
@@ -365,60 +493,78 @@ Published under the GNU Public License</source>
 <context>
     <name>Appearance</name>
     <message>
+        <location filename="../../muse/appearance.cpp" line="+751"/>
         <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>
-        <source>&lt;none&gt;</source>
+        <location line="+2"/>
+        <source>Global opacity (opposite of transparency).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select style sheet</source>
+        <location line="+4"/>
+        <source>Standard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Qt style sheets (*.qss)</source>
+        <location line="+2"/>
+        <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Global opaqueness (inverse of transparency).</source>
+        <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>
@@ -426,284 +572,398 @@ Word-breaking but only with spaces.</source>
     <name>AppearanceDialogBase</name>
     <message>
         <source>MusE: Appearance Settings</source>
-        <translation>MusE: Erscheinungsbild einstellen</translation>
+        <translation type="obsolete">MusE: Erscheinungsbild einstellen</translation>
     </message>
     <message>
+        <location filename="../../muse/widgets/appearancebase.ui" line="+1681"/>
         <source>Apply</source>
         <translation>Anwenden</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Ok</source>
         <translation>Bestätigen</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
+        <location line="-1668"/>
         <source>Arranger</source>
         <translation>Arrangierer</translation>
     </message>
     <message>
+        <location line="-16"/>
+        <source>MusE: Appearance settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>Parts</source>
         <translation>Parts</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>show names</source>
         <translation>Namen anzeigen</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>show events</source>
         <translation>Ereignisse anzeigen</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>show Cakewalk Style</source>
         <translation>Cakewalk Stil</translation>
     </message>
     <message>
+        <location line="+28"/>
+        <source>y-stretch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+15"/>
         <source>Events</source>
         <translation>Ereignisse</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>note on</source>
         <translation>Note An</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>poly pressure</source>
         <translation>Poly Tastendruck</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>controller</source>
         <translation>Kontroller</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>aftertouch</source>
         <translation>Aftertouch</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>pitch bend</source>
         <translation>Pitch bend</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>program change</source>
         <translation>Programmwechsel</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>special</source>
         <translation>Spezial</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Background picture</source>
         <translation>Hintergrundbild</translation>
     </message>
     <message>
         <source>bg</source>
-        <translation>bg</translation>
+        <translation type="obsolete">bg</translation>
     </message>
     <message>
         <source>select...</source>
-        <translation>auswählen ...</translation>
+        <translation type="obsolete">auswählen ...</translation>
     </message>
     <message>
+        <location line="+58"/>
         <source>show snap grid</source>
         <translation>Magnetisches Gitter anzeigen</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Colors</source>
         <translation>Farben</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Items</source>
         <translation>Items</translation>
     </message>
     <message>
+        <location line="+756"/>
+        <source>Color name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Global opacity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
         <source>Style/Fonts</source>
         <translation>Stil und Schriftart</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>QT Theme</source>
         <translation>Qt Thema</translation>
     </message>
     <message>
+        <location line="+21"/>
         <source>Windows</source>
         <translation>Fenster</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>MusE</source>
         <translation>MusE</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Metal</source>
         <translation>Metall</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Norwegian Wood</source>
         <translation>Norwegisches Holz</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Platinum</source>
         <translation>Platinum</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>CDE</source>
         <translation>CDE</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Motif</source>
         <translation>Motif</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Motif Plus</source>
         <translation>Motif Plus</translation>
     </message>
     <message>
+        <location line="+73"/>
         <source>Fonts</source>
         <translation>Schriftarten</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Family</source>
         <translation>Familie</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Size</source>
         <translation>Größe</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Font 1</source>
         <translation>Schriftart 1</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Font 2</source>
         <translation>Schriftart 2</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Font 3</source>
         <translation>Schriftart 3</translation>
     </message>
     <message>
+        <location line="+50"/>
         <source>Font 0</source>
         <translation>Schriftart 0</translation>
     </message>
     <message>
+        <location line="+50"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <location line="+157"/>
+        <location line="+47"/>
+        <location line="+7"/>
         <source>Bold</source>
         <translation>Fett</translation>
     </message>
     <message>
+        <location line="-204"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <location line="+136"/>
+        <location line="+54"/>
+        <location line="+7"/>
         <source>Italic</source>
         <translation>Kursiv</translation>
     </message>
     <message>
+        <location line="-433"/>
+        <location line="+7"/>
+        <location line="+242"/>
+        <location line="+13"/>
+        <location line="+13"/>
+        <location line="+13"/>
+        <location line="+97"/>
+        <location line="+61"/>
+        <location line="+13"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
+        <location line="-164"/>
         <source>Font 4</source>
         <translation>Schriftart 4</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Font 5</source>
         <translation>Schriftart 5</translation>
     </message>
     <message>
+        <location line="-1228"/>
         <source>Palette</source>
         <translation>Palette</translation>
     </message>
     <message>
+        <location line="-64"/>
+        <source>add</source>
+        <translation type="unfinished">Zufgen</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>remove</source>
+        <translation type="unfinished">entfernen</translation>
+    </message>
+    <message>
+        <location line="+586"/>
         <source>add to palette</source>
         <translation>Zur Palette hinzufügen</translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>B</source>
         <translation>B</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>H</source>
         <translation>H</translation>
     </message>
     <message>
+        <location line="+30"/>
         <source>V</source>
         <translation>V</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>G</source>
         <translation>G</translation>
     </message>
     <message>
+        <location line="+96"/>
         <source>R</source>
         <translation>R</translation>
     </message>
     <message>
+        <location line="-772"/>
         <source>clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+953"/>
         <source>Style Sheet:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+345"/>
         <source>Font 6</source>
         <translation type="unfinished">Schriftart 6</translation>
     </message>
-    <message>
-        <source>Global opaqueness</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>Arranger</name>
     <message>
+        <location filename="../../muse/arranger/arranger.cpp" line="-10"/>
         <source>Cursor</source>
         <translation>Position</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Snap</source>
         <translation>Magnet</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Len</source>
         <translation>Länge</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>NO</source>
         <translation>Kein</translation>
     </message>
     <message>
+        <location line="+103"/>
         <source>TrackInfo</source>
         <translation>Spurinfo</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Track</source>
         <translation>Spur</translation>
     </message>
     <message>
+        <location line="-121"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
+        <location line="+6"/>
+        <location line="+1"/>
         <source>midi song type</source>
         <translation>Midi Lied Typ</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Pitch</source>
         <translation>Tonhöhenänderung</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>midi pitch</source>
         <translation>Midi Tonhöhenänderung</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>global midi pitch shift</source>
         <translation>Globale Midi Tonhöhenänderung</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Tempo</source>
         <translation>Tempo</translation>
     </message>
     <message>
+        <location line="+8"/>
+        <location line="+1"/>
         <source>midi tempo</source>
         <translation>Midi Tempo</translation>
     </message>
@@ -712,6 +972,7 @@ Word-breaking but only with spaces.</source>
         <translation type="obsolete">Ausgangsanschluss</translation>
     </message>
     <message>
+        <location line="-80"/>
         <source>Arranger</source>
         <translation>Arrangierer</translation>
     </message>
@@ -724,82 +985,112 @@ Word-breaking but only with spaces.</source>
         <translation type="obsolete">Takt</translation>
     </message>
     <message>
+        <location line="+48"/>
         <source>GM</source>
         <translation>GM</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>GS</source>
         <translation>GS</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>XG</source>
         <translation>XG</translation>
     </message>
     <message>
+        <location line="+40"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
+        <location line="+73"/>
         <source>R</source>
         <translation>R</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>M</source>
         <translation>M</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Ch</source>
         <translation>K</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>T</source>
         <translation>T</translation>
     </message>
     <message>
+        <location line="-230"/>
         <source>Enable Recording</source>
         <translation type="unfinished">Aufnahme einschalten</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Mute/Off Indicator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Solo Indicator</source>
         <translation type="unfinished">Anzeige &quot;Solo&quot;</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Track Type</source>
         <translation type="unfinished">Spurtyp</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Track Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Midi output channel number or audio channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Midi output port or synth midi port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Time Lock</source>
         <translation type="unfinished">Sperre &quot;Zeit&quot;</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>Automation parameter selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Notation clef</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
         <source>Enable recording. Click to toggle.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Mute indicator. Click to toggle.
 Right-click to toggle track on/off.
 Mute is designed for rapid, repeated action.
@@ -807,28 +1098,33 @@ On/Off is not!</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+1"/>
         <source>Track type. Right-click to change
  midi and drum track types.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Track name. Double-click to edit.
 Right-click for more options.</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+1"/>
         <source>Midi/drum track: Output port.
 Synth track: Assigned midi port.
 Left-click to change.
@@ -836,19 +1132,34 @@ Right-click to show GUI.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Time lock</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>Notation clef. Select this tracks notation clef.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <location line="+1"/>
         <source>song length - bars</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+126"/>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;unknown&gt;</source>
+        <location line="+3"/>
+        <source>Automation</source>
+        <translation type="unfinished">Automatisierung</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Clef</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -859,46 +1170,57 @@ Right-click to show GUI.</source>
         <translation type="obsolete">MusE: Mischpult</translation>
     </message>
     <message>
+        <location filename="../../muse/mixer/amixer.cpp" line="+156"/>
         <source>&amp;Create</source>
         <translation>&amp;Erzeugen</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>&amp;View</source>
         <translation>&amp;Zeigen</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Routing</source>
         <translation>Signalfluss</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>Show Inputs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Show Outputs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Show Groups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Show Auxs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Show Synthesizers</source>
         <translation type="unfinished"></translation>
     </message>
@@ -906,46 +1228,57 @@ Right-click to show GUI.</source>
 <context>
     <name>AudioStrip</name>
     <message>
+        <location filename="../../muse/mixer/astrip.cpp" line="+603"/>
         <source>panorama</source>
         <translation>Panorama</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>aux send level</source>
         <translation>Aux Send Pegel</translation>
     </message>
     <message>
+        <location line="+286"/>
         <source>off</source>
         <translation>Aus</translation>
     </message>
     <message>
+        <location line="-263"/>
         <source>Pan</source>
         <translation>Balance</translation>
     </message>
     <message>
+        <location line="+93"/>
         <source>1/2 channel</source>
         <translation>1/2 Kanal</translation>
     </message>
     <message>
+        <location line="+12"/>
         <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="+64"/>
         <source>dB</source>
         <translation>dB</translation>
     </message>
     <message>
+        <location line="+36"/>
         <source>record</source>
         <translation>Aufnahme</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>mute</source>
         <translation>still</translation>
     </message>
     <message>
+        <location line="+25"/>
         <source>record downmix</source>
         <translation>Aufnahme Abmischung</translation>
     </message>
@@ -958,6 +1291,7 @@ Right-click to show GUI.</source>
         <translation type="obsolete">Abhöre vor Regler</translation>
     </message>
     <message>
+        <location line="+37"/>
         <source>iR</source>
         <translation>iR</translation>
     </message>
@@ -966,99 +1300,102 @@ Right-click to show GUI.</source>
         <translation type="obsolete">Eingangs-Signalfluss</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>oR</source>
         <translation>oR</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>output routing</source>
         <translation>Ausgangs-Signalfluss</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Off</source>
         <translation>Aus</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Read</source>
         <translation>Lesen</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Touch</source>
         <translation>Antasten</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Write</source>
         <translation>Schreiben</translation>
     </message>
     <message>
+        <location line="+25"/>
         <source>automation type</source>
         <translation>Automationstyp</translation>
     </message>
     <message>
         <source>Channel</source>
-        <translation>Kanal</translation>
+        <translation type="obsolete">Kanal</translation>
     </message>
     <message>
+        <location line="-88"/>
+        <location line="+4"/>
         <source>solo mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>input routing</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Awl::MidiVolEntry</name>
-    <message>
-        <source>off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>db</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Awl::VolEntry</name>
-    <message>
-        <source>off</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>BigTime</name>
     <message>
+        <location filename="../../muse/widgets/bigtime.cpp" line="+78"/>
         <source>MusE: Bigtime</source>
         <translation>MusE: Zeitanzeige groß</translation>
     </message>
     <message>
+        <location line="-42"/>
         <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">Minute</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>second</source>
         <translation type="unfinished">Sekunde</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <location line="+3"/>
         <source>frame</source>
         <translation type="unfinished">Rahmen</translation>
     </message>
     <message>
+        <location line="-2"/>
         <source>subframe</source>
         <translation type="unfinished">Subrahmen</translation>
     </message>
@@ -1066,6 +1403,7 @@ Right-click to show GUI.</source>
 <context>
     <name>ClipListEdit</name>
     <message>
+        <location filename="../../muse/cliplist/cliplist.cpp" line="+103"/>
         <source>MusE: Clip List Editor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1073,38 +1411,47 @@ Right-click to show GUI.</source>
 <context>
     <name>ClipListEditorBase</name>
     <message>
+        <location filename="../../muse/widgets/cliplisteditorbase.ui" line="+17"/>
         <source>MusE: ClipList</source>
         <translation>MusE: Klipp Liste</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Refs</source>
         <translation>Refs</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Start</source>
         <translation>Start</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Len</source>
         <translation>Länge</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Data</source>
         <translation>Daten</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>Clip Properties</source>
         <translation>Klippeigenschaften</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Pos:</source>
         <translation>Pos:</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Len:</source>
         <translation>Länge:</translation>
     </message>
@@ -1112,14 +1459,17 @@ Right-click to show GUI.</source>
 <context>
     <name>CommentBase</name>
     <message>
+        <location filename="../../muse/widgets/commentbase.ui" line="+14"/>
         <source>Form1</source>
         <translation>Form1</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>Track Comment</source>
         <translation>Spur Kommentar</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>Track 1</source>
         <translation>Spur 1</translation>
     </message>
@@ -1131,42 +1481,52 @@ Right-click to show GUI.</source>
         <translation type="obsolete">MusE: Konfiguration Midi Datei exportieren</translation>
     </message>
     <message>
+        <location filename="../../muse/widgets/configmidifilebase.ui" line="+193"/>
         <source>&amp;OK</source>
         <translation>&amp;Bestätigen</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Abbrechen</translation>
     </message>
     <message>
+        <location line="-56"/>
         <source>0 (single track)</source>
         <translation>0 (einzelne Spur)</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>1 (multiple tracks)</source>
         <translation>1 (mehrere Spuren)</translation>
     </message>
     <message>
+        <location line="-36"/>
         <source>Format:</source>
         <translation>Format:</translation>
     </message>
     <message>
+        <location line="-48"/>
         <source>96</source>
         <translation>96</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>192</source>
         <translation>192</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>384</source>
         <translation>384</translation>
     </message>
     <message>
+        <location line="+48"/>
         <source>Division:</source>
         <translation>Unterteilung:</translation>
     </message>
     <message>
+        <location line="-20"/>
         <source>Copyright:</source>
         <translation>Copyright:</translation>
     </message>
@@ -1175,46 +1535,57 @@ Right-click to show GUI.</source>
         <translation type="obsolete">Aktiviere erweitertes SMF Format</translation>
     </message>
     <message>
+        <location line="-95"/>
         <source>MusE: Config Midi File Import/Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Import:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Split tracks into &amp;parts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+P</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Split tracks into parts, or one single part</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Export:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+31"/>
         <source>Enable extended smf format (currently not implemented)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Use &amp;2-byte time signatures instead of standard 4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+37"/>
         <source>Save space by replacing note-offs with &amp;zero velocity note-ons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+Z</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1222,10 +1593,12 @@ Right-click to show GUI.</source>
 <context>
     <name>CtrlPanel</name>
     <message>
+        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="+79"/>
         <source>select controller</source>
         <translation>Kontroller wählen</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>remove panel</source>
         <translation>Kontrolleransicht schließen</translation>
     </message>
@@ -1238,252 +1611,384 @@ Right-click to show GUI.</source>
         <translation type="obsolete">Schließen</translation>
     </message>
     <message>
+        <location line="+463"/>
+        <location line="+236"/>
         <source>Velocity</source>
         <translation>Velocity</translation>
     </message>
     <message>
+        <location line="-186"/>
         <source>add new ...</source>
         <translation>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>
+    </message>
 </context>
 <context>
     <name>DeicsOnzeGui</name>
     <message>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="+533"/>
         <source>Save configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+41"/>
+        <location line="+7"/>
+        <location line="+1172"/>
+        <location line="+7"/>
+        <location line="+218"/>
+        <location line="+7"/>
+        <location line="+160"/>
+        <location line="+7"/>
+        <location line="+165"/>
+        <location line="+7"/>
         <source>Critical Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-1749"/>
+        <location line="+1179"/>
+        <location line="+225"/>
+        <location line="+167"/>
+        <location line="+172"/>
         <source>Cannot open file %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-1736"/>
+        <location line="+1179"/>
+        <location line="+225"/>
+        <location line="+167"/>
+        <location line="+172"/>
         <source>Parsing error for file %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-1709"/>
+        <location line="+1351"/>
         <source>Load category dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-226"/>
         <source>Load set dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+67"/>
         <source>Save set dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+24"/>
         <source>New category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location line="+101"/>
         <source>Delete category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-99"/>
         <source>Load category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Save category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Load set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Save set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Delete set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>New subcategory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
+        <location line="+243"/>
         <source>Delete subcategory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-240"/>
         <source>Load subcategory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Save subcategory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>New preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location line="+389"/>
         <source>Delete preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-387"/>
         <source>Load preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Save preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>No more category supported</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>You can not add more categories</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="-338"/>
+        <location line="+170"/>
+        <location line="+170"/>
         <source>&amp;Yes</source>
         <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
+        <location line="-340"/>
+        <location line="+170"/>
+        <location line="+170"/>
         <source>&amp;No</source>
         <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
+        <location line="-323"/>
+        <location line="+110"/>
         <source>No category selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-109"/>
+        <location line="+110"/>
         <source>You must first select a category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-61"/>
+        <location line="+167"/>
+        <location line="+172"/>
         <source>Replace or add</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+3"/>
+        <location line="+168"/>
+        <location line="+171"/>
         <source>&amp;Replace</source>
         <translation type="unfinished">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>
     </message>
     <message>
+        <location line="-329"/>
+        <location line="+167"/>
+        <location line="+171"/>
         <source>Download error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-337"/>
         <source>There is no more free category slot.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>Save category dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+30"/>
         <source>No more subcategory supported</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>You can not add more subcategories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+42"/>
+        <location line="+113"/>
         <source>No subcategory selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-112"/>
+        <location line="+113"/>
         <source>You must first select a subcategory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-101"/>
         <source>Load subcategory dialog</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+14"/>
         <source>There is no more free subcategory slot.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>Save subcategory dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>No more preset supported</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>You can not add more presets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+39"/>
+        <location line="+3"/>
+        <location line="+111"/>
         <source>No preset selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-113"/>
+        <location line="+3"/>
+        <location line="+111"/>
         <source>You must first select a preset.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-98"/>
         <source>Load preset dialog</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+13"/>
         <source>There is no more free preset slot.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>Save preset dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+120"/>
         <source>Browse set dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+35"/>
         <source>Browse image dialog</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1491,983 +1996,73 @@ Right-click to show GUI.</source>
 <context>
     <name>DeicsOnzeGuiBase</name>
     <message>
-        <source>DeicsOnze</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Preset</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Program numerous</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>INITVOICE</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LBank</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subcategory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bank numerous</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>NONE</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>HBank</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Prog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Preset</source>
-        <translation type="unfinished">Vorlage</translation>
-    </message>
-    <message>
-        <source>DeicsOnze v0.5.5 Copyright (c) 2004-2006 Nil Geisweiller. Published under GPL licence.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Global</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pitch Envelope</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PL3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PL2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PL1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PR1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PR2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PR3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pitch modulation depth</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LFO</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LFO Sync</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pitch modulation sensitivity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pitch Modulation Sensitivity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LFO Delay</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LFO delay</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LFO speed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amplitude modulation depth</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amplitude modulation sensitivity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amplitude Modulation Sensitivity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AMS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LFO Waveform</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pitch Modulation Depth</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PMD</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LFO Speed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AMD</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Speed</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Vorlage</translation>
     </message>
     <message>
         <source>Delay</source>
-        <translation type="unfinished">Delay</translation>
-    </message>
-    <message>
-        <source>PMS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Modulation Matrix</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&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;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Op4 Feedback</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Feedback level of the operator 4</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Delay</translation>
     </message>
     <message>
         <source>Transpose</source>
-        <translation type="unfinished">Transponieren</translation>
-    </message>
-    <message>
-        <source>Op &amp;1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scaling 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LS1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RS1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rate Scaling</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Attack Rate of the operator 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Level Scaling</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amplitude Envelope 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RR1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D1R1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D1L1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D2R1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Release Rate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message utf8="true">
-        <source>2° Decay Rate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message utf8="true">
-        <source>1° Decay Level</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message utf8="true">
-        <source>1° Decay Rate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Attack Rate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AR1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Detune, OSCWave, EGShift 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DET1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Detune</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EG Shift</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>96dB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>48dB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>24dB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>12dB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wave form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>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;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sensitivity 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>KVS1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amplitude Modulation Enable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AME1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Keyboard Velocity Sensitivity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key Velocity Sensitivity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EBS1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EG Bias Sensitivity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Eg Bias Sensitivity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Frequency 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Coarse 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Coarse Ratio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine Ratio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Freq 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fixed Frequency</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggle Fix Frequency</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>FIX</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OUT 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Output Volume</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Transponieren</translation>
     </message>
     <message>
         <source>Volume</source>
-        <translation type="unfinished">Volume</translation>
-    </message>
-    <message>
-        <source>Op &amp;2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amplitude Envelope 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D1R2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D1L2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D2R2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RR2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AR2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Frequency 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Coarse 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Freq 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scaling 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LS2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RS2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OUT 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Detune, OSCWave, EGShift 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DET2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sensitivity 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EBS2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>KVS2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AME2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Op &amp;3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amplitude Envelope 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D1R3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D1L3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D2R3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RR3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AR3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scaling 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LS3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RS3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OUT 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Frequency 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Coarse 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Freq 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Detune, OSCWave, EGShift 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DET3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sensitivity 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EBS3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>KVS3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AME3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Op &amp;4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>amplitude Envelope 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AR4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D1R4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D1L4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D2R4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RR4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Frequency 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Coarse 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Freq 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scaling 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LS4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RS4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OUT 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Detune, OSCWave, EGShift 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DET4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sensitivity 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EBS4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>KVS4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AME4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Func</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay Pan Depth</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay Pan LFO Freq</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay Ch Send Level </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Channel Chorus</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay Feedback</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay On/Off, Return Level</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Volume</translation>
     </message>
     <message>
         <source>On</source>
-        <translation type="unfinished">An</translation>
-    </message>
-    <message>
-        <source>Delay Beat Ratio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay BPM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Foot Control</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pitch Bend Range</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pitch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amplitude</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Modulation Wheel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Breath Control</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pitch Bias</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Envelope Bias</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">An</translation>
     </message>
     <message>
         <source>After Touch</source>
-        <translation type="unfinished">Aftertouch</translation>
-    </message>
-    <message>
-        <source>Phony Mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>POLY</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MONO</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Potamento</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Portamento Mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>FINGER</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>FULL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PT</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Portamento Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;horus</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Chorus Parameters</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Channel send level</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>On/Off and Return level</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select LADSPA plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Reverb</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reverb Parameters</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Aftertouch</translation>
     </message>
     <message>
         <source>&amp;Config</source>
-        <translation type="unfinished">&amp;Einstellen</translation>
-    </message>
-    <message>
-        <source>Font Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Quality</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>High</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Middle</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ultra low</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&amp;Einstellen</translation>
     </message>
     <message>
         <source>Filter</source>
-        <translation type="unfinished">Filter</translation>
-    </message>
-    <message>
-        <source>Save Mode (into the song)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save only the used presets</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save the entire set</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save the configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configuration File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Load...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save as default</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Filter</translation>
     </message>
     <message>
         <source>Colors</source>
-        <translation type="unfinished">Farben</translation>
+        <translation type="obsolete">Farben</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation type="unfinished">Text</translation>
-    </message>
-    <message>
-        <source>Background</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Background</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Red</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Blue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Green</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set Path</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Image in the background :</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Browse...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Load the set at the initialization :</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set Brightness, Detune, Attack and Release of the current channel to default</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Res. Ctrl</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut all notes off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Panic!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Number of Voices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Number of voices</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Text</translation>
     </message>
     <message>
         <source>Enable</source>
-        <translation type="unfinished">Einschalten</translation>
+        <translation type="obsolete">Einschalten</translation>
     </message>
     <message>
         <source>Channel</source>
-        <translation type="unfinished">Kanal</translation>
-    </message>
-    <message>
-        <source>Vol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Channel Ctrl</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Release</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Attack</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Brightness</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Modulation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pan</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Kanal</translation>
     </message>
 </context>
 <context>
     <name>DidYouKnow</name>
     <message>
+        <location filename="../../muse/widgets/didyouknow.ui" line="+14"/>
         <source>Did you know?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Don&apos;t show on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Next tip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2475,130 +2070,162 @@ 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="+169"/>
         <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="+11"/>
         <source>&amp;Edit</source>
         <translation>&amp;Bearbeiten</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>Paste</source>
         <translation>Einfügen</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Delete Events</source>
         <translation>Events entfernen</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>Select All</source>
         <translation>Alles auswählen</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Select None</source>
         <translation>Auswahl aufheben</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Invert</source>
         <translation>Auswahl umkehren</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Inside Loop</source>
         <translation>Innerhalb Schleife</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Outside Loop</source>
         <translation>Ausserhalb Schleife</translation>
     </message>
     <message>
+        <location line="-7"/>
         <source>&amp;Select</source>
         <translation>&amp;Auswählen</translation>
     </message>
     <message>
+        <location line="+94"/>
         <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="+57"/>
         <source>Add Controller View</source>
         <translation>Kontrolleransicht hinzufügen</translation>
     </message>
     <message>
+        <location line="+57"/>
         <source>M</source>
         <translation>M</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Sound</source>
         <translation>Klang</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>QNT</source>
         <translation>QNT</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>E-Note</source>
         <translation>E-Note</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Len</source>
         <translation>Länge</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>A-Note</source>
         <translation>A-Note</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Ch</source>
         <translation>K</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>LV1</source>
         <translation>LV1</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>LV2</source>
         <translation>LV2</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>LV3</source>
         <translation>LV3</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>LV4</source>
         <translation>LV4</translation>
     </message>
     <message>
+        <location line="-260"/>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
+        <location line="+110"/>
         <source>Load Drummap</source>
         <translation>Schlagzeugbelegung laden</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Store Drummap</source>
         <translation>Schlagzeugbelegung sichern</translation>
     </message>
     <message>
+        <location line="+68"/>
         <source>ctrl</source>
         <translation>steuern</translation>
     </message>
@@ -2607,118 +2234,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
         <translation type="obsolete">Schlagzeugbelegungen</translation>
     </message>
     <message>
+        <location line="+459"/>
         <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="-625"/>
         <source>Set Fixed Length</source>
         <translation>Länge festlegen</translation>
     </message>
     <message>
+        <location line="-6"/>
         <source>&amp;Functions</source>
         <translation>&amp;Funktionen</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Modify Velocity</source>
         <translation>Velocity ändern</translation>
     </message>
     <message>
+        <location line="-142"/>
+        <location line="+21"/>
         <source>mute instrument</source>
         <translation type="unfinished">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>
     </message>
     <message>
+        <location line="-20"/>
+        <location line="+21"/>
         <source>quantisation</source>
         <translation type="unfinished">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>
     </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>
     </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="+41"/>
         <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="+23"/>
+        <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">Quantisieren</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Erase Event</source>
+        <translation type="unfinished">Ereignis löschen</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="+9"/>
         <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>
+    </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="+471"/>
         <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>
@@ -2726,14 +2434,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
 <context>
     <name>EditCAfterDialog</name>
     <message>
+        <location filename="../../muse/liste/editevent.cpp" line="+430"/>
         <source>Time Position</source>
         <translation>Position</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Pressure</source>
         <translation>Anschlagsdruck</translation>
     </message>
     <message>
+        <location line="-6"/>
         <source>MusE: Enter Channel Aftertouch</source>
         <translation>MusE: Kanal Aftertouch festlegen</translation>
     </message>
@@ -2772,58 +2483,73 @@ 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>EditCtrlBase</name>
     <message>
+        <location filename="../../muse/liste/editctrlbase.ui" line="+14"/>
         <source>MusE: Edit Controller Event</source>
         <translation>MusE: Kontroller Ereignis bearbeiten</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Time Position</source>
         <translation>Position</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Available Controller:</source>
         <translation>Verfügbare Kontroller:</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Create New Controller</source>
         <translation>Neuen Kontroller erstellen</translation>
     </message>
     <message>
+        <location line="+486"/>
         <source>textLabel3</source>
         <translation>Beschriftung3</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Value</source>
         <translation>Wert</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Controller</source>
         <translation>Kontroller</translation>
     </message>
     <message>
+        <location line="+45"/>
         <source>H-Bank</source>
         <translation>H-Bank</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>L-Bank</source>
         <translation>L-Bank</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Program</source>
         <translation>Programm</translation>
     </message>
     <message>
+        <location line="+10"/>
+        <location line="+16"/>
         <source>off</source>
         <translation>aus</translation>
     </message>
     <message>
+        <location line="+42"/>
         <source>pushButton4</source>
         <translation>Schaltfläche4</translation>
     </message>
     <message>
+        <location line="+35"/>
         <source>&amp;OK</source>
         <translation>&amp;Bestätigen</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Abbrechen</translation>
     </message>
@@ -2831,10 +2557,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>
     </message>
     <message>
+        <location line="+2"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
@@ -2842,46 +2570,57 @@ 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>EditGainBase</name>
     <message>
+        <location filename="../../muse/waveedit/editgainbase.ui" line="+14"/>
         <source>MusE: Modify gain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Gain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+51"/>
         <source>200%</source>
         <translation type="unfinished">200%</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>100%</source>
         <translation type="unfinished">100%</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>0%</source>
         <translation type="unfinished">0%</translation>
     </message>
     <message>
+        <location line="+51"/>
         <source>&amp;Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+39"/>
         <source>&amp;Apply</source>
         <translation type="unfinished">&amp;Anwenden</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+A</source>
         <translation type="unfinished">Alt+A</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+C</source>
         <translation type="unfinished">Alt+C</translation>
     </message>
@@ -2889,131 +2628,178 @@ 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="+296"/>
+        <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>
-        <source>(You can override with the environment variable MUSEINSTRUMENTS)</source>
+        <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">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">Lied &amp;nicht Sichern</translation>
     </message>
     <message>
+        <location line="-5"/>
         <source>&amp;Abort</source>
         <translation type="unfinished">&amp;Abbrechen</translation>
     </message>
@@ -3021,6 +2807,7 @@ Save Current Instrument?</source>
 <context>
     <name>EditInstrumentBase</name>
     <message>
+        <location filename="../../muse/instruments/editinstrumentbase.ui" line="+20"/>
         <source>MusE: Instrument Editor</source>
         <translation>MusE: Instrumenten Editor</translation>
     </message>
@@ -3033,14 +2820,17 @@ Save Current Instrument?</source>
         <translation type="obsolete">Patch Name:</translation>
     </message>
     <message>
+        <location line="+119"/>
         <source>High Bank:</source>
         <translation>High Bank:</translation>
     </message>
     <message>
+        <location line="+52"/>
         <source>Low Bank:</source>
         <translation>Low Bank:</translation>
     </message>
     <message>
+        <location line="+52"/>
         <source>Program:</source>
         <translation>Programm:</translation>
     </message>
@@ -3058,10 +2848,16 @@ Save Current Instrument?</source>
         <translation type="obsolete">Patch/Gruppe</translation>
     </message>
     <message>
+        <location line="+141"/>
+        <location line="+747"/>
+        <location line="+201"/>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
+        <location line="-945"/>
+        <location line="+747"/>
+        <location line="+201"/>
         <source>Alt+D</source>
         <translation>Alt+D</translation>
     </message>
@@ -3078,18 +2874,22 @@ Save Current Instrument?</source>
         <translation type="obsolete">Neue Gruppe</translation>
     </message>
     <message>
+        <location line="-1035"/>
         <source>Drum</source>
         <translation>Schlagzeug</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>GM</source>
         <translation>GM</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>GS</source>
         <translation>GS</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>XG</source>
         <translation>XG</translation>
     </message>
@@ -3102,6 +2902,7 @@ Save Current Instrument?</source>
         <translation type="obsolete">Vordefinierte Kontroller:</translation>
     </message>
     <message>
+        <location line="+136"/>
         <source>This is a list of commonly used midi controllers.
 Note that in MusE pitch and program changes are
 handled like normal controllers.</source>
@@ -3109,6 +2910,8 @@ handled like normal controllers.</source>
 MusE behandelt allerdings Kontroller wie &quot;pitch&quot; und &quot;program changes&quot; wie normale Kontroller.</translation>
     </message>
     <message>
+        <location line="-368"/>
+        <location line="+441"/>
         <source>Properties</source>
         <translation>Eigenschaften</translation>
     </message>
@@ -3121,30 +2924,38 @@ MusE behandelt allerdings Kontroller wie &quot;pitch&quot; und &quot;program cha
         <translation type="obsolete">Typ</translation>
     </message>
     <message>
+        <location line="+49"/>
         <source>Control7</source>
         <translation>Kontroller7</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Control14</source>
         <translation>Kontroller14</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>RPN</source>
         <translation>RPN</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>NRPN</source>
         <translation>NRPN</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Pitch</source>
         <translation>Tonhöhe</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Program</source>
         <translation>Programm</translation>
     </message>
     <message>
+        <location line="-118"/>
+        <location line="+142"/>
         <source>H-Ctrl</source>
         <translation>H-Ctrl</translation>
     </message>
@@ -3153,6 +2964,8 @@ MusE behandelt allerdings Kontroller wie &quot;pitch&quot; und &quot;program cha
         <translation type="obsolete">Midi Kontrollernummer High Byte</translation>
     </message>
     <message>
+        <location line="-137"/>
+        <location line="+191"/>
         <source>L-Ctrl</source>
         <translation>L-Ctrl</translation>
     </message>
@@ -3165,10 +2978,12 @@ MusE behandelt allerdings Kontroller wie &quot;pitch&quot; und &quot;program cha
         <translation type="obsolete">Bereich</translation>
     </message>
     <message>
+        <location line="+79"/>
         <source>Min</source>
         <translation>Min</translation>
     </message>
     <message>
+        <location line="+72"/>
         <source>Max</source>
         <translation>Max</translation>
     </message>
@@ -3177,10 +2992,12 @@ MusE behandelt allerdings Kontroller wie &quot;pitch&quot; und &quot;program cha
         <translation type="obsolete">Standard</translation>
     </message>
     <message>
+        <location line="-357"/>
         <source>Name                  </source>
         <translation>Name</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Type       </source>
         <translation>Typ</translation>
     </message>
@@ -3213,247 +3030,314 @@ MusE behandelt allerdings Kontroller wie &quot;pitch&quot; und &quot;program cha
         <translation type="obsolete">Panik</translation>
     </message>
     <message>
+        <location line="+802"/>
         <source>Hex Entry:</source>
         <translation>Hex Eintrag:</translation>
     </message>
     <message>
+        <location line="+90"/>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
+        <location line="-27"/>
         <source>Tools</source>
         <translation>Werkzeuge</translation>
     </message>
     <message>
+        <location line="+49"/>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>Open</source>
         <translation>Öffnen</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Open...</source>
         <translation>&amp;Öffnen ...</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>Save</source>
         <translation>Sichern</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Save</source>
         <translation>&amp;Sichern</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Save As</source>
         <translation>Sichern Unter</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>Save &amp;As...</source>
         <translation>Sichern &amp;Unter...</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Exit</source>
         <translation>Beenden</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>E&amp;xit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
+        <location line="-1448"/>
         <source>Instrument Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Selected instrument name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>List of defined instruments.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Pa&amp;tches</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>List of groups and patches.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Group/Patch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+15"/>
+        <location line="+443"/>
+        <location line="+742"/>
         <source>Name:</source>
         <translation type="unfinished">Name:</translation>
     </message>
     <message>
+        <location line="-1175"/>
+        <location line="+3"/>
         <source>Group or patch name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Patch high bank number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Patch high bank number. --- means don&apos;t care.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>---</source>
         <comment>dont care</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+46"/>
         <source>Patch low bank number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Patch low bank number. --- means don&apos;t care.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>---</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+46"/>
+        <location line="+3"/>
         <source>Patch program number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+36"/>
         <source>Drum patch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>If set, the patch is available only for drum channels.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>GM patch</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+13"/>
         <source>GS patch</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+10"/>
         <source>XG patch</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+39"/>
         <source>Delete group or patch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>New patch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>New &amp;Patch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+P</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>New group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>New &amp;Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+G</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+30"/>
         <source>Contro&amp;ller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Common:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>List of defined controllers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>List of defined controllers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>Min  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Max  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Def  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+35"/>
         <source>Midi controller name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Type:</source>
         <translation type="unfinished">Typ:</translation>
     </message>
     <message>
+        <location line="+10"/>
+        <location line="+3"/>
         <source>Midi controller type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+24"/>
         <source>RPN14</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>NRPN14</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+53"/>
+        <location line="+3"/>
         <source>Midi controller number high byte</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+51"/>
         <source>Midi controller number low byte (* means drum controller)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Midi controller number low byte. 
 If low byte is * then the controller is a 
  &apos;drum controller&apos;. For drum tracks and 
@@ -3466,19 +3350,23 @@ Examples: The GS and XG instruments&apos;
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>*</source>
         <comment>wild card</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Range:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+48"/>
         <source>Minimum value. If negative, auto-translate.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Minimum value. If the minimum value 
  is negative, the range will automatically
  be translated to a positive range. 
@@ -3501,38 +3389,52 @@ True range: Min: -8192 Max: 8191 (bias 0)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+69"/>
+        <location line="+3"/>
         <source>Maximum value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+36"/>
         <source>Default:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>L-Bank</source>
         <translation type="unfinished">L-Bank</translation>
     </message>
     <message>
+        <location line="+10"/>
+        <location line="+16"/>
+        <location line="+26"/>
+        <location line="+198"/>
+        <location line="+53"/>
         <source>off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-261"/>
         <source>Progr.</source>
         <translation type="unfinished">Progr.</translation>
     </message>
     <message>
+        <location line="+35"/>
         <source>???</source>
         <translation type="unfinished">???</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>H-Bank</source>
         <translation type="unfinished">H-Bank</translation>
     </message>
     <message>
+        <location line="+44"/>
         <source>Default value. Off: No default.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Default (initial) value. Off means no default.
 
 If a default value is chosen, the value will be sent
@@ -3551,47 +3453,59 @@ Caution! Watch out for controllers such as
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>off</source>
         <comment>dont care</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Add common controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>&amp;Add</source>
         <translation type="unfinished">&amp;Hinzufügen</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+A</source>
         <translation type="unfinished">Alt+A</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Delete controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Create a new controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>New &amp;Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+C</source>
         <translation type="unfinished">Alt+C</translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Null Param Hi:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Null parameter number High byte</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
+        <location line="+53"/>
         <source>If set, these &apos;null&apos; parameter numbers will 
  be sent after each RPN/NRPN event. 
 This prevents subsequent &apos;data&apos; events
@@ -3601,38 +3515,49 @@ Typically, set to 127/127, or an unused
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-13"/>
         <source> Lo:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Null parameter number Low byte</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+34"/>
         <source>S&amp;ysEx</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>SysEx List:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+62"/>
         <source>New SysE&amp;x</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+X</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+73"/>
         <source>&amp;Help</source>
         <translation type="unfinished">&amp;Hilfe</translation>
     </message>
     <message>
+        <location line="+84"/>
+        <location line="+3"/>
         <source>new item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+8"/>
+        <location line="+3"/>
         <source>What&apos;s this?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3640,18 +3565,22 @@ 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</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Meta Type</source>
         <translation>Meta Typ</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Enter Hex</source>
         <translation>Hex Eingabe</translation>
     </message>
     <message>
+        <location line="-18"/>
         <source>MusE: Enter Meta Event</source>
         <translation>MusE: Eingabe von Metaereignissen</translation>
     </message>
@@ -3690,34 +3619,42 @@ Typically, set to 127/127, or an unused
 <context>
     <name>EditNoteDialogBase</name>
     <message>
+        <location filename="../../muse/widgets/editnotedialogbase.ui" line="+14"/>
         <source>MusE: Enter Note</source>
         <translation>MusE: Note eingeben</translation>
     </message>
     <message>
+        <location line="+39"/>
         <source>OK</source>
         <translation>Bestätigen</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Length:</source>
         <translation>Länge:</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Time Position:</source>
         <translation>Position:</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Pitch:</source>
         <translation>Tonhöhe:</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Velocity On:</source>
         <translation>Velocity An:</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Velocity Off:</source>
         <translation>Velocity Aus:</translation>
     </message>
@@ -3725,18 +3662,22 @@ 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>
     </message>
     <message>
+        <location line="+4"/>
         <source>Pitch</source>
         <translation>Tonhöhe</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Pressure</source>
         <translation>Anschlagsdruck</translation>
     </message>
     <message>
+        <location line="-8"/>
         <source>MusE: Enter Poly Aftertouch</source>
         <translation>MusE: Poly Aftertouch eingeben</translation>
     </message>
@@ -3744,22 +3685,27 @@ Typically, set to 127/127, or an unused
 <context>
     <name>EditSysexDialogBase</name>
     <message>
+        <location filename="../../muse/widgets/editsysexdialogbase.ui" line="+14"/>
         <source>MusE: Enter SysEx</source>
         <translation>MusE: SysEx eingeben</translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>TimePosition:</source>
         <translation>Position:</translation>
     </message>
     <message>
+        <location line="+48"/>
         <source>Comment:</source>
         <translation>Kommentar:</translation>
     </message>
     <message>
+        <location line="+37"/>
         <source>OK</source>
         <translation>Bestätigen</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
@@ -3767,6 +3713,7 @@ Typically, set to 127/127, or an unused
 <context>
     <name>EditToolBar</name>
     <message>
+        <location filename="../../muse/widgets/tools.cpp" line="+17"/>
         <source>Edit Tools</source>
         <translation>Werkzeuge bearbeiten</translation>
     </message>
@@ -3774,54 +3721,67 @@ Typically, set to 127/127, or an unused
 <context>
     <name>EffectRack</name>
     <message>
+        <location filename="../../muse/mixer/rack.cpp" line="+102"/>
         <source>effect rack</source>
         <translation>Effekteinschub</translation>
     </message>
     <message>
+        <location line="+84"/>
         <source>move up</source>
         <translation>Nach oben bewegen</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>move down</source>
         <translation>Nach unten bewegen</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>remove</source>
         <translation>entfernen</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>bypass</source>
         <translation>umleiten</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>show gui</source>
         <translation>GUI anzeigen</translation>
     </message>
     <message>
+        <location line="-6"/>
         <source>new</source>
         <translation>neu</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>change</source>
         <translation>ändern</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>show native gui</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>save preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+138"/>
         <source>MusE: Save Preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+143"/>
         <source>Replace effect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>Do you really want to replace the effect %1?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3829,6 +3789,7 @@ Typically, set to 127/127, or an unused
 <context>
     <name>FLUIDGui</name>
     <message>
+        <location filename="../../synti/fluid/fluidgui.cpp" line="+55"/>
         <source>FLUID: open Soundfile</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3836,14 +3797,17 @@ Typically, set to 127/127, or an unused
 <context>
     <name>FLUIDGuiBase</name>
     <message>
+        <location filename="../../synti/fluid/fluidguibase.ui" line="+14"/>
         <source>Form1</source>
         <translation type="unfinished">Form1</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Soundfont</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+52"/>
         <source>Load</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3851,98 +3815,123 @@ Typically, set to 127/127, or an unused
 <context>
     <name>FLUIDSynthGuiBase</name>
     <message>
+        <location filename="../../synti/fluidsynth/fluidsynthguibase.ui" line="+14"/>
         <source>FLUID Synth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Load</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Delete</source>
         <translation type="unfinished">Löschen</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Dump Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Fontname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Chnl</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Soundfont</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Drum Chnl</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+108"/>
+        <location line="+235"/>
         <source>Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-222"/>
         <source>Width</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Damping</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Room Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Reverb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>CHANNEL SETUP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>Sine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Triangle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Type</source>
         <translation type="unfinished">Typ</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+35"/>
         <source>Speed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+35"/>
         <source>Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+48"/>
         <source>Chorus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Gain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+50"/>
         <source>LOADED SOUNDFONTS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3954,14 +3943,17 @@ Typically, set to 127/127, or an unused
         <translation type="obsolete">Form1</translation>
     </message>
     <message>
+        <location filename="../../muse/widgets/fdialogbuttons.ui" line="+38"/>
         <source>Global</source>
         <translation>Global</translation>
     </message>
     <message>
+        <location line="+25"/>
         <source>User</source>
         <translation>Benutzer</translation>
     </message>
     <message>
+        <location line="+25"/>
         <source>Project</source>
         <translation>Projekt</translation>
     </message>
@@ -3976,15 +3968,18 @@ Cofiguration</source>
 Konfiguration</translation>
     </message>
     <message>
+        <location line="+55"/>
         <source>only
 Songdata</source>
         <translation>Nur Lieddaten</translation>
     </message>
     <message>
+        <location line="-129"/>
         <source>fdialogbuttons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+121"/>
         <source>Songdata +
 Configuration</source>
         <translation type="unfinished"></translation>
@@ -3993,6 +3988,7 @@ Configuration</source>
 <context>
     <name>FluidSynthGui</name>
     <message>
+        <location filename="../../synti/fluidsynth/fluidsynthgui.cpp" line="+165"/>
         <source>Choose soundfont</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4008,72 +4004,86 @@ Configuration</source>
     <name>GateTimeBase</name>
     <message>
         <source>MusE: Modify Gate Time</source>
-        <translation>MusE: Gate Zeit ändern</translation>
+        <translation type="obsolete">MusE: Gate Zeit ändern</translation>
     </message>
     <message>
         <source>Range</source>
-        <translation>Bereich</translation>
+        <translation type="obsolete">Bereich</translation>
     </message>
     <message>
         <source>All Events</source>
-        <translation>Alle Ereignisse</translation>
+        <translation type="obsolete">Alle Ereignisse</translation>
     </message>
     <message>
         <source>Selected Events</source>
-        <translation>Ausgewählte Ereignisse</translation>
+        <translation type="obsolete">Ausgewählte Ereignisse</translation>
     </message>
     <message>
         <source>Looped Events</source>
-        <translation>Ereignisse innerhalb Schleife</translation>
+        <translation type="obsolete">Ereignisse innerhalb Schleife</translation>
     </message>
     <message>
         <source>Selected &amp; Looped</source>
-        <translation>Ausgewählt &amp; innerhalb der Schleife</translation>
+        <translation type="obsolete">Ausgewählt &amp; innerhalb der Schleife</translation>
     </message>
     <message>
         <source>Values</source>
-        <translation>Werte</translation>
+        <translation type="obsolete">Werte</translation>
     </message>
     <message>
         <source>Rate:</source>
-        <translation>Rate:</translation>
+        <translation type="obsolete">Rate:</translation>
     </message>
     <message>
         <source>Offset:</source>
-        <translation>Zeitversatz:</translation>
+        <translation type="obsolete">Zeitversatz:</translation>
     </message>
     <message>
         <source>%</source>
-        <translation>%</translation>
+        <translation type="obsolete">%</translation>
     </message>
     <message>
         <source>OK</source>
-        <translation>Bestätigen</translation>
+        <translation type="obsolete">Bestätigen</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Abbrechen</translation>
+        <translation type="obsolete">Abbrechen</translation>
+    </message>
+</context>
+<context>
+    <name>GlobalSettingsConfig</name>
+    <message>
+        <location filename="../../muse/widgets/genset.cpp" line="+489"/>
+        <source>Selects instruments directory</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>GlobalSettingsDialogBase</name>
     <message>
+        <location filename="../../muse/widgets/gensetbase.ui" line="+14"/>
         <source>MusE: Global Settings</source>
         <translation>MusE: Globale Einstellungen</translation>
     </message>
     <message>
+        <location line="+530"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Mixer</source>
         <translation>Mischpult</translation>
     </message>
     <message>
+        <location line="+21"/>
+        <location line="+39"/>
         <source>dB</source>
         <translation>dB</translation>
     </message>
     <message>
+        <location line="-20"/>
         <source>min. Meter Value</source>
         <translation>min. Pegelreglerwerte</translation>
     </message>
@@ -4082,22 +4092,31 @@ Configuration</source>
         <translation type="obsolete">min. Schiebereglerwerte</translation>
     </message>
     <message>
+        <location line="+406"/>
         <source>Midi</source>
         <translation>Midi</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Ticks</source>
         <translation>Ticks</translation>
     </message>
     <message>
+        <location line="-223"/>
+        <location line="+194"/>
+        <location line="+47"/>
         <source>1024</source>
         <translation>1024</translation>
     </message>
     <message>
+        <location line="-236"/>
+        <location line="+194"/>
+        <location line="+47"/>
         <source>2048</source>
         <translation>2048</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>4096</source>
         <translation>4096</translation>
     </message>
@@ -4106,74 +4125,116 @@ Configuration</source>
         <translation type="obsolete">8172</translation>
     </message>
     <message>
+        <location line="+86"/>
         <source>Displayed Resolution
 (Ticks/Quarternote)</source>
         <translation>Angezeigte Auflösung
 (Ticks/Viertelnote)</translation>
     </message>
     <message>
+        <location line="-48"/>
+        <location line="+63"/>
         <source>48</source>
         <translation>48</translation>
     </message>
     <message>
+        <location line="-58"/>
+        <location line="+63"/>
         <source>96</source>
         <translation>96</translation>
     </message>
     <message>
+        <location line="-58"/>
+        <location line="+63"/>
         <source>192</source>
         <translation>192</translation>
     </message>
     <message>
+        <location line="-58"/>
+        <location line="+63"/>
         <source>384</source>
         <translation>384</translation>
     </message>
     <message>
+        <location line="-58"/>
+        <location line="+63"/>
         <source>768</source>
         <translation>768</translation>
     </message>
     <message>
+        <location line="-58"/>
+        <location line="+63"/>
         <source>1536</source>
         <translation>1536</translation>
     </message>
     <message>
+        <location line="-58"/>
+        <location line="+63"/>
         <source>3072</source>
         <translation>3072</translation>
     </message>
     <message>
+        <location line="-58"/>
+        <location line="+63"/>
         <source>6144</source>
         <translation>61144</translation>
     </message>
     <message>
+        <location line="-58"/>
+        <location line="+63"/>
         <source>12288</source>
         <translation>12288</translation>
     </message>
     <message>
+        <location line="-163"/>
         <source>RTC Resolution
 (Ticks/Sec)</source>
         <translation>RTC (RealTimeClock) Auflösung
 (Ticks/Sekunde)</translation>
     </message>
     <message>
+        <location line="+212"/>
         <source>GUI</source>
         <translation>GUI</translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>/sec</source>
         <translation>/sek</translation>
     </message>
     <message>
+        <location line="-10"/>
         <source>GUI Refresh Rate</source>
         <translation>GUI Aktualisierungsrate</translation>
     </message>
     <message>
+        <location line="+72"/>
+        <source>Use project save dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>Some popup menus stay open (else hold Ctrl)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Allows some popup menus to stay open.
+Otherwise, hold Ctrl to keep them open.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
         <source>&amp;Apply</source>
         <translation>&amp;Anwenden</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>&amp;Ok</source>
         <translation>&amp;Bestätigen</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>&amp;Cancel</source>
         <translation>Abb&amp;rechen</translation>
     </message>
@@ -4182,304 +4243,479 @@ Configuration</source>
         <translation type="obsolete">Hilfe Browser:</translation>
     </message>
     <message>
+        <location line="-1385"/>
         <source>Application</source>
         <translation>Anwendung</translation>
     </message>
     <message>
+        <location line="+389"/>
         <source>Start Muse</source>
         <translation>MusE starten</translation>
     </message>
     <message>
+        <location line="+47"/>
         <source>start with last song</source>
         <translation>Mit letztem Lied starten</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>start with song</source>
         <translation>Mit bestimmtem Lied starten</translation>
     </message>
     <message>
+        <location line="-47"/>
         <source>start song:</source>
         <translation>Startlied:</translation>
     </message>
     <message>
+        <location line="-403"/>
         <source>Views</source>
         <translation>Ansichten</translation>
     </message>
     <message>
+        <location line="+6"/>
+        <location line="+47"/>
+        <location line="+37"/>
+        <location line="+144"/>
+        <location line="+56"/>
         <source>y-pos</source>
         <translation>y-pos</translation>
     </message>
     <message>
+        <location line="-274"/>
+        <location line="+57"/>
+        <location line="+47"/>
+        <location line="+7"/>
         <source>show</source>
         <translation>zeigen</translation>
     </message>
     <message>
+        <location line="-104"/>
+        <location line="+40"/>
+        <location line="+17"/>
+        <location line="+164"/>
+        <location line="+56"/>
         <source>x-pos</source>
         <translation>x-pos</translation>
     </message>
     <message>
+        <location line="-267"/>
+        <location line="+77"/>
+        <location line="+104"/>
+        <location line="+56"/>
         <source>height</source>
         <translation>Höhe</translation>
     </message>
     <message>
+        <location line="-227"/>
+        <location line="+57"/>
+        <location line="+124"/>
+        <location line="+56"/>
         <source>width</source>
         <translation>Breite</translation>
     </message>
     <message>
+        <location line="-108"/>
         <source>Big Time</source>
         <translation>Zeitanzeige groß</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Arranger</source>
         <translation>Arrangierer</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Transport</source>
         <translation>Transport</translation>
     </message>
     <message>
+        <location line="+59"/>
+        <location line="+56"/>
+        <location line="+16"/>
+        <location line="+16"/>
+        <location line="+16"/>
         <source>Cur</source>
         <translation>Jetzt</translation>
     </message>
     <message>
+        <location line="-107"/>
+        <location line="+56"/>
+        <location line="+16"/>
+        <location line="+16"/>
+        <location line="+16"/>
         <source>set current values</source>
         <translation>Jetzige Werte übernehmen</translation>
     </message>
     <message>
+        <location line="+76"/>
         <source>start with template: default.med</source>
         <translation>Mit Lied: default.med starten</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>show splash screen</source>
         <translation>Begrüßungsbild anzeigen</translation>
     </message>
     <message>
+        <location line="-326"/>
         <source>Mixer A</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Mixer B</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+317"/>
         <source>show &quot;Did you know?&quot; dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-55"/>
         <source>Start song</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+140"/>
         <source>min. Slider Val</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use Jack freewheel mode if possible.
-(Speeds up bounce operations).</source>
+        <location line="+60"/>
+        <source>Enable denormal protection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable denormal protection</source>
+        <location line="+10"/>
+        <source>Enable output limiter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable output limiter</source>
+        <location line="+131"/>
+        <source>External Waveditor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable in-place processing for VST plugins.
-(Requires restart.)</source>
+        <location line="+25"/>
+        <source>External Waveditor command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Turn this off if VST Ladspa effect rack plugins do not work or feedback loudly, even if they are supposed to be in-place capable.</source>
+        <location line="+44"/>
+        <source>Note: External editor opened from the internal editor.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>External Waveditor</source>
+        <location line="+15"/>
+        <source>Dummy Audio Driver (settings require restart)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>External Waveditor command</source>
+        <location line="+31"/>
+        <source>Hz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Note: External editor opened from the internal editor.</source>
+        <location line="+19"/>
+        <source>Period size (Frames per period):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dummy Audio Driver (settings require restart)</source>
+        <location line="-180"/>
+        <location line="+194"/>
+        <source>16</source>
+        <translation type="unfinished">16</translation>
+    </message>
+    <message>
+        <location line="-320"/>
+        <source>Try to use Jack Freewheel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Preferred sample rate</source>
+        <location line="+17"/>
+        <source>Speeds bounce operations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Actual rate used depends on limitations of
- timer used. If a high rate timer is available,
- short periods can be used with high sample rates. 
-Period affects midi playback resolution. 
-Shorter periods are desirable.</source>
+        <location line="+3"/>
+        <source>Use Jack Freewheel mode if possible.
+This dramatically speeds bounce operations.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Hz</source>
+        <location line="+38"/>
+        <source>VST in-place</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Actual rate used now (dummy or not):</source>
+        <location line="+10"/>
+        <source>Enable VST in-place processing (restart required)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>---</source>
+        <location line="+3"/>
+        <source>Enable VST in-place processing. Turn this off if 
+ 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>
     </message>
     <message>
-        <source>Period size (Frames per period):</source>
+        <location line="+13"/>
+        <source>Minimum control period</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>16</source>
-        <translation type="unfinished">16</translation>
+        <location line="+7"/>
+        <source>Minimum audio controller process period (samples).
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Minimum audio controller process period (samples).
+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>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>1</source>
+        <translation type="unfinished">1</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>2</source>
+        <translation type="unfinished">2</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>4</source>
+        <translation type="unfinished">4</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>8</source>
+        <translation type="unfinished">8</translation>
     </message>
     <message>
+        <location line="+10"/>
+        <location line="+194"/>
         <source>32</source>
         <translation type="unfinished">32</translation>
     </message>
     <message>
+        <location line="-189"/>
+        <location line="+194"/>
         <source>64</source>
         <translation type="unfinished">64</translation>
     </message>
     <message>
+        <location line="-189"/>
+        <location line="+194"/>
         <source>128</source>
         <translation type="unfinished">128</translation>
     </message>
     <message>
+        <location line="-189"/>
+        <location line="+194"/>
         <source>256</source>
         <translation type="unfinished">256</translation>
     </message>
     <message>
+        <location line="-189"/>
+        <location line="+194"/>
         <source>512</source>
         <translation type="unfinished">512</translation>
     </message>
     <message>
+        <location line="-68"/>
+        <source>Sample rate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>Shorter periods give better midi playback resolution.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+96"/>
         <source>8192</source>
         <translation type="unfinished">8192</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>16384</source>
         <translation type="unfinished">16384</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>32768</source>
         <translation type="unfinished">32768</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Midi Resolution
 (Ticks/Quarternote)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+126"/>
+        <source>Instruments Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+85"/>
         <source>Use old-style stop shortcut:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Move single armed track with selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-791"/>
         <source>On Launch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+736"/>
         <source>Behavior</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>Header</name>
+    <message>
+        <location filename="../../muse/widgets/header.cpp" line="+134"/>
+        <source>Track Info Columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LMaster</name>
     <message>
+        <location filename="../../muse/master/lmaster.cpp" line="+170"/>
         <source>new tempo</source>
         <translation>Neues Tempo</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>new signature</source>
         <translation>Neues Taktmaß</translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Meter</source>
         <translation>Taktposition</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Time</source>
         <translation>Zeitposition</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="-67"/>
         <source>MusE: Mastertrack</source>
         <translation>MusE: Masterspur</translation>
     </message>
     <message>
+        <location line="+42"/>
         <source>Tempo</source>
         <translation>Tempo</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Timesig</source>
         <translation>Taktmaß</translation>
     </message>
     <message>
+        <location line="-37"/>
         <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="+20"/>
         <source>Master tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Edit tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+6"/>
+        <source>Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>new key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+370"/>
         <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>
@@ -4487,18 +4723,22 @@ Shorter periods are desirable.</source>
 <context>
     <name>ListEdit</name>
     <message>
+        <location filename="../../muse/liste/listedit.cpp" line="+470"/>
         <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>
@@ -4511,6 +4751,7 @@ Shorter periods are desirable.</source>
         <translation type="obsolete">Werkzeuge &quot;Einfügen&quot;</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Delete Events</source>
         <translation>Ereignisse löschen</translation>
     </message>
@@ -4519,6 +4760,7 @@ Shorter periods are desirable.</source>
         <translation type="obsolete">Note einfügen</translation>
     </message>
     <message>
+        <location line="-37"/>
         <source>insert Note</source>
         <translation>Note einfügen</translation>
     </message>
@@ -4527,6 +4769,7 @@ Shorter periods are desirable.</source>
         <translation type="obsolete">SysEx einfügen</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>insert SysEx</source>
         <translation>SysEx einfügen</translation>
     </message>
@@ -4535,6 +4778,7 @@ Shorter periods are desirable.</source>
         <translation type="obsolete">Ctrl einfügen</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>insert Ctrl</source>
         <translation>ctrl einfügen</translation>
     </message>
@@ -4543,6 +4787,7 @@ Shorter periods are desirable.</source>
         <translation type="obsolete">Meta einfügen</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>insert Meta</source>
         <translation>Meta einfügen</translation>
     </message>
@@ -4551,6 +4796,7 @@ Shorter periods are desirable.</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>
     </message>
@@ -4559,14 +4805,17 @@ Shorter periods are desirable.</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>
     </message>
     <message>
+        <location line="+68"/>
         <source>Tick</source>
         <translation>Tick</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Bar</source>
         <translation>Takt</translation>
     </message>
@@ -4575,38 +4824,47 @@ Shorter periods are desirable.</source>
         <translation type="obsolete">Typ</translation>
     </message>
     <message>
+        <location line="+2"/>
         <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>
     <message>
+        <location line="-32"/>
         <source>List tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Insert tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Type</source>
         <translation type="unfinished">Typ</translation>
     </message>
@@ -4614,22 +4872,27 @@ Shorter periods are desirable.</source>
 <context>
     <name>MITTransposeBase</name>
     <message>
+        <location filename="../../muse/widgets/mittransposebase.ui" line="+14"/>
         <source>MusE: Midi Input Plugin: Transpose</source>
         <translation>MusE: Midi Eingang PlugIn: Transponieren</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>On</source>
         <translation>An</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>TriggerKey</source>
         <translation>Auslösertaste</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Transpose:</source>
         <translation>Transponieren:</translation>
     </message>
     <message>
+        <location line="+31"/>
         <source>+0</source>
         <translation>+0</translation>
     </message>
@@ -4641,22 +4904,27 @@ Shorter periods are desirable.</source>
         <translation type="obsolete">kein</translation>
     </message>
     <message>
+        <location filename="../../muse/confmport.cpp" line="+236"/>
         <source>Port</source>
         <translation>Anschluss</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>GUI</source>
         <translation>GUI</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Instrument</source>
         <translation>Instrument</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Device Name</source>
         <translation>Gerätename</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>State</source>
         <translation>Status</translation>
     </message>
@@ -4665,158 +4933,238 @@ Shorter periods are desirable.</source>
         <translation type="obsolete">unbekannt</translation>
     </message>
     <message>
+        <location line="-8"/>
         <source>I</source>
         <translation>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>
+    </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>
-        <source>Connect these to new midi tracks</source>
+        <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>
-        <source>Connect new midi tracks to this (first listed only)</source>
+        <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>
     </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>
     </message>
     <message>
-        <source>Connect these channels, on this port, to new midi tracks.
-Example:
- 1 2 3    channel 1 2 and 3
- 1-3      same
- 1-3 5    channel 1 2 3 and 5
- all      all channels
- none     no channels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connect new midi tracks to these channels, on this port.
-See default in channels.
-NOTE: Currently only one output port and channel supported (first found)</source>
-        <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+87"/>
+        <location line="+74"/>
         <source>&lt;none&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4824,41 +5172,55 @@ NOTE: Currently only one output port and channel supported (first found)</source
 <context>
     <name>MRConfigBase</name>
     <message>
+        <location filename="../../muse/mplugins/mrconfigbase.ui" line="+14"/>
         <source>MusE: Midi Input Plugin: Remote Control</source>
         <translation>MusE: Midi Eingang PlugIn: Fernbedienung</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Activate</source>
         <translation>Einschalten</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>On</source>
         <translation>An</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Actions</source>
         <translation>Funktionen</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Stop</source>
         <translation>Stopp</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Record</source>
         <translation>Aufnahme</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Goto Left Mark</source>
         <translation>Zum linken Marker bewegen</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Play</source>
         <translation>Wiedergabe</translation>
     </message>
+    <message>
+        <location line="+25"/>
+        <source>Insert rest (step rec) </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MTScale</name>
     <message>
+        <location filename="../../muse/widgets/mtscale.cpp" line="+27"/>
         <source>bar scale</source>
         <translation>Taktposition</translation>
     </message>
@@ -4866,30 +5228,37 @@ NOTE: Currently only one output port and channel supported (first found)</source
 <context>
     <name>MarkerView</name>
     <message>
+        <location filename="../../muse/marker/markerview.cpp" line="+197"/>
         <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:R:SR</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>
     <message>
+        <location line="-53"/>
         <source>MusE: Marker</source>
         <translation>MusE: Marker</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>add marker</source>
         <translation>Marker hinzufügen</translation>
     </message>
@@ -4898,6 +5267,7 @@ NOTE: Currently only one output port and channel supported (first found)</source
         <translation type="obsolete">Marker hinzufügen</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>delete marker</source>
         <translation>Marker löschen</translation>
     </message>
@@ -4910,14 +5280,17 @@ NOTE: Currently only one output port and channel supported (first found)</source
         <translation type="obsolete">&amp;Datei</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>&amp;Edit</source>
         <translation>&amp;Bearbeiten</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>marker-tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>edit tools</source>
         <translation type="unfinished">Werkzeuge &quot;Bearbeitung&quot;</translation>
     </message>
@@ -4925,34 +5298,42 @@ NOTE: Currently only one output port and channel supported (first found)</source
 <context>
     <name>MasterEdit</name>
     <message>
+        <location filename="../../muse/master/masteredit.cpp" line="-15"/>
         <source>Cursor</source>
         <translation>Positionsmarker</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Snap</source>
         <translation>Magnet</translation>
     </message>
     <message>
+        <location line="-10"/>
         <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="+15"/>
         <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>
     <message>
+        <location line="-58"/>
         <source>MusE: Mastertrack</source>
         <translation>MusE: Masterspur</translation>
     </message>
@@ -4965,6 +5346,7 @@ NOTE: Currently only one output port and channel supported (first found)</source
         <translation type="obsolete">Master aktivieren</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>Info</source>
         <translation>Info</translation>
     </message>
@@ -4974,18 +5356,22 @@ NOTE: Currently only one output port and channel supported (first found)</source
 </translation>
     </message>
     <message>
+        <location line="-6"/>
         <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="-10"/>
         <source>Master tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Enable master</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4993,114 +5379,142 @@ NOTE: Currently only one output port and channel supported (first found)</source
 <context>
     <name>MetronomeConfigBase</name>
     <message>
+        <location filename="../../muse/widgets/metronomebase.ui" line="+14"/>
         <source>MusE: Metronome Config</source>
         <translation>MusE: Metronom Konfiguration</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Metronome</source>
         <translation>Metronom</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Audio Beep</source>
         <translation>Interner PC Lautsprecher</translation>
     </message>
     <message>
+        <location line="+65"/>
         <source>MIDI Click</source>
         <translation>MIDI Klick</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>Midi Channel</source>
         <translation>Midi Kanal</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Measure Note</source>
         <translation>Midi Note Taktbeginn</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Measure Velocity</source>
         <translation>Midi Note Taktschlag</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Beat Velocity</source>
         <translation>Taktbeginn Anschlagstärke</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Beat Note</source>
         <translation>Taktschlag Anschlagstärke</translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Midi Port</source>
         <translation>Midi Anschluss</translation>
     </message>
     <message>
+        <location line="+42"/>
         <source>Precount</source>
         <translation>Einzählen</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>enable</source>
         <translation>einschalten</translation>
     </message>
     <message>
+        <location line="+34"/>
         <source>Bars</source>
         <translation>Takte</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>From Mastertrack</source>
         <translation>Von der Masterspur</translation>
     </message>
     <message>
+        <location line="+34"/>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>Signature</source>
         <translation>Taktmaß</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Prerecord</source>
         <translation>Aufnahme ab Einzählen</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Preroll</source>
         <translation>Vorlauf</translation>
     </message>
     <message>
+        <location line="+38"/>
         <source>&amp;Apply</source>
         <translation>&amp;Anwenden</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>&amp;OK</source>
         <translation>&amp;Bestätigen</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>&amp;Cancel</source>
         <translation>Abb&amp;rechen</translation>
     </message>
     <message>
+        <location line="-425"/>
         <source>Choose outputs...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+36"/>
         <source>50</source>
         <translation type="unfinished">50</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>% Audio volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+324"/>
         <source>Hint: Enable metronome in Transportpanel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>Alt+A</source>
         <translation type="unfinished">Alt+A</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Alt+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Alt+C</source>
         <translation type="unfinished">Alt+C</translation>
     </message>
@@ -5115,266 +5529,353 @@ NOTE: Currently only one output port and channel supported (first found)</source
 <context>
     <name>MidiControllerEditDialogBase</name>
     <message>
+        <location filename="../../muse/instruments/ccontrolbase.ui" line="+154"/>
         <source>Type       </source>
-        <translation type="obsolete">Typ</translation>
+        <translation type="unfinished">Typ</translation>
     </message>
     <message>
+        <location line="+129"/>
         <source>Properties</source>
-        <translation type="obsolete">Eigenschaften</translation>
+        <translation type="unfinished">Eigenschaften</translation>
     </message>
     <message>
+        <location line="+82"/>
         <source>Type</source>
-        <translation type="obsolete">Typ</translation>
+        <translation type="unfinished">Typ</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation type="obsolete">Neu</translation>
     </message>
     <message>
+        <location line="-294"/>
         <source>&amp;Delete</source>
-        <translation type="obsolete">&amp;Löschen</translation>
+        <translation type="unfinished">&amp;Löschen</translation>
     </message>
     <message>
+        <location line="+31"/>
         <source>&amp;OK</source>
-        <translation type="obsolete">&amp;Bestätigen</translation>
+        <translation type="unfinished">&amp;Bestätigen</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>&amp;Cancel</source>
-        <translation type="obsolete">Abb&amp;rechen</translation>
+        <translation type="unfinished">Abb&amp;rechen</translation>
     </message>
     <message>
+        <location line="-108"/>
         <source>MusE: Define Midi Controller</source>
-        <translation type="obsolete">MusE: Midi Kontroller definieren</translation>
+        <translation type="unfinished">MusE: Midi Kontroller definieren</translation>
     </message>
     <message>
+        <location line="+34"/>
         <source>&amp;Add</source>
-        <translation type="obsolete">&amp;Hinzufügen</translation>
+        <translation type="unfinished">&amp;Hinzufügen</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+A</source>
-        <translation type="obsolete">Alt+A</translation>
+        <translation type="unfinished">Alt+A</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>create new entry</source>
-        <translation type="obsolete">Neuen Eintrag erzeugen</translation>
+        <translation type="unfinished">Neuen Eintrag erzeugen</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>pressing the New button you create a new entry
 in the MusE list of defined controllers</source>
-        <translation type="obsolete">Durch Klicken der Schaltfläche &quot;Neu&quot; einen neuen Eintrag erzeugen
+        <translation type="unfinished">Durch Klicken der Schaltfläche &quot;Neu&quot; einen neuen Eintrag erzeugen
 in der MusE Liste &quot;Definierte Kontroller&quot;</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>delete selected entry</source>
-        <translation type="obsolete">Ausgewählten Eintrag löschen</translation>
+        <translation type="unfinished">Ausgewählten Eintrag löschen</translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>A&amp;pply</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+24"/>
         <source>Predefined Controller:</source>
-        <translation type="obsolete">Vordefinierte Kontroller:</translation>
+        <translation type="unfinished">Vordefinierte Kontroller:</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Name                  </source>
-        <translation type="obsolete">Name</translation>
+        <translation type="unfinished">Name</translation>
     </message>
     <message>
+        <location line="+22"/>
+        <location line="+266"/>
         <source>H-Ctrl</source>
-        <translation type="obsolete">H-Ctrl</translation>
+        <translation type="unfinished">H-Ctrl</translation>
     </message>
     <message>
+        <location line="-255"/>
+        <location line="+283"/>
         <source>L-Ctrl</source>
-        <translation type="obsolete">L-Ctrl</translation>
+        <translation type="unfinished">L-Ctrl</translation>
     </message>
     <message>
+        <location line="-272"/>
         <source>Min Val</source>
-        <translation type="obsolete">Min Wert</translation>
+        <translation type="unfinished">Min Wert</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Max Val</source>
-        <translation type="obsolete">Max Wert</translation>
+        <translation type="unfinished">Max Wert</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>list of defined controllers</source>
-        <translation type="obsolete">Liste definierter Kontroller</translation>
+        <translation type="unfinished">Liste definierter Kontroller</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>This is the MusE list of defined controllers.</source>
-        <translation type="obsolete">Dies ist die MusE Liste definierter Kontroller.</translation>
+        <translation type="unfinished">Dies ist die MusE Liste definierter Kontroller.</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Managed Controller for Port</source>
-        <translation type="obsolete">Verwendeter Kontroller für Anschluss</translation>
+        <translation type="unfinished">Verwendeter Kontroller für Anschluss</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Channel</source>
-        <translation type="obsolete">Kanal</translation>
+        <translation type="unfinished">Kanal</translation>
     </message>
     <message>
+        <location line="+21"/>
         <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="obsolete">Dies ist eine Liste oft standardisierter Midi Kontroller.
+        <translation type="unfinished">Dies ist eine Liste oft standardisierter Midi Kontroller.
 Beachte dass in MusE Tonhöhen- und Programmwechselbefehle wie Midikontroller behandelt werden.</translation>
     </message>
     <message>
+        <location line="+27"/>
         <source>Name</source>
-        <translation type="obsolete">Name</translation>
+        <translation type="unfinished">Name</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Min Value</source>
-        <translation type="obsolete">Min Wert</translation>
+        <translation type="unfinished">Min Wert</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>Max Value</source>
-        <translation type="obsolete">Max Wert</translation>
+        <translation type="unfinished">Max Wert</translation>
     </message>
     <message>
+        <location line="+46"/>
         <source>Control7</source>
-        <translation type="obsolete">Kontroller7</translation>
+        <translation type="unfinished">Kontroller7</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Control14</source>
-        <translation type="obsolete">Kontroller14</translation>
+        <translation type="unfinished">Kontroller14</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>RPN</source>
-        <translation type="obsolete">RPN</translation>
+        <translation type="unfinished">RPN</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>NRPN</source>
-        <translation type="obsolete">NRPN</translation>
+        <translation type="unfinished">NRPN</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>RPN14</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>NRPN14</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Pitch</source>
-        <translation type="obsolete">Tonhöhe</translation>
+        <translation type="unfinished">Tonhöhe</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Program</source>
-        <translation type="obsolete">Programm</translation>
+        <translation type="unfinished">Programm</translation>
     </message>
     <message>
+        <location line="+32"/>
         <source>Midi Controller Number High Byte</source>
-        <translation type="obsolete">Midi Kontrollernummer höchstwertiges Byte</translation>
+        <translation type="unfinished">Midi Kontrollernummer höchstwertiges Byte</translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>Midi Controller Number Low Byte</source>
-        <translation type="obsolete">Midi Kontrollernummer niederwertigstes Byte</translation>
+        <translation type="unfinished">Midi Kontrollernummer niederwertigstes Byte</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Range</source>
-        <translation type="obsolete">Bereich</translation>
+        <translation type="unfinished">Bereich</translation>
     </message>
 </context>
 <context>
     <name>MidiFilterConfigBase</name>
     <message>
+        <location filename="../../muse/mplugins/midifilter.ui" line="+20"/>
         <source>MusE:  Midi Input Filter</source>
         <translation>MusE: Midi Eingangsfilter</translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Record Filter</source>
         <translation>Aufnahme Filter</translation>
     </message>
     <message>
+        <location line="+18"/>
+        <location line="+112"/>
         <source>Note On</source>
         <translation>Note an</translation>
     </message>
     <message>
+        <location line="-99"/>
+        <location line="+112"/>
         <source>Poly Pressure</source>
         <translation>Poly Anschlagsdruck</translation>
     </message>
     <message>
+        <location line="-99"/>
+        <location line="+112"/>
         <source>Controller</source>
         <translation>Kontroller</translation>
     </message>
     <message>
+        <location line="-99"/>
+        <location line="+112"/>
         <source>Program Change</source>
         <translation>Programmwechsel</translation>
     </message>
     <message>
+        <location line="-99"/>
+        <location line="+112"/>
         <source>After Touch</source>
         <translation>Aftertouch</translation>
     </message>
     <message>
+        <location line="-99"/>
+        <location line="+112"/>
         <source>Pitch Bend</source>
         <translation>Pitch bend</translation>
     </message>
     <message>
+        <location line="-99"/>
+        <location line="+112"/>
         <source>Sysex</source>
         <translation>Sysex</translation>
     </message>
     <message>
+        <location line="-96"/>
         <source>Thru Filter</source>
         <translation>Thru Filter</translation>
     </message>
     <message>
+        <location line="+112"/>
         <source>Controller Filter</source>
         <translation>Kontroller Filter</translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>Channel Filter</source>
         <translation>Kanal Filter</translation>
     </message>
     <message>
+        <location line="+24"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>13</source>
         <translation>13</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>15</source>
         <translation>15</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>11</source>
         <translation>11</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>1</source>
         <translation>1</translation>
     </message>
@@ -5382,6 +5883,8 @@ Beachte dass in MusE Tonhöhen- und Programmwechselbefehle wie Midikontroller be
 <context>
     <name>MidiInputTransformDialog</name>
     <message>
+        <location filename="../../muse/mplugins/midiitransform.cpp" line="+703"/>
+        <location line="+2"/>
         <source>New</source>
         <translation>Neu</translation>
     </message>
@@ -5389,214 +5892,334 @@ Beachte dass in MusE Tonhöhen- und Programmwechselbefehle wie Midikontroller be
 <context>
     <name>MidiInputTransformDialogBase</name>
     <message>
+        <location filename="../../muse/widgets/itransformbase.ui" line="+14"/>
         <source>MusE: Midi Input Transformator</source>
         <translation>MusE: Midi Eingang Transformator</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>All</source>
         <translation>alle</translation>
     </message>
     <message>
+        <location line="+5"/>
+        <location line="+91"/>
+        <location line="+60"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Equal</source>
         <translation>gleich</translation>
     </message>
     <message>
+        <location line="-224"/>
+        <location line="+91"/>
+        <location line="+60"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Unequal</source>
         <translation>ungleich</translation>
     </message>
     <message>
+        <location line="-217"/>
         <source>Note</source>
         <translation>Note</translation>
     </message>
     <message>
+        <location line="+5"/>
+        <location line="+338"/>
         <source>Poly Pressure</source>
         <translation>Poly Anschlagsdruck</translation>
     </message>
     <message>
+        <location line="-333"/>
+        <location line="+338"/>
         <source>Control Change</source>
         <translation>Kontrollerwechsel</translation>
     </message>
     <message>
+        <location line="-333"/>
+        <location line="+338"/>
         <source>Aftertouch</source>
         <translation>Aftertouch</translation>
     </message>
     <message>
+        <location line="-333"/>
+        <location line="+338"/>
         <source>Pitch Bend</source>
         <translation>Pitch bend</translation>
     </message>
     <message>
+        <location line="-333"/>
+        <location line="+338"/>
         <source>NRPN</source>
         <translation>NRPN</translation>
     </message>
     <message>
+        <location line="-333"/>
+        <location line="+338"/>
         <source>RPN</source>
         <translation>RPN</translation>
     </message>
     <message>
+        <location line="-330"/>
+        <location line="+369"/>
+        <location line="+43"/>
         <source>Value 2</source>
         <translation>Wert 2</translation>
     </message>
     <message>
+        <location line="-402"/>
+        <location line="+392"/>
+        <location line="+96"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Value 1</source>
         <translation>Wert 1</translation>
     </message>
     <message>
+        <location line="-586"/>
+        <location line="+257"/>
         <source>Event Type</source>
         <translation>Ereignistyp</translation>
     </message>
     <message>
+        <location line="-246"/>
+        <location line="+60"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Ignore</source>
         <translation>ignorieren</translation>
     </message>
     <message>
+        <location line="-123"/>
+        <location line="+60"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Higher</source>
         <translation>größer</translation>
     </message>
     <message>
+        <location line="-133"/>
+        <location line="+60"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Lower</source>
         <translation>kleiner</translation>
     </message>
     <message>
+        <location line="-133"/>
+        <location line="+60"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Inside</source>
         <translation>innerhalb</translation>
     </message>
     <message>
+        <location line="-133"/>
+        <location line="+60"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Outside</source>
         <translation>außerhalb</translation>
     </message>
     <message>
+        <location line="+8"/>
+        <location line="+422"/>
         <source>Channel</source>
         <translation>Kanal</translation>
     </message>
     <message>
+        <location line="-412"/>
+        <location line="+240"/>
         <source>Port</source>
         <translation>Anschluss</translation>
     </message>
     <message>
+        <location line="-192"/>
         <source>Processing</source>
         <translation>Bearbeitung</translation>
     </message>
     <message>
+        <location line="+23"/>
+        <location line="+51"/>
+        <location line="+129"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Keep</source>
         <translation>behalten</translation>
     </message>
     <message>
+        <location line="-283"/>
+        <location line="+71"/>
+        <location line="+129"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Fix</source>
         <translation>fest</translation>
     </message>
     <message>
+        <location line="-257"/>
+        <location line="+129"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Plus</source>
         <translation>plus</translation>
     </message>
     <message>
+        <location line="-232"/>
+        <location line="+129"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Minus</source>
         <translation>minus</translation>
     </message>
     <message>
+        <location line="-232"/>
+        <location line="+129"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Multiply</source>
         <translation>multiplizieren</translation>
     </message>
     <message>
+        <location line="-232"/>
+        <location line="+129"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Divide</source>
         <translation>dividieren</translation>
     </message>
     <message>
+        <location line="-222"/>
+        <location line="+129"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Invert</source>
         <translation>invertieren</translation>
     </message>
     <message>
+        <location line="-232"/>
         <source>ScaleMap</source>
         <translation>Notenbelegung</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Flip</source>
         <translation>umdrehen</translation>
     </message>
     <message>
+        <location line="+5"/>
+        <location line="+119"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Dyn</source>
         <translation>Dyn</translation>
     </message>
     <message>
+        <location line="-222"/>
+        <location line="+119"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Random</source>
         <translation>zufällig</translation>
     </message>
     <message>
+        <location line="+48"/>
         <source>Modules</source>
         <translation>Module</translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>enable modul 1</source>
         <translation>Modul 1 einschalten</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>enable modul 2</source>
         <translation>Modul 2 einschalten</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>enable modul 3</source>
         <translation>Modul 3 einschalten</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>enable modul 4</source>
         <translation>Modul 4 einschalten</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Preset</source>
         <translation>Vorlage</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Name:</source>
         <translation>Name:</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>Comment:</source>
         <translation>Kommentar:</translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>Function</source>
         <translation>Funktion</translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>create new preset</source>
         <translation>Neue Vorlage erzeugen</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>delete preset</source>
         <translation>Vorlage löschen</translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>&amp;Dismiss</source>
         <translation>&amp;Verwerfen</translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>PresetList</source>
         <translation>Liste Vorlagen</translation>
     </message>
@@ -5623,50 +6246,64 @@ Beachte dass in MusE Tonhöhen- und Programmwechselbefehle wie Midikontroller be
 <context>
     <name>MidiStrip</name>
     <message>
+        <location filename="../../muse/mixer/mstrip.cpp" line="+173"/>
         <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="-83"/>
+        <location line="+121"/>
+        <location line="+158"/>
         <source>off</source>
         <translation>aus</translation>
     </message>
     <message>
+        <location line="-157"/>
         <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="+20"/>
         <source>record</source>
         <translation>Aufnahme</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>mute</source>
         <translation>still</translation>
     </message>
@@ -5703,26 +6340,33 @@ Beachte dass in MusE Tonhöhen- und Programmwechselbefehle wie Midikontroller be
         <translation type="obsolete">Automatisationstyp</translation>
     </message>
     <message>
+        <location line="-206"/>
+        <location line="+122"/>
         <source>double click on/off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+105"/>
         <source>solo mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+67"/>
         <source>iR</source>
         <translation type="unfinished">iR</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">oR</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>output routing</source>
         <translation type="unfinished">Ausgangs-Signalfluss</translation>
     </message>
@@ -5730,111 +6374,142 @@ Beachte dass in MusE Tonhöhen- und Programmwechselbefehle wie Midikontroller be
 <context>
     <name>MidiSyncConfig</name>
     <message>
+        <location filename="../../muse/widgets/midisyncimpl.cpp" line="+41"/>
+        <location line="+29"/>
         <source>Port Number</source>
         <translation type="unfinished">Anschlussnummer</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>
     </message>
     <message>
+        <location line="-27"/>
         <source>Midi clock input detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <location line="+29"/>
         <source>Midi tick input detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-28"/>
         <source>Midi real time input detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>MMC input detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>MTC input detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Detected SMPTE format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Receive id number. 127 = Global. Double click to edit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Accept midi clock input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Accept midi real time input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Accept MMC input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Accept MTC input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Receive start rewinds before playing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Transmit id number. 127 = Global. Double click to edit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Send midi clock output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Send midi realtime output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <location line="+49"/>
         <source>Send MMC output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-48"/>
+        <location line="+49"/>
         <source>Send MTC output</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+3"/>
         <source>Midi realtime input detected, including
  start/stop/continue, and song position.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>MMC input detected, including stop/play/deferred play, and locate.</source>
         <translation type="unfinished"></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>
     </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>
     </message>
     <message>
+        <location line="+2"/>
         <source>Receive id number. 127 = global receive all, even if not global.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <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,
@@ -5844,6 +6519,7 @@ Click on detect indicator to force another.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Accept midi realtime input, including
  start/stop/continue, and song position.
 Non-clock events (start,stop etc) are
@@ -5854,30 +6530,36 @@ This means you may have several master
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Accept MMC input, including stop/play/deferred play, and locate.</source>
         <translation type="unfinished"></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>
     </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>
     </message>
     <message>
+        <location line="+3"/>
         <source>Transmit id number. 127 = global transmit to all.</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+2"/>
         <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
@@ -5887,103 +6569,128 @@ Note: It may be impossible to rewind fast
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+142"/>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Device Name</source>
         <translation type="unfinished">Gerätename</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>c</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>k</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>r</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>m</source>
         <translation type="unfinished">min</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>t</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>rid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>rc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>rr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>rm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>rt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>rw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>tid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>tc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>tr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>tm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>tt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+399"/>
         <source>MusE</source>
         <translation type="unfinished">MusE</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Settings have changed
 Apply sync settings?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>&amp;Apply</source>
         <translation type="unfinished">&amp;Anwenden</translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>&amp;No</source>
         <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>&amp;Abort</source>
         <translation type="unfinished">&amp;Abbrechen</translation>
     </message>
     <message>
+        <location line="+125"/>
         <source>&lt;none&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5991,70 +6698,87 @@ Apply sync settings?</source>
 <context>
     <name>MidiSyncConfigBase</name>
     <message>
+        <location filename="../../muse/widgets/midisync.ui" line="+17"/>
         <source>MusE: Midi Sync</source>
         <translation>MusE: Midi Sync</translation>
     </message>
     <message>
+        <location line="+30"/>
         <source>Apply</source>
         <translation>Anwenden</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Ok</source>
         <translation>Bestätigen</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
+        <location line="+99"/>
         <source>hour</source>
         <translation>Stunde</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>h</source>
         <translation>Std</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>minute</source>
         <translation>Minute</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>m</source>
         <translation>min</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>second</source>
         <translation>Sekunde</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>s</source>
         <translation>Sek</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>frame</source>
         <translation>Rahmen</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>f</source>
         <translation>R</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>subframe</source>
         <translation>Subrahmen</translation>
     </message>
     <message>
+        <location line="-148"/>
         <source>24</source>
         <translation>24</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>25</source>
         <translation>25</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>30D</source>
         <translation>30D</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>30N</source>
         <translation>30N</translation>
     </message>
@@ -6123,39 +6847,48 @@ Apply sync settings?</source>
         <translation type="obsolete">alle</translation>
     </message>
     <message>
+        <location line="-46"/>
         <source>MTC</source>
         <translation>MTC</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
     <message>
+        <location line="+60"/>
         <source>Offset:</source>
         <translation>Zeitversatz:</translation>
     </message>
     <message>
+        <location line="+117"/>
         <source>Sync receiving and sending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Send and receive Jack transport</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Send and receive Jack transport information,
  including stop, start and position.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Use Jack transport</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Make MusE the Jack transport Timebase Master</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Make MusE the Jack transport Timebase Master.
 Allows Jack to show time as 
  MusE Bars, Beats, and Ticks. 
@@ -6165,14 +6898,17 @@ You can always click here again for Master.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Jack transport Timebase Master</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Control MusE timing by external midi clock or MTC sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>When in slave mode, tempo is
  controlled externally.
 MusE can sync to midi clock, or MTC quarter frame sync. 
@@ -6181,14 +6917,17 @@ Enabled inputs in the list will
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Slave to external sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Send start to first clock delay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Allows &apos;slow sync&apos; devices time
  to synchronize to MusE. This value is the
  delay from sending start to sending
@@ -6196,10 +6935,12 @@ Enabled inputs in the list will
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>ms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Send sync delay</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6207,10 +6948,12 @@ Enabled inputs in the list will
 <context>
     <name>MidiTrackInfoBase</name>
     <message>
+        <location filename="../../muse/widgets/mtrackinfobase.ui" line="+38"/>
         <source>MusE: TrackInfo</source>
         <translation>MusE: Spurinfo</translation>
     </message>
     <message>
+        <location line="+59"/>
         <source>output channel</source>
         <translation>Ausgangskanal</translation>
     </message>
@@ -6223,6 +6966,8 @@ Enabled inputs in the list will
         <translation type="obsolete">Spurinfo</translation>
     </message>
     <message>
+        <location line="+249"/>
+        <location line="+91"/>
         <source>%</source>
         <translation>%</translation>
     </message>
@@ -6231,10 +6976,23 @@ Enabled inputs in the list will
         <translation type="obsolete">Spur Name</translation>
     </message>
     <message>
+        <location line="-353"/>
         <source>output port</source>
         <translation>Ausgangsanschluss</translation>
     </message>
     <message>
+        <location line="+68"/>
+        <source>iR</source>
+        <translation type="unfinished">iR</translation>
+    </message>
+    <message>
+        <location line="+109"/>
+        <location line="+44"/>
+        <location line="+287"/>
+        <location line="+53"/>
+        <location line="+53"/>
+        <location line="+67"/>
+        <location line="+70"/>
         <source>off</source>
         <translation>aus</translation>
     </message>
@@ -6255,6 +7013,7 @@ Enabled inputs in the list will
         <translation type="obsolete">Instrumentenpatch auswählen</translation>
     </message>
     <message>
+        <location line="-552"/>
         <source>Transp.</source>
         <translation>Transp.</translation>
     </message>
@@ -6263,26 +7022,47 @@ Enabled inputs in the list will
         <translation type="obsolete">Volume</translation>
     </message>
     <message>
+        <location line="+210"/>
         <source>Channel Info</source>
         <translation>Kanalinfo</translation>
     </message>
     <message>
+        <location line="+35"/>
+        <source>Rec:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+200"/>
+        <source>Prog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+67"/>
+        <source>Vol</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+70"/>
         <source>Pan</source>
         <translation>Pan</translation>
     </message>
     <message>
+        <location line="-541"/>
         <source>Delay</source>
         <translation>Delay</translation>
     </message>
     <message>
+        <location line="+293"/>
         <source>H-Bank</source>
         <translation>H-Bank</translation>
     </message>
     <message>
+        <location line="-155"/>
         <source>Compr.</source>
         <translation>Kompr.</translation>
     </message>
     <message>
+        <location line="+208"/>
         <source>L-Bank</source>
         <translation>L-Bank</translation>
     </message>
@@ -6291,10 +7071,12 @@ Enabled inputs in the list will
         <translation type="obsolete">Progr.</translation>
     </message>
     <message>
+        <location line="-255"/>
         <source>Velocity</source>
         <translation>Velocity</translation>
     </message>
     <message>
+        <location line="-47"/>
         <source>Length</source>
         <translation>Länge</translation>
     </message>
@@ -6347,108 +7129,115 @@ Zur Aufnahme können mehrere Kanäle gewählt werden:
         <translation type="obsolete">Bank Wahl MSB</translation>
     </message>
     <message>
+        <location line="-268"/>
         <source>all midi events are sent to this output channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>Out ch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+27"/>
         <source>input routing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Inputs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="+16"/>
         <source>output routing</source>
         <translation type="unfinished">Ausgangs-Signalfluss</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>oR</source>
         <translation type="unfinished">oR</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>input detect</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+5"/>
         <source>W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+25"/>
         <source>Midi thru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Pass input events through (&apos;thru&apos;) to output.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+288"/>
         <source>Select instrument patch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>&lt;unknown&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Record:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="+37"/>
         <source>Add all settings to song</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>All</source>
         <translation type="unfinished">alle</translation>
     </message>
     <message>
+        <location line="+31"/>
         <source>Bank Select MSB. Double-click on/off.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+53"/>
         <source>Bank Select LSB. Double-click on/off.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+53"/>
         <source>Program. Double-click on/off.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>Add bank + prog settings to song</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Prog.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="+34"/>
         <source>Volume. Double-click on/off.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>Add vol setting to song</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Vol.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="+34"/>
+        <location line="+3"/>
         <source>Change stereo position. Double-click on/off.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>Add pan setting to song</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6456,230 +7245,345 @@ Zur Aufnahme können mehrere Kanäle gewählt werden:
 <context>
     <name>MidiTransformDialogBase</name>
     <message>
+        <location filename="../../muse/widgets/transformbase.ui" line="+14"/>
         <source>MusE: Midi Transformator</source>
         <translation>MusE: Midi Transformator</translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>&amp;Apply</source>
         <translation>&amp;Anwenden</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>&amp;OK</source>
         <translation>&amp;Bestätigen</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>&amp;Cancel</source>
         <translation>Abb&amp;rechen</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>PresetList</source>
         <translation>Vorlagenliste</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>Processing</source>
         <translation>Bearbeitung</translation>
     </message>
     <message>
+        <location line="+12"/>
+        <location line="+425"/>
         <source>Event Type</source>
         <translation>Ereignistyp</translation>
     </message>
     <message>
+        <location line="-414"/>
+        <location line="+56"/>
+        <location line="+104"/>
+        <location line="+54"/>
+        <location line="+55"/>
         <source>Keep</source>
         <translation>behalten</translation>
     </message>
     <message>
+        <location line="-264"/>
+        <location line="+76"/>
+        <location line="+104"/>
+        <location line="+54"/>
         <source>Fix</source>
         <translation>fest</translation>
     </message>
     <message>
+        <location line="-222"/>
+        <location line="+339"/>
         <source>Note</source>
         <translation>Note</translation>
     </message>
     <message>
+        <location line="-334"/>
+        <location line="+339"/>
         <source>Poly Pressure</source>
         <translation>Poly Andruckstärke</translation>
     </message>
     <message>
+        <location line="-334"/>
+        <location line="+339"/>
         <source>Control Change</source>
         <translation>Kontrollerwechsel</translation>
     </message>
     <message>
+        <location line="-334"/>
+        <location line="+339"/>
         <source>Aftertouch</source>
         <translation>Aftertouch</translation>
     </message>
     <message>
+        <location line="-334"/>
+        <location line="+339"/>
         <source>Pitch Bend</source>
         <translation>Pitch bend</translation>
     </message>
     <message>
+        <location line="-334"/>
+        <location line="+339"/>
         <source>NRPN</source>
         <translation>NRPN</translation>
     </message>
     <message>
+        <location line="-334"/>
+        <location line="+339"/>
         <source>RPN</source>
         <translation>RPN</translation>
     </message>
     <message>
+        <location line="-325"/>
+        <location line="+104"/>
+        <location line="+54"/>
+        <location line="+55"/>
         <source>Plus</source>
         <translation>plus</translation>
     </message>
     <message>
+        <location line="-208"/>
+        <location line="+104"/>
+        <location line="+54"/>
+        <location line="+55"/>
         <source>Minus</source>
         <translation>minus</translation>
     </message>
     <message>
+        <location line="-208"/>
+        <location line="+104"/>
+        <location line="+54"/>
+        <location line="+55"/>
         <source>Multiply</source>
         <translation>multiplizieren</translation>
     </message>
     <message>
+        <location line="-208"/>
+        <location line="+104"/>
+        <location line="+54"/>
+        <location line="+55"/>
         <source>Divide</source>
         <translation>dividieren</translation>
     </message>
     <message>
+        <location line="-203"/>
+        <location line="+43"/>
+        <location line="+265"/>
         <source>Value 2</source>
         <translation>Wert 2</translation>
     </message>
     <message>
+        <location line="-303"/>
+        <location line="+104"/>
         <source>Invert</source>
         <translation>umkehren</translation>
     </message>
     <message>
+        <location line="-99"/>
         <source>ScaleMap</source>
         <translation>Notenbelegung</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Flip</source>
         <translation>umdrehen</translation>
     </message>
     <message>
+        <location line="+5"/>
+        <location line="+94"/>
         <source>Dyn</source>
         <translation>Dyn</translation>
     </message>
     <message>
+        <location line="-89"/>
+        <location line="+94"/>
         <source>Random</source>
         <translation>zufällig</translation>
     </message>
     <message>
+        <location line="-86"/>
+        <location line="+71"/>
+        <location line="+214"/>
         <source>Value 1</source>
         <translation>Wert 1</translation>
     </message>
     <message>
+        <location line="-265"/>
+        <location line="+324"/>
         <source>Length</source>
         <translation>Länge</translation>
     </message>
     <message>
+        <location line="-314"/>
         <source>Position</source>
         <translation>Zeitposition</translation>
     </message>
     <message>
+        <location line="+172"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>All</source>
         <translation>alle</translation>
     </message>
     <message>
+        <location line="+5"/>
+        <location line="+91"/>
+        <location line="+59"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Equal</source>
         <translation>gleich</translation>
     </message>
     <message>
+        <location line="-223"/>
+        <location line="+91"/>
+        <location line="+59"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Unequal</source>
         <translation>ungleich</translation>
     </message>
     <message>
+        <location line="-147"/>
+        <location line="+59"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Ignore</source>
         <translation>ignorieren</translation>
     </message>
     <message>
+        <location line="-122"/>
+        <location line="+59"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Higher</source>
         <translation>größer</translation>
     </message>
     <message>
+        <location line="-132"/>
+        <location line="+59"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Lower</source>
         <translation>kleiner</translation>
     </message>
     <message>
+        <location line="-132"/>
+        <location line="+59"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Inside</source>
         <translation>innerhalb</translation>
     </message>
     <message>
+        <location line="-132"/>
+        <location line="+59"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Outside</source>
         <translation>außerhalb</translation>
     </message>
     <message>
+        <location line="-119"/>
         <source>Bar Range</source>
         <translation>Taktbereich</translation>
     </message>
     <message>
+        <location line="+197"/>
         <source>Preset</source>
         <translation>Vorlage</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Name:</source>
         <translation>Name:</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Comment:</source>
         <translation>Kommentar:</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Range</source>
         <translation>Bereich</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>process all events</source>
         <translation>Alle Ereignisse verarbeiten</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>selected tracks</source>
         <translation>Ausgewählte Spuren</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>inside loop</source>
         <translation>Innerhalb der Schleife</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Function</source>
         <translation>Funktion</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Select</source>
         <translation>Auswählen</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Quantize</source>
         <translation>Quantisieren</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Transform</source>
         <translation>Transformieren</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Insert</source>
         <translation>Einfügen</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Copy</source>
         <translation>Kopieren</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Extract</source>
         <translation>Entnehmen</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Quantize Value</source>
         <translation>Wert quantisieren</translation>
     </message>
@@ -6687,6 +7591,8 @@ Zur Aufnahme können mehrere Kanäle gewählt werden:
 <context>
     <name>MidiTransformerDialog</name>
     <message>
+        <location filename="../../muse/miditransform.cpp" line="+248"/>
+        <location line="+2"/>
         <source>New</source>
         <translation>Neu</translation>
     </message>
@@ -6694,6 +7600,7 @@ Zur Aufnahme können mehrere Kanäle gewählt werden:
 <context>
     <name>MixdownFileDialog</name>
     <message>
+        <location filename="../../muse/widgets/mixdowndialog.cpp" line="+101"/>
         <source>Wave Files (*.wav);;All Files (*)</source>
         <translation>Wave Dateien (*.wav);;Alle Dateien (*)</translation>
     </message>
@@ -6701,50 +7608,62 @@ Zur Aufnahme können mehrere Kanäle gewählt werden:
 <context>
     <name>MixdownFileDialogBase</name>
     <message>
+        <location filename="../../muse/widgets/mixdowndialogbase.ui" line="+14"/>
         <source>MusE: Set Mixdown Wavefile</source>
         <translation>MusE: Wave Datei Abmischung einstellen</translation>
     </message>
     <message>
+        <location line="+39"/>
         <source>&amp;OK</source>
         <translation>&amp;Bestätigen</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>&amp;Cancel</source>
         <translation>Abb&amp;rechen</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>File Path</source>
         <translation>Dateipfad</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Channel</source>
         <translation>Kanal</translation>
     </message>
     <message>
+        <location line="+31"/>
         <source>Stereo</source>
         <translation>Stereo</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Mono</source>
         <translation>Mono</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>5.1</source>
         <translation>5.1</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>wav,16 Bit</source>
         <translation>wav, 16 Bit</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>wav, 24 Bit</source>
         <translation>wav, 24 Bit</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>wav, 32 Bit (float)</source>
         <translation>wav, 32 Bit (float)</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Format</source>
         <translation>Format</translation>
     </message>
@@ -6759,14 +7678,17 @@ Zur Aufnahme können mehrere Kanäle gewählt werden:
 <context>
     <name>MusE</name>
     <message>
+        <location filename="../../muse/app.cpp" line="+564"/>
         <source>&amp;File</source>
         <translation>Lied&amp;datei</translation>
     </message>
     <message>
+        <location line="-376"/>
         <source>Open &amp;Recent</source>
         <translation>&amp;Letztes Lied öffnen</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Save &amp;As</source>
         <translation>Lied &amp;sichern als</translation>
     </message>
@@ -6775,34 +7697,43 @@ Zur Aufnahme können mehrere Kanäle gewählt werden:
         <translation type="obsolete">Druckerkonfiguration</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="+3"/>
+        <location filename="../../muse/wave.cpp" line="+810"/>
         <source>Import Wave File</source>
         <translation>Wavedatei importieren</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>&amp;Quit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
+        <location line="+383"/>
         <source>&amp;Edit</source>
         <translation>B&amp;earbeiten</translation>
     </message>
     <message>
+        <location line="-380"/>
         <source>C&amp;ut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>&amp;Copy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>&amp;Paste</source>
         <translation>Ei&amp;nfügen</translation>
     </message>
@@ -6811,186 +7742,233 @@ Zur Aufnahme können mehrere Kanäle gewählt werden:
         <translation type="obsolete">Spur löschen</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Add Track</source>
         <translation>Spur hinzufügen</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Select &amp;All</source>
         <translation>Alles a&amp;uswählen</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>&amp;Deselect All</source>
         <translation>Alles ab&amp;wählen</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Invert &amp;Selection</source>
         <translation>Auswa&amp;hl umkehren</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>&amp;Inside Loop</source>
         <translation>Bereich &amp;innerhalb der Schleife</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>&amp;Outside Loop</source>
         <translation>Bereich außerhalb der Schlei&amp;fe</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>All &amp;Parts on Track</source>
         <translation>Alle &amp;Parts der Spur</translation>
     </message>
     <message>
+        <location line="-8"/>
         <source>Select</source>
         <translation>Auswählen</translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Drums</source>
         <translation>Schlagzeug Editor</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <location line="+6"/>
         <source>List</source>
         <translation>Listen Editor</translation>
     </message>
     <message>
+        <location line="-1"/>
         <source>Graphic</source>
         <translation>Graphischer Editor</translation>
     </message>
     <message>
+        <location line="-2"/>
         <source>Mastertrack</source>
         <translation>Masterspur</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Midi &amp;Transform</source>
         <translation>Midi &amp;transformieren</translation>
     </message>
     <message>
+        <location line="+374"/>
         <source>Modify Gate Time</source>
         <translation>Gate Zeit ändern</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Modify Velocity</source>
         <translation>Velocity ändern</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Crescendo</source>
         <translation>Crescendo</translation>
     </message>
     <message>
+        <location line="-344"/>
         <source>Transpose</source>
         <translation>Transponieren</translation>
     </message>
     <message>
+        <location line="+345"/>
         <source>Thin Out</source>
         <translation>Daten ausdünnen</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Erase Event</source>
         <translation>Ereignis löschen</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Note Shift</source>
         <translation>Notenhöhe ändern</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Move Clock</source>
         <translation></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Copy Measure</source>
         <translation>Takt kopieren</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Erase Measure</source>
         <translation>Takt löschen</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Delete Measure</source>
         <translation>Takt entfernen</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Create Measure</source>
         <translation>Takt erzeugen</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Mix Track</source>
         <translation>Spur mischen</translation>
     </message>
     <message>
+        <location line="-388"/>
         <source>Midi</source>
         <translation>Midi</translation>
     </message>
     <message>
+        <location line="+412"/>
         <source>&amp;Structure</source>
         <translation>&amp;Struktur</translation>
     </message>
     <message>
+        <location line="-390"/>
         <source>Global Cut</source>
         <translation>Globaler Schnitt</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Global Insert</source>
         <translation>Globales Einfügen</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Global Split</source>
         <translation>Globales Aufteilen</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Copy Range</source>
         <translation>Bereich kopieren</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Cut Events</source>
         <translation>Ereignisse ausschneiden</translation>
     </message>
     <message>
+        <location line="-19"/>
         <source>Transport Panel</source>
         <translation>Transportkonsole</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Bigtime Window</source>
         <translation>Zeitanzeige groß</translation>
     </message>
     <message>
-        <source>Don't Follow Song</source>
+        <location line="+53"/>
+        <source>Don&apos;t Follow Song</source>
         <translation>Fenster folgt nicht dem Lied</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Follow Page</source>
         <translation>Fenster folgt dem Lied seitenweise</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Follow Continuous</source>
         <translation>Fenster folgt dem Lied ständig</translation>
     </message>
     <message>
+        <location line="-8"/>
         <source>Global Settings</source>
         <translation>Globale Einstellungen</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Follow Song</source>
         <translation>Folge dem Lied</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Metronome</source>
         <translation>Metronom</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Midi Sync</source>
         <translation>Midi Sync</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Appearance Settings</source>
         <translation>Erscheinungsbild einstellen</translation>
     </message>
     <message>
+        <location line="-38"/>
         <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>
@@ -6999,6 +7977,7 @@ Zur Aufnahme können mehrere Kanäle gewählt werden:
         <translation type="obsolete">Zufälliger Rhythmusgenerator</translation>
     </message>
     <message>
+        <location line="+386"/>
         <source>&amp;Midi</source>
         <translation>&amp;Midi</translation>
     </message>
@@ -7007,34 +7986,42 @@ Zur Aufnahme können mehrere Kanäle gewählt werden:
         <translation type="obsolete">Mischpult</translation>
     </message>
     <message>
+        <location line="-391"/>
         <source>Input Plugins</source>
         <translation>Eingangs-PlugIns</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Reset Instr.</source>
         <translation>Rücksetzen Instr.</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Init Instr.</source>
         <translation>Initialisieren Instr.</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Local Off</source>
         <translation>Lokal off</translation>
     </message>
     <message>
+        <location line="+406"/>
         <source>&amp;Audio</source>
         <translation>&amp;Audio</translation>
     </message>
     <message>
+        <location line="-403"/>
         <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="+443"/>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
@@ -7047,16 +8034,21 @@ Zur Aufnahme können mehrere Kanäle gewählt werden:
         <translation type="obsolete">Über &amp;Qt</translation>
     </message>
     <message>
+        <location line="+499"/>
         <source>MusE: load project</source>
         <translation>Muse: Projekt laden</translation>
     </message>
     <message>
+        <location line="+114"/>
         <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="-1166"/>
+        <location line="+1168"/>
+        <location line="+1471"/>
         <source>&amp;Save</source>
         <translation>Lied &amp;sichern</translation>
     </message>
@@ -7065,18 +8057,25 @@ Aktuelles Projekt sichern?</translation>
         <translation type="obsolete">Lied &amp;nicht Sichern</translation>
     </message>
     <message>
+        <location line="+0"/>
+        <location filename="../../muse/importmidi.cpp" line="+68"/>
         <source>&amp;Abort</source>
         <translation>&amp;Abbrechen</translation>
     </message>
     <message>
+        <location line="-1275"/>
+        <location line="+13"/>
         <source>MusE: Save As</source>
         <translation>MusE: Lied sichern als</translation>
     </message>
     <message>
+        <location line="+57"/>
+        <location line="+197"/>
         <source>Nothing to edit</source>
         <translation>Es gibt Nichts zu editieren</translation>
     </message>
     <message>
+        <location line="+1005"/>
         <source>The current Project contains unsaved data
 Load overwrites current Project:
 Save Current Project?</source>
@@ -7089,10 +8088,12 @@ Aktuelles Projekt sichern?</translation>
         <translation type="obsolete">&amp;Überschreiben</translation>
     </message>
     <message>
+        <location filename="../../muse/help.cpp" line="+33"/>
         <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>
@@ -7105,6 +8106,7 @@ Aktuelles Projekt sichern?</translation>
         <translation type="obsolete">Rücksetzen</translation>
     </message>
     <message>
+        <location filename="../../muse/app.cpp" line="-2744"/>
         <source>Und&amp;o</source>
         <translation>&amp;Rücksetzen</translation>
     </message>
@@ -7113,18 +8115,22 @@ Aktuelles Projekt sichern?</translation>
         <translation type="obsolete">Wiederholen</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ücksetzen</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>redo last undo</source>
         <translation>Letztes Rücksetzen wiederholen</translation>
     </message>
     <message>
+        <location line="+424"/>
         <source>Transport</source>
         <translation>Transport</translation>
     </message>
@@ -7133,6 +8139,7 @@ Aktuelles Projekt sichern?</translation>
         <translation type="obsolete">Schleife erzeugen</translation>
     </message>
     <message>
+        <location line="-410"/>
         <source>Loop</source>
         <translation>Schleife</translation>
     </message>
@@ -7141,6 +8148,7 @@ Aktuelles Projekt sichern?</translation>
         <translation type="obsolete">Aufnahme am linken Marker beginnen</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Punchin</source>
         <translation>Aufnahme am linken Marker beginnen</translation>
     </message>
@@ -7149,6 +8157,7 @@ Aktuelles Projekt sichern?</translation>
         <translation type="obsolete">Aufnahme am rechten Marker beenden</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Punchout</source>
         <translation>Aufnahme am rechten Marker beenden</translation>
     </message>
@@ -7157,6 +8166,7 @@ Aktuelles Projekt sichern?</translation>
         <translation type="obsolete">Start</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Start</source>
         <translation>Start</translation>
     </message>
@@ -7165,6 +8175,7 @@ Aktuelles Projekt sichern?</translation>
         <translation type="obsolete">Einen Taktschlag rückwärts</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Rewind</source>
         <translation>Einen Taktschlag rückwärts</translation>
     </message>
@@ -7173,6 +8184,7 @@ Aktuelles Projekt sichern?</translation>
         <translation type="obsolete">Einen Taktschlag vorwärts</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Forward</source>
         <translation>Einen Taktschlag vorwärts</translation>
     </message>
@@ -7181,6 +8193,7 @@ Aktuelles Projekt sichern?</translation>
         <translation type="obsolete">Stopp</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Stop</source>
         <translation>Stopp</translation>
     </message>
@@ -7189,6 +8202,7 @@ Aktuelles Projekt sichern?</translation>
         <translation type="obsolete">Wiedergabe</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Play</source>
         <translation>Wiedergabe</translation>
     </message>
@@ -7197,6 +8211,7 @@ Aktuelles Projekt sichern?</translation>
         <translation type="obsolete">Aufnahme</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Record</source>
         <translation>Aufnahme</translation>
     </message>
@@ -7205,6 +8220,8 @@ Aktuelles Projekt sichern?</translation>
         <translation type="obsolete">Panik</translation>
     </message>
     <message>
+        <location line="+6"/>
+        <location line="+349"/>
         <source>Panic</source>
         <translation>Panik</translation>
     </message>
@@ -7213,6 +8230,7 @@ Aktuelles Projekt sichern?</translation>
         <translation type="obsolete">Neues Lied</translation>
     </message>
     <message>
+        <location line="-337"/>
         <source>&amp;New</source>
         <translation>&amp;Neues Lied</translation>
     </message>
@@ -7221,6 +8239,7 @@ Aktuelles Projekt sichern?</translation>
         <translation type="obsolete">Öffnen</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>&amp;Open</source>
         <translation>Lied &amp;öffnen</translation>
     </message>
@@ -7233,6 +8252,7 @@ Aktuelles Projekt sichern?</translation>
         <translation type="obsolete">Pianorollen Editor</translation>
     </message>
     <message>
+        <location line="+59"/>
         <source>Pianoroll</source>
         <translation>Pianorollen Editor</translation>
     </message>
@@ -7245,6 +8265,7 @@ Aktuelles Projekt sichern?</translation>
         <translation type="obsolete">Marker</translation>
     </message>
     <message>
+        <location line="+251"/>
         <source>File Buttons</source>
         <translation>Schaltflächen</translation>
     </message>
@@ -7253,26 +8274,35 @@ Aktuelles Projekt sichern?</translation>
         <translation type="obsolete">Unbekanntes Dateiformat</translation>
     </message>
     <message>
+        <location line="+825"/>
         <source>MusE: Write File failed</source>
         <translation>MusE: Datei schreiben schlug fehl</translation>
     </message>
     <message>
+        <location line="-141"/>
+        <location line="+399"/>
+        <location line="+1199"/>
         <source>MusE: Song: </source>
         <translation>MusE: Lied:</translation>
     </message>
     <message>
         <source>MusE: Copy Range</source>
-        <translation>MusE: Bereich kopieren</translation>
+        <translation type="obsolete">MusE: Bereich kopieren</translation>
     </message>
     <message>
         <source>not implemented</source>
-        <translation>Nicht umgesetzt</translation>
+        <translation type="obsolete">Nicht umgesetzt</translation>
     </message>
     <message>
         <source>MusE: Cut Events</source>
-        <translation>MusE: Ereignisse ausschneiden</translation>
+        <translation type="obsolete">MusE: Ereignisse ausschneiden</translation>
     </message>
     <message>
+        <location line="-191"/>
+        <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>
@@ -7295,42 +8325,49 @@ Wave Spur als Zielspur auswählen</translation>
         <translation type="obsolete">Um eine Audiodatei zu importieren zuerst eine Wave Spur auswählen</translation>
     </message>
     <message>
+        <location line="-2452"/>
         <source>Delete Selected Tracks</source>
         <translation>Ausgewählte Spuren löschen</translation>
     </message>
     <message>
         <source>View</source>
-        <translation>Ansicht</translation>
+        <translation type="obsolete">Ansicht</translation>
     </message>
     <message>
+        <location line="+69"/>
         <source>Edit Instrument</source>
         <translation>Instrument bearbeiten</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Restart Audio</source>
         <translation>Audio erneut starten</translation>
     </message>
     <message>
         <source>Automation</source>
-        <translation>Automatisierung</translation>
+        <translation type="obsolete">Automatisierung</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>
         <source>Settings</source>
-        <translation>Einstellungen</translation>
+        <translation type="obsolete">Einstellungen</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Configure Shortcuts</source>
         <translation>Tastenkürzel einstellen</translation>
     </message>
@@ -7339,22 +8376,27 @@ Wave Spur als Zielspur auswählen</translation>
         <translation type="obsolete">Midi Datei exportieren</translation>
     </message>
     <message>
+        <location line="+14"/>
         <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>
@@ -7363,30 +8405,36 @@ Wave Spur als Zielspur auswählen</translation>
         <translation type="obsolete">Was ist &amp;das?</translation>
     </message>
     <message>
+        <location line="+679"/>
         <source>Cannot read template</source>
         <translation>Vorlage nicht lesbar</translation>
     </message>
     <message>
+        <location line="+31"/>
         <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="+200"/>
         <source>MusE: load template</source>
         <translation>Muse: Vorlage laden</translation>
     </message>
     <message>
         <source>MusE: Bounce</source>
-        <translation>MusE: Abmischen</translation>
+        <translation type="obsolete">MusE: Abmischen</translation>
     </message>
     <message>
         <source>set left/right marker for bounce range</source>
-        <translation>Linken/rechten Marker für Abmischbereich einstellen</translation>
+        <translation type="obsolete">Linken/rechten Marker für Abmischbereich einstellen</translation>
     </message>
     <message>
+        <location line="+1443"/>
+        <location line="+25"/>
         <source>MusE: Bounce to File</source>
         <translation>MusE: In Datei abmischen</translation>
     </message>
@@ -7395,200 +8443,301 @@ Wave Spur als Zielspur auswählen</translation>
         <translation type="obsolete">Keine Ausgangsspur gefunden</translation>
     </message>
     <message>
+        <location filename="../../muse/exportmidi.cpp" line="+126"/>
         <source>MusE: Export Midi</source>
         <translation>MusE: Midi exportieren</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 filename="../../muse/app.cpp" line="-3221"/>
+        <location line="+18"/>
         <source>Failed to start audio!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-17"/>
         <source>Was not able to start audio, check if jack is running.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Timeout waiting for audio to run. Check if jack is running.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+677"/>
         <source>Import Part</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>&amp;Insert</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Paste c&amp;lone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Paste to &amp;track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Paste clone to trac&amp;k</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Insert Empty Measure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-9"/>
+        <source>Find unused wave files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>Score</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>all parts in one staff</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>one staff per part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>New score window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Wave</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Song Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <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="+13"/>
         <source>&amp;Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Rhythm Generator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>Midi File Import/Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+325"/>
+        <source>&amp;View</source>
+        <translation type="unfinished">&amp;Zeigen</translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <source>A&amp;utomation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Se&amp;ttings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+346"/>
         <source>Unknown File Format: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+289"/>
+        <location line="+1471"/>
         <source>&amp;Skip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-1471"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+286"/>
+        <location line="+6"/>
+        <source>New</source>
+        <translation type="unfinished">Neu</translation>
+    </message>
+    <message>
+        <location line="+935"/>
         <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="+57"/>
         <source>Select one audio output track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../../muse/importmidi.cpp" line="+356"/>
         <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>
+        <location line="+121"/>
         <source> out of </source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+1"/>
         <source> could not be imported.
 Likely the track is the wrong type.</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>
         <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;Nein</translation>
     </message>
     <message>
+        <location filename="../../muse/help.cpp" 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>
@@ -7597,26 +8746,32 @@ browser on your machine.</source>
 <context>
     <name>NoteInfo</name>
     <message>
+        <location filename="../../muse/widgets/noteinfo.cpp" line="+33"/>
         <source>Start</source>
         <translation>Start</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Len</source>
         <translation>Länge</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Pitch</source>
         <translation>Tonhöhe</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Velo On</source>
         <translation>Velo an</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Velo Off</source>
         <translation>Velo aus</translation>
     </message>
     <message>
+        <location line="-50"/>
         <source>Note Info</source>
         <translation>Noteninformation</translation>
     </message>
@@ -7624,90 +8779,122 @@ browser on your machine.</source>
 <context>
     <name>OrganGuiBase</name>
     <message>
+        <location filename="../../synti/organ/organguibase.ui" line="+20"/>
         <source>MusE: Organ</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Drawbars</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>16&apos;</source>
         <translation type="unfinished">16&apos;</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>4&apos;</source>
         <translation type="unfinished">4&apos;</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>2 2/3&apos;</source>
         <translation type="unfinished">2 2/3&apos;</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>2&apos;</source>
         <translation type="unfinished">2&apos;</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>5 1/3&apos;</source>
         <translation type="unfinished">5 1/3&apos;</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>8&apos;</source>
         <translation type="unfinished">8&apos;</translation>
     </message>
     <message>
+        <location line="+232"/>
         <source>Envelope Hi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+12"/>
+        <location line="+252"/>
         <source>Release</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-242"/>
+        <location line="+232"/>
         <source>Sustain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-222"/>
+        <location line="+212"/>
         <source>Decay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-196"/>
+        <location line="+186"/>
         <source>Attack</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-110"/>
+        <location line="+41"/>
+        <location line="+35"/>
+        <location line="+171"/>
+        <location line="+16"/>
+        <location line="+38"/>
         <source>ms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-244"/>
+        <location line="+222"/>
         <source>cB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-184"/>
         <source>Envelope Lo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+232"/>
         <source>O-1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Oscillator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Brass</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Reed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Flute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Velocity</source>
         <translation type="unfinished">Velocity</translation>
     </message>
@@ -7722,123 +8909,152 @@ browser on your machine.</source>
 <context>
     <name>PartCanvas</name>
     <message>
+        <location filename="../../muse/arranger/pcanvas.cpp" line="+743"/>
         <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="+14"/>
         <source>rename</source>
         <translation>Umbenennen</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>split</source>
         <translation>Schnitt</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>glue</source>
         <translation>Verbinder</translation>
     </message>
     <message>
         <source>pianoroll</source>
-        <translation>Pianorollen Editor</translation>
+        <translation type="obsolete">Pianorollen Editor</translation>
     </message>
     <message>
         <source>list</source>
-        <translation>Listen Editor</translation>
+        <translation type="obsolete">Listen Editor</translation>
     </message>
     <message>
         <source>drums</source>
-        <translation>Schlagzeug Editor</translation>
+        <translation type="obsolete">Schlagzeug Editor</translation>
     </message>
     <message>
+        <location line="-295"/>
         <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="+279"/>
         <source>color</source>
         <translation>Farbe</translation>
     </message>
     <message>
+        <location line="+18"/>
         <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 type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-2"/>
         <source>wave edit</source>
         <translation>Wave Editor</translation>
     </message>
     <message>
+        <location line="+1874"/>
         <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="+52"/>
         <source>Cannot paste: wrong data type</source>
         <translation>Einfügen nicht möglich: falscher Datentyp</translation>
     </message>
     <message>
+        <location line="-32"/>
         <source>Can only paste to midi/drum track</source>
         <translation>Einfügen möglich nur in Midi/Drum Spur </translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Can only paste to wave track</source>
         <translation>Einfügen möglich nur in Wave Spur</translation>
     </message>
     <message>
+        <location line="-1966"/>
         <source>s&amp;elect </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>clones</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>export</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="+52"/>
         <source>file info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+108"/>
         <source>MusE: save part</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Part name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1322"/>
         <source> out of </source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+1"/>
         <source> could not be pasted.
 Likely the selected track is the wrong type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+472"/>
         <source>Can only paste to midi or wave track</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7860,6 +9076,7 @@ Likely the selected track is the wrong type.</source>
 <context>
     <name>PianoRoll</name>
     <message>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="+85"/>
         <source>&amp;Edit</source>
         <translation>&amp;Bearbeiten</translation>
     </message>
@@ -7900,6 +9117,7 @@ Likely the selected track is the wrong type.</source>
         <translation type="obsolete">Auswahl außerhalb Schleife</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>&amp;Select</source>
         <translation>&amp;Auswählen</translation>
     </message>
@@ -7916,6 +9134,7 @@ Likely the selected track is the wrong type.</source>
         <translation type="obsolete">Farbe nach Anschlagsstärke</translation>
     </message>
     <message>
+        <location line="+36"/>
         <source>&amp;Config</source>
         <translation>&amp;Einstellen</translation>
     </message>
@@ -7924,182 +9143,241 @@ Likely the selected track is the wrong type.</source>
         <translation type="obsolete">Ereignisfarbe</translation>
     </message>
     <message>
+        <location line="+30"/>
         <source>&amp;Functions</source>
         <translation>&amp;Funktionen</translation>
     </message>
     <message>
         <source>Over Quantize</source>
-        <translation>Überquantisieren</translation>
+        <translation type="obsolete">Überquantisieren</translation>
     </message>
     <message>
         <source>Note On Quantize</source>
-        <translation>Wert &quot;Note an&quot; quantisieren</translation>
+        <translation type="obsolete">Wert &quot;Note an&quot; quantisieren</translation>
     </message>
     <message>
         <source>Note On/Off Quantize</source>
-        <translation>Wert &quot;Note an/aus&quot; quantisieren</translation>
+        <translation type="obsolete">Wert &quot;Note an/aus&quot; quantisieren</translation>
     </message>
     <message>
         <source>Iterative Quantize</source>
-        <translation>Iteratives quantisieren</translation>
+        <translation type="obsolete">Iteratives quantisieren</translation>
     </message>
     <message>
         <source>Pianoroll Tools</source>
         <translation type="obsolete">Werkzeug &quot;Pianorollen Editor&quot;</translation>
     </message>
     <message>
+        <location line="+57"/>
         <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="+41"/>
         <source>Add Controller View</source>
         <translation>Kontrolleransicht hinzufügen</translation>
     </message>
     <message>
         <source>Config Quant...</source>
-        <translation>Quantisierung einstellen ...</translation>
+        <translation type="obsolete">Quantisierung einstellen ...</translation>
     </message>
     <message>
         <source>Modify Gate Time</source>
-        <translation>Gate Zeit ändern</translation>
+        <translation type="obsolete">Gate Zeit ändern</translation>
     </message>
     <message>
+        <location line="-98"/>
         <source>Modify Velocity</source>
         <translation>Velocity ändern</translation>
     </message>
     <message>
         <source>Crescendo</source>
-        <translation>Crescendo</translation>
+        <translation type="obsolete">Crescendo</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Transpose</source>
         <translation>Transponieren</translation>
     </message>
     <message>
         <source>Thin Out</source>
-        <translation>Ausdünnen</translation>
+        <translation type="obsolete">Ausdünnen</translation>
     </message>
     <message>
         <source>Erase Event</source>
-        <translation>Ereignis löschen</translation>
+        <translation type="obsolete">Ereignis löschen</translation>
     </message>
     <message>
         <source>Note Shift</source>
-        <translation>Note verschieben</translation>
+        <translation type="obsolete">Note verschieben</translation>
     </message>
     <message>
         <source>Move Clock</source>
-        <translation>Zeitposition verschieben</translation>
+        <translation type="obsolete">Zeitposition verschieben</translation>
     </message>
     <message>
         <source>Copy Measure</source>
-        <translation>Taktmaß kopieren</translation>
+        <translation type="obsolete">Taktmaß kopieren</translation>
     </message>
     <message>
         <source>Erase Measure</source>
-        <translation>Taktmaß löschen</translation>
+        <translation type="obsolete">Taktmaß löschen</translation>
     </message>
     <message>
         <source>Delete Measure</source>
-        <translation>Taktmaß löschen</translation>
+        <translation type="obsolete">Taktmaß löschen</translation>
     </message>
     <message>
         <source>Create Measure</source>
-        <translation>Taktmaß erzeugen</translation>
+        <translation type="obsolete">Taktmaß erzeugen</translation>
     </message>
     <message>
+        <location line="+86"/>
         <source>ctrl</source>
         <translation>Ktrl</translation>
     </message>
     <message>
+        <location line="-192"/>
         <source>C&amp;ut</source>
         <translation type="unfinished">&amp;Ausschneiden</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>&amp;Copy</source>
         <translation type="unfinished">&amp;Kopieren</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>&amp;Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Delete &amp;Events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Select &amp;All</source>
         <translation type="unfinished">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>
     </message>
     <message>
+        <location line="+4"/>
         <source>Invert &amp;Selection</source>
         <translation type="unfinished">Auswa&amp;hl umkehren</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>&amp;Inside Loop</source>
         <translation type="unfinished">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="+6"/>
         <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="+16"/>
+        <source>Quantize</source>
+        <translation type="unfinished">Quantisieren</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">Länge festlegen</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="+6"/>
         <source>Pianoroll tools</source>
         <translation type="unfinished"></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>
     </message>
@@ -8107,58 +9385,72 @@ Likely the selected track is the wrong type.</source>
 <context>
     <name>PluginDialog</name>
     <message>
+        <location filename="../../muse/plugin.cpp" line="+3079"/>
         <source>Ok</source>
         <translation>Bestätigen</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
+        <location line="-49"/>
         <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>
@@ -8171,10 +9463,12 @@ Likely the selected track is the wrong type.</source>
         <translation type="obsolete">Stereo und Mono</translation>
     </message>
     <message>
+        <location line="+52"/>
         <source>Stereo</source>
         <translation>Stereo</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Mono</source>
         <translation>Mono</translation>
     </message>
@@ -8183,18 +9477,22 @@ Likely the selected track is the wrong type.</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>
@@ -8202,30 +9500,38 @@ Likely the selected track is the wrong type.</source>
 <context>
     <name>PluginGui</name>
     <message>
+        <location line="+219"/>
+        <location line="+3"/>
         <source>bypass plugin</source>
         <translation>Signalfluss PlugIn umleiten</translation>
     </message>
     <message>
+        <location line="+543"/>
         <source>MusE: load preset</source>
         <translation>MusE: Vorlage laden</translation>
     </message>
     <message>
+        <location line="+66"/>
         <source>MusE: save preset</source>
         <translation>MusE: Vorlage sichern</translation>
     </message>
     <message>
+        <location line="-624"/>
         <source>File Buttons</source>
         <translation>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="+577"/>
         <source>Error reading preset. Might not be right type for this plugin</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8366,6 +9672,7 @@ gegenwärtig nicht benutzt</translation>
 <context>
     <name>QObject</name>
     <message>
+        <location filename="../../muse/app.cpp" line="-2773"/>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8373,22 +9680,29 @@ gegenwärtig nicht benutzt</translation>
 <context>
     <name>QWidget</name>
     <message>
+        <location filename="../../muse/instruments/minstrument.cpp" line="+56"/>
+        <location filename="../../muse/liste/editevent.cpp" line="-410"/>
         <source>Cannot convert sysex string</source>
         <translation>Sysex Kette nicht umwandelbar</translation>
     </message>
     <message>
+        <location line="+8"/>
+        <location filename="../../muse/liste/editevent.cpp" line="+8"/>
         <source>Hex String too long (2048 bytes limit)</source>
         <translation>Hex Kette ist zu lang (Grenze 2048 Bytes)</translation>
     </message>
     <message>
+        <location filename="../../muse/miditransform.cpp" line="+92"/>
         <source>new</source>
         <translation>Neu</translation>
     </message>
     <message>
+        <location filename="../../muse/wave.cpp" line="-675"/>
         <source>create peakfile for </source>
         <translation>Pegelspitzendatei erzeugen für</translation>
     </message>
     <message>
+        <location filename="../../muse/widgets/filedialog.cpp" line="+63"/>
         <source>MusE: get file name</source>
         <translation>MusE: Dateinamen übermitteln</translation>
     </message>
@@ -8413,14 +9727,17 @@ Erzeugen?</translation>
         <translation type="obsolete">Abbrechen</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>MusE: create directory</source>
         <translation>MusE: Verzeichnis erzeugen</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>creating dir failed</source>
         <translation>Verzeichnis erzeugen schlug fehl</translation>
     </message>
     <message>
+        <location line="+396"/>
         <source>File
 </source>
         <translation>Datei</translation>
@@ -8431,6 +9748,7 @@ exists</source>
         <translation type="obsolete">besteht</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>MusE: write</source>
         <translation>MusE: schreiben</translation>
     </message>
@@ -8443,43 +9761,53 @@ exists</source>
         <translation type="obsolete">Beenden</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Open File
 </source>
         <translation>Datei öffnen</translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>
 failed: </source>
         <translation>schlug fehl:</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>MusE: Open File</source>
         <translation>MusE: Datei öffnen</translation>
     </message>
     <message>
+        <location filename="../../muse/route.cpp" line="+1026"/>
+        <location line="+37"/>
         <source>None</source>
         <translation>Kein</translation>
     </message>
     <message>
+        <location filename="../../muse/instruments/minstrument.cpp" line="+189"/>
         <source>generic midi</source>
         <translation>General Midi</translation>
     </message>
     <message>
+        <location filename="../../muse/waveedit/waveview.cpp" line="+616"/>
         <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>
@@ -8489,333 +9817,524 @@ exists. Overwrite?</source>
     <name>QuantConfig</name>
     <message>
         <source>Config Quantize</source>
-        <translation>Quantisierung einstellen</translation>
+        <translation type="obsolete">Quantisierung einstellen</translation>
     </message>
     <message>
         <source>Strength</source>
-        <translation>Stärke</translation>
+        <translation type="obsolete">Stärke</translation>
     </message>
     <message>
         <source>Don´t Quantize</source>
-        <translation>Nicht quantisieren</translation>
+        <translation type="obsolete">Nicht quantisieren</translation>
     </message>
     <message>
         <source>Quant Len</source>
-        <translation>Länge quantisieren</translation>
+        <translation type="obsolete">Länge quantisieren</translation>
     </message>
     <message>
         <source>MusE: Config Quantize</source>
-        <translation>MusE: Quantisierung einstellen</translation>
+        <translation type="obsolete">MusE: Quantisierung einstellen</translation>
     </message>
 </context>
 <context>
     <name>RhythmBase</name>
     <message>
+        <location filename="../../muse/mplugins/rhythmbase.ui" line="+14"/>
         <source>MusE: Random Rhythm Generator</source>
-        <translation type="obsolete">MusE: Rhythmus Zufallsgenerator</translation>
+        <translation type="unfinished">MusE: Rhythmus Zufallsgenerator</translation>
     </message>
     <message>
+        <location line="+21"/>
         <source>Instrument Properties</source>
-        <translation type="obsolete">Instrumenteigenschaften</translation>
+        <translation type="unfinished">Instrumenteigenschaften</translation>
     </message>
     <message>
+        <location line="+20"/>
+        <location line="+334"/>
         <source>counts/bar</source>
-        <translation type="obsolete">Schläge/Takt</translation>
+        <translation type="unfinished">Schläge/Takt</translation>
     </message>
     <message>
+        <location line="-324"/>
         <source>steps/count</source>
-        <translation type="obsolete">Schritte/Schlag</translation>
+        <translation type="unfinished">Schritte/Schlag</translation>
     </message>
     <message>
+        <location line="+10"/>
+        <location line="+325"/>
         <source># bars</source>
-        <translation type="obsolete"># Takte</translation>
+        <translation type="unfinished"># Takte</translation>
     </message>
     <message>
+        <location line="-315"/>
         <source>test</source>
-        <translation type="obsolete">testen</translation>
+        <translation type="unfinished">testen</translation>
     </message>
     <message>
+        <location line="+26"/>
+        <location line="+300"/>
         <source>contrib</source>
-        <translation type="obsolete">beitragen</translation>
+        <translation type="unfinished">beitragen</translation>
     </message>
     <message>
+        <location line="-290"/>
         <source>randomize</source>
-        <translation type="obsolete">zufällig anordnen</translation>
+        <translation type="unfinished">zufällig anordnen</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Group 1</source>
-        <translation type="obsolete">Gruppe 1</translation>
+        <translation type="unfinished">Gruppe 1</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Group 2</source>
-        <translation type="obsolete">Gruppe 2</translation>
+        <translation type="unfinished">Gruppe 2</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Group 3</source>
-        <translation type="obsolete">Gruppe 3</translation>
+        <translation type="unfinished">Gruppe 3</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Group 4</source>
-        <translation type="obsolete">Gruppe 4</translation>
+        <translation type="unfinished">Gruppe 4</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Group 5</source>
-        <translation type="obsolete">Gruppe 5</translation>
+        <translation type="unfinished">Gruppe 5</translation>
     </message>
     <message>
+        <location line="+34"/>
+        <location line="+228"/>
         <source>listen</source>
-        <translation type="obsolete">vorhören</translation>
+        <translation type="unfinished">vorhören</translation>
     </message>
     <message>
+        <location line="-218"/>
         <source>Instrument</source>
-        <translation type="obsolete">Instrument</translation>
+        <translation type="unfinished">Instrument</translation>
     </message>
     <message>
+        <location line="+36"/>
+        <location line="+127"/>
         <source>Group</source>
-        <translation type="obsolete">Gruppe</translation>
+        <translation type="unfinished">Gruppe</translation>
     </message>
     <message>
+        <location line="-100"/>
+        <location line="+339"/>
         <source>&amp;New</source>
-        <translation type="obsolete">&amp;Neu</translation>
+        <translation type="unfinished">&amp;Neu</translation>
     </message>
     <message>
+        <location line="-346"/>
         <source>create new entry</source>
-        <translation type="obsolete">Neuen Eintrag erzeugen</translation>
+        <translation type="unfinished">Neuen Eintrag erzeugen</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>pressing the New button you create a new entry
 in the MusE list of defined controllers</source>
-        <translation type="obsolete">Schaltfläche &quot;Neu&quot; klicken um einen neuen Eintrag
+        <translation type="unfinished">Schaltfläche &quot;Neu&quot; klicken um einen neuen Eintrag
 in der MusE Liste definierter Kontroller zu erzeugen</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>&amp;Delete</source>
-        <translation type="obsolete">&amp;Löschen</translation>
+        <translation type="unfinished">&amp;Löschen</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>delete selected entry</source>
-        <translation type="obsolete">Ausgewählten Eintrag löschen</translation>
+        <translation type="unfinished">Ausgewählten Eintrag löschen</translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>Up</source>
-        <translation type="obsolete">Nach oben</translation>
+        <translation type="unfinished">Nach oben</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Down</source>
-        <translation type="obsolete">Nach unten</translation>
+        <translation type="unfinished">Nach unten</translation>
     </message>
     <message>
+        <location line="+43"/>
         <source>Instrument              </source>
-        <translation type="obsolete">Instrument</translation>
+        <translation type="unfinished">Instrument</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>steps/count      </source>
-        <translation type="obsolete">Schritte/Schlag</translation>
+        <translation type="unfinished">Schritte/Schlag</translation>
     </message>
     <message>
+        <location line="-35"/>
         <source>list of defined controllers</source>
-        <translation type="obsolete">Liste definierter Kontroller</translation>
+        <translation type="unfinished">Liste definierter Kontroller</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>This is the MusE list of defined controllers.</source>
-        <translation type="obsolete">Dies ist die MusE Liste definierter Kontroller.</translation>
+        <translation type="unfinished">Dies ist die MusE Liste definierter Kontroller.</translation>
     </message>
     <message>
+        <location line="+217"/>
         <source>&amp;File</source>
-        <translation type="obsolete">&amp;Datei</translation>
+        <translation type="unfinished">&amp;Datei</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>&amp;Edit</source>
-        <translation type="obsolete">&amp;Bearbeiten</translation>
+        <translation type="unfinished">&amp;Bearbeiten</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>&amp;Help</source>
-        <translation type="obsolete">&amp;Hilfe</translation>
+        <translation type="unfinished">&amp;Hilfe</translation>
     </message>
     <message>
+        <location line="-43"/>
         <source>Tools</source>
-        <translation type="obsolete">Werkzeuge</translation>
+        <translation type="unfinished">Werkzeuge</translation>
     </message>
     <message>
+        <location line="+63"/>
         <source>New</source>
-        <translation type="obsolete">Neu</translation>
+        <translation type="unfinished">Neu</translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Open</source>
-        <translation type="obsolete">Öffnen</translation>
+        <translation type="unfinished">Öffnen</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Open...</source>
-        <translation type="obsolete">&amp;Öffnen ...</translation>
+        <translation type="unfinished">&amp;Öffnen ...</translation>
     </message>
     <message>
+        <location line="+21"/>
         <source>Save</source>
-        <translation type="obsolete">Sichern</translation>
+        <translation type="unfinished">Sichern</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Sichern</translation>
+        <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Save As</source>
-        <translation type="obsolete">Sichern als</translation>
+        <translation type="unfinished">Sichern als</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>Save &amp;As...</source>
-        <translation type="obsolete">S&amp;ichern als ...</translation>
+        <translation type="unfinished">S&amp;ichern als ...</translation>
     </message>
     <message>
+        <location line="+21"/>
         <source>Print</source>
-        <translation type="obsolete">Drucken</translation>
+        <translation type="unfinished">Drucken</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Print...</source>
-        <translation type="obsolete">&amp;Drucken ...</translation>
+        <translation type="unfinished">&amp;Drucken ...</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Exit</source>
-        <translation type="obsolete">Beenden</translation>
+        <translation type="unfinished">Beenden</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>E&amp;xit</source>
-        <translation type="obsolete">Bee&amp;nden</translation>
+        <translation type="unfinished">Bee&amp;nden</translation>
     </message>
     <message>
+        <location line="+21"/>
         <source>Undo</source>
-        <translation type="obsolete">Rckgängig</translation>
+        <translation type="unfinished">Rckgängig</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Undo</source>
-        <translation type="obsolete">&amp;Rückgängig</translation>
+        <translation type="unfinished">&amp;Rückgängig</translation>
     </message>
     <message>
+        <location line="+21"/>
         <source>Redo</source>
-        <translation type="obsolete">Wiederherstellen</translation>
+        <translation type="unfinished">Wiederherstellen</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Redo</source>
-        <translation type="obsolete">&amp;Wiederherstellen</translation>
+        <translation type="unfinished">&amp;Wiederherstellen</translation>
     </message>
     <message>
+        <location line="+21"/>
         <source>Cut</source>
-        <translation type="obsolete">Ausschneiden</translation>
+        <translation type="unfinished">Ausschneiden</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Cut</source>
-        <translation type="obsolete">A&amp;usschneiden</translation>
+        <translation type="unfinished">A&amp;usschneiden</translation>
     </message>
     <message>
+        <location line="+21"/>
         <source>Copy</source>
-        <translation type="obsolete">Kopieren</translation>
+        <translation type="unfinished">Kopieren</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>C&amp;opy</source>
-        <translation type="obsolete">Ko&amp;pieren</translation>
+        <translation type="unfinished">Ko&amp;pieren</translation>
     </message>
     <message>
+        <location line="+21"/>
         <source>Paste</source>
-        <translation type="obsolete">Einfügen</translation>
+        <translation type="unfinished">Einfügen</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Paste</source>
-        <translation type="obsolete">Ein&amp;fügen</translation>
+        <translation type="unfinished">Ein&amp;fügen</translation>
     </message>
     <message>
+        <location line="+21"/>
         <source>Find</source>
-        <translation type="obsolete">Suchen</translation>
+        <translation type="unfinished">Suchen</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Find...</source>
-        <translation type="obsolete">&amp;Suchen ...</translation>
+        <translation type="unfinished">&amp;Suchen ...</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Contents</source>
-        <translation type="obsolete">Inhalte</translation>
+        <translation type="unfinished">Inhalte</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Contents...</source>
-        <translation type="obsolete">&amp;Inhalte ...</translation>
+        <translation type="unfinished">&amp;Inhalte ...</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Index</source>
-        <translation type="obsolete">Verzeichnis</translation>
+        <translation type="unfinished">Verzeichnis</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Index...</source>
-        <translation type="obsolete">&amp;Verzeichnis ...</translation>
+        <translation type="unfinished">&amp;Verzeichnis ...</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>About</source>
-        <translation type="obsolete">Über</translation>
+        <translation type="unfinished">Über</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;About...</source>
-        <translation type="obsolete">&amp;Über ...</translation>
+        <translation type="unfinished">&amp;Über ...</translation>
     </message>
     <message>
+        <location line="-314"/>
         <source>&lt;b&gt;Notice!&lt;/b&gt;&lt;br&gt;
 Random Rhythm Generator is not enabled yet!</source>
-        <translation type="obsolete">Merke!
+        <translation type="unfinished">Merke!
 Rhythmus Zufallsgenerator noch nicht eingeführt!</translation>
     </message>
     <message>
+        <location line="+88"/>
         <source>Ctrl+N</source>
-        <translation type="obsolete">Strg+N</translation>
+        <translation type="unfinished">Strg+N</translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Ctrl+O</source>
-        <translation type="obsolete">Strg+O</translation>
+        <translation type="unfinished">Strg+O</translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Ctrl+S</source>
-        <translation type="obsolete">Strg+S</translation>
+        <translation type="unfinished">Strg+S</translation>
     </message>
     <message>
+        <location line="+32"/>
         <source>Ctrl+P</source>
-        <translation type="obsolete">Strg+P</translation>
+        <translation type="unfinished">Strg+P</translation>
     </message>
     <message>
+        <location line="+32"/>
         <source>Ctrl+Z</source>
-        <translation type="obsolete">Strg+Z</translation>
+        <translation type="unfinished">Strg+Z</translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Ctrl+Y</source>
-        <translation type="obsolete">Strg+Y</translation>
+        <translation type="unfinished">Strg+Y</translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Ctrl+X</source>
-        <translation type="obsolete">Strg+X</translation>
+        <translation type="unfinished">Strg+X</translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Ctrl+C</source>
-        <translation type="obsolete">Strg+C</translation>
+        <translation type="unfinished">Strg+C</translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Ctrl+V</source>
-        <translation type="obsolete">Strg+V</translation>
+        <translation type="unfinished">Strg+V</translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Ctrl+F</source>
-        <translation type="obsolete">Strg+F</translation>
+        <translation type="unfinished">Strg+F</translation>
     </message>
 </context>
 <context>
     <name>RhythmGenerator</name>
     <message>
+        <location filename="../../muse/mplugins/rhythm.cpp" line="+229"/>
+        <source>Form3</source>
+        <translation type="unfinished">Form3</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>Instrument Settings:</source>
-        <translation type="obsolete">Instrument Einstellungen</translation>
+        <translation type="unfinished">Instrument Einstellungen</translation>
     </message>
     <message>
+        <location line="+8"/>
+        <source>Instrument</source>
+        <translation type="unfinished">Instrument</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Hi-Hat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>add</source>
-        <translation type="obsolete">Zufgen</translation>
+        <translation type="unfinished">Zufgen</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>delete</source>
-        <translation type="obsolete">Entfernen</translation>
+        <translation type="unfinished">Entfernen</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>steps/count</source>
+        <translation type="unfinished">Schritte/Schlag</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>count/bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source># bars</source>
+        <translation type="unfinished"># Takte</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <source>Group Settings:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Group</source>
-        <translation type="obsolete">Gruppe</translation>
+        <translation type="unfinished">Gruppe</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Group 1</source>
+        <translation type="unfinished">Gruppe 1</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Group 2</source>
+        <translation type="unfinished">Gruppe 2</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Group 3</source>
+        <translation type="unfinished">Gruppe 3</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Group 4</source>
+        <translation type="unfinished">Gruppe 4</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Group 5</source>
+        <translation type="unfinished">Gruppe 5</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>contrib</source>
+        <translation type="unfinished">beitragen</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>listen</source>
+        <translation type="unfinished">vorhören</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Randomize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Rhythm Style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Open...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Save</source>
+        <translation type="unfinished">Sichern</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Save as...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Generate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
@@ -8825,46 +10344,57 @@ Rhythmus Zufallsgenerator noch nicht eingeführt!</translation>
 <context>
     <name>RouteDialogBase</name>
     <message>
+        <location filename="../../muse/mixer/routedialogbase.ui" line="+20"/>
         <source>MusE: Routing</source>
         <translation>MusE: Signalfluss</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Add Route</source>
         <translation>Signalfluss hinzufügen</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Source:</source>
         <translation>Quelle:</translation>
     </message>
     <message>
+        <location line="+24"/>
         <source>Destination:</source>
         <translation>Ziel:</translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>Connect</source>
         <translation>Verbinden</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>connect source to destination</source>
         <translation>Quelle mit Ziel verbinden</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Current Routes</source>
         <translation>Aktueller Signalfluss</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Source</source>
         <translation>Quelle</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Destination</source>
         <translation>Ziel</translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Remove</source>
         <translation>Entfernen</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>remove selected route</source>
         <translation>Ausgewählten Signalfluss entfernen</translation>
     </message>
@@ -8872,76 +10402,70 @@ Rhythmus Zufallsgenerator noch nicht eingeführt!</translation>
 <context>
     <name>SS_PluginChooserBase</name>
     <message>
+        <location filename="../../synti/simpledrums/sspluginchooserbase.ui" line="+16"/>
         <source>SimpleDrums - Ladspa Plugin Chooser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Label</source>
         <translation type="unfinished">Beschriftung</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Inports</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Outports</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Creator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+43"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+C</source>
         <translation type="unfinished">Alt+C</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>&amp;OK</source>
         <translation type="unfinished">&amp;Bestätigen</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+O</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SS_PluginFront</name>
-    <message>
-        <source>Clear and unload effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Load effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggle display of effect parameters</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Turn effect on/off</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>ScrollScale</name>
     <message>
+        <location filename="../../muse/widgets/scrollscale.cpp" line="+299"/>
         <source>next page</source>
         <translation>Nächste Seite</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>previous page</source>
         <translation>Vorherige Seite</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>current page number</source>
         <translation>Aktuelle Seitennummer</translation>
     </message>
@@ -8949,18 +10473,22 @@ Rhythmus Zufallsgenerator noch nicht eingeführt!</translation>
 <context>
     <name>ShortcutCaptureDialog</name>
     <message>
+        <location filename="../../muse/widgets/shortcutcapturedialog.cpp" line="+30"/>
         <source>Ok</source>
         <translation type="unfinished">Bestätigen</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Cancel</source>
         <translation type="unfinished">Abbrechen</translation>
     </message>
     <message>
+        <location line="+52"/>
         <source>Shortcut conflicts with </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Undefined</source>
         <translation type="unfinished">unbestimmt</translation>
     </message>
@@ -8968,30 +10496,38 @@ Rhythmus Zufallsgenerator noch nicht eingeführt!</translation>
 <context>
     <name>ShortcutCaptureDialogBase</name>
     <message>
+        <location filename="../../muse/widgets/shortcutcapturedialogbase.ui" line="+14"/>
         <source>Enter shortcut sequence</source>
         <translation>Folge von Tastenkürzeln eingeben</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Press keys to enter shortcut sequence!</source>
         <translation>Tasten drücken um Folge von Tastenkürzeln einzugeben!</translation>
     </message>
     <message>
+        <location line="+25"/>
         <source>Old shortcut:</source>
         <translation>Altes Tastenkürzel:</translation>
     </message>
     <message>
+        <location line="+10"/>
+        <location line="+24"/>
         <source>Undefined</source>
         <translation>unbestimmt</translation>
     </message>
     <message>
+        <location line="-10"/>
         <source>New shortcut:</source>
         <translation>Neues Tastenkürzel:</translation>
     </message>
     <message>
+        <location line="+27"/>
         <source>OK</source>
         <translation>Bestätigen</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
@@ -8999,42 +10535,52 @@ Rhythmus Zufallsgenerator noch nicht eingeführt!</translation>
 <context>
     <name>ShortcutConfigBase</name>
     <message>
+        <location filename="../../muse/widgets/shortcutconfigbase.ui" line="+14"/>
         <source>Configure Keyboard Shortcuts</source>
         <translation>Tastenkürzel einstellen</translation>
     </message>
     <message>
+        <location line="+34"/>
         <source>Shortcut Category</source>
         <translation>Kategorie Tastenkürzel</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>Description</source>
         <translation>Beschreibung</translation>
     </message>
     <message>
+        <location line="-5"/>
         <source>Shortcut</source>
         <translation>Tastenkürzel</translation>
     </message>
     <message>
+        <location line="+37"/>
         <source>&amp;Clear</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+C</source>
         <translation>Alt+C</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>&amp;Define</source>
         <translation>&amp;Bestimmen</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+D</source>
         <translation>Alt+D</translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>&amp;Apply</source>
         <translation>&amp;Anwenden</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+A</source>
         <translation>Alt+A</translation>
     </message>
@@ -9042,6 +10588,7 @@ Rhythmus Zufallsgenerator noch nicht eingeführt!</translation>
 <context>
     <name>SigScale</name>
     <message>
+        <location filename="../../muse/widgets/sigscale.cpp" line="+27"/>
         <source>signature scale</source>
         <translation>Skala Taktmaß</translation>
     </message>
@@ -9049,6 +10596,7 @@ Rhythmus Zufallsgenerator noch nicht eingeführt!</translation>
 <context>
     <name>SimpleDrumsGuiBase</name>
     <message>
+        <location filename="../../synti/simpledrums/simpledrumsguibase.ui" line="+23"/>
         <source>DrumSynth 0.1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9056,25 +10604,25 @@ Rhythmus Zufallsgenerator noch nicht eingeführt!</translation>
 <context>
     <name>SimpleSynthGui</name>
     <message>
+        <location filename="../../synti/simpledrums/simpledrumsgui.cpp" line="+367"/>
         <source>&amp;Load setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>&amp;Save setup</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Load sample dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>Song</name>
     <message>
+        <location filename="../../muse/song.cpp" line="+2344"/>
         <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:
@@ -9093,55 +10641,71 @@ click on the Restart button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+189"/>
         <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>
-        <source>MusE was unable to launch the script
-</source>
+        <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>
     </message>
@@ -9149,22 +10713,32 @@ click on the Restart button.</source>
 <context>
     <name>SongInfo</name>
     <message>
+        <location filename="../../muse/widgets/songinfo.ui" line="+14"/>
         <source>Song Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+16"/>
+        <source>Show on song load</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+C</source>
         <translation type="unfinished">Alt+C</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>&amp;Ok</source>
         <translation type="unfinished">&amp;Bestätigen</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+O</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9172,54 +10746,68 @@ 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: Synth Einstellung</translation>
     </message>
     <message>
+        <location line="+75"/>
         <source>Soft Synthesizer</source>
         <translation>Software-Synthesizer</translation>
     </message>
     <message>
+        <location line="+46"/>
         <source>File</source>
         <translation>Datei</translation>
     </message>
     <message>
+        <location line="-115"/>
         <source>Instances</source>
         <translation>Instanzen</translation>
     </message>
     <message>
+        <location line="+10"/>
+        <location line="+115"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
+        <location line="-17"/>
         <source>list of available software synthesizers</source>
         <translation>Liste verfügbarer Software-Synthesizer</translation>
     </message>
     <message>
+        <location line="-25"/>
         <source>Add Instance</source>
         <translation>Instanz hinzufügen</translation>
     </message>
     <message>
+        <location line="-58"/>
         <source>Remove Instance</source>
         <translation>Instanz entfernen</translation>
     </message>
     <message>
+        <location line="-10"/>
         <source>Midi Port</source>
         <translation>Midi Anschluss</translation>
     </message>
     <message>
+        <location line="+38"/>
         <source>Midi connections</source>
         <translation>Midi Verbindungen</translation>
     </message>
     <message>
+        <location line="+67"/>
         <source>Inst</source>
         <translation>Inst</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Version</source>
         <translation>Version</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Description</source>
         <translation>Beschreibung</translation>
     </message>
@@ -9227,82 +10815,156 @@ click on the Restart button.</source>
 <context>
     <name>TList</name>
     <message>
+        <location filename="../../muse/arranger/tlist.cpp" line="+700"/>
         <source>Midi</source>
         <translation>Midi</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Drum</source>
         <translation>Drum</translation>
     </message>
     <message>
+        <location line="-430"/>
         <source>Delete Track</source>
         <translation>Spur löschen</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Track Comment</source>
         <translation>Spur Kommentar</translation>
     </message>
     <message>
         <source>Show Gui</source>
-        <translation>Zeige GUI</translation>
+        <translation type="obsolete">Zeige GUI</translation>
     </message>
     <message>
+        <location line="-296"/>
         <source>Add Midi Track</source>
         <translation>Midi Spur hinzufügen</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Add Drum Track</source>
         <translation>Drum Spur hinzufügen</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Add Wave Track</source>
         <translation>Wave Spur hinzufügen</translation>
     </message>
     <message>
+        <location line="-533"/>
         <source>MusE: bad trackname</source>
         <translation>MusE: ungeeigneter Spurname</translation>
     </message>
     <message>
+        <location line="-53"/>
+        <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="+48"/>
         <source>please choose a unique track name</source>
         <translation>Bitte eindeutigen Spurnamen wählen</translation>
     </message>
     <message>
+        <location line="+203"/>
+        <location line="+53"/>
+        <source>show gui</source>
+        <translation type="unfinished">GUI anzeigen</translation>
+    </message>
+    <message>
+        <location line="-44"/>
+        <location line="+53"/>
+        <source>show native gui</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+270"/>
         <source>Add Output</source>
         <translation>Ausgang hinzufügen</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Add Group</source>
         <translation>Gruppe hinzufügen</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Add Input</source>
         <translation>Eingang hinzufügen</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Add Aux Send</source>
         <translation>Aux Send hinzufügen</translation>
     </message>
     <message>
+        <location line="-420"/>
+        <location line="+1176"/>
         <source>Update drummap?</source>
         <translation>Drumbelegung aktualisieren?</translation>
     </message>
     <message>
+        <location line="-1175"/>
         <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="+1176"/>
         <source>&amp;Yes</source>
         <translation>&amp;Ja</translation>
     </message>
     <message>
+        <location line="-1176"/>
+        <location line="+1176"/>
         <source>&amp;No</source>
         <translation>&amp;Nein</translation>
     </message>
     <message>
+        <location line="-643"/>
+        <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="+610"/>
         <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="-1386"/>
         <source>&lt;none&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9310,6 +10972,7 @@ 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>
     </message>
@@ -9324,38 +10987,41 @@ click on the Restart button.</source>
 <context>
     <name>Toolbar1</name>
     <message>
+        <location filename="../../muse/widgets/tb1.cpp" line="+21"/>
         <source>Solo</source>
         <translation>Solo</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>Snap</source>
         <translation>Magnet</translation>
     </message>
     <message>
         <source>Quantize</source>
-        <translation>Quantisieren</translation>
+        <translation type="obsolete">Quantisieren</translation>
     </message>
     <message>
         <source>To</source>
-        <translation>Zu</translation>
+        <translation type="obsolete">Zu</translation>
     </message>
     <message>
         <source>All Events</source>
-        <translation>Alle Ereignisse</translation>
+        <translation type="obsolete">Alle Ereignisse</translation>
     </message>
     <message>
         <source>Looped Ev.</source>
-        <translation>Ereignisse innerhalb Schleife.</translation>
+        <translation type="obsolete">Ereignisse innerhalb Schleife.</translation>
     </message>
     <message>
         <source>Selected Ev.</source>
-        <translation>Ausgewählte Ereignisse.</translation>
+        <translation type="obsolete">Ausgewählte Ereignisse.</translation>
     </message>
     <message>
         <source>Looped+Sel.</source>
-        <translation>Innerhalb Schleife + augewählt.</translation>
+        <translation type="obsolete">Innerhalb Schleife + augewählt.</translation>
     </message>
     <message>
+        <location line="-18"/>
         <source>Cursor</source>
         <translation>Positionsmarker</translation>
     </message>
@@ -9363,10 +11029,12 @@ click on the Restart button.</source>
 <context>
     <name>TrackComment</name>
     <message>
+        <location filename="../../muse/widgets/comment.cpp" line="+41"/>
         <source>MusE: Track Comment</source>
         <translation>MusE: Spur Kommentar</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Track Comment:</source>
         <translation>Spur Kommentar:</translation>
     </message>
@@ -9374,122 +11042,156 @@ 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>
     </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="-95"/>
         <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 geginnen</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="+101"/>
         <source>rewind to start</source>
         <translation>Zum Start zurück</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>rewind</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="+4"/>
         <source>stop</source>
         <translation>Stopp</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>play</source>
         <translation>Wiedergabe</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>record</source>
         <translation>Aufnahme</translation>
     </message>
     <message>
+        <location line="+28"/>
         <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="+45"/>
         <source>Master</source>
         <translation>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>
     </message>
@@ -9498,52 +11200,55 @@ click on the Restart button.</source>
     <name>TransposeDialogBase</name>
     <message>
         <source>MusE: Midi Transpose</source>
-        <translation>MusE: Midi transponieren</translation>
+        <translation type="obsolete">MusE: Midi transponieren</translation>
     </message>
     <message>
         <source>Value</source>
-        <translation>Wert</translation>
+        <translation type="obsolete">Wert</translation>
     </message>
     <message>
         <source>halftones</source>
-        <translation>Halbtonschritte</translation>
+        <translation type="obsolete">Halbtonschritte</translation>
     </message>
     <message>
         <source>Time</source>
-        <translation>Zeit</translation>
+        <translation type="obsolete">Zeit</translation>
     </message>
     <message>
         <source>all</source>
-        <translation>alle</translation>
+        <translation type="obsolete">alle</translation>
     </message>
     <message>
         <source>between markers</source>
-        <translation>Zwischen Markern</translation>
+        <translation type="obsolete">Zwischen Markern</translation>
     </message>
     <message>
         <source>Parts</source>
-        <translation>Parts</translation>
+        <translation type="obsolete">Parts</translation>
     </message>
     <message>
         <source>all in selected tracks</source>
-        <translation>Alles in ausgewählter Spur</translation>
+        <translation type="obsolete">Alles in ausgewählter Spur</translation>
     </message>
     <message>
         <source>OK</source>
-        <translation>Bestätigen</translation>
+        <translation type="obsolete">Bestätigen</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Abbrechen</translation>
+        <translation type="obsolete">Abbrechen</translation>
     </message>
 </context>
 <context>
     <name>VAMGui</name>
     <message>
+        <location filename="../../synti/vam/vamgui.cpp" line="+569"/>
         <source>MusE: Load VAM Presets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+110"/>
+        <location line="+18"/>
         <source>MusE: Save VAM Presets</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9551,134 +11256,190 @@ click on the Restart button.</source>
 <context>
     <name>VAMGuiBase</name>
     <message>
+        <location filename="../../synti/vam/vamguibase.ui" line="+23"/>
         <source>Virtual Analogue for MusE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>LFO</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Freq</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+42"/>
+        <location line="+950"/>
+        <location line="+177"/>
         <source>Waveform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-1116"/>
+        <location line="+956"/>
+        <location line="+177"/>
         <source>Sine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-1128"/>
+        <location line="+956"/>
+        <location line="+177"/>
         <source>Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-1128"/>
+        <location line="+956"/>
+        <location line="+177"/>
         <source>Saw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-1128"/>
+        <location line="+956"/>
+        <location line="+177"/>
         <source>Triangle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-1122"/>
         <source>Filter</source>
         <translation type="unfinished">Filter</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>EnvMod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
+        <location line="+717"/>
+        <location line="+427"/>
         <source>Attack</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-1134"/>
+        <location line="+645"/>
+        <location line="+531"/>
         <source>Decay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-1166"/>
+        <location line="+677"/>
+        <location line="+531"/>
         <source>Sustain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-1198"/>
+        <location line="+677"/>
+        <location line="+401"/>
         <source>Release</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-972"/>
         <source>Cutoff</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Resonance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Invert</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>KeyTrack</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+153"/>
         <source>Presets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+65"/>
         <source>Set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>load preset list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>save preset list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>save preset list to a new file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>delete preset</source>
         <translation type="unfinished">Vorlage löschen</translation>
     </message>
     <message>
+        <location line="+41"/>
         <source>DCO 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+12"/>
+        <location line="+538"/>
         <source>Pitch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-506"/>
+        <location line="+480"/>
         <source>Detune</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-374"/>
+        <location line="+473"/>
         <source>PWM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-391"/>
+        <location line="+266"/>
         <source>FM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-240"/>
+        <location line="+501"/>
         <source>PW</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-314"/>
         <source>DCO 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+324"/>
         <source>On</source>
         <translation type="unfinished">An</translation>
     </message>
     <message utf8="true">
+        <location line="+122"/>
         <source>VAM 1.0beta3
 Virtual Analog for MusE
 Released under GPL.
@@ -9695,58 +11456,59 @@ Robert Jonsson
     <name>VelocityBase</name>
     <message>
         <source>MusE: Modify Velocity</source>
-        <translation>MusE: Velocity ändern</translation>
+        <translation type="obsolete">MusE: Velocity ändern</translation>
     </message>
     <message>
         <source>Range</source>
-        <translation>Bereich</translation>
+        <translation type="obsolete">Bereich</translation>
     </message>
     <message>
         <source>All Events</source>
-        <translation>Alle Ereignisse</translation>
+        <translation type="obsolete">Alle Ereignisse</translation>
     </message>
     <message>
         <source>Selected Events</source>
-        <translation>Ausgewählte Ereignisse</translation>
+        <translation type="obsolete">Ausgewählte Ereignisse</translation>
     </message>
     <message>
         <source>Looped Events</source>
-        <translation>Ereignisse innerhalb Schleife</translation>
+        <translation type="obsolete">Ereignisse innerhalb Schleife</translation>
     </message>
     <message>
         <source>Selected &amp; Looped</source>
-        <translation>Ausgewählt &amp; innerhalb Schleife</translation>
+        <translation type="obsolete">Ausgewählt &amp; innerhalb Schleife</translation>
     </message>
     <message>
         <source>Values</source>
-        <translation>Werte</translation>
+        <translation type="obsolete">Werte</translation>
     </message>
     <message>
         <source>Rate:</source>
-        <translation>Rate:</translation>
+        <translation type="obsolete">Rate:</translation>
     </message>
     <message>
         <source>Offset:</source>
-        <translation>Zeitversatz:</translation>
+        <translation type="obsolete">Zeitversatz:</translation>
     </message>
     <message>
         <source>%</source>
-        <translation>%</translation>
+        <translation type="obsolete">%</translation>
     </message>
     <message>
         <source>OK</source>
-        <translation>Bestätigen</translation>
+        <translation type="obsolete">Bestätigen</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Abbrechen</translation>
+        <translation type="obsolete">Abbrechen</translation>
     </message>
 </context>
 <context>
     <name>WTScale</name>
     <message>
+        <location filename="../../muse/widgets/wtscale.cpp" line="+29"/>
         <source>bar scale</source>
-        <translation type="obsolete">Taktskala</translation>
+        <translation type="unfinished">Taktskala</translation>
     </message>
 </context>
 <context>
@@ -9760,10 +11522,12 @@ Robert Jonsson
         <translation type="obsolete">Werkzeug &quot;we&quot;</translation>
     </message>
     <message>
+        <location filename="../../muse/waveedit/waveedit.cpp" line="+180"/>
         <source>Solo</source>
         <translation>Solo</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Cursor</source>
         <translation>Positionsmarker</translation>
     </message>
@@ -9776,87 +11540,123 @@ Robert Jonsson
         <translation type="obsolete">Funktionen</translation>
     </message>
     <message>
+        <location line="-109"/>
         <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>
+        <location line="+2"/>
         <source>200%</source>
         <translation type="unfinished">200%</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>150%</source>
         <translation type="unfinished">150%</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>75%</source>
         <translation type="unfinished">75%</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>50%</source>
         <translation type="unfinished">50%</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>25%</source>
         <translation type="unfinished">25%</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+8"/>
+        <source>&amp;Copy</source>
+        <translation type="unfinished">&amp;Kopieren</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>C&amp;ut</source>
+        <translation type="unfinished">&amp;Ausschneiden</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">Auswählen</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Select &amp;All</source>
         <translation type="unfinished">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>
     </message>
     <message>
+        <location line="+5"/>
         <source>Wave edit tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>transport</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Pianoroll tools</source>
+        <location line="+8"/>
+        <source>WaveEdit tools</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -9898,10 +11698,12 @@ Robert Jonsson
 <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
@@ -9909,10 +11711,12 @@ 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.
 
@@ -9923,230 +11727,288 @@ Missing data is muted</source>
 <context>
     <name>freeverb</name>
     <message>
+        <location filename="../plugins/1050.ui" line="+20"/>
         <source>FreeVerb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Room Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+88"/>
         <source>Damping</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+60"/>
         <source>Wet Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../plugins/2142.ui" line="+26"/>
         <source>Tap-Reverberator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Decay [ms]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+59"/>
+        <location line="+41"/>
         <source>dB</source>
         <translation type="unfinished">dB</translation>
     </message>
     <message>
+        <location line="-31"/>
         <source>Dry Level [dB]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+41"/>
         <source>Wet Level [dB]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+72"/>
         <source>Preset:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>AfterBurn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>AfterBurn (Long)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Ambience</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Ambience (Thick)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Ambience (Thick) - HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Cathedral</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Cathedral - HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Drum Chamber</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Garage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Garage (Bright)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Gymnasium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Gymnasium (Bright)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Gymnasium (Bright) - HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Hall (Small)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Hall (Medium)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Hall (Large)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Hall (Large) - HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Plate (Small)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Plate (Medium)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Plate (Large)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Plate (Large) - HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Pulse Chamber</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Pulse Chamber (Reverse)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Resonator (96 ms)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Resonator (152 ms)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Resonator (208 ms)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Room (Small)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Room (Medium)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Room (Large)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Room (Large) - HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Slap Chamber</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Slap Chamber - HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Slap Chamber (Bright)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Slap Chamber (Bright) HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Smooth Hall (Small)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Smooth Hall (Medium)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Smooth Hall (Large)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Smooth Hall (Large) - HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Vocal Plate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Vocal Plate - HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Warble Chamber</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Warehoouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Warehouse - HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Comb Filters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Allpass Filters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Bandpass Filters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Enhanced Stereo</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/muse2/share/locale/muse_es.ts b/muse2/share/locale/muse_es.ts
index 18b96de3..047655ce 100644
--- a/muse2/share/locale/muse_es.ts
+++ b/muse2/share/locale/muse_es.ts
@@ -4,6 +4,7 @@
 <context>
     <name>@default</name>
     <message>
+        <location filename="../../muse/transport.cpp" line="+31"/>
         <source>Click this button to enable recording</source>
         <translation type="unfinished">Pulsa este botón para habilitar la captura</translation>
     </message>
@@ -11,11 +12,12 @@
         <source>sets amount of quantization:
 0   - no quantization
 100 - full quantization</source>
-        <translation type="unfinished">selecciona el porcentaje de cuantizado:
+        <translation type="obsolete">selecciona el porcentaje de cuantizado:
 0   - sin cuantizar
 100 - sobrecuantizado</translation>
     </message>
     <message>
+        <location filename="../../muse/widgets/tools.cpp" line="+16"/>
         <source>select Pointer Tool:
 with the pointer tool you can:
   select parts
@@ -28,88 +30,107 @@ con la herramienta de puntero puedes:
   copiar partes</translation>
     </message>
     <message>
+        <location filename="../../muse/app.cpp" line="+71"/>
         <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>
     </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.
 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>
     </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>
     </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>
     </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>
     </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>
     </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>
     </message>
     <message>
         <source>don&apos;t quantize notes above this tick limit</source>
-        <translation type="unfinished">no cuantices notas por encima de este límite de resolución</translation>
+        <translation type="obsolete">no cuantices notas por encima de este límite de resolución</translation>
     </message>
     <message>
         <source>quantize also note len as default</source>
-        <translation type="unfinished">cuantiza también la longitud de la nota al valor por defecto</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>
     </message>
     <message>
+        <location line="+1"/>
         <source>record starts at left mark</source>
         <translation type="unfinished">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>
     </message>
     <message>
+        <location line="+1"/>
         <source>rewind to start position</source>
         <translation type="unfinished">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>
     </message>
     <message>
+        <location line="+1"/>
         <source>move current position</source>
         <translation type="unfinished">mueve la posición actual</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>stop sequencer</source>
         <translation type="unfinished">para el secuenciador</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>start sequencer play</source>
         <translation type="unfinished">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>
     </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>
     </message>
     <message>
+        <location filename="../../muse/widgets/tools.cpp" line="+5"/>
         <source>select Pencil Tool:
 with the pencil tool you can:
   create new parts
@@ -120,82 +141,125 @@ con la herramienta de lápiz puedes:
   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:
 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:
 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:
 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>
     </message>
     <message>
+        <location line="+1"/>
         <source>select Quantize Tool:
 insert display quantize event</source>
         <translation type="unfinished">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>
     </message>
     <message>
+        <location line="+1"/>
         <source>select Muting Tool:
 click on part to mute/unmute</source>
         <translation type="unfinished">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>
     </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>
+    </message>
+    <message>
         <source>rubber</source>
         <translation type="obsolete">goma</translation>
     </message>
     <message>
+        <location line="-7"/>
         <source>cutter</source>
         <translation type="unfinished">cortador</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>score</source>
         <translation type="unfinished">partitura</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>glue</source>
         <translation type="unfinished">pegamento</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>quantize</source>
         <translation type="unfinished">cuantizador</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>draw</source>
         <translation type="unfinished">dibujar</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>mute parts</source>
         <translation type="unfinished">silenciar partes</translation>
     </message>
     <message>
+        <location filename="../../muse/arranger/arranger.cpp" line="+136"/>
+        <location filename="../../muse/master/masteredit.cpp" line="+127"/>
+        <location filename="../../muse/widgets/comboQuant.cpp" line="+23"/>
+        <location line="+1"/>
+        <location line="+1"/>
+        <location filename="../../muse/widgets/tb1.cpp" line="+31"/>
+        <location line="+1"/>
+        <location line="+1"/>
         <source>Off</source>
         <translation type="unfinished">Apagar</translation>
     </message>
@@ -208,130 +272,189 @@ haz click en una parte para silenciar/des-silenciar</translation>
         <translation type="obsolete">Todos los archivos (*)</translation>
     </message>
     <message>
+        <location filename="../../muse/app.cpp" line="+645"/>
         <source>Add Midi Track</source>
         <translation type="unfinished">Agregar pista MIDI</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Add Drum Track</source>
         <translation type="unfinished">Agregar pista de percusión</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Add Wave Track</source>
         <translation type="unfinished">Agregar pista de audio</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Add Audio Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Add Audio Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Add Audio Input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+4"/>
         <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>
     </message>
     <message>
+        <location filename="../../muse/app.cpp" line="-66"/>
         <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="+56"/>
+        <location filename="../../muse/arranger/tlist.cpp" line="+970"/>
         <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="+714"/>
         <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="+225"/>
+        <location filename="../../muse/driver/jackmidi.cpp" line="+737"/>
+        <location filename="../../muse/midiport.cpp" line="+1072"/>
+        <location filename="../../muse/track.cpp" line="+782"/>
+        <location line="+16"/>
+        <location line="+30"/>
         <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="+34"/>
+        <location filename="../../muse/driver/jackmidi.cpp" line="+36"/>
+        <location filename="../../muse/midiport.cpp" line="+7"/>
+        <location filename="../../muse/track.cpp" line="-48"/>
+        <location line="+60"/>
         <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="-61"/>
+        <location line="+64"/>
+        <location filename="../../muse/track.cpp" line="-42"/>
+        <location line="+48"/>
         <source> type=&quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location filename="../../muse/driver/jackmidi.cpp" line="-61"/>
+        <location line="+64"/>
+        <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="-69"/>
+        <location filename="../../muse/track.cpp" line="-56"/>
         <source>source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../../muse/midictrl.cpp" line="+227"/>
         <source>Velocity</source>
         <translation type="unfinished">Velocidad</translation>
     </message>
     <message>
+        <location filename="../../muse/midiport.cpp" line="-756"/>
         <source>&lt;none&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+750"/>
+        <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="+1316"/>
         <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>
@@ -339,14 +462,17 @@ haz click en una parte para silenciar/des-silenciar</translation>
 <context>
     <name>AboutBox</name>
     <message>
+        <location filename="../../muse/widgets/aboutbox.ui" line="+14"/>
         <source>AboutBox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+37"/>
         <source>Version 2 pre-alpha</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>(C) Copyright 1999-2010 Werner Schweer and others.
 See http://www.muse-sequencer.org for new versions and
 more information.
@@ -355,10 +481,12 @@ Published under the GNU Public License</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>&amp;Keep On Rocking!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+K</source>
         <translation type="unfinished"></translation>
     </message>
@@ -366,6 +494,7 @@ Published under the GNU Public License</source>
 <context>
     <name>Appearance</name>
     <message>
+        <location filename="../../muse/appearance.cpp" line="+751"/>
         <source>MusE: load image</source>
         <translation type="unfinished">MusE: carga imagen</translation>
     </message>
@@ -390,56 +519,73 @@ Published under the GNU Public License</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>
-        <source>&lt;none&gt;</source>
+        <location line="+2"/>
+        <source>Global opacity (opposite of transparency).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select style sheet</source>
+        <location line="+4"/>
+        <source>Standard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Qt style sheets (*.qss)</source>
+        <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>
-        <source>Global opaqueness (inverse of transparency).</source>
+        <location line="+0"/>
+        <source>Qt style sheets (*.qss)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -447,25 +593,30 @@ Word-breaking but only with spaces.</source>
     <name>AppearanceDialogBase</name>
     <message>
         <source>MusE: Appearance Settings</source>
-        <translation type="unfinished">MusE: Configuración de apariencia</translation>
+        <translation type="obsolete">MusE: Configuración de apariencia</translation>
     </message>
     <message>
+        <location filename="../../muse/widgets/appearancebase.ui" line="+1681"/>
         <source>Apply</source>
         <translation type="unfinished">Aplicar</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Ok</source>
         <translation type="unfinished">Aceptar</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Cancel</source>
         <translation type="unfinished">Cancelar</translation>
     </message>
     <message>
+        <location line="-1668"/>
         <source>Arranger</source>
         <translation type="unfinished">Arreglador</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Parts</source>
         <translation type="unfinished">Partes</translation>
     </message>
@@ -474,70 +625,90 @@ Word-breaking but only with spaces.</source>
         <translation type="obsolete">mostrar frames</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>show names</source>
         <translation type="unfinished">mostrar nombres</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>show events</source>
         <translation type="unfinished">mostrar eventos</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>show Cakewalk Style</source>
         <translation type="unfinished">mostrar al estilo de Cakewalk</translation>
     </message>
     <message>
+        <location line="+28"/>
+        <source>y-stretch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+15"/>
         <source>Events</source>
         <translation type="unfinished">Eventos</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>note on</source>
         <translation type="unfinished">nota on</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>poly pressure</source>
         <translation type="unfinished">presión polifónica</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>controller</source>
         <translation type="unfinished">controlador</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>aftertouch</source>
         <translation type="unfinished">aftertouch</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>pitch bend</source>
         <translation type="unfinished">pitch bend</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>program change</source>
         <translation type="unfinished">cambio de programa</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>special</source>
         <translation type="unfinished">especial</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Background picture</source>
         <translation type="unfinished">Imagen de fondo</translation>
     </message>
     <message>
         <source>bg</source>
-        <translation type="unfinished">fondo</translation>
+        <translation type="obsolete">fondo</translation>
     </message>
     <message>
         <source>select...</source>
-        <translation type="unfinished">selecciona...</translation>
+        <translation type="obsolete">selecciona...</translation>
     </message>
     <message>
+        <location line="+58"/>
         <source>show snap grid</source>
         <translation type="unfinished">muestra la rejilla de captura</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Colors</source>
         <translation type="unfinished">Colores</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Items</source>
         <translation type="unfinished">Objetos</translation>
     </message>
@@ -558,193 +729,282 @@ Word-breaking but only with spaces.</source>
         <translation type="obsolete">colores dinámicos para actividad en el arreglador</translation>
     </message>
     <message>
+        <location line="+824"/>
         <source>Style/Fonts</source>
         <translation type="unfinished">Estilo/Tipografía</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>QT Theme</source>
         <translation type="unfinished">tema QT</translation>
     </message>
     <message>
+        <location line="+21"/>
         <source>Windows</source>
         <translation type="unfinished">Ventanas</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>MusE</source>
         <translation type="unfinished">MusE</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Metal</source>
         <translation type="unfinished">Metal</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Norwegian Wood</source>
         <translation type="unfinished">Madera Noruega</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Platinum</source>
         <translation type="unfinished">Platino</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>CDE</source>
         <translation type="unfinished">CDE</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Motif</source>
         <translation type="unfinished">Motif</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Motif Plus</source>
         <translation type="unfinished">Motif Plus</translation>
     </message>
     <message>
+        <location line="+73"/>
         <source>Fonts</source>
         <translation type="unfinished">Tipografía</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Family</source>
         <translation type="unfinished">Familia</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Size</source>
         <translation type="unfinished">Tamaño</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Font 1</source>
         <translation type="unfinished">Tipografía 1</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Font 2</source>
         <translation type="unfinished">Tipografía 2</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Font 3</source>
         <translation type="unfinished">Tipografía 3</translation>
     </message>
     <message>
+        <location line="+50"/>
         <source>Font 0</source>
         <translation type="unfinished">Tipografía 0</translation>
     </message>
     <message>
+        <location line="+50"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <location line="+157"/>
+        <location line="+47"/>
+        <location line="+7"/>
         <source>Bold</source>
         <translation type="unfinished">Negrita</translation>
     </message>
     <message>
+        <location line="-204"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <location line="+136"/>
+        <location line="+54"/>
+        <location line="+7"/>
         <source>Italic</source>
         <translation type="unfinished">Cursiva</translation>
     </message>
     <message>
+        <location line="-433"/>
+        <location line="+7"/>
+        <location line="+242"/>
+        <location line="+13"/>
+        <location line="+13"/>
+        <location line="+13"/>
+        <location line="+97"/>
+        <location line="+61"/>
+        <location line="+13"/>
         <source>...</source>
         <translation type="unfinished">...</translation>
     </message>
     <message>
+        <location line="-633"/>
+        <source>Color name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Global opacity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+449"/>
         <source>Font 4</source>
         <translation type="unfinished">Tipografía 4</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Font 5</source>
         <translation type="unfinished">Tipografía 5</translation>
     </message>
     <message>
+        <location line="-1228"/>
         <source>Palette</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-257"/>
+        <source>MusE: Appearance settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+193"/>
+        <source>add</source>
+        <translation type="unfinished">Agregar</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>remove</source>
+        <translation type="unfinished">quitar</translation>
+    </message>
+    <message>
+        <location line="+586"/>
         <source>add to palette</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>B</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>S</source>
         <translation type="unfinished">S</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>H</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+30"/>
         <source>V</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>G</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+96"/>
         <source>R</source>
         <translation type="unfinished">R</translation>
     </message>
     <message>
+        <location line="-772"/>
         <source>clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+953"/>
         <source>Style Sheet:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+345"/>
         <source>Font 6</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Global opaqueness</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>Arranger</name>
     <message>
+        <location filename="../../muse/arranger/arranger.cpp" line="-10"/>
         <source>Cursor</source>
         <translation type="unfinished">Cursor</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Snap</source>
         <translation type="unfinished">Snap</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Len</source>
         <translation type="unfinished">Longitud</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>NO</source>
         <translation>No</translation>
     </message>
     <message>
+        <location line="+103"/>
         <source>TrackInfo</source>
         <translation>Información de pista</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Track</source>
         <translation>Pista</translation>
     </message>
     <message>
+        <location line="-121"/>
         <source>Type</source>
         <translation type="unfinished">Tipo</translation>
     </message>
     <message>
+        <location line="+6"/>
+        <location line="+1"/>
         <source>midi song type</source>
         <translation type="unfinished">tipo de canción midi</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Pitch</source>
         <translation type="unfinished">Tono</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>midi pitch</source>
         <translation type="unfinished">tono midi</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>global midi pitch shift</source>
         <translation type="unfinished">desplazamiento de tono midi</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Tempo</source>
         <translation type="unfinished">Tempo</translation>
     </message>
     <message>
+        <location line="+8"/>
+        <location line="+1"/>
         <source>midi tempo</source>
         <translation type="unfinished">tempo midi</translation>
     </message>
@@ -753,6 +1013,7 @@ Word-breaking but only with spaces.</source>
         <translation type="obsolete">Port de Salida</translation>
     </message>
     <message>
+        <location line="-80"/>
         <source>Arranger</source>
         <translation type="unfinished">Arreglador</translation>
     </message>
@@ -765,22 +1026,27 @@ Word-breaking but only with spaces.</source>
         <translation type="obsolete">compás</translation>
     </message>
     <message>
+        <location line="+48"/>
         <source>GM</source>
         <translation type="unfinished">GM</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>GS</source>
         <translation type="unfinished">GS</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>XG</source>
         <translation type="unfinished">XG</translation>
     </message>
     <message>
+        <location line="+40"/>
         <source>N</source>
         <translation type="unfinished">N</translation>
     </message>
     <message>
+        <location line="+73"/>
         <source>R</source>
         <translation type="unfinished">R</translation>
     </message>
@@ -789,22 +1055,27 @@ Word-breaking but only with spaces.</source>
         <translation type="obsolete">A</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>M</source>
         <translation type="unfinished">M</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>S</source>
         <translation type="unfinished">S</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>C</source>
         <translation type="unfinished">C</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Ch</source>
         <translation type="unfinished">Ch</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>T</source>
         <translation type="unfinished">T</translation>
     </message>
@@ -829,42 +1100,62 @@ Word-breaking but only with spaces.</source>
         <translation type="obsolete">Grupo D</translation>
     </message>
     <message>
+        <location line="-230"/>
         <source>Enable Recording</source>
         <translation type="unfinished">Habilita captura</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Mute/Off Indicator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Solo Indicator</source>
         <translation type="unfinished">Indicador de solo</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Track Type</source>
         <translation type="unfinished">Tipo de pista</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Track Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Midi output channel number or audio channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Midi output port or synth midi port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Time Lock</source>
         <translation type="unfinished">Bloqueo de tiempo</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>Automation parameter selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Notation clef</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
         <source>Enable recording. Click to toggle.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Mute indicator. Click to toggle.
 Right-click to toggle track on/off.
 Mute is designed for rapid, repeated action.
@@ -872,28 +1163,33 @@ On/Off is not!</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+1"/>
         <source>Track type. Right-click to change
  midi and drum track types.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Track name. Double-click to edit.
 Right-click for more options.</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+1"/>
         <source>Midi/drum track: Output port.
 Synth track: Assigned midi port.
 Left-click to change.
@@ -901,19 +1197,34 @@ Right-click to show GUI.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Time lock</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>Notation clef. Select this tracks notation clef.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <location line="+1"/>
         <source>song length - bars</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+126"/>
         <source>Port</source>
         <translation type="unfinished">Puerto</translation>
     </message>
     <message>
-        <source>&lt;unknown&gt;</source>
+        <location line="+3"/>
+        <source>Automation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Clef</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1115,46 +1426,57 @@ Right-click to show GUI.</source>
         <translation type="obsolete">Grupo D</translation>
     </message>
     <message>
+        <location filename="../../muse/mixer/amixer.cpp" line="+156"/>
         <source>&amp;Create</source>
         <translation type="unfinished">&amp;Crear</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <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>Show Inputs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Show Outputs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Show Groups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Show Auxs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Show Synthesizers</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1162,18 +1484,22 @@ Right-click to show GUI.</source>
 <context>
     <name>AudioStrip</name>
     <message>
+        <location filename="../../muse/mixer/astrip.cpp" line="+603"/>
         <source>panorama</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>aux send level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+286"/>
         <source>off</source>
         <translation type="unfinished">apagado</translation>
     </message>
     <message>
+        <location line="-263"/>
         <source>Pan</source>
         <translation type="unfinished">Bal</translation>
     </message>
@@ -1182,30 +1508,37 @@ Right-click to show GUI.</source>
         <translation type="obsolete">S</translation>
     </message>
     <message>
+        <location line="+93"/>
         <source>1/2 channel</source>
         <translation type="unfinished">Canales 1/2</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Pre</source>
         <translation type="unfinished">Pre</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>pre fader - post fader</source>
         <translation type="unfinished">pre fader - port fader</translation>
     </message>
     <message>
+        <location line="+64"/>
         <source>dB</source>
         <translation type="unfinished">dB</translation>
     </message>
     <message>
+        <location line="+36"/>
         <source>record</source>
         <translation type="unfinished">grabar</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>mute</source>
         <translation type="unfinished">silencio</translation>
     </message>
     <message>
+        <location line="+25"/>
         <source>record downmix</source>
         <translation type="unfinished">downmix de captura</translation>
     </message>
@@ -1214,46 +1547,57 @@ Right-click to show GUI.</source>
         <translation type="obsolete">monitorizar pre fader</translation>
     </message>
     <message>
+        <location line="+37"/>
         <source>iR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>oR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>output routing</source>
         <translation type="unfinished">ruteado de entrada</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Touch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+25"/>
         <source>automation type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel</source>
-        <translation type="unfinished">Canal</translation>
+        <translation type="obsolete">Canal</translation>
     </message>
     <message>
+        <location line="-88"/>
+        <location line="+4"/>
         <source>solo mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>input routing</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1262,55 +1606,62 @@ Right-click to show GUI.</source>
     <name>Awl::MidiVolEntry</name>
     <message>
         <source>off</source>
-        <translation type="unfinished">apagado</translation>
-    </message>
-    <message>
-        <source>db</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">apagado</translation>
     </message>
 </context>
 <context>
     <name>Awl::VolEntry</name>
     <message>
         <source>off</source>
-        <translation type="unfinished">apagado</translation>
+        <translation type="obsolete">apagado</translation>
     </message>
 </context>
 <context>
     <name>BigTime</name>
     <message>
+        <location filename="../../muse/widgets/bigtime.cpp" line="+78"/>
         <source>MusE: Bigtime</source>
         <translation type="unfinished">MusE: Big Time</translation>
     </message>
     <message>
+        <location line="-42"/>
         <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">minuto</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>second</source>
         <translation type="unfinished">segundo</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <location line="+3"/>
         <source>frame</source>
         <translation type="unfinished">frame</translation>
     </message>
     <message>
+        <location line="-2"/>
         <source>subframe</source>
         <translation type="unfinished">sub-frame</translation>
     </message>
@@ -1318,6 +1669,7 @@ Right-click to show GUI.</source>
 <context>
     <name>ClipListEdit</name>
     <message>
+        <location filename="../../muse/cliplist/cliplist.cpp" line="+103"/>
         <source>MusE: Clip List Editor</source>
         <translation type="unfinished">MusE: Editor de lista de clips</translation>
     </message>
@@ -1325,38 +1677,47 @@ Right-click to show GUI.</source>
 <context>
     <name>ClipListEditorBase</name>
     <message>
+        <location filename="../../muse/widgets/cliplisteditorbase.ui" line="+17"/>
         <source>MusE: ClipList</source>
         <translation type="unfinished">MusE: Lista de Clips</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Name</source>
         <translation type="unfinished">Nombre</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Refs</source>
         <translation type="unfinished">Referencias</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Start</source>
         <translation type="unfinished">Inicio</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Len</source>
         <translation type="unfinished">Longitud</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Data</source>
         <translation type="unfinished">Datos</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>Clip Properties</source>
         <translation type="unfinished">Propiedades del Clip</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Pos:</source>
         <translation type="unfinished">Posición:</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Len:</source>
         <translation type="unfinished">Longitud:</translation>
     </message>
@@ -1364,14 +1725,17 @@ Right-click to show GUI.</source>
 <context>
     <name>CommentBase</name>
     <message>
+        <location filename="../../muse/widgets/commentbase.ui" line="+14"/>
         <source>Form1</source>
         <translation type="unfinished">Form1</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>Track Comment</source>
         <translation type="unfinished">Comentario de la pista</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>Track 1</source>
         <translation type="unfinished">Pista 1</translation>
     </message>
@@ -1379,42 +1743,52 @@ Right-click to show GUI.</source>
 <context>
     <name>ConfigMidiFileBase</name>
     <message>
+        <location filename="../../muse/widgets/configmidifilebase.ui" line="+193"/>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished">&amp;Cancelar</translation>
     </message>
     <message>
+        <location line="-56"/>
         <source>0 (single track)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>1 (multiple tracks)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-36"/>
         <source>Format:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-48"/>
         <source>96</source>
         <translation type="unfinished">96</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>192</source>
         <translation type="unfinished">192</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>384</source>
         <translation type="unfinished">384</translation>
     </message>
     <message>
+        <location line="+48"/>
         <source>Division:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-20"/>
         <source>Copyright:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1423,46 +1797,57 @@ Right-click to show GUI.</source>
         <translation type="obsolete">Habilita el formato extendido de smf</translation>
     </message>
     <message>
+        <location line="-95"/>
         <source>MusE: Config Midi File Import/Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Import:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Split tracks into &amp;parts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+P</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Split tracks into parts, or one single part</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Export:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+31"/>
         <source>Enable extended smf format (currently not implemented)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Use &amp;2-byte time signatures instead of standard 4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+37"/>
         <source>Save space by replacing note-offs with &amp;zero velocity note-ons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+Z</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1470,10 +1855,12 @@ Right-click to show GUI.</source>
 <context>
     <name>CtrlPanel</name>
     <message>
+        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="+79"/>
         <source>select controller</source>
         <translation type="unfinished">selecciona controlador</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>remove panel</source>
         <translation type="unfinished">quitar panel</translation>
     </message>
@@ -1490,6 +1877,8 @@ Right-click to show GUI.</source>
         <translation type="obsolete">x</translation>
     </message>
     <message>
+        <location line="+463"/>
+        <location line="+236"/>
         <source>Velocity</source>
         <translation type="unfinished">Velocidad</translation>
     </message>
@@ -1498,248 +1887,378 @@ Right-click to show GUI.</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>
     </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>
+    </message>
 </context>
 <context>
     <name>DeicsOnzeGui</name>
     <message>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="+533"/>
         <source>Save configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+41"/>
+        <location line="+7"/>
+        <location line="+1172"/>
+        <location line="+7"/>
+        <location line="+218"/>
+        <location line="+7"/>
+        <location line="+160"/>
+        <location line="+7"/>
+        <location line="+165"/>
+        <location line="+7"/>
         <source>Critical Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-1749"/>
+        <location line="+1179"/>
+        <location line="+225"/>
+        <location line="+167"/>
+        <location line="+172"/>
         <source>Cannot open file %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-1736"/>
+        <location line="+1179"/>
+        <location line="+225"/>
+        <location line="+167"/>
+        <location line="+172"/>
         <source>Parsing error for file %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-1709"/>
+        <location line="+1351"/>
         <source>Load category dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-226"/>
         <source>Load set dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+67"/>
         <source>Save set dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+24"/>
         <source>New category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location line="+101"/>
         <source>Delete category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-99"/>
         <source>Load category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Save category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Load set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Save set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Delete set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>New subcategory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
+        <location line="+243"/>
         <source>Delete subcategory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-240"/>
         <source>Load subcategory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Save subcategory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>New preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location line="+389"/>
         <source>Delete preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-387"/>
         <source>Load preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Save preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>No more category supported</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>You can not add more categories</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="-338"/>
+        <location line="+170"/>
+        <location line="+170"/>
         <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-340"/>
+        <location line="+170"/>
+        <location line="+170"/>
         <source>&amp;No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-323"/>
+        <location line="+110"/>
         <source>No category selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-109"/>
+        <location line="+110"/>
         <source>You must first select a category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-61"/>
+        <location line="+167"/>
+        <location line="+172"/>
         <source>Replace or add</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+3"/>
+        <location line="+168"/>
+        <location line="+171"/>
         <source>&amp;Replace</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-339"/>
+        <location line="+168"/>
+        <location line="+171"/>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-329"/>
+        <location line="+167"/>
+        <location line="+171"/>
         <source>Download error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-337"/>
         <source>There is no more free category slot.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>Save category dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+30"/>
         <source>No more subcategory supported</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>You can not add more subcategories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+42"/>
+        <location line="+113"/>
         <source>No subcategory selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-112"/>
+        <location line="+113"/>
         <source>You must first select a subcategory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-101"/>
         <source>Load subcategory dialog</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+14"/>
         <source>There is no more free subcategory slot.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>Save subcategory dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>No more preset supported</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>You can not add more presets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+39"/>
+        <location line="+3"/>
+        <location line="+111"/>
         <source>No preset selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-113"/>
+        <location line="+3"/>
+        <location line="+111"/>
         <source>You must first select a preset.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-98"/>
         <source>Load preset dialog</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+13"/>
         <source>There is no more free preset slot.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>Save preset dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+120"/>
         <source>Browse set dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+35"/>
         <source>Browse image dialog</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1747,983 +2266,85 @@ Right-click to show GUI.</source>
 <context>
     <name>DeicsOnzeGuiBase</name>
     <message>
-        <source>DeicsOnze</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Preset</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Program nuúmerous</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>INITVOICE</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LBank</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subcategory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bank nuúmerous</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>NONE</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>HBank</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Prog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Preset</source>
-        <translation type="unfinished">Preselección</translation>
-    </message>
-    <message>
-        <source>DeicsOnze v0.5.5 Copyright (c) 2004-2006 Nil Geisweiller. Published under GPL licence.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Global</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pitch Envelope</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PL3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PL2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PL1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PR1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PR2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PR3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pitch modulation depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Preselección</translation>
     </message>
     <message>
         <source>LFO</source>
-        <translation type="unfinished">LFO</translation>
-    </message>
-    <message>
-        <source>LFO Sync</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pitch modulation sensitivity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pitch Modulation Sensitivity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LFO Delay</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LFO delay</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LFO speed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amplitude modulation depth</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amplitude modulation sensitivity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amplitude Modulation Sensitivity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AMS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LFO Waveform</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pitch Modulation Depth</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PMD</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LFO Speed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AMD</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">LFO</translation>
     </message>
     <message>
         <source>Speed</source>
-        <translation type="unfinished">Velocidad</translation>
+        <translation type="obsolete">Velocidad</translation>
     </message>
     <message>
         <source>Delay</source>
-        <translation type="unfinished">Delay</translation>
-    </message>
-    <message>
-        <source>PMS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Modulation Matrix</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&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;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Op4 Feedback</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Feedback level of the operator 4</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Delay</translation>
     </message>
     <message>
         <source>Transpose</source>
-        <translation type="unfinished">Transponer</translation>
-    </message>
-    <message>
-        <source>Op &amp;1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scaling 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LS1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RS1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rate Scaling</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Attack Rate of the operator 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Level Scaling</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amplitude Envelope 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RR1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D1R1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D1L1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D2R1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Release Rate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message utf8="true">
-        <source>2° Decay Rate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message utf8="true">
-        <source>1° Decay Level</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message utf8="true">
-        <source>1° Decay Rate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Attack Rate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AR1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Detune, OSCWave, EGShift 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DET1</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Transponer</translation>
     </message>
     <message>
         <source>Detune</source>
-        <translation type="unfinished">Desafinación</translation>
-    </message>
-    <message>
-        <source>EG Shift</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>96dB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>48dB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>24dB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>12dB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wave form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>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;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sensitivity 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>KVS1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amplitude Modulation Enable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AME1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Keyboard Velocity Sensitivity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key Velocity Sensitivity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EBS1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EG Bias Sensitivity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Eg Bias Sensitivity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Frequency 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Coarse 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Coarse Ratio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine Ratio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Freq 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fixed Frequency</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggle Fix Frequency</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>FIX</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OUT 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Output Volume</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Desafinación</translation>
     </message>
     <message>
         <source>Volume</source>
-        <translation type="unfinished">Volumen</translation>
-    </message>
-    <message>
-        <source>Op &amp;2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amplitude Envelope 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D1R2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D1L2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D2R2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RR2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AR2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Frequency 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Coarse 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Freq 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scaling 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LS2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RS2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OUT 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Detune, OSCWave, EGShift 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DET2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sensitivity 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EBS2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>KVS2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AME2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Op &amp;3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amplitude Envelope 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D1R3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D1L3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D2R3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RR3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AR3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scaling 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LS3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RS3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OUT 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Frequency 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Coarse 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Freq 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Detune, OSCWave, EGShift 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DET3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sensitivity 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EBS3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>KVS3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AME3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Op &amp;4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>amplitude Envelope 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AR4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D1R4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D1L4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D2R4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RR4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Frequency 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Coarse 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Freq 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scaling 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LS4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RS4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OUT 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Detune, OSCWave, EGShift 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DET4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sensitivity 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EBS4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>KVS4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AME4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Func</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay Pan Depth</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay Pan LFO Freq</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay Ch Send Level </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Channel Chorus</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay Feedback</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay On/Off, Return Level</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Volumen</translation>
     </message>
     <message>
         <source>On</source>
-        <translation type="unfinished">Encendido</translation>
-    </message>
-    <message>
-        <source>Delay Beat Ratio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay BPM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Foot Control</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pitch Bend Range</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Encendido</translation>
     </message>
     <message>
         <source>Pitch</source>
-        <translation type="unfinished">Tono</translation>
-    </message>
-    <message>
-        <source>Amplitude</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Modulation Wheel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Breath Control</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pitch Bias</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Envelope Bias</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Tono</translation>
     </message>
     <message>
         <source>After Touch</source>
-        <translation type="unfinished">After Touch</translation>
-    </message>
-    <message>
-        <source>Phony Mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>POLY</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MONO</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Potamento</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Portamento Mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>FINGER</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>FULL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PT</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Portamento Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;horus</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Chorus Parameters</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Channel send level</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>On/Off and Return level</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select LADSPA plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Reverb</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reverb Parameters</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Font Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Quality</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>High</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Middle</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ultra low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save Mode (into the song)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save only the used presets</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save the entire set</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save the configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configuration File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Load...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save as default</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">After Touch</translation>
     </message>
     <message>
         <source>Colors</source>
-        <translation type="unfinished">Colores</translation>
+        <translation type="obsolete">Colores</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation type="unfinished">Texto</translation>
-    </message>
-    <message>
-        <source>Background</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Background</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Red</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Blue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Green</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set Path</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Image in the background :</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Browse...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Load the set at the initialization :</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set Brightness, Detune, Attack and Release of the current channel to default</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Res. Ctrl</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut all notes off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Panic!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Number of Voices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Number of voices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Texto</translation>
     </message>
     <message>
         <source>Channel</source>
-        <translation type="unfinished">Canal</translation>
-    </message>
-    <message>
-        <source>Vol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Channel Ctrl</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Canal</translation>
     </message>
     <message>
         <source>Release</source>
-        <translation type="unfinished">Relajación</translation>
+        <translation type="obsolete">Relajación</translation>
     </message>
     <message>
         <source>Attack</source>
-        <translation type="unfinished">Ataque</translation>
-    </message>
-    <message>
-        <source>Brightness</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Modulation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pan</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Ataque</translation>
     </message>
 </context>
 <context>
     <name>DidYouKnow</name>
     <message>
+        <location filename="../../muse/widgets/didyouknow.ui" line="+14"/>
         <source>Did you know?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Don&apos;t show on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Next tip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Close</source>
         <translation type="unfinished">Cerrar</translation>
     </message>
@@ -2731,130 +2352,162 @@ 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="+169"/>
         <source>Load Map</source>
         <translation type="unfinished">Carga Mapa</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Save Map</source>
         <translation type="unfinished">Guarda Mapa</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>&amp;Edit</source>
         <translation type="unfinished">&amp;Editar</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Cut</source>
         <translation type="unfinished">Cortar</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Copy</source>
         <translation type="unfinished">Copiar</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Paste</source>
         <translation type="unfinished">Pegar</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Delete Events</source>
         <translation type="unfinished">Borrar Eventos</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>Select All</source>
         <translation type="unfinished">Seleccionar todo</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Select None</source>
         <translation type="unfinished">Deseleccionar</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Invert</source>
         <translation type="unfinished">Invertir</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Inside Loop</source>
         <translation type="unfinished">Bucle interior</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Outside Loop</source>
         <translation type="unfinished">Bucle exterior</translation>
     </message>
     <message>
+        <location line="-7"/>
         <source>&amp;Select</source>
         <translation type="unfinished">&amp;Seleccionar</translation>
     </message>
     <message>
+        <location line="+94"/>
         <source>Step Record</source>
         <translation type="unfinished">Parar captura</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Midi Input</source>
         <translation type="unfinished">Entrada MIDI</translation>
     </message>
     <message>
+        <location line="+57"/>
         <source>Add Controller View</source>
         <translation type="unfinished">Agregar Controlador</translation>
     </message>
     <message>
+        <location line="+57"/>
         <source>M</source>
         <translation type="unfinished">M</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Sound</source>
         <translation type="unfinished">Sonido</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>QNT</source>
         <translation type="unfinished">QNT</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>E-Note</source>
         <translation type="unfinished">Nota-E</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Len</source>
         <translation type="unfinished">Longitud</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>A-Note</source>
         <translation type="unfinished">Nota-A</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Ch</source>
         <translation type="unfinished">Ch</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Port</source>
         <translation type="unfinished">Puerto</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>LV1</source>
         <translation type="unfinished">VL1</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>LV2</source>
         <translation type="unfinished">VL2</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>LV3</source>
         <translation type="unfinished">VL3</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>LV4</source>
         <translation type="unfinished">VL4</translation>
     </message>
     <message>
+        <location line="-260"/>
         <source>&amp;File</source>
         <translation type="unfinished">&amp;Fichero</translation>
     </message>
     <message>
+        <location line="+110"/>
         <source>Load Drummap</source>
         <translation type="unfinished">Cargar mapa de percusión</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Store Drummap</source>
         <translation type="unfinished">Guardar mapa de percusión</translation>
     </message>
     <message>
+        <location line="+68"/>
         <source>ctrl</source>
         <translation type="unfinished">control</translation>
     </message>
@@ -2863,118 +2516,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
         <translation type="obsolete">mapas de percusión</translation>
     </message>
     <message>
+        <location line="+459"/>
         <source>Muse: Load Drum Map</source>
         <translation type="unfinished">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>
     </message>
     <message>
-        <source>Set fixed length</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="-631"/>
         <source>&amp;Functions</source>
         <translation type="unfinished">&amp;Funciones</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Modify Velocity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-142"/>
+        <location line="+21"/>
         <source>mute instrument</source>
         <translation type="unfinished">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>
     </message>
     <message>
+        <location line="-20"/>
+        <location line="+21"/>
         <source>quantisation</source>
         <translation type="unfinished">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>
     </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>
     </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="+41"/>
         <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="+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="+2"/>
+        <source>Crescendo/Decrescendo</source>
+        <translation type="unfinished"></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="+9"/>
         <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>
+    </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="+471"/>
         <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>
@@ -2982,14 +2716,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
 <context>
     <name>EditCAfterDialog</name>
     <message>
+        <location filename="../../muse/liste/editevent.cpp" line="+430"/>
         <source>Time Position</source>
         <translation type="unfinished">Posición de tiempo</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Pressure</source>
         <translation type="unfinished">Presión</translation>
     </message>
     <message>
+        <location line="-6"/>
         <source>MusE: Enter Channel Aftertouch</source>
         <translation type="unfinished">MusE: Introduce el AfterTouch del canal</translation>
     </message>
@@ -3070,58 +2807,73 @@ 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>EditCtrlBase</name>
     <message>
+        <location filename="../../muse/liste/editctrlbase.ui" line="+14"/>
         <source>MusE: Edit Controller Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Time Position</source>
         <translation type="unfinished">Posición de tiempo</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Available Controller:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Create New Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+486"/>
         <source>textLabel3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Value</source>
         <translation type="unfinished">Valor</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Controller</source>
         <translation type="unfinished">Controlador</translation>
     </message>
     <message>
+        <location line="+45"/>
         <source>H-Bank</source>
         <translation type="unfinished">Banco-H</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>L-Bank</source>
         <translation type="unfinished">Banco-L</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Program</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
+        <location line="+16"/>
         <source>off</source>
         <translation type="unfinished">apagado</translation>
     </message>
     <message>
+        <location line="+42"/>
         <source>pushButton4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+35"/>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished">&amp;Cancelar</translation>
     </message>
@@ -3129,10 +2881,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 type="unfinished">Aceptar</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Cancel</source>
         <translation type="unfinished">Cancelar</translation>
     </message>
@@ -3140,46 +2894,57 @@ 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>EditGainBase</name>
     <message>
+        <location filename="../../muse/waveedit/editgainbase.ui" line="+14"/>
         <source>MusE: Modify gain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Gain</source>
         <translation type="unfinished">Ganancia</translation>
     </message>
     <message>
+        <location line="+51"/>
         <source>200%</source>
         <translation type="unfinished">5 1/3&apos; {200%?}</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>100%</source>
         <translation type="unfinished">5 1/3&apos; {100%?}</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>0%</source>
         <translation type="unfinished">5 1/3&apos; {0%?}</translation>
     </message>
     <message>
+        <location line="+51"/>
         <source>&amp;Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+39"/>
         <source>&amp;Apply</source>
         <translation type="unfinished">&amp;Aplicar</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+A</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished">&amp;Cancelar</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+C</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3187,131 +2952,178 @@ 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="+296"/>
+        <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>
-        <source>(You can override with the environment variable MUSEINSTRUMENTS)</source>
+        <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">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">&amp;Guardar</translation>
     </message>
     <message>
+        <location line="-5"/>
+        <location line="+5"/>
         <source>&amp;Nosave</source>
         <translation type="unfinished">&amp;No Guardar</translation>
     </message>
     <message>
+        <location line="-5"/>
         <source>&amp;Abort</source>
         <translation type="unfinished">&amp;Abortar</translation>
     </message>
@@ -3319,42 +3131,56 @@ Save Current Instrument?</source>
 <context>
     <name>EditInstrumentBase</name>
     <message>
+        <location filename="../../muse/instruments/editinstrumentbase.ui" line="+20"/>
         <source>MusE: Instrument Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+119"/>
         <source>High Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+52"/>
         <source>Low Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+52"/>
         <source>Program:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+141"/>
+        <location line="+747"/>
+        <location line="+201"/>
         <source>&amp;Delete</source>
         <translation type="unfinished">&amp;Borrar</translation>
     </message>
     <message>
+        <location line="-945"/>
+        <location line="+747"/>
+        <location line="+201"/>
         <source>Alt+D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-1035"/>
         <source>Drum</source>
         <translation type="unfinished">Percusión</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>GM</source>
         <translation type="unfinished">GM</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>GS</source>
         <translation type="unfinished">GS</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>XG</source>
         <translation type="unfinished">XG</translation>
     </message>
@@ -3363,12 +3189,15 @@ Save Current Instrument?</source>
         <translation type="obsolete">Controlador</translation>
     </message>
     <message>
+        <location line="+136"/>
         <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>
     </message>
     <message>
+        <location line="-368"/>
+        <location line="+441"/>
         <source>Properties</source>
         <translation type="unfinished">Propiedades</translation>
     </message>
@@ -3381,50 +3210,64 @@ handled like normal controllers.</source>
         <translation type="obsolete">Tipo</translation>
     </message>
     <message>
+        <location line="+49"/>
         <source>Control7</source>
         <translation type="unfinished">Control7 :-?</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Control14</source>
         <translation type="unfinished">Control14</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>RPN</source>
         <translation type="unfinished">RPN</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>NRPN</source>
         <translation type="unfinished">NRPN</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Pitch</source>
         <translation type="unfinished">Tono</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Program</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-118"/>
+        <location line="+142"/>
         <source>H-Ctrl</source>
         <translation type="unfinished">Control-H</translation>
     </message>
     <message>
+        <location line="-137"/>
+        <location line="+191"/>
         <source>L-Ctrl</source>
         <translation type="unfinished">Control-L</translation>
     </message>
     <message>
+        <location line="+79"/>
         <source>Min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+72"/>
         <source>Max</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-357"/>
         <source>Name                  </source>
         <translation type="unfinished">Nombre                  </translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Type       </source>
         <translation type="unfinished">Tipo                 </translation>
     </message>
@@ -3433,247 +3276,314 @@ handled like normal controllers.</source>
         <translation type="obsolete">Sistema Exclusivo</translation>
     </message>
     <message>
+        <location line="+802"/>
         <source>Hex Entry:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+90"/>
         <source>&amp;File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-27"/>
         <source>Tools</source>
         <translation type="unfinished">Herramientas</translation>
     </message>
     <message>
+        <location line="+49"/>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;New</source>
         <translation type="unfinished">&amp;Nuevo</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>Open</source>
         <translation type="unfinished">Abrir</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Open...</source>
         <translation type="unfinished">&amp;Abrir...</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Ctrl+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>Save</source>
         <translation type="unfinished">Guardar</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Save</source>
         <translation type="unfinished">&amp;Guardar</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Save As</source>
         <translation type="unfinished">Guardar como</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>Save &amp;As...</source>
         <translation type="unfinished">Guardar &amp;Como...</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Exit</source>
         <translation type="unfinished">Salir</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>E&amp;xit</source>
         <translation type="unfinished">&amp;Salir</translation>
     </message>
     <message>
+        <location line="-1448"/>
         <source>Instrument Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Selected instrument name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>List of defined instruments.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Pa&amp;tches</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>List of groups and patches.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Group/Patch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+15"/>
+        <location line="+443"/>
+        <location line="+742"/>
         <source>Name:</source>
         <translation type="unfinished">Nombre:</translation>
     </message>
     <message>
+        <location line="-1175"/>
+        <location line="+3"/>
         <source>Group or patch name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Patch high bank number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Patch high bank number. --- means don&apos;t care.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>---</source>
         <comment>dont care</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+46"/>
         <source>Patch low bank number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Patch low bank number. --- means don&apos;t care.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>---</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+46"/>
+        <location line="+3"/>
         <source>Patch program number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+36"/>
         <source>Drum patch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>If set, the patch is available only for drum channels.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>GM patch</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+13"/>
         <source>GS patch</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+10"/>
         <source>XG patch</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+39"/>
         <source>Delete group or patch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>New patch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>New &amp;Patch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+P</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>New group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>New &amp;Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+G</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+30"/>
         <source>Contro&amp;ller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Common:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>List of defined controllers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>List of defined controllers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>Min  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Max  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Def  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+35"/>
         <source>Midi controller name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Type:</source>
         <translation type="unfinished">Tipo:</translation>
     </message>
     <message>
+        <location line="+10"/>
+        <location line="+3"/>
         <source>Midi controller type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+24"/>
         <source>RPN14</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>NRPN14</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+53"/>
+        <location line="+3"/>
         <source>Midi controller number high byte</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+51"/>
         <source>Midi controller number low byte (* means drum controller)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Midi controller number low byte. 
 If low byte is * then the controller is a 
  &apos;drum controller&apos;. For drum tracks and 
@@ -3686,19 +3596,23 @@ Examples: The GS and XG instruments&apos;
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>*</source>
         <comment>wild card</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Range:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+48"/>
         <source>Minimum value. If negative, auto-translate.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Minimum value. If the minimum value 
  is negative, the range will automatically
  be translated to a positive range. 
@@ -3721,38 +3635,52 @@ True range: Min: -8192 Max: 8191 (bias 0)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+69"/>
+        <location line="+3"/>
         <source>Maximum value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+36"/>
         <source>Default:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>L-Bank</source>
         <translation type="unfinished">Banco-L</translation>
     </message>
     <message>
+        <location line="+10"/>
+        <location line="+16"/>
+        <location line="+26"/>
+        <location line="+198"/>
+        <location line="+53"/>
         <source>off</source>
         <translation type="unfinished">apagado</translation>
     </message>
     <message>
+        <location line="-261"/>
         <source>Progr.</source>
         <translation type="unfinished">Progr.</translation>
     </message>
     <message>
+        <location line="+35"/>
         <source>???</source>
         <translation type="unfinished">???</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>H-Bank</source>
         <translation type="unfinished">Banco-H</translation>
     </message>
     <message>
+        <location line="+44"/>
         <source>Default value. Off: No default.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Default (initial) value. Off means no default.
 
 If a default value is chosen, the value will be sent
@@ -3771,47 +3699,59 @@ Caution! Watch out for controllers such as
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>off</source>
         <comment>dont care</comment>
         <translation type="unfinished">apagado</translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Add common controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+A</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Delete controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Create a new controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>New &amp;Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Null Param Hi:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Null parameter number High byte</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
+        <location line="+53"/>
         <source>If set, these &apos;null&apos; parameter numbers will 
  be sent after each RPN/NRPN event. 
 This prevents subsequent &apos;data&apos; events
@@ -3821,38 +3761,49 @@ Typically, set to 127/127, or an unused
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-13"/>
         <source> Lo:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Null parameter number Low byte</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+34"/>
         <source>S&amp;ysEx</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>SysEx List:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+62"/>
         <source>New SysE&amp;x</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+X</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+73"/>
         <source>&amp;Help</source>
         <translation type="unfinished">A&amp;yuda</translation>
     </message>
     <message>
+        <location line="+84"/>
+        <location line="+3"/>
         <source>new item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+8"/>
+        <location line="+3"/>
         <source>What&apos;s this?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3860,18 +3811,22 @@ 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 type="unfinished">Posición de tiempo</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Meta Type</source>
         <translation type="unfinished">Tipo de Meta</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Enter Hex</source>
         <translation type="unfinished">Introduzca en Hexadecimal</translation>
     </message>
     <message>
+        <location line="-18"/>
         <source>MusE: Enter Meta Event</source>
         <translation type="unfinished">MusE: Introduzca evento Meta</translation>
     </message>
@@ -3910,34 +3865,42 @@ Typically, set to 127/127, or an unused
 <context>
     <name>EditNoteDialogBase</name>
     <message>
+        <location filename="../../muse/widgets/editnotedialogbase.ui" line="+14"/>
         <source>MusE: Enter Note</source>
         <translation type="unfinished">MusE: Escribe Nota</translation>
     </message>
     <message>
+        <location line="+39"/>
         <source>OK</source>
         <translation type="unfinished">Aceptar</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Cancel</source>
         <translation type="unfinished">Cancelar</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Length:</source>
         <translation type="unfinished">Longitud:</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Time Position:</source>
         <translation type="unfinished">Posición de tiempo</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Pitch:</source>
         <translation type="unfinished">Tono:</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Velocity On:</source>
         <translation type="unfinished">Velocidad On:</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Velocity Off:</source>
         <translation type="unfinished">Velocidad Off:</translation>
     </message>
@@ -3945,18 +3908,22 @@ 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 type="unfinished">Posición de tiempo</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Pitch</source>
         <translation type="unfinished">Tono</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Pressure</source>
         <translation type="unfinished">Presión</translation>
     </message>
     <message>
+        <location line="-8"/>
         <source>MusE: Enter Poly Aftertouch</source>
         <translation type="unfinished">Muse: Escribe el aftertouch polifónico</translation>
     </message>
@@ -3979,22 +3946,27 @@ Typically, set to 127/127, or an unused
 <context>
     <name>EditSysexDialogBase</name>
     <message>
+        <location filename="../../muse/widgets/editsysexdialogbase.ui" line="+14"/>
         <source>MusE: Enter SysEx</source>
         <translation type="unfinished">MusE: Introduce el sistema exclusivo</translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>TimePosition:</source>
         <translation type="unfinished">Posición de tiempo:</translation>
     </message>
     <message>
+        <location line="+48"/>
         <source>Comment:</source>
         <translation type="unfinished">Comentario:</translation>
     </message>
     <message>
+        <location line="+37"/>
         <source>OK</source>
         <translation type="unfinished">Aceptar</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Cancel</source>
         <translation type="unfinished">Cancelar</translation>
     </message>
@@ -4002,6 +3974,7 @@ Typically, set to 127/127, or an unused
 <context>
     <name>EditToolBar</name>
     <message>
+        <location filename="../../muse/widgets/tools.cpp" line="+17"/>
         <source>Edit Tools</source>
         <translation type="unfinished">Editar herramientas</translation>
     </message>
@@ -4009,54 +3982,67 @@ Typically, set to 127/127, or an unused
 <context>
     <name>EffectRack</name>
     <message>
+        <location filename="../../muse/mixer/rack.cpp" line="+102"/>
         <source>effect rack</source>
         <translation type="unfinished">rack de efectos</translation>
     </message>
     <message>
+        <location line="+84"/>
         <source>move up</source>
         <translation type="unfinished">subir</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>move down</source>
         <translation type="unfinished">bajar</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>remove</source>
         <translation type="unfinished">quitar</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>bypass</source>
         <translation type="unfinished">saltar</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>show gui</source>
         <translation type="unfinished">mostrar gui</translation>
     </message>
     <message>
+        <location line="-6"/>
         <source>new</source>
         <translation type="unfinished">nuevo</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>change</source>
         <translation type="unfinished">cambiar</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>show native gui</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>save preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+138"/>
         <source>MusE: Save Preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+143"/>
         <source>Replace effect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>Do you really want to replace the effect %1?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4064,6 +4050,7 @@ Typically, set to 127/127, or an unused
 <context>
     <name>FLUIDGui</name>
     <message>
+        <location filename="../../synti/fluid/fluidgui.cpp" line="+55"/>
         <source>FLUID: open Soundfile</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4071,14 +4058,17 @@ Typically, set to 127/127, or an unused
 <context>
     <name>FLUIDGuiBase</name>
     <message>
+        <location filename="../../synti/fluid/fluidguibase.ui" line="+14"/>
         <source>Form1</source>
         <translation type="unfinished">Formulario1</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Soundfont</source>
         <translation type="unfinished">Fuente de sonido</translation>
     </message>
     <message>
+        <location line="+52"/>
         <source>Load</source>
         <translation type="unfinished">Cargar</translation>
     </message>
@@ -4086,98 +4076,123 @@ Typically, set to 127/127, or an unused
 <context>
     <name>FLUIDSynthGuiBase</name>
     <message>
+        <location filename="../../synti/fluidsynth/fluidsynthguibase.ui" line="+14"/>
         <source>FLUID Synth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Load</source>
         <translation type="unfinished">Cargar</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Delete</source>
         <translation type="unfinished">Borrar</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Dump Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Fontname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Chnl</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Soundfont</source>
         <translation type="unfinished">Fuente de sonido</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Drum Chnl</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+108"/>
+        <location line="+235"/>
         <source>Level</source>
         <translation type="unfinished">Nivel</translation>
     </message>
     <message>
+        <location line="-222"/>
         <source>Width</source>
         <translation type="unfinished">Anchura</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Damping</source>
         <translation type="unfinished">Amortiguamiento</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Room Size</source>
         <translation type="unfinished">Tamaño sala</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Reverb</source>
         <translation type="unfinished">Reverberación</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>CHANNEL SETUP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>Sine</source>
         <translation type="unfinished">Seno</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Triangle</source>
         <translation type="unfinished">Triángulo</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Type</source>
         <translation type="unfinished">Tipo</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Number</source>
         <translation type="unfinished">Número</translation>
     </message>
     <message>
+        <location line="+35"/>
         <source>Speed</source>
         <translation type="unfinished">Velocidad</translation>
     </message>
     <message>
+        <location line="+35"/>
         <source>Depth</source>
         <translation type="unfinished">Profundidad</translation>
     </message>
     <message>
+        <location line="+48"/>
         <source>Chorus</source>
         <translation type="unfinished">Coro ;-)</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Gain</source>
         <translation type="unfinished">Ganancia</translation>
     </message>
     <message>
+        <location line="+50"/>
         <source>LOADED SOUNDFONTS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4189,27 +4204,33 @@ Typically, set to 127/127, or an unused
         <translation type="obsolete">Formulario1</translation>
     </message>
     <message>
+        <location filename="../../muse/widgets/fdialogbuttons.ui" line="+38"/>
         <source>Global</source>
         <translation type="unfinished">Global</translation>
     </message>
     <message>
+        <location line="+25"/>
         <source>User</source>
         <translation type="unfinished">Usuario</translation>
     </message>
     <message>
+        <location line="+25"/>
         <source>Project</source>
         <translation type="unfinished">Proyecto</translation>
     </message>
     <message>
+        <location line="+55"/>
         <source>only
 Songdata</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-129"/>
         <source>fdialogbuttons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+121"/>
         <source>Songdata +
 Configuration</source>
         <translation type="unfinished"></translation>
@@ -4218,6 +4239,7 @@ Configuration</source>
 <context>
     <name>FluidSynthGui</name>
     <message>
+        <location filename="../../synti/fluidsynth/fluidsynthgui.cpp" line="+165"/>
         <source>Choose soundfont</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4233,72 +4255,86 @@ Configuration</source>
     <name>GateTimeBase</name>
     <message>
         <source>MusE: Modify Gate Time</source>
-        <translation type="unfinished">MusE: Modifica el timpo de puerta</translation>
+        <translation type="obsolete">MusE: Modifica el timpo de puerta</translation>
     </message>
     <message>
         <source>Range</source>
-        <translation type="unfinished">Rango</translation>
+        <translation type="obsolete">Rango</translation>
     </message>
     <message>
         <source>All Events</source>
-        <translation type="unfinished">Todos los eventos</translation>
+        <translation type="obsolete">Todos los eventos</translation>
     </message>
     <message>
         <source>Selected Events</source>
-        <translation type="unfinished">Eventos seleccionados</translation>
+        <translation type="obsolete">Eventos seleccionados</translation>
     </message>
     <message>
         <source>Looped Events</source>
-        <translation type="unfinished">Eventos en bucle</translation>
+        <translation type="obsolete">Eventos en bucle</translation>
     </message>
     <message>
         <source>Selected &amp; Looped</source>
-        <translation type="unfinished">Seleccionados y en bucle</translation>
+        <translation type="obsolete">Seleccionados y en bucle</translation>
     </message>
     <message>
         <source>Values</source>
-        <translation type="unfinished">Valores</translation>
+        <translation type="obsolete">Valores</translation>
     </message>
     <message>
         <source>Rate:</source>
-        <translation type="unfinished">Velocidad:</translation>
+        <translation type="obsolete">Velocidad:</translation>
     </message>
     <message>
         <source>Offset:</source>
-        <translation type="unfinished">Desplazamiento:</translation>
+        <translation type="obsolete">Desplazamiento:</translation>
     </message>
     <message>
         <source>%</source>
-        <translation type="unfinished">%</translation>
+        <translation type="obsolete">%</translation>
     </message>
     <message>
         <source>OK</source>
-        <translation type="unfinished">Aceptar</translation>
+        <translation type="obsolete">Aceptar</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="unfinished">Cancelar</translation>
+        <translation type="obsolete">Cancelar</translation>
+    </message>
+</context>
+<context>
+    <name>GlobalSettingsConfig</name>
+    <message>
+        <location filename="../../muse/widgets/genset.cpp" line="+489"/>
+        <source>Selects instruments directory</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>GlobalSettingsDialogBase</name>
     <message>
+        <location filename="../../muse/widgets/gensetbase.ui" line="+14"/>
         <source>MusE: Global Settings</source>
         <translation type="unfinished">MusE: Valores globales</translation>
     </message>
     <message>
+        <location line="+530"/>
         <source>Audio</source>
         <translation type="unfinished">Audio</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Mixer</source>
         <translation type="unfinished">Mezclador</translation>
     </message>
     <message>
+        <location line="+21"/>
+        <location line="+39"/>
         <source>dB</source>
         <translation type="unfinished">dB</translation>
     </message>
     <message>
+        <location line="-20"/>
         <source>min. Meter Value</source>
         <translation type="unfinished">valor mínimo del vumeter</translation>
     </message>
@@ -4307,22 +4343,31 @@ Configuration</source>
         <translation type="obsolete">valor mínimo del desplazador</translation>
     </message>
     <message>
+        <location line="+406"/>
         <source>Midi</source>
         <translation type="unfinished">MIDI</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Ticks</source>
         <translation type="unfinished">Ticks</translation>
     </message>
     <message>
+        <location line="-223"/>
+        <location line="+194"/>
+        <location line="+47"/>
         <source>1024</source>
         <translation type="unfinished">1024</translation>
     </message>
     <message>
+        <location line="-236"/>
+        <location line="+194"/>
+        <location line="+47"/>
         <source>2048</source>
         <translation type="unfinished">2048</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>4096</source>
         <translation type="unfinished">4096</translation>
     </message>
@@ -4331,74 +4376,116 @@ Configuration</source>
         <translation type="obsolete">8172</translation>
     </message>
     <message>
+        <location line="+86"/>
         <source>Displayed Resolution
 (Ticks/Quarternote)</source>
         <translation type="unfinished">Resolución mostrada
 (ticks/negra)</translation>
     </message>
     <message>
+        <location line="-48"/>
+        <location line="+63"/>
         <source>48</source>
         <translation type="unfinished">48</translation>
     </message>
     <message>
+        <location line="-58"/>
+        <location line="+63"/>
         <source>96</source>
         <translation type="unfinished">96</translation>
     </message>
     <message>
+        <location line="-58"/>
+        <location line="+63"/>
         <source>192</source>
         <translation type="unfinished">192</translation>
     </message>
     <message>
+        <location line="-58"/>
+        <location line="+63"/>
         <source>384</source>
         <translation type="unfinished">384</translation>
     </message>
     <message>
+        <location line="-58"/>
+        <location line="+63"/>
         <source>768</source>
         <translation type="unfinished">768</translation>
     </message>
     <message>
+        <location line="-58"/>
+        <location line="+63"/>
         <source>1536</source>
         <translation type="unfinished">1536</translation>
     </message>
     <message>
+        <location line="-58"/>
+        <location line="+63"/>
         <source>3072</source>
         <translation type="unfinished">3072</translation>
     </message>
     <message>
+        <location line="-58"/>
+        <location line="+63"/>
         <source>6144</source>
         <translation type="unfinished">6144</translation>
     </message>
     <message>
+        <location line="-58"/>
+        <location line="+63"/>
         <source>12288</source>
         <translation type="unfinished">12288</translation>
     </message>
     <message>
+        <location line="-163"/>
         <source>RTC Resolution
 (Ticks/Sec)</source>
         <translation type="unfinished">Resolución del reloj
 (Ticks/segundo)</translation>
     </message>
     <message>
+        <location line="+212"/>
         <source>GUI</source>
         <translation type="unfinished">GUI</translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>/sec</source>
         <translation type="unfinished">/seg</translation>
     </message>
     <message>
+        <location line="-10"/>
         <source>GUI Refresh Rate</source>
         <translation type="unfinished">Velocidad de refresco del GUI</translation>
     </message>
     <message>
+        <location line="+72"/>
+        <source>Use project save dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>Some popup menus stay open (else hold Ctrl)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Allows some popup menus to stay open.
+Otherwise, hold Ctrl to keep them open.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
         <source>&amp;Apply</source>
         <translation type="unfinished">&amp;Aplicar</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>&amp;Ok</source>
         <translation type="unfinished">Ac&amp;eptar</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished">&amp;Cancelar</translation>
     </message>
@@ -4407,222 +4494,361 @@ Configuration</source>
         <translation type="obsolete">Navegador de ayuda:</translation>
     </message>
     <message>
+        <location line="-1385"/>
         <source>Application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+389"/>
         <source>Start Muse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+47"/>
         <source>start with last song</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>start with song</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-47"/>
         <source>start song:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-403"/>
         <source>Views</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+6"/>
+        <location line="+47"/>
+        <location line="+37"/>
+        <location line="+144"/>
+        <location line="+56"/>
         <source>y-pos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-274"/>
+        <location line="+57"/>
+        <location line="+47"/>
+        <location line="+7"/>
         <source>show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-104"/>
+        <location line="+40"/>
+        <location line="+17"/>
+        <location line="+164"/>
+        <location line="+56"/>
         <source>x-pos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-267"/>
+        <location line="+77"/>
+        <location line="+104"/>
+        <location line="+56"/>
         <source>height</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-227"/>
+        <location line="+57"/>
+        <location line="+124"/>
+        <location line="+56"/>
         <source>width</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-108"/>
         <source>Big Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Arranger</source>
         <translation type="unfinished">Arreglador</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Transport</source>
         <translation type="unfinished">Transporte</translation>
     </message>
     <message>
+        <location line="+59"/>
+        <location line="+56"/>
+        <location line="+16"/>
+        <location line="+16"/>
+        <location line="+16"/>
         <source>Cur</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-107"/>
+        <location line="+56"/>
+        <location line="+16"/>
+        <location line="+16"/>
+        <location line="+16"/>
         <source>set current values</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+76"/>
         <source>start with template: default.med</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>show splash screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-326"/>
         <source>Mixer A</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Mixer B</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+317"/>
         <source>show &quot;Did you know?&quot; dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-55"/>
         <source>Start song</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+140"/>
         <source>min. Slider Val</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use Jack freewheel mode if possible.
-(Speeds up bounce operations).</source>
+        <location line="+60"/>
+        <source>Enable denormal protection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable denormal protection</source>
+        <location line="+10"/>
+        <source>Enable output limiter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable output limiter</source>
+        <location line="+131"/>
+        <source>External Waveditor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable in-place processing for VST plugins.
-(Requires restart.)</source>
+        <location line="+25"/>
+        <source>External Waveditor command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Turn this off if VST Ladspa effect rack plugins do not work or feedback loudly, even if they are supposed to be in-place capable.</source>
+        <location line="+44"/>
+        <source>Note: External editor opened from the internal editor.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>External Waveditor</source>
+        <location line="+15"/>
+        <source>Dummy Audio Driver (settings require restart)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>External Waveditor command</source>
+        <location line="+31"/>
+        <source>Hz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Note: External editor opened from the internal editor.</source>
+        <location line="+19"/>
+        <source>Period size (Frames per period):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dummy Audio Driver (settings require restart)</source>
+        <location line="-180"/>
+        <location line="+194"/>
+        <source>16</source>
+        <translation type="unfinished">16</translation>
+    </message>
+    <message>
+        <location line="-320"/>
+        <source>Try to use Jack Freewheel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Preferred sample rate</source>
+        <location line="+17"/>
+        <source>Speeds bounce operations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Actual rate used depends on limitations of
- timer used. If a high rate timer is available,
- short periods can be used with high sample rates. 
-Period affects midi playback resolution. 
-Shorter periods are desirable.</source>
+        <location line="+3"/>
+        <source>Use Jack Freewheel mode if possible.
+This dramatically speeds bounce operations.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Hz</source>
+        <location line="+38"/>
+        <source>VST in-place</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Actual rate used now (dummy or not):</source>
+        <location line="+10"/>
+        <source>Enable VST in-place processing (restart required)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>---</source>
+        <location line="+3"/>
+        <source>Enable VST in-place processing. Turn this off if 
+ 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>
     </message>
     <message>
-        <source>Period size (Frames per period):</source>
+        <location line="+13"/>
+        <source>Minimum control period</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>16</source>
-        <translation type="unfinished">16</translation>
+        <location line="+7"/>
+        <source>Minimum audio controller process period (samples).
+</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+4"/>
+        <source>Minimum audio controller process period (samples).
+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>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>1</source>
+        <translation type="unfinished">1</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>2</source>
+        <translation type="unfinished">2</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>4</source>
+        <translation type="unfinished">4</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>8</source>
+        <translation type="unfinished">8</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+194"/>
         <source>32</source>
         <translation type="unfinished">32</translation>
     </message>
     <message>
+        <location line="-189"/>
+        <location line="+194"/>
         <source>64</source>
         <translation type="unfinished">64</translation>
     </message>
     <message>
+        <location line="-189"/>
+        <location line="+194"/>
         <source>128</source>
         <translation type="unfinished">128</translation>
     </message>
     <message>
+        <location line="-189"/>
+        <location line="+194"/>
         <source>256</source>
         <translation type="unfinished">256</translation>
     </message>
     <message>
+        <location line="-189"/>
+        <location line="+194"/>
         <source>512</source>
         <translation type="unfinished">512</translation>
     </message>
     <message>
+        <location line="-68"/>
+        <source>Sample rate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>Shorter periods give better midi playback resolution.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+96"/>
         <source>8192</source>
         <translation type="unfinished">5 1/3&apos; {8192?}</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>16384</source>
         <translation type="unfinished">5 1/3&apos; {16384?}</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>32768</source>
         <translation type="unfinished">5 1/3&apos; {32768?}</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Midi Resolution
 (Ticks/Quarternote)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+126"/>
+        <source>Instruments Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+85"/>
         <source>Use old-style stop shortcut:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Move single armed track with selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-791"/>
         <source>On Launch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+736"/>
         <source>Behavior</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>Header</name>
+    <message>
+        <location filename="../../muse/widgets/header.cpp" line="+134"/>
+        <source>Track Info Columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>IIWUGuiBase</name>
     <message>
         <source>Form1</source>
@@ -4723,86 +4949,122 @@ Shorter periods are desirable.</source>
 <context>
     <name>LMaster</name>
     <message>
+        <location filename="../../muse/master/lmaster.cpp" line="+170"/>
         <source>new tempo</source>
         <translation type="unfinished">nuevo tempo</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>new signature</source>
         <translation type="unfinished">nuevo compás</translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Meter</source>
         <translation type="unfinished">Metrónomo</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Time</source>
         <translation type="unfinished">Tiempo</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Type</source>
         <translation type="unfinished">Tipo</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Value</source>
         <translation type="unfinished">Valor</translation>
     </message>
     <message>
+        <location line="-67"/>
         <source>MusE: Mastertrack</source>
         <translation type="unfinished">MusE: Pista maestra</translation>
     </message>
     <message>
+        <location line="+42"/>
         <source>Tempo</source>
         <translation type="unfinished">Tempo</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Timesig</source>
         <translation type="unfinished">compás</translation>
     </message>
     <message>
+        <location line="-37"/>
         <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="+20"/>
         <source>Master tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Edit tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+6"/>
+        <source>Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>new key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+370"/>
         <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>
@@ -4810,18 +5072,22 @@ Shorter periods are desirable.</source>
 <context>
     <name>ListEdit</name>
     <message>
+        <location filename="../../muse/liste/listedit.cpp" line="+470"/>
         <source>&amp;Edit</source>
         <translation type="unfinished">&amp;Editar</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Cut</source>
         <translation type="unfinished">Cortar</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Copy</source>
         <translation type="unfinished">Copiar</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Paste</source>
         <translation type="unfinished">Pegar</translation>
     </message>
@@ -4834,6 +5100,7 @@ Shorter periods are desirable.</source>
         <translation type="obsolete">Insertar herramientas</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Delete Events</source>
         <translation type="unfinished">Borrar eventos</translation>
     </message>
@@ -4842,6 +5109,7 @@ Shorter periods are desirable.</source>
         <translation type="obsolete">Insertar nota</translation>
     </message>
     <message>
+        <location line="-37"/>
         <source>insert Note</source>
         <translation type="unfinished">insertar Nota</translation>
     </message>
@@ -4850,6 +5118,7 @@ Shorter periods are desirable.</source>
         <translation type="obsolete">Insertar sistema exclusivo</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>insert SysEx</source>
         <translation type="unfinished">insertar sistema exclusivo</translation>
     </message>
@@ -4858,6 +5127,7 @@ Shorter periods are desirable.</source>
         <translation type="obsolete">Insertar controlador</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>insert Ctrl</source>
         <translation type="unfinished">insertar controlador</translation>
     </message>
@@ -4866,6 +5136,7 @@ Shorter periods are desirable.</source>
         <translation type="obsolete">Insertar Meta</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>insert Meta</source>
         <translation type="unfinished">insertar Meta</translation>
     </message>
@@ -4882,6 +5153,7 @@ Shorter periods are desirable.</source>
         <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>
     </message>
@@ -4890,14 +5162,17 @@ Shorter periods are desirable.</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>
     </message>
     <message>
+        <location line="+68"/>
         <source>Tick</source>
         <translation type="unfinished">Tick</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Bar</source>
         <translation type="unfinished">Compás</translation>
     </message>
@@ -4906,38 +5181,47 @@ Shorter periods are desirable.</source>
         <translation type="obsolete">Tip</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Ch</source>
         <translation type="unfinished">Cn</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">Lon</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Comment</source>
         <translation type="unfinished">Comentario</translation>
     </message>
     <message>
+        <location line="-32"/>
         <source>List tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Insert tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Type</source>
         <translation type="unfinished">Tipo</translation>
     </message>
@@ -4945,22 +5229,27 @@ Shorter periods are desirable.</source>
 <context>
     <name>MITTransposeBase</name>
     <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>
     </message>
     <message>
+        <location line="+12"/>
         <source>On</source>
         <translation type="unfinished">Encendido</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>TriggerKey</source>
         <translation type="unfinished">Tecla de salto</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Transpose:</source>
         <translation type="unfinished">Trasponer:</translation>
     </message>
     <message>
+        <location line="+31"/>
         <source>+0</source>
         <translation type="unfinished">+0</translation>
     </message>
@@ -4980,10 +5269,12 @@ Shorter periods are desirable.</source>
         <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>
     </message>
     <message>
+        <location line="+1"/>
         <source>GUI</source>
         <translation type="unfinished">GUI</translation>
     </message>
@@ -4992,14 +5283,17 @@ Shorter periods are desirable.</source>
         <translation type="obsolete">Grabar</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Instrument</source>
         <translation type="unfinished">Instrumento</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Device Name</source>
         <translation type="unfinished">Nombre de dispositivo</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>State</source>
         <translation type="unfinished">Estado</translation>
     </message>
@@ -5008,158 +5302,238 @@ Shorter periods are desirable.</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>
-        <source>Connect these to new midi tracks</source>
+        <location line="+1"/>
+        <source>Auto-connect these channels to new midi tracks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connect new midi tracks to this (first listed only)</source>
+        <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>
     </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>
     </message>
     <message>
-        <source>Connect these channels, on this port, to new midi tracks.
-Example:
- 1 2 3    channel 1 2 and 3
- 1-3      same
- 1-3 5    channel 1 2 3 and 5
- all      all channels
- none     no channels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connect new midi tracks to these channels, on this port.
-See default in channels.
-NOTE: Currently only one output port and channel supported (first found)</source>
-        <translation type="unfinished"></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>
     </message>
@@ -5167,41 +5541,55 @@ NOTE: Currently only one output port and channel supported (first found)</source
 <context>
     <name>MRConfigBase</name>
     <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>
     </message>
     <message>
+        <location line="+12"/>
         <source>Activate</source>
         <translation type="unfinished">Activar</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>On</source>
         <translation type="unfinished">Encendido</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Actions</source>
         <translation type="unfinished">Acciones</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Stop</source>
         <translation type="unfinished">Parar</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Record</source>
         <translation type="unfinished">Grabar</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Goto Left Mark</source>
         <translation type="unfinished">Ir ala marca izquierda</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Play</source>
         <translation type="unfinished">Reproducir</translation>
     </message>
+    <message>
+        <location line="+25"/>
+        <source>Insert rest (step rec) </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MTScale</name>
     <message>
+        <location filename="../../muse/widgets/mtscale.cpp" line="+27"/>
         <source>bar scale</source>
         <translation type="unfinished">escala de compases</translation>
     </message>
@@ -5209,30 +5597,37 @@ NOTE: Currently only one output port and channel supported (first found)</source
 <context>
     <name>MarkerView</name>
     <message>
+        <location filename="../../muse/marker/markerview.cpp" line="+197"/>
         <source>Bar:Beat:Tick</source>
         <translation type="unfinished">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>
     </message>
     <message>
+        <location line="+1"/>
         <source>Lock</source>
         <translation type="unfinished">Bloquear</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Text</source>
         <translation type="unfinished">Texto</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Marker Properties</source>
         <translation type="unfinished">Propiedades del marcador</translation>
     </message>
     <message>
+        <location line="-53"/>
         <source>MusE: Marker</source>
         <translation type="unfinished">MusE: Marcador</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>add marker</source>
         <translation type="unfinished">Agregar marcador</translation>
     </message>
@@ -5241,6 +5636,7 @@ NOTE: Currently only one output port and channel supported (first found)</source
         <translation type="obsolete">Agregar marcador</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>delete marker</source>
         <translation type="unfinished">borrar marcador</translation>
     </message>
@@ -5253,14 +5649,17 @@ NOTE: Currently only one output port and channel supported (first found)</source
         <translation type="obsolete">&amp;Archivo</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>&amp;Edit</source>
         <translation type="unfinished">&amp;Editar</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>marker-tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>edit tools</source>
         <translation type="unfinished">editar herramientas</translation>
     </message>
@@ -5268,30 +5667,37 @@ NOTE: Currently only one output port and channel supported (first found)</source
 <context>
     <name>MasterEdit</name>
     <message>
+        <location filename="../../muse/master/masteredit.cpp" line="-15"/>
         <source>Cursor</source>
         <translation type="unfinished">Cursor</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Snap</source>
         <translation type="unfinished">Snap</translation>
     </message>
     <message>
+        <location line="-10"/>
         <source>time at cursor position</source>
         <translation type="unfinished">tiempo en la posición del cursor</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>tempo at cursor position</source>
         <translation type="unfinished">tempo en la posición del cursor</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>CurPos </source>
         <translation type="unfinished">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>
     </message>
     <message>
+        <location line="+1"/>
         <source>time signature at current position</source>
         <translation type="unfinished">compás en la posición actual</translation>
     </message>
@@ -5300,6 +5706,7 @@ NOTE: Currently only one output port and channel supported (first found)</source
         <translation type="obsolete">Maestro</translation>
     </message>
     <message>
+        <location line="-58"/>
         <source>MusE: Mastertrack</source>
         <translation type="unfinished">Muse: Pista Maestra</translation>
     </message>
@@ -5316,6 +5723,7 @@ NOTE: Currently only one output port and channel supported (first found)</source
         <translation type="obsolete">usar pista maestra</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>Info</source>
         <translation type="unfinished">Info</translation>
     </message>
@@ -5324,18 +5732,22 @@ NOTE: Currently only one output port and channel supported (first found)</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="-10"/>
         <source>Master tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Enable master</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5343,114 +5755,142 @@ NOTE: Currently only one output port and channel supported (first found)</source
 <context>
     <name>MetronomeConfigBase</name>
     <message>
+        <location filename="../../muse/widgets/metronomebase.ui" line="+14"/>
         <source>MusE: Metronome Config</source>
         <translation type="unfinished">MusE: Configuración del metrónomo</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Metronome</source>
         <translation type="unfinished">Metrónomo</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Audio Beep</source>
         <translation type="unfinished">Bip de audio</translation>
     </message>
     <message>
+        <location line="+65"/>
         <source>MIDI Click</source>
         <translation type="unfinished">Click MIDI</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>Midi Channel</source>
         <translation type="unfinished">Canal MIDI</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Measure Note</source>
         <translation type="unfinished">Nota de compás</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Measure Velocity</source>
         <translation type="unfinished">Velocidad de compás</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Beat Velocity</source>
         <translation type="unfinished">Velocidad de barra</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Beat Note</source>
         <translation type="unfinished">Nota de barra</translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Midi Port</source>
         <translation type="unfinished">Puerto MIDI</translation>
     </message>
     <message>
+        <location line="+42"/>
         <source>Precount</source>
         <translation type="unfinished">Cuenta atrás</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>enable</source>
         <translation type="unfinished">habilitada</translation>
     </message>
     <message>
+        <location line="+34"/>
         <source>Bars</source>
         <translation type="unfinished">Compases</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>From Mastertrack</source>
         <translation type="unfinished">desde la pista Mestra</translation>
     </message>
     <message>
+        <location line="+34"/>
         <source>/</source>
         <translation type="unfinished">/</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>Signature</source>
         <translation type="unfinished">compás</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Prerecord</source>
         <translation type="unfinished">pre-captura</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Preroll</source>
         <translation type="unfinished">pre-escucha</translation>
     </message>
     <message>
+        <location line="+38"/>
         <source>&amp;Apply</source>
         <translation type="unfinished">&amp;Aplicar</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>&amp;OK</source>
         <translation type="unfinished">Ac&amp;eptar</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished">&amp;Cancelar</translation>
     </message>
     <message>
+        <location line="-425"/>
         <source>Choose outputs...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+36"/>
         <source>50</source>
         <translation type="unfinished">5 1/3&apos; {50?}</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>% Audio volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+324"/>
         <source>Hint: Enable metronome in Transportpanel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>Alt+A</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Alt+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Alt+C</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5476,8 +5916,9 @@ NOTE: Currently only one output port and channel supported (first found)</source
 <context>
     <name>MidiControllerEditDialogBase</name>
     <message>
+        <location filename="../../muse/instruments/ccontrolbase.ui" line="+16"/>
         <source>MusE: Define Midi Controller</source>
-        <translation type="obsolete">MusE: Define controlador MIDI</translation>
+        <translation type="unfinished">MusE: Define controlador MIDI</translation>
     </message>
     <message>
         <source>replace controller set</source>
@@ -5492,68 +5933,143 @@ NOTE: Currently only one output port and channel supported (first found)</source
         <translation type="obsolete">guardar conjunto de controladores como</translation>
     </message>
     <message>
+        <location line="+127"/>
         <source>Name                  </source>
-        <translation type="obsolete">Nombre                  </translation>
+        <translation type="unfinished">Nombre                  </translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Type       </source>
-        <translation type="obsolete">Tipo                 </translation>
+        <translation type="unfinished">Tipo                 </translation>
     </message>
     <message>
+        <location line="+11"/>
+        <location line="+266"/>
         <source>H-Ctrl</source>
-        <translation type="obsolete">Control-H</translation>
+        <translation type="unfinished">Control-H</translation>
     </message>
     <message>
+        <location line="-255"/>
+        <location line="+283"/>
         <source>L-Ctrl</source>
-        <translation type="obsolete">Control-L</translation>
+        <translation type="unfinished">Control-L</translation>
     </message>
     <message>
+        <location line="-272"/>
         <source>Min Val</source>
-        <translation type="obsolete">Valor mínimo</translation>
+        <translation type="unfinished">Valor mínimo</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Max Val</source>
-        <translation type="obsolete">Valor mínimo</translation>
+        <translation type="unfinished">Valor mínimo</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>list of defined controllers</source>
-        <translation type="obsolete">lista de controladores definidos</translation>
+        <translation type="unfinished">lista de controladores definidos</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>This is the MusE list of defined controllers.</source>
-        <translation type="obsolete">Esta es la lista de controladores definidos por MusE.</translation>
+        <translation type="unfinished">Esta es la lista de controladores definidos por MusE.</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Managed Controller for Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Channel</source>
+        <translation type="unfinished">Canal</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <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>
     </message>
     <message>
+        <location line="+10"/>
         <source>Properties</source>
-        <translation type="obsolete">Propiedades</translation>
+        <translation type="unfinished">Propiedades</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Name</source>
-        <translation type="obsolete">Nombre</translation>
+        <translation type="unfinished">Nombre</translation>
     </message>
     <message>
+        <location line="+38"/>
         <source>Max Value</source>
-        <translation type="obsolete">Valor mínimo</translation>
+        <translation type="unfinished">Valor mínimo</translation>
+    </message>
+    <message>
+        <location line="+81"/>
+        <source>Program</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>Midi Controller Number High Byte</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Midi Controller Number Low Byte</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Range</source>
+        <translation type="unfinished">Rango</translation>
     </message>
     <message>
+        <location line="-173"/>
         <source>Min Value</source>
-        <translation type="obsolete">Valor mínimo</translation>
+        <translation type="unfinished">Valor mínimo</translation>
     </message>
     <message>
+        <location line="-266"/>
+        <source>&amp;Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Alt+A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+60"/>
+        <source>A&amp;pply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Predefined Controller:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+247"/>
         <source>Control7</source>
-        <translation type="obsolete">Control7 :-?</translation>
+        <translation type="unfinished">Control7 :-?</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Control14</source>
-        <translation type="obsolete">Control14</translation>
+        <translation type="unfinished">Control14</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>RPN</source>
-        <translation type="obsolete">RPN</translation>
+        <translation type="unfinished">RPN</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>NRPN</source>
-        <translation type="obsolete">NRPN</translation>
+        <translation type="unfinished">NRPN</translation>
     </message>
     <message>
         <source>XG-SysEx</source>
@@ -5564,42 +6080,60 @@ NOTE: Currently only one output port and channel supported (first found)</source
         <translation type="obsolete">Sistema Exclusivo</translation>
     </message>
     <message>
+        <location line="-34"/>
         <source>Type</source>
-        <translation type="obsolete">Tipo</translation>
+        <translation type="unfinished">Tipo</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation type="obsolete">&amp;Nuevo</translation>
     </message>
     <message>
+        <location line="-306"/>
         <source>create new entry</source>
-        <translation type="obsolete">crear entrada nueva</translation>
+        <translation type="unfinished">crear entrada nueva</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>pressing the New button you create a new entry
 in the MusE list of defined controllers</source>
-        <translation type="obsolete">pulsando el botón se creará una nueva
+        <translation type="unfinished">pulsando el botón se creará una nueva
 clase de controladores en la lista de MusE.</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>&amp;Delete</source>
-        <translation type="obsolete">&amp;Borrar</translation>
+        <translation type="unfinished">&amp;Borrar</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>delete selected entry</source>
-        <translation type="obsolete">borra la clase seleccionada</translation>
+        <translation type="unfinished">borra la clase seleccionada</translation>
     </message>
     <message>
+        <location line="+25"/>
         <source>&amp;OK</source>
-        <translation type="obsolete">&amp;Aceptar</translation>
+        <translation type="unfinished">&amp;Aceptar</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>&amp;Cancel</source>
-        <translation type="obsolete">&amp;Cancelar</translation>
+        <translation type="unfinished">&amp;Cancelar</translation>
     </message>
     <message>
+        <location line="+280"/>
+        <source>RPN14</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>NRPN14</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>Pitch</source>
-        <translation type="obsolete">Tono</translation>
+        <translation type="unfinished">Tono</translation>
     </message>
 </context>
 <context>
@@ -5628,114 +6162,149 @@ clase de controladores en la lista de MusE.</translation>
 <context>
     <name>MidiFilterConfigBase</name>
     <message>
+        <location filename="../../muse/mplugins/midifilter.ui" line="+20"/>
         <source>MusE:  Midi Input Filter</source>
         <translation type="unfinished">MusE:  Filtro de entrada MIDI</translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Record Filter</source>
         <translation type="unfinished">Filtro de captura</translation>
     </message>
     <message>
+        <location line="+18"/>
+        <location line="+112"/>
         <source>Note On</source>
         <translation type="unfinished">Nota on</translation>
     </message>
     <message>
+        <location line="-99"/>
+        <location line="+112"/>
         <source>Poly Pressure</source>
         <translation type="unfinished">Presión polifónica</translation>
     </message>
     <message>
+        <location line="-99"/>
+        <location line="+112"/>
         <source>Controller</source>
         <translation type="unfinished">Caontrolador</translation>
     </message>
     <message>
+        <location line="-99"/>
+        <location line="+112"/>
         <source>Program Change</source>
         <translation type="unfinished">Cambio de programa</translation>
     </message>
     <message>
+        <location line="-99"/>
+        <location line="+112"/>
         <source>After Touch</source>
         <translation type="unfinished">After Touch</translation>
     </message>
     <message>
+        <location line="-99"/>
+        <location line="+112"/>
         <source>Pitch Bend</source>
         <translation type="unfinished">Rueda de bend</translation>
     </message>
     <message>
+        <location line="-99"/>
+        <location line="+112"/>
         <source>Sysex</source>
         <translation type="unfinished">Sistema exclusivo</translation>
     </message>
     <message>
+        <location line="-96"/>
         <source>Thru Filter</source>
         <translation type="unfinished">Filtro Thru</translation>
     </message>
     <message>
+        <location line="+112"/>
         <source>Controller Filter</source>
         <translation type="unfinished">Filtrar controlador</translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>Channel Filter</source>
         <translation type="unfinished">Filtro de canal</translation>
     </message>
     <message>
+        <location line="+24"/>
         <source>14</source>
         <translation type="unfinished">14</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>10</source>
         <translation type="unfinished">10</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>6</source>
         <translation type="unfinished">6</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>12</source>
         <translation type="unfinished">12</translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>4</source>
         <translation type="unfinished">4</translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>2</source>
         <translation type="unfinished">2</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>9</source>
         <translation type="unfinished">9</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>8</source>
         <translation type="unfinished">8</translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>3</source>
         <translation type="unfinished">3</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>13</source>
         <translation type="unfinished">13</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>15</source>
         <translation type="unfinished">15</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>16</source>
         <translation type="unfinished">16</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>7</source>
         <translation type="unfinished">7</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>11</source>
         <translation type="unfinished">11</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>5</source>
         <translation type="unfinished">5</translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>1</source>
         <translation type="unfinished">1</translation>
     </message>
@@ -5743,6 +6312,8 @@ clase de controladores en la lista de MusE.</translation>
 <context>
     <name>MidiInputTransformDialog</name>
     <message>
+        <location filename="../../muse/mplugins/midiitransform.cpp" line="+703"/>
+        <location line="+2"/>
         <source>New</source>
         <translation type="unfinished">Nueva</translation>
     </message>
@@ -5750,214 +6321,334 @@ clase de controladores en la lista de MusE.</translation>
 <context>
     <name>MidiInputTransformDialogBase</name>
     <message>
+        <location filename="../../muse/widgets/itransformbase.ui" line="+14"/>
         <source>MusE: Midi Input Transformator</source>
         <translation type="unfinished">MusE: Transformador de entrada MIDI</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Filter</source>
         <translation type="unfinished">Filtrar</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>All</source>
         <translation type="unfinished">Todo</translation>
     </message>
     <message>
+        <location line="+5"/>
+        <location line="+91"/>
+        <location line="+60"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Equal</source>
         <translation type="unfinished">Igual</translation>
     </message>
     <message>
+        <location line="-224"/>
+        <location line="+91"/>
+        <location line="+60"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Unequal</source>
         <translation type="unfinished">Diferente</translation>
     </message>
     <message>
+        <location line="-217"/>
         <source>Note</source>
         <translation type="unfinished">Nota</translation>
     </message>
     <message>
+        <location line="+5"/>
+        <location line="+338"/>
         <source>Poly Pressure</source>
         <translation type="unfinished">Presión polifóica</translation>
     </message>
     <message>
+        <location line="-333"/>
+        <location line="+338"/>
         <source>Control Change</source>
         <translation type="unfinished">Cambio de control</translation>
     </message>
     <message>
+        <location line="-333"/>
+        <location line="+338"/>
         <source>Aftertouch</source>
         <translation type="unfinished">AfterTouch</translation>
     </message>
     <message>
+        <location line="-333"/>
+        <location line="+338"/>
         <source>Pitch Bend</source>
         <translation type="unfinished">Rueda de modulación</translation>
     </message>
     <message>
+        <location line="-333"/>
+        <location line="+338"/>
         <source>NRPN</source>
         <translation type="unfinished">NRPN</translation>
     </message>
     <message>
+        <location line="-333"/>
+        <location line="+338"/>
         <source>RPN</source>
         <translation type="unfinished">RPN</translation>
     </message>
     <message>
+        <location line="-330"/>
+        <location line="+369"/>
+        <location line="+43"/>
         <source>Value 2</source>
         <translation type="unfinished">Valor 2</translation>
     </message>
     <message>
+        <location line="-402"/>
+        <location line="+392"/>
+        <location line="+96"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Value 1</source>
         <translation type="unfinished">Valor 1</translation>
     </message>
     <message>
+        <location line="-586"/>
+        <location line="+257"/>
         <source>Event Type</source>
         <translation type="unfinished">Tipo de Evento</translation>
     </message>
     <message>
+        <location line="-246"/>
+        <location line="+60"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Ignore</source>
         <translation type="unfinished">Ignorar</translation>
     </message>
     <message>
+        <location line="-123"/>
+        <location line="+60"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Higher</source>
         <translation type="unfinished">Mayor</translation>
     </message>
     <message>
+        <location line="-133"/>
+        <location line="+60"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Lower</source>
         <translation type="unfinished">Menor</translation>
     </message>
     <message>
+        <location line="-133"/>
+        <location line="+60"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Inside</source>
         <translation type="unfinished">Entre</translation>
     </message>
     <message>
+        <location line="-133"/>
+        <location line="+60"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Outside</source>
         <translation type="unfinished">Fuera</translation>
     </message>
     <message>
+        <location line="+8"/>
+        <location line="+422"/>
         <source>Channel</source>
         <translation type="unfinished">Canal</translation>
     </message>
     <message>
+        <location line="-412"/>
+        <location line="+240"/>
         <source>Port</source>
         <translation type="unfinished">Puerto</translation>
     </message>
     <message>
+        <location line="-192"/>
         <source>Processing</source>
         <translation type="unfinished">Procesando</translation>
     </message>
     <message>
+        <location line="+23"/>
+        <location line="+51"/>
+        <location line="+129"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Keep</source>
         <translation type="unfinished">Mantener</translation>
     </message>
     <message>
+        <location line="-283"/>
+        <location line="+71"/>
+        <location line="+129"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Fix</source>
         <translation type="unfinished">Arreglar</translation>
     </message>
     <message>
+        <location line="-257"/>
+        <location line="+129"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Plus</source>
         <translation type="unfinished">Más</translation>
     </message>
     <message>
+        <location line="-232"/>
+        <location line="+129"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Minus</source>
         <translation type="unfinished">Menos</translation>
     </message>
     <message>
+        <location line="-232"/>
+        <location line="+129"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Multiply</source>
         <translation type="unfinished">Multiplicar</translation>
     </message>
     <message>
+        <location line="-232"/>
+        <location line="+129"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Divide</source>
         <translation type="unfinished">Dividir</translation>
     </message>
     <message>
+        <location line="-222"/>
+        <location line="+129"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Invert</source>
         <translation type="unfinished">Invertir</translation>
     </message>
     <message>
+        <location line="-232"/>
         <source>ScaleMap</source>
         <translation type="unfinished">Mapa de escalado</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Flip</source>
         <translation type="unfinished">cambiar</translation>
     </message>
     <message>
+        <location line="+5"/>
+        <location line="+119"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Dyn</source>
         <translation type="unfinished">Dinámico</translation>
     </message>
     <message>
+        <location line="-222"/>
+        <location line="+119"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Random</source>
         <translation type="unfinished">Aleatorio</translation>
     </message>
     <message>
+        <location line="+48"/>
         <source>Modules</source>
         <translation type="unfinished">Módulos</translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>1</source>
         <translation type="unfinished">1</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>2</source>
         <translation type="unfinished">2</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>3</source>
         <translation type="unfinished">3</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>4</source>
         <translation type="unfinished">4</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>enable modul 1</source>
         <translation type="unfinished">habilitar módulo 1</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>enable modul 2</source>
         <translation type="unfinished">habilitar módulo 2</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>enable modul 3</source>
         <translation type="unfinished">habilitar módulo 3</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>enable modul 4</source>
         <translation type="unfinished">habilitar módulo 4</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Preset</source>
         <translation type="unfinished">Preselección</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Name:</source>
         <translation type="unfinished">Nombre:</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>Comment:</source>
         <translation type="unfinished">Comentario:</translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>Function</source>
         <translation type="unfinished">Función</translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>&amp;New</source>
         <translation type="unfinished">&amp;Nueva</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>create new preset</source>
         <translation type="unfinished">crea nueva preselección</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>&amp;Delete</source>
         <translation type="unfinished">&amp;Borrar</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>delete preset</source>
         <translation type="unfinished">borra la preselección</translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>&amp;Dismiss</source>
         <translation type="unfinished">&amp;Ocultar</translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>PresetList</source>
         <translation type="unfinished">Lista de Preselecciones</translation>
     </message>
@@ -6067,50 +6758,64 @@ clase de controladores en la lista de MusE.</translation>
 <context>
     <name>MidiStrip</name>
     <message>
+        <location filename="../../muse/mixer/mstrip.cpp" line="+173"/>
         <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="-83"/>
+        <location line="+121"/>
+        <location line="+158"/>
         <source>off</source>
         <translation type="unfinished">apagado</translation>
     </message>
     <message>
+        <location line="-157"/>
         <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">Bal</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>record</source>
         <translation type="unfinished">grabar</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>mute</source>
         <translation type="unfinished">silencio</translation>
     </message>
@@ -6119,26 +6824,33 @@ clase de controladores en la lista de MusE.</translation>
         <translation type="obsolete">monitorizar pre fader</translation>
     </message>
     <message>
+        <location line="-206"/>
+        <location line="+122"/>
         <source>double click on/off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+105"/>
         <source>solo mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+67"/>
         <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">ruteado de entrada</translation>
     </message>
@@ -6146,111 +6858,142 @@ clase de controladores en la lista de MusE.</translation>
 <context>
     <name>MidiSyncConfig</name>
     <message>
+        <location filename="../../muse/widgets/midisyncimpl.cpp" line="+41"/>
+        <location line="+29"/>
         <source>Port Number</source>
         <translation type="unfinished">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>
     </message>
     <message>
+        <location line="-27"/>
         <source>Midi clock input detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <location line="+29"/>
         <source>Midi tick input detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-28"/>
         <source>Midi real time input detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>MMC input detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>MTC input detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Detected SMPTE format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Receive id number. 127 = Global. Double click to edit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Accept midi clock input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Accept midi real time input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Accept MMC input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Accept MTC input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Receive start rewinds before playing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Transmit id number. 127 = Global. Double click to edit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Send midi clock output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Send midi realtime output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <location line="+49"/>
         <source>Send MMC output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-48"/>
+        <location line="+49"/>
         <source>Send MTC output</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+3"/>
         <source>Midi realtime input detected, including
  start/stop/continue, and song position.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>MMC input detected, including stop/play/deferred play, and locate.</source>
         <translation type="unfinished"></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>
     </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>
     </message>
     <message>
+        <location line="+2"/>
         <source>Receive id number. 127 = global receive all, even if not global.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <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,
@@ -6260,6 +7003,7 @@ Click on detect indicator to force another.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Accept midi realtime input, including
  start/stop/continue, and song position.
 Non-clock events (start,stop etc) are
@@ -6270,30 +7014,36 @@ This means you may have several master
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Accept MMC input, including stop/play/deferred play, and locate.</source>
         <translation type="unfinished"></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>
     </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>
     </message>
     <message>
+        <location line="+3"/>
         <source>Transmit id number. 127 = global transmit to all.</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+2"/>
         <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
@@ -6303,103 +7053,128 @@ Note: It may be impossible to rewind fast
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+142"/>
         <source>Port</source>
         <translation type="unfinished">Puerto</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Device Name</source>
         <translation type="unfinished">Nombre de dispositivo</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>c</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>k</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>r</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>m</source>
         <translation type="unfinished">m</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>t</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>rid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>rc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>rr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>rm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>rt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>rw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>tid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>tc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>tr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>tm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>tt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+399"/>
         <source>MusE</source>
         <translation type="unfinished">MusE</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Settings have changed
 Apply sync settings?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>&amp;Apply</source>
         <translation type="unfinished">&amp;Aplicar</translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>&amp;No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>&amp;Abort</source>
         <translation type="unfinished">&amp;Abortar</translation>
     </message>
     <message>
+        <location line="+125"/>
         <source>&lt;none&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6407,70 +7182,87 @@ Apply sync settings?</source>
 <context>
     <name>MidiSyncConfigBase</name>
     <message>
+        <location filename="../../muse/widgets/midisync.ui" line="+17"/>
         <source>MusE: Midi Sync</source>
         <translation type="unfinished">MusE: Sincronización MIDI</translation>
     </message>
     <message>
+        <location line="+30"/>
         <source>Apply</source>
         <translation type="unfinished">Aplicar</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Ok</source>
         <translation type="unfinished">Aceptar</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Cancel</source>
         <translation type="unfinished">Cancelar</translation>
     </message>
     <message>
+        <location line="+99"/>
         <source>hour</source>
         <translation type="unfinished">hora</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>h</source>
         <translation type="unfinished">h</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>minute</source>
         <translation type="unfinished">minuto</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>m</source>
         <translation type="unfinished">m</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>second</source>
         <translation type="unfinished">segundo</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>s</source>
         <translation type="unfinished">s</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>frame</source>
         <translation type="unfinished">frame</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>f</source>
         <translation type="unfinished">f</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>subframe</source>
         <translation type="unfinished">sub-frame</translation>
     </message>
     <message>
+        <location line="-148"/>
         <source>24</source>
         <translation type="unfinished">24</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>25</source>
         <translation type="unfinished">25</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>30D</source>
         <translation type="unfinished">30D</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>30N</source>
         <translation type="unfinished">30N</translation>
     </message>
@@ -6539,39 +7331,48 @@ Apply sync settings?</source>
         <translation type="obsolete">todo</translation>
     </message>
     <message>
+        <location line="-46"/>
         <source>MTC</source>
         <translation type="unfinished">MTC</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>Type:</source>
         <translation type="unfinished">Tipo:</translation>
     </message>
     <message>
+        <location line="+60"/>
         <source>Offset:</source>
         <translation type="unfinished">Desplazamiento:</translation>
     </message>
     <message>
+        <location line="+117"/>
         <source>Sync receiving and sending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Send and receive Jack transport</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Send and receive Jack transport information,
  including stop, start and position.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Use Jack transport</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Make MusE the Jack transport Timebase Master</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Make MusE the Jack transport Timebase Master.
 Allows Jack to show time as 
  MusE Bars, Beats, and Ticks. 
@@ -6581,14 +7382,17 @@ You can always click here again for Master.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Jack transport Timebase Master</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Control MusE timing by external midi clock or MTC sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>When in slave mode, tempo is
  controlled externally.
 MusE can sync to midi clock, or MTC quarter frame sync. 
@@ -6597,14 +7401,17 @@ Enabled inputs in the list will
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Slave to external sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Send start to first clock delay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Allows &apos;slow sync&apos; devices time
  to synchronize to MusE. This value is the
  delay from sending start to sending
@@ -6612,10 +7419,12 @@ Enabled inputs in the list will
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>ms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Send sync delay</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6623,10 +7432,12 @@ Enabled inputs in the list will
 <context>
     <name>MidiTrackInfoBase</name>
     <message>
+        <location filename="../../muse/widgets/mtrackinfobase.ui" line="+38"/>
         <source>MusE: TrackInfo</source>
         <translation type="unfinished">MusE: Información de pista</translation>
     </message>
     <message>
+        <location line="+59"/>
         <source>output channel</source>
         <translation type="unfinished">canal de salida</translation>
     </message>
@@ -6639,6 +7450,8 @@ Enabled inputs in the list will
         <translation type="obsolete">Información de Pista</translation>
     </message>
     <message>
+        <location line="+249"/>
+        <location line="+91"/>
         <source>%</source>
         <translation type="unfinished">%</translation>
     </message>
@@ -6647,10 +7460,23 @@ Enabled inputs in the list will
         <translation type="obsolete">Nombre de Pista</translation>
     </message>
     <message>
+        <location line="-353"/>
         <source>output port</source>
         <translation type="unfinished">puerto de salida</translation>
     </message>
     <message>
+        <location line="+68"/>
+        <source>iR</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+109"/>
+        <location line="+44"/>
+        <location line="+287"/>
+        <location line="+53"/>
+        <location line="+53"/>
+        <location line="+67"/>
+        <location line="+70"/>
         <source>off</source>
         <translation type="unfinished">apagado</translation>
     </message>
@@ -6675,6 +7501,7 @@ Enabled inputs in the list will
         <translation type="obsolete">selecciona el grupo de instrumento</translation>
     </message>
     <message>
+        <location line="-552"/>
         <source>Transp.</source>
         <translation type="unfinished">Transposición</translation>
     </message>
@@ -6683,26 +7510,47 @@ Enabled inputs in the list will
         <translation type="obsolete">Volumen</translation>
     </message>
     <message>
+        <location line="+210"/>
         <source>Channel Info</source>
         <translation type="unfinished">Información de Canal</translation>
     </message>
     <message>
+        <location line="+35"/>
+        <source>Rec:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+200"/>
+        <source>Prog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+67"/>
+        <source>Vol</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+70"/>
         <source>Pan</source>
         <translation type="unfinished">Balance</translation>
     </message>
     <message>
+        <location line="-541"/>
         <source>Delay</source>
         <translation type="unfinished">Delay</translation>
     </message>
     <message>
+        <location line="+293"/>
         <source>H-Bank</source>
         <translation type="unfinished">Banco-H</translation>
     </message>
     <message>
+        <location line="-155"/>
         <source>Compr.</source>
         <translation type="unfinished">Compr.</translation>
     </message>
     <message>
+        <location line="+208"/>
         <source>L-Bank</source>
         <translation type="unfinished">Banco-L</translation>
     </message>
@@ -6711,10 +7559,12 @@ Enabled inputs in the list will
         <translation type="obsolete">Progr.</translation>
     </message>
     <message>
+        <location line="-255"/>
         <source>Velocity</source>
         <translation type="unfinished">Velocidad</translation>
     </message>
     <message>
+        <location line="-47"/>
         <source>Length</source>
         <translation type="unfinished">Longitud</translation>
     </message>
@@ -6750,108 +7600,119 @@ Puedes especificar más de un canal para grabar:
         <translation type="obsolete">Grabar</translation>
     </message>
     <message>
+        <location line="-268"/>
         <source>all midi events are sent to this output channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>Out ch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+27"/>
         <source>input routing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Inputs</source>
-        <translation type="unfinished">Entradas</translation>
+        <translation type="obsolete">Entradas</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>output routing</source>
         <translation type="unfinished">ruteado de entrada</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>oR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>input detect</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+5"/>
         <source>W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+25"/>
         <source>Midi thru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Pass input events through (&apos;thru&apos;) to output.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+288"/>
         <source>Select instrument patch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>&lt;unknown&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Record:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="+37"/>
         <source>Add all settings to song</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>All</source>
         <translation type="unfinished">Todo</translation>
     </message>
     <message>
+        <location line="+31"/>
         <source>Bank Select MSB. Double-click on/off.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+53"/>
         <source>Bank Select LSB. Double-click on/off.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+53"/>
         <source>Program. Double-click on/off.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>Add bank + prog settings to song</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Prog.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="+34"/>
         <source>Volume. Double-click on/off.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>Add vol setting to song</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Vol.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="+34"/>
+        <location line="+3"/>
         <source>Change stereo position. Double-click on/off.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>Add pan setting to song</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6859,230 +7720,345 @@ Puedes especificar más de un canal para grabar:
 <context>
     <name>MidiTransformDialogBase</name>
     <message>
+        <location filename="../../muse/widgets/transformbase.ui" line="+14"/>
         <source>MusE: Midi Transformator</source>
         <translation type="unfinished">MusE: Transformador MIDI</translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>&amp;New</source>
         <translation type="unfinished">&amp;Nueva</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>&amp;Delete</source>
         <translation type="unfinished">&amp;Borrar</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>&amp;Apply</source>
         <translation type="unfinished">&amp;Aplicar</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>&amp;OK</source>
         <translation type="unfinished">Ac&amp;eptar</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished">&amp;Cancelar</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>PresetList</source>
         <translation type="unfinished">Lista de preselecciones</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>Processing</source>
         <translation type="unfinished">Procesando</translation>
     </message>
     <message>
+        <location line="+12"/>
+        <location line="+425"/>
         <source>Event Type</source>
         <translation type="unfinished">Tipo de evento</translation>
     </message>
     <message>
+        <location line="-414"/>
+        <location line="+56"/>
+        <location line="+104"/>
+        <location line="+54"/>
+        <location line="+55"/>
         <source>Keep</source>
         <translation type="unfinished">Mantener</translation>
     </message>
     <message>
+        <location line="-264"/>
+        <location line="+76"/>
+        <location line="+104"/>
+        <location line="+54"/>
         <source>Fix</source>
         <translation type="unfinished">Arreglar</translation>
     </message>
     <message>
+        <location line="-222"/>
+        <location line="+339"/>
         <source>Note</source>
         <translation type="unfinished">Nota</translation>
     </message>
     <message>
+        <location line="-334"/>
+        <location line="+339"/>
         <source>Poly Pressure</source>
         <translation type="unfinished">Presión polifónica</translation>
     </message>
     <message>
+        <location line="-334"/>
+        <location line="+339"/>
         <source>Control Change</source>
         <translation type="unfinished">Cambio de control</translation>
     </message>
     <message>
+        <location line="-334"/>
+        <location line="+339"/>
         <source>Aftertouch</source>
         <translation type="unfinished">AfterTouch</translation>
     </message>
     <message>
+        <location line="-334"/>
+        <location line="+339"/>
         <source>Pitch Bend</source>
         <translation type="unfinished">Rueda de modulación</translation>
     </message>
     <message>
+        <location line="-334"/>
+        <location line="+339"/>
         <source>NRPN</source>
         <translation type="unfinished">NRPN</translation>
     </message>
     <message>
+        <location line="-334"/>
+        <location line="+339"/>
         <source>RPN</source>
         <translation type="unfinished">RPN</translation>
     </message>
     <message>
+        <location line="-325"/>
+        <location line="+104"/>
+        <location line="+54"/>
+        <location line="+55"/>
         <source>Plus</source>
         <translation type="unfinished">Más</translation>
     </message>
     <message>
+        <location line="-208"/>
+        <location line="+104"/>
+        <location line="+54"/>
+        <location line="+55"/>
         <source>Minus</source>
         <translation type="unfinished">Menos</translation>
     </message>
     <message>
+        <location line="-208"/>
+        <location line="+104"/>
+        <location line="+54"/>
+        <location line="+55"/>
         <source>Multiply</source>
         <translation type="unfinished">Multiplicar</translation>
     </message>
     <message>
+        <location line="-208"/>
+        <location line="+104"/>
+        <location line="+54"/>
+        <location line="+55"/>
         <source>Divide</source>
         <translation type="unfinished">Dividir</translation>
     </message>
     <message>
+        <location line="-203"/>
+        <location line="+43"/>
+        <location line="+265"/>
         <source>Value 2</source>
         <translation type="unfinished">Valor 2</translation>
     </message>
     <message>
+        <location line="-303"/>
+        <location line="+104"/>
         <source>Invert</source>
         <translation type="unfinished">Invertir</translation>
     </message>
     <message>
+        <location line="-99"/>
         <source>ScaleMap</source>
         <translation type="unfinished">Escalado de mapa</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Flip</source>
         <translation type="unfinished">Cambiar</translation>
     </message>
     <message>
+        <location line="+5"/>
+        <location line="+94"/>
         <source>Dyn</source>
         <translation type="unfinished">Dyn</translation>
     </message>
     <message>
+        <location line="-89"/>
+        <location line="+94"/>
         <source>Random</source>
         <translation type="unfinished">Aleatorio</translation>
     </message>
     <message>
+        <location line="-86"/>
+        <location line="+71"/>
+        <location line="+214"/>
         <source>Value 1</source>
         <translation type="unfinished">Valor 1</translation>
     </message>
     <message>
+        <location line="-265"/>
+        <location line="+324"/>
         <source>Length</source>
         <translation type="unfinished">Longitud</translation>
     </message>
     <message>
+        <location line="-314"/>
         <source>Position</source>
         <translation type="unfinished">Posición</translation>
     </message>
     <message>
+        <location line="+172"/>
         <source>Filter</source>
         <translation type="unfinished">Filtro</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>All</source>
         <translation type="unfinished">Todo</translation>
     </message>
     <message>
+        <location line="+5"/>
+        <location line="+91"/>
+        <location line="+59"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Equal</source>
         <translation type="unfinished">Igual</translation>
     </message>
     <message>
+        <location line="-223"/>
+        <location line="+91"/>
+        <location line="+59"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Unequal</source>
         <translation type="unfinished">Diferente</translation>
     </message>
     <message>
+        <location line="-147"/>
+        <location line="+59"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Ignore</source>
         <translation type="unfinished">Ignora</translation>
     </message>
     <message>
+        <location line="-122"/>
+        <location line="+59"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Higher</source>
         <translation type="unfinished">Mayor</translation>
     </message>
     <message>
+        <location line="-132"/>
+        <location line="+59"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Lower</source>
         <translation type="unfinished">Menor</translation>
     </message>
     <message>
+        <location line="-132"/>
+        <location line="+59"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Inside</source>
         <translation type="unfinished">Entre</translation>
     </message>
     <message>
+        <location line="-132"/>
+        <location line="+59"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Outside</source>
         <translation type="unfinished">Fuera</translation>
     </message>
     <message>
+        <location line="-119"/>
         <source>Bar Range</source>
         <translation type="unfinished">Rango de compases</translation>
     </message>
     <message>
+        <location line="+197"/>
         <source>Preset</source>
         <translation type="unfinished">Preselección</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Name:</source>
         <translation type="unfinished">Nombre:</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Comment:</source>
         <translation type="unfinished">Comentario:</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Range</source>
         <translation type="unfinished">Rango</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>process all events</source>
         <translation type="unfinished">procesar todos los eventos</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>selected tracks</source>
         <translation type="unfinished">seleccionar pistas</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>inside loop</source>
         <translation type="unfinished">dentro de bucle</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Function</source>
         <translation type="unfinished">Función</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Select</source>
         <translation type="unfinished">Seleccionar</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Quantize</source>
         <translation type="unfinished">Cuantizar</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Delete</source>
         <translation type="unfinished">Borrar</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Transform</source>
         <translation type="unfinished">Transformar</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Insert</source>
         <translation type="unfinished">Insertar</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Copy</source>
         <translation type="unfinished">Copiar</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Extract</source>
         <translation type="unfinished">Extraer</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Quantize Value</source>
         <translation type="unfinished">Cuantizar valor</translation>
     </message>
@@ -7090,6 +8066,8 @@ Puedes especificar más de un canal para grabar:
 <context>
     <name>MidiTransformerDialog</name>
     <message>
+        <location filename="../../muse/miditransform.cpp" line="+248"/>
+        <location line="+2"/>
         <source>New</source>
         <translation type="unfinished">Nueva</translation>
     </message>
@@ -7097,6 +8075,7 @@ Puedes especificar más de un canal para grabar:
 <context>
     <name>MixdownFileDialog</name>
     <message>
+        <location filename="../../muse/widgets/mixdowndialog.cpp" line="+101"/>
         <source>Wave Files (*.wav);;All Files (*)</source>
         <translation type="unfinished">Archivos de onda (*.wav);;Todos los archivos(*)</translation>
     </message>
@@ -7104,50 +8083,62 @@ Puedes especificar más de un canal para grabar:
 <context>
     <name>MixdownFileDialogBase</name>
     <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>
     </message>
     <message>
+        <location line="+39"/>
         <source>&amp;OK</source>
         <translation type="unfinished">&amp;Aceptar</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished">&amp;Cancelar</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>File Path</source>
         <translation type="unfinished">Directorio del archivo</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Channel</source>
         <translation type="unfinished">Canal</translation>
     </message>
     <message>
+        <location line="+31"/>
         <source>Stereo</source>
         <translation type="unfinished">Estéreo</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Mono</source>
         <translation type="unfinished">Mono</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>5.1</source>
         <translation type="unfinished">5.1</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>wav,16 Bit</source>
         <translation type="unfinished">wav, 16 bits</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>wav, 24 Bit</source>
         <translation type="unfinished">wav, 24 bits</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>wav, 32 Bit (float)</source>
         <translation type="unfinished">wav, 32 bits</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Format</source>
         <translation type="unfinished">Formato</translation>
     </message>
@@ -7190,14 +8181,17 @@ Puedes especificar más de un canal para grabar:
 <context>
     <name>MusE</name>
     <message>
+        <location filename="../../muse/app.cpp" line="+564"/>
         <source>&amp;File</source>
         <translation type="unfinished">&amp;Archivo</translation>
     </message>
     <message>
+        <location line="-376"/>
         <source>Open &amp;Recent</source>
         <translation type="unfinished">Abrir &amp;Recientes</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Save &amp;As</source>
         <translation type="unfinished">Guardar c&amp;omo</translation>
     </message>
@@ -7206,34 +8200,43 @@ Puedes especificar más de un canal para grabar:
         <translation type="obsolete">Configurar &amp;Impresión</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Import Midifile</source>
         <translation type="unfinished">Importar archivo MIDI</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Export Midifile</source>
         <translation type="unfinished">Exportar archivo MIDI</translation>
     </message>
     <message>
+        <location line="+3"/>
+        <location filename="../../muse/wave.cpp" line="+810"/>
         <source>Import Wave File</source>
         <translation type="unfinished">Importar archivo de audio</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>&amp;Quit</source>
         <translation type="unfinished">&amp;Salir</translation>
     </message>
     <message>
+        <location line="+383"/>
         <source>&amp;Edit</source>
         <translation type="unfinished">&amp;Editar</translation>
     </message>
     <message>
+        <location line="-380"/>
         <source>C&amp;ut</source>
         <translation type="unfinished">C&amp;ortar</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>&amp;Copy</source>
         <translation type="unfinished">&amp;Copiar</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>&amp;Paste</source>
         <translation type="unfinished">&amp;Pegar</translation>
     </message>
@@ -7242,134 +8245,213 @@ Puedes especificar más de un canal para grabar:
         <translation type="obsolete">Borrar pista</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Add Track</source>
         <translation type="unfinished">Agregar Pista</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Select &amp;All</source>
         <translation type="unfinished">Seleccion&amp;ar Todo</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>&amp;Deselect All</source>
         <translation type="unfinished">&amp;Deseleccionar Todo</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Invert &amp;Selection</source>
         <translation type="unfinished">Invertir &amp;Selección</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>&amp;Inside Loop</source>
         <translation type="unfinished">&amp;Interior de bucle</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>&amp;Outside Loop</source>
         <translation type="unfinished">&amp;Exterior de 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>
     </message>
     <message>
+        <location line="-8"/>
         <source>Select</source>
         <translation type="unfinished">Seleccionar</translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Drums</source>
         <translation type="unfinished">Percusión</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <location line="+6"/>
         <source>List</source>
         <translation type="unfinished">Lista</translation>
     </message>
     <message>
+        <location line="-1"/>
         <source>Graphic</source>
         <translation type="unfinished">Gráfico</translation>
     </message>
     <message>
+        <location line="-2"/>
         <source>Mastertrack</source>
         <translation type="unfinished">Pista Maestra</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Midi &amp;Transform</source>
         <translation type="unfinished">&amp;Transformación MIDI</translation>
     </message>
     <message>
+        <location line="+374"/>
         <source>Modify Gate Time</source>
         <translation type="unfinished">Modificar el tiempo de puerta</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Modify Velocity</source>
         <translation type="unfinished">Modificar Velocidad</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Crescendo</source>
         <translation type="unfinished">Crescendo</translation>
     </message>
     <message>
+        <location line="-344"/>
         <source>Transpose</source>
         <translation type="unfinished">Transponer</translation>
     </message>
     <message>
+        <location line="-85"/>
+        <source>Find unused wave files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>&amp;Insert Empty Measure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>all parts in one staff</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>one staff per part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>New score window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Song Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bigtime Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <source>Local Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>&amp;MusE Homepage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+301"/>
         <source>Thin Out</source>
         <translation type="unfinished">Adelgazar? (Thin Out)</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Erase Event</source>
         <translation type="unfinished">Borrar Evento</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Note Shift</source>
         <translation type="unfinished">Desplazamiento de nota</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Move Clock</source>
         <translation type="unfinished">Mover reloj</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Copy Measure</source>
         <translation type="unfinished">Copiar compás</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Erase Measure</source>
         <translation type="unfinished">Vaciar compás</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Delete Measure</source>
         <translation type="unfinished">Borrar compás</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Create Measure</source>
         <translation type="unfinished">Crear compás</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Mix Track</source>
         <translation type="unfinished">Mezclar pista</translation>
     </message>
     <message>
+        <location line="-388"/>
         <source>Midi</source>
         <translation type="unfinished">MIDI</translation>
     </message>
     <message>
+        <location line="+412"/>
         <source>&amp;Structure</source>
         <translation type="unfinished">E&amp;structura</translation>
     </message>
     <message>
+        <location line="-390"/>
         <source>Global Cut</source>
         <translation type="unfinished">Corte global</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Global Insert</source>
         <translation type="unfinished">Inserción Global</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Global Split</source>
         <translation type="unfinished">Partición Global</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Copy Range</source>
         <translation type="unfinished">Copiar Rango</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Cut Events</source>
         <translation type="unfinished">Cortar eventos</translation>
     </message>
@@ -7378,22 +8460,26 @@ Puedes especificar más de un canal para grabar:
         <translation type="obsolete">&amp;Mostrar</translation>
     </message>
     <message>
+        <location line="-19"/>
         <source>Transport Panel</source>
         <translation type="unfinished">Panel de transporte</translation>
     </message>
     <message>
         <source>Bigtime window</source>
-        <translation type="unfinished">ventana BigTime</translation>
+        <translation type="obsolete">ventana BigTime</translation>
     </message>
     <message>
-        <source>Don't Follow Song</source>
+        <location line="+55"/>
+        <source>Don&apos;t Follow Song</source>
         <translation type="unfinished">no sigas la canción</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Follow Page</source>
         <translation type="unfinished">sigue la página</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Follow Continuous</source>
         <translation type="unfinished">sigue contínuamente</translation>
     </message>
@@ -7402,18 +8488,22 @@ Puedes especificar más de un canal para grabar:
         <translation type="obsolete">&amp;Configuración</translation>
     </message>
     <message>
+        <location line="-8"/>
         <source>Global Settings</source>
         <translation type="unfinished">Selecciones Globales</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Follow Song</source>
         <translation type="unfinished">seguir canción</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Metronome</source>
         <translation type="unfinished">Metrónomo</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Midi Sync</source>
         <translation type="unfinished">Sincronización MIDI</translation>
     </message>
@@ -7422,6 +8512,7 @@ Puedes especificar más de un canal para grabar:
         <translation type="obsolete">Configuración de archivos MIDI</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Appearance Settings</source>
         <translation type="unfinished">Selecciones de apariencia</translation>
     </message>
@@ -7442,14 +8533,17 @@ Puedes especificar más de un canal para grabar:
         <translation type="obsolete">Guardar configuración</translation>
     </message>
     <message>
+        <location line="-38"/>
         <source>Midi Input Transform</source>
         <translation type="unfinished">Transformación de entrada MIDI</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Midi Input Filter</source>
         <translation type="unfinished">Filtrado de entrada MIDI</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Midi Remote Control</source>
         <translation type="unfinished">Control remoto MIDI</translation>
     </message>
@@ -7458,6 +8552,7 @@ Puedes especificar más de un canal para grabar:
         <translation type="obsolete">generador aleatorio de ritmos</translation>
     </message>
     <message>
+        <location line="+386"/>
         <source>&amp;Midi</source>
         <translation type="unfinished">&amp;MIDI</translation>
     </message>
@@ -7470,22 +8565,26 @@ Puedes especificar más de un canal para grabar:
         <translation type="obsolete">Define Controlador</translation>
     </message>
     <message>
+        <location line="-391"/>
         <source>Input Plugins</source>
         <translation type="unfinished">Plugins e entrada</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Reset Instr.</source>
         <translation type="unfinished">Reinicializa Instrumento</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Init Instr.</source>
         <translation type="unfinished">Inicializa Instruemnto</translation>
     </message>
     <message>
         <source>local off</source>
-        <translation type="unfinished">apagado local</translation>
+        <translation type="obsolete">apagado local</translation>
     </message>
     <message>
+        <location line="+407"/>
         <source>&amp;Audio</source>
         <translation type="unfinished">&amp;Audio</translation>
     </message>
@@ -7494,14 +8593,17 @@ Puedes especificar más de un canal para grabar:
         <translation type="obsolete">Audio</translation>
     </message>
     <message>
+        <location line="-434"/>
         <source>Cliplist</source>
         <translation type="unfinished">Lista de Clips</translation>
     </message>
     <message>
+        <location line="+31"/>
         <source>Bounce to Track</source>
         <translation type="unfinished">Rebotar a pista</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Bounce to File</source>
         <translation type="unfinished">Rebotar a Archivo</translation>
     </message>
@@ -7510,6 +8612,7 @@ Puedes especificar más de un canal para grabar:
         <translation type="obsolete">Rebotar</translation>
     </message>
     <message>
+        <location line="+443"/>
         <source>&amp;Help</source>
         <translation type="unfinished">A&amp;yuda</translation>
     </message>
@@ -7530,16 +8633,21 @@ Puedes especificar más de un canal para grabar:
         <translation type="obsolete">Que es esto</translation>
     </message>
     <message>
+        <location line="+499"/>
         <source>MusE: load project</source>
         <translation type="unfinished">MusE: Carga proyecto</translation>
     </message>
     <message>
+        <location line="+114"/>
         <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>
     </message>
     <message>
+        <location line="-1166"/>
+        <location line="+1168"/>
+        <location line="+1471"/>
         <source>&amp;Save</source>
         <translation type="unfinished">&amp;Guardar</translation>
     </message>
@@ -7548,26 +8656,35 @@ Guardamos el proyecto actual?</translation>
         <translation type="obsolete">&amp;No Guardar</translation>
     </message>
     <message>
+        <location line="+0"/>
+        <location filename="../../muse/importmidi.cpp" line="+68"/>
         <source>&amp;Abort</source>
         <translation type="unfinished">&amp;Abortar</translation>
     </message>
     <message>
+        <location line="-1275"/>
+        <location line="+13"/>
         <source>MusE: Save As</source>
         <translation type="unfinished">MusE: Guardar como</translation>
     </message>
     <message>
+        <location filename="../../muse/importmidi.cpp" line="-12"/>
         <source>MusE: Import Midi</source>
         <translation type="unfinished">MusE: Importar MIDI</translation>
     </message>
     <message>
+        <location filename="../../muse/exportmidi.cpp" line="+126"/>
         <source>MusE: Export Midi</source>
         <translation type="unfinished">MusE: Exportar MIDI</translation>
     </message>
     <message>
+        <location filename="../../muse/app.cpp" line="+57"/>
+        <location line="+197"/>
         <source>Nothing to edit</source>
         <translation type="unfinished">Nada para editar</translation>
     </message>
     <message>
+        <location line="+1005"/>
         <source>The current Project contains unsaved data
 Load overwrites current Project:
 Save Current Project?</source>
@@ -7580,10 +8697,12 @@ Guardar el proyecto actual?</translation>
         <translation type="obsolete">S&amp;obre escribir</translation>
     </message>
     <message>
+        <location filename="../../muse/help.cpp" line="+33"/>
         <source>no help found at: </source>
         <translation type="unfinished">no se ha encontrado ayuda en: </translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>MusE: Open Help</source>
         <translation type="unfinished">MusE: Abre ayuda</translation>
     </message>
@@ -7600,6 +8719,7 @@ Guardar el proyecto actual?</translation>
         <translation type="obsolete">deshacer</translation>
     </message>
     <message>
+        <location filename="../../muse/app.cpp" line="-2744"/>
         <source>Und&amp;o</source>
         <translation type="unfinished">&amp;Deshacer</translation>
     </message>
@@ -7608,18 +8728,22 @@ Guardar el proyecto actual?</translation>
         <translation type="obsolete">rehacer</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Re&amp;do</source>
         <translation type="unfinished">&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>
     </message>
     <message>
+        <location line="+1"/>
         <source>redo last undo</source>
         <translation type="unfinished">rehace el ltimo deshacer</translation>
     </message>
     <message>
+        <location line="+424"/>
         <source>Transport</source>
         <translation type="unfinished">Transporte</translation>
     </message>
@@ -7628,6 +8752,7 @@ Guardar el proyecto actual?</translation>
         <translation type="obsolete">bucle</translation>
     </message>
     <message>
+        <location line="-410"/>
         <source>Loop</source>
         <translation type="unfinished">Bucle</translation>
     </message>
@@ -7636,6 +8761,7 @@ Guardar el proyecto actual?</translation>
         <translation type="obsolete">pinchar</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Punchin</source>
         <translation type="unfinished">Pinchar</translation>
     </message>
@@ -7644,6 +8770,7 @@ Guardar el proyecto actual?</translation>
         <translation type="obsolete">fin pinchado</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Punchout</source>
         <translation type="unfinished">Fin pinchado</translation>
     </message>
@@ -7652,6 +8779,7 @@ Guardar el proyecto actual?</translation>
         <translation type="obsolete">empezar</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Start</source>
         <translation type="unfinished">Empezar</translation>
     </message>
@@ -7660,6 +8788,7 @@ Guardar el proyecto actual?</translation>
         <translation type="obsolete">retroceder</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Rewind</source>
         <translation type="unfinished">Retroceder</translation>
     </message>
@@ -7668,6 +8797,7 @@ Guardar el proyecto actual?</translation>
         <translation type="obsolete">avanzar</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Forward</source>
         <translation type="unfinished">Avanzar</translation>
     </message>
@@ -7676,6 +8806,7 @@ Guardar el proyecto actual?</translation>
         <translation type="obsolete">parar</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Stop</source>
         <translation type="unfinished">Parar</translation>
     </message>
@@ -7684,6 +8815,7 @@ Guardar el proyecto actual?</translation>
         <translation type="obsolete">reproducir</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Play</source>
         <translation type="unfinished">Reproducir</translation>
     </message>
@@ -7692,6 +8824,7 @@ Guardar el proyecto actual?</translation>
         <translation type="obsolete">grabar</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Record</source>
         <translation type="unfinished">Grabar</translation>
     </message>
@@ -7700,6 +8833,8 @@ Guardar el proyecto actual?</translation>
         <translation type="obsolete">pánico</translation>
     </message>
     <message>
+        <location line="+6"/>
+        <location line="+349"/>
         <source>Panic</source>
         <translation type="unfinished">Pánico</translation>
     </message>
@@ -7708,6 +8843,7 @@ Guardar el proyecto actual?</translation>
         <translation type="obsolete">nuevo</translation>
     </message>
     <message>
+        <location line="-337"/>
         <source>&amp;New</source>
         <translation type="unfinished">&amp;Nuevo</translation>
     </message>
@@ -7716,6 +8852,7 @@ Guardar el proyecto actual?</translation>
         <translation type="obsolete">abrir</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>&amp;Open</source>
         <translation type="unfinished">&amp;Abrir</translation>
     </message>
@@ -7728,6 +8865,7 @@ Guardar el proyecto actual?</translation>
         <translation type="obsolete">pianola</translation>
     </message>
     <message>
+        <location line="+59"/>
         <source>Pianoroll</source>
         <translation type="unfinished">Pianola</translation>
     </message>
@@ -7736,8 +8874,9 @@ Guardar el proyecto actual?</translation>
         <translation type="obsolete">partitura</translation>
     </message>
     <message>
+        <location line="-11"/>
         <source>Score</source>
-        <translation type="obsolete">Partitura</translation>
+        <translation type="unfinished">Partitura</translation>
     </message>
     <message>
         <source>marker</source>
@@ -7748,6 +8887,7 @@ Guardar el proyecto actual?</translation>
         <translation type="obsolete">Marcador</translation>
     </message>
     <message>
+        <location line="+262"/>
         <source>File Buttons</source>
         <translation type="unfinished">Botones de Archivo</translation>
     </message>
@@ -7760,6 +8900,7 @@ Guardar el proyecto actual?</translation>
         <translation type="obsolete">ninguno</translation>
     </message>
     <message>
+        <location line="+825"/>
         <source>MusE: Write File failed</source>
         <translation type="unfinished">MusE: La captura del archivo ha fallado</translation>
     </message>
@@ -7768,10 +8909,14 @@ Guardar el proyecto actual?</translation>
         <translation type="obsolete">Muse: Acerca de</translation>
     </message>
     <message>
+        <location line="-141"/>
+        <location line="+399"/>
+        <location line="+1199"/>
         <source>MusE: Song: </source>
         <translation type="unfinished">MusE: Canción: </translation>
     </message>
     <message>
+        <location filename="../../muse/importmidi.cpp" line="+42"/>
         <source>reading midifile
   </source>
         <translation type="unfinished">leyendo archivo midi
@@ -7785,17 +8930,22 @@ falló</translation>
     </message>
     <message>
         <source>MusE: Copy Range</source>
-        <translation type="unfinished">MusE: Copiar Rango</translation>
+        <translation type="obsolete">MusE: Copiar Rango</translation>
     </message>
     <message>
         <source>not implemented</source>
-        <translation type="unfinished">no implementado</translation>
+        <translation type="obsolete">no implementado</translation>
     </message>
     <message>
         <source>MusE: Cut Events</source>
-        <translation type="unfinished">MusE: Cortar Eventos</translation>
+        <translation type="obsolete">MusE: Cortar Eventos</translation>
     </message>
     <message>
+        <location filename="../../muse/app.cpp" line="-191"/>
+        <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>
     </message>
@@ -7814,272 +8964,327 @@ selecciona una pista de audio como destino</translation>
         <translation type="obsolete">no hay pista de destino seleccionada</translation>
     </message>
     <message>
+        <location line="-2452"/>
         <source>Delete Selected Tracks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="+69"/>
         <source>Edit Instrument</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Restart Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automation</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>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="+6"/>
         <source>Configure Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+14"/>
         <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>
-        <source>&amp;MusE homepage</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="+2"/>
         <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="+679"/>
         <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="+200"/>
         <source>MusE: load template</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>MusE: Bounce</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>set left/right marker for bounce range</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="+1443"/>
+        <location line="+25"/>
         <source>MusE: Bounce to File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../../muse/importmidi.cpp" line="-33"/>
         <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="+33"/>
         <source>
 failed: </source>
         <translation type="unfinished">
 falló </translation>
     </message>
     <message>
+        <location filename="../../muse/app.cpp" line="-3221"/>
+        <location line="+18"/>
         <source>Failed to start audio!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-17"/>
         <source>Was not able to start audio, check if jack is running.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Timeout waiting for audio to run. Check if jack is running.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+677"/>
         <source>Import Part</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>&amp;Insert</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Paste c&amp;lone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Paste to &amp;track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Paste clone to trac&amp;k</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Insert empty measure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="+31"/>
         <source>Wave</source>
         <translation type="unfinished">Audio</translation>
     </message>
     <message>
-        <source>Song info</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="+19"/>
         <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="+4"/>
         <source>Marker View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>&amp;Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Rhythm Generator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>Midi File Import/Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+325"/>
+        <source>&amp;View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <source>A&amp;utomation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Se&amp;ttings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+346"/>
         <source>Unknown File Format: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+289"/>
+        <location line="+1471"/>
         <source>&amp;Skip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-1471"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Cancelar</translation>
+    </message>
+    <message>
+        <location line="+286"/>
+        <location line="+6"/>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+935"/>
         <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="+57"/>
         <source>Select one audio output track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../../muse/importmidi.cpp" line="+356"/>
         <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>
+        <location line="+121"/>
         <source> out of </source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+1"/>
         <source> could not be imported.
 Likely the track is the wrong type.</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>
         <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>
     <message>
+        <location filename="../../muse/help.cpp" 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>
@@ -8088,26 +9293,32 @@ browser on your machine.</source>
 <context>
     <name>NoteInfo</name>
     <message>
+        <location filename="../../muse/widgets/noteinfo.cpp" line="+33"/>
         <source>Start</source>
         <translation type="unfinished">Inicio</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Len</source>
         <translation type="unfinished">Longitud</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Pitch</source>
         <translation type="unfinished">Tono</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Velo On</source>
         <translation type="unfinished">Velocidad On</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Velo Off</source>
         <translation type="unfinished">Velocidad Off</translation>
     </message>
     <message>
+        <location line="-50"/>
         <source>Note Info</source>
         <translation type="unfinished">Información de nota</translation>
     </message>
@@ -8115,6 +9326,7 @@ browser on your machine.</source>
 <context>
     <name>OrganGuiBase</name>
     <message>
+        <location filename="../../synti/organ/organguibase.ui" line="+20"/>
         <source>MusE: Organ</source>
         <translation type="unfinished">MusE: órgano</translation>
     </message>
@@ -8135,54 +9347,67 @@ browser on your machine.</source>
         <translation type="obsolete">guardar lista de preselecciones</translation>
     </message>
     <message>
+        <location line="+763"/>
         <source>O-1</source>
         <translation type="unfinished">0-1</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Oscillator</source>
         <translation type="unfinished">Oscilador</translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Brass</source>
         <translation type="unfinished">Metales</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Reed</source>
         <translation type="unfinished">Reed</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Flute</source>
         <translation type="unfinished">Flauta</translation>
     </message>
     <message>
+        <location line="-808"/>
         <source>Drawbars</source>
         <translation type="unfinished">Drawbars</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>16&apos;</source>
         <translation type="unfinished">16&apos;</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>4&apos;</source>
         <translation type="unfinished">4&apos;</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>2 2/3&apos;</source>
         <translation type="unfinished">2 2/3&apos;</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>2&apos;</source>
         <translation type="unfinished">2&apos;</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>8&apos;</source>
         <translation type="unfinished">8&apos;</translation>
     </message>
     <message>
+        <location line="-10"/>
         <source>5 1/3&apos;</source>
         <translation type="unfinished">5 1/3&apos;</translation>
     </message>
     <message>
+        <location line="+461"/>
         <source>Envelope Lo</source>
         <translation type="unfinished">Envolvente Lo</translation>
     </message>
@@ -8203,34 +9428,52 @@ browser on your machine.</source>
         <translation type="obsolete">Relajación (ms)</translation>
     </message>
     <message>
+        <location line="-219"/>
         <source>Envelope Hi</source>
         <translation type="unfinished">Envolvente Hi</translation>
     </message>
     <message>
+        <location line="+12"/>
+        <location line="+252"/>
         <source>Release</source>
         <translation type="unfinished">Relajación</translation>
     </message>
     <message>
+        <location line="-242"/>
+        <location line="+232"/>
         <source>Sustain</source>
         <translation type="unfinished">Sostenido</translation>
     </message>
     <message>
+        <location line="-222"/>
+        <location line="+212"/>
         <source>Decay</source>
         <translation type="unfinished">Decaimiento</translation>
     </message>
     <message>
+        <location line="-196"/>
+        <location line="+186"/>
         <source>Attack</source>
         <translation type="unfinished">Ataque</translation>
     </message>
     <message>
+        <location line="-110"/>
+        <location line="+41"/>
+        <location line="+35"/>
+        <location line="+171"/>
+        <location line="+16"/>
+        <location line="+38"/>
         <source>ms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-244"/>
+        <location line="+222"/>
         <source>cB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+134"/>
         <source>Velocity</source>
         <translation type="unfinished">Velocidad</translation>
     </message>
@@ -8341,32 +9584,38 @@ browser on your machine.</source>
 <context>
     <name>PartCanvas</name>
     <message>
+        <location filename="../../muse/arranger/pcanvas.cpp" line="+743"/>
         <source>C&amp;ut</source>
         <translation type="unfinished">C&amp;ortar</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>&amp;Copy</source>
         <translation type="unfinished">&amp;Copiar</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>rename</source>
         <translation type="unfinished">renombrar</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>delete</source>
         <translation type="unfinished">borrar</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>split</source>
         <translation type="unfinished">partir</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>glue</source>
         <translation type="unfinished">pegar</translation>
     </message>
     <message>
         <source>pianoroll</source>
-        <translation type="unfinished">pianola</translation>
+        <translation type="obsolete">pianola</translation>
     </message>
     <message>
         <source>score</source>
@@ -8374,33 +9623,46 @@ browser on your machine.</source>
     </message>
     <message>
         <source>list</source>
-        <translation type="unfinished">lista</translation>
+        <translation type="obsolete">lista</translation>
     </message>
     <message>
         <source>drums</source>
-        <translation type="unfinished">percusión</translation>
+        <translation type="obsolete">percusión</translation>
     </message>
     <message>
+        <location line="-295"/>
         <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>
     </message>
     <message>
+        <location line="+279"/>
         <source>color</source>
         <translation type="unfinished">color</translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>de-clone</source>
         <translation type="unfinished">des-clonar</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">editar onda</translation>
     </message>
     <message>
+        <location line="+1874"/>
         <source>Cannot paste: multiple tracks selected</source>
         <translation type="unfinished">No puedo pegar: mtilpes pistas seleccionadas</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Cannot paste: no track selected</source>
         <translation type="unfinished">No puedo pegar: No hay pista seleccionada</translation>
     </message>
@@ -8413,63 +9675,73 @@ browser on your machine.</source>
         <translation type="obsolete">No puedo pegar audio en una pista MIDI</translation>
     </message>
     <message>
+        <location line="+52"/>
         <source>Cannot paste: wrong data type</source>
         <translation type="unfinished">No puedo pegar: Tipo de datos equivocado</translation>
     </message>
     <message>
+        <location line="-32"/>
         <source>Can only paste to midi/drum track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Can only paste to wave track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-1966"/>
         <source>s&amp;elect </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>clones</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>export</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="+52"/>
         <source>file info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+108"/>
         <source>MusE: save part</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Part name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1322"/>
         <source> out of </source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+1"/>
         <source> could not be pasted.
 Likely the selected track is the wrong type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+472"/>
         <source>Can only paste to midi or wave track</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8491,6 +9763,7 @@ Likely the selected track is the wrong type.</source>
 <context>
     <name>PianoRoll</name>
     <message>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="+85"/>
         <source>&amp;Edit</source>
         <translation type="unfinished">&amp;Editar</translation>
     </message>
@@ -8531,6 +9804,7 @@ Likely the selected track is the wrong type.</source>
         <translation type="obsolete">Fuera del bucle</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>&amp;Select</source>
         <translation type="unfinished">&amp;Seleccionar</translation>
     </message>
@@ -8547,6 +9821,7 @@ Likely the selected track is the wrong type.</source>
         <translation type="obsolete">colores de velocidad</translation>
     </message>
     <message>
+        <location line="+36"/>
         <source>&amp;Config</source>
         <translation type="unfinished">&amp;Configurar</translation>
     </message>
@@ -8555,182 +9830,241 @@ Likely the selected track is the wrong type.</source>
         <translation type="obsolete">color de eventos</translation>
     </message>
     <message>
+        <location line="+30"/>
         <source>&amp;Functions</source>
         <translation type="unfinished">&amp;Funciones</translation>
     </message>
     <message>
         <source>Over Quantize</source>
-        <translation type="unfinished">Sobre cuantizar</translation>
+        <translation type="obsolete">Sobre cuantizar</translation>
     </message>
     <message>
         <source>Note On Quantize</source>
-        <translation type="unfinished">Cuantizar inicio de nota</translation>
+        <translation type="obsolete">Cuantizar inicio de nota</translation>
     </message>
     <message>
         <source>Note On/Off Quantize</source>
-        <translation type="unfinished">Cuantizar inicio y final de nota</translation>
+        <translation type="obsolete">Cuantizar inicio y final de nota</translation>
     </message>
     <message>
         <source>Iterative Quantize</source>
-        <translation type="unfinished">Cuantización iterativa</translation>
+        <translation type="obsolete">Cuantización iterativa</translation>
     </message>
     <message>
         <source>Pianoroll Tools</source>
         <translation type="obsolete">Herramientas de pianola</translation>
     </message>
     <message>
+        <location line="+57"/>
         <source>Step Record</source>
         <translation type="unfinished">captura por pasos</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Midi Input</source>
         <translation type="unfinished">Entrada MIDI</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Play Events</source>
         <translation type="unfinished">Reproducir eventos</translation>
     </message>
     <message>
+        <location line="+41"/>
         <source>Add Controller View</source>
         <translation type="unfinished">Añade vista de controladores</translation>
     </message>
     <message>
         <source>Config Quant...</source>
-        <translation type="unfinished">Configura cuantización...</translation>
+        <translation type="obsolete">Configura cuantización...</translation>
     </message>
     <message>
         <source>Modify Gate Time</source>
-        <translation type="unfinished">Modifica el tiempo de puerta</translation>
+        <translation type="obsolete">Modifica el tiempo de puerta</translation>
     </message>
     <message>
+        <location line="-98"/>
         <source>Modify Velocity</source>
         <translation type="unfinished">Modifica la velocidad</translation>
     </message>
     <message>
         <source>Crescendo</source>
-        <translation type="unfinished">Crescendo</translation>
+        <translation type="obsolete">Crescendo</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Transpose</source>
         <translation type="unfinished">Transponer</translation>
     </message>
     <message>
         <source>Thin Out</source>
-        <translation type="unfinished">Adelgazar</translation>
+        <translation type="obsolete">Adelgazar</translation>
     </message>
     <message>
         <source>Erase Event</source>
-        <translation type="unfinished">Borrar evento</translation>
+        <translation type="obsolete">Borrar evento</translation>
     </message>
     <message>
         <source>Note Shift</source>
-        <translation type="unfinished">Desplazar nota</translation>
+        <translation type="obsolete">Desplazar nota</translation>
     </message>
     <message>
         <source>Move Clock</source>
-        <translation type="unfinished">Mover reloj</translation>
+        <translation type="obsolete">Mover reloj</translation>
     </message>
     <message>
         <source>Copy Measure</source>
-        <translation type="unfinished">Copiar compás</translation>
+        <translation type="obsolete">Copiar compás</translation>
     </message>
     <message>
         <source>Erase Measure</source>
-        <translation type="unfinished">Vaciar compás</translation>
+        <translation type="obsolete">Vaciar compás</translation>
     </message>
     <message>
         <source>Delete Measure</source>
-        <translation type="unfinished">Borrar compás</translation>
+        <translation type="obsolete">Borrar compás</translation>
     </message>
     <message>
         <source>Create Measure</source>
-        <translation type="unfinished">Crear compás</translation>
+        <translation type="obsolete">Crear compás</translation>
     </message>
     <message>
+        <location line="+86"/>
         <source>ctrl</source>
         <translation type="unfinished">control</translation>
     </message>
     <message>
+        <location line="-192"/>
         <source>C&amp;ut</source>
         <translation type="unfinished">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>&amp;Paste</source>
         <translation type="unfinished">&amp;Pegar</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Delete &amp;Events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Select &amp;All</source>
         <translation type="unfinished">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="+4"/>
         <source>Invert &amp;Selection</source>
         <translation type="unfinished">Invertir &amp;Selección</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>&amp;Inside Loop</source>
         <translation type="unfinished">&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>
-        <source>&amp;Event color</source>
+        <location line="+6"/>
+        <source>&amp;Event Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Blue</source>
+        <location line="+32"/>
+        <source>Quantize</source>
+        <translation type="unfinished">Cuantizar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Modify Note Length</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Pitch colors</source>
+        <location line="+8"/>
+        <source>Crescendo/Decrescendo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Velocity colors</source>
+        <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="-62"/>
+        <source>&amp;Blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set fixed length</source>
+        <location line="+5"/>
+        <source>&amp;Pitch colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete overlaps</source>
+        <location line="+5"/>
+        <source>&amp;Velocity colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+57"/>
         <source>&amp;Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Pianoroll tools</source>
         <translation type="unfinished"></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>
     </message>
@@ -8738,82 +10072,102 @@ Likely the selected track is the wrong type.</source>
 <context>
     <name>PluginDialog</name>
     <message>
+        <location filename="../../muse/plugin.cpp" line="+3079"/>
         <source>Ok</source>
         <translation type="unfinished">Aceptar</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Cancel</source>
         <translation type="unfinished">Cancelar</translation>
     </message>
     <message>
+        <location line="-49"/>
         <source>MusE: select plugin</source>
         <translation type="unfinished">MusE: Selecciona el 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">Etiqueta</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Name</source>
         <translation type="unfinished">Nombre</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">Fabricante</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Copyright</source>
         <translation type="unfinished">Copyright</translation>
     </message>
     <message>
+        <location line="+52"/>
         <source>Stereo</source>
         <translation type="unfinished">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>
     </message>
@@ -8821,30 +10175,38 @@ Likely the selected track is the wrong type.</source>
 <context>
     <name>PluginGui</name>
     <message>
+        <location line="+219"/>
+        <location line="+3"/>
         <source>bypass plugin</source>
         <translation type="unfinished">saltar plugin</translation>
     </message>
     <message>
+        <location line="+543"/>
         <source>MusE: load preset</source>
         <translation type="unfinished">MusE: Cargar plantilla</translation>
     </message>
     <message>
+        <location line="+66"/>
         <source>MusE: save preset</source>
         <translation type="unfinished">MusE: Guardar plantilla</translation>
     </message>
     <message>
+        <location line="-624"/>
         <source>File Buttons</source>
         <translation type="unfinished">Archivar botones</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Load Preset</source>
         <translation type="unfinished">Cargar plantilla</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Save Preset</source>
         <translation type="unfinished">Guardar plantilla</translation>
     </message>
     <message>
+        <location line="+577"/>
         <source>Error reading preset. Might not be right type for this plugin</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9012,6 +10374,7 @@ actualmente sin uso</translation>
 <context>
     <name>QObject</name>
     <message>
+        <location filename="../../muse/app.cpp" line="-2773"/>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9027,26 +10390,34 @@ actualmente sin uso</translation>
         <translation type="obsolete">Velocidad</translation>
     </message>
     <message>
+        <location filename="../../muse/instruments/minstrument.cpp" line="+56"/>
+        <location filename="../../muse/liste/editevent.cpp" line="-410"/>
         <source>Cannot convert sysex string</source>
         <translation type="unfinished">No puedo 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>
     </message>
     <message>
+        <location line="+189"/>
         <source>generic midi</source>
         <translation type="unfinished">midi genánico</translation>
     </message>
     <message>
+        <location filename="../../muse/miditransform.cpp" line="+92"/>
         <source>new</source>
         <translation type="unfinished">nuevo</translation>
     </message>
     <message>
+        <location filename="../../muse/wave.cpp" line="-675"/>
         <source>create peakfile for </source>
         <translation type="unfinished">crear archivo de picos para</translation>
     </message>
     <message>
+        <location filename="../../muse/widgets/filedialog.cpp" line="+63"/>
         <source>MusE: get file name</source>
         <translation type="unfinished">MusE: obtener el nombre de archivo</translation>
     </message>
@@ -9073,14 +10444,17 @@ no existe
         <translation type="obsolete">Cancelar</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>MusE: create directory</source>
         <translation type="unfinished">MusE: crear directorio</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>creating dir failed</source>
         <translation type="unfinished">fallóla creación de directorio</translation>
     </message>
     <message>
+        <location line="+396"/>
         <source>File
 </source>
         <translation type="unfinished">El archivo
@@ -9093,6 +10467,7 @@ exists</source>
 existe</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>MusE: write</source>
         <translation type="unfinished">MusE: escribe</translation>
     </message>
@@ -9105,21 +10480,26 @@ existe</translation>
         <translation type="obsolete">Salir</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Open File
 </source>
         <translation type="unfinished">Abrir archivo</translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>
 failed: </source>
         <translation type="unfinished">
 falló </translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>MusE: Open File</source>
         <translation type="unfinished">MusE: Abrir archivo</translation>
     </message>
     <message>
+        <location filename="../../muse/route.cpp" line="+1026"/>
+        <location line="+37"/>
         <source>None</source>
         <translation type="unfinished">Ninguno</translation>
     </message>
@@ -9140,21 +10520,25 @@ falló </translation>
         <translation type="obsolete">Desconocido</translation>
     </message>
     <message>
+        <location filename="../../muse/waveedit/waveview.cpp" line="+616"/>
         <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>
@@ -9164,23 +10548,23 @@ exists. Overwrite?</source>
     <name>QuantConfig</name>
     <message>
         <source>Config Quantize</source>
-        <translation type="unfinished">Configurar Cuantización</translation>
+        <translation type="obsolete">Configurar Cuantización</translation>
     </message>
     <message>
         <source>Strength</source>
-        <translation type="unfinished">Fuerza</translation>
+        <translation type="obsolete">Fuerza</translation>
     </message>
     <message>
         <source>Don´t Quantize</source>
-        <translation type="unfinished">No cuantizes</translation>
+        <translation type="obsolete">No cuantizes</translation>
     </message>
     <message>
         <source>Quant Len</source>
-        <translation type="unfinished">Cuantizar la longitud</translation>
+        <translation type="obsolete">Cuantizar la longitud</translation>
     </message>
     <message>
         <source>MusE: Config Quantize</source>
-        <translation type="unfinished">MusE: Configurar Cuantización</translation>
+        <translation type="obsolete">MusE: Configurar Cuantización</translation>
     </message>
 </context>
 <context>
@@ -9213,353 +10597,501 @@ exists. Overwrite?</source>
 <context>
     <name>RhythmBase</name>
     <message>
+        <location filename="../../muse/mplugins/rhythmbase.ui" line="+14"/>
         <source>MusE: Random Rhythm Generator</source>
-        <translation type="obsolete">MusE: Generador de rítmo aleatorio</translation>
+        <translation type="unfinished">MusE: Generador de rítmo aleatorio</translation>
     </message>
     <message>
+        <location line="+21"/>
         <source>Instrument Properties</source>
-        <translation type="obsolete">Propiedades del instrumento</translation>
+        <translation type="unfinished">Propiedades del instrumento</translation>
     </message>
     <message>
+        <location line="+20"/>
+        <location line="+334"/>
         <source>counts/bar</source>
-        <translation type="obsolete">cuentar por barra</translation>
+        <translation type="unfinished">cuentar por barra</translation>
     </message>
     <message>
+        <location line="-324"/>
         <source>steps/count</source>
-        <translation type="obsolete">pasos por cuenta</translation>
+        <translation type="unfinished">pasos por cuenta</translation>
     </message>
     <message>
+        <location line="+10"/>
+        <location line="+325"/>
         <source># bars</source>
-        <translation type="obsolete">n barras</translation>
+        <translation type="unfinished">n barras</translation>
     </message>
     <message>
+        <location line="-315"/>
         <source>test</source>
-        <translation type="obsolete">probar</translation>
+        <translation type="unfinished">probar</translation>
     </message>
     <message>
+        <location line="+26"/>
+        <location line="+300"/>
         <source>contrib</source>
-        <translation type="obsolete">contribuir</translation>
+        <translation type="unfinished">contribuir</translation>
     </message>
     <message>
+        <location line="-290"/>
         <source>randomize</source>
-        <translation type="obsolete">aleartorizar</translation>
+        <translation type="unfinished">aleartorizar</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Group 1</source>
-        <translation type="obsolete">Grupo 1</translation>
+        <translation type="unfinished">Grupo 1</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Group 2</source>
-        <translation type="obsolete">Grupo 2</translation>
+        <translation type="unfinished">Grupo 2</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Group 3</source>
-        <translation type="obsolete">Grupo 3</translation>
+        <translation type="unfinished">Grupo 3</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Group 4</source>
-        <translation type="obsolete">Grupo 4</translation>
+        <translation type="unfinished">Grupo 4</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Group 5</source>
-        <translation type="obsolete">Grupo 5</translation>
+        <translation type="unfinished">Grupo 5</translation>
     </message>
     <message>
+        <location line="+34"/>
+        <location line="+228"/>
         <source>listen</source>
-        <translation type="obsolete">escuchar</translation>
+        <translation type="unfinished">escuchar</translation>
     </message>
     <message>
+        <location line="-218"/>
         <source>Instrument</source>
-        <translation type="obsolete">Instrumento</translation>
+        <translation type="unfinished">Instrumento</translation>
     </message>
     <message>
+        <location line="+36"/>
+        <location line="+127"/>
         <source>Group</source>
-        <translation type="obsolete">Grupo</translation>
+        <translation type="unfinished">Grupo</translation>
     </message>
     <message>
+        <location line="-100"/>
+        <location line="+339"/>
         <source>&amp;New</source>
-        <translation type="obsolete">&amp;Nuevo</translation>
+        <translation type="unfinished">&amp;Nuevo</translation>
     </message>
     <message>
+        <location line="-346"/>
         <source>create new entry</source>
-        <translation type="obsolete">crear nueva entrada</translation>
+        <translation type="unfinished">crear nueva entrada</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>pressing the New button you create a new entry
 in the MusE list of defined controllers</source>
-        <translation type="obsolete">pulsando el botón Nuevo creas una entrada nueva
+        <translation type="unfinished">pulsando el botón Nuevo creas una entrada nueva
 en la lista de controles definidos por MusE</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>&amp;Delete</source>
-        <translation type="obsolete">&amp;Borrar</translation>
+        <translation type="unfinished">&amp;Borrar</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>delete selected entry</source>
-        <translation type="obsolete">borra la entrada seleccionada</translation>
+        <translation type="unfinished">borra la entrada seleccionada</translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>Up</source>
-        <translation type="obsolete">Arriba</translation>
+        <translation type="unfinished">Arriba</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Down</source>
-        <translation type="obsolete">Abajo</translation>
+        <translation type="unfinished">Abajo</translation>
     </message>
     <message>
+        <location line="+43"/>
         <source>Instrument              </source>
-        <translation type="obsolete">Instrumento             </translation>
+        <translation type="unfinished">Instrumento             </translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>steps/count      </source>
-        <translation type="obsolete">pasos por cuenta       </translation>
+        <translation type="unfinished">pasos por cuenta       </translation>
     </message>
     <message>
+        <location line="-35"/>
         <source>list of defined controllers</source>
-        <translation type="obsolete">Lista de controladores definidos</translation>
+        <translation type="unfinished">Lista de controladores definidos</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>This is the MusE list of defined controllers.</source>
-        <translation type="obsolete">Esta es la lista de controladores definidos en MusE.</translation>
+        <translation type="unfinished">Esta es la lista de controladores definidos en MusE.</translation>
     </message>
     <message>
+        <location line="+178"/>
+        <source>&lt;b&gt;Notice!&lt;/b&gt;&lt;br&gt;
+Random Rhythm Generator is not enabled yet!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
         <source>&amp;File</source>
-        <translation type="obsolete">&amp;Archivo</translation>
+        <translation type="unfinished">&amp;Archivo</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>&amp;Edit</source>
-        <translation type="obsolete">&amp;Editar</translation>
+        <translation type="unfinished">&amp;Editar</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>&amp;Help</source>
-        <translation type="obsolete">A&amp;yuda</translation>
+        <translation type="unfinished">A&amp;yuda</translation>
     </message>
     <message>
+        <location line="-43"/>
         <source>Tools</source>
-        <translation type="obsolete">Herramientas</translation>
+        <translation type="unfinished">Herramientas</translation>
     </message>
     <message>
+        <location line="+63"/>
         <source>New</source>
-        <translation type="obsolete">Nuevo</translation>
+        <translation type="unfinished">Nuevo</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Ctrl+N</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Open</source>
-        <translation type="obsolete">Abrir</translation>
+        <translation type="unfinished">Abrir</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Open...</source>
-        <translation type="obsolete">&amp;Abrir...</translation>
+        <translation type="unfinished">&amp;Abrir...</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Ctrl+O</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Save</source>
-        <translation type="obsolete">Guardar</translation>
+        <translation type="unfinished">Guardar</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Guardar</translation>
+        <translation type="unfinished">&amp;Guardar</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Save As</source>
-        <translation type="obsolete">Guardar como</translation>
+        <translation type="unfinished">Guardar como</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>Save &amp;As...</source>
-        <translation type="obsolete">Guardar &amp;Como...</translation>
+        <translation type="unfinished">Guardar &amp;Como...</translation>
     </message>
     <message>
+        <location line="+21"/>
         <source>Print</source>
-        <translation type="obsolete">Imprimir</translation>
+        <translation type="unfinished">Imprimir</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Print...</source>
-        <translation type="obsolete">&amp;Imprimir...</translation>
+        <translation type="unfinished">&amp;Imprimir...</translation>
     </message>
     <message>
+        <location line="+6"/>
+        <source>Ctrl+P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
         <source>Exit</source>
-        <translation type="obsolete">Salir</translation>
+        <translation type="unfinished">Salir</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>E&amp;xit</source>
-        <translation type="obsolete">&amp;Salir</translation>
+        <translation type="unfinished">&amp;Salir</translation>
     </message>
     <message>
+        <location line="+21"/>
         <source>Undo</source>
-        <translation type="obsolete">Deshacer</translation>
+        <translation type="unfinished">Deshacer</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Undo</source>
-        <translation type="obsolete">&amp;Deshacer</translation>
+        <translation type="unfinished">&amp;Deshacer</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Ctrl+Z</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Redo</source>
-        <translation type="obsolete">Rehacer</translation>
+        <translation type="unfinished">Rehacer</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Redo</source>
-        <translation type="obsolete">&amp;Rehacer</translation>
+        <translation type="unfinished">&amp;Rehacer</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Ctrl+Y</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Cut</source>
-        <translation type="obsolete">Cortar</translation>
+        <translation type="unfinished">Cortar</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Cut</source>
-        <translation type="obsolete">&amp;Cortar</translation>
+        <translation type="unfinished">&amp;Cortar</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Ctrl+X</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Copy</source>
-        <translation type="obsolete">Copiar</translation>
+        <translation type="unfinished">Copiar</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>C&amp;opy</source>
-        <translation type="obsolete">C&amp;opiar</translation>
+        <translation type="unfinished">C&amp;opiar</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Ctrl+C</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Paste</source>
-        <translation type="obsolete">Pegar</translation>
+        <translation type="unfinished">Pegar</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Paste</source>
-        <translation type="obsolete">&amp;Pegar</translation>
+        <translation type="unfinished">&amp;Pegar</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Ctrl+V</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Find</source>
-        <translation type="obsolete">Buscar</translation>
+        <translation type="unfinished">Buscar</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Find...</source>
-        <translation type="obsolete">&amp;Buscar...</translation>
+        <translation type="unfinished">&amp;Buscar...</translation>
     </message>
     <message>
+        <location line="+6"/>
+        <source>Ctrl+F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
         <source>Contents</source>
-        <translation type="obsolete">Contenidos</translation>
+        <translation type="unfinished">Contenidos</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Contents...</source>
-        <translation type="obsolete">&amp;Contenidos...</translation>
+        <translation type="unfinished">&amp;Contenidos...</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Index</source>
-        <translation type="obsolete">índice</translation>
+        <translation type="unfinished">índice</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Index...</source>
-        <translation type="obsolete">&amp;Indice...</translation>
+        <translation type="unfinished">&amp;Indice...</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>About</source>
-        <translation type="obsolete">Acerca de</translation>
+        <translation type="unfinished">Acerca de</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;About...</source>
-        <translation type="obsolete">&amp;Acerca de ...</translation>
+        <translation type="unfinished">&amp;Acerca de ...</translation>
     </message>
 </context>
 <context>
     <name>RhythmGenerator</name>
     <message>
+        <location filename="../../muse/mplugins/rhythm.cpp" line="+229"/>
         <source>Form3</source>
-        <translation type="obsolete">Formulario3</translation>
+        <translation type="unfinished">Formulario3</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Instrument Settings:</source>
-        <translation type="obsolete">Configuración de instrumento:</translation>
+        <translation type="unfinished">Configuración de instrumento:</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Instrument</source>
-        <translation type="obsolete">Instrumento</translation>
+        <translation type="unfinished">Instrumento</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Hi-Hat</source>
-        <translation type="obsolete">Charli</translation>
+        <translation type="unfinished">Charli</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>add</source>
-        <translation type="obsolete">Agregar</translation>
+        <translation type="unfinished">Agregar</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>delete</source>
-        <translation type="obsolete">borrar</translation>
+        <translation type="unfinished">borrar</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>steps/count</source>
-        <translation type="obsolete">pasos/cuenta</translation>
+        <translation type="unfinished">pasos/cuenta</translation>
     </message>
     <message>
+        <location line="+21"/>
         <source>count/bar</source>
-        <translation type="obsolete">cuentas/compás</translation>
+        <translation type="unfinished">cuentas/compás</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source># bars</source>
-        <translation type="obsolete">n compases</translation>
+        <translation type="unfinished">n compases</translation>
     </message>
     <message>
+        <location line="+34"/>
         <source>Group Settings:</source>
-        <translation type="obsolete">Configuración de grupo:</translation>
+        <translation type="unfinished">Configuración de grupo:</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Group</source>
-        <translation type="obsolete">Grupo</translation>
+        <translation type="unfinished">Grupo</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Group 1</source>
-        <translation type="obsolete">Grupo 1</translation>
+        <translation type="unfinished">Grupo 1</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Group 2</source>
-        <translation type="obsolete">Grupo 2</translation>
+        <translation type="unfinished">Grupo 2</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Group 3</source>
-        <translation type="obsolete">Grupo 3</translation>
+        <translation type="unfinished">Grupo 3</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Group 4</source>
-        <translation type="obsolete">Grupo 4</translation>
+        <translation type="unfinished">Grupo 4</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Group 5</source>
-        <translation type="obsolete">Grupo 5</translation>
+        <translation type="unfinished">Grupo 5</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>contrib</source>
-        <translation type="obsolete">contrib</translation>
+        <translation type="unfinished">contrib</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>listen</source>
-        <translation type="obsolete">escuchar</translation>
+        <translation type="unfinished">escuchar</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>Randomize</source>
-        <translation type="obsolete">aleatorizar</translation>
+        <translation type="unfinished">aleatorizar</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>Rhythm Style:</source>
-        <translation type="obsolete">Estilo de ritmo:</translation>
+        <translation type="unfinished">Estilo de ritmo:</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Clear</source>
-        <translation type="obsolete">Límpio</translation>
+        <translation type="unfinished">Límpio</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Open...</source>
-        <translation type="obsolete">Abrir...</translation>
+        <translation type="unfinished">Abrir...</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Save</source>
-        <translation type="obsolete">Guardar</translation>
+        <translation type="unfinished">Guardar</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Save as...</source>
-        <translation type="obsolete">Guardar como...</translation>
+        <translation type="unfinished">Guardar como...</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Generate</source>
-        <translation type="obsolete">Generar</translation>
+        <translation type="unfinished">Generar</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Close</source>
-        <translation type="obsolete">Cerrar</translation>
+        <translation type="unfinished">Cerrar</translation>
     </message>
     <message>
         <source></source>
@@ -9569,46 +11101,57 @@ en la lista de controles definidos por MusE</translation>
 <context>
     <name>RouteDialogBase</name>
     <message>
+        <location filename="../../muse/mixer/routedialogbase.ui" line="+20"/>
         <source>MusE: Routing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Add Route</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Source:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+24"/>
         <source>Destination:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>connect source to destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Current Routes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>remove selected route</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9616,66 +11159,57 @@ en la lista de controles definidos por MusE</translation>
 <context>
     <name>SS_PluginChooserBase</name>
     <message>
+        <location filename="../../synti/simpledrums/sspluginchooserbase.ui" line="+16"/>
         <source>SimpleDrums - Ladspa Plugin Chooser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Name</source>
         <translation type="unfinished">Nombre</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Label</source>
         <translation type="unfinished">Etiqueta</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Inports</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Outports</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Creator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+43"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished">&amp;Cancelar</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+O</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SS_PluginFront</name>
-    <message>
-        <source>Clear and unload effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Load effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggle display of effect parameters</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Turn effect on/off</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>Score</name>
     <message>
         <source>&amp;Config</source>
@@ -9832,14 +11366,17 @@ en la lista de controles definidos por MusE</translation>
 <context>
     <name>ScrollScale</name>
     <message>
+        <location filename="../../muse/widgets/scrollscale.cpp" line="+299"/>
         <source>next page</source>
         <translation type="unfinished">página siguiente</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>previous page</source>
         <translation type="unfinished">página anterior</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>current page number</source>
         <translation type="unfinished">nuúmero de página actual</translation>
     </message>
@@ -9847,18 +11384,22 @@ en la lista de controles definidos por MusE</translation>
 <context>
     <name>ShortcutCaptureDialog</name>
     <message>
+        <location filename="../../muse/widgets/shortcutcapturedialog.cpp" line="+30"/>
         <source>Ok</source>
         <translation type="unfinished">Aceptar</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Cancel</source>
         <translation type="unfinished">Cancelar</translation>
     </message>
     <message>
+        <location line="+52"/>
         <source>Shortcut conflicts with </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Undefined</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9866,30 +11407,38 @@ en la lista de controles definidos por MusE</translation>
 <context>
     <name>ShortcutCaptureDialogBase</name>
     <message>
+        <location filename="../../muse/widgets/shortcutcapturedialogbase.ui" line="+14"/>
         <source>Enter shortcut sequence</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Press keys to enter shortcut sequence!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+25"/>
         <source>Old shortcut:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
+        <location line="+24"/>
         <source>Undefined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-10"/>
         <source>New shortcut:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+27"/>
         <source>OK</source>
         <translation type="unfinished">Aceptar</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Cancel</source>
         <translation type="unfinished">Cancelar</translation>
     </message>
@@ -9897,42 +11446,52 @@ en la lista de controles definidos por MusE</translation>
 <context>
     <name>ShortcutConfigBase</name>
     <message>
+        <location filename="../../muse/widgets/shortcutconfigbase.ui" line="+14"/>
         <source>Configure Keyboard Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+34"/>
         <source>Shortcut Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-5"/>
         <source>Shortcut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+37"/>
         <source>&amp;Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>&amp;Define</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>&amp;Apply</source>
         <translation type="unfinished">&amp;Aplicar</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+A</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9940,6 +11499,7 @@ en la lista de controles definidos por MusE</translation>
 <context>
     <name>SigScale</name>
     <message>
+        <location filename="../../muse/widgets/sigscale.cpp" line="+27"/>
         <source>signature scale</source>
         <translation type="unfinished">Armadura de la escala</translation>
     </message>
@@ -9947,6 +11507,7 @@ en la lista de controles definidos por MusE</translation>
 <context>
     <name>SimpleDrumsGuiBase</name>
     <message>
+        <location filename="../../synti/simpledrums/simpledrumsguibase.ui" line="+23"/>
         <source>DrumSynth 0.1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9954,25 +11515,25 @@ en la lista de controles definidos por MusE</translation>
 <context>
     <name>SimpleSynthGui</name>
     <message>
+        <location filename="../../synti/simpledrums/simpledrumsgui.cpp" line="+367"/>
         <source>&amp;Load setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>&amp;Save setup</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Load sample dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>Song</name>
     <message>
+        <location filename="../../muse/song.cpp" line="+2344"/>
         <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:
@@ -9991,55 +11552,71 @@ click on the Restart button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+189"/>
         <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>
     </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>
-        <source>MusE was unable to launch the script
-</source>
+        <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>
     </message>
@@ -10047,22 +11624,32 @@ click on the Restart button.</source>
 <context>
     <name>SongInfo</name>
     <message>
+        <location filename="../../muse/widgets/songinfo.ui" line="+14"/>
         <source>Song Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+16"/>
+        <source>Show on song load</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished">&amp;Cancelar</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>&amp;Ok</source>
         <translation type="unfinished">Ac&amp;eptar</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+O</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10085,30 +11672,38 @@ 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 type="unfinished">MusE: Configuración del Sintetizador virtual</translation>
     </message>
     <message>
+        <location line="+75"/>
         <source>Soft Synthesizer</source>
         <translation type="unfinished">Sintetizador Virtual</translation>
     </message>
     <message>
+        <location line="+46"/>
         <source>File</source>
         <translation type="unfinished">Archivo</translation>
     </message>
     <message>
+        <location line="-115"/>
         <source>Instances</source>
         <translation type="unfinished">Copias</translation>
     </message>
     <message>
+        <location line="+10"/>
+        <location line="+115"/>
         <source>Name</source>
         <translation type="unfinished">Nombre</translation>
     </message>
     <message>
+        <location line="-17"/>
         <source>list of available software synthesizers</source>
         <translation type="unfinished">lista de sintetizadores de software dispoibles</translation>
     </message>
     <message>
+        <location line="-25"/>
         <source>Add Instance</source>
         <translation type="unfinished">Agregar copia</translation>
     </message>
@@ -10117,26 +11712,32 @@ click on the Restart button.</source>
         <translation type="obsolete">Puerto ALSA</translation>
     </message>
     <message>
+        <location line="-58"/>
         <source>Remove Instance</source>
         <translation type="unfinished">Quitar copia</translation>
     </message>
     <message>
+        <location line="-10"/>
         <source>Midi Port</source>
         <translation type="unfinished">Puerto MIDI</translation>
     </message>
     <message>
+        <location line="+38"/>
         <source>Midi connections</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+67"/>
         <source>Inst</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10144,10 +11745,12 @@ click on the Restart button.</source>
 <context>
     <name>TList</name>
     <message>
+        <location filename="../../muse/arranger/tlist.cpp" line="+700"/>
         <source>Midi</source>
         <translation type="unfinished">MIDI</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Drum</source>
         <translation type="unfinished">Percusión</translation>
     </message>
@@ -10156,74 +11759,146 @@ click on the Restart button.</source>
         <translation type="obsolete">Audio</translation>
     </message>
     <message>
+        <location line="-430"/>
         <source>Delete Track</source>
         <translation type="unfinished">Borrar pista</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Track Comment</source>
         <translation type="unfinished">Comentario de pista</translation>
     </message>
     <message>
         <source>Show Gui</source>
-        <translation type="unfinished">Mostrar GUI</translation>
+        <translation type="obsolete">Mostrar GUI</translation>
     </message>
     <message>
+        <location line="-296"/>
         <source>Add Midi Track</source>
         <translation type="unfinished">Agregar pista MIDI</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Add Drum Track</source>
         <translation type="unfinished">Agregar pista de percusión</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Add Wave Track</source>
         <translation type="unfinished">Agregar pista de audio</translation>
     </message>
     <message>
+        <location line="-533"/>
         <source>MusE: bad trackname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-53"/>
+        <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="+48"/>
         <source>please choose a unique track name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+203"/>
+        <location line="+53"/>
+        <source>show gui</source>
+        <translation type="unfinished">mostrar gui</translation>
+    </message>
+    <message>
+        <location line="-44"/>
+        <location line="+53"/>
+        <source>show native gui</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+270"/>
         <source>Add Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Add Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Add Input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Add Aux Send</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-420"/>
+        <location line="+1176"/>
         <source>Update drummap?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-1175"/>
         <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="+1176"/>
         <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-1176"/>
+        <location line="+1176"/>
         <source>&amp;No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-643"/>
+        <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="+610"/>
         <source>Do you want to use same port and channel for all instruments in the drummap?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-1386"/>
         <source>&lt;none&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10231,6 +11906,7 @@ 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>
     </message>
@@ -10238,38 +11914,41 @@ click on the Restart button.</source>
 <context>
     <name>Toolbar1</name>
     <message>
+        <location filename="../../muse/widgets/tb1.cpp" line="+21"/>
         <source>Solo</source>
         <translation type="unfinished">Solo</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>Snap</source>
         <translation type="unfinished">Snap</translation>
     </message>
     <message>
         <source>Quantize</source>
-        <translation type="unfinished">Cuantizar</translation>
+        <translation type="obsolete">Cuantizar</translation>
     </message>
     <message>
         <source>To</source>
-        <translation type="unfinished">A</translation>
+        <translation type="obsolete">A</translation>
     </message>
     <message>
         <source>All Events</source>
-        <translation type="unfinished">Todos los eventos</translation>
+        <translation type="obsolete">Todos los eventos</translation>
     </message>
     <message>
         <source>Looped Ev.</source>
-        <translation type="unfinished">Eventos del bucle</translation>
+        <translation type="obsolete">Eventos del bucle</translation>
     </message>
     <message>
         <source>Selected Ev.</source>
-        <translation type="unfinished">Eventos seleccionados</translation>
+        <translation type="obsolete">Eventos seleccionados</translation>
     </message>
     <message>
         <source>Looped+Sel.</source>
-        <translation type="unfinished">Bucle + Selección</translation>
+        <translation type="obsolete">Bucle + Selección</translation>
     </message>
     <message>
+        <location line="-18"/>
         <source>Cursor</source>
         <translation type="unfinished">Cursor</translation>
     </message>
@@ -10277,10 +11956,12 @@ click on the Restart button.</source>
 <context>
     <name>TrackComment</name>
     <message>
+        <location filename="../../muse/widgets/comment.cpp" line="+41"/>
         <source>MusE: Track Comment</source>
         <translation type="unfinished">MusE: Comentario de la pista</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Track Comment:</source>
         <translation type="unfinished">Comentario de la pista:</translation>
     </message>
@@ -10288,122 +11969,156 @@ 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>
     </message>
     <message>
+        <location line="-2"/>
+        <location line="+3"/>
         <source>Loop</source>
         <translation type="unfinished">Bucle</translation>
     </message>
     <message>
+        <location line="-2"/>
+        <location line="+3"/>
         <source>Punch Out</source>
         <translation type="unfinished">Fin pinchado</translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>Left Mark</source>
         <translation type="unfinished">Marca izquierda</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Right Mark</source>
         <translation type="unfinished">Marca derecha</translation>
     </message>
     <message>
+        <location line="-95"/>
         <source>Overdub</source>
         <translation type="unfinished">Agregar</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <location line="+15"/>
         <source>Replace</source>
         <translation type="unfinished">Reemplazar</translation>
     </message>
     <message>
+        <location line="-10"/>
         <source>Rec Mode</source>
         <translation type="unfinished">Modo de captura</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">Mezcla</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Cycle Rec</source>
         <translation type="unfinished">Ciclar captura</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>punchin</source>
         <translation type="unfinished">pinchar</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>loop</source>
         <translation type="unfinished">bucle</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>punchout</source>
         <translation type="unfinished">fin pinchado</translation>
     </message>
     <message>
+        <location line="+101"/>
         <source>rewind to start</source>
         <translation type="unfinished">retroceder al inicio</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>rewind</source>
         <translation type="unfinished">retroceder</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>forward</source>
         <translation type="unfinished">avanzar</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>stop</source>
         <translation type="unfinished">parar</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>play</source>
         <translation type="unfinished">reproducir</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>record</source>
         <translation type="unfinished">grabar</translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>AC</source>
         <translation type="unfinished">AC</translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>quantize during record</source>
         <translation type="unfinished">cuantizar durante la captura</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Click</source>
         <translation type="unfinished">Click</translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>metronom click on/off</source>
         <translation type="unfinished">Click del metrónomo encendido/apagado</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Sync</source>
         <translation type="unfinished">Sinconización</translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>external sync on/off</source>
         <translation type="unfinished">Sincronización externa encedida/apagada</translation>
     </message>
     <message>
+        <location line="+45"/>
         <source>Master</source>
         <translation type="unfinished">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>
     </message>
@@ -10412,52 +12127,55 @@ click on the Restart button.</source>
     <name>TransposeDialogBase</name>
     <message>
         <source>MusE: Midi Transpose</source>
-        <translation type="unfinished">MusE: Transposición MIDI</translation>
+        <translation type="obsolete">MusE: Transposición MIDI</translation>
     </message>
     <message>
         <source>Value</source>
-        <translation type="unfinished">Valor</translation>
+        <translation type="obsolete">Valor</translation>
     </message>
     <message>
         <source>halftones</source>
-        <translation type="unfinished">semitonos</translation>
+        <translation type="obsolete">semitonos</translation>
     </message>
     <message>
         <source>Time</source>
-        <translation type="unfinished">Tiempo</translation>
+        <translation type="obsolete">Tiempo</translation>
     </message>
     <message>
         <source>all</source>
-        <translation type="unfinished">todo</translation>
+        <translation type="obsolete">todo</translation>
     </message>
     <message>
         <source>between markers</source>
-        <translation type="unfinished">entre marcadores</translation>
+        <translation type="obsolete">entre marcadores</translation>
     </message>
     <message>
         <source>Parts</source>
-        <translation type="unfinished">Partes</translation>
+        <translation type="obsolete">Partes</translation>
     </message>
     <message>
         <source>all in selected tracks</source>
-        <translation type="unfinished">todo en las pistas seleccionadas</translation>
+        <translation type="obsolete">todo en las pistas seleccionadas</translation>
     </message>
     <message>
         <source>OK</source>
-        <translation type="unfinished">Aceptar</translation>
+        <translation type="obsolete">Aceptar</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="unfinished">Cancelar</translation>
+        <translation type="obsolete">Cancelar</translation>
     </message>
 </context>
 <context>
     <name>VAMGui</name>
     <message>
+        <location filename="../../synti/vam/vamgui.cpp" line="+569"/>
         <source>MusE: Load VAM Presets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+110"/>
+        <location line="+18"/>
         <source>MusE: Save VAM Presets</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10465,130 +12183,185 @@ click on the Restart button.</source>
 <context>
     <name>VAMGuiBase</name>
     <message>
+        <location filename="../../synti/vam/vamguibase.ui" line="+23"/>
         <source>Virtual Analogue for MusE</source>
         <translation type="unfinished">Analogico virtual para MusE</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>LFO</source>
         <translation type="unfinished">LFO</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Freq</source>
         <translation type="unfinished">Freq</translation>
     </message>
     <message>
+        <location line="+42"/>
+        <location line="+950"/>
+        <location line="+177"/>
         <source>Waveform</source>
         <translation type="unfinished">Tipo Onda</translation>
     </message>
     <message>
+        <location line="-1116"/>
+        <location line="+956"/>
+        <location line="+177"/>
         <source>Sine</source>
         <translation type="unfinished">Seno</translation>
     </message>
     <message>
+        <location line="-1128"/>
+        <location line="+956"/>
+        <location line="+177"/>
         <source>Pulse</source>
         <translation type="unfinished">Pulso</translation>
     </message>
     <message>
+        <location line="-1128"/>
+        <location line="+956"/>
+        <location line="+177"/>
         <source>Saw</source>
         <translation type="unfinished">Sierra</translation>
     </message>
     <message>
+        <location line="-1128"/>
+        <location line="+956"/>
+        <location line="+177"/>
         <source>Triangle</source>
         <translation type="unfinished">Triángulo</translation>
     </message>
     <message>
+        <location line="-1122"/>
         <source>Filter</source>
         <translation type="unfinished">Filtro</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>EnvMod</source>
         <translation type="unfinished">Modulación de envolvente</translation>
     </message>
     <message>
+        <location line="+10"/>
+        <location line="+717"/>
+        <location line="+427"/>
         <source>Attack</source>
         <translation type="unfinished">Ataque</translation>
     </message>
     <message>
+        <location line="-1134"/>
+        <location line="+645"/>
+        <location line="+531"/>
         <source>Decay</source>
         <translation type="unfinished">Decaimiento</translation>
     </message>
     <message>
+        <location line="-1166"/>
+        <location line="+677"/>
+        <location line="+531"/>
         <source>Sustain</source>
         <translation type="unfinished">Sostenido</translation>
     </message>
     <message>
+        <location line="-1198"/>
+        <location line="+677"/>
+        <location line="+401"/>
         <source>Release</source>
         <translation type="unfinished">Relajación</translation>
     </message>
     <message>
+        <location line="-972"/>
         <source>Cutoff</source>
         <translation type="unfinished">Frecuencia de corte</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Resonance</source>
         <translation type="unfinished">Resonancia</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Invert</source>
         <translation type="unfinished">Invertir</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>KeyTrack</source>
         <translation type="unfinished">Seguir teclas</translation>
     </message>
     <message>
+        <location line="+153"/>
         <source>Presets</source>
         <translation type="unfinished">Plantillas</translation>
     </message>
     <message>
+        <location line="+65"/>
         <source>Set</source>
         <translation type="unfinished">Establecer</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>load preset list</source>
         <translation type="unfinished">cargar lista de plantillas</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>save preset list</source>
         <translation type="unfinished">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>
     </message>
     <message>
+        <location line="+14"/>
         <source>delete preset</source>
         <translation type="unfinished">borrar plantilla</translation>
     </message>
     <message>
+        <location line="+41"/>
         <source>DCO 1</source>
         <translation type="unfinished">DCO 1</translation>
     </message>
     <message>
+        <location line="+12"/>
+        <location line="+538"/>
         <source>Pitch</source>
         <translation type="unfinished">Tono</translation>
     </message>
     <message>
+        <location line="-506"/>
+        <location line="+480"/>
         <source>Detune</source>
         <translation type="unfinished">Desafinación</translation>
     </message>
     <message>
+        <location line="-374"/>
+        <location line="+473"/>
         <source>PWM</source>
         <translation type="unfinished">PWM</translation>
     </message>
     <message>
+        <location line="-391"/>
+        <location line="+266"/>
         <source>FM</source>
         <translation type="unfinished">FM</translation>
     </message>
     <message>
+        <location line="-240"/>
+        <location line="+501"/>
         <source>PW</source>
         <translation type="unfinished">PW</translation>
     </message>
     <message>
+        <location line="-314"/>
         <source>DCO 2</source>
         <translation type="unfinished">DCO 2</translation>
     </message>
     <message>
+        <location line="+324"/>
         <source>On</source>
         <translation type="unfinished">Encendido</translation>
     </message>
@@ -10607,6 +12380,7 @@ Jotsif Lindman Hörnlund
 ( jotsif@linux.nu )</translation>
     </message>
     <message utf8="true">
+        <location line="+122"/>
         <source>VAM 1.0beta3
 Virtual Analog for MusE
 Released under GPL.
@@ -10623,58 +12397,59 @@ Robert Jonsson
     <name>VelocityBase</name>
     <message>
         <source>MusE: Modify Velocity</source>
-        <translation type="unfinished">MusE: Modificar velocidad</translation>
+        <translation type="obsolete">MusE: Modificar velocidad</translation>
     </message>
     <message>
         <source>Range</source>
-        <translation type="unfinished">Rango</translation>
+        <translation type="obsolete">Rango</translation>
     </message>
     <message>
         <source>All Events</source>
-        <translation type="unfinished">Todos los eventos</translation>
+        <translation type="obsolete">Todos los eventos</translation>
     </message>
     <message>
         <source>Selected Events</source>
-        <translation type="unfinished">Eventos seleccionados</translation>
+        <translation type="obsolete">Eventos seleccionados</translation>
     </message>
     <message>
         <source>Looped Events</source>
-        <translation type="unfinished">Eventos del bucle</translation>
+        <translation type="obsolete">Eventos del bucle</translation>
     </message>
     <message>
         <source>Selected &amp; Looped</source>
-        <translation type="unfinished">Seleccionados y bucle</translation>
+        <translation type="obsolete">Seleccionados y bucle</translation>
     </message>
     <message>
         <source>Values</source>
-        <translation type="unfinished">Valores</translation>
+        <translation type="obsolete">Valores</translation>
     </message>
     <message>
         <source>Rate:</source>
-        <translation type="unfinished">Velocidad:</translation>
+        <translation type="obsolete">Velocidad:</translation>
     </message>
     <message>
         <source>Offset:</source>
-        <translation type="unfinished">Desplazamiento:</translation>
+        <translation type="obsolete">Desplazamiento:</translation>
     </message>
     <message>
         <source>%</source>
-        <translation type="unfinished">%</translation>
+        <translation type="obsolete">%</translation>
     </message>
     <message>
         <source>OK</source>
-        <translation type="unfinished">Aceptar</translation>
+        <translation type="obsolete">Aceptar</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="unfinished">Cancelar</translation>
+        <translation type="obsolete">Cancelar</translation>
     </message>
 </context>
 <context>
     <name>WTScale</name>
     <message>
+        <location filename="../../muse/widgets/wtscale.cpp" line="+29"/>
         <source>bar scale</source>
-        <translation type="obsolete">escala de compases</translation>
+        <translation type="unfinished">escala de compases</translation>
     </message>
 </context>
 <context>
@@ -10688,10 +12463,12 @@ Robert Jonsson
         <translation type="obsolete">Herramientas de Audio</translation>
     </message>
     <message>
+        <location filename="../../muse/waveedit/waveedit.cpp" line="+180"/>
         <source>Solo</source>
         <translation type="unfinished">Solo</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Cursor</source>
         <translation type="unfinished">Cursor</translation>
     </message>
@@ -10704,87 +12481,123 @@ Robert Jonsson
         <translation type="obsolete">Funciones</translation>
     </message>
     <message>
+        <location line="-109"/>
         <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>
     </message>
     <message>
+        <location line="+2"/>
         <source>200%</source>
         <translation type="unfinished">5 1/3&apos; {200%?}</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>150%</source>
         <translation type="unfinished">5 1/3&apos; {150%?}</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>75%</source>
         <translation type="unfinished">5 1/3&apos; {75%?}</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>50%</source>
         <translation type="unfinished">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>
     </message>
     <message>
+        <location line="+8"/>
+        <source>&amp;Copy</source>
+        <translation type="unfinished">&amp;Copiar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>C&amp;ut</source>
+        <translation type="unfinished">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>
     </message>
     <message>
+        <location line="+4"/>
         <source>Select</source>
         <translation type="unfinished">Seleccionar</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Select &amp;All</source>
         <translation type="unfinished">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>Wave edit tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>transport</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Pianoroll tools</source>
+        <location line="+8"/>
+        <source>WaveEdit tools</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -10826,10 +12639,12 @@ Robert Jonsson
 <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
@@ -10837,10 +12652,12 @@ 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.
 
@@ -10851,230 +12668,288 @@ Missing data is muted</source>
 <context>
     <name>freeverb</name>
     <message>
+        <location filename="../plugins/1050.ui" line="+20"/>
         <source>FreeVerb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Room Size</source>
         <translation type="unfinished">Tamaño sala</translation>
     </message>
     <message>
+        <location line="+88"/>
         <source>Damping</source>
         <translation type="unfinished">Amortiguamiento</translation>
     </message>
     <message>
+        <location line="+60"/>
         <source>Wet Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../plugins/2142.ui" line="+26"/>
         <source>Tap-Reverberator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Decay [ms]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+59"/>
+        <location line="+41"/>
         <source>dB</source>
         <translation type="unfinished">dB</translation>
     </message>
     <message>
+        <location line="-31"/>
         <source>Dry Level [dB]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+41"/>
         <source>Wet Level [dB]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+72"/>
         <source>Preset:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>AfterBurn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>AfterBurn (Long)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Ambience</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Ambience (Thick)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Ambience (Thick) - HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Cathedral</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Cathedral - HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Drum Chamber</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Garage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Garage (Bright)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Gymnasium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Gymnasium (Bright)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Gymnasium (Bright) - HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Hall (Small)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Hall (Medium)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Hall (Large)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Hall (Large) - HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Plate (Small)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Plate (Medium)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Plate (Large)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Plate (Large) - HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Pulse Chamber</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Pulse Chamber (Reverse)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Resonator (96 ms)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Resonator (152 ms)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Resonator (208 ms)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Room (Small)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Room (Medium)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Room (Large)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Room (Large) - HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Slap Chamber</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Slap Chamber - HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Slap Chamber (Bright)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Slap Chamber (Bright) HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Smooth Hall (Small)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Smooth Hall (Medium)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Smooth Hall (Large)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Smooth Hall (Large) - HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Vocal Plate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Vocal Plate - HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Warble Chamber</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Warehoouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Warehouse - HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Comb Filters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Allpass Filters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Bandpass Filters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Enhanced Stereo</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/muse2/share/locale/muse_fr.ts b/muse2/share/locale/muse_fr.ts
index 2e22b550..9a402bbe 100644
--- a/muse2/share/locale/muse_fr.ts
+++ b/muse2/share/locale/muse_fr.ts
@@ -4,6 +4,7 @@
 <context>
     <name>@default</name>
     <message>
+        <location filename="../../muse/transport.cpp" line="+31"/>
         <source>Click this button to enable recording</source>
         <translation>Cliquez sur ce bouton pour activer
 l&apos;enregistrement</translation>
@@ -12,11 +13,12 @@ l&apos;enregistrement</translation>
         <source>sets amount of quantization:
 0   - no quantization
 100 - full quantization</source>
-        <translation>Définit le niveau de quantisation:
+        <translation type="obsolete">Définit le niveau de quantisation:
 0   - pas de quantisation
 100 - quantisation complète</translation>
     </message>
     <message>
+        <location filename="../../muse/widgets/tools.cpp" line="+16"/>
         <source>select Pointer Tool:
 with the pointer tool you can:
   select parts
@@ -45,89 +47,106 @@ 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="+77"/>
         <source>Create New Song</source>
         <translation>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
 lecture</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Click this button to start playback</source>
         <translation>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
 départ</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Click this button to rewind</source>
         <translation>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
 lecture</translation>
     </message>
     <message>
         <source>don&apos;t quantize notes above this tick limit</source>
-        <translation>Ne pas quantiser les notes sur cette limite (en
+        <translation type="obsolete">Ne pas quantiser les notes sur cette limite (en
 tick)</translation>
     </message>
     <message>
         <source>quantize also note len as default</source>
-        <translation>quantiser aussi la longueur de note par
+        <translation type="obsolete">quantiser aussi la longueur de note par
 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>
     </message>
     <message>
+        <location line="+1"/>
         <source>record starts at left mark</source>
         <translation>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
 droit</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>rewind to start position</source>
         <translation>revenir � la position de départ</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>rewind current position</source>
         <translation>revenir � la position en cours</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>move current position</source>
         <translation>déplacer la position en cours</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>stop sequencer</source>
         <translation>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>
     </message>
     <message>
+        <location line="+1"/>
         <source>to record press record and then play</source>
         <translation>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
 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
@@ -138,81 +157,124 @@ avec le crayon vous pouvez:
   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:
 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
 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:
 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>
     </message>
     <message>
+        <location line="+1"/>
         <source>select Quantize Tool:
 insert display quantize event</source>
         <translation>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>
     </message>
     <message>
+        <location line="+1"/>
         <source>select Muting Tool:
 click on part to mute/unmute</source>
         <translation>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>
     </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>
+    </message>
+    <message>
         <source>rubber</source>
         <translation type="obsolete">gomme</translation>
     </message>
     <message>
+        <location line="-7"/>
         <source>cutter</source>
         <translation>ciseaux</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>score</source>
         <translation>partition</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>glue</source>
         <translation>colle</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>quantize</source>
         <translation>quantisation</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>draw</source>
         <translation>dessin</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>mute parts</source>
         <translation>silence</translation>
     </message>
     <message>
+        <location filename="../../muse/arranger/arranger.cpp" line="+136"/>
+        <location filename="../../muse/master/masteredit.cpp" line="+127"/>
+        <location filename="../../muse/widgets/comboQuant.cpp" line="+23"/>
+        <location line="+1"/>
+        <location line="+1"/>
+        <location filename="../../muse/widgets/tb1.cpp" line="+31"/>
+        <location line="+1"/>
+        <location line="+1"/>
         <source>Off</source>
         <translation>Arrêt</translation>
     </message>
@@ -226,139 +288,200 @@ 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 line="+617"/>
         <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="+25"/>
         <source>Add Midi Track</source>
         <translation type="unfinished">Ajouter une Piste Midi</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Add Drum Track</source>
         <translation type="unfinished">Ajouter une Piste de Batterie</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Add Wave Track</source>
         <translation type="unfinished">Ajouter une Piste Audio</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Add Audio Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Add Audio Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Add Audio Input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Add Aux Send</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
+        <location filename="../../muse/arranger/tlist.cpp" line="+970"/>
         <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="+714"/>
         <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="+225"/>
+        <location filename="../../muse/driver/jackmidi.cpp" line="+737"/>
+        <location filename="../../muse/midiport.cpp" line="+1072"/>
+        <location filename="../../muse/track.cpp" line="+782"/>
+        <location line="+16"/>
+        <location line="+30"/>
         <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="+34"/>
+        <location filename="../../muse/driver/jackmidi.cpp" line="+36"/>
+        <location filename="../../muse/midiport.cpp" line="+7"/>
+        <location filename="../../muse/track.cpp" line="-48"/>
+        <location line="+60"/>
         <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="-61"/>
+        <location line="+64"/>
+        <location filename="../../muse/track.cpp" line="-42"/>
+        <location line="+48"/>
         <source> type=&quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location filename="../../muse/driver/jackmidi.cpp" line="-61"/>
+        <location line="+64"/>
+        <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="-69"/>
+        <location filename="../../muse/track.cpp" line="-56"/>
         <source>source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../../muse/midictrl.cpp" line="+227"/>
         <source>Velocity</source>
         <translation type="unfinished">Vélocité</translation>
     </message>
     <message>
+        <location filename="../../muse/midiport.cpp" line="-756"/>
         <source>&lt;none&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+750"/>
+        <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="+1316"/>
         <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>
@@ -366,14 +489,17 @@ You can also select the Save command from the File menu.</source>
 <context>
     <name>AboutBox</name>
     <message>
+        <location filename="../../muse/widgets/aboutbox.ui" line="+14"/>
         <source>AboutBox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+37"/>
         <source>Version 2 pre-alpha</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>(C) Copyright 1999-2010 Werner Schweer and others.
 See http://www.muse-sequencer.org for new versions and
 more information.
@@ -382,10 +508,12 @@ Published under the GNU Public License</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>&amp;Keep On Rocking!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+K</source>
         <translation type="unfinished"></translation>
     </message>
@@ -393,6 +521,7 @@ Published under the GNU Public License</source>
 <context>
     <name>Appearance</name>
     <message>
+        <location filename="../../muse/appearance.cpp" line="+751"/>
         <source>MusE: load image</source>
         <translation>MusE: charger une image</translation>
     </message>
@@ -418,56 +547,73 @@ Published under the GNU Public License</source>
 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>
-        <source>&lt;none&gt;</source>
+        <location line="+2"/>
+        <source>Global opacity (opposite of transparency).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select style sheet</source>
+        <location line="+4"/>
+        <source>Standard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Qt style sheets (*.qss)</source>
+        <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>
-        <source>Global opaqueness (inverse of transparency).</source>
+        <location line="+0"/>
+        <source>Qt style sheets (*.qss)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -475,25 +621,30 @@ Word-breaking but only with spaces.</source>
     <name>AppearanceDialogBase</name>
     <message>
         <source>MusE: Appearance Settings</source>
-        <translation>MusE: réglages de l&apos;apparence</translation>
+        <translation type="obsolete">MusE: réglages de l&apos;apparence</translation>
     </message>
     <message>
+        <location filename="../../muse/widgets/appearancebase.ui" line="+1681"/>
         <source>Apply</source>
         <translation>Appliquer</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
+        <location line="-1668"/>
         <source>Arranger</source>
         <translation>Arrangeur</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Parts</source>
         <translation>Pièces</translation>
     </message>
@@ -502,70 +653,90 @@ Word-breaking but only with spaces.</source>
         <translation type="obsolete">montrer les séparations</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>show names</source>
         <translation>montrer les noms</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>show events</source>
         <translation>montrer les évènements</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>show Cakewalk Style</source>
         <translation>montrer dans le style Cakewalk</translation>
     </message>
     <message>
+        <location line="+28"/>
+        <source>y-stretch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+15"/>
         <source>Events</source>
         <translation>Evènements</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>note on</source>
         <translation>note on</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>poly pressure</source>
         <translation>pression poly</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>controller</source>
         <translation>contrôleurs</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>aftertouch</source>
         <translation>pression (aftertouch)</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>pitch bend</source>
         <translation>molette de hauteur (pitch)</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>program change</source>
         <translation>sélection de programme (prog. change)</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>special</source>
         <translation>spécial</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Background picture</source>
         <translation>image de fond</translation>
     </message>
     <message>
         <source>bg</source>
-        <translation>fond</translation>
+        <translation type="obsolete">fond</translation>
     </message>
     <message>
         <source>select...</source>
-        <translation>choisissez...</translation>
+        <translation type="obsolete">choisissez...</translation>
     </message>
     <message>
+        <location line="+58"/>
         <source>show snap grid</source>
         <translation>voir la grille de positionnement</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Colors</source>
         <translation>couleurs</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Items</source>
         <translation>Objets</translation>
     </message>
@@ -587,193 +758,282 @@ Word-breaking but only with spaces.</source>
 dans l&apos;Arrangeur</translation>
     </message>
     <message>
+        <location line="+824"/>
         <source>Style/Fonts</source>
         <translation>Styles/Polices</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>QT Theme</source>
         <translation>Thème</translation>
     </message>
     <message>
+        <location line="+21"/>
         <source>Windows</source>
         <translation>Windows</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>MusE</source>
         <translation>MusE</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Metal</source>
         <translation>Metal</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Norwegian Wood</source>
         <translation>Norwegian Wood</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Platinum</source>
         <translation>Platinum</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>CDE</source>
         <translation>CDE</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Motif</source>
         <translation>Motif</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Motif Plus</source>
         <translation>Motif Plus</translation>
     </message>
     <message>
+        <location line="+73"/>
         <source>Fonts</source>
         <translation>Polices</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Family</source>
         <translation>Famille</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Size</source>
         <translation>Taille</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Font 1</source>
         <translation>Police 1</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Font 2</source>
         <translation>Police 2</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Font 3</source>
         <translation>Police 3</translation>
     </message>
     <message>
+        <location line="+50"/>
         <source>Font 0</source>
         <translation>Police 0</translation>
     </message>
     <message>
+        <location line="+50"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <location line="+157"/>
+        <location line="+47"/>
+        <location line="+7"/>
         <source>Bold</source>
         <translation>Gras</translation>
     </message>
     <message>
+        <location line="-204"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <location line="+136"/>
+        <location line="+54"/>
+        <location line="+7"/>
         <source>Italic</source>
         <translation>Italique</translation>
     </message>
     <message>
+        <location line="-433"/>
+        <location line="+7"/>
+        <location line="+242"/>
+        <location line="+13"/>
+        <location line="+13"/>
+        <location line="+13"/>
+        <location line="+97"/>
+        <location line="+61"/>
+        <location line="+13"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
+        <location line="-164"/>
         <source>Font 4</source>
         <translation>Police 4</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Font 5</source>
         <translation>Couleurs</translation>
     </message>
     <message>
+        <location line="-1278"/>
         <source>clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-207"/>
+        <source>MusE: Appearance settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+193"/>
+        <source>add</source>
+        <translation type="unfinished">ajouter</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>remove</source>
+        <translation type="unfinished">enlever</translation>
+    </message>
+    <message>
+        <location line="+57"/>
         <source>Palette</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+529"/>
         <source>add to palette</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>B</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>S</source>
         <translation type="unfinished">S</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>H</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+30"/>
         <source>V</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>G</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+96"/>
         <source>R</source>
         <translation type="unfinished">R</translation>
     </message>
     <message>
-        <source>Style Sheet:</source>
+        <location line="+17"/>
+        <source>Color name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Font 6</source>
-        <translation type="unfinished">Couleurs {6?}</translation>
+        <location line="+20"/>
+        <source>Global opacity</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Global opaqueness</source>
+        <location line="+144"/>
+        <source>Style Sheet:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+345"/>
+        <source>Font 6</source>
+        <translation type="unfinished">Couleurs {6?}</translation>
+    </message>
 </context>
 <context>
     <name>Arranger</name>
     <message>
+        <location filename="../../muse/arranger/arranger.cpp" line="-10"/>
         <source>Cursor</source>
         <translation>Curseur</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Snap</source>
         <translation>Aligne</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Len</source>
         <translation>Long</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>NO</source>
         <translation>NON</translation>
     </message>
     <message>
+        <location line="+5"/>
+        <location line="+1"/>
         <source>midi song type</source>
         <translation>type de fichier midi</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Pitch</source>
         <translation>Hauteur</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>midi pitch</source>
         <translation>hauteur midi</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>global midi pitch shift</source>
         <translation>transposition midi globale</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Tempo</source>
         <translation>Tempo</translation>
     </message>
     <message>
+        <location line="+8"/>
+        <location line="+1"/>
         <source>midi tempo</source>
         <translation>tempo midi</translation>
     </message>
     <message>
+        <location line="+70"/>
         <source>TrackInfo</source>
         <translation>InfoPiste</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Track</source>
         <translation>Piste</translation>
     </message>
@@ -782,6 +1042,7 @@ dans l&apos;Arrangeur</translation>
         <translation type="obsolete">O-Port</translation>
     </message>
     <message>
+        <location line="-167"/>
         <source>Arranger</source>
         <translation>Arrangeur</translation>
     </message>
@@ -794,22 +1055,27 @@ dans l&apos;Arrangeur</translation>
         <translation type="obsolete">Mesure</translation>
     </message>
     <message>
+        <location line="+48"/>
         <source>GM</source>
         <translation>GM</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>GS</source>
         <translation>GS</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>XG</source>
         <translation>XG</translation>
     </message>
     <message>
+        <location line="+40"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
+        <location line="+73"/>
         <source>R</source>
         <translation>R</translation>
     </message>
@@ -818,62 +1084,87 @@ dans l&apos;Arrangeur</translation>
         <translation type="obsolete">A</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>M</source>
         <translation>M</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Ch</source>
         <translation>Ch</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>T</source>
         <translation>T</translation>
     </message>
     <message>
+        <location line="-230"/>
         <source>Enable Recording</source>
         <translation type="unfinished">Activer l&apos;Enregistrement</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Mute/Off Indicator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Solo Indicator</source>
         <translation type="unfinished">Indicateur de Solo</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Track Type</source>
         <translation type="unfinished">Type de Piste</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Track Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Midi output channel number or audio channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Midi output port or synth midi port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Time Lock</source>
         <translation type="unfinished">Vérouillage d&apos;Horloge</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>Automation parameter selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Notation clef</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
         <source>Enable recording. Click to toggle.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Mute indicator. Click to toggle.
 Right-click to toggle track on/off.
 Mute is designed for rapid, repeated action.
@@ -881,28 +1172,33 @@ On/Off is not!</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+1"/>
         <source>Track type. Right-click to change
  midi and drum track types.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Track name. Double-click to edit.
 Right-click for more options.</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+1"/>
         <source>Midi/drum track: Output port.
 Synth track: Assigned midi port.
 Left-click to change.
@@ -910,19 +1206,34 @@ Right-click to show GUI.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Time lock</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>Notation clef. Select this tracks notation clef.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <location line="+1"/>
         <source>song length - bars</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+126"/>
         <source>Port</source>
         <translation type="unfinished">Port</translation>
     </message>
     <message>
-        <source>&lt;unknown&gt;</source>
+        <location line="+3"/>
+        <source>Automation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Clef</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1100,46 +1411,57 @@ Right-click to show GUI.</source>
         <translation type="obsolete">Pistes</translation>
     </message>
     <message>
+        <location filename="../../muse/mixer/amixer.cpp" line="+156"/>
         <source>&amp;Create</source>
         <translation type="unfinished">&amp;Créer</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <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>Show Inputs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Show Outputs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Show Groups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Show Auxs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Show Synthesizers</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1147,147 +1469,162 @@ Right-click to show GUI.</source>
 <context>
     <name>AudioStrip</name>
     <message>
+        <location filename="../../muse/mixer/astrip.cpp" line="+603"/>
         <source>panorama</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>aux send level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Pan</source>
         <translation type="unfinished">Pan</translation>
     </message>
     <message>
+        <location line="+93"/>
         <source>1/2 channel</source>
         <translation type="unfinished">1/2 canal</translation>
     </message>
     <message>
+        <location line="+12"/>
         <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="+64"/>
         <source>dB</source>
         <translation type="unfinished">dB</translation>
     </message>
     <message>
+        <location line="+36"/>
         <source>record</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>mute</source>
         <translation type="unfinished">silence</translation>
     </message>
     <message>
+        <location line="+25"/>
         <source>record downmix</source>
         <translation type="unfinished">enregistrer mixdown</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location line="+4"/>
         <source>solo mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+19"/>
         <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">chemin de sortie (routing)</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Touch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+25"/>
         <source>automation type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel</source>
-        <translation type="unfinished">Canal</translation>
-    </message>
-</context>
-<context>
-    <name>Awl::MidiVolEntry</name>
-    <message>
-        <source>off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>db</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Awl::VolEntry</name>
-    <message>
-        <source>off</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Canal</translation>
     </message>
 </context>
 <context>
     <name>BigTime</name>
     <message>
+        <location filename="../../muse/widgets/bigtime.cpp" line="+78"/>
         <source>MusE: Bigtime</source>
         <translation>MusE: GrandChrono</translation>
     </message>
     <message>
+        <location line="-42"/>
         <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">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>
@@ -1295,6 +1632,7 @@ Right-click to show GUI.</source>
 <context>
     <name>ClipListEdit</name>
     <message>
+        <location filename="../../muse/cliplist/cliplist.cpp" line="+103"/>
         <source>MusE: Clip List Editor</source>
         <translation>MusE: Editeur de la Liste de Clips</translation>
     </message>
@@ -1302,38 +1640,47 @@ Right-click to show GUI.</source>
 <context>
     <name>ClipListEditorBase</name>
     <message>
+        <location filename="../../muse/widgets/cliplisteditorbase.ui" line="+17"/>
         <source>MusE: ClipList</source>
         <translation>MusE: Liste de Clips</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Refs</source>
         <translation>Réfs</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Start</source>
         <translation>Départ</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Len</source>
         <translation>Long</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Data</source>
         <translation>Donnée</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>Clip Properties</source>
         <translation>Propriétés du Clip</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Pos:</source>
         <translation>Pos:</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Len:</source>
         <translation>Long:</translation>
     </message>
@@ -1341,14 +1688,17 @@ Right-click to show GUI.</source>
 <context>
     <name>CommentBase</name>
     <message>
+        <location filename="../../muse/widgets/commentbase.ui" line="+14"/>
         <source>Form1</source>
         <translation>Forme1</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>Track Comment</source>
         <translation>Commentaire pour la Piste</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>Track 1</source>
         <translation>Piste 1</translation>
     </message>
@@ -1356,86 +1706,107 @@ Right-click to show GUI.</source>
 <context>
     <name>ConfigMidiFileBase</name>
     <message>
+        <location filename="../../muse/widgets/configmidifilebase.ui" line="+17"/>
         <source>MusE: Config Midi File Import/Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Import:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Split tracks into &amp;parts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+P</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Split tracks into parts, or one single part</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Export:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>96</source>
         <translation type="unfinished">96</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>192</source>
         <translation type="unfinished">192</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>384</source>
         <translation type="unfinished">384</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Enable extended smf format (currently not implemented)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Use &amp;2-byte time signatures instead of standard 4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Copyright:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Format:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Division:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Save space by replacing note-offs with &amp;zero velocity note-ons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+Z</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>0 (single track)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>1 (multiple tracks)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+35"/>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1443,10 +1814,12 @@ Right-click to show GUI.</source>
 <context>
     <name>CtrlPanel</name>
     <message>
+        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="+79"/>
         <source>select controller</source>
         <translation>Choisissez le contrôle</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>remove panel</source>
         <translation>enlever le panneau</translation>
     </message>
@@ -1463,6 +1836,8 @@ Right-click to show GUI.</source>
         <translation type="obsolete">x</translation>
     </message>
     <message>
+        <location line="+463"/>
+        <location line="+236"/>
         <source>Velocity</source>
         <translation>Vélocité</translation>
     </message>
@@ -1471,248 +1846,378 @@ Right-click to show GUI.</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>
+    </message>
 </context>
 <context>
     <name>DeicsOnzeGui</name>
     <message>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="+533"/>
         <source>Save configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+41"/>
+        <location line="+7"/>
+        <location line="+1172"/>
+        <location line="+7"/>
+        <location line="+218"/>
+        <location line="+7"/>
+        <location line="+160"/>
+        <location line="+7"/>
+        <location line="+165"/>
+        <location line="+7"/>
         <source>Critical Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-1749"/>
+        <location line="+1179"/>
+        <location line="+225"/>
+        <location line="+167"/>
+        <location line="+172"/>
         <source>Cannot open file %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-1736"/>
+        <location line="+1179"/>
+        <location line="+225"/>
+        <location line="+167"/>
+        <location line="+172"/>
         <source>Parsing error for file %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-1709"/>
+        <location line="+1351"/>
         <source>Load category dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-226"/>
         <source>Load set dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+67"/>
         <source>Save set dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+24"/>
         <source>New category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location line="+101"/>
         <source>Delete category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-99"/>
         <source>Load category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Save category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Load set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Save set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Delete set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>New subcategory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
+        <location line="+243"/>
         <source>Delete subcategory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-240"/>
         <source>Load subcategory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Save subcategory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>New preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location line="+389"/>
         <source>Delete preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-387"/>
         <source>Load preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Save preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>No more category supported</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>You can not add more categories</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="-338"/>
+        <location line="+170"/>
+        <location line="+170"/>
         <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-340"/>
+        <location line="+170"/>
+        <location line="+170"/>
         <source>&amp;No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-323"/>
+        <location line="+110"/>
         <source>No category selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-109"/>
+        <location line="+110"/>
         <source>You must first select a category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-61"/>
+        <location line="+167"/>
+        <location line="+172"/>
         <source>Replace or add</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+3"/>
+        <location line="+168"/>
+        <location line="+171"/>
         <source>&amp;Replace</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-339"/>
+        <location line="+168"/>
+        <location line="+171"/>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-329"/>
+        <location line="+167"/>
+        <location line="+171"/>
         <source>Download error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-337"/>
         <source>There is no more free category slot.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>Save category dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+30"/>
         <source>No more subcategory supported</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>You can not add more subcategories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+42"/>
+        <location line="+113"/>
         <source>No subcategory selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-112"/>
+        <location line="+113"/>
         <source>You must first select a subcategory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-101"/>
         <source>Load subcategory dialog</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+14"/>
         <source>There is no more free subcategory slot.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>Save subcategory dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>No more preset supported</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>You can not add more presets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+39"/>
+        <location line="+3"/>
+        <location line="+111"/>
         <source>No preset selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-113"/>
+        <location line="+3"/>
+        <location line="+111"/>
         <source>You must first select a preset.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-98"/>
         <source>Load preset dialog</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+13"/>
         <source>There is no more free preset slot.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>Save preset dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+120"/>
         <source>Browse set dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+35"/>
         <source>Browse image dialog</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1720,983 +2225,93 @@ Right-click to show GUI.</source>
 <context>
     <name>DeicsOnzeGuiBase</name>
     <message>
-        <source>DeicsOnze</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Preset</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Program numerous</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>INITVOICE</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LBank</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subcategory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bank numerous</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>NONE</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>HBank</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Prog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Preset</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DeicsOnze v0.5.5 Copyright (c) 2004-2006 Nil Geisweiller. Published under GPL licence.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Global</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pitch Envelope</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PL3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PL2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PL1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PR1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PR2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PR3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pitch modulation depth</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>LFO</source>
-        <translation type="unfinished">LFO</translation>
-    </message>
-    <message>
-        <source>LFO Sync</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pitch modulation sensitivity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pitch Modulation Sensitivity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LFO Delay</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LFO delay</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LFO speed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amplitude modulation depth</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amplitude modulation sensitivity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amplitude Modulation Sensitivity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AMS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LFO Waveform</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pitch Modulation Depth</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PMD</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LFO Speed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AMD</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">LFO</translation>
     </message>
     <message>
         <source>Speed</source>
-        <translation type="unfinished">Vitesse</translation>
+        <translation type="obsolete">Vitesse</translation>
     </message>
     <message>
         <source>Delay</source>
-        <translation type="unfinished">Délai</translation>
-    </message>
-    <message>
-        <source>PMS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Modulation Matrix</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&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;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Op4 Feedback</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Feedback level of the operator 4</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Délai</translation>
     </message>
     <message>
         <source>Transpose</source>
-        <translation type="unfinished">Transposition</translation>
-    </message>
-    <message>
-        <source>Op &amp;1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scaling 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LS1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RS1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rate Scaling</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Attack Rate of the operator 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Level Scaling</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amplitude Envelope 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RR1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D1R1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D1L1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D2R1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Release Rate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message utf8="true">
-        <source>2° Decay Rate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message utf8="true">
-        <source>1° Decay Level</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message utf8="true">
-        <source>1° Decay Rate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Attack Rate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AR1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Detune, OSCWave, EGShift 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DET1</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Transposition</translation>
     </message>
     <message>
         <source>Detune</source>
-        <translation type="unfinished">Désaccordage</translation>
-    </message>
-    <message>
-        <source>EG Shift</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>96dB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>48dB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>24dB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>12dB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wave form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>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;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sensitivity 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>KVS1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amplitude Modulation Enable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AME1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Keyboard Velocity Sensitivity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key Velocity Sensitivity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EBS1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EG Bias Sensitivity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Eg Bias Sensitivity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Frequency 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Coarse 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Coarse Ratio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine Ratio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Freq 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fixed Frequency</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggle Fix Frequency</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>FIX</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OUT 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Output Volume</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Désaccordage</translation>
     </message>
     <message>
         <source>Volume</source>
-        <translation type="unfinished">Volume</translation>
-    </message>
-    <message>
-        <source>Op &amp;2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amplitude Envelope 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D1R2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D1L2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D2R2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RR2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AR2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Frequency 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Coarse 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Freq 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scaling 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LS2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RS2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OUT 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Detune, OSCWave, EGShift 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DET2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sensitivity 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EBS2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>KVS2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AME2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Op &amp;3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amplitude Envelope 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D1R3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D1L3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D2R3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RR3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AR3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scaling 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LS3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RS3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OUT 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Frequency 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Coarse 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Freq 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Detune, OSCWave, EGShift 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DET3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sensitivity 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EBS3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>KVS3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AME3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Op &amp;4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>amplitude Envelope 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AR4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D1R4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D1L4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D2R4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RR4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Frequency 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Coarse 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Freq 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scaling 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LS4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RS4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OUT 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Detune, OSCWave, EGShift 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DET4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sensitivity 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EBS4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>KVS4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AME4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Func</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay Pan Depth</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay Pan LFO Freq</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay Ch Send Level </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Channel Chorus</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay Feedback</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay On/Off, Return Level</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Volume</translation>
     </message>
     <message>
         <source>On</source>
-        <translation type="unfinished">On</translation>
-    </message>
-    <message>
-        <source>Delay Beat Ratio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay BPM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Foot Control</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pitch Bend Range</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">On</translation>
     </message>
     <message>
         <source>Pitch</source>
-        <translation type="unfinished">Hauteur</translation>
-    </message>
-    <message>
-        <source>Amplitude</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Modulation Wheel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Breath Control</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pitch Bias</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Envelope Bias</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Hauteur</translation>
     </message>
     <message>
         <source>After Touch</source>
-        <translation type="unfinished">Pression (After Touch)</translation>
-    </message>
-    <message>
-        <source>Phony Mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>POLY</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MONO</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Potamento</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Portamento Mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>FINGER</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>FULL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PT</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Portamento Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;horus</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Chorus Parameters</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Channel send level</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>On/Off and Return level</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select LADSPA plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Reverb</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reverb Parameters</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Pression (After Touch)</translation>
     </message>
     <message>
         <source>&amp;Config</source>
-        <translation type="unfinished">&amp;Configuration</translation>
-    </message>
-    <message>
-        <source>Font Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Quality</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>High</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Middle</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ultra low</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&amp;Configuration</translation>
     </message>
     <message>
         <source>Filter</source>
-        <translation type="unfinished">Filtre</translation>
-    </message>
-    <message>
-        <source>Save Mode (into the song)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save only the used presets</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save the entire set</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save the configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configuration File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Load...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save as default</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Filtre</translation>
     </message>
     <message>
         <source>Colors</source>
-        <translation type="unfinished">couleurs</translation>
+        <translation type="obsolete">couleurs</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation type="unfinished">Texte</translation>
-    </message>
-    <message>
-        <source>Background</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Background</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Red</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Blue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Green</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set Path</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Image in the background :</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Browse...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Load the set at the initialization :</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set Brightness, Detune, Attack and Release of the current channel to default</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Res. Ctrl</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut all notes off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Panic!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Number of Voices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Number of voices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Texte</translation>
     </message>
     <message>
         <source>Channel</source>
-        <translation type="unfinished">Canal</translation>
-    </message>
-    <message>
-        <source>Vol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Channel Ctrl</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Canal</translation>
     </message>
     <message>
         <source>Release</source>
-        <translation type="unfinished">Relachement</translation>
+        <translation type="obsolete">Relachement</translation>
     </message>
     <message>
         <source>Attack</source>
-        <translation type="unfinished">Attaque</translation>
-    </message>
-    <message>
-        <source>Brightness</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Modulation</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Attaque</translation>
     </message>
     <message>
         <source>Pan</source>
-        <translation type="unfinished">Pan</translation>
+        <translation type="obsolete">Pan</translation>
     </message>
 </context>
 <context>
     <name>DidYouKnow</name>
     <message>
+        <location filename="../../muse/widgets/didyouknow.ui" line="+14"/>
         <source>Did you know?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Don&apos;t show on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Next tip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Close</source>
         <translation type="unfinished">Fermer</translation>
     </message>
@@ -2704,130 +2319,162 @@ 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="+169"/>
         <source>Load Map</source>
         <translation>Charger set de batterie</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Save Map</source>
         <translation>Enregistrer set de batterie</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>&amp;Edit</source>
         <translation>&amp;Editer</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Cut</source>
         <translation>Couper</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Copy</source>
         <translation>Copier</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Paste</source>
         <translation>Coller</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Delete Events</source>
         <translation>Effacer</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>Select All</source>
         <translation>Tout sélectionner</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Select None</source>
         <translation>Dé-sélectionner</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Invert</source>
         <translation>Inverser</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Inside Loop</source>
         <translation>Dans la boucle</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Outside Loop</source>
         <translation>Hors de la boucle</translation>
     </message>
     <message>
+        <location line="-7"/>
         <source>&amp;Select</source>
         <translation>&amp;Sélectionner</translation>
     </message>
     <message>
+        <location line="+94"/>
         <source>Step Record</source>
         <translation>Enregistrement pas-�-pas</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Midi Input</source>
         <translation>Entrée Midi</translation>
     </message>
     <message>
+        <location line="+57"/>
         <source>Add Controller View</source>
         <translation>Ajouter une Vue des contrôles</translation>
     </message>
     <message>
+        <location line="+57"/>
         <source>M</source>
         <translation>M</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Sound</source>
         <translation>Son</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>QNT</source>
         <translation>QNT</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>E-Note</source>
         <translation>E-Note</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Len</source>
         <translation>Long</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>A-Note</source>
         <translation>A-Note</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Ch</source>
         <translation>Ch</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>LV1</source>
         <translation>LV1</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>LV2</source>
         <translation>LV2</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>LV3</source>
         <translation>LV3</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>LV4</source>
         <translation>LV4</translation>
     </message>
     <message>
+        <location line="-260"/>
         <source>&amp;File</source>
         <translation>&amp;Fichier</translation>
     </message>
     <message>
+        <location line="+110"/>
         <source>Load Drummap</source>
         <translation>Charger Set de Batterie</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Store Drummap</source>
         <translation>Enregistrer Set de Batterie</translation>
     </message>
     <message>
+        <location line="+68"/>
         <source>ctrl</source>
         <translation>ctrl</translation>
     </message>
@@ -2836,118 +2483,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
         <translation type="obsolete">Sets de Batterie</translation>
     </message>
     <message>
+        <location line="+459"/>
         <source>Muse: Load Drum Map</source>
         <translation>MusE: Charger Set de Batterie</translation>
     </message>
     <message>
+        <location line="+53"/>
         <source>MusE: Store Drum Map</source>
         <translation>MusE: Enregistrer Set de Batterie</translation>
     </message>
     <message>
+        <location line="-766"/>
+        <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"/>
+        <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="+41"/>
         <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>&amp;Functions</source>
         <translation type="unfinished">&amp;Fonctions</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>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="+9"/>
         <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>
+    </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="+471"/>
         <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>
@@ -2955,14 +2683,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
 <context>
     <name>EditCAfterDialog</name>
     <message>
+        <location filename="../../muse/liste/editevent.cpp" line="+430"/>
         <source>Time Position</source>
         <translation>Position temporelle</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Pressure</source>
         <translation>Pression</translation>
     </message>
     <message>
+        <location line="-6"/>
         <source>MusE: Enter Channel Aftertouch</source>
         <translation>MusE: Entrez le Canal de Pression
 (AfterTouch)</translation>
@@ -3044,58 +2775,73 @@ 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>EditCtrlBase</name>
     <message>
+        <location filename="../../muse/liste/editctrlbase.ui" line="+14"/>
         <source>MusE: Edit Controller Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Time Position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Available Controller:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Create New Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+486"/>
         <source>textLabel3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Value</source>
         <translation type="unfinished">Valeur</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Controller</source>
         <translation type="unfinished">Contrôle</translation>
     </message>
     <message>
+        <location line="+45"/>
         <source>H-Bank</source>
         <translation type="unfinished">H-Bank</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>L-Bank</source>
         <translation type="unfinished">L-Bank</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Program</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
+        <location line="+16"/>
         <source>off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+42"/>
         <source>pushButton4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+35"/>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3103,10 +2849,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>
     </message>
     <message>
+        <location line="+2"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
@@ -3114,46 +2862,57 @@ 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>EditGainBase</name>
     <message>
+        <location filename="../../muse/waveedit/editgainbase.ui" line="+14"/>
         <source>MusE: Modify gain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Gain</source>
         <translation type="unfinished">Gain</translation>
     </message>
     <message>
+        <location line="+51"/>
         <source>200%</source>
         <translation type="unfinished">5 1/3&apos; {200%?}</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>100%</source>
         <translation type="unfinished">5 1/3&apos; {100%?}</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>0%</source>
         <translation type="unfinished">5 1/3&apos; {0%?}</translation>
     </message>
     <message>
+        <location line="+51"/>
         <source>&amp;Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+39"/>
         <source>&amp;Apply</source>
         <translation type="unfinished">&amp;Appliquer</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+A</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+C</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3161,131 +2920,178 @@ 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="+296"/>
+        <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>
-        <source>(You can override with the environment variable MUSEINSTRUMENTS)</source>
+        <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">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>
@@ -3293,273 +3099,353 @@ Save Current Instrument?</source>
 <context>
     <name>EditInstrumentBase</name>
     <message>
+        <location filename="../../muse/instruments/editinstrumentbase.ui" line="+20"/>
         <source>MusE: Instrument Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Instrument Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Selected instrument name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>List of defined instruments.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Pa&amp;tches</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>List of groups and patches.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Group/Patch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+9"/>
+        <location line="+441"/>
         <source>Properties</source>
         <translation type="unfinished">Propriétés</translation>
     </message>
     <message>
+        <location line="-435"/>
+        <location line="+443"/>
+        <location line="+742"/>
         <source>Name:</source>
         <translation type="unfinished">Nom:</translation>
     </message>
     <message>
+        <location line="-1175"/>
+        <location line="+3"/>
         <source>Group or patch name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>High Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Patch high bank number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Patch high bank number. --- means don&apos;t care.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>---</source>
         <comment>dont care</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+34"/>
         <source>Low Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Patch low bank number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Patch low bank number. --- means don&apos;t care.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>---</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+34"/>
         <source>Program:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+12"/>
+        <location line="+3"/>
         <source>Patch program number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+36"/>
         <source>Drum patch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>If set, the patch is available only for drum channels.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Drum</source>
         <translation type="unfinished">Batterie</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>GM patch</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+3"/>
         <source>GM</source>
         <translation type="unfinished">GM</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>GS patch</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+3"/>
         <source>GS</source>
         <translation type="unfinished">GS</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>XG patch</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+3"/>
         <source>XG</source>
         <translation type="unfinished">XG</translation>
     </message>
     <message>
+        <location line="+36"/>
         <source>Delete group or patch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
+        <location line="+747"/>
+        <location line="+201"/>
         <source>&amp;Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-945"/>
+        <location line="+747"/>
+        <location line="+201"/>
         <source>Alt+D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-935"/>
         <source>New patch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>New &amp;Patch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+P</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>New group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>New &amp;Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+G</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+30"/>
         <source>Contro&amp;ller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Common:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <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>
     </message>
     <message>
+        <location line="+13"/>
         <source>List of defined controllers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>List of defined controllers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Name                  </source>
         <translation type="unfinished">Nom                  </translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Type       </source>
         <translation type="unfinished">Type       </translation>
     </message>
     <message>
+        <location line="+5"/>
+        <location line="+142"/>
         <source>H-Ctrl</source>
         <translation type="unfinished">H-Ctrl</translation>
     </message>
     <message>
+        <location line="-137"/>
+        <location line="+191"/>
         <source>L-Ctrl</source>
         <translation type="unfinished">L-Ctrl</translation>
     </message>
     <message>
+        <location line="-186"/>
         <source>Min  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Max  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Def  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+35"/>
         <source>Midi controller name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Type:</source>
         <translation type="unfinished">Type:</translation>
     </message>
     <message>
+        <location line="+10"/>
+        <location line="+3"/>
         <source>Midi controller type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Control7</source>
         <translation type="unfinished">Control7</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Control14</source>
         <translation type="unfinished">Control8</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>RPN</source>
         <translation type="unfinished">RPN</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>NRPN</source>
         <translation type="unfinished">NRPN</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>RPN14</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>NRPN14</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Pitch</source>
         <translation type="unfinished">Hauteur</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Program</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+43"/>
+        <location line="+3"/>
         <source>Midi controller number high byte</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+51"/>
         <source>Midi controller number low byte (* means drum controller)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Midi controller number low byte. 
 If low byte is * then the controller is a 
  &apos;drum controller&apos;. For drum tracks and 
@@ -3572,23 +3458,28 @@ Examples: The GS and XG instruments&apos;
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>*</source>
         <comment>wild card</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Range:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>Min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>Minimum value. If negative, auto-translate.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Minimum value. If the minimum value 
  is negative, the range will automatically
  be translated to a positive range. 
@@ -3611,42 +3502,57 @@ True range: Min: -8192 Max: 8191 (bias 0)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+47"/>
         <source>Max</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+22"/>
+        <location line="+3"/>
         <source>Maximum value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+36"/>
         <source>Default:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>L-Bank</source>
         <translation type="unfinished">L-Bank</translation>
     </message>
     <message>
+        <location line="+10"/>
+        <location line="+16"/>
+        <location line="+26"/>
+        <location line="+198"/>
+        <location line="+53"/>
         <source>off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-261"/>
         <source>Progr.</source>
         <translation type="unfinished">Progr.</translation>
     </message>
     <message>
+        <location line="+35"/>
         <source>???</source>
         <translation type="unfinished">???</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>H-Bank</source>
         <translation type="unfinished">H-Bank</translation>
     </message>
     <message>
+        <location line="+44"/>
         <source>Default value. Off: No default.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Default (initial) value. Off means no default.
 
 If a default value is chosen, the value will be sent
@@ -3665,47 +3571,59 @@ Caution! Watch out for controllers such as
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>off</source>
         <comment>dont care</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Add common controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+A</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Delete controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Create a new controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>New &amp;Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Null Param Hi:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Null parameter number High byte</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
+        <location line="+53"/>
         <source>If set, these &apos;null&apos; parameter numbers will 
  be sent after each RPN/NRPN event. 
 This prevents subsequent &apos;data&apos; events
@@ -3715,102 +3633,129 @@ Typically, set to 127/127, or an unused
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-13"/>
         <source> Lo:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Null parameter number Low byte</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+34"/>
         <source>S&amp;ysEx</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>SysEx List:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+37"/>
         <source>Hex Entry:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+25"/>
         <source>New SysE&amp;x</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+X</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+35"/>
         <source>Tools</source>
         <translation type="unfinished">Outils</translation>
     </message>
     <message>
+        <location line="+27"/>
         <source>&amp;File</source>
         <translation type="unfinished">&amp;Fichier</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>&amp;Help</source>
         <translation type="unfinished">&amp;Aide</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>&amp;New</source>
         <translation type="unfinished">&amp;Nouveau</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>New</source>
         <translation type="unfinished">Nouveau</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>&amp;Open...</source>
         <translation type="unfinished">&amp;Ouvrir...</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Open</source>
         <translation type="unfinished">Ouvrir</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Ctrl+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>&amp;Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Save &amp;As...</source>
         <translation type="unfinished">Sauvegarder &amp;sous...</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Save As</source>
         <translation type="unfinished">Sauvegarder sous</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>E&amp;xit</source>
         <translation type="unfinished">&amp;Quitter</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Exit</source>
         <translation type="unfinished">Quitter</translation>
     </message>
     <message>
+        <location line="+11"/>
+        <location line="+3"/>
         <source>new item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+8"/>
+        <location line="+3"/>
         <source>What&apos;s this?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3818,18 +3763,22 @@ 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>
     </message>
     <message>
+        <location line="+4"/>
         <source>Meta Type</source>
         <translation>Meta Type</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Enter Hex</source>
         <translation>Entrez en Hexa</translation>
     </message>
     <message>
+        <location line="-18"/>
         <source>MusE: Enter Meta Event</source>
         <translation>MusE: Entrer un Evènement en Hexa</translation>
     </message>
@@ -3868,34 +3817,42 @@ Typically, set to 127/127, or an unused
 <context>
     <name>EditNoteDialogBase</name>
     <message>
+        <location filename="../../muse/widgets/editnotedialogbase.ui" line="+14"/>
         <source>MusE: Enter Note</source>
         <translation>Mus2: Entrer la Note</translation>
     </message>
     <message>
+        <location line="+39"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Length:</source>
         <translation>Longueur:</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Time Position:</source>
         <translation>Position temporelle:</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Pitch:</source>
         <translation>Hauteur</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Velocity On:</source>
         <translation>Vélocité On:</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Velocity Off:</source>
         <translation>Vélocité Off:</translation>
     </message>
@@ -3903,18 +3860,22 @@ 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>
     </message>
     <message>
+        <location line="+4"/>
         <source>Pitch</source>
         <translation>Hauteur</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Pressure</source>
         <translation>Pression</translation>
     </message>
     <message>
+        <location line="-8"/>
         <source>MusE: Enter Poly Aftertouch</source>
         <translation>Muse: Entrer la Pression polyphonique</translation>
     </message>
@@ -3937,22 +3898,27 @@ Typically, set to 127/127, or an unused
 <context>
     <name>EditSysexDialogBase</name>
     <message>
+        <location filename="../../muse/widgets/editsysexdialogbase.ui" line="+14"/>
         <source>MusE: Enter SysEx</source>
         <translation>MusE: Entrer le Sysex</translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>TimePosition:</source>
         <translation>Position temporelle</translation>
     </message>
     <message>
+        <location line="+48"/>
         <source>Comment:</source>
         <translation>Commentaire:</translation>
     </message>
     <message>
+        <location line="+37"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
@@ -3960,6 +3926,7 @@ Typically, set to 127/127, or an unused
 <context>
     <name>EditToolBar</name>
     <message>
+        <location filename="../../muse/widgets/tools.cpp" line="+17"/>
         <source>Edit Tools</source>
         <translation>Outils d&apos;Edition</translation>
     </message>
@@ -3967,54 +3934,67 @@ Typically, set to 127/127, or an unused
 <context>
     <name>EffectRack</name>
     <message>
+        <location filename="../../muse/mixer/rack.cpp" line="+102"/>
         <source>effect rack</source>
         <translation>rack d&apos;effets</translation>
     </message>
     <message>
+        <location line="+84"/>
         <source>move up</source>
         <translation>Déplacer vers le haut</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>move down</source>
         <translation>Déplacer vers le bas</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>remove</source>
         <translation>enlever</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>bypass</source>
         <translation>direct</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>show gui</source>
         <translation>montrer l&apos;interface</translation>
     </message>
     <message>
+        <location line="-6"/>
         <source>new</source>
         <translation>nouveau</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>change</source>
         <translation>changement</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>show native gui</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>save preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+138"/>
         <source>MusE: Save Preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+143"/>
         <source>Replace effect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>Do you really want to replace the effect %1?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4022,6 +4002,7 @@ Typically, set to 127/127, or an unused
 <context>
     <name>FLUIDGui</name>
     <message>
+        <location filename="../../synti/fluid/fluidgui.cpp" line="+55"/>
         <source>FLUID: open Soundfile</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4029,14 +4010,17 @@ Typically, set to 127/127, or an unused
 <context>
     <name>FLUIDGuiBase</name>
     <message>
+        <location filename="../../synti/fluid/fluidguibase.ui" line="+14"/>
         <source>Form1</source>
         <translation type="unfinished">Form1</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Soundfont</source>
         <translation type="unfinished">Set de Sons</translation>
     </message>
     <message>
+        <location line="+52"/>
         <source>Load</source>
         <translation type="unfinished">Charger</translation>
     </message>
@@ -4044,58 +4028,73 @@ Typically, set to 127/127, or an unused
 <context>
     <name>FLUIDSynthGuiBase</name>
     <message>
+        <location filename="../../synti/fluidsynth/fluidsynthguibase.ui" line="+14"/>
         <source>FLUID Synth</source>
         <translation type="unfinished">FLUID Synth</translation>
     </message>
     <message>
+        <location line="+459"/>
         <source>Gain</source>
         <translation type="unfinished">Gain</translation>
     </message>
     <message>
+        <location line="-225"/>
         <source>Room Size</source>
         <translation type="unfinished">Dimension de la chambre</translation>
     </message>
     <message>
+        <location line="-13"/>
         <source>Damping</source>
         <translation type="unfinished">Atténuation</translation>
     </message>
     <message>
+        <location line="-26"/>
+        <location line="+235"/>
         <source>Level</source>
         <translation type="unfinished">Niveau</translation>
     </message>
     <message>
+        <location line="-222"/>
         <source>Width</source>
         <translation type="unfinished">Largeur</translation>
     </message>
     <message>
+        <location line="+152"/>
         <source>Speed</source>
         <translation type="unfinished">Vitesse</translation>
     </message>
     <message>
+        <location line="+35"/>
         <source>Depth</source>
         <translation type="unfinished">Profondeur</translation>
     </message>
     <message>
+        <location line="-70"/>
         <source>Number</source>
         <translation type="unfinished">Nombre</translation>
     </message>
     <message>
+        <location line="-20"/>
         <source>Type</source>
         <translation type="unfinished">Type</translation>
     </message>
     <message>
+        <location line="-13"/>
         <source>Sine</source>
         <translation type="unfinished">Sinusoide</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Triangle</source>
         <translation type="unfinished">Triangle</translation>
     </message>
     <message>
+        <location line="-50"/>
         <source>Reverb</source>
         <translation type="unfinished">Réverb</translation>
     </message>
     <message>
+        <location line="+196"/>
         <source>Chorus</source>
         <translation type="unfinished">Chorus</translation>
     </message>
@@ -4116,6 +4115,7 @@ Typically, set to 127/127, or an unused
         <translation type="obsolete">Montrer les contrôles de fluidsynth</translation>
     </message>
     <message>
+        <location line="-423"/>
         <source>Load</source>
         <translation type="unfinished">charger</translation>
     </message>
@@ -4124,38 +4124,47 @@ Typically, set to 127/127, or an unused
         <translation type="obsolete">Enregistrer</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Delete</source>
         <translation type="unfinished">Effacer</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Dump Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Fontname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Chnl</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Soundfont</source>
         <translation type="unfinished">Set de Sons</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Drum Chnl</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+176"/>
         <source>CHANNEL SETUP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+246"/>
         <source>LOADED SOUNDFONTS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4167,27 +4176,33 @@ Typically, set to 127/127, or an unused
         <translation type="obsolete">Form1</translation>
     </message>
     <message>
+        <location filename="../../muse/widgets/fdialogbuttons.ui" line="+38"/>
         <source>Global</source>
         <translation>Global</translation>
     </message>
     <message>
+        <location line="+25"/>
         <source>User</source>
         <translation>Utilisateur</translation>
     </message>
     <message>
+        <location line="+25"/>
         <source>Project</source>
         <translation>Projet</translation>
     </message>
     <message>
+        <location line="-74"/>
         <source>fdialogbuttons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+121"/>
         <source>Songdata +
 Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>only
 Songdata</source>
         <translation type="unfinished"></translation>
@@ -4196,6 +4211,7 @@ Songdata</source>
 <context>
     <name>FluidSynthGui</name>
     <message>
+        <location filename="../../synti/fluidsynth/fluidsynthgui.cpp" line="+165"/>
         <source>Choose soundfont</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4211,73 +4227,87 @@ Songdata</source>
     <name>GateTimeBase</name>
     <message>
         <source>MusE: Modify Gate Time</source>
-        <translation>MusE: modifier le temps de fermeture (Gate
+        <translation type="obsolete">MusE: modifier le temps de fermeture (Gate
 Time)</translation>
     </message>
     <message>
         <source>Range</source>
-        <translation>Entre</translation>
+        <translation type="obsolete">Entre</translation>
     </message>
     <message>
         <source>All Events</source>
-        <translation>Tous les Evènements</translation>
+        <translation type="obsolete">Tous les Evènements</translation>
     </message>
     <message>
         <source>Selected Events</source>
-        <translation>Evènements choisis</translation>
+        <translation type="obsolete">Evènements choisis</translation>
     </message>
     <message>
         <source>Looped Events</source>
-        <translation>Evènements bouclés</translation>
+        <translation type="obsolete">Evènements bouclés</translation>
     </message>
     <message>
         <source>Selected &amp; Looped</source>
-        <translation>Boucle &amp; sélectionnée</translation>
+        <translation type="obsolete">Boucle &amp; sélectionnée</translation>
     </message>
     <message>
         <source>Values</source>
-        <translation>Valeurs</translation>
+        <translation type="obsolete">Valeurs</translation>
     </message>
     <message>
         <source>Rate:</source>
-        <translation>Vitesse:</translation>
+        <translation type="obsolete">Vitesse:</translation>
     </message>
     <message>
         <source>Offset:</source>
-        <translation>Décalage:</translation>
+        <translation type="obsolete">Décalage:</translation>
     </message>
     <message>
         <source>%</source>
-        <translation>%</translation>
+        <translation type="obsolete">%</translation>
     </message>
     <message>
         <source>OK</source>
-        <translation>OK</translation>
+        <translation type="obsolete">OK</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Annuler</translation>
+        <translation type="obsolete">Annuler</translation>
+    </message>
+</context>
+<context>
+    <name>GlobalSettingsConfig</name>
+    <message>
+        <location filename="../../muse/widgets/genset.cpp" line="+489"/>
+        <source>Selects instruments directory</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>GlobalSettingsDialogBase</name>
     <message>
+        <location filename="../../muse/widgets/gensetbase.ui" line="+14"/>
         <source>MusE: Global Settings</source>
         <translation>MusE: Paramètres</translation>
     </message>
     <message>
+        <location line="+530"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Mixer</source>
         <translation>Mixeur</translation>
     </message>
     <message>
+        <location line="+21"/>
+        <location line="+39"/>
         <source>dB</source>
         <translation>dB</translation>
     </message>
     <message>
+        <location line="-20"/>
         <source>min. Meter Value</source>
         <translation>Métrage mini</translation>
     </message>
@@ -4286,22 +4316,31 @@ Time)</translation>
         <translation type="obsolete">Val. mini du Curseur</translation>
     </message>
     <message>
+        <location line="+406"/>
         <source>Midi</source>
         <translation>Midi</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Ticks</source>
         <translation>Tics</translation>
     </message>
     <message>
+        <location line="-223"/>
+        <location line="+194"/>
+        <location line="+47"/>
         <source>1024</source>
         <translation>1024</translation>
     </message>
     <message>
+        <location line="-236"/>
+        <location line="+194"/>
+        <location line="+47"/>
         <source>2048</source>
         <translation>2048</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>4096</source>
         <translation>4096</translation>
     </message>
@@ -4310,75 +4349,117 @@ Time)</translation>
         <translation type="obsolete">8172</translation>
     </message>
     <message>
+        <location line="+86"/>
         <source>Displayed Resolution
 (Ticks/Quarternote)</source>
         <translation>Résolution affichée
 (Tics par 1/4 de note)</translation>
     </message>
     <message>
+        <location line="-48"/>
+        <location line="+63"/>
         <source>48</source>
         <translation>48</translation>
     </message>
     <message>
+        <location line="-58"/>
+        <location line="+63"/>
         <source>96</source>
         <translation>96</translation>
     </message>
     <message>
+        <location line="-58"/>
+        <location line="+63"/>
         <source>192</source>
         <translation>192</translation>
     </message>
     <message>
+        <location line="-58"/>
+        <location line="+63"/>
         <source>384</source>
         <translation>384</translation>
     </message>
     <message>
+        <location line="-58"/>
+        <location line="+63"/>
         <source>768</source>
         <translation>768</translation>
     </message>
     <message>
+        <location line="-58"/>
+        <location line="+63"/>
         <source>1536</source>
         <translation>1536</translation>
     </message>
     <message>
+        <location line="-58"/>
+        <location line="+63"/>
         <source>3072</source>
         <translation>3072</translation>
     </message>
     <message>
+        <location line="-58"/>
+        <location line="+63"/>
         <source>6144</source>
         <translation>6144</translation>
     </message>
     <message>
+        <location line="-58"/>
+        <location line="+63"/>
         <source>12288</source>
         <translation>12288</translation>
     </message>
     <message>
+        <location line="-163"/>
         <source>RTC Resolution
 (Ticks/Sec)</source>
         <translation>Résolution RTC 
 (Tics par sec.)</translation>
     </message>
     <message>
+        <location line="+212"/>
         <source>GUI</source>
         <translation>GUI</translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>/sec</source>
         <translation>/sec</translation>
     </message>
     <message>
+        <location line="-10"/>
         <source>GUI Refresh Rate</source>
         <translation>Vitesse de rafraîchissement de
 l&apos;interface</translation>
     </message>
     <message>
+        <location line="+72"/>
+        <source>Use project save dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>Some popup menus stay open (else hold Ctrl)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Allows some popup menus to stay open.
+Otherwise, hold Ctrl to keep them open.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
         <source>&amp;Apply</source>
         <translation>&amp;Appliquer</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>&amp;Ok</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Annuler</translation>
     </message>
@@ -4387,304 +4468,479 @@ l&apos;interface</translation>
         <translation type="obsolete">Navigateur pour l&apos;aide:</translation>
     </message>
     <message>
+        <location line="-1385"/>
         <source>Application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Views</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+6"/>
+        <location line="+47"/>
+        <location line="+37"/>
+        <location line="+144"/>
+        <location line="+56"/>
         <source>y-pos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-274"/>
+        <location line="+57"/>
+        <location line="+47"/>
+        <location line="+7"/>
         <source>show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-104"/>
+        <location line="+40"/>
+        <location line="+17"/>
+        <location line="+164"/>
+        <location line="+56"/>
         <source>x-pos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-267"/>
+        <location line="+77"/>
+        <location line="+104"/>
+        <location line="+56"/>
         <source>height</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-227"/>
+        <location line="+57"/>
+        <location line="+124"/>
+        <location line="+56"/>
         <source>width</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-140"/>
         <source>Mixer A</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Mixer B</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Big Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Arranger</source>
         <translation type="unfinished">Arrangeur</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Transport</source>
         <translation type="unfinished">Transport</translation>
     </message>
     <message>
+        <location line="+56"/>
+        <location line="+56"/>
+        <location line="+16"/>
+        <location line="+16"/>
+        <location line="+16"/>
         <source>set current values</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-101"/>
+        <location line="+56"/>
+        <location line="+16"/>
+        <location line="+16"/>
+        <location line="+16"/>
         <source>Cur</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Start Muse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+89"/>
         <source>show splash screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>show &quot;Did you know?&quot; dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-70"/>
         <source>start song:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Start song</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>start with last song</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>start with template: default.med</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>start with song</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+108"/>
         <source>min. Slider Val</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use Jack freewheel mode if possible.
-(Speeds up bounce operations).</source>
+        <location line="+60"/>
+        <source>Enable denormal protection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable denormal protection</source>
+        <location line="+10"/>
+        <source>Enable output limiter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable output limiter</source>
+        <location line="+131"/>
+        <source>External Waveditor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable in-place processing for VST plugins.
-(Requires restart.)</source>
+        <location line="+25"/>
+        <source>External Waveditor command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Turn this off if VST Ladspa effect rack plugins do not work or feedback loudly, even if they are supposed to be in-place capable.</source>
+        <location line="+44"/>
+        <source>Note: External editor opened from the internal editor.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>External Waveditor</source>
+        <location line="+15"/>
+        <source>Dummy Audio Driver (settings require restart)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>External Waveditor command</source>
+        <location line="+31"/>
+        <source>Hz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Note: External editor opened from the internal editor.</source>
+        <location line="+19"/>
+        <source>Period size (Frames per period):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dummy Audio Driver (settings require restart)</source>
+        <location line="-180"/>
+        <location line="+194"/>
+        <source>16</source>
+        <translation type="unfinished">16</translation>
+    </message>
+    <message>
+        <location line="-320"/>
+        <source>Try to use Jack Freewheel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Preferred sample rate</source>
+        <location line="+17"/>
+        <source>Speeds bounce operations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Actual rate used depends on limitations of
- timer used. If a high rate timer is available,
- short periods can be used with high sample rates. 
-Period affects midi playback resolution. 
-Shorter periods are desirable.</source>
+        <location line="+3"/>
+        <source>Use Jack Freewheel mode if possible.
+This dramatically speeds bounce operations.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Hz</source>
+        <location line="+38"/>
+        <source>VST in-place</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Actual rate used now (dummy or not):</source>
+        <location line="+10"/>
+        <source>Enable VST in-place processing (restart required)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>---</source>
+        <location line="+3"/>
+        <source>Enable VST in-place processing. Turn this off if 
+ 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>
     </message>
     <message>
-        <source>Period size (Frames per period):</source>
+        <location line="+13"/>
+        <source>Minimum control period</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>16</source>
-        <translation type="unfinished">16</translation>
+        <location line="+7"/>
+        <source>Minimum audio controller process period (samples).
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Minimum audio controller process period (samples).
+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>
     </message>
     <message>
+        <location line="+11"/>
+        <source>1</source>
+        <translation type="unfinished">1</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>2</source>
+        <translation type="unfinished">2</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>4</source>
+        <translation type="unfinished">4</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>8</source>
+        <translation type="unfinished">8</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+194"/>
         <source>32</source>
         <translation type="unfinished">32</translation>
     </message>
     <message>
+        <location line="-189"/>
+        <location line="+194"/>
         <source>64</source>
         <translation type="unfinished">64</translation>
     </message>
     <message>
+        <location line="-189"/>
+        <location line="+194"/>
         <source>128</source>
         <translation type="unfinished">128</translation>
     </message>
     <message>
+        <location line="-189"/>
+        <location line="+194"/>
         <source>256</source>
         <translation type="unfinished">256</translation>
     </message>
     <message>
+        <location line="-189"/>
+        <location line="+194"/>
         <source>512</source>
         <translation type="unfinished">512</translation>
     </message>
     <message>
+        <location line="-68"/>
+        <source>Sample rate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>Shorter periods give better midi playback resolution.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+96"/>
         <source>8192</source>
         <translation type="unfinished">5 1/3&apos; {8192?}</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>16384</source>
         <translation type="unfinished">5 1/3&apos; {16384?}</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>32768</source>
         <translation type="unfinished">5 1/3&apos; {32768?}</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Midi Resolution
 (Ticks/Quarternote)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+126"/>
+        <source>Instruments Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+85"/>
         <source>Use old-style stop shortcut:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Move single armed track with selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-791"/>
         <source>On Launch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+736"/>
         <source>Behavior</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>Header</name>
+    <message>
+        <location filename="../../muse/widgets/header.cpp" line="+134"/>
+        <source>Track Info Columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LMaster</name>
     <message>
+        <location filename="../../muse/master/lmaster.cpp" line="+170"/>
         <source>new tempo</source>
         <translation>nouveau tempo</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>new signature</source>
         <translation>nouvelle signature</translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Meter</source>
         <translation>Métrage</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Time</source>
         <translation>Temps</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Value</source>
         <translation>Valeur</translation>
     </message>
     <message>
+        <location line="-67"/>
         <source>MusE: Mastertrack</source>
         <translation>MusE: Piste principale</translation>
     </message>
     <message>
+        <location line="+42"/>
         <source>Tempo</source>
         <translation>Tempo</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Timesig</source>
         <translation>Signature Temporelle</translation>
     </message>
     <message>
+        <location line="-37"/>
         <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="+20"/>
         <source>Master tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Edit tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+6"/>
+        <source>Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>new key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+370"/>
         <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>
@@ -4692,22 +4948,27 @@ Shorter periods are desirable.</source>
 <context>
     <name>ListEdit</name>
     <message>
+        <location filename="../../muse/liste/listedit.cpp" line="+470"/>
         <source>&amp;Edit</source>
         <translation>&amp;Edition</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Cut</source>
         <translation>Couper</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Copy</source>
         <translation>Copier</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Paste</source>
         <translation>Coller</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Delete Events</source>
         <translation>Effacer évènements</translation>
     </message>
@@ -4724,6 +4985,7 @@ Shorter periods are desirable.</source>
         <translation type="obsolete">Insérer Note</translation>
     </message>
     <message>
+        <location line="-37"/>
         <source>insert Note</source>
         <translation>insére une note</translation>
     </message>
@@ -4732,6 +4994,7 @@ Shorter periods are desirable.</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>
     </message>
@@ -4740,6 +5003,7 @@ Shorter periods are desirable.</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>
     </message>
@@ -4748,6 +5012,7 @@ Shorter periods are desirable.</source>
         <translation type="obsolete">Insérer Meta</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>insert Meta</source>
         <translation>insére une balise Meta</translation>
     </message>
@@ -4764,6 +5029,7 @@ Shorter periods are desirable.</source>
         <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>
     </message>
@@ -4772,15 +5038,18 @@ Shorter periods are desirable.</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)
 polyphonique</translation>
     </message>
     <message>
+        <location line="+68"/>
         <source>Tick</source>
         <translation>Tic</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Bar</source>
         <translation>Mesure</translation>
     </message>
@@ -4789,38 +5058,47 @@ polyphonique</translation>
         <translation type="obsolete">Typ</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Ch</source>
         <translation>Can</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>Lon</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Comment</source>
         <translation>Commentaire</translation>
     </message>
     <message>
+        <location line="-32"/>
         <source>List tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Insert tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Type</source>
         <translation type="unfinished">Type</translation>
     </message>
@@ -4828,23 +5106,28 @@ polyphonique</translation>
 <context>
     <name>MITTransposeBase</name>
     <message>
+        <location filename="../../muse/widgets/mittransposebase.ui" line="+14"/>
         <source>MusE: Midi Input Plugin: Transpose</source>
         <translation>MusE: Plugin d&apos;Entrée Midi:
 Transposition</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>On</source>
         <translation>On</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>TriggerKey</source>
         <translation>Note de Déclenchement</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Transpose:</source>
         <translation>Transposition:</translation>
     </message>
     <message>
+        <location line="+31"/>
         <source>+0</source>
         <translation>+0</translation>
     </message>
@@ -4864,10 +5147,12 @@ 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>
     </message>
     <message>
+        <location line="+1"/>
         <source>GUI</source>
         <translation>GUI</translation>
     </message>
@@ -4876,14 +5161,17 @@ Transposition</translation>
         <translation type="obsolete">Enr</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Instrument</source>
         <translation>Instrument</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Device Name</source>
         <translation>Nom du Périphérique</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>State</source>
         <translation>Etat</translation>
     </message>
@@ -4892,158 +5180,238 @@ Transposition</translation>
         <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>
-        <source>Connect these to new midi tracks</source>
+        <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>
-        <source>Connect new midi tracks to this (first listed only)</source>
+        <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>
     </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>
-        <source>Connect these channels, on this port, to new midi tracks.
-Example:
- 1 2 3    channel 1 2 and 3
- 1-3      same
- 1-3 5    channel 1 2 3 and 5
- all      all channels
- none     no channels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connect new midi tracks to these channels, on this port.
-See default in channels.
-NOTE: Currently only one output port and channel supported (first found)</source>
-        <translation type="unfinished"></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>
     </message>
@@ -5051,42 +5419,56 @@ NOTE: Currently only one output port and channel supported (first found)</source
 <context>
     <name>MRConfigBase</name>
     <message>
+        <location filename="../../muse/mplugins/mrconfigbase.ui" line="+14"/>
         <source>MusE: Midi Input Plugin: Remote Control</source>
         <translation>MusE: Plugin d&apos;Entrée Midi: Contrôle
 Distant</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Activate</source>
         <translation>Activer</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>On</source>
         <translation>On</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Actions</source>
         <translation>Actions</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Stop</source>
         <translation>Stop</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Record</source>
         <translation>Enregistre</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Goto Left Mark</source>
         <translation>Aller � la Marque Gauche</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Play</source>
         <translation>Jouer</translation>
     </message>
+    <message>
+        <location line="+25"/>
+        <source>Insert rest (step rec) </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MTScale</name>
     <message>
+        <location filename="../../muse/widgets/mtscale.cpp" line="+27"/>
         <source>bar scale</source>
         <translation>Echelle de la mesure</translation>
     </message>
@@ -5094,30 +5476,37 @@ Distant</translation>
 <context>
     <name>MarkerView</name>
     <message>
+        <location filename="../../muse/marker/markerview.cpp" line="+197"/>
         <source>Bar:Beat:Tick</source>
         <translation>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>
     </message>
     <message>
+        <location line="+1"/>
         <source>Lock</source>
         <translation>Verrouillage</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Text</source>
         <translation>Texte</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Marker Properties</source>
         <translation>Propriétés du Marqueur</translation>
     </message>
     <message>
+        <location line="-53"/>
         <source>MusE: Marker</source>
         <translation>MusE: Marqueur</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>add marker</source>
         <translation>Ajouter marqueur</translation>
     </message>
@@ -5126,6 +5515,7 @@ Distant</translation>
         <translation type="obsolete">Ajoute un marqueur</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>delete marker</source>
         <translation>Effacer Marqueur</translation>
     </message>
@@ -5138,14 +5528,17 @@ Distant</translation>
         <translation type="obsolete">&amp;Fichier</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>&amp;Edit</source>
         <translation>&amp;Edition</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>marker-tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>edit tools</source>
         <translation type="unfinished">outils d&apos;édition</translation>
     </message>
@@ -5153,34 +5546,42 @@ Distant</translation>
 <context>
     <name>MasterEdit</name>
     <message>
+        <location filename="../../muse/master/masteredit.cpp" line="-15"/>
         <source>Cursor</source>
         <translation>Curseur</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Snap</source>
         <translation>Aligne</translation>
     </message>
     <message>
+        <location line="-10"/>
         <source>time at cursor position</source>
         <translation>Temps à la position du curseur</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>tempo at cursor position</source>
         <translation>Temps � la position du curseur</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>CurPos </source>
         <translation>PosCur</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>tempo at current position</source>
         <translation>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>
     </message>
     <message>
+        <location line="-58"/>
         <source>MusE: Mastertrack</source>
         <translation>MusE: PistePrincipale</translation>
     </message>
@@ -5197,6 +5598,7 @@ Distant</translation>
         <translation type="obsolete">Utiliser la piste principale</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>Info</source>
         <translation>Info</translation>
     </message>
@@ -5205,18 +5607,22 @@ Distant</translation>
         <translation type="obsolete">Off</translation>
     </message>
     <message>
+        <location line="-15"/>
         <source>Master tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Enable master</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Enable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Enable usage of master track</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5224,114 +5630,142 @@ Distant</translation>
 <context>
     <name>MetronomeConfigBase</name>
     <message>
+        <location filename="../../muse/widgets/metronomebase.ui" line="+14"/>
         <source>MusE: Metronome Config</source>
         <translation>MusE: Configuration du Métronome</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Metronome</source>
         <translation>Métronome</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Audio Beep</source>
         <translation>Bip audio</translation>
     </message>
     <message>
+        <location line="+65"/>
         <source>MIDI Click</source>
         <translation>Clic MIDI</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>Midi Channel</source>
         <translation>Canal Midi</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Measure Note</source>
         <translation>Note Mesure</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Measure Velocity</source>
         <translation>Vélocité de la Mesure</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Beat Velocity</source>
         <translation>Résolution (Beat) de la Vélocité</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Beat Note</source>
         <translation>Note de Résolution (Beat)</translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Midi Port</source>
         <translation>Port MIDI</translation>
     </message>
     <message>
+        <location line="+42"/>
         <source>Precount</source>
         <translation>Pré-compte</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>enable</source>
         <translation>activer</translation>
     </message>
     <message>
+        <location line="+34"/>
         <source>Bars</source>
         <translation>Mesures</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>From Mastertrack</source>
         <translation>de la Piste Principale</translation>
     </message>
     <message>
+        <location line="+34"/>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>Signature</source>
         <translation>Signature</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Prerecord</source>
         <translation>Pré-enregistrement</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Preroll</source>
         <translation>PreRoll</translation>
     </message>
     <message>
+        <location line="+38"/>
         <source>&amp;Apply</source>
         <translation>&amp;Appliquer</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>&amp;OK</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Annuler</translation>
     </message>
     <message>
+        <location line="-425"/>
         <source>Choose outputs...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+36"/>
         <source>50</source>
         <translation type="unfinished">5 1/3&apos; {50?}</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>% Audio volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+324"/>
         <source>Hint: Enable metronome in Transportpanel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>Alt+A</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Alt+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Alt+C</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5351,8 +5785,9 @@ midi</translation>
 <context>
     <name>MidiControllerEditDialogBase</name>
     <message>
+        <location filename="../../muse/instruments/ccontrolbase.ui" line="+16"/>
         <source>MusE: Define Midi Controller</source>
-        <translation type="obsolete">MusE: Définir un Contrôle Midi</translation>
+        <translation type="unfinished">MusE: Définir un Contrôle Midi</translation>
     </message>
     <message>
         <source>replace controller set</source>
@@ -5367,69 +5802,159 @@ midi</translation>
         <translation type="obsolete">Enregistrer le groupe de contrôles sous</translation>
     </message>
     <message>
+        <location line="+127"/>
         <source>Name                  </source>
-        <translation type="obsolete">Nom                  </translation>
+        <translation type="unfinished">Nom                  </translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Type       </source>
-        <translation type="obsolete">Type       </translation>
+        <translation type="unfinished">Type       </translation>
     </message>
     <message>
+        <location line="+11"/>
+        <location line="+266"/>
         <source>H-Ctrl</source>
-        <translation type="obsolete">H-Ctrl</translation>
+        <translation type="unfinished">H-Ctrl</translation>
     </message>
     <message>
+        <location line="-255"/>
+        <location line="+283"/>
         <source>L-Ctrl</source>
-        <translation type="obsolete">L-Ctrl</translation>
+        <translation type="unfinished">L-Ctrl</translation>
     </message>
     <message>
+        <location line="-272"/>
         <source>Min Val</source>
-        <translation type="obsolete">Val Min</translation>
+        <translation type="unfinished">Val Min</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Max Val</source>
-        <translation type="obsolete">Val Max</translation>
+        <translation type="unfinished">Val Max</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>list of defined controllers</source>
-        <translation type="obsolete">list des contrôles définis</translation>
+        <translation type="unfinished">list des contrôles définis</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>This is the MusE list of defined controllers.</source>
-        <translation type="obsolete">C&apos;est la liste des contrôles qui ont été
+        <translation type="unfinished">C&apos;est la liste des contrôles qui ont été
 définis.</translation>
     </message>
     <message>
+        <location line="+16"/>
+        <source>Managed Controller for Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Channel</source>
+        <translation type="unfinished">Canal</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <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>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>Properties</source>
-        <translation type="obsolete">Propriétés</translation>
+        <translation type="unfinished">Propriétés</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Name</source>
-        <translation type="obsolete">Nom</translation>
+        <translation type="unfinished">Nom</translation>
     </message>
     <message>
+        <location line="+38"/>
         <source>Max Value</source>
-        <translation type="obsolete">Valeur Max</translation>
+        <translation type="unfinished">Valeur Max</translation>
+    </message>
+    <message>
+        <location line="+66"/>
+        <source>RPN14</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>NRPN14</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Pitch</source>
+        <translation type="unfinished">Hauteur</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Program</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>Midi Controller Number High Byte</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+28"/>
+        <source>Midi Controller Number Low Byte</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-173"/>
         <source>Min Value</source>
-        <translation type="obsolete">Valeur Mini</translation>
+        <translation type="unfinished">Valeur Mini</translation>
+    </message>
+    <message>
+        <location line="-266"/>
+        <source>&amp;Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Alt+A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+60"/>
+        <source>A&amp;pply</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+24"/>
+        <source>Predefined Controller:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+247"/>
         <source>Control7</source>
-        <translation type="obsolete">Control7</translation>
+        <translation type="unfinished">Control7</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Control14</source>
-        <translation type="obsolete">Control8</translation>
+        <translation type="unfinished">Control8</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>RPN</source>
-        <translation type="obsolete">RPN</translation>
+        <translation type="unfinished">RPN</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>NRPN</source>
-        <translation type="obsolete">NRPN</translation>
+        <translation type="unfinished">NRPN</translation>
     </message>
     <message>
         <source>XG-SysEx</source>
@@ -5440,38 +5965,45 @@ définis.</translation>
         <translation type="obsolete">SysEx</translation>
     </message>
     <message>
+        <location line="-34"/>
         <source>Type</source>
-        <translation type="obsolete">Type</translation>
+        <translation type="unfinished">Type</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation type="obsolete">&amp;Nouveau</translation>
     </message>
     <message>
+        <location line="-306"/>
         <source>create new entry</source>
-        <translation type="obsolete">Crée une nouvelle entrée</translation>
+        <translation type="unfinished">Crée une nouvelle entrée</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>pressing the New button you create a new entry
 in the MusE list of defined controllers</source>
-        <translation type="obsolete">Crée une nouvelle entrée dans la liste des
+        <translation type="unfinished">Crée une nouvelle entrée dans la liste des
 contrôles</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>&amp;Delete</source>
-        <translation type="obsolete">&amp;Effacer</translation>
+        <translation type="unfinished">&amp;Effacer</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>delete selected entry</source>
-        <translation type="obsolete">efface l&apos;entrée sélectionnée</translation>
+        <translation type="unfinished">efface l&apos;entrée sélectionnée</translation>
     </message>
     <message>
+        <location line="+25"/>
         <source>&amp;OK</source>
-        <translation type="obsolete">&amp;Ok</translation>
+        <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>&amp;Cancel</source>
-        <translation type="obsolete">&amp;Annuler</translation>
+        <translation type="unfinished">&amp;Annuler</translation>
     </message>
 </context>
 <context>
@@ -5503,114 +6035,149 @@ Midi</translation>
 <context>
     <name>MidiFilterConfigBase</name>
     <message>
+        <location filename="../../muse/mplugins/midifilter.ui" line="+20"/>
         <source>MusE:  Midi Input Filter</source>
         <translation>MusE: Filtre Entrée Midi</translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Record Filter</source>
         <translation>Filtre d&apos;Enregistrement</translation>
     </message>
     <message>
+        <location line="+18"/>
+        <location line="+112"/>
         <source>Note On</source>
         <translation>Note On</translation>
     </message>
     <message>
+        <location line="-99"/>
+        <location line="+112"/>
         <source>Poly Pressure</source>
         <translation>Pression Poly</translation>
     </message>
     <message>
+        <location line="-99"/>
+        <location line="+112"/>
         <source>Controller</source>
         <translation>Contrôle</translation>
     </message>
     <message>
+        <location line="-99"/>
+        <location line="+112"/>
         <source>Program Change</source>
         <translation>Changement de son (Program Change)</translation>
     </message>
     <message>
+        <location line="-99"/>
+        <location line="+112"/>
         <source>After Touch</source>
         <translation>Pression (After Touch)</translation>
     </message>
     <message>
+        <location line="-99"/>
+        <location line="+112"/>
         <source>Pitch Bend</source>
         <translation>Molette de modulation - Hauteur</translation>
     </message>
     <message>
+        <location line="-99"/>
+        <location line="+112"/>
         <source>Sysex</source>
         <translation>SysEx</translation>
     </message>
     <message>
+        <location line="-96"/>
         <source>Thru Filter</source>
         <translation>Filtre Thru</translation>
     </message>
     <message>
+        <location line="+112"/>
         <source>Controller Filter</source>
         <translation>Filtre de contrôle</translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>Channel Filter</source>
         <translation>Filtre Canal</translation>
     </message>
     <message>
+        <location line="+24"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>13</source>
         <translation>13</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>15</source>
         <translation>15</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>11</source>
         <translation>11</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>1</source>
         <translation>1</translation>
     </message>
@@ -5618,6 +6185,8 @@ Midi</translation>
 <context>
     <name>MidiInputTransformDialog</name>
     <message>
+        <location filename="../../muse/mplugins/midiitransform.cpp" line="+703"/>
+        <location line="+2"/>
         <source>New</source>
         <translation>Nouveau</translation>
     </message>
@@ -5625,214 +6194,334 @@ Midi</translation>
 <context>
     <name>MidiInputTransformDialogBase</name>
     <message>
+        <location filename="../../muse/widgets/itransformbase.ui" line="+14"/>
         <source>MusE: Midi Input Transformator</source>
         <translation>MusE: Transformateur d&apos;Entrée Midi</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Filter</source>
         <translation>Filtre</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>All</source>
         <translation>Tous</translation>
     </message>
     <message>
+        <location line="+5"/>
+        <location line="+91"/>
+        <location line="+60"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Equal</source>
         <translation>Egal</translation>
     </message>
     <message>
+        <location line="-224"/>
+        <location line="+91"/>
+        <location line="+60"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Unequal</source>
         <translation>Différent de</translation>
     </message>
     <message>
+        <location line="-217"/>
         <source>Note</source>
         <translation>Note</translation>
     </message>
     <message>
+        <location line="+5"/>
+        <location line="+338"/>
         <source>Poly Pressure</source>
         <translation>Pression Poly</translation>
     </message>
     <message>
+        <location line="-333"/>
+        <location line="+338"/>
         <source>Control Change</source>
         <translation>Contrôle de Changement</translation>
     </message>
     <message>
+        <location line="-333"/>
+        <location line="+338"/>
         <source>Aftertouch</source>
         <translation>Pression</translation>
     </message>
     <message>
+        <location line="-333"/>
+        <location line="+338"/>
         <source>Pitch Bend</source>
         <translation>Molette de modulation</translation>
     </message>
     <message>
+        <location line="-333"/>
+        <location line="+338"/>
         <source>NRPN</source>
         <translation>NRPN</translation>
     </message>
     <message>
+        <location line="-333"/>
+        <location line="+338"/>
         <source>RPN</source>
         <translation>RPN</translation>
     </message>
     <message>
+        <location line="-330"/>
+        <location line="+369"/>
+        <location line="+43"/>
         <source>Value 2</source>
         <translation>Valeur 2</translation>
     </message>
     <message>
+        <location line="-402"/>
+        <location line="+392"/>
+        <location line="+96"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Value 1</source>
         <translation>Valeur 1</translation>
     </message>
     <message>
+        <location line="-586"/>
+        <location line="+257"/>
         <source>Event Type</source>
         <translation>Type d&apos;Evènements</translation>
     </message>
     <message>
+        <location line="-246"/>
+        <location line="+60"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Ignore</source>
         <translation>Ignore</translation>
     </message>
     <message>
+        <location line="-123"/>
+        <location line="+60"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Higher</source>
         <translation>Plus Haut</translation>
     </message>
     <message>
+        <location line="-133"/>
+        <location line="+60"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Lower</source>
         <translation>Plus Bas</translation>
     </message>
     <message>
+        <location line="-133"/>
+        <location line="+60"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Inside</source>
         <translation>A l&apos;intérieur</translation>
     </message>
     <message>
+        <location line="-133"/>
+        <location line="+60"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Outside</source>
         <translation>Al&apos;extérieur</translation>
     </message>
     <message>
+        <location line="+8"/>
+        <location line="+422"/>
         <source>Channel</source>
         <translation>Canal</translation>
     </message>
     <message>
+        <location line="-412"/>
+        <location line="+240"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
+        <location line="-192"/>
         <source>Processing</source>
         <translation>Travail</translation>
     </message>
     <message>
+        <location line="+23"/>
+        <location line="+51"/>
+        <location line="+129"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Keep</source>
         <translation>Garder</translation>
     </message>
     <message>
+        <location line="-283"/>
+        <location line="+71"/>
+        <location line="+129"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Fix</source>
         <translation>Fixer</translation>
     </message>
     <message>
+        <location line="-257"/>
+        <location line="+129"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Plus</source>
         <translation>Plus</translation>
     </message>
     <message>
+        <location line="-232"/>
+        <location line="+129"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Minus</source>
         <translation>Moins</translation>
     </message>
     <message>
+        <location line="-232"/>
+        <location line="+129"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Multiply</source>
         <translation>Multiplier</translation>
     </message>
     <message>
+        <location line="-232"/>
+        <location line="+129"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Divide</source>
         <translation>Diviser</translation>
     </message>
     <message>
+        <location line="-222"/>
+        <location line="+129"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Invert</source>
         <translation>Inverser</translation>
     </message>
     <message>
+        <location line="-232"/>
         <source>ScaleMap</source>
         <translation>Echelle</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Flip</source>
         <translation>Retourner</translation>
     </message>
     <message>
+        <location line="+5"/>
+        <location line="+119"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Dyn</source>
         <translation>Dyn</translation>
     </message>
     <message>
+        <location line="-222"/>
+        <location line="+119"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Random</source>
         <translation>Aléatoire</translation>
     </message>
     <message>
+        <location line="+48"/>
         <source>Modules</source>
         <translation>Modules</translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>enable modul 1</source>
         <translation>Activer module 1</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>enable modul 2</source>
         <translation>Activer module 2</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>enable modul 3</source>
         <translation>Activer module 3</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>enable modul 4</source>
         <translation>Activer module 4</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Preset</source>
         <translation>Réglages enregistrés</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Name:</source>
         <translation>Nom:</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>Comment:</source>
         <translation>Commentaires:</translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>Function</source>
         <translation>Fonction</translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>&amp;New</source>
         <translation>&amp;Nouveau</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>create new preset</source>
         <translation>Crée un nouveau réglage</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>&amp;Delete</source>
         <translation>&amp;Efface</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>delete preset</source>
         <translation>efface un réglage</translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>&amp;Dismiss</source>
         <translation>&amp;Rejeter</translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>PresetList</source>
         <translation>Liste de Réglages</translation>
     </message>
@@ -5931,74 +6620,95 @@ Midi</translation>
 <context>
     <name>MidiStrip</name>
     <message>
+        <location filename="../../muse/mixer/mstrip.cpp" line="+92"/>
+        <location line="+121"/>
+        <location line="+158"/>
         <source>off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-278"/>
+        <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="+20"/>
         <source>record</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>mute</source>
         <translation type="unfinished">silence</translation>
     </message>
     <message>
+        <location line="+21"/>
         <source>solo mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+67"/>
         <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>
@@ -6006,111 +6716,142 @@ Midi</translation>
 <context>
     <name>MidiSyncConfig</name>
     <message>
+        <location filename="../../muse/widgets/midisyncimpl.cpp" line="+41"/>
+        <location line="+29"/>
         <source>Port Number</source>
         <translation type="unfinished">Numéro de port</translation>
     </message>
     <message>
+        <location line="-28"/>
+        <location line="+29"/>
         <source>Name of the midi device associated with this port number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-27"/>
         <source>Midi clock input detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <location line="+29"/>
         <source>Midi tick input detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-28"/>
         <source>Midi real time input detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>MMC input detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>MTC input detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Detected SMPTE format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Receive id number. 127 = Global. Double click to edit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Accept midi clock input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Accept midi real time input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Accept MMC input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Accept MTC input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Receive start rewinds before playing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Transmit id number. 127 = Global. Double click to edit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Send midi clock output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Send midi realtime output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <location line="+49"/>
         <source>Send MMC output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-48"/>
+        <location line="+49"/>
         <source>Send MTC output</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+3"/>
         <source>Midi realtime input detected, including
  start/stop/continue, and song position.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>MMC input detected, including stop/play/deferred play, and locate.</source>
         <translation type="unfinished"></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>
     </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>
     </message>
     <message>
+        <location line="+2"/>
         <source>Receive id number. 127 = global receive all, even if not global.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <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,
@@ -6120,6 +6861,7 @@ Click on detect indicator to force another.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Accept midi realtime input, including
  start/stop/continue, and song position.
 Non-clock events (start,stop etc) are
@@ -6130,30 +6872,36 @@ This means you may have several master
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Accept MMC input, including stop/play/deferred play, and locate.</source>
         <translation type="unfinished"></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>
     </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>
     </message>
     <message>
+        <location line="+3"/>
         <source>Transmit id number. 127 = global transmit to all.</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+2"/>
         <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
@@ -6163,103 +6911,128 @@ Note: It may be impossible to rewind fast
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+142"/>
         <source>Port</source>
         <translation type="unfinished">Port</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>c</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>k</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>r</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>m</source>
         <translation type="unfinished">m</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>t</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>rid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>rc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>rr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>rm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>rt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>rw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>tid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>tc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>tr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>tm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>tt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+399"/>
         <source>MusE</source>
         <translation type="unfinished">MusE</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Settings have changed
 Apply sync settings?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>&amp;Apply</source>
         <translation type="unfinished">&amp;Appliquer</translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>&amp;No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>&amp;Abort</source>
         <translation type="unfinished">&amp;Annuler</translation>
     </message>
     <message>
+        <location line="+125"/>
         <source>&lt;none&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6267,70 +7040,87 @@ Apply sync settings?</source>
 <context>
     <name>MidiSyncConfigBase</name>
     <message>
+        <location filename="../../muse/widgets/midisync.ui" line="+17"/>
         <source>MusE: Midi Sync</source>
         <translation>MusE: Synchro Midi</translation>
     </message>
     <message>
+        <location line="+30"/>
         <source>Apply</source>
         <translation>Appliquer</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
+        <location line="+99"/>
         <source>hour</source>
         <translation>heure</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>h</source>
         <translation>h</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>minute</source>
         <translation>minute</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>second</source>
         <translation>second</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>s</source>
         <translation>s</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>frame</source>
         <translation>trame (frame)</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>f</source>
         <translation>f</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>subframe</source>
         <translation>trame fine (subframe)</translation>
     </message>
     <message>
+        <location line="-148"/>
         <source>24</source>
         <translation>24</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>25</source>
         <translation>25</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>30D</source>
         <translation>30D</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>30N</source>
         <translation>30N</translation>
     </message>
@@ -6395,39 +7185,48 @@ Apply sync settings?</source>
         <translation type="obsolete">tous</translation>
     </message>
     <message>
+        <location line="-46"/>
         <source>MTC</source>
         <translation>MTC</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>Type:</source>
         <translation>Type:</translation>
     </message>
     <message>
+        <location line="+60"/>
         <source>Offset:</source>
         <translation>Décalage:</translation>
     </message>
     <message>
+        <location line="+117"/>
         <source>Sync receiving and sending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Send and receive Jack transport</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Send and receive Jack transport information,
  including stop, start and position.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Use Jack transport</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Make MusE the Jack transport Timebase Master</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Make MusE the Jack transport Timebase Master.
 Allows Jack to show time as 
  MusE Bars, Beats, and Ticks. 
@@ -6437,14 +7236,17 @@ You can always click here again for Master.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Jack transport Timebase Master</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Control MusE timing by external midi clock or MTC sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>When in slave mode, tempo is
  controlled externally.
 MusE can sync to midi clock, or MTC quarter frame sync. 
@@ -6453,14 +7255,17 @@ Enabled inputs in the list will
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Slave to external sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Send start to first clock delay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Allows &apos;slow sync&apos; devices time
  to synchronize to MusE. This value is the
  delay from sending start to sending
@@ -6468,10 +7273,12 @@ Enabled inputs in the list will
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>ms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Send sync delay</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6479,10 +7286,12 @@ Enabled inputs in the list will
 <context>
     <name>MidiTrackInfoBase</name>
     <message>
+        <location filename="../../muse/widgets/mtrackinfobase.ui" line="+38"/>
         <source>MusE: TrackInfo</source>
         <translation>MusE: InfoPiste</translation>
     </message>
     <message>
+        <location line="+59"/>
         <source>output channel</source>
         <translation>canal de sortie</translation>
     </message>
@@ -6496,6 +7305,8 @@ sortie</translation>
         <translation type="obsolete">Info Piste</translation>
     </message>
     <message>
+        <location line="+249"/>
+        <location line="+91"/>
         <source>%</source>
         <translation>%</translation>
     </message>
@@ -6504,10 +7315,23 @@ sortie</translation>
         <translation type="obsolete">Nom de Piste</translation>
     </message>
     <message>
+        <location line="-353"/>
         <source>output port</source>
         <translation>port de sortie (Output Ch.)</translation>
     </message>
     <message>
+        <location line="+68"/>
+        <source>iR</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+109"/>
+        <location line="+44"/>
+        <location line="+287"/>
+        <location line="+53"/>
+        <location line="+53"/>
+        <location line="+67"/>
+        <location line="+70"/>
         <source>off</source>
         <translation>off</translation>
     </message>
@@ -6532,6 +7356,7 @@ sortie</translation>
         <translation type="obsolete">choisissez le groupe d&apos;instruments</translation>
     </message>
     <message>
+        <location line="-552"/>
         <source>Transp.</source>
         <translation>Transp.</translation>
     </message>
@@ -6540,26 +7365,47 @@ sortie</translation>
         <translation type="obsolete">Volume</translation>
     </message>
     <message>
+        <location line="+210"/>
         <source>Channel Info</source>
         <translation>Info canal</translation>
     </message>
     <message>
+        <location line="+35"/>
+        <source>Rec:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+200"/>
+        <source>Prog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+67"/>
+        <source>Vol</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+70"/>
         <source>Pan</source>
         <translation>Pan</translation>
     </message>
     <message>
+        <location line="-541"/>
         <source>Delay</source>
         <translation>Délai</translation>
     </message>
     <message>
+        <location line="+293"/>
         <source>H-Bank</source>
         <translation>H-Bank</translation>
     </message>
     <message>
+        <location line="-155"/>
         <source>Compr.</source>
         <translation>Compr.</translation>
     </message>
     <message>
+        <location line="+208"/>
         <source>L-Bank</source>
         <translation>L-Bank</translation>
     </message>
@@ -6568,10 +7414,12 @@ sortie</translation>
         <translation type="obsolete">Progr.</translation>
     </message>
     <message>
+        <location line="-255"/>
         <source>Velocity</source>
         <translation>Vélocité</translation>
     </message>
     <message>
+        <location line="-47"/>
         <source>Length</source>
         <translation>Longueur</translation>
     </message>
@@ -6605,108 +7453,119 @@ pour l&apos;enregistrement:
 5</translation>
     </message>
     <message>
+        <location line="-268"/>
         <source>all midi events are sent to this output channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>Out ch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+27"/>
         <source>input routing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Inputs</source>
-        <translation type="unfinished">Entrées</translation>
+        <translation type="obsolete">Entrées</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>output routing</source>
         <translation type="unfinished">chemin de sortie (routing)</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>oR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>input detect</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+5"/>
         <source>W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+25"/>
         <source>Midi thru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Pass input events through (&apos;thru&apos;) to output.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+288"/>
         <source>Select instrument patch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>&lt;unknown&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Record:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="+37"/>
         <source>Add all settings to song</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>All</source>
         <translation type="unfinished">Tous</translation>
     </message>
     <message>
+        <location line="+31"/>
         <source>Bank Select MSB. Double-click on/off.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+53"/>
         <source>Bank Select LSB. Double-click on/off.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+53"/>
         <source>Program. Double-click on/off.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>Add bank + prog settings to song</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Prog.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="+34"/>
         <source>Volume. Double-click on/off.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>Add vol setting to song</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Vol.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="+34"/>
+        <location line="+3"/>
         <source>Change stereo position. Double-click on/off.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>Add pan setting to song</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6714,230 +7573,345 @@ pour l&apos;enregistrement:
 <context>
     <name>MidiTransformDialogBase</name>
     <message>
+        <location filename="../../muse/widgets/transformbase.ui" line="+14"/>
         <source>MusE: Midi Transformator</source>
         <translation>MusE: Transformateur Midi</translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>&amp;New</source>
         <translation>&amp;Nouveau</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>&amp;Delete</source>
         <translation>&amp;Effacer</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>&amp;Apply</source>
         <translation>&amp;Appliquer</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>&amp;OK</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Annuler</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>PresetList</source>
         <translation>ListRéglages</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>Processing</source>
         <translation>Transformations</translation>
     </message>
     <message>
+        <location line="+12"/>
+        <location line="+425"/>
         <source>Event Type</source>
         <translation>Type d&apos;évènements</translation>
     </message>
     <message>
+        <location line="-414"/>
+        <location line="+56"/>
+        <location line="+104"/>
+        <location line="+54"/>
+        <location line="+55"/>
         <source>Keep</source>
         <translation>Garder</translation>
     </message>
     <message>
+        <location line="-264"/>
+        <location line="+76"/>
+        <location line="+104"/>
+        <location line="+54"/>
         <source>Fix</source>
         <translation>Fixer</translation>
     </message>
     <message>
+        <location line="-222"/>
+        <location line="+339"/>
         <source>Note</source>
         <translation>Note</translation>
     </message>
     <message>
+        <location line="-334"/>
+        <location line="+339"/>
         <source>Poly Pressure</source>
         <translation>Pression Poly</translation>
     </message>
     <message>
+        <location line="-334"/>
+        <location line="+339"/>
         <source>Control Change</source>
         <translation>Changement de Contrôle</translation>
     </message>
     <message>
+        <location line="-334"/>
+        <location line="+339"/>
         <source>Aftertouch</source>
         <translation>Pression</translation>
     </message>
     <message>
+        <location line="-334"/>
+        <location line="+339"/>
         <source>Pitch Bend</source>
         <translation>Molette de modulation</translation>
     </message>
     <message>
+        <location line="-334"/>
+        <location line="+339"/>
         <source>NRPN</source>
         <translation>NRPN</translation>
     </message>
     <message>
+        <location line="-334"/>
+        <location line="+339"/>
         <source>RPN</source>
         <translation>RPN</translation>
     </message>
     <message>
+        <location line="-325"/>
+        <location line="+104"/>
+        <location line="+54"/>
+        <location line="+55"/>
         <source>Plus</source>
         <translation>Addition</translation>
     </message>
     <message>
+        <location line="-208"/>
+        <location line="+104"/>
+        <location line="+54"/>
+        <location line="+55"/>
         <source>Minus</source>
         <translation>Soustraction</translation>
     </message>
     <message>
+        <location line="-208"/>
+        <location line="+104"/>
+        <location line="+54"/>
+        <location line="+55"/>
         <source>Multiply</source>
         <translation>Multiplication</translation>
     </message>
     <message>
+        <location line="-208"/>
+        <location line="+104"/>
+        <location line="+54"/>
+        <location line="+55"/>
         <source>Divide</source>
         <translation>Division</translation>
     </message>
     <message>
+        <location line="-203"/>
+        <location line="+43"/>
+        <location line="+265"/>
         <source>Value 2</source>
         <translation>Valeur 2</translation>
     </message>
     <message>
+        <location line="-303"/>
+        <location line="+104"/>
         <source>Invert</source>
         <translation>Inverser</translation>
     </message>
     <message>
+        <location line="-99"/>
         <source>ScaleMap</source>
         <translation>Echelle</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Flip</source>
         <translation>Retourner</translation>
     </message>
     <message>
+        <location line="+5"/>
+        <location line="+94"/>
         <source>Dyn</source>
         <translation>Dyn</translation>
     </message>
     <message>
+        <location line="-89"/>
+        <location line="+94"/>
         <source>Random</source>
         <translation>Aléatoire</translation>
     </message>
     <message>
+        <location line="-86"/>
+        <location line="+71"/>
+        <location line="+214"/>
         <source>Value 1</source>
         <translation>Valeur 1</translation>
     </message>
     <message>
+        <location line="-265"/>
+        <location line="+324"/>
         <source>Length</source>
         <translation>Longueur</translation>
     </message>
     <message>
+        <location line="-314"/>
         <source>Position</source>
         <translation>Position</translation>
     </message>
     <message>
+        <location line="+172"/>
         <source>Filter</source>
         <translation>Filtre</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>All</source>
         <translation>Tous</translation>
     </message>
     <message>
+        <location line="+5"/>
+        <location line="+91"/>
+        <location line="+59"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Equal</source>
         <translation>Egal</translation>
     </message>
     <message>
+        <location line="-223"/>
+        <location line="+91"/>
+        <location line="+59"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Unequal</source>
         <translation>Différent</translation>
     </message>
     <message>
+        <location line="-147"/>
+        <location line="+59"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Ignore</source>
         <translation>Ignore</translation>
     </message>
     <message>
+        <location line="-122"/>
+        <location line="+59"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Higher</source>
         <translation>Plus haut</translation>
     </message>
     <message>
+        <location line="-132"/>
+        <location line="+59"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Lower</source>
         <translation>Plus bas</translation>
     </message>
     <message>
+        <location line="-132"/>
+        <location line="+59"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Inside</source>
         <translation>A l&apos;intérieur</translation>
     </message>
     <message>
+        <location line="-132"/>
+        <location line="+59"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Outside</source>
         <translation>A l&apos;extérieur</translation>
     </message>
     <message>
+        <location line="-119"/>
         <source>Bar Range</source>
         <translation>Type de mesure</translation>
     </message>
     <message>
+        <location line="+197"/>
         <source>Preset</source>
         <translation>Réglages</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Name:</source>
         <translation>Nom:</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Comment:</source>
         <translation>Commentaire:</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Range</source>
         <translation>Type</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>process all events</source>
         <translation>Transformer tous les évènements</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>selected tracks</source>
         <translation>pistes sélectionnées</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>inside loop</source>
         <translation>dans la boucle</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Function</source>
         <translation>fonction</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Select</source>
         <translation>Sélectionner</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Quantize</source>
         <translation>Quantiser</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Delete</source>
         <translation>Effacer</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Transform</source>
         <translation>Transformer</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Insert</source>
         <translation>Insérer</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Copy</source>
         <translation>Copier</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Extract</source>
         <translation>Extraire</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Quantize Value</source>
         <translation>Valeur de Quantisation</translation>
     </message>
@@ -6945,6 +7919,8 @@ pour l&apos;enregistrement:
 <context>
     <name>MidiTransformerDialog</name>
     <message>
+        <location filename="../../muse/miditransform.cpp" line="+248"/>
+        <location line="+2"/>
         <source>New</source>
         <translation></translation>
     </message>
@@ -6952,6 +7928,7 @@ pour l&apos;enregistrement:
 <context>
     <name>MixdownFileDialog</name>
     <message>
+        <location filename="../../muse/widgets/mixdowndialog.cpp" line="+101"/>
         <source>Wave Files (*.wav);;All Files (*)</source>
         <translation>Fichiers Wave (*.wav);;Tous les Fichiers (*)</translation>
     </message>
@@ -6959,50 +7936,62 @@ pour l&apos;enregistrement:
 <context>
     <name>MixdownFileDialogBase</name>
     <message>
+        <location filename="../../muse/widgets/mixdowndialogbase.ui" line="+14"/>
         <source>MusE: Set Mixdown Wavefile</source>
         <translation>MusE: Fichier wav pour mixage</translation>
     </message>
     <message>
+        <location line="+39"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Annuler</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>File Path</source>
         <translation>Chemin d&apos;accés</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Channel</source>
         <translation>Canal</translation>
     </message>
     <message>
+        <location line="+31"/>
         <source>Stereo</source>
         <translation>Stéréo</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Mono</source>
         <translation>Mono</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>5.1</source>
         <translation>5.1</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>wav,16 Bit</source>
         <translation>wav,16 Bit</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>wav, 24 Bit</source>
         <translation>wav, 24 Bit</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>wav, 32 Bit (float)</source>
         <translation>wav, 32 Bit (flottant)</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Format</source>
         <translation>Format</translation>
     </message>
@@ -7041,14 +8030,17 @@ pour l&apos;enregistrement:
 <context>
     <name>MusE</name>
     <message>
+        <location filename="../../muse/app.cpp" line="+564"/>
         <source>&amp;File</source>
         <translation>&amp;Fichier</translation>
     </message>
     <message>
+        <location line="-376"/>
         <source>Open &amp;Recent</source>
         <translation>Ouvrir &amp;Récent</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Save &amp;As</source>
         <translation>Enregistrer &amp;Sous</translation>
     </message>
@@ -7057,34 +8049,43 @@ pour l&apos;enregistrement:
         <translation type="obsolete">Configuration Im&amp;primante</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Import Midifile</source>
         <translation>Importer fichier MIDI</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Export Midifile</source>
         <translation>Exporter fichier MIDI</translation>
     </message>
     <message>
+        <location line="+3"/>
+        <location filename="../../muse/wave.cpp" line="+810"/>
         <source>Import Wave File</source>
         <translation>Importer fichier WAV</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>&amp;Quit</source>
         <translation>&amp;Quitter</translation>
     </message>
     <message>
+        <location line="+383"/>
         <source>&amp;Edit</source>
         <translation>&amp;Edition</translation>
     </message>
     <message>
+        <location line="-380"/>
         <source>C&amp;ut</source>
         <translation>Co&amp;uper</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>&amp;Copy</source>
         <translation>&amp;Copier</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>&amp;Paste</source>
         <translation>Co&amp;ller</translation>
     </message>
@@ -7093,134 +8094,168 @@ pour l&apos;enregistrement:
         <translation type="obsolete">Effacer Piste</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Add Track</source>
         <translation>Ajouter Piste</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Select &amp;All</source>
         <translation>Selectionner &amp;Tout</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>&amp;Deselect All</source>
         <translation>&amp;Dé-selectionner tout</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Invert &amp;Selection</source>
         <translation>Inverser la &amp;Sélection</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>&amp;Inside Loop</source>
         <translation>A l&apos;&amp;intérieur de la Boucle</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>&amp;Outside Loop</source>
         <translation>A l&apos;e&amp;xtérieur de la Boucle</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>All &amp;Parts on Track</source>
         <translation>Tous les &amp;bouts de la Piste</translation>
     </message>
     <message>
+        <location line="-8"/>
         <source>Select</source>
         <translation>Sélectionner</translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Drums</source>
         <translation>Batterie</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <location line="+6"/>
         <source>List</source>
         <translation>Liste</translation>
     </message>
     <message>
+        <location line="-1"/>
         <source>Graphic</source>
         <translation>Graphique</translation>
     </message>
     <message>
+        <location line="-2"/>
         <source>Mastertrack</source>
         <translation>PistePrincipale</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Midi &amp;Transform</source>
         <translation>&amp;Transformation MIDI</translation>
     </message>
     <message>
+        <location line="+374"/>
         <source>Modify Gate Time</source>
         <translation>Modifier la Durée du Pont (Gate Time)</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Modify Velocity</source>
         <translation>Modifier la vélocité</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Crescendo</source>
         <translation>Crescendo</translation>
     </message>
     <message>
+        <location line="-344"/>
         <source>Transpose</source>
         <translation>Transposition</translation>
     </message>
     <message>
+        <location line="+345"/>
         <source>Thin Out</source>
         <translation>Sortie fine</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Erase Event</source>
         <translation>Effacer évènements</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Note Shift</source>
         <translation>Décalage de note</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Move Clock</source>
         <translation>Décalage horloge</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Copy Measure</source>
         <translation>Copier la mesure</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Erase Measure</source>
         <translation>Effacer la mesure</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Delete Measure</source>
         <translation>Supprimer la mesure</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Create Measure</source>
         <translation>Créer une mesure</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Mix Track</source>
         <translation>Mixeur Piste</translation>
     </message>
     <message>
+        <location line="-388"/>
         <source>Midi</source>
         <translation>MIDI</translation>
     </message>
     <message>
+        <location line="+412"/>
         <source>&amp;Structure</source>
         <translation>&amp;Structure</translation>
     </message>
     <message>
+        <location line="-390"/>
         <source>Global Cut</source>
         <translation>Couper tout</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Global Insert</source>
         <translation>Insérer tout</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Global Split</source>
         <translation>Diviser Tout</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Copy Range</source>
         <translation>Limites de Copie</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Cut Events</source>
         <translation>Couper Evènements</translation>
     </message>
@@ -7229,22 +8264,27 @@ pour l&apos;enregistrement:
         <translation type="obsolete">&amp;Affichage</translation>
     </message>
     <message>
+        <location line="-19"/>
         <source>Transport Panel</source>
         <translation>Panneau de Contrôle</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Bigtime Window</source>
         <translation>Fenêtre GrandeHorloge</translation>
     </message>
     <message>
-        <source>Don't Follow Song</source>
+        <location line="+53"/>
+        <source>Don&apos;t Follow Song</source>
         <translation>Ne pas suivre la chanson</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Follow Page</source>
         <translation>Défilement par page</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Follow Continuous</source>
         <translation>Défilement fin</translation>
     </message>
@@ -7253,18 +8293,22 @@ pour l&apos;enregistrement:
         <translation type="obsolete">&amp;Configuration</translation>
     </message>
     <message>
+        <location line="-8"/>
         <source>Global Settings</source>
         <translation>Paramètres Généraux</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Follow Song</source>
         <translation>suivre la chanson</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Metronome</source>
         <translation>Métronome</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Midi Sync</source>
         <translation>Synchro MIDI</translation>
     </message>
@@ -7273,6 +8317,7 @@ pour l&apos;enregistrement:
         <translation type="obsolete">Paramètres du fichier MIDI</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Appearance Settings</source>
         <translation>Apparence</translation>
     </message>
@@ -7293,14 +8338,17 @@ pour l&apos;enregistrement:
         <translation type="obsolete">Sauvegarder la Configuration</translation>
     </message>
     <message>
+        <location line="-38"/>
         <source>Midi Input Transform</source>
         <translation>Transformations Entrée MIDI</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Midi Input Filter</source>
         <translation>Filtres pour l&apos;Entrée MIDI</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Midi Remote Control</source>
         <translation>Contrôle MIDI à distance</translation>
     </message>
@@ -7309,6 +8357,7 @@ pour l&apos;enregistrement:
         <translation type="obsolete">Générateur aléatoire de rythmes</translation>
     </message>
     <message>
+        <location line="+386"/>
         <source>&amp;Midi</source>
         <translation>&amp;MIDI</translation>
     </message>
@@ -7321,34 +8370,47 @@ pour l&apos;enregistrement:
         <translation type="obsolete">Définir contrôles</translation>
     </message>
     <message>
+        <location line="-391"/>
         <source>Input Plugins</source>
         <translation>Plugins d&apos;Entrée</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Reset Instr.</source>
         <translation>Ré-initialisation des Instruments</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Init Instr.</source>
         <translation>Init. Instr.</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Local Off</source>
         <translation>Local Off</translation>
     </message>
     <message>
+        <location line="+354"/>
+        <source>&amp;View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+52"/>
         <source>&amp;Audio</source>
         <translation>&amp;Audio</translation>
     </message>
     <message>
+        <location line="-434"/>
         <source>Cliplist</source>
         <translation>ListClip</translation>
     </message>
     <message>
+        <location line="+31"/>
         <source>Bounce to Track</source>
         <translation>Rebondir (bounce) sur la piste</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Bounce to File</source>
         <translation>Rebondir (bounce) sur Fichier</translation>
     </message>
@@ -7357,6 +8419,7 @@ pour l&apos;enregistrement:
         <translation type="obsolete">Rebondir (bounce)</translation>
     </message>
     <message>
+        <location line="+443"/>
         <source>&amp;Help</source>
         <translation>&amp;Aide</translation>
     </message>
@@ -7377,16 +8440,21 @@ pour l&apos;enregistrement:
         <translation type="obsolete">Qu&apos;est-ce que c&apos;es&amp;t</translation>
     </message>
     <message>
+        <location line="+499"/>
         <source>MusE: load project</source>
         <translation>Muse: charger Projet</translation>
     </message>
     <message>
+        <location line="+114"/>
         <source>The current Project contains unsaved data
 Save Current Project?</source>
         <translation>Le Projet en cours contient des données 
 non encore sauvegardées. Enregistrer?</translation>
     </message>
     <message>
+        <location line="-1166"/>
+        <location line="+1168"/>
+        <location line="+1471"/>
         <source>&amp;Save</source>
         <translation>&amp;Enregistrer</translation>
     </message>
@@ -7395,26 +8463,41 @@ non encore sauvegardées. Enregistrer?</translation>
         <translation type="obsolete">&amp;Pas d&apos;enregistrement</translation>
     </message>
     <message>
+        <location line="+0"/>
+        <location filename="../../muse/importmidi.cpp" line="+68"/>
         <source>&amp;Abort</source>
         <translation>&amp;Annuler</translation>
     </message>
     <message>
+        <location line="-1275"/>
+        <location line="+13"/>
         <source>MusE: Save As</source>
         <translation>MusE: enregistrer sous</translation>
     </message>
     <message>
+        <location filename="../../muse/importmidi.cpp" line="-12"/>
         <source>MusE: Import Midi</source>
         <translation>MusE: importer fichier MIDI</translation>
     </message>
     <message>
+        <location filename="../../muse/exportmidi.cpp" line="+126"/>
         <source>MusE: Export Midi</source>
         <translation>MusE: exporter fichier MIDI</translation>
     </message>
     <message>
+        <location filename="../../muse/app.cpp" line="+57"/>
+        <location line="+197"/>
         <source>Nothing to edit</source>
         <translation>Rien � éditer</translation>
     </message>
     <message>
+        <location line="-177"/>
+        <location line="+6"/>
+        <source>New</source>
+        <translation type="unfinished">Nouveau</translation>
+    </message>
+    <message>
+        <location line="+1176"/>
         <source>The current Project contains unsaved data
 Load overwrites current Project:
 Save Current Project?</source>
@@ -7427,10 +8510,12 @@ avant d&apos;en ouvrir un autre?</translation>
         <translation type="obsolete">Ec&amp;raser</translation>
     </message>
     <message>
+        <location filename="../../muse/help.cpp" line="+33"/>
         <source>no help found at: </source>
         <translation>Pas d&apos;aide trouvée ici:</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>MusE: Open Help</source>
         <translation>MusE: Ouvrir l&apos;Aide</translation>
     </message>
@@ -7449,6 +8534,7 @@ une piste AUDIO</translation>
         <translation type="obsolete">annuler</translation>
     </message>
     <message>
+        <location filename="../../muse/app.cpp" line="-2744"/>
         <source>Und&amp;o</source>
         <translation>&amp;Annuler</translation>
     </message>
@@ -7457,18 +8543,22 @@ une piste AUDIO</translation>
         <translation type="obsolete">Refaire</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Re&amp;do</source>
         <translation>Re&amp;faire</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>undo last change to song</source>
         <translation>Annuler le dernier changement sur la chanson</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>redo last undo</source>
         <translation>Refaire ce qui a été annulé en dernier</translation>
     </message>
     <message>
+        <location line="+424"/>
         <source>Transport</source>
         <translation>Transport</translation>
     </message>
@@ -7477,6 +8567,7 @@ une piste AUDIO</translation>
         <translation type="obsolete">boucle</translation>
     </message>
     <message>
+        <location line="-410"/>
         <source>Loop</source>
         <translation>Boucle</translation>
     </message>
@@ -7485,6 +8576,7 @@ une piste AUDIO</translation>
         <translation type="obsolete">Punch-In</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Punchin</source>
         <translation>Punch-In</translation>
     </message>
@@ -7493,6 +8585,7 @@ une piste AUDIO</translation>
         <translation type="obsolete">Punch-Out</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Punchout</source>
         <translation>Punch-Out</translation>
     </message>
@@ -7501,6 +8594,7 @@ une piste AUDIO</translation>
         <translation type="obsolete">démarrer</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Start</source>
         <translation>Démarrer</translation>
     </message>
@@ -7509,6 +8603,7 @@ une piste AUDIO</translation>
         <translation type="obsolete">rembobiner</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Rewind</source>
         <translation>Rembobiner</translation>
     </message>
@@ -7517,6 +8612,7 @@ une piste AUDIO</translation>
         <translation type="obsolete">avance</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Forward</source>
         <translation>Avance</translation>
     </message>
@@ -7525,6 +8621,7 @@ une piste AUDIO</translation>
         <translation type="obsolete">stop</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Stop</source>
         <translation>Stop</translation>
     </message>
@@ -7533,6 +8630,7 @@ une piste AUDIO</translation>
         <translation type="obsolete">jouer</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Play</source>
         <translation>Jouer</translation>
     </message>
@@ -7541,6 +8639,7 @@ une piste AUDIO</translation>
         <translation type="obsolete">enregistrer</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Record</source>
         <translation>Enregistrer</translation>
     </message>
@@ -7549,6 +8648,8 @@ une piste AUDIO</translation>
         <translation type="obsolete">panique!</translation>
     </message>
     <message>
+        <location line="+6"/>
+        <location line="+349"/>
         <source>Panic</source>
         <translation>Panique!</translation>
     </message>
@@ -7557,6 +8658,7 @@ une piste AUDIO</translation>
         <translation type="obsolete">nouveau</translation>
     </message>
     <message>
+        <location line="-337"/>
         <source>&amp;New</source>
         <translation>&amp;Nouveau</translation>
     </message>
@@ -7565,6 +8667,7 @@ une piste AUDIO</translation>
         <translation type="obsolete">ouvrir</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>&amp;Open</source>
         <translation>&amp;Ouvrir</translation>
     </message>
@@ -7577,6 +8680,7 @@ une piste AUDIO</translation>
         <translation type="obsolete">rouleau Piano</translation>
     </message>
     <message>
+        <location line="+59"/>
         <source>Pianoroll</source>
         <translation>Rouleau-Piano</translation>
     </message>
@@ -7585,8 +8689,9 @@ une piste AUDIO</translation>
         <translation type="obsolete">partition</translation>
     </message>
     <message>
+        <location line="-11"/>
         <source>Score</source>
-        <translation type="obsolete">Partition</translation>
+        <translation type="unfinished">Partition</translation>
     </message>
     <message>
         <source>marker</source>
@@ -7597,6 +8702,7 @@ une piste AUDIO</translation>
         <translation type="obsolete">Marker</translation>
     </message>
     <message>
+        <location line="+262"/>
         <source>File Buttons</source>
         <translation>Boutons Fichiers</translation>
     </message>
@@ -7609,6 +8715,7 @@ une piste AUDIO</translation>
         <translation type="obsolete">aucun</translation>
     </message>
     <message>
+        <location line="+825"/>
         <source>MusE: Write File failed</source>
         <translation>MusE: échec de l&apos;enregistrement</translation>
     </message>
@@ -7617,10 +8724,14 @@ une piste AUDIO</translation>
         <translation type="obsolete">MusE: A propos</translation>
     </message>
     <message>
+        <location line="-141"/>
+        <location line="+399"/>
+        <location line="+1199"/>
         <source>MusE: Song: </source>
         <translation>MusE: chanson</translation>
     </message>
     <message>
+        <location filename="../../muse/importmidi.cpp" line="+42"/>
         <source>reading midifile
   </source>
         <translation>lecture du fichier MIDI
@@ -7634,17 +8745,22 @@ Echec</translation>
     </message>
     <message>
         <source>MusE: Copy Range</source>
-        <translation>MusE: limites de la copie</translation>
+        <translation type="obsolete">MusE: limites de la copie</translation>
     </message>
     <message>
         <source>not implemented</source>
-        <translation>Non-implémenté (désolé)</translation>
+        <translation type="obsolete">Non-implémenté (désolé)</translation>
     </message>
     <message>
         <source>MusE: Cut Events</source>
-        <translation>MusE: Couper Evènements</translation>
+        <translation type="obsolete">MusE: Couper Evènements</translation>
     </message>
     <message>
+        <location filename="../../muse/app.cpp" line="-191"/>
+        <location line="+10"/>
+        <location line="+31"/>
+        <location line="+34"/>
+        <location line="+8"/>
         <source>MusE: Bounce to Track</source>
         <translation>MusE: Rebondir sur la piste (bounce)</translation>
     </message>
@@ -7665,272 +8781,351 @@ choisissez une piste AUDIO en destination</translation>
 destination</translation>
     </message>
     <message>
+        <location line="-3164"/>
+        <location line="+18"/>
         <source>Failed to start audio!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-17"/>
         <source>Was not able to start audio, check if jack is running.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Timeout waiting for audio to run. Check if jack is running.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+677"/>
         <source>Import Part</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>&amp;Insert</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Paste c&amp;lone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Paste to &amp;track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Paste clone to trac&amp;k</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Insert Empty Measure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-9"/>
+        <source>Find unused wave files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>Delete Selected Tracks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+19"/>
+        <source>all parts in one staff</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>one staff per part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>New score window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Wave</source>
         <translation type="unfinished">Forme d&apos;Onde</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Song Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <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="+4"/>
         <source>Marker View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <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="+8"/>
         <source>Rhythm Generator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+9"/>
         <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="+6"/>
         <source>Configure Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Midi File Import/Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
         <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>
-        <source>View</source>
+        <location line="+380"/>
+        <source>A&amp;utomation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automation</source>
+        <location line="+10"/>
+        <source>Se&amp;ttings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Settings</source>
+        <location line="+635"/>
+        <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-346"/>
         <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: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+187"/>
         <source>MusE: load template</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+102"/>
+        <location line="+1471"/>
         <source>&amp;Skip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>MusE: Bounce</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>set left/right marker for bounce range</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="-244"/>
         <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 filename="../../muse/importmidi.cpp" line="-33"/>
         <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="+33"/>
         <source>
 failed: </source>
         <translation type="unfinished">
 échec:</translation>
     </message>
     <message>
+        <location line="+356"/>
         <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>
+        <location line="+121"/>
         <source> out of </source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+1"/>
         <source> could not be imported.
 Likely the track is the wrong type.</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>
         <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>
     <message>
+        <location filename="../../muse/help.cpp" 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>
@@ -7939,26 +9134,32 @@ browser on your machine.</source>
 <context>
     <name>NoteInfo</name>
     <message>
+        <location filename="../../muse/widgets/noteinfo.cpp" line="+33"/>
         <source>Start</source>
         <translation>Début</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Len</source>
         <translation>Long</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Pitch</source>
         <translation>Hauteur</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Velo On</source>
         <translation>Vélo on</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Velo Off</source>
         <translation>Vélo off</translation>
     </message>
     <message>
+        <location line="-50"/>
         <source>Note Info</source>
         <translation>Info Note</translation>
     </message>
@@ -7966,6 +9167,7 @@ browser on your machine.</source>
 <context>
     <name>OrganGuiBase</name>
     <message>
+        <location filename="../../synti/organ/organguibase.ui" line="+20"/>
         <source>MusE: Organ</source>
         <translation type="unfinished">MusE: Orgue</translation>
     </message>
@@ -7986,54 +9188,67 @@ browser on your machine.</source>
         <translation type="obsolete">enregistrer la liste des presets</translation>
     </message>
     <message>
+        <location line="+763"/>
         <source>O-1</source>
         <translation type="unfinished">O-1</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Oscillator</source>
         <translation type="unfinished">Oscillateur</translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Brass</source>
         <translation type="unfinished">Cuivres</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Reed</source>
         <translation type="unfinished">Roseau</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Flute</source>
         <translation type="unfinished">Flûte</translation>
     </message>
     <message>
+        <location line="-808"/>
         <source>Drawbars</source>
         <translation type="unfinished">Grands Tuyaux</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>16&apos;</source>
         <translation type="unfinished">16&apos;</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>4&apos;</source>
         <translation type="unfinished">4&apos;</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>2 2/3&apos;</source>
         <translation type="unfinished">2 2/3&apos;</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>2&apos;</source>
         <translation type="unfinished">2&apos;</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>8&apos;</source>
         <translation type="unfinished">8&apos;</translation>
     </message>
     <message>
+        <location line="-10"/>
         <source>5 1/3&apos;</source>
         <translation type="unfinished">5 1/3&apos;</translation>
     </message>
     <message>
+        <location line="+461"/>
         <source>Envelope Lo</source>
         <translation type="unfinished">Enveloppe basse (Lo)</translation>
     </message>
@@ -8054,34 +9269,52 @@ browser on your machine.</source>
         <translation type="obsolete">Relachement (ms)</translation>
     </message>
     <message>
+        <location line="-219"/>
         <source>Envelope Hi</source>
         <translation type="unfinished">Enveloppe Haute (Hi)</translation>
     </message>
     <message>
+        <location line="+12"/>
+        <location line="+252"/>
         <source>Release</source>
         <translation type="unfinished">Relachement</translation>
     </message>
     <message>
+        <location line="-242"/>
+        <location line="+232"/>
         <source>Sustain</source>
         <translation type="unfinished">Tenue</translation>
     </message>
     <message>
+        <location line="-222"/>
+        <location line="+212"/>
         <source>Decay</source>
         <translation type="unfinished">Affaiblissement</translation>
     </message>
     <message>
+        <location line="-196"/>
+        <location line="+186"/>
         <source>Attack</source>
         <translation type="unfinished">Attaque</translation>
     </message>
     <message>
+        <location line="-110"/>
+        <location line="+41"/>
+        <location line="+35"/>
+        <location line="+171"/>
+        <location line="+16"/>
+        <location line="+38"/>
         <source>ms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-244"/>
+        <location line="+222"/>
         <source>cB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+134"/>
         <source>Velocity</source>
         <translation type="unfinished">Vélocité</translation>
     </message>
@@ -8192,45 +9425,54 @@ browser on your machine.</source>
 <context>
     <name>PartCanvas</name>
     <message>
+        <location filename="../../muse/arranger/pcanvas.cpp" line="+485"/>
         <source>Cannot copy/move/clone to different Track-Type</source>
         <translation>Ne peut copier/déplacer vers une type de Piste
 différent</translation>
     </message>
     <message>
+        <location line="+258"/>
         <source>C&amp;ut</source>
         <translation>Co&amp;uper</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>&amp;Copy</source>
         <translation>&amp;Copier</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>rename</source>
         <translation>renommer</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>color</source>
         <translation>couleur</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>delete</source>
         <translation>effacer</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>split</source>
         <translation>séparer</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>glue</source>
         <translation>coller</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>de-clone</source>
         <translation>annuler-clônage</translation>
     </message>
     <message>
         <source>pianoroll</source>
-        <translation>rouleau-piano</translation>
+        <translation type="obsolete">rouleau-piano</translation>
     </message>
     <message>
         <source>score</source>
@@ -8238,22 +9480,25 @@ différent</translation>
     </message>
     <message>
         <source>list</source>
-        <translation>liste</translation>
+        <translation type="obsolete">liste</translation>
     </message>
     <message>
         <source>drums</source>
-        <translation>batterie</translation>
+        <translation type="obsolete">batterie</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>wave edit</source>
         <translation>édition wav</translation>
     </message>
     <message>
+        <location line="+1874"/>
         <source>Cannot paste: multiple tracks selected</source>
         <translation>Ne peut coller: plusieurs pistes
 sélectionnées</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Cannot paste: no track selected</source>
         <translation>Ne peut coller: pas de piste choisie</translation>
     </message>
@@ -8268,63 +9513,80 @@ AUDIO</translation>
 MIDI</translation>
     </message>
     <message>
+        <location line="+52"/>
         <source>Cannot paste: wrong data type</source>
         <translation>Ne peut coller: mauvais type de donnée</translation>
     </message>
     <message>
+        <location line="-1986"/>
         <source>s&amp;elect </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>clones</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>export</source>
+        <location line="+36"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <source>save part to disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>file info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+108"/>
         <source>MusE: save part</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Part name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1322"/>
         <source> out of </source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+1"/>
         <source> could not be pasted.
 Likely the selected track is the wrong type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+448"/>
         <source>Can only paste to midi/drum track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Can only paste to wave track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Can only paste to midi or wave track</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8346,6 +9608,7 @@ Likely the selected track is the wrong type.</source>
 <context>
     <name>PianoRoll</name>
     <message>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="+85"/>
         <source>&amp;Edit</source>
         <translation>&amp;Edition</translation>
     </message>
@@ -8386,6 +9649,7 @@ Likely the selected track is the wrong type.</source>
         <translation type="obsolete">Hors de la Boucle</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>&amp;Select</source>
         <translation>&amp;Sélectionner</translation>
     </message>
@@ -8402,6 +9666,7 @@ Likely the selected track is the wrong type.</source>
         <translation type="obsolete">couleurs pour la vélocité</translation>
     </message>
     <message>
+        <location line="+36"/>
         <source>&amp;Config</source>
         <translation>&amp;Configuration</translation>
     </message>
@@ -8410,182 +9675,241 @@ Likely the selected track is the wrong type.</source>
         <translation type="obsolete">couleur pour les évènements</translation>
     </message>
     <message>
+        <location line="+30"/>
         <source>&amp;Functions</source>
         <translation>&amp;Fonctions</translation>
     </message>
     <message>
         <source>Over Quantize</source>
-        <translation>Plus de Quantisation</translation>
+        <translation type="obsolete">Plus de Quantisation</translation>
     </message>
     <message>
         <source>Note On Quantize</source>
-        <translation>Quantisation Appui de Note</translation>
+        <translation type="obsolete">Quantisation Appui de Note</translation>
     </message>
     <message>
         <source>Note On/Off Quantize</source>
-        <translation>Quantisation Appui/Relachement de Note</translation>
+        <translation type="obsolete">Quantisation Appui/Relachement de Note</translation>
     </message>
     <message>
         <source>Iterative Quantize</source>
-        <translation>Quantisation itérative</translation>
+        <translation type="obsolete">Quantisation itérative</translation>
     </message>
     <message>
         <source>Config Quant...</source>
-        <translation type="unfinished">Config. Quant...</translation>
+        <translation type="obsolete">Config. Quant...</translation>
     </message>
     <message>
         <source>Modify Gate Time</source>
-        <translation>Modifier temps de fermeture (gate time)</translation>
+        <translation type="obsolete">Modifier temps de fermeture (gate time)</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Modify Velocity</source>
         <translation>Modifier la vélocité</translation>
     </message>
     <message>
         <source>Crescendo</source>
-        <translation>Crescendo</translation>
+        <translation type="obsolete">Crescendo</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Transpose</source>
         <translation>Transposition</translation>
     </message>
     <message>
         <source>Thin Out</source>
-        <translation>Sortie fine</translation>
+        <translation type="obsolete">Sortie fine</translation>
     </message>
     <message>
         <source>Erase Event</source>
-        <translation>Effacer Evènements</translation>
+        <translation type="obsolete">Effacer Evènements</translation>
     </message>
     <message>
         <source>Note Shift</source>
-        <translation>Décalage de Note</translation>
+        <translation type="obsolete">Décalage de Note</translation>
     </message>
     <message>
         <source>Move Clock</source>
-        <translation>Décalage temporel</translation>
+        <translation type="obsolete">Décalage temporel</translation>
     </message>
     <message>
         <source>Copy Measure</source>
-        <translation>Copier mesure</translation>
+        <translation type="obsolete">Copier mesure</translation>
     </message>
     <message>
         <source>Erase Measure</source>
-        <translation>Effacer mesure</translation>
+        <translation type="obsolete">Effacer mesure</translation>
     </message>
     <message>
         <source>Delete Measure</source>
-        <translation>Supprimer mesure</translation>
+        <translation type="obsolete">Supprimer mesure</translation>
     </message>
     <message>
         <source>Create Measure</source>
-        <translation>Créer mesure</translation>
+        <translation type="obsolete">Créer mesure</translation>
     </message>
     <message>
         <source>Pianoroll Tools</source>
         <translation type="obsolete">Outils de piano-roll</translation>
     </message>
     <message>
+        <location line="+37"/>
         <source>Step Record</source>
         <translation>Enregistrement pas-a-pas</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Midi Input</source>
         <translation>Entrée MIDI</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Play Events</source>
         <translation>Jouer Evènements</translation>
     </message>
     <message>
+        <location line="+41"/>
         <source>Add Controller View</source>
         <translation>Ajouter une vue de contrôles</translation>
     </message>
     <message>
+        <location line="-4"/>
         <source>ctrl</source>
         <translation>ctrl</translation>
     </message>
     <message>
+        <location line="-192"/>
         <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>&amp;Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Delete &amp;Events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+8"/>
         <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="+6"/>
         <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="+16"/>
+        <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="+6"/>
         <source>Pianoroll tools</source>
         <translation type="unfinished"></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>
     </message>
@@ -8593,82 +9917,102 @@ Likely the selected track is the wrong type.</source>
 <context>
     <name>PluginDialog</name>
     <message>
+        <location filename="../../muse/plugin.cpp" line="+3079"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
+        <location line="-49"/>
         <source>MusE: select plugin</source>
         <translation>MusE: choisir plugin</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Lib</source>
         <translation>Lib</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Label</source>
         <translation>Label</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Name</source>
         <translation>Nom</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>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>
     </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>
@@ -8676,30 +10020,38 @@ Likely the selected track is the wrong type.</source>
 <context>
     <name>PluginGui</name>
     <message>
+        <location line="+219"/>
+        <location line="+3"/>
         <source>bypass plugin</source>
         <translation>Plugin de Direct (bypass)</translation>
     </message>
     <message>
+        <location line="+543"/>
         <source>MusE: load preset</source>
         <translation>MusE: charger réglages</translation>
     </message>
     <message>
+        <location line="+66"/>
         <source>MusE: save preset</source>
         <translation>MusE: enregistrer réglages</translation>
     </message>
     <message>
+        <location line="-624"/>
         <source>File Buttons</source>
         <translation>Boutons Fichier</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Load Preset</source>
         <translation>Charger réglages</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Save Preset</source>
         <translation>Enregistrer réglages</translation>
     </message>
     <message>
+        <location line="+577"/>
         <source>Error reading preset. Might not be right type for this plugin</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8871,6 +10223,7 @@ port</translation>
 <context>
     <name>QObject</name>
     <message>
+        <location filename="../../muse/app.cpp" line="-2773"/>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8886,26 +10239,34 @@ port</translation>
         <translation type="obsolete">Vélocité</translation>
     </message>
     <message>
+        <location filename="../../muse/instruments/minstrument.cpp" line="+56"/>
+        <location filename="../../muse/liste/editevent.cpp" line="-410"/>
         <source>Cannot convert sysex string</source>
         <translation>Ne peut convertir le code sysex</translation>
     </message>
     <message>
+        <location line="+8"/>
+        <location filename="../../muse/liste/editevent.cpp" line="+8"/>
         <source>Hex String too long (2048 bytes limit)</source>
         <translation>Code Hexa tro long (limite: 2048 octets)</translation>
     </message>
     <message>
+        <location line="+189"/>
         <source>generic midi</source>
         <translation>MIDI générique</translation>
     </message>
     <message>
+        <location filename="../../muse/miditransform.cpp" line="+92"/>
         <source>new</source>
         <translation>nouveau</translation>
     </message>
     <message>
+        <location filename="../../muse/wave.cpp" line="-675"/>
         <source>create peakfile for </source>
         <translation>créer fichier de crêtes pour</translation>
     </message>
     <message>
+        <location filename="../../muse/widgets/filedialog.cpp" line="+63"/>
         <source>MusE: get file name</source>
         <translation>MusE: avoir le nom du fichier</translation>
     </message>
@@ -8931,14 +10292,17 @@ Le créer?</translation>
         <translation type="obsolete">Annuler</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>MusE: create directory</source>
         <translation>MusE: créer un répertoire</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>creating dir failed</source>
         <translation>échec de la création du répertoire</translation>
     </message>
     <message>
+        <location line="+396"/>
         <source>File
 </source>
         <translation>Fichier
@@ -8951,6 +10315,7 @@ exists</source>
 existe</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>MusE: write</source>
         <translation>MusE: écriture</translation>
     </message>
@@ -8963,22 +10328,27 @@ existe</translation>
         <translation type="obsolete">Quitter</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Open File
 </source>
         <translation>Ouvrir Fichier
 </translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>
 failed: </source>
         <translation>
 échec:</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>MusE: Open File</source>
         <translation>MusE: Ouvrir un Fichier</translation>
     </message>
     <message>
+        <location filename="../../muse/route.cpp" line="+1026"/>
+        <location line="+37"/>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8991,21 +10361,25 @@ failed: </source>
         <translation type="obsolete">Inconnu</translation>
     </message>
     <message>
+        <location filename="../../muse/waveedit/waveview.cpp" line="+616"/>
         <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>
@@ -9015,23 +10389,23 @@ exists. Overwrite?</source>
     <name>QuantConfig</name>
     <message>
         <source>Config Quantize</source>
-        <translation>Configuration de la Quantisation</translation>
+        <translation type="obsolete">Configuration de la Quantisation</translation>
     </message>
     <message>
         <source>Strength</source>
-        <translation>Force</translation>
+        <translation type="obsolete">Force</translation>
     </message>
     <message>
         <source>Don´t Quantize</source>
-        <translation>Ne pas quantiser</translation>
+        <translation type="obsolete">Ne pas quantiser</translation>
     </message>
     <message>
         <source>Quant Len</source>
-        <translation>Lon Quant</translation>
+        <translation type="obsolete">Lon Quant</translation>
     </message>
     <message>
         <source>MusE: Config Quantize</source>
-        <translation>MusE: Configuration de la Quantisation</translation>
+        <translation type="obsolete">MusE: Configuration de la Quantisation</translation>
     </message>
 </context>
 <context>
@@ -9064,391 +10438,558 @@ exists. Overwrite?</source>
 <context>
     <name>RhythmBase</name>
     <message>
+        <location filename="../../muse/mplugins/rhythmbase.ui" line="+14"/>
         <source>MusE: Random Rhythm Generator</source>
-        <translation type="obsolete">MusE: Générateur Aléatoire de Rythmes</translation>
+        <translation type="unfinished">MusE: Générateur Aléatoire de Rythmes</translation>
     </message>
     <message>
+        <location line="+21"/>
         <source>Instrument Properties</source>
-        <translation type="obsolete">Propriétés des Instruments</translation>
+        <translation type="unfinished">Propriétés des Instruments</translation>
     </message>
     <message>
+        <location line="+20"/>
+        <location line="+334"/>
         <source>counts/bar</source>
-        <translation type="obsolete">battements/mesure</translation>
+        <translation type="unfinished">battements/mesure</translation>
     </message>
     <message>
+        <location line="-324"/>
         <source>steps/count</source>
-        <translation type="obsolete">divisions/battements</translation>
+        <translation type="unfinished">divisions/battements</translation>
     </message>
     <message>
+        <location line="+10"/>
+        <location line="+325"/>
         <source># bars</source>
-        <translation type="obsolete"># mesure</translation>
+        <translation type="unfinished"># mesure</translation>
     </message>
     <message>
+        <location line="-315"/>
         <source>test</source>
-        <translation type="obsolete">test</translation>
+        <translation type="unfinished">test</translation>
     </message>
     <message>
+        <location line="+26"/>
+        <location line="+300"/>
         <source>contrib</source>
-        <translation type="obsolete">contrib</translation>
+        <translation type="unfinished">contrib</translation>
     </message>
     <message>
+        <location line="-290"/>
         <source>randomize</source>
-        <translation type="obsolete">aléatoire</translation>
+        <translation type="unfinished">aléatoire</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Group 1</source>
-        <translation type="obsolete">Groupe 1</translation>
+        <translation type="unfinished">Groupe 1</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Group 2</source>
-        <translation type="obsolete">Groupe 2</translation>
+        <translation type="unfinished">Groupe 2</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Group 3</source>
-        <translation type="obsolete">Groupe 3</translation>
+        <translation type="unfinished">Groupe 3</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Group 4</source>
-        <translation type="obsolete">Groupe 4</translation>
+        <translation type="unfinished">Groupe 4</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Group 5</source>
-        <translation type="obsolete">Groupe 5</translation>
+        <translation type="unfinished">Groupe 5</translation>
     </message>
     <message>
+        <location line="+34"/>
+        <location line="+228"/>
         <source>listen</source>
-        <translation type="obsolete">écoute</translation>
+        <translation type="unfinished">écoute</translation>
     </message>
     <message>
+        <location line="-218"/>
         <source>Instrument</source>
-        <translation type="obsolete">Instrument</translation>
+        <translation type="unfinished">Instrument</translation>
     </message>
     <message>
+        <location line="+36"/>
+        <location line="+127"/>
+        <source>Group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-100"/>
+        <location line="+339"/>
         <source>&amp;New</source>
-        <translation type="obsolete">&amp;Nouveau</translation>
+        <translation type="unfinished">&amp;Nouveau</translation>
     </message>
     <message>
+        <location line="-346"/>
         <source>create new entry</source>
-        <translation type="obsolete">créer une nouvelle entrée</translation>
+        <translation type="unfinished">créer une nouvelle entrée</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>pressing the New button you create a new entry
 in the MusE list of defined controllers</source>
-        <translation type="obsolete">en appuyant sur Nouveau vous créez une nouvelle entrée
+        <translation type="unfinished">en appuyant sur Nouveau vous créez une nouvelle entrée
 dans la liste des contrôles</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>&amp;Delete</source>
-        <translation type="obsolete">&amp;Effacer</translation>
+        <translation type="unfinished">&amp;Effacer</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>delete selected entry</source>
-        <translation type="obsolete">efface l&apos;entrée sélectionnée</translation>
+        <translation type="unfinished">efface l&apos;entrée sélectionnée</translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>Up</source>
-        <translation type="obsolete">Haut</translation>
+        <translation type="unfinished">Haut</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Down</source>
-        <translation type="obsolete">Bas</translation>
+        <translation type="unfinished">Bas</translation>
     </message>
     <message>
+        <location line="+43"/>
         <source>Instrument              </source>
-        <translation type="obsolete">Instrument</translation>
+        <translation type="unfinished">Instrument</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>steps/count      </source>
-        <translation type="obsolete">divisions/battement</translation>
+        <translation type="unfinished">divisions/battement</translation>
     </message>
     <message>
+        <location line="-35"/>
         <source>list of defined controllers</source>
-        <translation type="obsolete">liste des contrôles définis</translation>
+        <translation type="unfinished">liste des contrôles définis</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>This is the MusE list of defined controllers.</source>
-        <translation type="obsolete">Ceci est la liste des contrôles qui ont été
+        <translation type="unfinished">Ceci est la liste des contrôles qui ont été
 définis.</translation>
     </message>
     <message>
+        <location line="+178"/>
+        <source>&lt;b&gt;Notice!&lt;/b&gt;&lt;br&gt;
+Random Rhythm Generator is not enabled yet!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
         <source>&amp;File</source>
-        <translation type="obsolete">&amp;Fichier</translation>
+        <translation type="unfinished">&amp;Fichier</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>&amp;Edit</source>
-        <translation type="obsolete">&amp;Edition</translation>
+        <translation type="unfinished">&amp;Edition</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>&amp;Help</source>
-        <translation type="obsolete">&amp;Aide</translation>
+        <translation type="unfinished">&amp;Aide</translation>
     </message>
     <message>
+        <location line="-43"/>
         <source>Tools</source>
-        <translation type="obsolete">Outils</translation>
+        <translation type="unfinished">Outils</translation>
     </message>
     <message>
+        <location line="+63"/>
         <source>New</source>
-        <translation type="obsolete">Nouveau</translation>
+        <translation type="unfinished">Nouveau</translation>
     </message>
     <message>
+        <location line="+3"/>
+        <source>Ctrl+N</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+15"/>
         <source>Open</source>
-        <translation type="obsolete">Ouvrir</translation>
+        <translation type="unfinished">Ouvrir</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Open...</source>
-        <translation type="obsolete">&amp;Ouvrir...</translation>
+        <translation type="unfinished">&amp;Ouvrir...</translation>
     </message>
     <message>
+        <location line="+6"/>
+        <source>Ctrl+O</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+15"/>
         <source>Save</source>
-        <translation type="obsolete">Sauvegarder</translation>
+        <translation type="unfinished">Sauvegarder</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Sauvegarder</translation>
+        <translation type="unfinished">&amp;Sauvegarder</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Save As</source>
-        <translation type="obsolete">Sauvegarder sous</translation>
+        <translation type="unfinished">Sauvegarder sous</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>Save &amp;As...</source>
-        <translation type="obsolete">Sauvegarder &amp;sous...</translation>
+        <translation type="unfinished">Sauvegarder &amp;sous...</translation>
     </message>
     <message>
+        <location line="+21"/>
         <source>Print</source>
-        <translation type="obsolete">Imprimer</translation>
+        <translation type="unfinished">Imprimer</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Print...</source>
-        <translation type="obsolete">Im&amp;primer...</translation>
+        <translation type="unfinished">Im&amp;primer...</translation>
     </message>
     <message>
+        <location line="+6"/>
+        <source>Ctrl+P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
         <source>Exit</source>
-        <translation type="obsolete">Quitter</translation>
+        <translation type="unfinished">Quitter</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>E&amp;xit</source>
-        <translation type="obsolete">&amp;Quitter</translation>
+        <translation type="unfinished">&amp;Quitter</translation>
     </message>
     <message>
+        <location line="+21"/>
         <source>Undo</source>
-        <translation type="obsolete">Annuler</translation>
+        <translation type="unfinished">Annuler</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Undo</source>
-        <translation type="obsolete">&amp;Annuler</translation>
+        <translation type="unfinished">&amp;Annuler</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Ctrl+Z</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Redo</source>
-        <translation type="obsolete">Refaire</translation>
+        <translation type="unfinished">Refaire</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Redo</source>
-        <translation type="obsolete">&amp;Refaire</translation>
+        <translation type="unfinished">&amp;Refaire</translation>
     </message>
     <message>
+        <location line="+6"/>
+        <source>Ctrl+Y</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+15"/>
         <source>Cut</source>
-        <translation type="obsolete">Couper</translation>
+        <translation type="unfinished">Couper</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Cut</source>
-        <translation type="obsolete">Co&amp;uper</translation>
+        <translation type="unfinished">Co&amp;uper</translation>
     </message>
     <message>
+        <location line="+6"/>
+        <source>Ctrl+X</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+15"/>
         <source>Copy</source>
-        <translation type="obsolete">Copier</translation>
+        <translation type="unfinished">Copier</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>C&amp;opy</source>
-        <translation type="obsolete">&amp;Copier</translation>
+        <translation type="unfinished">&amp;Copier</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Ctrl+C</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Paste</source>
-        <translation type="obsolete">Coller</translation>
+        <translation type="unfinished">Coller</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Paste</source>
-        <translation type="obsolete">C&amp;oller</translation>
+        <translation type="unfinished">C&amp;oller</translation>
     </message>
     <message>
+        <location line="+6"/>
+        <source>Ctrl+V</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+15"/>
         <source>Find</source>
-        <translation type="obsolete">Rechercher</translation>
+        <translation type="unfinished">Rechercher</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Find...</source>
-        <translation type="obsolete">&amp;Rechercher...</translation>
+        <translation type="unfinished">&amp;Rechercher...</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Ctrl+F</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Contents</source>
-        <translation type="obsolete">Contenus</translation>
+        <translation type="unfinished">Contenus</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Contents...</source>
-        <translation type="obsolete">Co&amp;ntenus...</translation>
+        <translation type="unfinished">Co&amp;ntenus...</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Index</source>
-        <translation type="obsolete">Index</translation>
+        <translation type="unfinished">Index</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Index...</source>
-        <translation type="obsolete">&amp;Index...</translation>
+        <translation type="unfinished">&amp;Index...</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>About</source>
-        <translation type="obsolete">A propos</translation>
+        <translation type="unfinished">A propos</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;About...</source>
-        <translation type="obsolete">&amp;A propos...</translation>
+        <translation type="unfinished">&amp;A propos...</translation>
     </message>
 </context>
 <context>
     <name>RhythmGenerator</name>
     <message>
+        <location filename="../../muse/mplugins/rhythm.cpp" line="+229"/>
         <source>Form3</source>
-        <translation type="obsolete">Form3</translation>
+        <translation type="unfinished">Form3</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Instrument Settings:</source>
-        <translation type="obsolete">Réglages des Instruments:</translation>
+        <translation type="unfinished">Réglages des Instruments:</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Instrument</source>
-        <translation type="obsolete">Instrument</translation>
+        <translation type="unfinished">Instrument</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Hi-Hat</source>
-        <translation type="obsolete">Charley (Hi-Hat)</translation>
+        <translation type="unfinished">Charley (Hi-Hat)</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>add</source>
-        <translation type="obsolete">ajouter</translation>
+        <translation type="unfinished">ajouter</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>delete</source>
-        <translation type="obsolete">effacer</translation>
+        <translation type="unfinished">effacer</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>steps/count</source>
-        <translation type="obsolete">battements/division</translation>
+        <translation type="unfinished">battements/division</translation>
     </message>
     <message>
+        <location line="+21"/>
         <source>count/bar</source>
-        <translation type="obsolete">divisions/mesure</translation>
+        <translation type="unfinished">divisions/mesure</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source># bars</source>
-        <translation type="obsolete"># mesures</translation>
+        <translation type="unfinished"># mesures</translation>
     </message>
     <message>
+        <location line="+34"/>
         <source>Group Settings:</source>
-        <translation type="obsolete">Réglages des Groupes:</translation>
+        <translation type="unfinished">Réglages des Groupes:</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Group</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Group 1</source>
-        <translation type="obsolete">Groupe 1</translation>
+        <translation type="unfinished">Groupe 1</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Group 2</source>
-        <translation type="obsolete">Groupe 2</translation>
+        <translation type="unfinished">Groupe 2</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Group 3</source>
-        <translation type="obsolete">Groupe 3</translation>
+        <translation type="unfinished">Groupe 3</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Group 4</source>
-        <translation type="obsolete">Groupe 4</translation>
+        <translation type="unfinished">Groupe 4</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Group 5</source>
-        <translation type="obsolete">Groupe 5</translation>
+        <translation type="unfinished">Groupe 5</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>contrib</source>
-        <translation type="obsolete">contrib</translation>
+        <translation type="unfinished">contrib</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>listen</source>
-        <translation type="obsolete">écoute</translation>
+        <translation type="unfinished">écoute</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>Randomize</source>
-        <translation type="obsolete">Aléatoire</translation>
+        <translation type="unfinished">Aléatoire</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>Rhythm Style:</source>
-        <translation type="obsolete">Style de Rythme:</translation>
+        <translation type="unfinished">Style de Rythme:</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Clear</source>
-        <translation type="obsolete">Effacer</translation>
+        <translation type="unfinished">Effacer</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Open...</source>
-        <translation type="obsolete">Ouvrir...</translation>
+        <translation type="unfinished">Ouvrir...</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Save</source>
-        <translation type="obsolete">Sauvegarder</translation>
+        <translation type="unfinished">Sauvegarder</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Save as...</source>
-        <translation type="obsolete">Sauvegarder sous...</translation>
+        <translation type="unfinished">Sauvegarder sous...</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Generate</source>
-        <translation type="obsolete">Générer</translation>
+        <translation type="unfinished">Générer</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Close</source>
-        <translation type="obsolete">Fermer</translation>
+        <translation type="unfinished">Fermer</translation>
     </message>
 </context>
 <context>
     <name>RouteDialogBase</name>
     <message>
+        <location filename="../../muse/mixer/routedialogbase.ui" line="+20"/>
         <source>MusE: Routing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Add Route</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Source:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+24"/>
         <source>Destination:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>connect source to destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Current Routes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>remove selected route</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9456,66 +10997,57 @@ définis.</translation>
 <context>
     <name>SS_PluginChooserBase</name>
     <message>
+        <location filename="../../synti/simpledrums/sspluginchooserbase.ui" line="+16"/>
         <source>SimpleDrums - Ladspa Plugin Chooser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Name</source>
         <translation type="unfinished">Nom</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Label</source>
         <translation type="unfinished">Label</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Inports</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Outports</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Creator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+43"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+O</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SS_PluginFront</name>
-    <message>
-        <source>Clear and unload effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Load effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggle display of effect parameters</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Turn effect on/off</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>Score</name>
     <message>
         <source>Dynamics</source>
@@ -9677,14 +11209,17 @@ sélectionnées</translation>
 <context>
     <name>ScrollScale</name>
     <message>
+        <location filename="../../muse/widgets/scrollscale.cpp" line="+299"/>
         <source>next page</source>
         <translation>page suivante</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>previous page</source>
         <translation>page précédente</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>current page number</source>
         <translation>numéro de page courante</translation>
     </message>
@@ -9692,18 +11227,22 @@ sélectionnées</translation>
 <context>
     <name>ShortcutCaptureDialog</name>
     <message>
+        <location filename="../../muse/widgets/shortcutcapturedialog.cpp" line="+30"/>
         <source>Ok</source>
         <translation type="unfinished">Ok</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Cancel</source>
         <translation type="unfinished">Annuler</translation>
     </message>
     <message>
+        <location line="+52"/>
         <source>Shortcut conflicts with </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Undefined</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9711,30 +11250,38 @@ sélectionnées</translation>
 <context>
     <name>ShortcutCaptureDialogBase</name>
     <message>
+        <location filename="../../muse/widgets/shortcutcapturedialogbase.ui" line="+14"/>
         <source>Enter shortcut sequence</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Press keys to enter shortcut sequence!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+25"/>
         <source>Old shortcut:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
+        <location line="+24"/>
         <source>Undefined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-10"/>
         <source>New shortcut:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+27"/>
         <source>OK</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Cancel</source>
         <translation type="unfinished">Annuler</translation>
     </message>
@@ -9742,42 +11289,52 @@ sélectionnées</translation>
 <context>
     <name>ShortcutConfigBase</name>
     <message>
+        <location filename="../../muse/widgets/shortcutconfigbase.ui" line="+14"/>
         <source>Configure Keyboard Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+34"/>
         <source>Shortcut Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-5"/>
         <source>Shortcut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+37"/>
         <source>&amp;Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>&amp;Define</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>&amp;Apply</source>
         <translation type="unfinished">&amp;Appliquer</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+A</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9785,6 +11342,7 @@ sélectionnées</translation>
 <context>
     <name>SigScale</name>
     <message>
+        <location filename="../../muse/widgets/sigscale.cpp" line="+27"/>
         <source>signature scale</source>
         <translation>Echelle de la signature</translation>
     </message>
@@ -9792,6 +11350,7 @@ sélectionnées</translation>
 <context>
     <name>SimpleDrumsGuiBase</name>
     <message>
+        <location filename="../../synti/simpledrums/simpledrumsguibase.ui" line="+23"/>
         <source>DrumSynth 0.1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9799,25 +11358,25 @@ sélectionnées</translation>
 <context>
     <name>SimpleSynthGui</name>
     <message>
+        <location filename="../../synti/simpledrums/simpledrumsgui.cpp" line="+367"/>
         <source>&amp;Load setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>&amp;Save setup</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Load sample dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>Song</name>
     <message>
+        <location filename="../../muse/song.cpp" line="+2344"/>
         <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:
@@ -9836,55 +11395,71 @@ click on the Restart button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+189"/>
         <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>
-        <source>MusE was unable to launch the script
-</source>
+        <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>
     </message>
@@ -9892,22 +11467,32 @@ click on the Restart button.</source>
 <context>
     <name>SongInfo</name>
     <message>
+        <location filename="../../muse/widgets/songinfo.ui" line="+14"/>
         <source>Song Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+16"/>
+        <source>Show on song load</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>&amp;Ok</source>
         <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+O</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9930,31 +11515,39 @@ 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>
     </message>
     <message>
+        <location line="+75"/>
         <source>Soft Synthesizer</source>
         <translation>Synthétiseur Virtuel</translation>
     </message>
     <message>
+        <location line="+46"/>
         <source>File</source>
         <translation>Fichier</translation>
     </message>
     <message>
+        <location line="-115"/>
         <source>Instances</source>
         <translation>Exemplaires</translation>
     </message>
     <message>
+        <location line="+10"/>
+        <location line="+115"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
+        <location line="-17"/>
         <source>list of available software synthesizers</source>
         <translation>liste des synthétiseurs virtuels
 disponibles</translation>
     </message>
     <message>
+        <location line="-25"/>
         <source>Add Instance</source>
         <translation>Ajouter un Exemplaire</translation>
     </message>
@@ -9963,26 +11556,32 @@ disponibles</translation>
         <translation type="obsolete">Port Alsa</translation>
     </message>
     <message>
+        <location line="-58"/>
         <source>Remove Instance</source>
         <translation>Retirer un Exemplaire</translation>
     </message>
     <message>
+        <location line="-10"/>
         <source>Midi Port</source>
         <translation type="unfinished">Port MIDI</translation>
     </message>
     <message>
+        <location line="+38"/>
         <source>Midi connections</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+67"/>
         <source>Inst</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9990,18 +11589,22 @@ disponibles</translation>
 <context>
     <name>TList</name>
     <message>
+        <location filename="../../muse/arranger/tlist.cpp" line="+271"/>
         <source>Delete Track</source>
         <translation>Effacer la Piste</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Track Comment</source>
         <translation>Commentaire de Piste</translation>
     </message>
     <message>
+        <location line="+428"/>
         <source>Midi</source>
         <translation>Midi</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Drum</source>
         <translation>Batterie</translation>
     </message>
@@ -10011,65 +11614,135 @@ disponibles</translation>
     </message>
     <message>
         <source>Show Gui</source>
-        <translation>Montrer la Gui</translation>
+        <translation type="obsolete">Montrer la Gui</translation>
     </message>
     <message>
+        <location line="-725"/>
         <source>Add Midi Track</source>
         <translation>Ajouter une Piste Midi</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Add Drum Track</source>
         <translation>Ajouter une Piste de Batterie</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Add Wave Track</source>
         <translation>Ajouter une Piste Audio</translation>
     </message>
     <message>
+        <location line="-617"/>
         <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="+124"/>
+        <location line="+1176"/>
         <source>Update drummap?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-1175"/>
         <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="+1176"/>
         <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-1176"/>
+        <location line="+1176"/>
         <source>&amp;No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-1099"/>
+        <location line="+53"/>
+        <source>show gui</source>
+        <translation type="unfinished">montrer l&apos;interface</translation>
+    </message>
+    <message>
+        <location line="-44"/>
+        <location line="+53"/>
+        <source>show native gui</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+270"/>
         <source>Add Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Add Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Add Input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Add Aux Send</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+115"/>
+        <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="+610"/>
         <source>Do you want to use same port and channel for all instruments in the drummap?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10077,6 +11750,7 @@ disponibles</translation>
 <context>
     <name>TempoSig</name>
     <message>
+        <location filename="../../muse/transport.cpp" line="+103"/>
         <source>Tempo/Sig</source>
         <translation>Tempo/Sig</translation>
     </message>
@@ -10084,38 +11758,41 @@ disponibles</translation>
 <context>
     <name>Toolbar1</name>
     <message>
+        <location filename="../../muse/widgets/tb1.cpp" line="+21"/>
         <source>Solo</source>
         <translation>Solo</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>Snap</source>
         <translation>Aligne</translation>
     </message>
     <message>
         <source>Quantize</source>
-        <translation>Quantisation</translation>
+        <translation type="obsolete">Quantisation</translation>
     </message>
     <message>
         <source>To</source>
-        <translation>A</translation>
+        <translation type="obsolete">A</translation>
     </message>
     <message>
         <source>All Events</source>
-        <translation>Tous les Evènements</translation>
+        <translation type="obsolete">Tous les Evènements</translation>
     </message>
     <message>
         <source>Looped Ev.</source>
-        <translation>Ev. Bouclés</translation>
+        <translation type="obsolete">Ev. Bouclés</translation>
     </message>
     <message>
         <source>Selected Ev.</source>
-        <translation>Ev. Choisis</translation>
+        <translation type="obsolete">Ev. Choisis</translation>
     </message>
     <message>
         <source>Looped+Sel.</source>
-        <translation>Bouclés+Sél.</translation>
+        <translation type="obsolete">Bouclés+Sél.</translation>
     </message>
     <message>
+        <location line="-18"/>
         <source>Cursor</source>
         <translation>Curseur</translation>
     </message>
@@ -10123,10 +11800,12 @@ disponibles</translation>
 <context>
     <name>TrackComment</name>
     <message>
+        <location filename="../../muse/widgets/comment.cpp" line="+41"/>
         <source>MusE: Track Comment</source>
         <translation>Muse: Commentaire de Piste</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Track Comment:</source>
         <translation>Commentaire de Piste:</translation>
     </message>
@@ -10134,122 +11813,156 @@ 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>
     </message>
     <message>
+        <location line="-2"/>
+        <location line="+3"/>
         <source>Loop</source>
         <translation>Boucle</translation>
     </message>
     <message>
+        <location line="-2"/>
+        <location line="+3"/>
         <source>Punch Out</source>
         <translation>Punch-Out</translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>Left Mark</source>
         <translation>Marque Gauche</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Right Mark</source>
         <translation>Marque Droite</translation>
     </message>
     <message>
+        <location line="-95"/>
         <source>Overdub</source>
         <translation>Sur-enregistrement (Overdub)</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <location line="+15"/>
         <source>Replace</source>
         <translation>Remplace</translation>
     </message>
     <message>
+        <location line="-10"/>
         <source>Rec Mode</source>
         <translation>Mode Enregistrement</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Mix</source>
         <translation>Mix</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Cycle Rec</source>
         <translation>Enr. Cycle</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>punchin</source>
         <translation>Punch-In</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>loop</source>
         <translation>boucle</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>punchout</source>
         <translation>Punch-Out</translation>
     </message>
     <message>
+        <location line="+101"/>
         <source>rewind to start</source>
         <translation>rembobine au départ</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>rewind</source>
         <translation>rembobiner</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>forward</source>
         <translation>avance</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>stop</source>
         <translation>stop</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>play</source>
         <translation>jouer</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>record</source>
         <translation>enregistrement</translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>AC</source>
         <translation>AC</translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>quantize during record</source>
         <translation>quantise pendant l&apos;enregistrement</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Click</source>
         <translation>Clic</translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>metronom click on/off</source>
         <translation>clic du métronome oui/non</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Sync</source>
         <translation>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>
     </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>
     </message>
@@ -10258,52 +11971,55 @@ disponibles</translation>
     <name>TransposeDialogBase</name>
     <message>
         <source>MusE: Midi Transpose</source>
-        <translation>MusE: Transposition Midi</translation>
+        <translation type="obsolete">MusE: Transposition Midi</translation>
     </message>
     <message>
         <source>Value</source>
-        <translation>Valeur</translation>
+        <translation type="obsolete">Valeur</translation>
     </message>
     <message>
         <source>halftones</source>
-        <translation>demi-tons</translation>
+        <translation type="obsolete">demi-tons</translation>
     </message>
     <message>
         <source>Time</source>
-        <translation>Temps</translation>
+        <translation type="obsolete">Temps</translation>
     </message>
     <message>
         <source>all</source>
-        <translation>tous</translation>
+        <translation type="obsolete">tous</translation>
     </message>
     <message>
         <source>between markers</source>
-        <translation>entre les marqueurs</translation>
+        <translation type="obsolete">entre les marqueurs</translation>
     </message>
     <message>
         <source>Parts</source>
-        <translation>Pièces</translation>
+        <translation type="obsolete">Pièces</translation>
     </message>
     <message>
         <source>all in selected tracks</source>
-        <translation>tous dans les pistes sélectionnées</translation>
+        <translation type="obsolete">tous dans les pistes sélectionnées</translation>
     </message>
     <message>
         <source>OK</source>
-        <translation>OK</translation>
+        <translation type="obsolete">OK</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Annuler</translation>
+        <translation type="obsolete">Annuler</translation>
     </message>
 </context>
 <context>
     <name>VAMGui</name>
     <message>
+        <location filename="../../synti/vam/vamgui.cpp" line="+569"/>
         <source>MusE: Load VAM Presets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+110"/>
+        <location line="+18"/>
         <source>MusE: Save VAM Presets</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10311,131 +12027,186 @@ disponibles</translation>
 <context>
     <name>VAMGuiBase</name>
     <message>
+        <location filename="../../synti/vam/vamguibase.ui" line="+23"/>
         <source>Virtual Analogue for MusE</source>
         <translation type="unfinished">Synthé Analogique Virtuel pour Muse</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>LFO</source>
         <translation type="unfinished">LFO</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Freq</source>
         <translation type="unfinished">Frèq</translation>
     </message>
     <message>
+        <location line="+42"/>
+        <location line="+950"/>
+        <location line="+177"/>
         <source>Waveform</source>
         <translation type="unfinished">Forme d&apos;Onde</translation>
     </message>
     <message>
+        <location line="-1116"/>
+        <location line="+956"/>
+        <location line="+177"/>
         <source>Sine</source>
         <translation type="unfinished">Sinusoïde</translation>
     </message>
     <message>
+        <location line="-1128"/>
+        <location line="+956"/>
+        <location line="+177"/>
         <source>Pulse</source>
         <translation type="unfinished">Impulsion</translation>
     </message>
     <message>
+        <location line="-1128"/>
+        <location line="+956"/>
+        <location line="+177"/>
         <source>Saw</source>
         <translation type="unfinished">Dents-de-scie</translation>
     </message>
     <message>
+        <location line="-1128"/>
+        <location line="+956"/>
+        <location line="+177"/>
         <source>Triangle</source>
         <translation type="unfinished">Triangle</translation>
     </message>
     <message>
+        <location line="-1122"/>
         <source>Filter</source>
         <translation type="unfinished">Filtre</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>EnvMod</source>
         <translation type="unfinished">ModEnv</translation>
     </message>
     <message>
+        <location line="+10"/>
+        <location line="+717"/>
+        <location line="+427"/>
         <source>Attack</source>
         <translation type="unfinished">Attaque</translation>
     </message>
     <message>
+        <location line="-1134"/>
+        <location line="+645"/>
+        <location line="+531"/>
         <source>Decay</source>
         <translation type="unfinished">Affaiblissement</translation>
     </message>
     <message>
+        <location line="-1166"/>
+        <location line="+677"/>
+        <location line="+531"/>
         <source>Sustain</source>
         <translation type="unfinished">Tenue</translation>
     </message>
     <message>
+        <location line="-1198"/>
+        <location line="+677"/>
+        <location line="+401"/>
         <source>Release</source>
         <translation type="unfinished">Relachement</translation>
     </message>
     <message>
+        <location line="-972"/>
         <source>Cutoff</source>
         <translation type="unfinished">Limiteur (CutOff)</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Resonance</source>
         <translation type="unfinished">Résonance</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Invert</source>
         <translation type="unfinished">Inverser</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>KeyTrack</source>
         <translation type="unfinished">PisteClef</translation>
     </message>
     <message>
+        <location line="+153"/>
         <source>Presets</source>
         <translation type="unfinished">Presets</translation>
     </message>
     <message>
+        <location line="+65"/>
         <source>Set</source>
         <translation type="unfinished">Set</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>load preset list</source>
         <translation type="unfinished">charger la liste des presets</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>save preset list</source>
         <translation type="unfinished">enregistrer la liste des presets</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>save preset list to a new file</source>
         <translation type="unfinished">enregistrer la liste des presets dans un nouveau
 fichier</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>delete preset</source>
         <translation type="unfinished">efface le preset</translation>
     </message>
     <message>
+        <location line="+41"/>
         <source>DCO 1</source>
         <translation type="unfinished">DCO 1</translation>
     </message>
     <message>
+        <location line="+12"/>
+        <location line="+538"/>
         <source>Pitch</source>
         <translation type="unfinished">Hauteur</translation>
     </message>
     <message>
+        <location line="-506"/>
+        <location line="+480"/>
         <source>Detune</source>
         <translation type="unfinished">Désaccordage</translation>
     </message>
     <message>
+        <location line="-374"/>
+        <location line="+473"/>
         <source>PWM</source>
         <translation type="unfinished">PWM</translation>
     </message>
     <message>
+        <location line="-391"/>
+        <location line="+266"/>
         <source>FM</source>
         <translation type="unfinished">FM</translation>
     </message>
     <message>
+        <location line="-240"/>
+        <location line="+501"/>
         <source>PW</source>
         <translation type="unfinished">PW</translation>
     </message>
     <message>
+        <location line="-314"/>
         <source>DCO 2</source>
         <translation type="unfinished">DCO 2</translation>
     </message>
     <message>
+        <location line="+324"/>
         <source>On</source>
         <translation type="unfinished">On</translation>
     </message>
@@ -10454,6 +12225,7 @@ Jotsif Lindman Hörnlund
 ( jotsif@linux.nu )</translation>
     </message>
     <message utf8="true">
+        <location line="+122"/>
         <source>VAM 1.0beta3
 Virtual Analog for MusE
 Released under GPL.
@@ -10470,58 +12242,59 @@ Robert Jonsson
     <name>VelocityBase</name>
     <message>
         <source>MusE: Modify Velocity</source>
-        <translation>Muse: Modifier la vélocité</translation>
+        <translation type="obsolete">Muse: Modifier la vélocité</translation>
     </message>
     <message>
         <source>Range</source>
-        <translation>Taille</translation>
+        <translation type="obsolete">Taille</translation>
     </message>
     <message>
         <source>All Events</source>
-        <translation>Tous les Evènements</translation>
+        <translation type="obsolete">Tous les Evènements</translation>
     </message>
     <message>
         <source>Selected Events</source>
-        <translation>Evènements choisis</translation>
+        <translation type="obsolete">Evènements choisis</translation>
     </message>
     <message>
         <source>Looped Events</source>
-        <translation>Evènements bouclés</translation>
+        <translation type="obsolete">Evènements bouclés</translation>
     </message>
     <message>
         <source>Selected &amp; Looped</source>
-        <translation>Bouclés &amp; Sélectionnés</translation>
+        <translation type="obsolete">Bouclés &amp; Sélectionnés</translation>
     </message>
     <message>
         <source>Values</source>
-        <translation>Valeurs</translation>
+        <translation type="obsolete">Valeurs</translation>
     </message>
     <message>
         <source>Rate:</source>
-        <translation>Vitesse:</translation>
+        <translation type="obsolete">Vitesse:</translation>
     </message>
     <message>
         <source>Offset:</source>
-        <translation>Décalage:</translation>
+        <translation type="obsolete">Décalage:</translation>
     </message>
     <message>
         <source>%</source>
-        <translation>%</translation>
+        <translation type="obsolete">%</translation>
     </message>
     <message>
         <source>OK</source>
-        <translation>OK</translation>
+        <translation type="obsolete">OK</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Annuler</translation>
+        <translation type="obsolete">Annuler</translation>
     </message>
 </context>
 <context>
     <name>WTScale</name>
     <message>
+        <location filename="../../muse/widgets/wtscale.cpp" line="+29"/>
         <source>bar scale</source>
-        <translation type="obsolete">échelle de la mesure</translation>
+        <translation type="unfinished">échelle de la mesure</translation>
     </message>
 </context>
 <context>
@@ -10535,10 +12308,12 @@ Robert Jonsson
         <translation type="obsolete">weTools</translation>
     </message>
     <message>
+        <location filename="../../muse/waveedit/waveedit.cpp" line="+180"/>
         <source>Solo</source>
         <translation>Solo</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Cursor</source>
         <translation>Curseur</translation>
     </message>
@@ -10551,87 +12326,123 @@ Robert Jonsson
         <translation type="obsolete">Fonctions</translation>
     </message>
     <message>
+        <location line="-109"/>
         <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>
+        <location line="+2"/>
         <source>200%</source>
         <translation type="unfinished">5 1/3&apos; {200%?}</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>150%</source>
         <translation type="unfinished">5 1/3&apos; {150%?}</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>75%</source>
         <translation type="unfinished">5 1/3&apos; {75%?}</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>50%</source>
         <translation type="unfinished">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>
     </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>Wave edit tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>transport</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Pianoroll tools</source>
+        <location line="+8"/>
+        <source>WaveEdit tools</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -10673,10 +12484,12 @@ Robert Jonsson
 <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
@@ -10684,10 +12497,12 @@ 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.
 
@@ -10698,230 +12513,288 @@ Missing data is muted</source>
 <context>
     <name>freeverb</name>
     <message>
+        <location filename="../plugins/1050.ui" line="+20"/>
         <source>FreeVerb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Room Size</source>
         <translation type="unfinished">Dimension de la chambre</translation>
     </message>
     <message>
+        <location line="+88"/>
         <source>Damping</source>
         <translation type="unfinished">Atténuation</translation>
     </message>
     <message>
+        <location line="+60"/>
         <source>Wet Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../plugins/2142.ui" line="+26"/>
         <source>Tap-Reverberator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Decay [ms]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+59"/>
+        <location line="+41"/>
         <source>dB</source>
         <translation type="unfinished">dB</translation>
     </message>
     <message>
+        <location line="-31"/>
         <source>Dry Level [dB]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+41"/>
         <source>Wet Level [dB]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+72"/>
         <source>Preset:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>AfterBurn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>AfterBurn (Long)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Ambience</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Ambience (Thick)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Ambience (Thick) - HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Cathedral</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Cathedral - HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Drum Chamber</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Garage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Garage (Bright)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Gymnasium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Gymnasium (Bright)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Gymnasium (Bright) - HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Hall (Small)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Hall (Medium)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Hall (Large)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Hall (Large) - HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Plate (Small)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Plate (Medium)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Plate (Large)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Plate (Large) - HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Pulse Chamber</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Pulse Chamber (Reverse)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Resonator (96 ms)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Resonator (152 ms)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Resonator (208 ms)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Room (Small)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Room (Medium)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Room (Large)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Room (Large) - HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Slap Chamber</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Slap Chamber - HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Slap Chamber (Bright)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Slap Chamber (Bright) HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Smooth Hall (Small)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Smooth Hall (Medium)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Smooth Hall (Large)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Smooth Hall (Large) - HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Vocal Plate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Vocal Plate - HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Warble Chamber</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Warehoouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Warehouse - HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Comb Filters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Allpass Filters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Bandpass Filters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Enhanced Stereo</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/muse2/share/locale/muse_pl.ts b/muse2/share/locale/muse_pl.ts
index a36746a6..d7354e66 100644
--- a/muse2/share/locale/muse_pl.ts
+++ b/muse2/share/locale/muse_pl.ts
@@ -4,6 +4,7 @@
 <context>
     <name>@default</name>
     <message>
+        <location filename="../../muse/transport.cpp" line="+31"/>
         <source>Click this button to enable recording</source>
         <translation>Naciśnij ten przycisk, aby pozwolić na nagrywanie</translation>
     </message>
@@ -11,11 +12,12 @@
         <source>sets amount of quantization:
 0   - no quantization
 100 - full quantization</source>
-        <translation>stopień kwantyzacji:
+        <translation type="obsolete">stopień kwantyzacji:
 0 - bez kwantyzacji
 100 - pełna kwantyzacja</translation>
     </message>
     <message>
+        <location filename="../../muse/widgets/tools.cpp" line="+16"/>
         <source>select Pointer Tool:
 with the pointer tool you can:
   select parts
@@ -25,11 +27,13 @@ with the pointer tool you can:
 Strzałką możesz zaznaczać, przesuwać i kopiować klocki</translation>
     </message>
     <message>
+        <location filename="../../muse/app.cpp" line="+71"/>
         <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>
     </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.
@@ -37,78 +41,95 @@ 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>
     </message>
     <message>
+        <location filename="../../muse/transport.cpp" line="+1"/>
         <source>Click this button to stop playback</source>
         <translation>Zatrzymaj odtwarzanie.</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Click this button to start playback</source>
         <translation>Rozpocznij odtwarzanie.</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Click this button to rewind to start position</source>
         <translation>Przewiń do początku.</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Click this button to rewind</source>
         <translation>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>
     </message>
     <message>
         <source>don&apos;t quantize notes above this tick limit</source>
-        <translation>Nie kwantyzuj nut poniżej tego poziomu.</translation>
+        <translation type="obsolete">Nie kwantyzuj nut poniżej tego poziomu.</translation>
     </message>
     <message>
         <source>quantize also note len as default</source>
-        <translation>Kwantyzuj długości nut tak samo jak domyślnie.</translation>
+        <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>
     </message>
     <message>
+        <location line="+1"/>
         <source>record starts at left mark</source>
         <translation>Nagrywaj od lewego lokatora.</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>record stops at right mark</source>
         <translation>Nagrywaj od prawego lokatora.</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>rewind to start position</source>
         <translation>Przewiń do początku.</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>rewind current position</source>
         <translation>Przewijaj kursor do tyłu.</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>move current position</source>
         <translation>Przewijaj kursor do przodu.</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>stop sequencer</source>
         <translation>Zatrzymaj sekwencer.</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>start sequencer play</source>
         <translation>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>
     </message>
     <message>
+        <location line="+1"/>
         <source>send note off to all midi channels</source>
         <translation>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
@@ -117,77 +138,120 @@ with the pencil tool you can:
 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ę.
 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.
 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.
 Klejem możesz sklejać dwa klocki</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>select Score Tool:
 </source>
         <translation>Wybierz Podgląd Nutowy.</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>select Quantize Tool:
 insert display quantize event</source>
         <translation>Ustaw Kwantyzator
 (ustawia kwantyzację wstawiania komunikatów midi).</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>select Drawing Tool</source>
         <translation>wybierz Wykres</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>select Muting Tool:
 click on part to mute/unmute</source>
         <translation>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>
     </message>
     <message>
+        <location line="+1"/>
         <source>pencil</source>
         <translation>Ołówek</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>cutter</source>
         <translation>Nożyczki</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>score</source>
         <translation>Pogląd nutowy</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>glue</source>
         <translation>Klej</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>quantize</source>
         <translation>Kwantyzator</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>draw</source>
         <translation>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>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../muse/arranger/arranger.cpp" line="+136"/>
+        <location filename="../../muse/master/masteredit.cpp" line="+127"/>
+        <location filename="../../muse/widgets/comboQuant.cpp" line="+23"/>
+        <location line="+1"/>
+        <location line="+1"/>
+        <location filename="../../muse/widgets/tb1.cpp" line="+31"/>
+        <location line="+1"/>
+        <location line="+1"/>
         <source>Off</source>
         <translation>Wył.</translation>
     </message>
@@ -200,130 +264,189 @@ Kliknij na pojedynczy klocek aby go wyłączyć z odtwarzania.</translation>
         <translation type="obsolete">Wszystkie Pliki (*)</translation>
     </message>
     <message>
+        <location filename="../../muse/app.cpp" line="+645"/>
         <source>Add Midi Track</source>
         <translation>Dodaj Ślad Midi</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Add Drum Track</source>
         <translation>Dodaj Ślad Perkusyjny</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Add Wave Track</source>
         <translation>Dodaj Ślad Audio</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Add Audio Output</source>
         <translation>Dodaj Wyjście Audio</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Add Audio Group</source>
         <translation>Dodaj Grupę(Szynę) Audio</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Add Audio Input</source>
         <translation>Dodaj Wejście Audio</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Add Aux Send</source>
         <translation>Dodaj Wysyłkę Audio</translation>
     </message>
     <message>
+        <location filename="../../muse/widgets/tools.cpp" line="-8"/>
         <source>eraser</source>
         <translation>Gumka</translation>
     </message>
     <message>
+        <location filename="../../muse/app.cpp" line="-66"/>
         <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="+56"/>
+        <location filename="../../muse/arranger/tlist.cpp" line="+970"/>
         <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="+714"/>
         <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="+225"/>
+        <location filename="../../muse/driver/jackmidi.cpp" line="+737"/>
+        <location filename="../../muse/midiport.cpp" line="+1072"/>
+        <location filename="../../muse/track.cpp" line="+782"/>
+        <location line="+16"/>
+        <location line="+30"/>
         <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="+34"/>
+        <location filename="../../muse/driver/jackmidi.cpp" line="+36"/>
+        <location filename="../../muse/midiport.cpp" line="+7"/>
+        <location filename="../../muse/track.cpp" line="-48"/>
+        <location line="+60"/>
         <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="-61"/>
+        <location line="+64"/>
+        <location filename="../../muse/track.cpp" line="-42"/>
+        <location line="+48"/>
         <source> type=&quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location filename="../../muse/driver/jackmidi.cpp" line="-61"/>
+        <location line="+64"/>
+        <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="-69"/>
+        <location filename="../../muse/track.cpp" line="-56"/>
         <source>source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../../muse/midictrl.cpp" line="+227"/>
         <source>Velocity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../../muse/midiport.cpp" line="-756"/>
         <source>&lt;none&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+750"/>
+        <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="+1316"/>
         <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>
@@ -331,6 +454,7 @@ Kliknij na pojedynczy klocek aby go wyłączyć z odtwarzania.</translation>
 <context>
     <name>AboutBox</name>
     <message>
+        <location filename="../../muse/widgets/aboutbox.ui" line="+14"/>
         <source>AboutBox</source>
         <translation>O Programie</translation>
     </message>
@@ -356,10 +480,12 @@ Opublikowane na zasadzie licencji GNU Public License
 </translation>
     </message>
     <message>
+        <location line="+37"/>
         <source>Version 2 pre-alpha</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>(C) Copyright 1999-2010 Werner Schweer and others.
 See http://www.muse-sequencer.org for new versions and
 more information.
@@ -368,10 +494,12 @@ Published under the GNU Public License</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>&amp;Keep On Rocking!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+K</source>
         <translation type="unfinished"></translation>
     </message>
@@ -379,60 +507,78 @@ Published under the GNU Public License</source>
 <context>
     <name>Appearance</name>
     <message>
+        <location filename="../../muse/appearance.cpp" line="+751"/>
         <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>
-        <source>&lt;none&gt;</source>
+        <location line="+2"/>
+        <source>Global opacity (opposite of transparency).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select style sheet</source>
+        <location line="+4"/>
+        <source>Standard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Qt style sheets (*.qss)</source>
+        <location line="+2"/>
+        <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Global opaqueness (inverse of transparency).</source>
+        <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>
@@ -440,284 +586,398 @@ Word-breaking but only with spaces.</source>
     <name>AppearanceDialogBase</name>
     <message>
         <source>MusE: Appearance Settings</source>
-        <translation type="unfinished">MuzA: Wygląd aplikacji.</translation>
+        <translation type="obsolete">MuzA: Wygląd aplikacji.</translation>
     </message>
     <message>
+        <location filename="../../muse/widgets/appearancebase.ui" line="+1681"/>
         <source>Apply</source>
         <translation>Zastosuj</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Ok</source>
         <translation>Akceptuj</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
     <message>
+        <location line="-1668"/>
         <source>Arranger</source>
         <translation>Główne Okno</translation>
     </message>
     <message>
+        <location line="-16"/>
+        <source>MusE: Appearance settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>Parts</source>
         <translation>Klocki</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>show names</source>
         <translation>pokaż nazwy</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>show events</source>
         <translation>pokaż elementy midi</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>show Cakewalk Style</source>
         <translation>pokaż w stylu Cakewalk</translation>
     </message>
     <message>
+        <location line="+28"/>
+        <source>y-stretch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+15"/>
         <source>Events</source>
         <translation>Elementy midi</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>note on</source>
         <translation>Dźwięki</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>poly pressure</source>
         <translation>Poly pressure</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>controller</source>
         <translation>Kontrolery midi</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>aftertouch</source>
         <translation>Nacisk pod uderzeniu (aftertouch)</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>pitch bend</source>
         <translation>Odchylenie stroju (Pitch Bend)</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>program change</source>
         <translation>Zmiana programu (program change)</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>special</source>
         <translation>specjalne</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Background picture</source>
         <translation>Obrazek w tle</translation>
     </message>
     <message>
         <source>bg</source>
-        <translation>tło</translation>
+        <translation type="obsolete">tło</translation>
     </message>
     <message>
         <source>select...</source>
-        <translation>wybierz...</translation>
+        <translation type="obsolete">wybierz...</translation>
     </message>
     <message>
+        <location line="+58"/>
         <source>show snap grid</source>
         <translation>pokaż siatkę przyciągania</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Colors</source>
         <translation>Kolory</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Items</source>
         <translation>Składniki</translation>
     </message>
     <message>
+        <location line="+756"/>
+        <source>Color name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Global opacity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
         <source>Style/Fonts</source>
         <translation>Style/Czcionki</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>QT Theme</source>
         <translation>Styl Qt</translation>
     </message>
     <message>
+        <location line="+21"/>
         <source>Windows</source>
         <translation>Windows</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>MusE</source>
         <translation>MuzA</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Metal</source>
         <translation>Metaliczny</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Norwegian Wood</source>
         <translation>Norweskie drzewo</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Platinum</source>
         <translation>Platyna</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>CDE</source>
         <translation>CDE</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Motif</source>
         <translation>Motif</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Motif Plus</source>
         <translation>Motif Plus</translation>
     </message>
     <message>
+        <location line="+73"/>
         <source>Fonts</source>
         <translation>Czcionki</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Family</source>
         <translation>Rodzina Czcionek</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Size</source>
         <translation>Rozmiar</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Font 1</source>
         <translation>Czcionka 1</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Font 2</source>
         <translation>Czcionka 2</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Font 3</source>
         <translation>Czcionka 3</translation>
     </message>
     <message>
+        <location line="+50"/>
         <source>Font 0</source>
         <translation>Czcionka 0</translation>
     </message>
     <message>
+        <location line="+50"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <location line="+157"/>
+        <location line="+47"/>
+        <location line="+7"/>
         <source>Bold</source>
         <translation>Pogrubionie</translation>
     </message>
     <message>
+        <location line="-204"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <location line="+136"/>
+        <location line="+54"/>
+        <location line="+7"/>
         <source>Italic</source>
         <translation>Kursywa</translation>
     </message>
     <message>
+        <location line="-433"/>
+        <location line="+7"/>
+        <location line="+242"/>
+        <location line="+13"/>
+        <location line="+13"/>
+        <location line="+13"/>
+        <location line="+97"/>
+        <location line="+61"/>
+        <location line="+13"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
+        <location line="-164"/>
         <source>Font 4</source>
         <translation>Czcionka 4</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Font 5</source>
         <translation>Czcionka 5</translation>
     </message>
     <message>
+        <location line="-1228"/>
         <source>Palette</source>
         <translation>Paleta kolorów</translation>
     </message>
     <message>
+        <location line="-64"/>
+        <source>add</source>
+        <translation type="unfinished">Zufgen</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>remove</source>
+        <translation type="unfinished">usuń</translation>
+    </message>
+    <message>
+        <location line="+586"/>
         <source>add to palette</source>
         <translation>dodaj do palety</translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>B</source>
         <translation>B</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>H</source>
         <translation>H</translation>
     </message>
     <message>
+        <location line="+30"/>
         <source>V</source>
         <translation>V</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>G</source>
         <translation>G</translation>
     </message>
     <message>
+        <location line="+96"/>
         <source>R</source>
         <translation>R</translation>
     </message>
     <message>
+        <location line="-772"/>
         <source>clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+953"/>
         <source>Style Sheet:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+345"/>
         <source>Font 6</source>
         <translation type="unfinished">Czcionka 6</translation>
     </message>
-    <message>
-        <source>Global opaqueness</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>Arranger</name>
     <message>
+        <location filename="../../muse/arranger/arranger.cpp" line="-10"/>
         <source>Cursor</source>
         <translation>Kursor</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Snap</source>
         <translation>Przyciąganie elementów</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Len</source>
         <translation>Długość utworu w taktach</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>NO</source>
         <translation>Brak</translation>
     </message>
     <message>
+        <location line="+103"/>
         <source>TrackInfo</source>
         <translation>Info o śladzie</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Track</source>
         <translation>Ślad</translation>
     </message>
     <message>
+        <location line="-121"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
+        <location line="+6"/>
+        <location line="+1"/>
         <source>midi song type</source>
         <translation>Utwór Midi</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Pitch</source>
         <translation>Glob. Transpozycja</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>midi pitch</source>
         <translation>transpozycja midi</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>global midi pitch shift</source>
         <translation>globalna transpozycja midi</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Tempo</source>
         <translation>Tempo</translation>
     </message>
     <message>
+        <location line="+8"/>
+        <location line="+1"/>
         <source>midi tempo</source>
         <translation>Tempo Midi</translation>
     </message>
@@ -726,6 +986,7 @@ Word-breaking but only with spaces.</source>
         <translation type="obsolete">Wyjście</translation>
     </message>
     <message>
+        <location line="-80"/>
         <source>Arranger</source>
         <translation>Główne Okno</translation>
     </message>
@@ -738,82 +999,112 @@ Word-breaking but only with spaces.</source>
         <translation type="obsolete">do kreski taktowej</translation>
     </message>
     <message>
+        <location line="+48"/>
         <source>GM</source>
         <translation>GM</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>GS</source>
         <translation>GS</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>XG</source>
         <translation>XG</translation>
     </message>
     <message>
+        <location line="+40"/>
         <source>N</source>
         <translation>100%</translation>
     </message>
     <message>
+        <location line="+73"/>
         <source>R</source>
         <translation>N</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>M</source>
         <translation>W</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>C</source>
         <translation>T</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Ch</source>
         <translation>K</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>T</source>
         <translation>B</translation>
     </message>
     <message>
+        <location line="-230"/>
         <source>Enable Recording</source>
         <translation type="unfinished">Udostępnij nagrywanie</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Mute/Off Indicator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Solo Indicator</source>
         <translation type="unfinished">Solo Wzkaźnik</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Track Type</source>
         <translation type="unfinished">Typ śladu</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Track Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Midi output channel number or audio channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Midi output port or synth midi port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Time Lock</source>
         <translation type="unfinished">Zablokuj Ślad</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>Automation parameter selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Notation clef</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
         <source>Enable recording. Click to toggle.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Mute indicator. Click to toggle.
 Right-click to toggle track on/off.
 Mute is designed for rapid, repeated action.
@@ -821,28 +1112,33 @@ On/Off is not!</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+1"/>
         <source>Track type. Right-click to change
  midi and drum track types.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Track name. Double-click to edit.
 Right-click for more options.</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+1"/>
         <source>Midi/drum track: Output port.
 Synth track: Assigned midi port.
 Left-click to change.
@@ -850,19 +1146,34 @@ Right-click to show GUI.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Time lock</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>Notation clef. Select this tracks notation clef.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <location line="+1"/>
         <source>song length - bars</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+126"/>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;unknown&gt;</source>
+        <location line="+3"/>
+        <source>Automation</source>
+        <translation type="unfinished">Au&amp;tomatyka</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Clef</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -873,46 +1184,57 @@ Right-click to show GUI.</source>
         <translation type="obsolete">MuzA: Mikser</translation>
     </message>
     <message>
+        <location filename="../../muse/mixer/amixer.cpp" line="+156"/>
         <source>&amp;Create</source>
         <translation type="unfinished">&amp;Dodaj</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>&amp;View</source>
         <translation type="unfinished">&amp;Przeglądaj</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Routing</source>
         <translation>Konfiguracja połączeń</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>Show Inputs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Show Outputs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Show Groups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Show Auxs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Show Synthesizers</source>
         <translation type="unfinished"></translation>
     </message>
@@ -920,46 +1242,57 @@ Right-click to show GUI.</source>
 <context>
     <name>AudioStrip</name>
     <message>
+        <location filename="../../muse/mixer/astrip.cpp" line="+603"/>
         <source>panorama</source>
         <translation>Panorama</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>aux send level</source>
         <translation>Poziom syngału na wysyłce</translation>
     </message>
     <message>
+        <location line="+286"/>
         <source>off</source>
         <translation>Wył.</translation>
     </message>
     <message>
+        <location line="-263"/>
         <source>Pan</source>
         <translation>Pan</translation>
     </message>
     <message>
+        <location line="+93"/>
         <source>1/2 channel</source>
         <translation>kanał m/s</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Pre</source>
         <translation>Przed</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>pre fader - post fader</source>
         <translation>przed/ za tłumikiem</translation>
     </message>
     <message>
+        <location line="+64"/>
         <source>dB</source>
         <translation>dB</translation>
     </message>
     <message>
+        <location line="+36"/>
         <source>record</source>
         <translation>nagranie</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>mute</source>
         <translation>wycisz</translation>
     </message>
     <message>
+        <location line="+25"/>
         <source>record downmix</source>
         <translation>zgraj miks</translation>
     </message>
@@ -972,6 +1305,7 @@ Right-click to show GUI.</source>
         <translation type="obsolete">odsłuch przed tłumikiem</translation>
     </message>
     <message>
+        <location line="+37"/>
         <source>iR</source>
         <translation>Wej.</translation>
     </message>
@@ -980,99 +1314,102 @@ Right-click to show GUI.</source>
         <translation type="obsolete">połączenie wejścia</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>oR</source>
         <translation>Wyj.</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>output routing</source>
         <translation>połączenie Wyjścia</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Off</source>
         <translation>Wył.</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Read</source>
         <translation>Czytaj</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Touch</source>
         <translation>Dotknij</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Write</source>
         <translation>Zapisz</translation>
     </message>
     <message>
+        <location line="+25"/>
         <source>automation type</source>
         <translation>typ automatyki</translation>
     </message>
     <message>
         <source>Channel</source>
-        <translation>Kanał</translation>
+        <translation type="obsolete">Kanał</translation>
     </message>
     <message>
+        <location line="-88"/>
+        <location line="+4"/>
         <source>solo mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>input routing</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Awl::MidiVolEntry</name>
-    <message>
-        <source>off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>db</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Awl::VolEntry</name>
-    <message>
-        <source>off</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>BigTime</name>
     <message>
+        <location filename="../../muse/widgets/bigtime.cpp" line="+78"/>
         <source>MusE: Bigtime</source>
         <translation>MuzA: Duży zegar</translation>
     </message>
     <message>
+        <location line="-42"/>
         <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">minuta</translation>
     </message>
     <message>
+        <location line="+1"/>
         <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>
@@ -1080,6 +1417,7 @@ Right-click to show GUI.</source>
 <context>
     <name>ClipListEdit</name>
     <message>
+        <location filename="../../muse/cliplist/cliplist.cpp" line="+103"/>
         <source>MusE: Clip List Editor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1087,38 +1425,47 @@ Right-click to show GUI.</source>
 <context>
     <name>ClipListEditorBase</name>
     <message>
+        <location filename="../../muse/widgets/cliplisteditorbase.ui" line="+17"/>
         <source>MusE: ClipList</source>
         <translation>MuzA: Lista Klipów</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Refs</source>
         <translation type="unfinished">Refs</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Start</source>
         <translation>Start</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Len</source>
         <translation>Długość</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Data</source>
         <translation>Dane</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>Clip Properties</source>
         <translation>Właściwości klipu</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Pos:</source>
         <translation>Poz.:</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Len:</source>
         <translation>Dł.:</translation>
     </message>
@@ -1126,14 +1473,17 @@ Right-click to show GUI.</source>
 <context>
     <name>CommentBase</name>
     <message>
+        <location filename="../../muse/widgets/commentbase.ui" line="+14"/>
         <source>Form1</source>
         <translation>Form. 1</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>Track Comment</source>
         <translation>Opis śladu</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>Track 1</source>
         <translation>Ślad 1</translation>
     </message>
@@ -1145,42 +1495,52 @@ Right-click to show GUI.</source>
         <translation type="obsolete">MuzA: Konfiguracja exportu plików midi</translation>
     </message>
     <message>
+        <location filename="../../muse/widgets/configmidifilebase.ui" line="+193"/>
         <source>&amp;OK</source>
         <translation>&amp;Akceptuj</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Anuluj</translation>
     </message>
     <message>
+        <location line="-56"/>
         <source>0 (single track)</source>
         <translation>0 (pojedynczy ślad)</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>1 (multiple tracks)</source>
         <translation>1 (wiele śladów)</translation>
     </message>
     <message>
+        <location line="-36"/>
         <source>Format:</source>
         <translation>Format:</translation>
     </message>
     <message>
+        <location line="-48"/>
         <source>96</source>
         <translation>96</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>192</source>
         <translation>192</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>384</source>
         <translation>384</translation>
     </message>
     <message>
+        <location line="+48"/>
         <source>Division:</source>
         <translation>Rozdzielczość:</translation>
     </message>
     <message>
+        <location line="-20"/>
         <source>Copyright:</source>
         <translation>Prawa autorskie:</translation>
     </message>
@@ -1189,46 +1549,57 @@ Right-click to show GUI.</source>
         <translation type="obsolete">Aktuwuj rozszerzony format smf (standard midi file)</translation>
     </message>
     <message>
+        <location line="-95"/>
         <source>MusE: Config Midi File Import/Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Import:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Split tracks into &amp;parts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+P</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Split tracks into parts, or one single part</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Export:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+31"/>
         <source>Enable extended smf format (currently not implemented)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Use &amp;2-byte time signatures instead of standard 4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+37"/>
         <source>Save space by replacing note-offs with &amp;zero velocity note-ons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+Z</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1236,10 +1607,12 @@ Right-click to show GUI.</source>
 <context>
     <name>CtrlPanel</name>
     <message>
+        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="+79"/>
         <source>select controller</source>
         <translation>Wybierz kontroler</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>remove panel</source>
         <translation>Usuń panel</translation>
     </message>
@@ -1252,252 +1625,384 @@ Right-click to show GUI.</source>
         <translation type="obsolete">x</translation>
     </message>
     <message>
+        <location line="+463"/>
+        <location line="+236"/>
         <source>Velocity</source>
         <translation>Predkość uderzenia (velocity)</translation>
     </message>
     <message>
+        <location line="-186"/>
         <source>add new ...</source>
         <translation>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>
+    </message>
 </context>
 <context>
     <name>DeicsOnzeGui</name>
     <message>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="+533"/>
         <source>Save configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+41"/>
+        <location line="+7"/>
+        <location line="+1172"/>
+        <location line="+7"/>
+        <location line="+218"/>
+        <location line="+7"/>
+        <location line="+160"/>
+        <location line="+7"/>
+        <location line="+165"/>
+        <location line="+7"/>
         <source>Critical Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-1749"/>
+        <location line="+1179"/>
+        <location line="+225"/>
+        <location line="+167"/>
+        <location line="+172"/>
         <source>Cannot open file %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-1736"/>
+        <location line="+1179"/>
+        <location line="+225"/>
+        <location line="+167"/>
+        <location line="+172"/>
         <source>Parsing error for file %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-1709"/>
+        <location line="+1351"/>
         <source>Load category dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-226"/>
         <source>Load set dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+67"/>
         <source>Save set dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+24"/>
         <source>New category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location line="+101"/>
         <source>Delete category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-99"/>
         <source>Load category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Save category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Load set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Save set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Delete set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>New subcategory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
+        <location line="+243"/>
         <source>Delete subcategory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-240"/>
         <source>Load subcategory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Save subcategory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>New preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location line="+389"/>
         <source>Delete preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-387"/>
         <source>Load preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Save preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>No more category supported</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>You can not add more categories</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="-338"/>
+        <location line="+170"/>
+        <location line="+170"/>
         <source>&amp;Yes</source>
         <translation type="unfinished">&amp;Tak</translation>
     </message>
     <message>
+        <location line="-340"/>
+        <location line="+170"/>
+        <location line="+170"/>
         <source>&amp;No</source>
         <translation type="unfinished">&amp;Nie</translation>
     </message>
     <message>
+        <location line="-323"/>
+        <location line="+110"/>
         <source>No category selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-109"/>
+        <location line="+110"/>
         <source>You must first select a category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-61"/>
+        <location line="+167"/>
+        <location line="+172"/>
         <source>Replace or add</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+3"/>
+        <location line="+168"/>
+        <location line="+171"/>
         <source>&amp;Replace</source>
         <translation type="unfinished">&amp;Zastąp</translation>
     </message>
     <message>
+        <location line="-339"/>
+        <location line="+168"/>
+        <location line="+171"/>
         <source>&amp;Add</source>
         <translation type="unfinished">&amp;Dodaj</translation>
     </message>
     <message>
+        <location line="-329"/>
+        <location line="+167"/>
+        <location line="+171"/>
         <source>Download error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-337"/>
         <source>There is no more free category slot.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>Save category dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+30"/>
         <source>No more subcategory supported</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>You can not add more subcategories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+42"/>
+        <location line="+113"/>
         <source>No subcategory selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-112"/>
+        <location line="+113"/>
         <source>You must first select a subcategory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-101"/>
         <source>Load subcategory dialog</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+14"/>
         <source>There is no more free subcategory slot.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>Save subcategory dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>No more preset supported</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>You can not add more presets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+39"/>
+        <location line="+3"/>
+        <location line="+111"/>
         <source>No preset selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-113"/>
+        <location line="+3"/>
+        <location line="+111"/>
         <source>You must first select a preset.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-98"/>
         <source>Load preset dialog</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+13"/>
         <source>There is no more free preset slot.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>Save preset dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+120"/>
         <source>Browse set dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+35"/>
         <source>Browse image dialog</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1505,983 +2010,61 @@ Right-click to show GUI.</source>
 <context>
     <name>DeicsOnzeGuiBase</name>
     <message>
-        <source>DeicsOnze</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Preset</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Program numerous</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>INITVOICE</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LBank</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subcategory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bank numerous</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>NONE</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>HBank</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Prog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Preset</source>
-        <translation type="unfinished">Ustawienie</translation>
-    </message>
-    <message>
-        <source>DeicsOnze v0.5.5 Copyright (c) 2004-2006 Nil Geisweiller. Published under GPL licence.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Global</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pitch Envelope</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PL3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PL2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PL1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PR1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PR2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PR3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pitch modulation depth</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LFO</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LFO Sync</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pitch modulation sensitivity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pitch Modulation Sensitivity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LFO Delay</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LFO delay</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LFO speed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amplitude modulation depth</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amplitude modulation sensitivity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amplitude Modulation Sensitivity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AMS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LFO Waveform</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pitch Modulation Depth</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PMD</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LFO Speed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AMD</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Speed</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Ustawienie</translation>
     </message>
     <message>
         <source>Delay</source>
-        <translation type="unfinished">Opóźnienie</translation>
-    </message>
-    <message>
-        <source>PMS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Modulation Matrix</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&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;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Op4 Feedback</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Feedback level of the operator 4</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Opóźnienie</translation>
     </message>
     <message>
         <source>Transpose</source>
-        <translation type="unfinished">Transponuj</translation>
-    </message>
-    <message>
-        <source>Op &amp;1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scaling 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LS1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RS1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rate Scaling</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Attack Rate of the operator 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Level Scaling</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amplitude Envelope 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RR1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D1R1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D1L1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D2R1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Release Rate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message utf8="true">
-        <source>2° Decay Rate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message utf8="true">
-        <source>1° Decay Level</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message utf8="true">
-        <source>1° Decay Rate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Attack Rate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AR1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Detune, OSCWave, EGShift 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DET1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Detune</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EG Shift</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>96dB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>48dB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>24dB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>12dB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wave form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>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;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sensitivity 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>KVS1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amplitude Modulation Enable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AME1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Keyboard Velocity Sensitivity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key Velocity Sensitivity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EBS1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EG Bias Sensitivity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Eg Bias Sensitivity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Frequency 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Coarse 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Coarse Ratio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine Ratio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Freq 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fixed Frequency</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggle Fix Frequency</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>FIX</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OUT 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Output Volume</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Transponuj</translation>
     </message>
     <message>
         <source>Volume</source>
-        <translation type="unfinished">Głośność</translation>
-    </message>
-    <message>
-        <source>Op &amp;2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amplitude Envelope 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D1R2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D1L2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D2R2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RR2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AR2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Frequency 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Coarse 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Freq 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scaling 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LS2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RS2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OUT 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Detune, OSCWave, EGShift 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DET2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sensitivity 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EBS2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>KVS2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AME2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Op &amp;3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amplitude Envelope 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D1R3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D1L3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D2R3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RR3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AR3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scaling 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LS3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RS3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OUT 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Frequency 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Coarse 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Freq 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Detune, OSCWave, EGShift 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DET3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sensitivity 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EBS3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>KVS3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AME3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Op &amp;4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>amplitude Envelope 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AR4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D1R4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D1L4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D2R4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RR4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Frequency 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Coarse 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Freq 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scaling 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LS4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RS4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OUT 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Detune, OSCWave, EGShift 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DET4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sensitivity 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EBS4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>KVS4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AME4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Func</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay Pan Depth</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay Pan LFO Freq</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay Ch Send Level </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Channel Chorus</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay Feedback</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay On/Off, Return Level</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>On</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay Beat Ratio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay BPM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Foot Control</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pitch Bend Range</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pitch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amplitude</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Modulation Wheel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Breath Control</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pitch Bias</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Envelope Bias</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Głośność</translation>
     </message>
     <message>
         <source>After Touch</source>
-        <translation type="unfinished">Nacisk pod uderzeniu (aftertouch)</translation>
-    </message>
-    <message>
-        <source>Phony Mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>POLY</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MONO</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Potamento</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Portamento Mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>FINGER</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>FULL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PT</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Portamento Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;horus</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Chorus Parameters</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Channel send level</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>On/Off and Return level</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select LADSPA plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Reverb</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reverb Parameters</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Nacisk pod uderzeniu (aftertouch)</translation>
     </message>
     <message>
         <source>&amp;Config</source>
-        <translation type="unfinished">&amp;Konfiguracja</translation>
-    </message>
-    <message>
-        <source>Font Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Quality</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>High</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Middle</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ultra low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save Mode (into the song)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save only the used presets</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save the entire set</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save the configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configuration File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Load...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save as default</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&amp;Konfiguracja</translation>
     </message>
     <message>
         <source>Colors</source>
-        <translation type="unfinished">Kolory</translation>
+        <translation type="obsolete">Kolory</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation type="unfinished">Tekst</translation>
-    </message>
-    <message>
-        <source>Background</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Background</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Red</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Blue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Green</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set Path</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Image in the background :</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Browse...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Load the set at the initialization :</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set Brightness, Detune, Attack and Release of the current channel to default</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Res. Ctrl</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut all notes off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Panic!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Number of Voices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Number of voices</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Tekst</translation>
     </message>
     <message>
         <source>Enable</source>
-        <translation type="unfinished">Włącz</translation>
-    </message>
-    <message>
-        <source>Channel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Vol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Channel Ctrl</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Release</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Attack</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Brightness</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Modulation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pan</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Włącz</translation>
     </message>
 </context>
 <context>
     <name>DidYouKnow</name>
     <message>
+        <location filename="../../muse/widgets/didyouknow.ui" line="+14"/>
         <source>Did you know?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Don&apos;t show on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Next tip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2489,130 +2072,162 @@ 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="+169"/>
         <source>Load Map</source>
         <translation>Załaduj zestaw</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Save Map</source>
         <translation>Zapisz zestaw</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>&amp;Edit</source>
         <translation>&amp;Edytuj</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Cut</source>
         <translation>Wytnij</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Copy</source>
         <translation>Kopiuj</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Paste</source>
         <translation>Wklej</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Delete Events</source>
         <translation>Kasuj Elementy</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>Select All</source>
         <translation>Zaznacz wszystko</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Select None</source>
         <translation>Bez zaznaczenia</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Invert</source>
         <translation>Odwróć zaznaczenie</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Inside Loop</source>
         <translation>Pomiędzy lokatorami</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Outside Loop</source>
         <translation>Poza obrębem lokatorów</translation>
     </message>
     <message>
+        <location line="-7"/>
         <source>&amp;Select</source>
         <translation>&amp;Zaznacz</translation>
     </message>
     <message>
+        <location line="+94"/>
         <source>Step Record</source>
         <translation>Nagrywanie po jednej nucie</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Midi Input</source>
         <translation>Podgląd Midi</translation>
     </message>
     <message>
+        <location line="+57"/>
         <source>Add Controller View</source>
         <translation>Pokaż widok kontrolerów</translation>
     </message>
     <message>
+        <location line="+57"/>
         <source>M</source>
         <translation>Wycisz</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Sound</source>
         <translation>Brzmienie</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>QNT</source>
         <translation>Kwant.</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>E-Note</source>
         <translation>U-Wys</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Len</source>
         <translation>Dług.</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>A-Note</source>
         <translation>W-Wys</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Ch</source>
         <translation>Kanał</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Port</source>
         <translation>Urz. Midi</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>LV1</source>
         <translation>PV1</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>LV2</source>
         <translation>PV2</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>LV3</source>
         <translation>PV3</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>LV4</source>
         <translation>PV4</translation>
     </message>
     <message>
+        <location line="-260"/>
         <source>&amp;File</source>
         <translation>&amp;Plik</translation>
     </message>
     <message>
+        <location line="+110"/>
         <source>Load Drummap</source>
         <translation>Załaduj zestaw perkusyjny</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Store Drummap</source>
         <translation>Zapisz zestaw perkusyjny</translation>
     </message>
     <message>
+        <location line="+68"/>
         <source>ctrl</source>
         <translation>ctrl</translation>
     </message>
@@ -2621,118 +2236,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
         <translation type="obsolete">Zestawy perkusyjne</translation>
     </message>
     <message>
+        <location line="+459"/>
         <source>Muse: Load Drum Map</source>
         <translation>MuzA: Załaduj zestaw perkusyjny</translation>
     </message>
     <message>
+        <location line="+53"/>
         <source>MusE: Store Drum Map</source>
         <translation>MuzA: Zapisz zestaw perkusyjny</translation>
     </message>
     <message>
+        <location line="-625"/>
         <source>Set Fixed Length</source>
         <translation>Ustaw stałą długość nut</translation>
     </message>
     <message>
+        <location line="-6"/>
         <source>&amp;Functions</source>
         <translation>&amp;Opcje</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Modify Velocity</source>
         <translation>Zmień Velocity</translation>
     </message>
     <message>
+        <location line="-142"/>
+        <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="-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="-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">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="+41"/>
         <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="+23"/>
+        <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="+9"/>
         <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>
+    </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="+471"/>
         <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>
@@ -2740,14 +2436,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
 <context>
     <name>EditCAfterDialog</name>
     <message>
+        <location filename="../../muse/liste/editevent.cpp" line="+430"/>
         <source>Time Position</source>
         <translation>Pozycja:</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Pressure</source>
         <translation>Nacisk</translation>
     </message>
     <message>
+        <location line="-6"/>
         <source>MusE: Enter Channel Aftertouch</source>
         <translation>MuzA: Wstaw zmianę średniego nacisku pod uderzeniu (channel aftertouch)</translation>
     </message>
@@ -2786,58 +2485,73 @@ 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>EditCtrlBase</name>
     <message>
+        <location filename="../../muse/liste/editctrlbase.ui" line="+14"/>
         <source>MusE: Edit Controller Event</source>
         <translation>MuzA: Edytuj zdarzenia kontrolera</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Time Position</source>
         <translation>Pozycja:</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Available Controller:</source>
         <translation>Dostępne kontrolery:</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Create New Controller</source>
         <translation>Ustaw nowy kontroler</translation>
     </message>
     <message>
+        <location line="+486"/>
         <source>textLabel3</source>
         <translation>Etykieta3</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Value</source>
         <translation>Wartość</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Controller</source>
         <translation>Kontroler</translation>
     </message>
     <message>
+        <location line="+45"/>
         <source>H-Bank</source>
         <translation>H-Bank</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>L-Bank</source>
         <translation>L-Bank</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Program</source>
         <translation>Program</translation>
     </message>
     <message>
+        <location line="+10"/>
+        <location line="+16"/>
         <source>off</source>
         <translation>wył.</translation>
     </message>
     <message>
+        <location line="+42"/>
         <source>pushButton4</source>
         <translation>naciśnij Przycisk 4</translation>
     </message>
     <message>
+        <location line="+35"/>
         <source>&amp;OK</source>
         <translation>&amp;Akceptuj</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Anuluj</translation>
     </message>
@@ -2845,10 +2559,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>
     </message>
     <message>
+        <location line="+2"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
@@ -2856,46 +2572,57 @@ 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>EditGainBase</name>
     <message>
+        <location filename="../../muse/waveedit/editgainbase.ui" line="+14"/>
         <source>MusE: Modify gain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Gain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+51"/>
         <source>200%</source>
         <translation type="unfinished">200%</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>100%</source>
         <translation type="unfinished">100%</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>0%</source>
         <translation type="unfinished">0%</translation>
     </message>
     <message>
+        <location line="+51"/>
         <source>&amp;Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+39"/>
         <source>&amp;Apply</source>
         <translation type="unfinished">&amp;Zastosuj</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+A</source>
         <translation type="unfinished">Alt+A</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+C</source>
         <translation type="unfinished">Alt+C</translation>
     </message>
@@ -2903,131 +2630,178 @@ 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="+296"/>
+        <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>
-        <source>(You can override with the environment variable MUSEINSTRUMENTS)</source>
+        <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">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>
@@ -3035,6 +2809,7 @@ Save Current Instrument?</source>
 <context>
     <name>EditInstrumentBase</name>
     <message>
+        <location filename="../../muse/instruments/editinstrumentbase.ui" line="+20"/>
         <source>MusE: Instrument Editor</source>
         <translation>MuzA: Edytor Instrumentów</translation>
     </message>
@@ -3047,14 +2822,17 @@ Save Current Instrument?</source>
         <translation type="obsolete">Patch Nazwa</translation>
     </message>
     <message>
+        <location line="+119"/>
         <source>High Bank:</source>
         <translation>Górny Bank:</translation>
     </message>
     <message>
+        <location line="+52"/>
         <source>Low Bank:</source>
         <translation>Dolny Bank:</translation>
     </message>
     <message>
+        <location line="+52"/>
         <source>Program:</source>
         <translation>Program:</translation>
     </message>
@@ -3073,10 +2851,16 @@ nie ważne</translation>
         <translation type="obsolete">Patch/Grupa</translation>
     </message>
     <message>
+        <location line="+141"/>
+        <location line="+747"/>
+        <location line="+201"/>
         <source>&amp;Delete</source>
         <translation>&amp;Kasuj</translation>
     </message>
     <message>
+        <location line="-945"/>
+        <location line="+747"/>
+        <location line="+201"/>
         <source>Alt+D</source>
         <translation>Alt+D</translation>
     </message>
@@ -3093,18 +2877,22 @@ nie ważne</translation>
         <translation type="obsolete">Nowa Grupa</translation>
     </message>
     <message>
+        <location line="-1035"/>
         <source>Drum</source>
         <translation>Perkusja</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>GM</source>
         <translation>GM</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>GS</source>
         <translation>GS</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>XG</source>
         <translation>XG</translation>
     </message>
@@ -3117,6 +2905,7 @@ nie ważne</translation>
         <translation type="obsolete">Predefiniowany kontroler:</translation>
     </message>
     <message>
+        <location line="+136"/>
         <source>This is a list of commonly used midi controllers.
 Note that in MusE pitch and program changes are
 handled like normal controllers.</source>
@@ -3124,6 +2913,8 @@ handled like normal controllers.</source>
 Zauważ, że &quot;pitch&quot; i &quot;zmiana programu (program change)&quot; są traktowane w MuzA  jako zwykłe kontrolery.</translation>
     </message>
     <message>
+        <location line="-368"/>
+        <location line="+441"/>
         <source>Properties</source>
         <translation>Właściwości</translation>
     </message>
@@ -3136,30 +2927,38 @@ Zauważ, że &quot;pitch&quot; i &quot;zmiana programu (program change)&quot; s�
         <translation type="obsolete">Typ</translation>
     </message>
     <message>
+        <location line="+49"/>
         <source>Control7</source>
         <translation>Kontroler7</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Control14</source>
         <translation>Kontroler14</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>RPN</source>
         <translation type="unfinished">RPN</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>NRPN</source>
         <translation type="unfinished">NRPN</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Pitch</source>
         <translation type="unfinished">Transpozycja</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Program</source>
         <translation>Program</translation>
     </message>
     <message>
+        <location line="-118"/>
+        <location line="+142"/>
         <source>H-Ctrl</source>
         <translation type="unfinished">H-Ctrl</translation>
     </message>
@@ -3168,6 +2967,8 @@ Zauważ, że &quot;pitch&quot; i &quot;zmiana programu (program change)&quot; s�
         <translation type="obsolete">Numer midi kontrolera High Byte</translation>
     </message>
     <message>
+        <location line="-137"/>
+        <location line="+191"/>
         <source>L-Ctrl</source>
         <translation type="unfinished">L-Ctrl</translation>
     </message>
@@ -3180,10 +2981,12 @@ Zauważ, że &quot;pitch&quot; i &quot;zmiana programu (program change)&quot; s�
         <translation type="obsolete">Zakres</translation>
     </message>
     <message>
+        <location line="+79"/>
         <source>Min</source>
         <translation>Min.</translation>
     </message>
     <message>
+        <location line="+72"/>
         <source>Max</source>
         <translation>Max</translation>
     </message>
@@ -3192,10 +2995,12 @@ Zauważ, że &quot;pitch&quot; i &quot;zmiana programu (program change)&quot; s�
         <translation type="obsolete">Domyślny</translation>
     </message>
     <message>
+        <location line="-357"/>
         <source>Name                  </source>
         <translation>nazwa</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Type       </source>
         <translation>Typ</translation>
     </message>
@@ -3228,247 +3033,314 @@ Zauważ, że &quot;pitch&quot; i &quot;zmiana programu (program change)&quot; s�
         <translation type="obsolete">Zatrzymaj wszystkie komunikaty midi!</translation>
     </message>
     <message>
+        <location line="+802"/>
         <source>Hex Entry:</source>
         <translation>Wartość Heks.</translation>
     </message>
     <message>
+        <location line="+90"/>
         <source>&amp;File</source>
         <translation>&amp;Plik</translation>
     </message>
     <message>
+        <location line="-27"/>
         <source>Tools</source>
         <translation>Narzędzia</translation>
     </message>
     <message>
+        <location line="+49"/>
         <source>New</source>
         <translation>Nowy</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;New</source>
         <translation>&amp;Nowy</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>Open</source>
         <translation>Otwórz</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Open...</source>
         <translation>&amp;Otwórz...</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>Save</source>
         <translation>Zapisz</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Save</source>
         <translation>&amp;Zapisz</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Save As</source>
         <translation>Zapisz jako</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>Save &amp;As...</source>
         <translation>Zapisz &amp;Jako...</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Exit</source>
         <translation>Zakończ</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>E&amp;xit</source>
         <translation>&amp;Zakończ</translation>
     </message>
     <message>
+        <location line="-1448"/>
         <source>Instrument Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Selected instrument name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>List of defined instruments.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Pa&amp;tches</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>List of groups and patches.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Group/Patch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+15"/>
+        <location line="+443"/>
+        <location line="+742"/>
         <source>Name:</source>
         <translation type="unfinished">Nazwa:</translation>
     </message>
     <message>
+        <location line="-1175"/>
+        <location line="+3"/>
         <source>Group or patch name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Patch high bank number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Patch high bank number. --- means don&apos;t care.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>---</source>
         <comment>dont care</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+46"/>
         <source>Patch low bank number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Patch low bank number. --- means don&apos;t care.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>---</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+46"/>
+        <location line="+3"/>
         <source>Patch program number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+36"/>
         <source>Drum patch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>If set, the patch is available only for drum channels.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>GM patch</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+13"/>
         <source>GS patch</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+10"/>
         <source>XG patch</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+39"/>
         <source>Delete group or patch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>New patch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>New &amp;Patch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+P</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>New group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>New &amp;Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+G</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+30"/>
         <source>Contro&amp;ller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Common:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>List of defined controllers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>List of defined controllers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>Min  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Max  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Def  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+35"/>
         <source>Midi controller name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Type:</source>
         <translation type="unfinished">Typ:</translation>
     </message>
     <message>
+        <location line="+10"/>
+        <location line="+3"/>
         <source>Midi controller type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+24"/>
         <source>RPN14</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>NRPN14</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+53"/>
+        <location line="+3"/>
         <source>Midi controller number high byte</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+51"/>
         <source>Midi controller number low byte (* means drum controller)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Midi controller number low byte. 
 If low byte is * then the controller is a 
  &apos;drum controller&apos;. For drum tracks and 
@@ -3481,19 +3353,23 @@ Examples: The GS and XG instruments&apos;
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>*</source>
         <comment>wild card</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Range:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+48"/>
         <source>Minimum value. If negative, auto-translate.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Minimum value. If the minimum value 
  is negative, the range will automatically
  be translated to a positive range. 
@@ -3516,38 +3392,52 @@ True range: Min: -8192 Max: 8191 (bias 0)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+69"/>
+        <location line="+3"/>
         <source>Maximum value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+36"/>
         <source>Default:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>L-Bank</source>
         <translation type="unfinished">L-Bank</translation>
     </message>
     <message>
+        <location line="+10"/>
+        <location line="+16"/>
+        <location line="+26"/>
+        <location line="+198"/>
+        <location line="+53"/>
         <source>off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-261"/>
         <source>Progr.</source>
         <translation type="unfinished">Nr programu</translation>
     </message>
     <message>
+        <location line="+35"/>
         <source>???</source>
         <translation type="unfinished">???</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>H-Bank</source>
         <translation type="unfinished">H-Bank</translation>
     </message>
     <message>
+        <location line="+44"/>
         <source>Default value. Off: No default.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Default (initial) value. Off means no default.
 
 If a default value is chosen, the value will be sent
@@ -3566,47 +3456,59 @@ Caution! Watch out for controllers such as
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>off</source>
         <comment>dont care</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Add common controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>&amp;Add</source>
         <translation type="unfinished">&amp;Dodaj</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+A</source>
         <translation type="unfinished">Alt+A</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Delete controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Create a new controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>New &amp;Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+C</source>
         <translation type="unfinished">Alt+C</translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Null Param Hi:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Null parameter number High byte</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
+        <location line="+53"/>
         <source>If set, these &apos;null&apos; parameter numbers will 
  be sent after each RPN/NRPN event. 
 This prevents subsequent &apos;data&apos; events
@@ -3616,38 +3518,49 @@ Typically, set to 127/127, or an unused
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-13"/>
         <source> Lo:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Null parameter number Low byte</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+34"/>
         <source>S&amp;ysEx</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>SysEx List:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+62"/>
         <source>New SysE&amp;x</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+X</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+73"/>
         <source>&amp;Help</source>
         <translation type="unfinished">P&amp;omoc</translation>
     </message>
     <message>
+        <location line="+84"/>
+        <location line="+3"/>
         <source>new item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+8"/>
+        <location line="+3"/>
         <source>What&apos;s this?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3655,18 +3568,22 @@ 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>
     </message>
     <message>
+        <location line="+4"/>
         <source>Meta Type</source>
         <translation>Meta Typ</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Enter Hex</source>
         <translation>Wstaw Heks.</translation>
     </message>
     <message>
+        <location line="-18"/>
         <source>MusE: Enter Meta Event</source>
         <translation>MuzA: Wstaw Zdarzenie Meta (nacisk po uderzeniu</translation>
     </message>
@@ -3705,34 +3622,42 @@ Typically, set to 127/127, or an unused
 <context>
     <name>EditNoteDialogBase</name>
     <message>
+        <location filename="../../muse/widgets/editnotedialogbase.ui" line="+14"/>
         <source>MusE: Enter Note</source>
         <translation>MuzA: Wstaw Nutę</translation>
     </message>
     <message>
+        <location line="+39"/>
         <source>OK</source>
         <translation>Akceptuj</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Length:</source>
         <translation>Długość:</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Time Position:</source>
         <translation>Pozycja:</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Pitch:</source>
         <translation>Wysokość dźwięku</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Velocity On:</source>
         <translation>Predkość uderzenia (velocity) Wł.:</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Velocity Off:</source>
         <translation>Predkość uderzenia (velocity) Wył.:</translation>
     </message>
@@ -3740,18 +3665,22 @@ 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>
     </message>
     <message>
+        <location line="+4"/>
         <source>Pitch</source>
         <translation>Wysokość dźwięku</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Pressure</source>
         <translation>Nacisk</translation>
     </message>
     <message>
+        <location line="-8"/>
         <source>MusE: Enter Poly Aftertouch</source>
         <translation>MuzA: Wstaw zmianę średniego nacisku pod uderzeniu (channel aftertouch)</translation>
     </message>
@@ -3759,22 +3688,27 @@ Typically, set to 127/127, or an unused
 <context>
     <name>EditSysexDialogBase</name>
     <message>
+        <location filename="../../muse/widgets/editsysexdialogbase.ui" line="+14"/>
         <source>MusE: Enter SysEx</source>
         <translation>MuzA: Wstaw komunikat midi SysEx</translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>TimePosition:</source>
         <translation>Pozycja:</translation>
     </message>
     <message>
+        <location line="+48"/>
         <source>Comment:</source>
         <translation>Opis:</translation>
     </message>
     <message>
+        <location line="+37"/>
         <source>OK</source>
         <translation>Akceptuj</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
@@ -3782,6 +3716,7 @@ Typically, set to 127/127, or an unused
 <context>
     <name>EditToolBar</name>
     <message>
+        <location filename="../../muse/widgets/tools.cpp" line="+17"/>
         <source>Edit Tools</source>
         <translation>Narzędzia Edycyjne</translation>
     </message>
@@ -3789,54 +3724,67 @@ Typically, set to 127/127, or an unused
 <context>
     <name>EffectRack</name>
     <message>
+        <location filename="../../muse/mixer/rack.cpp" line="+102"/>
         <source>effect rack</source>
         <translation>skrzynia efektów</translation>
     </message>
     <message>
+        <location line="+84"/>
         <source>move up</source>
         <translation>przesuń w górę</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>move down</source>
         <translation>przesuń w dół</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>remove</source>
         <translation>usuń</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>bypass</source>
         <translation>omiń (bypass)</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>show gui</source>
         <translation>pokaż interfejs użytkownika</translation>
     </message>
     <message>
+        <location line="-6"/>
         <source>new</source>
         <translation>nowy</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>change</source>
         <translation>zmień</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>show native gui</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>save preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+138"/>
         <source>MusE: Save Preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+143"/>
         <source>Replace effect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>Do you really want to replace the effect %1?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3844,6 +3792,7 @@ Typically, set to 127/127, or an unused
 <context>
     <name>FLUIDGui</name>
     <message>
+        <location filename="../../synti/fluid/fluidgui.cpp" line="+55"/>
         <source>FLUID: open Soundfile</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3851,14 +3800,17 @@ Typically, set to 127/127, or an unused
 <context>
     <name>FLUIDGuiBase</name>
     <message>
+        <location filename="../../synti/fluid/fluidguibase.ui" line="+14"/>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Soundfont</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+52"/>
         <source>Load</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3866,98 +3818,123 @@ Typically, set to 127/127, or an unused
 <context>
     <name>FLUIDSynthGuiBase</name>
     <message>
+        <location filename="../../synti/fluidsynth/fluidsynthguibase.ui" line="+14"/>
         <source>FLUID Synth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Load</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Delete</source>
         <translation type="unfinished">Kasuj</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Dump Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Fontname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Chnl</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Soundfont</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Drum Chnl</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+108"/>
+        <location line="+235"/>
         <source>Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-222"/>
         <source>Width</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Damping</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Room Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Reverb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>CHANNEL SETUP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>Sine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Triangle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Type</source>
         <translation type="unfinished">Typ</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+35"/>
         <source>Speed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+35"/>
         <source>Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+48"/>
         <source>Chorus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Gain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+50"/>
         <source>LOADED SOUNDFONTS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3969,14 +3946,17 @@ Typically, set to 127/127, or an unused
         <translation type="obsolete">Form1</translation>
     </message>
     <message>
+        <location filename="../../muse/widgets/fdialogbuttons.ui" line="+38"/>
         <source>Global</source>
         <translation>Globalnie</translation>
     </message>
     <message>
+        <location line="+25"/>
         <source>User</source>
         <translation>Użytkownik</translation>
     </message>
     <message>
+        <location line="+25"/>
         <source>Project</source>
         <translation>Katalog projektu</translation>
     </message>
@@ -3991,15 +3971,18 @@ Cofiguration</source>
 konfiguracja</translation>
     </message>
     <message>
+        <location line="+55"/>
         <source>only
 Songdata</source>
         <translation>Tylko pliki typu utwór</translation>
     </message>
     <message>
+        <location line="-129"/>
         <source>fdialogbuttons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+121"/>
         <source>Songdata +
 Configuration</source>
         <translation type="unfinished"></translation>
@@ -4008,6 +3991,7 @@ Configuration</source>
 <context>
     <name>FluidSynthGui</name>
     <message>
+        <location filename="../../synti/fluidsynth/fluidsynthgui.cpp" line="+165"/>
         <source>Choose soundfont</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4023,72 +4007,86 @@ Configuration</source>
     <name>GateTimeBase</name>
     <message>
         <source>MusE: Modify Gate Time</source>
-        <translation>MuzA: modyfikuj Gate Time</translation>
+        <translation type="obsolete">MuzA: modyfikuj Gate Time</translation>
     </message>
     <message>
         <source>Range</source>
-        <translation>Zakres</translation>
+        <translation type="obsolete">Zakres</translation>
     </message>
     <message>
         <source>All Events</source>
-        <translation>Wszytkie Elementy</translation>
+        <translation type="obsolete">Wszytkie Elementy</translation>
     </message>
     <message>
         <source>Selected Events</source>
-        <translation>Zaznaczone Elementy</translation>
+        <translation type="obsolete">Zaznaczone Elementy</translation>
     </message>
     <message>
         <source>Looped Events</source>
-        <translation>Pomiędzy lokatorami</translation>
+        <translation type="obsolete">Pomiędzy lokatorami</translation>
     </message>
     <message>
         <source>Selected &amp; Looped</source>
-        <translation>Zaznaczone &amp; Pomiędzy lokatorami</translation>
+        <translation type="obsolete">Zaznaczone &amp; Pomiędzy lokatorami</translation>
     </message>
     <message>
         <source>Values</source>
-        <translation>Wartość</translation>
+        <translation type="obsolete">Wartość</translation>
     </message>
     <message>
         <source>Rate:</source>
-        <translation>Częstotliwość:</translation>
+        <translation type="obsolete">Częstotliwość:</translation>
     </message>
     <message>
         <source>Offset:</source>
-        <translation>Offset:</translation>
+        <translation type="obsolete">Offset:</translation>
     </message>
     <message>
         <source>%</source>
-        <translation>%</translation>
+        <translation type="obsolete">%</translation>
     </message>
     <message>
         <source>OK</source>
-        <translation>Akceptuj</translation>
+        <translation type="obsolete">Akceptuj</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Anuluj</translation>
+        <translation type="obsolete">Anuluj</translation>
+    </message>
+</context>
+<context>
+    <name>GlobalSettingsConfig</name>
+    <message>
+        <location filename="../../muse/widgets/genset.cpp" line="+489"/>
+        <source>Selects instruments directory</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>GlobalSettingsDialogBase</name>
     <message>
+        <location filename="../../muse/widgets/gensetbase.ui" line="+14"/>
         <source>MusE: Global Settings</source>
         <translation>MuzA: Globalne Ustawienia</translation>
     </message>
     <message>
+        <location line="+530"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Mixer</source>
         <translation>Mikser</translation>
     </message>
     <message>
+        <location line="+21"/>
+        <location line="+39"/>
         <source>dB</source>
         <translation>dB</translation>
     </message>
     <message>
+        <location line="-20"/>
         <source>min. Meter Value</source>
         <translation>min. wartość miernika sygnału</translation>
     </message>
@@ -4097,22 +4095,31 @@ Configuration</source>
         <translation type="obsolete">dolna granica przesunięcia tłumika</translation>
     </message>
     <message>
+        <location line="+406"/>
         <source>Midi</source>
         <translation>Midi</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Ticks</source>
         <translation>Tykanie</translation>
     </message>
     <message>
+        <location line="-223"/>
+        <location line="+194"/>
+        <location line="+47"/>
         <source>1024</source>
         <translation>1024</translation>
     </message>
     <message>
+        <location line="-236"/>
+        <location line="+194"/>
+        <location line="+47"/>
         <source>2048</source>
         <translation>2048</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>4096</source>
         <translation>4096</translation>
     </message>
@@ -4121,48 +4128,68 @@ Configuration</source>
         <translation type="obsolete">8172</translation>
     </message>
     <message>
+        <location line="+86"/>
         <source>Displayed Resolution
 (Ticks/Quarternote)</source>
         <translation>Wyświetlana Rozdzielczość
 (Tykanie/Ćwiartka)</translation>
     </message>
     <message>
+        <location line="-48"/>
+        <location line="+63"/>
         <source>48</source>
         <translation>48</translation>
     </message>
     <message>
+        <location line="-58"/>
+        <location line="+63"/>
         <source>96</source>
         <translation>96</translation>
     </message>
     <message>
+        <location line="-58"/>
+        <location line="+63"/>
         <source>192</source>
         <translation>192</translation>
     </message>
     <message>
+        <location line="-58"/>
+        <location line="+63"/>
         <source>384</source>
         <translation>384</translation>
     </message>
     <message>
+        <location line="-58"/>
+        <location line="+63"/>
         <source>768</source>
         <translation>768</translation>
     </message>
     <message>
+        <location line="-58"/>
+        <location line="+63"/>
         <source>1536</source>
         <translation>1536</translation>
     </message>
     <message>
+        <location line="-58"/>
+        <location line="+63"/>
         <source>3072</source>
         <translation>3072</translation>
     </message>
     <message>
+        <location line="-58"/>
+        <location line="+63"/>
         <source>6144</source>
         <translation>6144</translation>
     </message>
     <message>
+        <location line="-58"/>
+        <location line="+63"/>
         <source>12288</source>
         <translation>12288</translation>
     </message>
     <message>
+        <location line="-163"/>
         <source>RTC Resolution
 (Ticks/Sec)</source>
         <translation>
@@ -4170,26 +4197,48 @@ RTC (Rzeczywista Rozdzielczość Zegara)
 (Tykanie/Sekunda)</translation>
     </message>
     <message>
+        <location line="+212"/>
         <source>GUI</source>
         <translation>Interfejs Użytkownika</translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>/sec</source>
         <translation>/sek.</translation>
     </message>
     <message>
+        <location line="-10"/>
         <source>GUI Refresh Rate</source>
         <translation>Częstotliwość odświeżania interfejsu użytkownika</translation>
     </message>
     <message>
+        <location line="+72"/>
+        <source>Use project save dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>Some popup menus stay open (else hold Ctrl)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Allows some popup menus to stay open.
+Otherwise, hold Ctrl to keep them open.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
         <source>&amp;Apply</source>
         <translation>&amp;Zastosuj</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>&amp;Ok</source>
         <translation>&amp;Akceptuj</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>&amp;Cancel</source>
         <translation>A&amp;nuluj</translation>
     </message>
@@ -4198,304 +4247,479 @@ RTC (Rzeczywista Rozdzielczość Zegara)
         <translation type="obsolete">Przeglądarka pomocy:</translation>
     </message>
     <message>
+        <location line="-1385"/>
         <source>Application</source>
         <translation>Zastosowanie</translation>
     </message>
     <message>
+        <location line="+389"/>
         <source>Start Muse</source>
         <translation>Uruchamianie MuzA</translation>
     </message>
     <message>
+        <location line="+47"/>
         <source>start with last song</source>
         <translation>Otwórz ostatnio otwierany utwór</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>start with song</source>
         <translation>Ładuj przy uruchamianiu utwór</translation>
     </message>
     <message>
+        <location line="-47"/>
         <source>start song:</source>
         <translation>Ładuj utwór:</translation>
     </message>
     <message>
+        <location line="-403"/>
         <source>Views</source>
         <translation>Widoki</translation>
     </message>
     <message>
+        <location line="+6"/>
+        <location line="+47"/>
+        <location line="+37"/>
+        <location line="+144"/>
+        <location line="+56"/>
         <source>y-pos</source>
         <translation>poz.-y</translation>
     </message>
     <message>
+        <location line="-274"/>
+        <location line="+57"/>
+        <location line="+47"/>
+        <location line="+7"/>
         <source>show</source>
         <translation>Pokaż</translation>
     </message>
     <message>
+        <location line="-104"/>
+        <location line="+40"/>
+        <location line="+17"/>
+        <location line="+164"/>
+        <location line="+56"/>
         <source>x-pos</source>
         <translation>poz.-x</translation>
     </message>
     <message>
+        <location line="-267"/>
+        <location line="+77"/>
+        <location line="+104"/>
+        <location line="+56"/>
         <source>height</source>
         <translation>wysokość</translation>
     </message>
     <message>
+        <location line="-227"/>
+        <location line="+57"/>
+        <location line="+124"/>
+        <location line="+56"/>
         <source>width</source>
         <translation>szerokość</translation>
     </message>
     <message>
+        <location line="-108"/>
         <source>Big Time</source>
         <translation>Duży Zegar</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Arranger</source>
         <translation>Główne Okno</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Transport</source>
         <translation>Panel transportu</translation>
     </message>
     <message>
+        <location line="+59"/>
+        <location line="+56"/>
+        <location line="+16"/>
+        <location line="+16"/>
+        <location line="+16"/>
         <source>Cur</source>
         <translation>Aktualne</translation>
     </message>
     <message>
+        <location line="-107"/>
+        <location line="+56"/>
+        <location line="+16"/>
+        <location line="+16"/>
+        <location line="+16"/>
         <source>set current values</source>
         <translation>Ustaw aktualną wartość</translation>
     </message>
     <message>
+        <location line="+76"/>
         <source>start with template: default.med</source>
         <translation>Załaduj utwór szablon: default.med</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>show splash screen</source>
         <translation>Pokaż okno o programie przy starcie</translation>
     </message>
     <message>
+        <location line="-326"/>
         <source>Mixer A</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Mixer B</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+317"/>
         <source>show &quot;Did you know?&quot; dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-55"/>
         <source>Start song</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+140"/>
         <source>min. Slider Val</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use Jack freewheel mode if possible.
-(Speeds up bounce operations).</source>
+        <location line="+60"/>
+        <source>Enable denormal protection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable denormal protection</source>
+        <location line="+10"/>
+        <source>Enable output limiter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable output limiter</source>
+        <location line="+131"/>
+        <source>External Waveditor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable in-place processing for VST plugins.
-(Requires restart.)</source>
+        <location line="+25"/>
+        <source>External Waveditor command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Turn this off if VST Ladspa effect rack plugins do not work or feedback loudly, even if they are supposed to be in-place capable.</source>
+        <location line="+44"/>
+        <source>Note: External editor opened from the internal editor.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>External Waveditor</source>
+        <location line="+15"/>
+        <source>Dummy Audio Driver (settings require restart)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>External Waveditor command</source>
+        <location line="+31"/>
+        <source>Hz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Note: External editor opened from the internal editor.</source>
+        <location line="+19"/>
+        <source>Period size (Frames per period):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dummy Audio Driver (settings require restart)</source>
+        <location line="-180"/>
+        <location line="+194"/>
+        <source>16</source>
+        <translation type="unfinished">16</translation>
+    </message>
+    <message>
+        <location line="-320"/>
+        <source>Try to use Jack Freewheel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Preferred sample rate</source>
+        <location line="+17"/>
+        <source>Speeds bounce operations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Actual rate used depends on limitations of
- timer used. If a high rate timer is available,
- short periods can be used with high sample rates. 
-Period affects midi playback resolution. 
-Shorter periods are desirable.</source>
+        <location line="+3"/>
+        <source>Use Jack Freewheel mode if possible.
+This dramatically speeds bounce operations.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Hz</source>
+        <location line="+38"/>
+        <source>VST in-place</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Actual rate used now (dummy or not):</source>
+        <location line="+10"/>
+        <source>Enable VST in-place processing (restart required)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>---</source>
+        <location line="+3"/>
+        <source>Enable VST in-place processing. Turn this off if 
+ 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>
     </message>
     <message>
-        <source>Period size (Frames per period):</source>
+        <location line="+13"/>
+        <source>Minimum control period</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>16</source>
-        <translation type="unfinished">16</translation>
+        <location line="+7"/>
+        <source>Minimum audio controller process period (samples).
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Minimum audio controller process period (samples).
+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>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>1</source>
+        <translation type="unfinished">1</translation>
     </message>
     <message>
+        <location line="+5"/>
+        <source>2</source>
+        <translation type="unfinished">2</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>4</source>
+        <translation type="unfinished">4</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>8</source>
+        <translation type="unfinished">8</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+194"/>
         <source>32</source>
         <translation type="unfinished">32</translation>
     </message>
     <message>
+        <location line="-189"/>
+        <location line="+194"/>
         <source>64</source>
         <translation type="unfinished">64</translation>
     </message>
     <message>
+        <location line="-189"/>
+        <location line="+194"/>
         <source>128</source>
         <translation type="unfinished">128</translation>
     </message>
     <message>
+        <location line="-189"/>
+        <location line="+194"/>
         <source>256</source>
         <translation type="unfinished">256</translation>
     </message>
     <message>
+        <location line="-189"/>
+        <location line="+194"/>
         <source>512</source>
         <translation type="unfinished">512</translation>
     </message>
     <message>
+        <location line="-68"/>
+        <source>Sample rate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>Shorter periods give better midi playback resolution.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+96"/>
         <source>8192</source>
         <translation type="unfinished">8192</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>16384</source>
         <translation type="unfinished">16384</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>32768</source>
         <translation type="unfinished">32768</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Midi Resolution
 (Ticks/Quarternote)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+126"/>
+        <source>Instruments Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+85"/>
         <source>Use old-style stop shortcut:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Move single armed track with selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-791"/>
         <source>On Launch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+736"/>
         <source>Behavior</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>Header</name>
+    <message>
+        <location filename="../../muse/widgets/header.cpp" line="+134"/>
+        <source>Track Info Columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LMaster</name>
     <message>
+        <location filename="../../muse/master/lmaster.cpp" line="+170"/>
         <source>new tempo</source>
         <translation>nowe tempo</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>new signature</source>
         <translation>nowe metrum</translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Meter</source>
         <translation>Miernik</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Time</source>
         <translation>Pozycja</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Value</source>
         <translation>Wartość</translation>
     </message>
     <message>
+        <location line="-67"/>
         <source>MusE: Mastertrack</source>
         <translation>MuzA: Ślad Tempo/Metrum</translation>
     </message>
     <message>
+        <location line="+42"/>
         <source>Tempo</source>
         <translation>Tempo</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Timesig</source>
         <translation>Metrum</translation>
     </message>
     <message>
+        <location line="-37"/>
         <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="+20"/>
         <source>Master tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Edit tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+6"/>
+        <source>Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>new key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+370"/>
         <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>
@@ -4503,18 +4727,22 @@ Shorter periods are desirable.</source>
 <context>
     <name>ListEdit</name>
     <message>
+        <location filename="../../muse/liste/listedit.cpp" line="+470"/>
         <source>&amp;Edit</source>
         <translation>E&amp;dytuj</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Cut</source>
         <translation>Wytnij</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Copy</source>
         <translation>Kopiuj</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Paste</source>
         <translation>Wklej</translation>
     </message>
@@ -4527,6 +4755,7 @@ Shorter periods are desirable.</source>
         <translation type="obsolete">Wstaw Narzędzia</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Delete Events</source>
         <translation>Kasuj Elementy</translation>
     </message>
@@ -4535,6 +4764,7 @@ Shorter periods are desirable.</source>
         <translation type="obsolete">Wstaw nutę</translation>
     </message>
     <message>
+        <location line="-37"/>
         <source>insert Note</source>
         <translation>Wstaw nutę</translation>
     </message>
@@ -4543,6 +4773,7 @@ Shorter periods are desirable.</source>
         <translation type="obsolete">wstaw SysEx</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>insert SysEx</source>
         <translation>wstaw SysEx</translation>
     </message>
@@ -4551,6 +4782,7 @@ Shorter periods are desirable.</source>
         <translation type="obsolete">Wstaw kontroler</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>insert Ctrl</source>
         <translation>wstaw </translation>
     </message>
@@ -4559,6 +4791,7 @@ Shorter periods are desirable.</source>
         <translation type="obsolete">Wstaw Meta</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>insert Meta</source>
         <translation>Wstaw Meta</translation>
     </message>
@@ -4567,6 +4800,7 @@ Shorter periods are desirable.</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>
     </message>
@@ -4575,14 +4809,17 @@ Shorter periods are desirable.</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="+68"/>
         <source>Tick</source>
         <translation>Takt (impuls sygnału czasu)</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Bar</source>
         <translation>Takt</translation>
     </message>
@@ -4591,38 +4828,47 @@ Shorter periods are desirable.</source>
         <translation type="obsolete">Typ</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Ch</source>
         <translation>Kan</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Val A</source>
         <translation>Wart. A</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Val B</source>
         <translation>Wart. B</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Val C</source>
         <translation>Wart. C</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Len</source>
         <translation>Dług.</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Comment</source>
         <translation>Opis</translation>
     </message>
     <message>
+        <location line="-32"/>
         <source>List tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Insert tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Type</source>
         <translation type="unfinished">Typ</translation>
     </message>
@@ -4630,22 +4876,27 @@ Shorter periods are desirable.</source>
 <context>
     <name>MITTransposeBase</name>
     <message>
+        <location filename="../../muse/widgets/mittransposebase.ui" line="+14"/>
         <source>MusE: Midi Input Plugin: Transpose</source>
         <translation>MuzA: Wtyczka Wejścia Midi: Transponuj</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>On</source>
         <translation>Włącz.</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>TriggerKey</source>
         <translation>Klawisz uruchamiający</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Transpose:</source>
         <translation>Transponuj:</translation>
     </message>
     <message>
+        <location line="+31"/>
         <source>+0</source>
         <translation></translation>
     </message>
@@ -4657,22 +4908,27 @@ Shorter periods are desirable.</source>
         <translation type="obsolete">brak</translation>
     </message>
     <message>
+        <location filename="../../muse/confmport.cpp" line="+236"/>
         <source>Port</source>
         <translation>Numer</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>GUI</source>
         <translation>Interfejs użytkownika </translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Instrument</source>
         <translation>Typ portu midi</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Device Name</source>
         <translation>Nazwa Urządzenia</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>State</source>
         <translation>Status</translation>
     </message>
@@ -4681,158 +4937,238 @@ Shorter periods are desirable.</source>
         <translation type="obsolete">nieznane</translation>
     </message>
     <message>
+        <location line="-8"/>
         <source>I</source>
         <translation>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>
     </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>
-        <source>Connect these to new midi tracks</source>
+        <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>
-        <source>Connect new midi tracks to this (first listed only)</source>
+        <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>
     </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>
-        <source>Connect these channels, on this port, to new midi tracks.
-Example:
- 1 2 3    channel 1 2 and 3
- 1-3      same
- 1-3 5    channel 1 2 3 and 5
- all      all channels
- none     no channels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connect new midi tracks to these channels, on this port.
-See default in channels.
-NOTE: Currently only one output port and channel supported (first found)</source>
-        <translation type="unfinished"></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>
     </message>
@@ -4840,41 +5176,55 @@ NOTE: Currently only one output port and channel supported (first found)</source
 <context>
     <name>MRConfigBase</name>
     <message>
+        <location filename="../../muse/mplugins/mrconfigbase.ui" line="+14"/>
         <source>MusE: Midi Input Plugin: Remote Control</source>
         <translation>MuzA: Wtyczka Wejścia Midi: Zdalne Sterowanie</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Activate</source>
         <translation>Aktywuj</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>On</source>
         <translation>Wł.</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Actions</source>
         <translation>Funkcje</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Stop</source>
         <translation>Stop</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Record</source>
         <translation>Nagrywanie</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Goto Left Mark</source>
         <translation>Idź do lewego lokatora</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Play</source>
         <translation>Odtwarzanie</translation>
     </message>
+    <message>
+        <location line="+25"/>
+        <source>Insert rest (step rec) </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MTScale</name>
     <message>
+        <location filename="../../muse/widgets/mtscale.cpp" line="+27"/>
         <source>bar scale</source>
         <translation>Oś taktów</translation>
     </message>
@@ -4882,30 +5232,37 @@ NOTE: Currently only one output port and channel supported (first found)</source
 <context>
     <name>MarkerView</name>
     <message>
+        <location filename="../../muse/marker/markerview.cpp" line="+197"/>
         <source>Bar:Beat:Tick</source>
         <translation>Takt:Puls:Takt</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Hr:Mn:Sc:Fr:Sf</source>
         <translation>Godz.:Min.:Sek.:Kl.:SKl</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Lock</source>
         <translation>Zablokuj</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Text</source>
         <translation>Tekst</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Marker Properties</source>
         <translation>Właściwości znacznika</translation>
     </message>
     <message>
+        <location line="-53"/>
         <source>MusE: Marker</source>
         <translation>MuzA: Znacznik</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>add marker</source>
         <translation>Dodaj znacznik</translation>
     </message>
@@ -4914,6 +5271,7 @@ NOTE: Currently only one output port and channel supported (first found)</source
         <translation type="obsolete">Dodaj znacznik</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>delete marker</source>
         <translation>Kasuj znacznik</translation>
     </message>
@@ -4926,14 +5284,17 @@ NOTE: Currently only one output port and channel supported (first found)</source
         <translation type="obsolete">&amp;Plik</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>&amp;Edit</source>
         <translation>&amp;Edycja</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>marker-tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>edit tools</source>
         <translation type="unfinished">Narzędzia Edycyjne</translation>
     </message>
@@ -4941,34 +5302,42 @@ NOTE: Currently only one output port and channel supported (first found)</source
 <context>
     <name>MasterEdit</name>
     <message>
+        <location filename="../../muse/master/masteredit.cpp" line="-15"/>
         <source>Cursor</source>
         <translation>Poz. kursora</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Snap</source>
         <translation>Przyciąganie</translation>
     </message>
     <message>
+        <location line="-10"/>
         <source>time at cursor position</source>
         <translation>Wstaw metrum w aktualnej pozycji kursora</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>tempo at cursor position</source>
         <translation>Wstaw tempo w aktualnej pozycji kursora</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>CurPos </source>
         <translation>Akt. Poz. Kursora:</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>tempo at current position</source>
         <translation>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>
     </message>
     <message>
+        <location line="-58"/>
         <source>MusE: Mastertrack</source>
         <translation>MuzA: Ślad Tempo/Metrum</translation>
     </message>
@@ -4981,6 +5350,7 @@ NOTE: Currently only one output port and channel supported (first found)</source
         <translation type="obsolete">Aktywuj Ślad Tempo/Metrum</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>Info</source>
         <translation>Info</translation>
     </message>
@@ -4989,18 +5359,22 @@ NOTE: Currently only one output port and channel supported (first found)</source
         <translation type="obsolete">Wył.</translation>
     </message>
     <message>
+        <location line="-6"/>
         <source>Enable</source>
         <translation>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="-10"/>
         <source>Master tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Enable master</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5008,114 +5382,142 @@ NOTE: Currently only one output port and channel supported (first found)</source
 <context>
     <name>MetronomeConfigBase</name>
     <message>
+        <location filename="../../muse/widgets/metronomebase.ui" line="+14"/>
         <source>MusE: Metronome Config</source>
         <translation>MuzA: Konfiguracja Metronomu</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Metronome</source>
         <translation>Metronom</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Audio Beep</source>
         <translation>Audio Beep</translation>
     </message>
     <message>
+        <location line="+65"/>
         <source>MIDI Click</source>
         <translation>MIDI Klik</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>Midi Channel</source>
         <translation>Kanał Midi</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Measure Note</source>
         <translation>Dźwięk 1 uderzenie w takcie</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Measure Velocity</source>
         <translation>Głośność 1 uderzenie w takcie</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Beat Velocity</source>
         <translation>Głośność pozostałych uderzeń metronomu</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Beat Note</source>
         <translation>Dźwięk pozostałych uderzeń metronomu</translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Midi Port</source>
         <translation>Numer Portu Midi</translation>
     </message>
     <message>
+        <location line="+42"/>
         <source>Precount</source>
         <translation>Nabicie tempa</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>enable</source>
         <translation>włącz</translation>
     </message>
     <message>
+        <location line="+34"/>
         <source>Bars</source>
         <translation>Takty</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>From Mastertrack</source>
         <translation>Ze śladu tempo/metrum (Mastertrack)</translation>
     </message>
     <message>
+        <location line="+34"/>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>Signature</source>
         <translation>Metrum</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Prerecord</source>
         <translation>Prerecord</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Preroll</source>
         <translation>Preroll</translation>
     </message>
     <message>
+        <location line="+38"/>
         <source>&amp;Apply</source>
         <translation>&amp;Zastosuj</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>&amp;OK</source>
         <translation>&amp;Akceptuj</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Anuluj</translation>
     </message>
     <message>
+        <location line="-425"/>
         <source>Choose outputs...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+36"/>
         <source>50</source>
         <translation type="unfinished">50</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>% Audio volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+324"/>
         <source>Hint: Enable metronome in Transportpanel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>Alt+A</source>
         <translation type="unfinished">Alt+A</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Alt+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Alt+C</source>
         <translation type="unfinished">Alt+C</translation>
     </message>
@@ -5130,261 +5532,352 @@ NOTE: Currently only one output port and channel supported (first found)</source
 <context>
     <name>MidiControllerEditDialogBase</name>
     <message>
+        <location filename="../../muse/instruments/ccontrolbase.ui" line="+154"/>
         <source>Type       </source>
-        <translation type="obsolete">Typ</translation>
+        <translation type="unfinished">Typ</translation>
     </message>
     <message>
+        <location line="+129"/>
         <source>Properties</source>
-        <translation type="obsolete">Właściwości</translation>
+        <translation type="unfinished">Właściwości</translation>
     </message>
     <message>
+        <location line="+82"/>
         <source>Type</source>
-        <translation type="obsolete">Typ</translation>
+        <translation type="unfinished">Typ</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation type="obsolete">Neu</translation>
     </message>
     <message>
+        <location line="-294"/>
         <source>&amp;Delete</source>
-        <translation type="obsolete">&amp;Kasuj</translation>
+        <translation type="unfinished">&amp;Kasuj</translation>
     </message>
     <message>
+        <location line="+31"/>
         <source>&amp;OK</source>
-        <translation type="obsolete">&amp;AkceptujOK</translation>
+        <translation type="unfinished">&amp;AkceptujOK</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>&amp;Cancel</source>
-        <translation type="obsolete">&amp;Anuluj</translation>
+        <translation type="unfinished">&amp;Anuluj</translation>
     </message>
     <message>
+        <location line="-108"/>
         <source>MusE: Define Midi Controller</source>
-        <translation type="obsolete">MuzA: Zdefiniuj Midi Kontroler</translation>
+        <translation type="unfinished">MuzA: Zdefiniuj Midi Kontroler</translation>
     </message>
     <message>
+        <location line="+34"/>
         <source>&amp;Add</source>
-        <translation type="obsolete">&amp;Dodaj</translation>
+        <translation type="unfinished">&amp;Dodaj</translation>
     </message>
     <message>
+        <location line="+3"/>
+        <source>Alt+A</source>
+        <translation type="unfinished">Alt+A</translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>create new entry</source>
-        <translation type="obsolete">Stwórz nowy wpis</translation>
+        <translation type="unfinished">Stwórz nowy wpis</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>pressing the New button you create a new entry
 in the MusE list of defined controllers</source>
-        <translation type="obsolete">Naciśnij Nowy żeby utworzyć nowy wpis do listy zdefiniowanych kontrolerów MuzA</translation>
+        <translation type="unfinished">Naciśnij Nowy żeby utworzyć nowy wpis do listy zdefiniowanych kontrolerów MuzA</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>delete selected entry</source>
-        <translation type="obsolete">kasuj zaznaczone elementy</translation>
+        <translation type="unfinished">kasuj zaznaczone elementy</translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>A&amp;pply</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+24"/>
         <source>Predefined Controller:</source>
-        <translation type="obsolete">Predefiniowany kontroler:</translation>
+        <translation type="unfinished">Predefiniowany kontroler:</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Name                  </source>
-        <translation type="obsolete">nazwa</translation>
+        <translation type="unfinished">nazwa</translation>
     </message>
     <message>
+        <location line="+22"/>
+        <location line="+266"/>
         <source>H-Ctrl</source>
-        <translation type="obsolete">H-Ctrl</translation>
+        <translation type="unfinished">H-Ctrl</translation>
     </message>
     <message>
+        <location line="-255"/>
+        <location line="+283"/>
         <source>L-Ctrl</source>
-        <translation type="obsolete">L-Ctrl</translation>
+        <translation type="unfinished">L-Ctrl</translation>
     </message>
     <message>
+        <location line="-272"/>
         <source>Min Val</source>
-        <translation type="obsolete">Min. Wart.</translation>
+        <translation type="unfinished">Min. Wart.</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Max Val</source>
-        <translation type="obsolete">Max Wart.</translation>
+        <translation type="unfinished">Max Wart.</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>list of defined controllers</source>
-        <translation type="obsolete">Lista zdefiniowanych kontrolerów</translation>
+        <translation type="unfinished">Lista zdefiniowanych kontrolerów</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>This is the MusE list of defined controllers.</source>
-        <translation type="obsolete">To jest lista MuzA zdefiniowanych midi kontrolerów.</translation>
+        <translation type="unfinished">To jest lista MuzA zdefiniowanych midi kontrolerów.</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Managed Controller for Port</source>
-        <translation type="obsolete">Obsługiwane kontrolery dla portu</translation>
+        <translation type="unfinished">Obsługiwane kontrolery dla portu</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Channel</source>
-        <translation type="obsolete">Kanał</translation>
+        <translation type="unfinished">Kanał</translation>
     </message>
     <message>
+        <location line="+21"/>
         <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="obsolete">To jest lista najczęściej używanych kontorlerów midi.
+        <translation type="unfinished">To jest lista najczęściej używanych kontorlerów midi.
 Zauważ, że &quot;pitch&quot; i &quot;zmiana programu (program change)&quot; są traktowane w MuzA jako zwykłe kontrolery.</translation>
     </message>
     <message>
+        <location line="+27"/>
         <source>Name</source>
-        <translation type="obsolete">Nazwa</translation>
+        <translation type="unfinished">Nazwa</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Min Value</source>
-        <translation type="obsolete">Min. Wart.</translation>
+        <translation type="unfinished">Min. Wart.</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>Max Value</source>
-        <translation type="obsolete">Max Wart.</translation>
+        <translation type="unfinished">Max Wart.</translation>
     </message>
     <message>
+        <location line="+46"/>
         <source>Control7</source>
-        <translation type="obsolete">Kontroler7</translation>
+        <translation type="unfinished">Kontroler7</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Control14</source>
-        <translation type="obsolete">Kontroler14</translation>
+        <translation type="unfinished">Kontroler14</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>RPN</source>
-        <translation type="obsolete">RPN</translation>
+        <translation type="unfinished">RPN</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>NRPN</source>
-        <translation type="obsolete">NRPN</translation>
+        <translation type="unfinished">NRPN</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>RPN14</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>NRPN14</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Pitch</source>
-        <translation type="obsolete">Transpozycja</translation>
+        <translation type="unfinished">Transpozycja</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Program</source>
-        <translation type="obsolete">Program</translation>
+        <translation type="unfinished">Program</translation>
     </message>
     <message>
+        <location line="+32"/>
         <source>Midi Controller Number High Byte</source>
-        <translation type="obsolete">Numer midi kontrolera High Byte</translation>
+        <translation type="unfinished">Numer midi kontrolera High Byte</translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>Midi Controller Number Low Byte</source>
-        <translation type="obsolete">Numer midi kontrolera Low Byte</translation>
+        <translation type="unfinished">Numer midi kontrolera Low Byte</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Range</source>
-        <translation type="obsolete">Zakres</translation>
+        <translation type="unfinished">Zakres</translation>
     </message>
 </context>
 <context>
     <name>MidiFilterConfigBase</name>
     <message>
+        <location filename="../../muse/mplugins/midifilter.ui" line="+20"/>
         <source>MusE:  Midi Input Filter</source>
         <translation>Filtr Wejścia Midi</translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Record Filter</source>
         <translation>Filtr Komunikatów Przych. (Midi In)</translation>
     </message>
     <message>
+        <location line="+18"/>
+        <location line="+112"/>
         <source>Note On</source>
         <translation>Dźwięki</translation>
     </message>
     <message>
+        <location line="-99"/>
+        <location line="+112"/>
         <source>Poly Pressure</source>
         <translation>Średni nacisk po uderzeniu</translation>
     </message>
     <message>
+        <location line="-99"/>
+        <location line="+112"/>
         <source>Controller</source>
         <translation>Kontrolery</translation>
     </message>
     <message>
+        <location line="-99"/>
+        <location line="+112"/>
         <source>Program Change</source>
         <translation>Zmiana programu (program change)</translation>
     </message>
     <message>
+        <location line="-99"/>
+        <location line="+112"/>
         <source>After Touch</source>
         <translation>Nacisk pod uderzeniu (aftertouch)</translation>
     </message>
     <message>
+        <location line="-99"/>
+        <location line="+112"/>
         <source>Pitch Bend</source>
         <translation>Odchylenie stroju (Pitch Bend)</translation>
     </message>
     <message>
+        <location line="-99"/>
+        <location line="+112"/>
         <source>Sysex</source>
         <translation>SysEx</translation>
     </message>
     <message>
+        <location line="-96"/>
         <source>Thru Filter</source>
         <translation>Filtr Komunikatów Wych. (Midi Thru)</translation>
     </message>
     <message>
+        <location line="+112"/>
         <source>Controller Filter</source>
         <translation>Filtruj Kontroler</translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>Channel Filter</source>
         <translation>Filtruj Kanał</translation>
     </message>
     <message>
+        <location line="+24"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>13</source>
         <translation>13</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>15</source>
         <translation>15</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>11</source>
         <translation>11</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>1</source>
         <translation>1</translation>
     </message>
@@ -5392,6 +5885,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="+703"/>
+        <location line="+2"/>
         <source>New</source>
         <translation>Nowy</translation>
     </message>
@@ -5399,214 +5894,334 @@ Zauważ, że &quot;pitch&quot; i &quot;zmiana programu (program change)&quot; s�
 <context>
     <name>MidiInputTransformDialogBase</name>
     <message>
+        <location filename="../../muse/widgets/itransformbase.ui" line="+14"/>
         <source>MusE: Midi Input Transformator</source>
         <translation>MuzA: Transformator Wejścia Midi</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Filter</source>
         <translation>Filtr</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>All</source>
         <translation>Wszystko</translation>
     </message>
     <message>
+        <location line="+5"/>
+        <location line="+91"/>
+        <location line="+60"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Equal</source>
         <translation>Równe</translation>
     </message>
     <message>
+        <location line="-224"/>
+        <location line="+91"/>
+        <location line="+60"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Unequal</source>
         <translation>Nierówne</translation>
     </message>
     <message>
+        <location line="-217"/>
         <source>Note</source>
         <translation>Dźwięk</translation>
     </message>
     <message>
+        <location line="+5"/>
+        <location line="+338"/>
         <source>Poly Pressure</source>
         <translation>Średni nacisk po uderzeniu (Poly Pressure)</translation>
     </message>
     <message>
+        <location line="-333"/>
+        <location line="+338"/>
         <source>Control Change</source>
         <translation type="unfinished">Control Change</translation>
     </message>
     <message>
+        <location line="-333"/>
+        <location line="+338"/>
         <source>Aftertouch</source>
         <translation>Nacisk pod uderzeniu (aftertouch)</translation>
     </message>
     <message>
+        <location line="-333"/>
+        <location line="+338"/>
         <source>Pitch Bend</source>
         <translation>Odchylenie stroju (Pitch Bend)</translation>
     </message>
     <message>
+        <location line="-333"/>
+        <location line="+338"/>
         <source>NRPN</source>
         <translation type="unfinished">NRPN</translation>
     </message>
     <message>
+        <location line="-333"/>
+        <location line="+338"/>
         <source>RPN</source>
         <translation type="unfinished">RPN</translation>
     </message>
     <message>
+        <location line="-330"/>
+        <location line="+369"/>
+        <location line="+43"/>
         <source>Value 2</source>
         <translation>Wartość 2</translation>
     </message>
     <message>
+        <location line="-402"/>
+        <location line="+392"/>
+        <location line="+96"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Value 1</source>
         <translation>Wartość 1</translation>
     </message>
     <message>
+        <location line="-586"/>
+        <location line="+257"/>
         <source>Event Type</source>
         <translation>Rodzaje komunikatów midi</translation>
     </message>
     <message>
+        <location line="-246"/>
+        <location line="+60"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Ignore</source>
         <translation>Ignoruj</translation>
     </message>
     <message>
+        <location line="-123"/>
+        <location line="+60"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Higher</source>
         <translation>Powyżej</translation>
     </message>
     <message>
+        <location line="-133"/>
+        <location line="+60"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Lower</source>
         <translation>Poniżej</translation>
     </message>
     <message>
+        <location line="-133"/>
+        <location line="+60"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Inside</source>
         <translation>Pomiędzy</translation>
     </message>
     <message>
+        <location line="-133"/>
+        <location line="+60"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Outside</source>
         <translation>Poza</translation>
     </message>
     <message>
+        <location line="+8"/>
+        <location line="+422"/>
         <source>Channel</source>
         <translation>Kanał</translation>
     </message>
     <message>
+        <location line="-412"/>
+        <location line="+240"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
+        <location line="-192"/>
         <source>Processing</source>
         <translation>Przetwarzanie</translation>
     </message>
     <message>
+        <location line="+23"/>
+        <location line="+51"/>
+        <location line="+129"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Keep</source>
         <translation>Pozostaw</translation>
     </message>
     <message>
+        <location line="-283"/>
+        <location line="+71"/>
+        <location line="+129"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Fix</source>
         <translation>Ustal</translation>
     </message>
     <message>
+        <location line="-257"/>
+        <location line="+129"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Plus</source>
         <translation>Plus</translation>
     </message>
     <message>
+        <location line="-232"/>
+        <location line="+129"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Minus</source>
         <translation>Minus</translation>
     </message>
     <message>
+        <location line="-232"/>
+        <location line="+129"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Multiply</source>
         <translation>Przemnóż</translation>
     </message>
     <message>
+        <location line="-232"/>
+        <location line="+129"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Divide</source>
         <translation>Podziel</translation>
     </message>
     <message>
+        <location line="-222"/>
+        <location line="+129"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Invert</source>
         <translation>Odwróć</translation>
     </message>
     <message>
+        <location line="-232"/>
         <source>ScaleMap</source>
         <translation type="unfinished">Zakres Skali</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Flip</source>
         <translation>Odwróć</translation>
     </message>
     <message>
+        <location line="+5"/>
+        <location line="+119"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Dyn</source>
         <translation type="unfinished">Dyn</translation>
     </message>
     <message>
+        <location line="-222"/>
+        <location line="+119"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Random</source>
         <translation>Losowo</translation>
     </message>
     <message>
+        <location line="+48"/>
         <source>Modules</source>
         <translation>Moduły</translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>enable modul 1</source>
         <translation>aktywuj moduł 1</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>enable modul 2</source>
         <translation>aktywuj moduł 2</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>enable modul 3</source>
         <translation>aktywuj moduł 3</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>enable modul 4</source>
         <translation>aktywuj moduł 4</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Preset</source>
         <translation>Ustawienie</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Name:</source>
         <translation>Nazwa:</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>Comment:</source>
         <translation>Opis:</translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>Function</source>
         <translation>Funkcja</translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>&amp;New</source>
         <translation>&amp;Nowy</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>create new preset</source>
         <translation>Twórz nowe ustawienie</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>&amp;Delete</source>
         <translation>&amp;Kasuj</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>delete preset</source>
         <translation>kasuj ustawienie</translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>&amp;Dismiss</source>
         <translation>&amp;Wyrzuć</translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>PresetList</source>
         <translation>Lista Ustawień</translation>
     </message>
@@ -5633,50 +6248,64 @@ Zauważ, że &quot;pitch&quot; i &quot;zmiana programu (program change)&quot; s�
 <context>
     <name>MidiStrip</name>
     <message>
+        <location filename="../../muse/mixer/mstrip.cpp" line="+173"/>
         <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>Wysyłka Pogłosu</translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>Rev</source>
         <translation>Pogł.</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>ChorusSend</source>
         <translation>Wysyłka Chorusa</translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>Cho</source>
         <translation>Chorus</translation>
     </message>
     <message>
+        <location line="-83"/>
+        <location line="+121"/>
+        <location line="+158"/>
         <source>off</source>
         <translation>Wył.</translation>
     </message>
     <message>
+        <location line="-157"/>
         <source>dB</source>
         <translation>dB</translation>
     </message>
     <message>
+        <location line="+54"/>
         <source>Pan/Balance</source>
         <translation>Pan/Równowaga</translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>Pan</source>
         <translation>Pan</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>record</source>
         <translation>nagranie</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>mute</source>
         <translation>wycisz</translation>
     </message>
@@ -5713,26 +6342,33 @@ Zauważ, że &quot;pitch&quot; i &quot;zmiana programu (program change)&quot; s�
         <translation type="obsolete">typ automatyki</translation>
     </message>
     <message>
+        <location line="-206"/>
+        <location line="+122"/>
         <source>double click on/off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+105"/>
         <source>solo mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+67"/>
         <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>
@@ -5740,111 +6376,142 @@ Zauważ, że &quot;pitch&quot; i &quot;zmiana programu (program change)&quot; s�
 <context>
     <name>MidiSyncConfig</name>
     <message>
+        <location filename="../../muse/widgets/midisyncimpl.cpp" line="+41"/>
+        <location line="+29"/>
         <source>Port Number</source>
         <translation type="unfinished">Numer portu</translation>
     </message>
     <message>
+        <location line="-28"/>
+        <location line="+29"/>
         <source>Name of the midi device associated with this port number</source>
         <translation type="unfinished">Nazwa urządzenia midi skojarzona z tym numerem portu</translation>
     </message>
     <message>
+        <location line="-27"/>
         <source>Midi clock input detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <location line="+29"/>
         <source>Midi tick input detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-28"/>
         <source>Midi real time input detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>MMC input detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>MTC input detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Detected SMPTE format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Receive id number. 127 = Global. Double click to edit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Accept midi clock input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Accept midi real time input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Accept MMC input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Accept MTC input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Receive start rewinds before playing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Transmit id number. 127 = Global. Double click to edit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Send midi clock output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Send midi realtime output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <location line="+49"/>
         <source>Send MMC output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-48"/>
+        <location line="+49"/>
         <source>Send MTC output</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+3"/>
         <source>Midi realtime input detected, including
  start/stop/continue, and song position.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>MMC input detected, including stop/play/deferred play, and locate.</source>
         <translation type="unfinished"></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>
     </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>
     </message>
     <message>
+        <location line="+2"/>
         <source>Receive id number. 127 = global receive all, even if not global.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <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,
@@ -5854,6 +6521,7 @@ Click on detect indicator to force another.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Accept midi realtime input, including
  start/stop/continue, and song position.
 Non-clock events (start,stop etc) are
@@ -5864,30 +6532,36 @@ This means you may have several master
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Accept MMC input, including stop/play/deferred play, and locate.</source>
         <translation type="unfinished"></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>
     </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>
     </message>
     <message>
+        <location line="+3"/>
         <source>Transmit id number. 127 = global transmit to all.</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+2"/>
         <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
@@ -5897,103 +6571,128 @@ Note: It may be impossible to rewind fast
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+142"/>
         <source>Port</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>c</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>k</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>r</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>m</source>
         <translation type="unfinished">min.</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>t</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>rid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>rc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>rr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>rm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>rt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>rw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>tid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>tc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>tr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>tm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>tt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+399"/>
         <source>MusE</source>
         <translation type="unfinished">MuzA</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Settings have changed
 Apply sync settings?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>&amp;Apply</source>
         <translation type="unfinished">&amp;Zastosuj</translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>&amp;No</source>
         <translation type="unfinished">&amp;Nie</translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>&amp;Abort</source>
         <translation type="unfinished">&amp;Anuluj</translation>
     </message>
     <message>
+        <location line="+125"/>
         <source>&lt;none&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6001,70 +6700,87 @@ Apply sync settings?</source>
 <context>
     <name>MidiSyncConfigBase</name>
     <message>
+        <location filename="../../muse/widgets/midisync.ui" line="+17"/>
         <source>MusE: Midi Sync</source>
         <translation>MuzA: Synchronizacja Midi</translation>
     </message>
     <message>
+        <location line="+30"/>
         <source>Apply</source>
         <translation>Zastosuj</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Ok</source>
         <translation>Akceptuj</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
     <message>
+        <location line="+99"/>
         <source>hour</source>
         <translation>godzina</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>h</source>
         <translation>godz.</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>minute</source>
         <translation>minuta</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>m</source>
         <translation>min.</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>second</source>
         <translation>sekunda</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>s</source>
         <translation>sek.</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>frame</source>
         <translation>ramka</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>f</source>
         <translation>r.</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>subframe</source>
         <translation>subramka</translation>
     </message>
     <message>
+        <location line="-148"/>
         <source>24</source>
         <translation>24</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>25</source>
         <translation>25</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>30D</source>
         <translation type="unfinished">30D</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>30N</source>
         <translation type="unfinished">30N</translation>
     </message>
@@ -6133,39 +6849,48 @@ Apply sync settings?</source>
         <translation type="obsolete">wszystkie</translation>
     </message>
     <message>
+        <location line="-46"/>
         <source>MTC</source>
         <translation>MTC</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
     <message>
+        <location line="+60"/>
         <source>Offset:</source>
         <translation>Offset:</translation>
     </message>
     <message>
+        <location line="+117"/>
         <source>Sync receiving and sending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Send and receive Jack transport</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Send and receive Jack transport information,
  including stop, start and position.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Use Jack transport</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Make MusE the Jack transport Timebase Master</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Make MusE the Jack transport Timebase Master.
 Allows Jack to show time as 
  MusE Bars, Beats, and Ticks. 
@@ -6175,14 +6900,17 @@ You can always click here again for Master.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Jack transport Timebase Master</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Control MusE timing by external midi clock or MTC sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>When in slave mode, tempo is
  controlled externally.
 MusE can sync to midi clock, or MTC quarter frame sync. 
@@ -6191,14 +6919,17 @@ Enabled inputs in the list will
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Slave to external sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Send start to first clock delay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Allows &apos;slow sync&apos; devices time
  to synchronize to MusE. This value is the
  delay from sending start to sending
@@ -6206,10 +6937,12 @@ Enabled inputs in the list will
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>ms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Send sync delay</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6217,10 +6950,12 @@ Enabled inputs in the list will
 <context>
     <name>MidiTrackInfoBase</name>
     <message>
+        <location filename="../../muse/widgets/mtrackinfobase.ui" line="+38"/>
         <source>MusE: TrackInfo</source>
         <translation>Info o śladzie</translation>
     </message>
     <message>
+        <location line="+59"/>
         <source>output channel</source>
         <translation>kanał wyjściowy</translation>
     </message>
@@ -6233,6 +6968,8 @@ Enabled inputs in the list will
         <translation type="obsolete">Info o śladzie</translation>
     </message>
     <message>
+        <location line="+249"/>
+        <location line="+91"/>
         <source>%</source>
         <translation>%</translation>
     </message>
@@ -6241,10 +6978,23 @@ Enabled inputs in the list will
         <translation type="obsolete">Nazwa Śladu</translation>
     </message>
     <message>
+        <location line="-353"/>
         <source>output port</source>
         <translation>port wyjściowy</translation>
     </message>
     <message>
+        <location line="+68"/>
+        <source>iR</source>
+        <translation type="unfinished">Wej.</translation>
+    </message>
+    <message>
+        <location line="+109"/>
+        <location line="+44"/>
+        <location line="+287"/>
+        <location line="+53"/>
+        <location line="+53"/>
+        <location line="+67"/>
+        <location line="+70"/>
         <source>off</source>
         <translation>Wył.</translation>
     </message>
@@ -6265,6 +7015,7 @@ Enabled inputs in the list will
         <translation type="obsolete">wybierz ustawienie instrumentu</translation>
     </message>
     <message>
+        <location line="-552"/>
         <source>Transp.</source>
         <translation>Transpozycja</translation>
     </message>
@@ -6273,26 +7024,47 @@ Enabled inputs in the list will
         <translation type="obsolete">Głośność</translation>
     </message>
     <message>
+        <location line="+210"/>
         <source>Channel Info</source>
         <translation>Info o kanale</translation>
     </message>
     <message>
+        <location line="+35"/>
+        <source>Rec:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+200"/>
+        <source>Prog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+67"/>
+        <source>Vol</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+70"/>
         <source>Pan</source>
         <translation>Panorama</translation>
     </message>
     <message>
+        <location line="-541"/>
         <source>Delay</source>
         <translation>Opóźnienie</translation>
     </message>
     <message>
+        <location line="+293"/>
         <source>H-Bank</source>
         <translation type="unfinished">H-Bank</translation>
     </message>
     <message>
+        <location line="-155"/>
         <source>Compr.</source>
         <translation>Kompr.</translation>
     </message>
     <message>
+        <location line="+208"/>
         <source>L-Bank</source>
         <translation type="unfinished">L-Bank</translation>
     </message>
@@ -6301,10 +7073,12 @@ Enabled inputs in the list will
         <translation type="obsolete">Nr programu</translation>
     </message>
     <message>
+        <location line="-255"/>
         <source>Velocity</source>
         <translation>Prędk. uderz. (vel)</translation>
     </message>
     <message>
+        <location line="-47"/>
         <source>Length</source>
         <translation>Długość</translation>
     </message>
@@ -6355,108 +7129,115 @@ Możesz określić więcej niż jeden ślad do nagrywania:
         <translation type="obsolete">Wybierz Bank MSB</translation>
     </message>
     <message>
+        <location line="-268"/>
         <source>all midi events are sent to this output channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>Out ch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+27"/>
         <source>input routing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Inputs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="+16"/>
         <source>output routing</source>
         <translation type="unfinished">połączenie Wyjścia</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>oR</source>
         <translation type="unfinished">Wyj.</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>input detect</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+5"/>
         <source>W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+25"/>
         <source>Midi thru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Pass input events through (&apos;thru&apos;) to output.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+288"/>
         <source>Select instrument patch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>&lt;unknown&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Record:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="+37"/>
         <source>Add all settings to song</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>All</source>
         <translation type="unfinished">Wszystko</translation>
     </message>
     <message>
+        <location line="+31"/>
         <source>Bank Select MSB. Double-click on/off.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+53"/>
         <source>Bank Select LSB. Double-click on/off.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+53"/>
         <source>Program. Double-click on/off.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>Add bank + prog settings to song</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Prog.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="+34"/>
         <source>Volume. Double-click on/off.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>Add vol setting to song</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Vol.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="+34"/>
+        <location line="+3"/>
         <source>Change stereo position. Double-click on/off.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>Add pan setting to song</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6464,230 +7245,345 @@ Możesz określić więcej niż jeden ślad do nagrywania:
 <context>
     <name>MidiTransformDialogBase</name>
     <message>
+        <location filename="../../muse/widgets/transformbase.ui" line="+14"/>
         <source>MusE: Midi Transformator</source>
         <translation>MuzA: Midi Transformator</translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>&amp;New</source>
         <translation>&amp;Nowy</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>&amp;Delete</source>
         <translation>&amp;Kasuj</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>&amp;Apply</source>
         <translation>&amp;Zastosuj</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>&amp;OK</source>
         <translation>&amp;Akceptuj</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Anuluj</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>PresetList</source>
         <translation>Lista Ustawień</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>Processing</source>
         <translation>Przetwarzanie</translation>
     </message>
     <message>
+        <location line="+12"/>
+        <location line="+425"/>
         <source>Event Type</source>
         <translation>Rodzaje komunikatów midi</translation>
     </message>
     <message>
+        <location line="-414"/>
+        <location line="+56"/>
+        <location line="+104"/>
+        <location line="+54"/>
+        <location line="+55"/>
         <source>Keep</source>
         <translation>Pozostaw</translation>
     </message>
     <message>
+        <location line="-264"/>
+        <location line="+76"/>
+        <location line="+104"/>
+        <location line="+54"/>
         <source>Fix</source>
         <translation>Ustal</translation>
     </message>
     <message>
+        <location line="-222"/>
+        <location line="+339"/>
         <source>Note</source>
         <translation>Dźwięki</translation>
     </message>
     <message>
+        <location line="-334"/>
+        <location line="+339"/>
         <source>Poly Pressure</source>
         <translation>Średni nacisk po uderzeniu</translation>
     </message>
     <message>
+        <location line="-334"/>
+        <location line="+339"/>
         <source>Control Change</source>
         <translation type="unfinished">Control Change</translation>
     </message>
     <message>
+        <location line="-334"/>
+        <location line="+339"/>
         <source>Aftertouch</source>
         <translation>Nacisk pod uderzeniu (aftertouch)</translation>
     </message>
     <message>
+        <location line="-334"/>
+        <location line="+339"/>
         <source>Pitch Bend</source>
         <translation type="unfinished">Odchylenie stroju (Pitch Bend)</translation>
     </message>
     <message>
+        <location line="-334"/>
+        <location line="+339"/>
         <source>NRPN</source>
         <translation type="unfinished">NRPN</translation>
     </message>
     <message>
+        <location line="-334"/>
+        <location line="+339"/>
         <source>RPN</source>
         <translation type="unfinished">RPN</translation>
     </message>
     <message>
+        <location line="-325"/>
+        <location line="+104"/>
+        <location line="+54"/>
+        <location line="+55"/>
         <source>Plus</source>
         <translation>Plus</translation>
     </message>
     <message>
+        <location line="-208"/>
+        <location line="+104"/>
+        <location line="+54"/>
+        <location line="+55"/>
         <source>Minus</source>
         <translation>Minus</translation>
     </message>
     <message>
+        <location line="-208"/>
+        <location line="+104"/>
+        <location line="+54"/>
+        <location line="+55"/>
         <source>Multiply</source>
         <translation>Przemnóż</translation>
     </message>
     <message>
+        <location line="-208"/>
+        <location line="+104"/>
+        <location line="+54"/>
+        <location line="+55"/>
         <source>Divide</source>
         <translation>Podziel</translation>
     </message>
     <message>
+        <location line="-203"/>
+        <location line="+43"/>
+        <location line="+265"/>
         <source>Value 2</source>
         <translation>Wartość 2</translation>
     </message>
     <message>
+        <location line="-303"/>
+        <location line="+104"/>
         <source>Invert</source>
         <translation>Odwróć</translation>
     </message>
     <message>
+        <location line="-99"/>
         <source>ScaleMap</source>
         <translation type="unfinished">Zakres Skali</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Flip</source>
         <translation>Odwróć</translation>
     </message>
     <message>
+        <location line="+5"/>
+        <location line="+94"/>
         <source>Dyn</source>
         <translation type="unfinished">Dyn.</translation>
     </message>
     <message>
+        <location line="-89"/>
+        <location line="+94"/>
         <source>Random</source>
         <translation>Losowo</translation>
     </message>
     <message>
+        <location line="-86"/>
+        <location line="+71"/>
+        <location line="+214"/>
         <source>Value 1</source>
         <translation>Wartość 1</translation>
     </message>
     <message>
+        <location line="-265"/>
+        <location line="+324"/>
         <source>Length</source>
         <translation>Długość:</translation>
     </message>
     <message>
+        <location line="-314"/>
         <source>Position</source>
         <translation>Pozycja</translation>
     </message>
     <message>
+        <location line="+172"/>
         <source>Filter</source>
         <translation>Filtruj</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>All</source>
         <translation>Wszystko</translation>
     </message>
     <message>
+        <location line="+5"/>
+        <location line="+91"/>
+        <location line="+59"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Equal</source>
         <translation>Równe</translation>
     </message>
     <message>
+        <location line="-223"/>
+        <location line="+91"/>
+        <location line="+59"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Unequal</source>
         <translation>Nnierówne</translation>
     </message>
     <message>
+        <location line="-147"/>
+        <location line="+59"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Ignore</source>
         <translation>Ignoruj</translation>
     </message>
     <message>
+        <location line="-122"/>
+        <location line="+59"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Higher</source>
         <translation>Powyżej</translation>
     </message>
     <message>
+        <location line="-132"/>
+        <location line="+59"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Lower</source>
         <translation>Poniżej</translation>
     </message>
     <message>
+        <location line="-132"/>
+        <location line="+59"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Inside</source>
         <translation>Pomiędzy</translation>
     </message>
     <message>
+        <location line="-132"/>
+        <location line="+59"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Outside</source>
         <translation>Poza</translation>
     </message>
     <message>
+        <location line="-119"/>
         <source>Bar Range</source>
         <translation>Zakres Taktów</translation>
     </message>
     <message>
+        <location line="+197"/>
         <source>Preset</source>
         <translation>Ustawienie</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Name:</source>
         <translation>Nazwa:</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Comment:</source>
         <translation>Opis:</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Range</source>
         <translation>Zakres</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>process all events</source>
         <translation>przetwórz wszystkie elementy</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>selected tracks</source>
         <translation>Zaznaczone ślady</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>inside loop</source>
         <translation>Pomiędzy lokatorami.</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Function</source>
         <translation>Opcje</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Select</source>
         <translation>Wybierz</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Quantize</source>
         <translation>Kwantyzuj</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Delete</source>
         <translation>Kasuj</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Transform</source>
         <translation>przekształć</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Insert</source>
         <translation>Wstaw</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Copy</source>
         <translation>Kopiuj</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Extract</source>
         <translation>Wydobądź</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Quantize Value</source>
         <translation>Wartość kwantyzacji</translation>
     </message>
@@ -6695,6 +7591,8 @@ Możesz określić więcej niż jeden ślad do nagrywania:
 <context>
     <name>MidiTransformerDialog</name>
     <message>
+        <location filename="../../muse/miditransform.cpp" line="+248"/>
+        <location line="+2"/>
         <source>New</source>
         <translation>Nowy</translation>
     </message>
@@ -6702,6 +7600,7 @@ Możesz określić więcej niż jeden ślad do nagrywania:
 <context>
     <name>MixdownFileDialog</name>
     <message>
+        <location filename="../../muse/widgets/mixdowndialog.cpp" line="+101"/>
         <source>Wave Files (*.wav);;All Files (*)</source>
         <translation>Pliki Wave (*.wav);;Wszystkie Pliki (*)</translation>
     </message>
@@ -6709,50 +7608,62 @@ Możesz określić więcej niż jeden ślad do nagrywania:
 <context>
     <name>MixdownFileDialogBase</name>
     <message>
+        <location filename="../../muse/widgets/mixdowndialogbase.ui" line="+14"/>
         <source>MusE: Set Mixdown Wavefile</source>
         <translation>MuzA: Ustaw miks do zgrania do pliku Wavefile</translation>
     </message>
     <message>
+        <location line="+39"/>
         <source>&amp;OK</source>
         <translation>&amp;Akceptuj</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Anuluj</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>File Path</source>
         <translation>Ścieżka do pliku</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Channel</source>
         <translation>Ilość Kanałów</translation>
     </message>
     <message>
+        <location line="+31"/>
         <source>Stereo</source>
         <translation>Stereo</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Mono</source>
         <translation>Mono</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>5.1</source>
         <translation>5.1</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>wav,16 Bit</source>
         <translation>wav, 16 Bitów</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>wav, 24 Bit</source>
         <translation>wav, 24 Bity</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>wav, 32 Bit (float)</source>
         <translation>wav, 32 Bity (float)</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Format</source>
         <translation>Format</translation>
     </message>
@@ -6767,14 +7678,17 @@ Możesz określić więcej niż jeden ślad do nagrywania:
 <context>
     <name>MusE</name>
     <message>
+        <location filename="../../muse/app.cpp" line="+564"/>
         <source>&amp;File</source>
         <translation>&amp;Plik</translation>
     </message>
     <message>
+        <location line="-376"/>
         <source>Open &amp;Recent</source>
         <translation>Otwórz O&amp;statnie</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Save &amp;As</source>
         <translation>Zapisz &amp;Jako</translation>
     </message>
@@ -6783,34 +7697,43 @@ Możesz określić więcej niż jeden ślad do nagrywania:
         <translation type="obsolete">Druckerkonfiguration</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Import Midifile</source>
         <translation>&amp;Import Pliku Midi</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Export Midifile</source>
         <translation>&amp;Export do pliku midi</translation>
     </message>
     <message>
+        <location line="+3"/>
+        <location filename="../../muse/wave.cpp" line="+810"/>
         <source>Import Wave File</source>
         <translation>Import Pliku &amp;Wave</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>&amp;Quit</source>
         <translation>&amp;Zakończ</translation>
     </message>
     <message>
+        <location line="+383"/>
         <source>&amp;Edit</source>
         <translation>&amp;Edycja</translation>
     </message>
     <message>
+        <location line="-380"/>
         <source>C&amp;ut</source>
         <translation>W&amp;ytnij</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>&amp;Copy</source>
         <translation>&amp;Kopiuj</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>&amp;Paste</source>
         <translation>&amp;Wklej</translation>
     </message>
@@ -6819,186 +7742,233 @@ Możesz określić więcej niż jeden ślad do nagrywania:
         <translation type="obsolete">Spur Lschen</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Add Track</source>
         <translation>Dodaj Ślad</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Select &amp;All</source>
         <translation>Zaznacz &amp;wszystko</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>&amp;Deselect All</source>
         <translation>&amp;Odznacz wszystko</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Invert &amp;Selection</source>
         <translation>Odwróć &amp;zaznaczenie</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>&amp;Inside Loop</source>
         <translation>&amp;Pomiędzy lokatorami.</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>&amp;Outside Loop</source>
         <translation>&amp;Poza obrębem lokatorów</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>All &amp;Parts on Track</source>
         <translation>Wszystkie &amp;klocki na śladzie</translation>
     </message>
     <message>
+        <location line="-8"/>
         <source>Select</source>
         <translation>Zaznacz</translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Drums</source>
         <translation>Edytor Perkusji</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <location line="+6"/>
         <source>List</source>
         <translation>Edytor Lista</translation>
     </message>
     <message>
+        <location line="-1"/>
         <source>Graphic</source>
         <translation>Edytor Graficzny Tempo/Metrum</translation>
     </message>
     <message>
+        <location line="-2"/>
         <source>Mastertrack</source>
         <translation>Ślad Tempo/Metrum</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Midi &amp;Transform</source>
         <translation>&amp;Przekształcanie Midi</translation>
     </message>
     <message>
+        <location line="+374"/>
         <source>Modify Gate Time</source>
         <translation>Modyfikuj Gate Time</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Modify Velocity</source>
         <translation>Modifikuj predkość uderzenia (velocity)</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Crescendo</source>
         <translation>Crescendo</translation>
     </message>
     <message>
+        <location line="-344"/>
         <source>Transpose</source>
         <translation>Transponuj</translation>
     </message>
     <message>
+        <location line="+345"/>
         <source>Thin Out</source>
         <translation>Decresendo</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Erase Event</source>
         <translation>Skasuj Element</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Note Shift</source>
         <translation>Przesunięcie Dźwięku</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Move Clock</source>
         <translation>Przesuń licznik</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Copy Measure</source>
         <translation>Kopiuj Takt</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Erase Measure</source>
         <translation>Skasuj Takt</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Delete Measure</source>
         <translation>Skasuj Takt</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Create Measure</source>
         <translation>Twórz Takt</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Mix Track</source>
         <translation>Zmiksuj Ślad</translation>
     </message>
     <message>
+        <location line="-388"/>
         <source>Midi</source>
         <translation>Midi</translation>
     </message>
     <message>
+        <location line="+412"/>
         <source>&amp;Structure</source>
         <translation>&amp;Globalne</translation>
     </message>
     <message>
+        <location line="-390"/>
         <source>Global Cut</source>
         <translation>Globalne Wycięcie</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Global Insert</source>
         <translation>Globalne Wstawienie</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Global Split</source>
         <translation>Globalne Podzielenie</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Copy Range</source>
         <translation>Kopiuj Zakres</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Cut Events</source>
         <translation>Wytnij Elementy</translation>
     </message>
     <message>
+        <location line="-19"/>
         <source>Transport Panel</source>
         <translation>Panel transportu</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Bigtime Window</source>
         <translation>Duży Zegar</translation>
     </message>
     <message>
-        <source>Don't Follow Song</source>
+        <location line="+53"/>
+        <source>Don&apos;t Follow Song</source>
         <translation>nie podążaj za utworem</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Follow Page</source>
         <translation>kursor się przesuwa</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Follow Continuous</source>
         <translation>takty się przesuwają (kursor stoi)</translation>
     </message>
     <message>
+        <location line="-8"/>
         <source>Global Settings</source>
         <translation>Globalne Ustawienia</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Follow Song</source>
         <translation>podążanie kursora za utworem</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Metronome</source>
         <translation>Metronom</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Midi Sync</source>
         <translation>Synchronizacja Midi</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Appearance Settings</source>
         <translation>Ustawienia wyglądu</translation>
     </message>
     <message>
+        <location line="-38"/>
         <source>Midi Input Transform</source>
         <translation>Przekształcanie Wejścia Midi</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Midi Input Filter</source>
         <translation>Filtr Wejścia Midi</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Midi Remote Control</source>
         <translation>Zdalne Sterowanie Midi</translation>
     </message>
@@ -7007,6 +7977,7 @@ Możesz określić więcej niż jeden ślad do nagrywania:
         <translation type="obsolete">Losowy generator rytmu</translation>
     </message>
     <message>
+        <location line="+386"/>
         <source>&amp;Midi</source>
         <translation>&amp;Midi</translation>
     </message>
@@ -7015,35 +7986,43 @@ Możesz określić więcej niż jeden ślad do nagrywania:
         <translation type="obsolete">Mikser</translation>
     </message>
     <message>
+        <location line="-391"/>
         <source>Input Plugins</source>
         <translation>Wtyczki wejścia</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Reset Instr.</source>
         <translation>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="+406"/>
         <source>&amp;Audio</source>
         <translation>&amp;Audio</translation>
     </message>
     <message>
+        <location line="-403"/>
         <source>Bounce to Track</source>
         <translation>
 Zgrywanie śladu (bounce)</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Bounce to File</source>
         <translation>Zgrywanie do Pliku (bounce)</translation>
     </message>
     <message>
+        <location line="+443"/>
         <source>&amp;Help</source>
         <translation>P&amp;omoc</translation>
     </message>
@@ -7056,16 +8035,21 @@ Zgrywanie śladu (bounce)</translation>
         <translation type="obsolete">Informacje o &amp;Qt</translation>
     </message>
     <message>
+        <location line="+499"/>
         <source>MusE: load project</source>
         <translation>MuzA: ładuj utwór</translation>
     </message>
     <message>
+        <location line="+114"/>
         <source>The current Project contains unsaved data
 Save Current Project?</source>
         <translation>Otwarty utwór zawiera niezapisane dane
 Zapisać otwarty utwór?</translation>
     </message>
     <message>
+        <location line="-1166"/>
+        <location line="+1168"/>
+        <location line="+1471"/>
         <source>&amp;Save</source>
         <translation>&amp;Zapisz</translation>
     </message>
@@ -7074,18 +8058,25 @@ Zapisać otwarty utwór?</translation>
         <translation type="obsolete">&amp;Nie zapisuj</translation>
     </message>
     <message>
+        <location line="+0"/>
+        <location filename="../../muse/importmidi.cpp" line="+68"/>
         <source>&amp;Abort</source>
         <translation>&amp;Anuluj</translation>
     </message>
     <message>
+        <location line="-1275"/>
+        <location line="+13"/>
         <source>MusE: Save As</source>
         <translation>MuzA: Zapisz Jako</translation>
     </message>
     <message>
+        <location line="+57"/>
+        <location line="+197"/>
         <source>Nothing to edit</source>
         <translation>Nie ma nic do edytowania</translation>
     </message>
     <message>
+        <location line="+1005"/>
         <source>The current Project contains unsaved data
 Load overwrites current Project:
 Save Current Project?</source>
@@ -7098,10 +8089,12 @@ Zapisać otwarty utwór?</translation>
         <translation type="obsolete">&amp;Nadpisz</translation>
     </message>
     <message>
+        <location filename="../../muse/help.cpp" line="+33"/>
         <source>no help found at: </source>
         <translation>nie znalezniono pomocy</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>MusE: Open Help</source>
         <translation>MuzA: Otwórz Pomoc</translation>
     </message>
@@ -7114,6 +8107,7 @@ Zapisać otwarty utwór?</translation>
         <translation type="obsolete">cofnij</translation>
     </message>
     <message>
+        <location filename="../../muse/app.cpp" line="-2744"/>
         <source>Und&amp;o</source>
         <translation>Co&amp;fnij</translation>
     </message>
@@ -7122,18 +8116,22 @@ Zapisać otwarty utwór?</translation>
         <translation type="obsolete">cofnij</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Re&amp;do</source>
         <translation>Co&amp;fnij</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>undo last change to song</source>
         <translation>cofnij ostatnią zmianę w utworze</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>redo last undo</source>
         <translation>ponów ostanie cofnij</translation>
     </message>
     <message>
+        <location line="+424"/>
         <source>Transport</source>
         <translation>Panel transportu</translation>
     </message>
@@ -7142,6 +8140,7 @@ Zapisać otwarty utwór?</translation>
         <translation type="obsolete">pętla</translation>
     </message>
     <message>
+        <location line="-410"/>
         <source>Loop</source>
         <translation>Pętla</translation>
     </message>
@@ -7150,6 +8149,7 @@ Zapisać otwarty utwór?</translation>
         <translation type="obsolete">włącz wcinki (punch In)</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Punchin</source>
         <translation>Włącz wcinki (punch In)</translation>
     </message>
@@ -7158,6 +8158,7 @@ Zapisać otwarty utwór?</translation>
         <translation type="obsolete">wył. wcinki (punch out)punchout</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Punchout</source>
         <translation>Wył. wcinki (punch out)</translation>
     </message>
@@ -7166,6 +8167,7 @@ Zapisać otwarty utwór?</translation>
         <translation type="obsolete">Początek</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Start</source>
         <translation>Początek</translation>
     </message>
@@ -7174,6 +8176,7 @@ Zapisać otwarty utwór?</translation>
         <translation type="obsolete">Przewiń do tyłu</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Rewind</source>
         <translation>Przewiń do tyłu</translation>
     </message>
@@ -7182,6 +8185,7 @@ Zapisać otwarty utwór?</translation>
         <translation type="obsolete">Przewiń do przodu</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Forward</source>
         <translation>Przewiń do przodu</translation>
     </message>
@@ -7190,6 +8194,7 @@ Zapisać otwarty utwór?</translation>
         <translation type="obsolete">Stop</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Stop</source>
         <translation>Stop</translation>
     </message>
@@ -7198,6 +8203,7 @@ Zapisać otwarty utwór?</translation>
         <translation type="obsolete">Odtwarzaj</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Play</source>
         <translation>Odtwarzanie</translation>
     </message>
@@ -7206,6 +8212,7 @@ Zapisać otwarty utwór?</translation>
         <translation type="obsolete">Nagrywaj</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Record</source>
         <translation>Nagrywanie</translation>
     </message>
@@ -7214,6 +8221,8 @@ Zapisać otwarty utwór?</translation>
         <translation type="obsolete">Zatrzymaj wszystkie komunikaty midi!</translation>
     </message>
     <message>
+        <location line="+6"/>
+        <location line="+349"/>
         <source>Panic</source>
         <translation>Zatrzymaj wszystkie komunikaty midi!</translation>
     </message>
@@ -7222,6 +8231,7 @@ Zapisać otwarty utwór?</translation>
         <translation type="obsolete">nowy</translation>
     </message>
     <message>
+        <location line="-337"/>
         <source>&amp;New</source>
         <translation>&amp;Nowy</translation>
     </message>
@@ -7230,6 +8240,7 @@ Zapisać otwarty utwór?</translation>
         <translation type="obsolete">otwórz</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>&amp;Open</source>
         <translation>&amp;Otwórz</translation>
     </message>
@@ -7242,6 +8253,7 @@ Zapisać otwarty utwór?</translation>
         <translation type="obsolete">Pianoroll</translation>
     </message>
     <message>
+        <location line="+59"/>
         <source>Pianoroll</source>
         <translation>Pianoroll</translation>
     </message>
@@ -7254,6 +8266,7 @@ Zapisać otwarty utwór?</translation>
         <translation type="obsolete">Edytor Znaczników</translation>
     </message>
     <message>
+        <location line="+251"/>
         <source>File Buttons</source>
         <translation>Przyciski Menu Plik</translation>
     </message>
@@ -7262,26 +8275,35 @@ Zapisać otwarty utwór?</translation>
         <translation type="obsolete">Nieznany Format Pliku</translation>
     </message>
     <message>
+        <location line="+825"/>
         <source>MusE: Write File failed</source>
         <translation>MuzA: Zapis pliku nie powiódł się</translation>
     </message>
     <message>
+        <location line="-141"/>
+        <location line="+399"/>
+        <location line="+1199"/>
         <source>MusE: Song: </source>
         <translation type="unfinished">MuzA: Utwór</translation>
     </message>
     <message>
         <source>MusE: Copy Range</source>
-        <translation>Kopiuj Zakres</translation>
+        <translation type="obsolete">Kopiuj Zakres</translation>
     </message>
     <message>
         <source>not implemented</source>
-        <translation>jeszcze nie wprowadzone</translation>
+        <translation type="obsolete">jeszcze nie wprowadzone</translation>
     </message>
     <message>
         <source>MusE: Cut Events</source>
-        <translation>MuzA: Wytnij Elementy</translation>
+        <translation type="obsolete">MuzA: Wytnij Elementy</translation>
     </message>
     <message>
+        <location line="-191"/>
+        <location line="+10"/>
+        <location line="+31"/>
+        <location line="+34"/>
+        <location line="+8"/>
         <source>MusE: Bounce to Track</source>
         <translation>MuzA: Zgrywanie (bounce) do Śladu</translation>
     </message>
@@ -7304,42 +8326,49 @@ zaznacz ślad audio jako docelowy</translation>
         <translation type="obsolete">aby zaimpotować plik audio, najpierw zaznacz ślad audio</translation>
     </message>
     <message>
+        <location line="-2452"/>
         <source>Delete Selected Tracks</source>
         <translation>Skasuj Zaznaczone Ślady</translation>
     </message>
     <message>
         <source>View</source>
-        <translation>&amp;Widok</translation>
+        <translation type="obsolete">&amp;Widok</translation>
     </message>
     <message>
+        <location line="+69"/>
         <source>Edit Instrument</source>
         <translation>Edytuj Instrument</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Restart Audio</source>
         <translation>Zrestartuj Audio</translation>
     </message>
     <message>
         <source>Automation</source>
-        <translation>Au&amp;tomatyka</translation>
+        <translation type="obsolete">Au&amp;tomatyka</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Mixer Automation</source>
         <translation>Automatyka Miksera</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Take Snapshot</source>
         <translation>Zrób zrzut ekranu</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Clear Automation Data</source>
         <translation>Wyczyść automatykę</translation>
     </message>
     <message>
         <source>Settings</source>
-        <translation>&amp;Ustawienia</translation>
+        <translation type="obsolete">&amp;Ustawienia</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Configure Shortcuts</source>
         <translation>Konfiguracja skrótów</translation>
     </message>
@@ -7348,22 +8377,27 @@ zaznacz ślad audio jako docelowy</translation>
         <translation type="obsolete">Export do pliku midi</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>Midi Ports / Soft Synth</source>
         <translation>Porty Midi i Syntezatory Softowe</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>&amp;Manual</source>
         <translation>&amp;Instrukcja Obłsugi</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>&amp;MusE Homepage</source>
         <translation>strona domowa &amp;MuzA</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>&amp;Report Bug...</source>
         <translation>&amp;Zgłoś Błąd...</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>&amp;About MusE</source>
         <translation>&amp;Informacje o programie</translation>
     </message>
@@ -7372,30 +8406,36 @@ zaznacz ślad audio jako docelowy</translation>
         <translation type="obsolete">Co &amp;To?</translation>
     </message>
     <message>
+        <location line="+679"/>
         <source>Cannot read template</source>
         <translation>Nie można odczytać pliku szablonu</translation>
     </message>
     <message>
+        <location line="+31"/>
         <source>File open error</source>
         <translation>Błąd odczytu pliku</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>File read error</source>
         <translation>błąd odczytu pliku</translation>
     </message>
     <message>
+        <location line="+200"/>
         <source>MusE: load template</source>
         <translation>MuzA: ładuj szablon</translation>
     </message>
     <message>
         <source>MusE: Bounce</source>
-        <translation>MuzA: Zgrywanie (bounce)</translation>
+        <translation type="obsolete">MuzA: Zgrywanie (bounce)</translation>
     </message>
     <message>
         <source>set left/right marker for bounce range</source>
-        <translation>ustaw lokatory do zgrania (bounce) danego zakresu</translation>
+        <translation type="obsolete">ustaw lokatory do zgrania (bounce) danego zakresu</translation>
     </message>
     <message>
+        <location line="+1443"/>
+        <location line="+25"/>
         <source>MusE: Bounce to File</source>
         <translation>MuzA: Zgrywanie (bounce) do Pliku</translation>
     </message>
@@ -7404,200 +8444,301 @@ zaznacz ślad audio jako docelowy</translation>
         <translation type="obsolete">nie znaleziono śladu wyjściowego</translation>
     </message>
     <message>
+        <location filename="../../muse/exportmidi.cpp" line="+126"/>
         <source>MusE: Export Midi</source>
         <translation>MuzA: Exportuj Midi</translation>
     </message>
     <message>
+        <location filename="../../muse/importmidi.cpp" line="-12"/>
         <source>MusE: Import Midi</source>
         <translation>MuzA: Importuj Midi</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Add midi file to current project?
 </source>
         <translation>Dodać plik midi do otwartego utworu?</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>&amp;Add to Project</source>
         <translation>&amp;Dodaj do utworu</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>&amp;Replace</source>
         <translation>&amp;Zastąp</translation>
     </message>
     <message>
+        <location line="+31"/>
         <source>reading midifile
   </source>
         <translation>czytanie pliku midi</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>
 failed: </source>
         <translation>nie powiodło się</translation>
     </message>
     <message>
+        <location filename="../../muse/app.cpp" line="-3221"/>
+        <location line="+18"/>
         <source>Failed to start audio!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-17"/>
         <source>Was not able to start audio, check if jack is running.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Timeout waiting for audio to run. Check if jack is running.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+677"/>
         <source>Import Part</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>&amp;Insert</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Paste c&amp;lone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Paste to &amp;track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Paste clone to trac&amp;k</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Insert Empty Measure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-9"/>
+        <source>Find unused wave files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>Score</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>all parts in one staff</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>one staff per part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>New score window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Wave</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Song Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <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="+13"/>
         <source>&amp;Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Rhythm Generator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>Midi File Import/Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+325"/>
+        <source>&amp;View</source>
+        <translation type="unfinished">&amp;Przeglądaj</translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <source>A&amp;utomation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Se&amp;ttings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+346"/>
         <source>Unknown File Format: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+289"/>
+        <location line="+1471"/>
         <source>&amp;Skip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-1471"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+286"/>
+        <location line="+6"/>
+        <source>New</source>
+        <translation type="unfinished">Nowy</translation>
+    </message>
+    <message>
+        <location line="+935"/>
         <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="+57"/>
         <source>Select one audio output track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../../muse/importmidi.cpp" line="+356"/>
         <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>
+        <location line="+121"/>
         <source> out of </source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+1"/>
         <source> could not be imported.
 Likely the track is the wrong type.</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>
         <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>
     <message>
+        <location filename="../../muse/help.cpp" 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>
@@ -7606,26 +8747,32 @@ browser on your machine.</source>
 <context>
     <name>NoteInfo</name>
     <message>
+        <location filename="../../muse/widgets/noteinfo.cpp" line="+33"/>
         <source>Start</source>
         <translation>Pozycja</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Len</source>
         <translation>Długość</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Pitch</source>
         <translation>Wysokość dźwięku</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Velo On</source>
         <translation>Prędk. uderz.</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Velo Off</source>
         <translation>Prędk. puszcz.</translation>
     </message>
     <message>
+        <location line="-50"/>
         <source>Note Info</source>
         <translation>Info o dźwięku</translation>
     </message>
@@ -7633,90 +8780,122 @@ browser on your machine.</source>
 <context>
     <name>OrganGuiBase</name>
     <message>
+        <location filename="../../synti/organ/organguibase.ui" line="+20"/>
         <source>MusE: Organ</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Drawbars</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>16&apos;</source>
         <translation type="unfinished">16&apos;</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>4&apos;</source>
         <translation type="unfinished">4&apos;</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>2 2/3&apos;</source>
         <translation type="unfinished">2 2/3&apos;</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>2&apos;</source>
         <translation type="unfinished">2&apos;</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>5 1/3&apos;</source>
         <translation type="unfinished">5 1/3&apos;</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>8&apos;</source>
         <translation type="unfinished">8&apos;</translation>
     </message>
     <message>
+        <location line="+232"/>
         <source>Envelope Hi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+12"/>
+        <location line="+252"/>
         <source>Release</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-242"/>
+        <location line="+232"/>
         <source>Sustain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-222"/>
+        <location line="+212"/>
         <source>Decay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-196"/>
+        <location line="+186"/>
         <source>Attack</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-110"/>
+        <location line="+41"/>
+        <location line="+35"/>
+        <location line="+171"/>
+        <location line="+16"/>
+        <location line="+38"/>
         <source>ms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-244"/>
+        <location line="+222"/>
         <source>cB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-184"/>
         <source>Envelope Lo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+232"/>
         <source>O-1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Oscillator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Brass</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Reed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Flute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Velocity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7731,123 +8910,152 @@ browser on your machine.</source>
 <context>
     <name>PartCanvas</name>
     <message>
+        <location filename="../../muse/arranger/pcanvas.cpp" line="+743"/>
         <source>C&amp;ut</source>
         <translation>&amp;Wytnij</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>&amp;Copy</source>
         <translation>&amp;Kopiuj</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>rename</source>
         <translation>zmień nazwę</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>delete</source>
         <translation>kasuj</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>split</source>
         <translation>podziel</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>glue</source>
         <translation>sklej</translation>
     </message>
     <message>
         <source>pianoroll</source>
-        <translation>pianoroll</translation>
+        <translation type="obsolete">pianoroll</translation>
     </message>
     <message>
         <source>list</source>
-        <translation>edytor lista </translation>
+        <translation type="obsolete">edytor lista </translation>
     </message>
     <message>
         <source>drums</source>
-        <translation>edytor perkusja</translation>
+        <translation type="obsolete">edytor perkusja</translation>
     </message>
     <message>
+        <location line="-295"/>
         <source>Cannot copy/move/clone to different Track-Type</source>
         <translation>Nie można skopiować/przenieść/sklonować do innego typu śladu</translation>
     </message>
     <message>
+        <location line="+279"/>
         <source>color</source>
         <translation>kolor</translation>
     </message>
     <message>
+        <location line="+18"/>
         <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>edycja audio</translation>
     </message>
     <message>
+        <location line="+1874"/>
         <source>Cannot paste: multiple tracks selected</source>
         <translation>Nie można wkleić: zaznaczono kilka śladów</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Cannot paste: no track selected</source>
         <translation>Nie można wkleić: nie zaznaczono żadnych śladów</translation>
     </message>
     <message>
+        <location line="+52"/>
         <source>Cannot paste: wrong data type</source>
         <translation>Nie można wkleić: nieprawidłowy typ danych</translation>
     </message>
     <message>
+        <location line="-32"/>
         <source>Can only paste to midi/drum track</source>
         <translation>Można tylko wkleić do śladu midi, lub perkusji</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Can only paste to wave track</source>
         <translation>Można wkleić tylko do śladu audio</translation>
     </message>
     <message>
+        <location line="-1966"/>
         <source>s&amp;elect </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>clones</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>export</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="+52"/>
         <source>file info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+108"/>
         <source>MusE: save part</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Part name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1322"/>
         <source> out of </source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+1"/>
         <source> could not be pasted.
 Likely the selected track is the wrong type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+472"/>
         <source>Can only paste to midi or wave track</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7869,6 +9077,7 @@ Likely the selected track is the wrong type.</source>
 <context>
     <name>PianoRoll</name>
     <message>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="+85"/>
         <source>&amp;Edit</source>
         <translation>&amp;Edycja</translation>
     </message>
@@ -7909,6 +9118,7 @@ Likely the selected track is the wrong type.</source>
         <translation type="obsolete">Poza obrębem lokatorów</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>&amp;Select</source>
         <translation>&amp;Zaznacz</translation>
     </message>
@@ -7925,6 +9135,7 @@ Likely the selected track is the wrong type.</source>
         <translation type="obsolete">kolory predkości uderzenia (velocity)</translation>
     </message>
     <message>
+        <location line="+36"/>
         <source>&amp;Config</source>
         <translation>&amp;Konfiguracja</translation>
     </message>
@@ -7933,182 +9144,241 @@ Likely the selected track is the wrong type.</source>
         <translation type="obsolete">kolor elementu</translation>
     </message>
     <message>
+        <location line="+30"/>
         <source>&amp;Functions</source>
         <translation>&amp;Opcje</translation>
     </message>
     <message>
         <source>Over Quantize</source>
-        <translation>Inteligentna kwantyzacja do najbliższej dozw. poz. (w tym samym kierunku)</translation>
+        <translation type="obsolete">Inteligentna kwantyzacja do najbliższej dozw. poz. (w tym samym kierunku)</translation>
     </message>
     <message>
         <source>Note On Quantize</source>
-        <translation>Kwantyzacja do najbl. dozwolonej pozycji</translation>
+        <translation type="obsolete">Kwantyzacja do najbl. dozwolonej pozycji</translation>
     </message>
     <message>
         <source>Note On/Off Quantize</source>
-        <translation>Kwantyzacja pocz i końca dźwięku</translation>
+        <translation type="obsolete">Kwantyzacja pocz i końca dźwięku</translation>
     </message>
     <message>
         <source>Iterative Quantize</source>
-        <translation>Przesuwana Kwantyzacja</translation>
+        <translation type="obsolete">Przesuwana Kwantyzacja</translation>
     </message>
     <message>
         <source>Pianoroll Tools</source>
         <translation type="obsolete">Narzędzia Pianoroll</translation>
     </message>
     <message>
+        <location line="+57"/>
         <source>Step Record</source>
         <translation>Nagrywanie krok po kroku</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Midi Input</source>
         <translation>Wejście Midi</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Play Events</source>
         <translation>Podgląd midi</translation>
     </message>
     <message>
+        <location line="+41"/>
         <source>Add Controller View</source>
         <translation>Dodaj wykres kontorolera</translation>
     </message>
     <message>
         <source>Config Quant...</source>
-        <translation>Konfiguruj kwantyzację</translation>
+        <translation type="obsolete">Konfiguruj kwantyzację</translation>
     </message>
     <message>
         <source>Modify Gate Time</source>
-        <translation>Modyfikuj czas bramki</translation>
+        <translation type="obsolete">Modyfikuj czas bramki</translation>
     </message>
     <message>
+        <location line="-98"/>
         <source>Modify Velocity</source>
         <translation>Modyfikuj predkość uderzenia (velocity)</translation>
     </message>
     <message>
         <source>Crescendo</source>
-        <translation>Crescendo</translation>
+        <translation type="obsolete">Crescendo</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Transpose</source>
         <translation>Transponuj</translation>
     </message>
     <message>
         <source>Thin Out</source>
-        <translation>Decresendo</translation>
+        <translation type="obsolete">Decresendo</translation>
     </message>
     <message>
         <source>Erase Event</source>
-        <translation>Skasuj element</translation>
+        <translation type="obsolete">Skasuj element</translation>
     </message>
     <message>
         <source>Note Shift</source>
-        <translation>Przesuń dźwięk</translation>
+        <translation type="obsolete">Przesuń dźwięk</translation>
     </message>
     <message>
         <source>Move Clock</source>
-        <translation>Przesuń zegar</translation>
+        <translation type="obsolete">Przesuń zegar</translation>
     </message>
     <message>
         <source>Copy Measure</source>
-        <translation>Kopiuj takt</translation>
+        <translation type="obsolete">Kopiuj takt</translation>
     </message>
     <message>
         <source>Erase Measure</source>
-        <translation>Wyczyść takt</translation>
+        <translation type="obsolete">Wyczyść takt</translation>
     </message>
     <message>
         <source>Delete Measure</source>
-        <translation>Kasuj takt</translation>
+        <translation type="obsolete">Kasuj takt</translation>
     </message>
     <message>
         <source>Create Measure</source>
-        <translation>Stwórz takt</translation>
+        <translation type="obsolete">Stwórz takt</translation>
     </message>
     <message>
+        <location line="+86"/>
         <source>ctrl</source>
         <translation>kontr.</translation>
     </message>
     <message>
+        <location line="-192"/>
         <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>&amp;Paste</source>
         <translation type="unfinished">&amp;Wklej</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Delete &amp;Events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+8"/>
         <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="+6"/>
         <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="+16"/>
+        <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">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="+6"/>
         <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>
     </message>
@@ -8116,58 +9386,72 @@ Likely the selected track is the wrong type.</source>
 <context>
     <name>PluginDialog</name>
     <message>
+        <location filename="../../muse/plugin.cpp" line="+3079"/>
         <source>Ok</source>
         <translation>Akceptuj</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
     <message>
+        <location line="-49"/>
         <source>MusE: select plugin</source>
         <translation>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>Etykieta</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Name</source>
         <translation>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>numer</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Maker</source>
         <translation>Znacznik</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Copyright</source>
         <translation>Prawa autorskie</translation>
     </message>
@@ -8180,10 +9464,12 @@ Likely the selected track is the wrong type.</source>
         <translation type="obsolete">Stereo i Mono</translation>
     </message>
     <message>
+        <location line="+52"/>
         <source>Stereo</source>
         <translation>Stereo</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Mono</source>
         <translation>Mono</translation>
     </message>
@@ -8192,18 +9478,22 @@ Likely the selected track is the wrong type.</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>
@@ -8211,30 +9501,38 @@ Likely the selected track is the wrong type.</source>
 <context>
     <name>PluginGui</name>
     <message>
+        <location line="+219"/>
+        <location line="+3"/>
         <source>bypass plugin</source>
         <translation>omiń wtyczkę (bypass)</translation>
     </message>
     <message>
+        <location line="+543"/>
         <source>MusE: load preset</source>
         <translation>MuzA: załaduj ustawienie</translation>
     </message>
     <message>
+        <location line="+66"/>
         <source>MusE: save preset</source>
         <translation>MuzA: zapisz ustawienie</translation>
     </message>
     <message>
+        <location line="-624"/>
         <source>File Buttons</source>
         <translation>Przyciski Menu Plik</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Load Preset</source>
         <translation>Załaduj Ustawienie</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Save Preset</source>
         <translation>Zapisz ustawienie</translation>
     </message>
     <message>
+        <location line="+577"/>
         <source>Error reading preset. Might not be right type for this plugin</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8372,6 +9670,7 @@ currently not used</source>
 <context>
     <name>QObject</name>
     <message>
+        <location filename="../../muse/app.cpp" line="-2773"/>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8379,22 +9678,29 @@ currently not used</source>
 <context>
     <name>QWidget</name>
     <message>
+        <location filename="../../muse/instruments/minstrument.cpp" line="+56"/>
+        <location filename="../../muse/liste/editevent.cpp" line="-410"/>
         <source>Cannot convert sysex string</source>
         <translation type="unfinished">Nie można przekonwertować łańcucha sysex</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">Łańcuch Hex za długi (limit 2048 bajtów)</translation>
     </message>
     <message>
+        <location filename="../../muse/miditransform.cpp" line="+92"/>
         <source>new</source>
         <translation>nowy</translation>
     </message>
     <message>
+        <location filename="../../muse/wave.cpp" line="-675"/>
         <source>create peakfile for </source>
         <translation type="unfinished">stwórz plik szczytu dla</translation>
     </message>
     <message>
+        <location filename="../../muse/widgets/filedialog.cpp" line="+63"/>
         <source>MusE: get file name</source>
         <translation>MuzA: weź nazwę pliku</translation>
     </message>
@@ -8419,14 +9725,17 @@ utworzyć?</translation>
         <translation type="obsolete">Anuluj</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>MusE: create directory</source>
         <translation>MuzA: utwórz katalog</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>creating dir failed</source>
         <translation>tworzenie katalogu nie powiodło się</translation>
     </message>
     <message>
+        <location line="+396"/>
         <source>File
 </source>
         <translation>Plik</translation>
@@ -8437,6 +9746,7 @@ exists</source>
         <translation type="obsolete">istnieje</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>MusE: write</source>
         <translation type="unfinished">MuzA: zapis:</translation>
     </message>
@@ -8449,43 +9759,53 @@ exists</source>
         <translation type="obsolete">Wyjdź</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Open File
 </source>
         <translation>Otwórz plik</translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>
 failed: </source>
         <translation>nie udane</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>MusE: Open File</source>
         <translation>MuzA: Otwórz plik</translation>
     </message>
     <message>
+        <location filename="../../muse/route.cpp" line="+1026"/>
+        <location line="+37"/>
         <source>None</source>
         <translation>Brak</translation>
     </message>
     <message>
+        <location filename="../../muse/instruments/minstrument.cpp" line="+189"/>
         <source>generic midi</source>
         <translation>generyczne midi</translation>
     </message>
     <message>
+        <location filename="../../muse/waveedit/waveview.cpp" line="+616"/>
         <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>
@@ -8495,332 +9815,523 @@ exists. Overwrite?</source>
     <name>QuantConfig</name>
     <message>
         <source>Config Quantize</source>
-        <translation>Konfiguruj Kwantyzację</translation>
+        <translation type="obsolete">Konfiguruj Kwantyzację</translation>
     </message>
     <message>
         <source>Strength</source>
-        <translation>Siła</translation>
+        <translation type="obsolete">Siła</translation>
     </message>
     <message>
         <source>Don´t Quantize</source>
-        <translation>Nie kwantyzuj</translation>
+        <translation type="obsolete">Nie kwantyzuj</translation>
     </message>
     <message>
         <source>Quant Len</source>
-        <translation>Wartość kwantyzacji</translation>
+        <translation type="obsolete">Wartość kwantyzacji</translation>
     </message>
     <message>
         <source>MusE: Config Quantize</source>
-        <translation>MuzA: Konfiguracja kwantyzacji</translation>
+        <translation type="obsolete">MuzA: Konfiguracja kwantyzacji</translation>
     </message>
 </context>
 <context>
     <name>RhythmBase</name>
     <message>
+        <location filename="../../muse/mplugins/rhythmbase.ui" line="+14"/>
         <source>MusE: Random Rhythm Generator</source>
-        <translation type="obsolete">MuzA: Generator Losowego Rytmu</translation>
+        <translation type="unfinished">MuzA: Generator Losowego Rytmu</translation>
     </message>
     <message>
+        <location line="+21"/>
         <source>Instrument Properties</source>
-        <translation type="obsolete">Właściwości Instrumentu</translation>
+        <translation type="unfinished">Właściwości Instrumentu</translation>
     </message>
     <message>
+        <location line="+20"/>
+        <location line="+334"/>
         <source>counts/bar</source>
-        <translation type="obsolete">ilość taktów</translation>
+        <translation type="unfinished">ilość taktów</translation>
     </message>
     <message>
+        <location line="-324"/>
         <source>steps/count</source>
-        <translation type="obsolete">ilość kroków</translation>
+        <translation type="unfinished">ilość kroków</translation>
     </message>
     <message>
+        <location line="+10"/>
+        <location line="+325"/>
         <source># bars</source>
-        <translation type="obsolete"># takty</translation>
+        <translation type="unfinished"># takty</translation>
     </message>
     <message>
+        <location line="-315"/>
         <source>test</source>
-        <translation type="obsolete">test</translation>
+        <translation type="unfinished">test</translation>
     </message>
     <message>
+        <location line="+26"/>
+        <location line="+300"/>
         <source>contrib</source>
-        <translation type="obsolete">contrib</translation>
+        <translation type="unfinished">contrib</translation>
     </message>
     <message>
+        <location line="-290"/>
         <source>randomize</source>
-        <translation type="obsolete">ustaw w przypadkowej kolejności</translation>
+        <translation type="unfinished">ustaw w przypadkowej kolejności</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Group 1</source>
-        <translation type="obsolete">Grupa 1</translation>
+        <translation type="unfinished">Grupa 1</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Group 2</source>
-        <translation type="obsolete">Grupa 2</translation>
+        <translation type="unfinished">Grupa 2</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Group 3</source>
-        <translation type="obsolete">Grupa 3</translation>
+        <translation type="unfinished">Grupa 3</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Group 4</source>
-        <translation type="obsolete">Grupa 4</translation>
+        <translation type="unfinished">Grupa 4</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Group 5</source>
-        <translation type="obsolete">Grupa 5</translation>
+        <translation type="unfinished">Grupa 5</translation>
     </message>
     <message>
+        <location line="+34"/>
+        <location line="+228"/>
         <source>listen</source>
-        <translation type="obsolete">słuchaj</translation>
+        <translation type="unfinished">słuchaj</translation>
     </message>
     <message>
+        <location line="-218"/>
         <source>Instrument</source>
-        <translation type="obsolete">Instrument</translation>
+        <translation type="unfinished">Instrument</translation>
     </message>
     <message>
+        <location line="+36"/>
+        <location line="+127"/>
         <source>Group</source>
-        <translation type="obsolete">Grupa</translation>
+        <translation type="unfinished">Grupa</translation>
     </message>
     <message>
+        <location line="-100"/>
+        <location line="+339"/>
         <source>&amp;New</source>
-        <translation type="obsolete">&amp;Nowy</translation>
+        <translation type="unfinished">&amp;Nowy</translation>
     </message>
     <message>
+        <location line="-346"/>
         <source>create new entry</source>
-        <translation type="obsolete">stwórz nowy wpis</translation>
+        <translation type="unfinished">stwórz nowy wpis</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>pressing the New button you create a new entry
 in the MusE list of defined controllers</source>
-        <translation type="obsolete">naciśnij przycisk Nowy aby utworzyć wpis na lisćie zdefiniowanych kontrolerów </translation>
+        <translation type="unfinished">naciśnij przycisk Nowy aby utworzyć wpis na lisćie zdefiniowanych kontrolerów </translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>&amp;Delete</source>
-        <translation type="obsolete">&amp;Kasuj</translation>
+        <translation type="unfinished">&amp;Kasuj</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>delete selected entry</source>
-        <translation type="obsolete">kasuj zaznaczone elementy</translation>
+        <translation type="unfinished">kasuj zaznaczone elementy</translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>Up</source>
-        <translation type="obsolete">W góre</translation>
+        <translation type="unfinished">W góre</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Down</source>
-        <translation type="obsolete">W dół </translation>
+        <translation type="unfinished">W dół </translation>
     </message>
     <message>
+        <location line="+43"/>
         <source>Instrument              </source>
-        <translation type="obsolete">Instrument</translation>
+        <translation type="unfinished">Instrument</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>steps/count      </source>
-        <translation type="obsolete">kroki/liczy</translation>
+        <translation type="unfinished">kroki/liczy</translation>
     </message>
     <message>
+        <location line="-35"/>
         <source>list of defined controllers</source>
-        <translation type="obsolete">Lista zdefiniowanych kontrolerów</translation>
+        <translation type="unfinished">Lista zdefiniowanych kontrolerów</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>This is the MusE list of defined controllers.</source>
-        <translation type="obsolete">To jest lista MuzA zdefiniowanych midi kontrolerów.</translation>
+        <translation type="unfinished">To jest lista MuzA zdefiniowanych midi kontrolerów.</translation>
     </message>
     <message>
+        <location line="+217"/>
         <source>&amp;File</source>
-        <translation type="obsolete">&amp;Plik</translation>
+        <translation type="unfinished">&amp;Plik</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>&amp;Edit</source>
-        <translation type="obsolete">&amp;Edytuj</translation>
+        <translation type="unfinished">&amp;Edytuj</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>&amp;Help</source>
-        <translation type="obsolete">P&amp;omoc</translation>
+        <translation type="unfinished">P&amp;omoc</translation>
     </message>
     <message>
+        <location line="-43"/>
         <source>Tools</source>
-        <translation type="obsolete">Narzędzia</translation>
+        <translation type="unfinished">Narzędzia</translation>
     </message>
     <message>
+        <location line="+63"/>
         <source>New</source>
-        <translation type="obsolete">Nowy</translation>
+        <translation type="unfinished">Nowy</translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Open</source>
-        <translation type="obsolete">Otwórz</translation>
+        <translation type="unfinished">Otwórz</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Open...</source>
-        <translation type="obsolete">&amp;Otwórz...</translation>
+        <translation type="unfinished">&amp;Otwórz...</translation>
     </message>
     <message>
+        <location line="+21"/>
         <source>Save</source>
-        <translation type="obsolete">Zapisz</translation>
+        <translation type="unfinished">Zapisz</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Zapisz</translation>
+        <translation type="unfinished">&amp;Zapisz</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Save As</source>
-        <translation type="obsolete">Zapisz jako</translation>
+        <translation type="unfinished">Zapisz jako</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>Save &amp;As...</source>
-        <translation type="obsolete">Zapisz &amp;Jako...</translation>
+        <translation type="unfinished">Zapisz &amp;Jako...</translation>
     </message>
     <message>
+        <location line="+21"/>
         <source>Print</source>
-        <translation type="obsolete">Drukuj</translation>
+        <translation type="unfinished">Drukuj</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Print...</source>
-        <translation type="obsolete">&amp;Drukuj</translation>
+        <translation type="unfinished">&amp;Drukuj</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Exit</source>
-        <translation type="obsolete">Zakończ</translation>
+        <translation type="unfinished">Zakończ</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>E&amp;xit</source>
-        <translation type="obsolete">&amp;Zakończ</translation>
+        <translation type="unfinished">&amp;Zakończ</translation>
     </message>
     <message>
+        <location line="+21"/>
         <source>Undo</source>
-        <translation type="obsolete">Cofnij</translation>
+        <translation type="unfinished">Cofnij</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Undo</source>
-        <translation type="obsolete">&amp;Cofnij</translation>
+        <translation type="unfinished">&amp;Cofnij</translation>
     </message>
     <message>
+        <location line="+21"/>
         <source>Redo</source>
-        <translation type="obsolete">Ponów</translation>
+        <translation type="unfinished">Ponów</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Redo</source>
-        <translation type="obsolete">&amp;Ponów</translation>
+        <translation type="unfinished">&amp;Ponów</translation>
     </message>
     <message>
+        <location line="+21"/>
         <source>Cut</source>
-        <translation type="obsolete">Wytnij</translation>
+        <translation type="unfinished">Wytnij</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Cut</source>
-        <translation type="obsolete">&amp;Wytnij</translation>
+        <translation type="unfinished">&amp;Wytnij</translation>
     </message>
     <message>
+        <location line="+21"/>
         <source>Copy</source>
-        <translation type="obsolete">Kopiuj</translation>
+        <translation type="unfinished">Kopiuj</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>C&amp;opy</source>
-        <translation type="obsolete">&amp;Kopiuj</translation>
+        <translation type="unfinished">&amp;Kopiuj</translation>
     </message>
     <message>
+        <location line="+21"/>
         <source>Paste</source>
-        <translation type="obsolete">Wklej</translation>
+        <translation type="unfinished">Wklej</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Paste</source>
-        <translation type="obsolete">&amp;Wklej</translation>
+        <translation type="unfinished">&amp;Wklej</translation>
     </message>
     <message>
+        <location line="+21"/>
         <source>Find</source>
-        <translation type="obsolete">Szukaj</translation>
+        <translation type="unfinished">Szukaj</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Find...</source>
-        <translation type="obsolete">&amp;Szukaj</translation>
+        <translation type="unfinished">&amp;Szukaj</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Contents</source>
-        <translation type="obsolete">Spis treści</translation>
+        <translation type="unfinished">Spis treści</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Contents...</source>
-        <translation type="obsolete">&amp;Spis treści</translation>
+        <translation type="unfinished">&amp;Spis treści</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Index</source>
-        <translation type="obsolete">Indeks</translation>
+        <translation type="unfinished">Indeks</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Index...</source>
-        <translation type="obsolete">&amp;Indeks</translation>
+        <translation type="unfinished">&amp;Indeks</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>About</source>
-        <translation type="obsolete">O programie</translation>
+        <translation type="unfinished">O programie</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;About...</source>
-        <translation type="obsolete">&amp;O programie</translation>
+        <translation type="unfinished">&amp;O programie</translation>
     </message>
     <message>
+        <location line="-314"/>
         <source>&lt;b&gt;Notice!&lt;/b&gt;&lt;br&gt;
 Random Rhythm Generator is not enabled yet!</source>
-        <translation type="obsolete">&lt;b&gt;Zauważ!&lt;/b&gt;&lt;br&gt;
+        <translation type="unfinished">&lt;b&gt;Zauważ!&lt;/b&gt;&lt;br&gt;
 Losowy Generator Rytmu jeszcze nie jest udostępniony!</translation>
     </message>
     <message>
+        <location line="+88"/>
         <source>Ctrl+N</source>
-        <translation type="obsolete">Ctrl+N</translation>
+        <translation type="unfinished">Ctrl+N</translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Ctrl+O</source>
-        <translation type="obsolete">Ctrl+O</translation>
+        <translation type="unfinished">Ctrl+O</translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Ctrl+S</source>
-        <translation type="obsolete">Ctrl+S</translation>
+        <translation type="unfinished">Ctrl+S</translation>
     </message>
     <message>
+        <location line="+32"/>
         <source>Ctrl+P</source>
-        <translation type="obsolete">Ctrl+P</translation>
+        <translation type="unfinished">Ctrl+P</translation>
     </message>
     <message>
+        <location line="+32"/>
         <source>Ctrl+Z</source>
-        <translation type="obsolete">Ctrl+Z</translation>
+        <translation type="unfinished">Ctrl+Z</translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Ctrl+Y</source>
-        <translation type="obsolete">Ctrl+Y</translation>
+        <translation type="unfinished">Ctrl+Y</translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Ctrl+X</source>
-        <translation type="obsolete">Ctrl+X</translation>
+        <translation type="unfinished">Ctrl+X</translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Ctrl+C</source>
-        <translation type="obsolete">Ctrl+C</translation>
+        <translation type="unfinished">Ctrl+C</translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Ctrl+V</source>
-        <translation type="obsolete">Ctrl+V</translation>
+        <translation type="unfinished">Ctrl+V</translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Ctrl+F</source>
-        <translation type="obsolete">Ctrl+F</translation>
+        <translation type="unfinished">Ctrl+F</translation>
     </message>
 </context>
 <context>
     <name>RhythmGenerator</name>
     <message>
+        <location filename="../../muse/mplugins/rhythm.cpp" line="+229"/>
+        <source>Form3</source>
+        <translation type="unfinished">Form3</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>Instrument Settings:</source>
-        <translation type="obsolete">Instrument Einstellungen</translation>
+        <translation type="unfinished">Instrument Einstellungen</translation>
     </message>
     <message>
+        <location line="+8"/>
+        <source>Instrument</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Hi-Hat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>add</source>
-        <translation type="obsolete">Zufgen</translation>
+        <translation type="unfinished">Zufgen</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>delete</source>
-        <translation type="obsolete">Entfernen</translation>
+        <translation type="unfinished">Entfernen</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>steps/count</source>
+        <translation type="unfinished">ilość kroków</translation>
     </message>
     <message>
+        <location line="+21"/>
+        <source>count/bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source># bars</source>
+        <translation type="unfinished"># takty</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <source>Group Settings:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>Group</source>
-        <translation type="obsolete">Gruppe</translation>
+        <translation type="unfinished">Gruppe</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Group 1</source>
+        <translation type="unfinished">Grupa 1</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Group 2</source>
+        <translation type="unfinished">Grupa 2</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Group 3</source>
+        <translation type="unfinished">Grupa 3</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Group 4</source>
+        <translation type="unfinished">Grupa 4</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Group 5</source>
+        <translation type="unfinished">Grupa 5</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>contrib</source>
+        <translation type="unfinished">contrib</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>listen</source>
+        <translation type="unfinished">słuchaj</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Randomize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Rhythm Style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Open...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Save</source>
+        <translation type="unfinished">Zapisz</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Save as...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Generate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
@@ -8830,46 +10341,57 @@ Losowy Generator Rytmu jeszcze nie jest udostępniony!</translation>
 <context>
     <name>RouteDialogBase</name>
     <message>
+        <location filename="../../muse/mixer/routedialogbase.ui" line="+20"/>
         <source>MusE: Routing</source>
         <translation>MuzA: Konfiguracja połączeń</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Add Route</source>
         <translation>Dodaj połączenie</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Source:</source>
         <translation>Źródło:</translation>
     </message>
     <message>
+        <location line="+24"/>
         <source>Destination:</source>
         <translation>Odbiornik:</translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>Connect</source>
         <translation>Połącz</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>connect source to destination</source>
         <translation>połącz źródło do odbiornika</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Current Routes</source>
         <translation>Aktualne połączenia</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Source</source>
         <translation>Źródło</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Destination</source>
         <translation>Odbiornik</translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Remove</source>
         <translation>Usuń</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>remove selected route</source>
         <translation>Usuń wybrane połączenie</translation>
     </message>
@@ -8877,76 +10399,70 @@ Losowy Generator Rytmu jeszcze nie jest udostępniony!</translation>
 <context>
     <name>SS_PluginChooserBase</name>
     <message>
+        <location filename="../../synti/simpledrums/sspluginchooserbase.ui" line="+16"/>
         <source>SimpleDrums - Ladspa Plugin Chooser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Name</source>
         <translation type="unfinished">Nazwa</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Label</source>
         <translation type="unfinished">Etykieta</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Inports</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Outports</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Creator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+43"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+C</source>
         <translation type="unfinished">Alt+C</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+O</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SS_PluginFront</name>
-    <message>
-        <source>Clear and unload effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Load effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggle display of effect parameters</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Turn effect on/off</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>ScrollScale</name>
     <message>
+        <location filename="../../muse/widgets/scrollscale.cpp" line="+299"/>
         <source>next page</source>
         <translation>następna strona</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>previous page</source>
         <translation>poprzednia strona</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>current page number</source>
         <translation>aktualny numer strony</translation>
     </message>
@@ -8954,18 +10470,22 @@ Losowy Generator Rytmu jeszcze nie jest udostępniony!</translation>
 <context>
     <name>ShortcutCaptureDialog</name>
     <message>
+        <location filename="../../muse/widgets/shortcutcapturedialog.cpp" line="+30"/>
         <source>Ok</source>
         <translation type="unfinished">Akceptuj</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Cancel</source>
         <translation type="unfinished">Anuluj</translation>
     </message>
     <message>
+        <location line="+52"/>
         <source>Shortcut conflicts with </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Undefined</source>
         <translation type="unfinished">Niezdefiniowany</translation>
     </message>
@@ -8973,30 +10493,38 @@ Losowy Generator Rytmu jeszcze nie jest udostępniony!</translation>
 <context>
     <name>ShortcutCaptureDialogBase</name>
     <message>
+        <location filename="../../muse/widgets/shortcutcapturedialogbase.ui" line="+14"/>
         <source>Enter shortcut sequence</source>
         <translation>Wprowadź skrót - kominację klawiszy </translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Press keys to enter shortcut sequence!</source>
         <translation>Naciśnij kombinację klawiszy by wprowadzić skrót!</translation>
     </message>
     <message>
+        <location line="+25"/>
         <source>Old shortcut:</source>
         <translation>Stary skrót</translation>
     </message>
     <message>
+        <location line="+10"/>
+        <location line="+24"/>
         <source>Undefined</source>
         <translation>Niezdefiniowany</translation>
     </message>
     <message>
+        <location line="-10"/>
         <source>New shortcut:</source>
         <translation>Nowy skrót</translation>
     </message>
     <message>
+        <location line="+27"/>
         <source>OK</source>
         <translation>Akceptuj</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
@@ -9004,42 +10532,52 @@ Losowy Generator Rytmu jeszcze nie jest udostępniony!</translation>
 <context>
     <name>ShortcutConfigBase</name>
     <message>
+        <location filename="../../muse/widgets/shortcutconfigbase.ui" line="+14"/>
         <source>Configure Keyboard Shortcuts</source>
         <translation>Konfiguruj Skróty Klawiaturowe</translation>
     </message>
     <message>
+        <location line="+34"/>
         <source>Shortcut Category</source>
         <translation>Kategoria Skrótu</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>Description</source>
         <translation>Opis</translation>
     </message>
     <message>
+        <location line="-5"/>
         <source>Shortcut</source>
         <translation>Skrót</translation>
     </message>
     <message>
+        <location line="+37"/>
         <source>&amp;Clear</source>
         <translation>&amp;Wyczyść</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+C</source>
         <translation>Alt+C</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>&amp;Define</source>
         <translation>&amp;Zdefiniuj</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+D</source>
         <translation>Alt+D</translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>&amp;Apply</source>
         <translation>&amp;Zastosuj</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+A</source>
         <translation>Alt+A</translation>
     </message>
@@ -9047,6 +10585,7 @@ Losowy Generator Rytmu jeszcze nie jest udostępniony!</translation>
 <context>
     <name>SigScale</name>
     <message>
+        <location filename="../../muse/widgets/sigscale.cpp" line="+27"/>
         <source>signature scale</source>
         <translation>oś metrum</translation>
     </message>
@@ -9054,6 +10593,7 @@ Losowy Generator Rytmu jeszcze nie jest udostępniony!</translation>
 <context>
     <name>SimpleDrumsGuiBase</name>
     <message>
+        <location filename="../../synti/simpledrums/simpledrumsguibase.ui" line="+23"/>
         <source>DrumSynth 0.1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9061,25 +10601,25 @@ Losowy Generator Rytmu jeszcze nie jest udostępniony!</translation>
 <context>
     <name>SimpleSynthGui</name>
     <message>
+        <location filename="../../synti/simpledrums/simpledrumsgui.cpp" line="+367"/>
         <source>&amp;Load setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>&amp;Save setup</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Load sample dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>Song</name>
     <message>
+        <location filename="../../muse/song.cpp" line="+2344"/>
         <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:
@@ -9098,55 +10638,71 @@ click on the Restart button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+189"/>
         <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>
-        <source>MusE was unable to launch the script
-</source>
+        <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>
     </message>
@@ -9154,22 +10710,32 @@ click on the Restart button.</source>
 <context>
     <name>SongInfo</name>
     <message>
+        <location filename="../../muse/widgets/songinfo.ui" line="+14"/>
         <source>Song Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+16"/>
+        <source>Show on song load</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+C</source>
         <translation type="unfinished">Alt+C</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>&amp;Ok</source>
         <translation type="unfinished">&amp;Akceptuj</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+O</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9177,54 +10743,68 @@ 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>
     </message>
     <message>
+        <location line="+75"/>
         <source>Soft Synthesizer</source>
         <translation>Syntezator Softowy</translation>
     </message>
     <message>
+        <location line="+46"/>
         <source>File</source>
         <translation>Plik</translation>
     </message>
     <message>
+        <location line="-115"/>
         <source>Instances</source>
         <translation>Urządzenia</translation>
     </message>
     <message>
+        <location line="+10"/>
+        <location line="+115"/>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
     <message>
+        <location line="-17"/>
         <source>list of available software synthesizers</source>
         <translation>lista wszystkich dostępnych syntezatorów softowych</translation>
     </message>
     <message>
+        <location line="-25"/>
         <source>Add Instance</source>
         <translation>Dodaj urządzenie</translation>
     </message>
     <message>
+        <location line="-58"/>
         <source>Remove Instance</source>
         <translation>Usuń urządzenie</translation>
     </message>
     <message>
+        <location line="-10"/>
         <source>Midi Port</source>
         <translation>Port Midi</translation>
     </message>
     <message>
+        <location line="+38"/>
         <source>Midi connections</source>
         <translation>Połączenia midi</translation>
     </message>
     <message>
+        <location line="+67"/>
         <source>Inst</source>
         <translation>Instr.</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Version</source>
         <translation>Wersja</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Description</source>
         <translation>Opis</translation>
     </message>
@@ -9232,82 +10812,156 @@ click on the Restart button.</source>
 <context>
     <name>TList</name>
     <message>
+        <location filename="../../muse/arranger/tlist.cpp" line="+700"/>
         <source>Midi</source>
         <translation>Midi</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Drum</source>
         <translation>Perkusja</translation>
     </message>
     <message>
+        <location line="-430"/>
         <source>Delete Track</source>
         <translation>Kasuj Ślad</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Track Comment</source>
         <translation>Opis Śladu</translation>
     </message>
     <message>
         <source>Show Gui</source>
-        <translation>Pokaż interfejs użytkownika</translation>
+        <translation type="obsolete">Pokaż interfejs użytkownika</translation>
     </message>
     <message>
+        <location line="-296"/>
         <source>Add Midi Track</source>
         <translation>Dodaj ślad midi</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Add Drum Track</source>
         <translation>Dodaj ślad perkusyjny</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Add Wave Track</source>
         <translation>Dodaj ślad audio</translation>
     </message>
     <message>
+        <location line="-533"/>
         <source>MusE: bad trackname</source>
         <translation>MuzA: zła nazwa śladu</translation>
     </message>
     <message>
+        <location line="-53"/>
+        <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="+48"/>
         <source>please choose a unique track name</source>
         <translation>proszę wybrać niepowtarzalną nazwę dla śladu</translation>
     </message>
     <message>
+        <location line="+203"/>
+        <location line="+53"/>
+        <source>show gui</source>
+        <translation type="unfinished">pokaż interfejs użytkownika</translation>
+    </message>
+    <message>
+        <location line="-44"/>
+        <location line="+53"/>
+        <source>show native gui</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+270"/>
         <source>Add Output</source>
         <translation>Dodaj wyjście audio</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Add Group</source>
         <translation>Dodaj szynę audio</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Add Input</source>
         <translation>Dodaj wejście audio</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Add Aux Send</source>
         <translation>Dodaj wysyłkę na efekty</translation>
     </message>
     <message>
+        <location line="-420"/>
+        <location line="+1176"/>
         <source>Update drummap?</source>
         <translation>Zaktualizować zestaw perkusyjny?</translation>
     </message>
     <message>
+        <location line="-1175"/>
         <source>Do you want to use same port for all instruments in the drummap?</source>
         <translation>Czy chcesz używać jednego portu midi dla wszystkich instrumentów w zestawie perkusyjnym?</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <location line="+1176"/>
         <source>&amp;Yes</source>
         <translation>&amp;Tak</translation>
     </message>
     <message>
+        <location line="-1176"/>
+        <location line="+1176"/>
         <source>&amp;No</source>
         <translation>&amp;Nie</translation>
     </message>
     <message>
+        <location line="-643"/>
+        <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="+610"/>
         <source>Do you want to use same port and channel for all instruments in the drummap?</source>
         <translation>Czy chcesz używać jednego portu  i jednego kanału dla wszystkich instrumentów w zestawie perkusyjnym?</translation>
     </message>
     <message>
+        <location line="-1386"/>
         <source>&lt;none&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9315,6 +10969,7 @@ 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>
     </message>
@@ -9322,38 +10977,41 @@ click on the Restart button.</source>
 <context>
     <name>Toolbar1</name>
     <message>
+        <location filename="../../muse/widgets/tb1.cpp" line="+21"/>
         <source>Solo</source>
         <translation>Solo</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>Snap</source>
         <translation>Przyciąganie</translation>
     </message>
     <message>
         <source>Quantize</source>
-        <translation>Kwantyzacja</translation>
+        <translation type="obsolete">Kwantyzacja</translation>
     </message>
     <message>
         <source>To</source>
-        <translation>Zakres</translation>
+        <translation type="obsolete">Zakres</translation>
     </message>
     <message>
         <source>All Events</source>
-        <translation>Wszytkie Elementy</translation>
+        <translation type="obsolete">Wszytkie Elementy</translation>
     </message>
     <message>
         <source>Looped Ev.</source>
-        <translation>Pomiędzy lokatorami</translation>
+        <translation type="obsolete">Pomiędzy lokatorami</translation>
     </message>
     <message>
         <source>Selected Ev.</source>
-        <translation>Zaznaczone Elementy</translation>
+        <translation type="obsolete">Zaznaczone Elementy</translation>
     </message>
     <message>
         <source>Looped+Sel.</source>
-        <translation>Zaznaczone +  Pomiędzy lokatorami</translation>
+        <translation type="obsolete">Zaznaczone +  Pomiędzy lokatorami</translation>
     </message>
     <message>
+        <location line="-18"/>
         <source>Cursor</source>
         <translation>Kursor</translation>
     </message>
@@ -9361,10 +11019,12 @@ click on the Restart button.</source>
 <context>
     <name>TrackComment</name>
     <message>
+        <location filename="../../muse/widgets/comment.cpp" line="+41"/>
         <source>MusE: Track Comment</source>
         <translation>MuzA: Opis Śladu</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Track Comment:</source>
         <translation>Opis Śladu</translation>
     </message>
@@ -9372,122 +11032,156 @@ 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>
     </message>
     <message>
+        <location line="-2"/>
+        <location line="+3"/>
         <source>Loop</source>
         <translation>Pętla</translation>
     </message>
     <message>
+        <location line="-2"/>
+        <location line="+3"/>
         <source>Punch Out</source>
         <translation>Wył. wcinki (punch out)</translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>Left Mark</source>
         <translation>Lewy Lokator</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Right Mark</source>
         <translation>Prawy Lokator</translation>
     </message>
     <message>
+        <location line="-95"/>
         <source>Overdub</source>
         <translation>Dogrywanie</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <location line="+15"/>
         <source>Replace</source>
         <translation>Zastępowania</translation>
     </message>
     <message>
+        <location line="-10"/>
         <source>Rec Mode</source>
         <translation>Typ Nagrywania</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Normal</source>
         <translation>Normalny</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Mix</source>
         <translation>Miks</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Cycle Rec</source>
         <translation>Zapętl nagrywanie</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>punchin</source>
         <translation>włącz wcinki (punch In)</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>loop</source>
         <translation>pętla</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>punchout</source>
         <translation>wył. wcinki (punch out)punchout</translation>
     </message>
     <message>
+        <location line="+101"/>
         <source>rewind to start</source>
         <translation>przewiń do początku</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>rewind</source>
         <translation>przewijaj do tyłu</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>forward</source>
         <translation>przewijaj do przodu</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>stop</source>
         <translation>stop</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>play</source>
         <translation>odtwarzanie</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>record</source>
         <translation>nagrywanie</translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>AC</source>
         <translation>Aut. Kw.</translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>quantize during record</source>
         <translation>kwantyzuj podczas nagrywania</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Click</source>
         <translation>Metronom</translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>metronom click on/off</source>
         <translation>włącz/wyłącz metronom</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Sync</source>
         <translation>Synch.</translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>external sync on/off</source>
         <translation>synchronizowanie do zewn. urz.</translation>
     </message>
     <message>
+        <location line="+45"/>
         <source>Master</source>
         <translation>Ś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>
     </message>
@@ -9496,52 +11190,55 @@ click on the Restart button.</source>
     <name>TransposeDialogBase</name>
     <message>
         <source>MusE: Midi Transpose</source>
-        <translation>MuzA: Transponuj Midi</translation>
+        <translation type="obsolete">MuzA: Transponuj Midi</translation>
     </message>
     <message>
         <source>Value</source>
-        <translation>Wartość</translation>
+        <translation type="obsolete">Wartość</translation>
     </message>
     <message>
         <source>halftones</source>
-        <translation>Półtony</translation>
+        <translation type="obsolete">Półtony</translation>
     </message>
     <message>
         <source>Time</source>
-        <translation>Zakres</translation>
+        <translation type="obsolete">Zakres</translation>
     </message>
     <message>
         <source>all</source>
-        <translation>Wszystko</translation>
+        <translation type="obsolete">Wszystko</translation>
     </message>
     <message>
         <source>between markers</source>
-        <translation>Pomiędzy znacznikami</translation>
+        <translation type="obsolete">Pomiędzy znacznikami</translation>
     </message>
     <message>
         <source>Parts</source>
-        <translation>Klocki</translation>
+        <translation type="obsolete">Klocki</translation>
     </message>
     <message>
         <source>all in selected tracks</source>
-        <translation>Wszystko na zaznaczonych śladach</translation>
+        <translation type="obsolete">Wszystko na zaznaczonych śladach</translation>
     </message>
     <message>
         <source>OK</source>
-        <translation>Akceptuj</translation>
+        <translation type="obsolete">Akceptuj</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Anuluj</translation>
+        <translation type="obsolete">Anuluj</translation>
     </message>
 </context>
 <context>
     <name>VAMGui</name>
     <message>
+        <location filename="../../synti/vam/vamgui.cpp" line="+569"/>
         <source>MusE: Load VAM Presets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+110"/>
+        <location line="+18"/>
         <source>MusE: Save VAM Presets</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9549,134 +11246,190 @@ click on the Restart button.</source>
 <context>
     <name>VAMGuiBase</name>
     <message>
+        <location filename="../../synti/vam/vamguibase.ui" line="+23"/>
         <source>Virtual Analogue for MusE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>LFO</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Freq</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+42"/>
+        <location line="+950"/>
+        <location line="+177"/>
         <source>Waveform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-1116"/>
+        <location line="+956"/>
+        <location line="+177"/>
         <source>Sine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-1128"/>
+        <location line="+956"/>
+        <location line="+177"/>
         <source>Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-1128"/>
+        <location line="+956"/>
+        <location line="+177"/>
         <source>Saw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-1128"/>
+        <location line="+956"/>
+        <location line="+177"/>
         <source>Triangle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-1122"/>
         <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>EnvMod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
+        <location line="+717"/>
+        <location line="+427"/>
         <source>Attack</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-1134"/>
+        <location line="+645"/>
+        <location line="+531"/>
         <source>Decay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-1166"/>
+        <location line="+677"/>
+        <location line="+531"/>
         <source>Sustain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-1198"/>
+        <location line="+677"/>
+        <location line="+401"/>
         <source>Release</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-972"/>
         <source>Cutoff</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Resonance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Invert</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>KeyTrack</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+153"/>
         <source>Presets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+65"/>
         <source>Set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>load preset list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>save preset list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>save preset list to a new file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>delete preset</source>
         <translation type="unfinished">kasuj ustawienie</translation>
     </message>
     <message>
+        <location line="+41"/>
         <source>DCO 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+12"/>
+        <location line="+538"/>
         <source>Pitch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-506"/>
+        <location line="+480"/>
         <source>Detune</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-374"/>
+        <location line="+473"/>
         <source>PWM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-391"/>
+        <location line="+266"/>
         <source>FM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-240"/>
+        <location line="+501"/>
         <source>PW</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-314"/>
         <source>DCO 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+324"/>
         <source>On</source>
         <translation type="unfinished"></translation>
     </message>
     <message utf8="true">
+        <location line="+122"/>
         <source>VAM 1.0beta3
 Virtual Analog for MusE
 Released under GPL.
@@ -9693,58 +11446,59 @@ Robert Jonsson
     <name>VelocityBase</name>
     <message>
         <source>MusE: Modify Velocity</source>
-        <translation>MuzA: Modyfikuj predkość uderzenia (velocity)</translation>
+        <translation type="obsolete">MuzA: Modyfikuj predkość uderzenia (velocity)</translation>
     </message>
     <message>
         <source>Range</source>
-        <translation>Zakres</translation>
+        <translation type="obsolete">Zakres</translation>
     </message>
     <message>
         <source>All Events</source>
-        <translation>Wszytkie Elementy</translation>
+        <translation type="obsolete">Wszytkie Elementy</translation>
     </message>
     <message>
         <source>Selected Events</source>
-        <translation>Zaznaczone Elementy</translation>
+        <translation type="obsolete">Zaznaczone Elementy</translation>
     </message>
     <message>
         <source>Looped Events</source>
-        <translation>Pomiędzy lokatorami</translation>
+        <translation type="obsolete">Pomiędzy lokatorami</translation>
     </message>
     <message>
         <source>Selected &amp; Looped</source>
-        <translation>Zaznaczone &amp; Pomiędzy lokatorami</translation>
+        <translation type="obsolete">Zaznaczone &amp; Pomiędzy lokatorami</translation>
     </message>
     <message>
         <source>Values</source>
-        <translation>Wartość</translation>
+        <translation type="obsolete">Wartość</translation>
     </message>
     <message>
         <source>Rate:</source>
-        <translation>Częstotliwość:</translation>
+        <translation type="obsolete">Częstotliwość:</translation>
     </message>
     <message>
         <source>Offset:</source>
-        <translation>Offset:</translation>
+        <translation type="obsolete">Offset:</translation>
     </message>
     <message>
         <source>%</source>
-        <translation>%</translation>
+        <translation type="obsolete">%</translation>
     </message>
     <message>
         <source>OK</source>
-        <translation>Akceptuj</translation>
+        <translation type="obsolete">Akceptuj</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Anuluj</translation>
+        <translation type="obsolete">Anuluj</translation>
     </message>
 </context>
 <context>
     <name>WTScale</name>
     <message>
+        <location filename="../../muse/widgets/wtscale.cpp" line="+29"/>
         <source>bar scale</source>
-        <translation type="obsolete">oś taktów</translation>
+        <translation type="unfinished">oś taktów</translation>
     </message>
 </context>
 <context>
@@ -9758,10 +11512,12 @@ Robert Jonsson
         <translation type="obsolete">Narzędzia audio</translation>
     </message>
     <message>
+        <location filename="../../muse/waveedit/waveedit.cpp" line="+180"/>
         <source>Solo</source>
         <translation>Solo</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Cursor</source>
         <translation>Kursor</translation>
     </message>
@@ -9774,87 +11530,123 @@ Robert Jonsson
         <translation type="obsolete">Opcje</translation>
     </message>
     <message>
+        <location line="-109"/>
         <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>
+        <location line="+2"/>
         <source>200%</source>
         <translation type="unfinished">200%</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>150%</source>
         <translation type="unfinished">150%</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>75%</source>
         <translation type="unfinished">75%</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>50%</source>
         <translation type="unfinished">50%</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>25%</source>
         <translation type="unfinished">25%</translation>
     </message>
     <message>
+        <location line="+4"/>
         <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>Wave edit tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>transport</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Pianoroll tools</source>
+        <location line="+8"/>
+        <source>WaveEdit tools</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -9896,10 +11688,12 @@ Robert Jonsson
 <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
@@ -9907,10 +11701,12 @@ 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.
 
@@ -9921,230 +11717,288 @@ Missing data is muted</source>
 <context>
     <name>freeverb</name>
     <message>
+        <location filename="../plugins/1050.ui" line="+20"/>
         <source>FreeVerb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Room Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+88"/>
         <source>Damping</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+60"/>
         <source>Wet Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../plugins/2142.ui" line="+26"/>
         <source>Tap-Reverberator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Decay [ms]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+59"/>
+        <location line="+41"/>
         <source>dB</source>
         <translation type="unfinished">dB</translation>
     </message>
     <message>
+        <location line="-31"/>
         <source>Dry Level [dB]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+41"/>
         <source>Wet Level [dB]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+72"/>
         <source>Preset:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>AfterBurn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>AfterBurn (Long)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Ambience</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Ambience (Thick)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Ambience (Thick) - HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Cathedral</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Cathedral - HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Drum Chamber</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Garage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Garage (Bright)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Gymnasium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Gymnasium (Bright)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Gymnasium (Bright) - HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Hall (Small)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Hall (Medium)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Hall (Large)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Hall (Large) - HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Plate (Small)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Plate (Medium)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Plate (Large)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Plate (Large) - HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Pulse Chamber</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Pulse Chamber (Reverse)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Resonator (96 ms)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Resonator (152 ms)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Resonator (208 ms)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Room (Small)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Room (Medium)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Room (Large)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Room (Large) - HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Slap Chamber</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Slap Chamber - HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Slap Chamber (Bright)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Slap Chamber (Bright) HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Smooth Hall (Small)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Smooth Hall (Medium)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Smooth Hall (Large)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Smooth Hall (Large) - HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Vocal Plate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Vocal Plate - HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Warble Chamber</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Warehoouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Warehouse - HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Comb Filters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Allpass Filters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Bandpass Filters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Enhanced Stereo</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/muse2/share/locale/muse_ru.ts b/muse2/share/locale/muse_ru.ts
index 167c24a7..c7a70abb 100644
--- a/muse2/share/locale/muse_ru.ts
+++ b/muse2/share/locale/muse_ru.ts
@@ -4,6 +4,7 @@
 <context>
     <name>@default</name>
     <message>
+        <location filename="../../muse/transport.cpp" line="+31"/>
         <source>Click this button to enable recording</source>
         <translation>Щелкните по этой кнопке для активизации режима записи</translation>
     </message>
@@ -11,11 +12,12 @@
         <source>sets amount of quantization:
 0   - no quantization
 100 - full quantization</source>
-        <translation>устанавливает объём квантования:
+        <translation type="obsolete">устанавливает объём квантования:
 0    - без квантования
 100 - полное квантование</translation>
     </message>
     <message>
+        <location filename="../../muse/widgets/tools.cpp" line="+16"/>
         <source>select Pointer Tool:
 with the pointer tool you can:
   select parts
@@ -28,88 +30,107 @@ with the pointer tool you can:
   копировать партии</translation>
     </message>
     <message>
+        <location filename="../../muse/transport.cpp" line="+1"/>
         <source>Click this button to stop playback</source>
         <translation>Щелкните по этой кнопке для остановки воспроизведения</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Click this button to start playback</source>
         <translation>Щелкните по этой кнопке, чтобы начать воспроизведение</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Click this button to rewind to start position</source>
         <translation>Щелкните по этой кнопке для перемещения к началу</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Click this button to rewind</source>
         <translation>Щелкните по этой кнопке для перемотки назад</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Click this button to forward current play position</source>
         <translation>Щелкните по этой кнопке для перемещения вперёд</translation>
     </message>
     <message>
         <source>don&apos;t quantize notes above this tick limit</source>
-        <translation>не квантовать ноты выше этого предела тиков</translation>
+        <translation type="obsolete">не квантовать ноты выше этого предела тиков</translation>
     </message>
     <message>
         <source>quantize also note len as default</source>
-        <translation>также квантовать длительность нот по умолчанию</translation>
+        <translation type="obsolete">также квантовать длительность нот по умолчанию</translation>
     </message>
     <message>
+        <location filename="../../muse/app.cpp" line="+71"/>
         <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>
     </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>Щелкните по этой кнопке для сохранения проекта.  Будет предложено ввести имя файла.
 Вы также можете выбрать пункт &quot;Сохранить&quot; в меню &quot;Файл&quot;.</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Create New Song</source>
         <translation>Создать новый проект</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>loop between left mark and right mark</source>
         <translation>цикл между левым и правым маркерами</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>record starts at left mark</source>
         <translation>запись начинается с левого маркера</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>record stops at right mark</source>
         <translation>запись останавливается на правом маркере</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>rewind to start position</source>
         <translation>перемотать к начальной позиции</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>rewind current position</source>
         <translation>перемотать к текущей позиции</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>move current position</source>
         <translation>переместить текущую позицию</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>stop sequencer</source>
         <translation>остановить секвенсер</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>start sequencer play</source>
         <translation>начать воспроизведение в секвенсере</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>to record press record and then play</source>
         <translation>чтобы начать запись нажмите &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>
     </message>
     <message>
+        <location filename="../../muse/widgets/tools.cpp" line="+5"/>
         <source>select Pencil Tool:
 with the pencil tool you can:
   create new parts
@@ -120,78 +141,121 @@ with the pencil tool you can:
   изменять длину партий</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>select Delete Tool:
 with the delete tool you can delete parts</source>
         <translation>выбрать инструмент &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)
 с помощью инструмента &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;:
 с помощью инструмента &quot;Клей&quot; вы можете соединить две партии</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>select Score Tool:
 </source>
         <translation>выбрать редактор партитур:
 </translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>select Quantize Tool:
 insert display quantize event</source>
         <translation>выбрать инструмент &quot;Квантование&quot;:
 вставить отображение квантуемых событий</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>select Drawing Tool</source>
         <translation>выбрать инструмент &quot;Рисование&quot;</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>select Muting Tool:
 click on part to mute/unmute</source>
         <translation>выбрать инструмент &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>
     </message>
     <message>
+        <location line="+1"/>
         <source>pencil</source>
         <translation>карандаш</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>cutter</source>
         <translation>ножницы</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>score</source>
         <translation>партитура</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>glue</source>
         <translation>клей</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>quantize</source>
         <translation>квантовать</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>draw</source>
         <translation>рисовать</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>
+    </message>
+    <message>
+        <location filename="../../muse/arranger/arranger.cpp" line="+136"/>
+        <location filename="../../muse/master/masteredit.cpp" line="+127"/>
+        <location filename="../../muse/widgets/comboQuant.cpp" line="+23"/>
+        <location line="+1"/>
+        <location line="+1"/>
+        <location filename="../../muse/widgets/tb1.cpp" line="+31"/>
+        <location line="+1"/>
+        <location line="+1"/>
         <source>Off</source>
         <translation>Выкл</translation>
     </message>
@@ -204,130 +268,189 @@ click on part to mute/unmute</source>
         <translation type="obsolete">Все файлы (*)</translation>
     </message>
     <message>
+        <location filename="../../muse/app.cpp" line="+645"/>
         <source>Add Midi Track</source>
         <translation>Добавить Midi Трек</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Add Drum Track</source>
         <translation>Добавить трек с ударными</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Add Wave Track</source>
         <translation>Добавить wave-трек</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Add Audio Output</source>
         <translation>Добавить аудиовыход</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Add Audio Group</source>
         <translation>Добавить аудиогруппу</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Add Audio Input</source>
         <translation>Добавить аудиовход</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Add Aux Send</source>
         <translation>Добавить Aux посыл</translation>
     </message>
     <message>
+        <location filename="../../muse/widgets/tools.cpp" line="-8"/>
         <source>eraser</source>
         <translation>ластик</translation>
     </message>
     <message>
+        <location filename="../../muse/app.cpp" line="-66"/>
         <source>MESS</source>
         <translation>MESS</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>DSSI</source>
         <translation>DSSI</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>FST</source>
         <translation>FST</translation>
     </message>
     <message>
+        <location line="+56"/>
+        <location filename="../../muse/arranger/tlist.cpp" line="+970"/>
         <source>Add Synth</source>
         <translation>Добавить синтезатор</translation>
     </message>
     <message>
+        <location filename="../../muse/arranger/arranger.cpp" line="+0"/>
         <source>Bar</source>
         <translation>Такт</translation>
     </message>
     <message>
+        <location filename="../../muse/confmport.cpp" line="+714"/>
         <source> Jack</source>
         <translation> Jack</translation>
     </message>
     <message>
+        <location line="+46"/>
         <source>ALSA:</source>
         <translation>ALSA:</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>SYNTH:</source>
         <translation>SYNTH:</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>JACK:</source>
         <translation>JACK:</translation>
     </message>
     <message>
+        <location filename="../../muse/driver/alsamidi.cpp" line="+225"/>
+        <location filename="../../muse/driver/jackmidi.cpp" line="+737"/>
+        <location filename="../../muse/midiport.cpp" line="+1072"/>
+        <location filename="../../muse/track.cpp" line="+782"/>
+        <location line="+16"/>
+        <location line="+30"/>
         <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>
     </message>
     <message>
+        <location line="+34"/>
+        <location filename="../../muse/driver/jackmidi.cpp" line="+36"/>
+        <location filename="../../muse/midiport.cpp" line="+7"/>
+        <location filename="../../muse/track.cpp" line="-48"/>
+        <location line="+60"/>
         <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>
     </message>
     <message>
+        <location line="+3"/>
+        <location filename="../../muse/driver/jackmidi.cpp" line="-61"/>
+        <location line="+64"/>
+        <location filename="../../muse/track.cpp" line="-42"/>
+        <location line="+48"/>
         <source> type=&quot;%1&quot;</source>
         <translation> тип=&quot;%1&quot;</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location filename="../../muse/driver/jackmidi.cpp" line="-61"/>
+        <location line="+64"/>
+        <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="-69"/>
+        <location filename="../../muse/track.cpp" line="-56"/>
         <source>source</source>
         <translation>источник</translation>
     </message>
     <message>
+        <location filename="../../muse/midictrl.cpp" line="+227"/>
         <source>Velocity</source>
         <translation>Скорость нажатия</translation>
     </message>
     <message>
+        <location filename="../../muse/midiport.cpp" line="-756"/>
         <source>&lt;none&gt;</source>
         <translation>&lt;ничего&gt;</translation>
     </message>
     <message>
+        <location line="+750"/>
+        <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="+1316"/>
         <source>dssi_synth</source>
         <translation>dssi_synth</translation>
     </message>
     <message>
+        <location line="+87"/>
         <source>ladspa_efx</source>
         <translation>ladspa_efx</translation>
     </message>
     <message>
+        <location filename="../../muse/track.cpp" line="+8"/>
         <source> channels=&quot;%1&quot;</source>
         <translation> каналы=&quot;%1&quot;</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source> remch=&quot;%1&quot;</source>
         <translation> remch=&quot;%1&quot;</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source> mport=&quot;%1&quot;/</source>
         <translation> mport=&quot;%1&quot;/</translation>
     </message>
@@ -335,6 +458,7 @@ click on part to mute/unmute</source>
 <context>
     <name>AboutBox</name>
     <message>
+        <location filename="../../muse/widgets/aboutbox.ui" line="+14"/>
         <source>AboutBox</source>
         <translation>Об окне</translation>
     </message>
@@ -358,10 +482,12 @@ Published under the GNU Public License</source>
 Опубликовано на условиях GNU Public License</translation>
     </message>
     <message>
+        <location line="+37"/>
         <source>Version 2 pre-alpha</source>
         <translation>Версия 2 пре-альфа</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>(C) Copyright 1999-2010 Werner Schweer and others.
 See http://www.muse-sequencer.org for new versions and
 more information.
@@ -374,10 +500,12 @@ Published under the GNU Public License</source>
 Опубликовано на условиях GNU Public License</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>&amp;Keep On Rocking!</source>
         <translation>&amp;Продолжим рок!</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+K</source>
         <translation>Alt+K</translation>
     </message>
@@ -385,16 +513,19 @@ Published under the GNU Public License</source>
 <context>
     <name>Appearance</name>
     <message>
+        <location filename="../../muse/appearance.cpp" line="+751"/>
         <source>MusE: load image</source>
         <translation>MusE: загрузить изображение</translation>
     </message>
     <message>
+        <location line="-639"/>
         <source>Main application font, and default font for any
  controls not defined here.</source>
         <translation>Главный шрифт приложения, и шрифт по умолчанию 
 для всех средств управления, здесь не определены.</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>
@@ -402,288 +533,408 @@ Also timescale small numbers, arranger part name overlay,
 Также для маленьких цифр на линейке времени, названий партий в компоновщике и рэка эффектов.</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Midi track info panel. Transport controls.</source>
         <translation>Инфо-панель 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>
     </message>
     <message>
+        <location line="+1"/>
         <source>Time scale markers.</source>
         <translation>Маркеры на линейке времени.</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>List editor: meta event edit dialog multi-line edit box.</source>
         <translation>Редактор списка: редактирование мета-события многострочное окно редактирования. </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>
     </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>
+    </message>
+    <message>
         <source>&lt;none&gt;</source>
-        <translation>&lt;ничего&gt;</translation>
+        <translation type="obsolete">&lt;ничего&gt;</translation>
     </message>
     <message>
+        <location line="+958"/>
         <source>Select style sheet</source>
         <translation>Выберите таблицу стилей</translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>Qt style sheets (*.qss)</source>
         <translation>Таблицы стилей Qt (*.qss)</translation>
     </message>
-    <message>
-        <source>Global opaqueness (inverse of transparency).</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>AppearanceDialogBase</name>
     <message>
         <source>MusE: Appearance Settings</source>
-        <translation>MusE: Настройки вида</translation>
+        <translation type="obsolete">MusE: Настройки вида</translation>
     </message>
     <message>
+        <location filename="../../muse/widgets/appearancebase.ui" line="+1681"/>
         <source>Apply</source>
         <translation>Применить</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
+        <location line="-1668"/>
         <source>Arranger</source>
         <translation>Компоновщик</translation>
     </message>
     <message>
+        <location line="-16"/>
+        <source>MusE: Appearance settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>Parts</source>
         <translation>Партии</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>show names</source>
         <translation>показывать названия</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>show events</source>
         <translation>показывать события</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>show Cakewalk Style</source>
         <translation>показывать в стиле Cakewalk</translation>
     </message>
     <message>
+        <location line="+28"/>
+        <source>y-stretch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+15"/>
         <source>Events</source>
         <translation>События</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>note on</source>
         <translation>нажатие ноты</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>poly pressure</source>
         <translation>полифоническое нажатие</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>controller</source>
         <translation>контроллер</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>aftertouch</source>
         <translation>посленажатие</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>pitch bend</source>
         <translation>изменение высоты тона</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>program change</source>
         <translation>смена программы</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>special</source>
         <translation>специальная</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Background picture</source>
         <translation>Фоновое изображение</translation>
     </message>
     <message>
         <source>bg</source>
-        <translation>фон</translation>
+        <translation type="obsolete">фон</translation>
     </message>
     <message>
         <source>select...</source>
-        <translation>выбрать...</translation>
+        <translation type="obsolete">выбрать...</translation>
     </message>
     <message>
+        <location line="+58"/>
         <source>show snap grid</source>
         <translation>показывать сетку привязки</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Colors</source>
         <translation>Цвета</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Items</source>
         <translation>Разделы</translation>
     </message>
     <message>
+        <location line="+756"/>
+        <source>Color name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Global opacity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
         <source>Style/Fonts</source>
         <translation>Стиль/Шрифты</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>QT Theme</source>
         <translation>Тема QT</translation>
     </message>
     <message>
+        <location line="+21"/>
         <source>Windows</source>
         <translation>Окна</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>MusE</source>
         <translation>MusE</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Metal</source>
         <translation>Металл</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Norwegian Wood</source>
         <translation>Норвежское дерево</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Platinum</source>
         <translation>Платина</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>CDE</source>
         <translation>КДЕ</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Motif</source>
         <translation>Motif</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Motif Plus</source>
         <translation>Motif Plus</translation>
     </message>
     <message>
+        <location line="+73"/>
         <source>Fonts</source>
         <translation>Шрифты</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Family</source>
         <translation>Семейство</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Size</source>
         <translation>Размер</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Font 1</source>
         <translation>Шрифт 1</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Font 2</source>
         <translation>Шрифт 2</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Font 3</source>
         <translation>Шрифт 3</translation>
     </message>
     <message>
+        <location line="+50"/>
         <source>Font 0</source>
         <translation>Шрифт 0</translation>
     </message>
     <message>
+        <location line="+50"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <location line="+157"/>
+        <location line="+47"/>
+        <location line="+7"/>
         <source>Bold</source>
         <translation>Жирный</translation>
     </message>
     <message>
+        <location line="-204"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <location line="+136"/>
+        <location line="+54"/>
+        <location line="+7"/>
         <source>Italic</source>
         <translation>Курсив</translation>
     </message>
     <message>
+        <location line="-433"/>
+        <location line="+7"/>
+        <location line="+242"/>
+        <location line="+13"/>
+        <location line="+13"/>
+        <location line="+13"/>
+        <location line="+97"/>
+        <location line="+61"/>
+        <location line="+13"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
+        <location line="-164"/>
         <source>Font 4</source>
         <translation>Шрифт 4</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Font 5</source>
         <translation>Шрифт 5</translation>
     </message>
     <message>
+        <location line="-1228"/>
         <source>Palette</source>
         <translation>Палитра</translation>
     </message>
     <message>
+        <location line="-64"/>
+        <source>add</source>
+        <translation type="unfinished">добавить</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>remove</source>
+        <translation type="unfinished">удалить</translation>
+    </message>
+    <message>
+        <location line="+586"/>
         <source>add to palette</source>
         <translation>Добавить в палитру</translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>B</source>
         <translation>B</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>H</source>
         <translation>H</translation>
     </message>
     <message>
+        <location line="+30"/>
         <source>V</source>
         <translation>V</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>G</source>
         <translation>G</translation>
     </message>
     <message>
+        <location line="+96"/>
         <source>R</source>
         <translation>R</translation>
     </message>
     <message>
+        <location line="-772"/>
         <source>clear</source>
         <translation>очистить</translation>
     </message>
     <message>
+        <location line="+953"/>
         <source>Style Sheet:</source>
         <translation>Таблица Стилей:</translation>
     </message>
     <message>
+        <location line="+345"/>
         <source>Font 6</source>
         <translation>Шрифт 6</translation>
     </message>
-    <message>
-        <source>Global opaqueness</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>Arranger</name>
     <message>
+        <location filename="../../muse/arranger/arranger.cpp" line="-13"/>
         <source>Arranger</source>
         <translation>Компоновщик</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Cursor</source>
         <translation>Курсор</translation>
     </message>
@@ -696,82 +947,104 @@ Word-breaking but only with spaces.</source>
         <translation type="obsolete">Такт</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Snap</source>
         <translation>Привязка</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Len</source>
         <translation>Дл</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>NO</source>
         <translation>НЕТ</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>GM</source>
         <translation>GM</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>GS</source>
         <translation>GS</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>XG</source>
         <translation>XG</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location line="+1"/>
         <source>midi song type</source>
         <translation>тип midi-проекта</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Pitch</source>
         <translation>Высота тона</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>midi pitch</source>
         <translation>midi высотность</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>global midi pitch shift</source>
         <translation>общий сдвиг midi-высотности</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Tempo</source>
         <translation>Темп</translation>
     </message>
     <message>
+        <location line="+8"/>
+        <location line="+1"/>
         <source>midi tempo</source>
         <translation>midi-темп</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
+        <location line="+60"/>
         <source>TrackInfo</source>
         <translation>ТрекИнфо</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>R</source>
         <translation>R</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>M</source>
         <translation>M</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>C</source>
         <translation>Т</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Track</source>
         <translation> Трек</translation>
     </message>
@@ -780,50 +1053,72 @@ Word-breaking but only with spaces.</source>
         <translation type="obsolete">Вых. порт</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Ch</source>
         <translation>Кан</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>T</source>
         <translation>Т</translation>
     </message>
     <message>
+        <location line="-230"/>
         <source>Enable Recording</source>
         <translation>Разрешить запись</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Mute/Off Indicator</source>
         <translation>Индикатор глушения вкл/выкл</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Solo Indicator</source>
         <translation>Индикатор соло</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Track Type</source>
         <translation>Тип трека</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Track Name</source>
         <translation>Имя трека</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Midi output channel number or audio channels</source>
         <translation>Номер выходного Midi-канала или аудио каналов</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Midi output port or synth midi port</source>
         <translation>Выходной midi-порт или midi-порт синтезатора</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Time Lock</source>
         <translation>Изменение времени заблокировано</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>Automation parameter selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Notation clef</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
         <source>Enable recording. Click to toggle.</source>
         <translation>Разрешить запись. Щелкните для переключения.</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Mute indicator. Click to toggle.
 Right-click to toggle track on/off.
 Mute is designed for rapid, repeated action.
@@ -834,6 +1129,7 @@ On/Off is not!</source>
 А Вкл/Выкл нет!</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>
@@ -842,18 +1138,21 @@ Connected tracks are also &apos;phantom&apos; soloed,
 Они будут обозначены темными квадратами.</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Track type. Right-click to change
  midi and drum track types.</source>
         <translation>Тип трека. Щелкните правой кнопкой мыши чтобы
 изменить тип трека (midi-трек или трек ударных).</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Track name. Double-click to edit.
 Right-click for more options.</source>
         <translation>Название трека. Редактирование - двойной щелчок.
 Большее количество опций -  правый щелчок мыши.</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Midi/drum track: Output channel number.
 Audio track: Channels.
 Mid/right-click to change.</source>
@@ -862,6 +1161,7 @@ Mid/right-click to change.</source>
 Чтобы изменить, щелкните Средней/Правой кнопкой мыши.</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Midi/drum track: Output port.
 Synth track: Assigned midi port.
 Left-click to change.
@@ -872,20 +1172,39 @@ Right-click to show GUI.</source>
 Щелчок правой кнопкой - показать ГИП.</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Time lock</source>
         <translation>Изменение времени заблокировано</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>Notation clef. Select this tracks notation clef.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <location line="+1"/>
         <source>song length - bars</source>
         <translation>длина проекта - в тактах</translation>
     </message>
     <message>
+        <location line="+126"/>
         <source>Port</source>
         <translation>Порт</translation>
     </message>
     <message>
+        <location line="+3"/>
+        <source>Automation</source>
+        <translation type="unfinished">Автоматизация</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Clef</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>&lt;unknown&gt;</source>
-        <translation>&lt;неизвестно&gt;</translation>
+        <translation type="obsolete">&lt;неизвестно&gt;</translation>
     </message>
 </context>
 <context>
@@ -895,46 +1214,57 @@ Right-click to show GUI.</source>
         <translation type="obsolete">MusE: Микшер</translation>
     </message>
     <message>
+        <location filename="../../muse/mixer/amixer.cpp" line="+156"/>
         <source>&amp;Create</source>
         <translation>&amp;Добавить</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>&amp;View</source>
         <translation>&amp;Вид</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Routing</source>
         <translation>Маршрутизация</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Show Midi Tracks</source>
         <translation>Показать Midi-треки</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Show Drum Tracks</source>
         <translation>Показать треки ударных</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Show Wave Tracks</source>
         <translation>Показать Wave-треки</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Show Inputs</source>
         <translation>Показать входы</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Show Outputs</source>
         <translation>Показать выходы</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Show Groups</source>
         <translation>Показать группы</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Show Auxs</source>
         <translation>Показать Auxs</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Show Synthesizers</source>
         <translation>Показать синтезаторы</translation>
     </message>
@@ -942,46 +1272,57 @@ Right-click to show GUI.</source>
 <context>
     <name>AudioStrip</name>
     <message>
+        <location filename="../../muse/mixer/astrip.cpp" line="+603"/>
         <source>panorama</source>
         <translation>панорама</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>aux send level</source>
         <translation>уровень aux посыла</translation>
     </message>
     <message>
+        <location line="+286"/>
         <source>off</source>
         <translation>выкл</translation>
     </message>
     <message>
+        <location line="-263"/>
         <source>Pan</source>
         <translation>Пан</translation>
     </message>
     <message>
+        <location line="+93"/>
         <source>1/2 channel</source>
         <translation>стерео-моно</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Pre</source>
         <translation>Пре</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>pre fader - post fader</source>
         <translation>пре федер - пост федер</translation>
     </message>
     <message>
+        <location line="+64"/>
         <source>dB</source>
         <translation>Дб</translation>
     </message>
     <message>
+        <location line="+36"/>
         <source>record</source>
         <translation>записать</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>mute</source>
         <translation>заглушить</translation>
     </message>
     <message>
+        <location line="+25"/>
         <source>record downmix</source>
         <translation>записать downmix</translation>
     </message>
@@ -994,6 +1335,7 @@ Right-click to show GUI.</source>
         <translation type="obsolete">прослушивание пре федера</translation>
     </message>
     <message>
+        <location line="+37"/>
         <source>iR</source>
         <translation>вх</translation>
     </message>
@@ -1002,42 +1344,52 @@ Right-click to show GUI.</source>
         <translation type="obsolete">маршрут входа</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>oR</source>
         <translation>вых</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>output routing</source>
         <translation>маршрут выхода</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Off</source>
         <translation>Откл</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Read</source>
         <translation>Читать</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Touch</source>
         <translation>По касанию</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Write</source>
         <translation>Записывать</translation>
     </message>
     <message>
+        <location line="+25"/>
         <source>automation type</source>
         <translation>тип автоматизации</translation>
     </message>
     <message>
         <source>Channel</source>
-        <translation>Канал</translation>
+        <translation type="obsolete">Канал</translation>
     </message>
     <message>
+        <location line="-88"/>
+        <location line="+4"/>
         <source>solo mode</source>
         <translation>режим соло</translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>input routing</source>
         <translation>маршрут входа</translation>
     </message>
@@ -1046,55 +1398,66 @@ Right-click to show GUI.</source>
     <name>Awl::MidiVolEntry</name>
     <message>
         <source>off</source>
-        <translation>выкл</translation>
+        <translation type="obsolete">выкл</translation>
     </message>
     <message>
         <source>db</source>
-        <translation>дб</translation>
+        <translation type="obsolete">дб</translation>
     </message>
 </context>
 <context>
     <name>Awl::VolEntry</name>
     <message>
         <source>off</source>
-        <translation>выкл</translation>
+        <translation type="obsolete">выкл</translation>
     </message>
 </context>
 <context>
     <name>BigTime</name>
     <message>
+        <location filename="../../muse/widgets/bigtime.cpp" line="+78"/>
         <source>MusE: Bigtime</source>
         <translation>MusE: Хронометр</translation>
     </message>
     <message>
+        <location line="-42"/>
         <source>format display</source>
         <translation>формат дисплея</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>bar</source>
         <translation>такт</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>beat</source>
         <translation>доля</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <location line="+6"/>
         <source>tick</source>
         <translation>тик</translation>
     </message>
     <message>
+        <location line="-4"/>
         <source>minute</source>
         <translation>минут(а)</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>second</source>
         <translation>секунд(а)</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <location line="+3"/>
         <source>frame</source>
         <translation>фреймов</translation>
     </message>
     <message>
+        <location line="-2"/>
         <source>subframe</source>
         <translation>субфреймов</translation>
     </message>
@@ -1102,6 +1465,7 @@ Right-click to show GUI.</source>
 <context>
     <name>ClipListEdit</name>
     <message>
+        <location filename="../../muse/cliplist/cliplist.cpp" line="+103"/>
         <source>MusE: Clip List Editor</source>
         <translation>MusE: Редактор списка фрагментов</translation>
     </message>
@@ -1109,38 +1473,47 @@ Right-click to show GUI.</source>
 <context>
     <name>ClipListEditorBase</name>
     <message>
+        <location filename="../../muse/widgets/cliplisteditorbase.ui" line="+17"/>
         <source>MusE: ClipList</source>
         <translation>MusE: Список фрагментов</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Refs</source>
         <translation>Рефс (Refs)</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Start</source>
         <translation>Начало</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Len</source>
         <translation>Дл</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Data</source>
         <translation>Данные</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>Clip Properties</source>
         <translation>Свойства фрагмента</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Pos:</source>
         <translation>Поз:</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Len:</source>
         <translation>Дл:</translation>
     </message>
@@ -1148,14 +1521,17 @@ Right-click to show GUI.</source>
 <context>
     <name>CommentBase</name>
     <message>
+        <location filename="../../muse/widgets/commentbase.ui" line="+14"/>
         <source>Form1</source>
         <translation>Форма1</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>Track Comment</source>
         <translation>Комментарий к треку</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>Track 1</source>
         <translation>Трек 1</translation>
     </message>
@@ -1167,42 +1543,52 @@ Right-click to show GUI.</source>
         <translation type="obsolete">Настроить экспорт midi-файла</translation>
     </message>
     <message>
+        <location filename="../../muse/widgets/configmidifilebase.ui" line="+193"/>
         <source>&amp;OK</source>
         <translation>&amp;ОК</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Отмена</translation>
     </message>
     <message>
+        <location line="-56"/>
         <source>0 (single track)</source>
         <translation>0 (один трек)</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>1 (multiple tracks)</source>
         <translation>1 (несколько треков)</translation>
     </message>
     <message>
+        <location line="-36"/>
         <source>Format:</source>
         <translation>Формат:</translation>
     </message>
     <message>
+        <location line="-48"/>
         <source>96</source>
         <translation>96</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>192</source>
         <translation>192</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>384</source>
         <translation>384</translation>
     </message>
     <message>
+        <location line="+48"/>
         <source>Division:</source>
         <translation>Деление(Division):</translation>
     </message>
     <message>
+        <location line="-20"/>
         <source>Copyright:</source>
         <translation>Copyright:</translation>
     </message>
@@ -1211,46 +1597,57 @@ Right-click to show GUI.</source>
         <translation type="obsolete">Разрешить расширенный формат SMF</translation>
     </message>
     <message>
+        <location line="-95"/>
         <source>MusE: Config Midi File Import/Export</source>
         <translation>MusE: Настроить Импорт/Экспорт Midi-файла</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Import:</source>
         <translation>Импорт:</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Split tracks into &amp;parts</source>
         <translation>Разделить треки на &amp;партии</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+P</source>
         <translation>Alt+P</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Split tracks into parts, or one single part</source>
         <translation>Разделить треки на партии, или одну партию</translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Export:</source>
         <translation>Экспорт:</translation>
     </message>
     <message>
+        <location line="+31"/>
         <source>Enable extended smf format (currently not implemented)</source>
         <translation>Разрешить расширенный smf формат (в настоящее время не осуществлено)</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Use &amp;2-byte time signatures instead of standard 4</source>
         <translation>Использовать &amp;2-байтные размеры в такте вместо стандартных  4</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+2</source>
         <translation>Alt+2</translation>
     </message>
     <message>
+        <location line="+37"/>
         <source>Save space by replacing note-offs with &amp;zero velocity note-ons</source>
         <translation>Сохранить место, заменяя note-offs на &amp;note-ons с нулевой скоростью нажатия</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+Z</source>
         <translation>Alt+Z</translation>
     </message>
@@ -1262,6 +1659,7 @@ Right-click to show GUI.</source>
         <translation type="obsolete">Выбр</translation>
     </message>
     <message>
+        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="+79"/>
         <source>select controller</source>
         <translation>выбрать контроллер</translation>
     </message>
@@ -1270,256 +1668,389 @@ Right-click to show GUI.</source>
         <translation type="obsolete">x</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>remove panel</source>
         <translation>удалить панель</translation>
     </message>
     <message>
+        <location line="+463"/>
+        <location line="+236"/>
         <source>Velocity</source>
         <translation>Скорость нажатия</translation>
     </message>
     <message>
+        <location line="-186"/>
         <source>add new ...</source>
         <translation>Добавить новый...</translation>
     </message>
     <message>
+        <location line="-528"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>X</source>
         <translation>X</translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>manual adjust</source>
         <translation>настройка вручную</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>double click on/off</source>
         <translation>двойной щелчок вкл/выкл</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>
+    </message>
 </context>
 <context>
     <name>DeicsOnzeGui</name>
     <message>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="+1886"/>
+        <location line="+389"/>
         <source>Delete preset</source>
         <translation>Удалить пресет</translation>
     </message>
     <message>
+        <location line="-339"/>
+        <location line="+169"/>
+        <location line="+171"/>
         <source>Do you really want to delete %1 ?</source>
         <translation>Вы действительно хотите удалить %1 ?</translation>
     </message>
     <message>
+        <location line="-338"/>
+        <location line="+170"/>
+        <location line="+170"/>
         <source>&amp;Yes</source>
         <translation>&amp;Да</translation>
     </message>
     <message>
+        <location line="-340"/>
+        <location line="+170"/>
+        <location line="+170"/>
         <source>&amp;No</source>
         <translation>&amp;Нет</translation>
     </message>
     <message>
+        <location line="-1745"/>
         <source>Save configuration</source>
         <translation>Сохранить конфигурацию</translation>
     </message>
     <message>
+        <location line="+41"/>
+        <location line="+7"/>
+        <location line="+1172"/>
+        <location line="+7"/>
+        <location line="+218"/>
+        <location line="+7"/>
+        <location line="+160"/>
+        <location line="+7"/>
+        <location line="+165"/>
+        <location line="+7"/>
         <source>Critical Error</source>
         <translation>Критическая ошибка</translation>
     </message>
     <message>
+        <location line="-1749"/>
+        <location line="+1179"/>
+        <location line="+225"/>
+        <location line="+167"/>
+        <location line="+172"/>
         <source>Cannot open file %1</source>
         <translation>Не могу открыть файл %1</translation>
     </message>
     <message>
+        <location line="-1736"/>
+        <location line="+1179"/>
+        <location line="+225"/>
+        <location line="+167"/>
+        <location line="+172"/>
         <source>Parsing error for file %1</source>
         <translation>Синтаксическая ошибка в файле %1</translation>
     </message>
     <message>
+        <location line="-1709"/>
+        <location line="+1351"/>
         <source>Load category dialog</source>
         <translation>Загрузить диалог категорий</translation>
     </message>
     <message>
+        <location line="-226"/>
         <source>Load set dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+67"/>
         <source>Save set dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+24"/>
         <source>New category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location line="+101"/>
         <source>Delete category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-99"/>
         <source>Load category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Save category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Load set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Save set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Delete set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>New subcategory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
+        <location line="+243"/>
         <source>Delete subcategory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-240"/>
         <source>Load subcategory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Save subcategory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>New preset</source>
         <translation type="unfinished">Новый пресет</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Load preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Save preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>No more category supported</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>You can not add more categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+42"/>
+        <location line="+110"/>
         <source>No category selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-109"/>
+        <location line="+110"/>
         <source>You must first select a category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-61"/>
+        <location line="+167"/>
+        <location line="+172"/>
         <source>Replace or add</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+3"/>
+        <location line="+168"/>
+        <location line="+171"/>
         <source>&amp;Replace</source>
         <translation type="unfinished">&amp;Заменить</translation>
     </message>
     <message>
+        <location line="-339"/>
+        <location line="+168"/>
+        <location line="+171"/>
         <source>&amp;Add</source>
         <translation type="unfinished">&amp;Добавить</translation>
     </message>
     <message>
+        <location line="-329"/>
+        <location line="+167"/>
+        <location line="+171"/>
         <source>Download error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-337"/>
         <source>There is no more free category slot.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>Save category dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+30"/>
         <source>No more subcategory supported</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>You can not add more subcategories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+42"/>
+        <location line="+113"/>
         <source>No subcategory selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-112"/>
+        <location line="+113"/>
         <source>You must first select a subcategory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-101"/>
         <source>Load subcategory dialog</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+14"/>
         <source>There is no more free subcategory slot.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>Save subcategory dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>No more preset supported</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>You can not add more presets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+39"/>
+        <location line="+3"/>
+        <location line="+111"/>
         <source>No preset selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-113"/>
+        <location line="+3"/>
+        <location line="+111"/>
         <source>You must first select a preset.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-98"/>
         <source>Load preset dialog</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+13"/>
         <source>There is no more free preset slot.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>Save preset dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+120"/>
         <source>Browse set dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+35"/>
         <source>Browse image dialog</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1528,7 +2059,7 @@ Right-click to show GUI.</source>
     <name>DeicsOnzeGuiBase</name>
     <message>
         <source>DeicsOnze</source>
-        <translation type="unfinished">DeicsOnze</translation>
+        <translation type="obsolete">DeicsOnze</translation>
     </message>
     <message>
         <source>&amp;Presets</source>
@@ -1552,15 +2083,15 @@ Right-click to show GUI.</source>
     </message>
     <message>
         <source>Subcategory</source>
-        <translation type="unfinished">Подкатегория</translation>
+        <translation type="obsolete">Подкатегория</translation>
     </message>
     <message>
         <source>NONE</source>
-        <translation type="unfinished">НИЧЕГО</translation>
+        <translation type="obsolete">НИЧЕГО</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation type="unfinished">Категория</translation>
+        <translation type="obsolete">Категория</translation>
     </message>
     <message>
         <source>Delete</source>
@@ -1568,7 +2099,7 @@ Right-click to show GUI.</source>
     </message>
     <message>
         <source>Preset</source>
-        <translation type="unfinished">Пресет</translation>
+        <translation type="obsolete">Пресет</translation>
     </message>
     <message>
         <source>New</source>
@@ -1580,15 +2111,15 @@ Right-click to show GUI.</source>
     </message>
     <message>
         <source>Bank numerous</source>
-        <translation type="unfinished">Несколько банков</translation>
+        <translation type="obsolete">Несколько банков</translation>
     </message>
     <message>
         <source>Prog</source>
-        <translation type="unfinished">Прогр</translation>
+        <translation type="obsolete">Прогр</translation>
     </message>
     <message>
         <source>Program numerous</source>
-        <translation type="unfinished">Несколько программ</translation>
+        <translation type="obsolete">Несколько программ</translation>
     </message>
     <message>
         <source>DeicsOnze v0.2.2 Copyright (c) 2004 Nil Geisweiller under GPL licence</source>
@@ -1596,7 +2127,7 @@ Right-click to show GUI.</source>
     </message>
     <message>
         <source>&amp;Global</source>
-        <translation type="unfinished">&amp;Глобальный</translation>
+        <translation type="obsolete">&amp;Глобальный</translation>
     </message>
     <message>
         <source>Master Volume</source>
@@ -1612,7 +2143,7 @@ Right-click to show GUI.</source>
     </message>
     <message>
         <source>Coarse Ratio</source>
-        <translation type="unfinished">Грубая пропорция</translation>
+        <translation type="obsolete">Грубая пропорция</translation>
     </message>
     <message>
         <source>Feedback of Op 4</source>
@@ -1624,11 +2155,11 @@ Right-click to show GUI.</source>
     </message>
     <message>
         <source>POLY</source>
-        <translation type="unfinished">ПОЛИ</translation>
+        <translation type="obsolete">ПОЛИ</translation>
     </message>
     <message>
         <source>MONO</source>
-        <translation type="unfinished">МОНО</translation>
+        <translation type="obsolete">МОНО</translation>
     </message>
     <message>
         <source>PBR</source>
@@ -1636,35 +2167,35 @@ Right-click to show GUI.</source>
     </message>
     <message>
         <source>Pitch Bend Range</source>
-        <translation type="unfinished">Диапозон изменения высоты тона</translation>
+        <translation type="obsolete">Диапозон изменения высоты тона</translation>
     </message>
     <message>
         <source>LFO</source>
-        <translation type="unfinished">LFO</translation>
+        <translation type="obsolete">LFO</translation>
     </message>
     <message>
         <source>PMS</source>
-        <translation type="unfinished">PMS</translation>
+        <translation type="obsolete">PMS</translation>
     </message>
     <message>
         <source>PMD</source>
-        <translation type="unfinished">PMD</translation>
+        <translation type="obsolete">PMD</translation>
     </message>
     <message>
         <source>AMD</source>
-        <translation type="unfinished">AMD</translation>
+        <translation type="obsolete">AMD</translation>
     </message>
     <message>
         <source>Speed</source>
-        <translation type="unfinished">Скорость</translation>
+        <translation type="obsolete">Скорость</translation>
     </message>
     <message>
         <source>Delay</source>
-        <translation type="unfinished">Задержка</translation>
+        <translation type="obsolete">Задержка</translation>
     </message>
     <message>
         <source>AMS</source>
-        <translation type="unfinished">AMS</translation>
+        <translation type="obsolete">AMS</translation>
     </message>
     <message>
         <source>Saw Up</source>
@@ -1684,31 +2215,31 @@ Right-click to show GUI.</source>
     </message>
     <message>
         <source>LFO Waveform</source>
-        <translation type="unfinished">Форма волны LFO</translation>
+        <translation type="obsolete">Форма волны LFO</translation>
     </message>
     <message>
         <source>LFO Sync</source>
-        <translation type="unfinished">Синхр. LFO</translation>
+        <translation type="obsolete">Синхр. LFO</translation>
     </message>
     <message>
         <source>Amplitude Modulation Sensitivity</source>
-        <translation type="unfinished">Чувствительность Амплитудной Модуляции</translation>
+        <translation type="obsolete">Чувствительность Амплитудной Модуляции</translation>
     </message>
     <message>
         <source>Pitch Modulation Sensitivity</source>
-        <translation type="unfinished">Чувствительность Частотной Модуляции</translation>
+        <translation type="obsolete">Чувствительность Частотной Модуляции</translation>
     </message>
     <message>
         <source>Pitch Modulation Depth</source>
-        <translation type="unfinished">Глубина Частотной Модуляции</translation>
+        <translation type="obsolete">Глубина Частотной Модуляции</translation>
     </message>
     <message>
         <source>LFO Speed</source>
-        <translation type="unfinished">Скорость LFO</translation>
+        <translation type="obsolete">Скорость LFO</translation>
     </message>
     <message>
         <source>LFO Delay</source>
-        <translation type="unfinished">Задержка LFO</translation>
+        <translation type="obsolete">Задержка LFO</translation>
     </message>
     <message>
         <source>Transpose and Global Detune</source>
@@ -1716,7 +2247,7 @@ Right-click to show GUI.</source>
     </message>
     <message>
         <source>Transpose</source>
-        <translation type="unfinished">Транспонировать</translation>
+        <translation type="obsolete">Транспонировать</translation>
     </message>
     <message>
         <source>Global Detune</source>
@@ -1756,870 +2287,88 @@ Right-click to show GUI.</source>
     </message>
     <message>
         <source>Modulation Matrix</source>
-        <translation type="unfinished">Матрица модуляции</translation>
+        <translation type="obsolete">Матрица модуляции</translation>
     </message>
     <message>
         <source>Volume</source>
-        <translation type="unfinished">Громкость</translation>
-    </message>
-    <message>
-        <source>&amp;Preset</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>INITVOICE</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LBank</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>HBank</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DeicsOnze v0.5.5 Copyright (c) 2004-2006 Nil Geisweiller. Published under GPL licence.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pitch Envelope</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PL3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PL2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PL1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PR1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PR2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PR3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pitch modulation depth</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pitch modulation sensitivity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LFO delay</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LFO speed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amplitude modulation depth</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amplitude modulation sensitivity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&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;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Op4 Feedback</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Feedback level of the operator 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Op &amp;1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scaling 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LS1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RS1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rate Scaling</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Attack Rate of the operator 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Level Scaling</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amplitude Envelope 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RR1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D1R1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D1L1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D2R1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Release Rate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message utf8="true">
-        <source>2° Decay Rate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message utf8="true">
-        <source>1° Decay Level</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message utf8="true">
-        <source>1° Decay Rate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Attack Rate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AR1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Detune, OSCWave, EGShift 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DET1</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Громкость</translation>
     </message>
     <message>
         <source>Detune</source>
-        <translation type="unfinished">Расстройка</translation>
-    </message>
-    <message>
-        <source>EG Shift</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>96dB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>48dB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>24dB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>12dB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wave form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>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;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sensitivity 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>KVS1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amplitude Modulation Enable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AME1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Keyboard Velocity Sensitivity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key Velocity Sensitivity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EBS1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EG Bias Sensitivity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Eg Bias Sensitivity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Frequency 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Coarse 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine Ratio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Freq 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fixed Frequency</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggle Fix Frequency</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>FIX</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OUT 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Output Volume</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Op &amp;2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amplitude Envelope 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D1R2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D1L2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D2R2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RR2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AR2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Frequency 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Coarse 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Freq 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scaling 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LS2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RS2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OUT 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Detune, OSCWave, EGShift 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DET2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sensitivity 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EBS2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>KVS2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AME2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Op &amp;3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amplitude Envelope 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D1R3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D1L3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D2R3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RR3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AR3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scaling 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LS3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RS3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OUT 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Frequency 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Coarse 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Freq 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Detune, OSCWave, EGShift 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DET3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sensitivity 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EBS3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>KVS3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AME3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Op &amp;4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>amplitude Envelope 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AR4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D1R4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D1L4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D2R4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RR4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Frequency 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Coarse 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Freq 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scaling 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LS4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RS4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OUT 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Detune, OSCWave, EGShift 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DET4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sensitivity 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EBS4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>KVS4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AME4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Func</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay Pan Depth</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay Pan LFO Freq</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay Ch Send Level </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Channel Chorus</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay Feedback</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay On/Off, Return Level</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Расстройка</translation>
     </message>
     <message>
         <source>On</source>
-        <translation type="unfinished">Вкл</translation>
-    </message>
-    <message>
-        <source>Delay Beat Ratio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay BPM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Foot Control</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Вкл</translation>
     </message>
     <message>
         <source>Pitch</source>
-        <translation type="unfinished">Высота тона</translation>
-    </message>
-    <message>
-        <source>Amplitude</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Modulation Wheel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Breath Control</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pitch Bias</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Envelope Bias</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Высота тона</translation>
     </message>
     <message>
         <source>After Touch</source>
-        <translation type="unfinished">Посленажатие</translation>
-    </message>
-    <message>
-        <source>Phony Mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Potamento</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Portamento Mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>FINGER</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>FULL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PT</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Portamento Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;horus</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Chorus Parameters</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Channel send level</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>On/Off and Return level</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select LADSPA plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Reverb</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reverb Parameters</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Посленажатие</translation>
     </message>
     <message>
         <source>&amp;Config</source>
-        <translation type="unfinished">&amp;Настроить</translation>
-    </message>
-    <message>
-        <source>Font Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Quality</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>High</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Middle</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ultra low</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&amp;Настроить</translation>
     </message>
     <message>
         <source>Filter</source>
-        <translation type="unfinished">Фильтр</translation>
-    </message>
-    <message>
-        <source>Save Mode (into the song)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save only the used presets</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save the entire set</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save the configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configuration File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Load...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save as default</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Фильтр</translation>
     </message>
     <message>
         <source>Colors</source>
-        <translation type="unfinished">Цвета</translation>
+        <translation type="obsolete">Цвета</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation type="unfinished">Текст</translation>
-    </message>
-    <message>
-        <source>Background</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Background</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Red</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Blue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Green</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set Path</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Image in the background :</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Browse...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Load the set at the initialization :</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set Brightness, Detune, Attack and Release of the current channel to default</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Res. Ctrl</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut all notes off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Panic!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Number of Voices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Number of voices</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Текст</translation>
     </message>
     <message>
         <source>Enable</source>
-        <translation type="unfinished">Разрешить</translation>
+        <translation type="obsolete">Разрешить</translation>
     </message>
     <message>
         <source>Channel</source>
-        <translation type="unfinished">Канал</translation>
+        <translation type="obsolete">Канал</translation>
     </message>
     <message>
         <source>Vol</source>
-        <translation type="unfinished">Громк</translation>
-    </message>
-    <message>
-        <source>Channel Ctrl</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Громк</translation>
     </message>
     <message>
         <source>Release</source>
-        <translation type="unfinished">Послезвучие</translation>
+        <translation type="obsolete">Послезвучие</translation>
     </message>
     <message>
         <source>Attack</source>
-        <translation type="unfinished">Атака</translation>
-    </message>
-    <message>
-        <source>Brightness</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Modulation</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Атака</translation>
     </message>
     <message>
         <source>Pan</source>
-        <translation type="unfinished">Пан</translation>
+        <translation type="obsolete">Пан</translation>
     </message>
 </context>
 <context>
     <name>DidYouKnow</name>
     <message>
+        <location filename="../../muse/widgets/didyouknow.ui" line="+14"/>
         <source>Did you know?</source>
         <translation>Знаете ли вы?</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Don&apos;t show on startup</source>
         <translation>Не показывать при старте программы</translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Next tip</source>
         <translation>Следующий совет</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
@@ -2627,130 +2376,162 @@ 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="+167"/>
         <source>&amp;File</source>
         <translation>&amp;Файл</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Load Map</source>
         <translation>Загрузить карту</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Save Map</source>
         <translation>Сохранить карту</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>&amp;Edit</source>
         <translation>&amp;Правка</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Cut</source>
         <translation>Вырезать</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Copy</source>
         <translation>Копировать</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Paste</source>
         <translation>Вставить</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Delete Events</source>
         <translation>Удалить события</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>Select All</source>
         <translation>Выделить всё</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Select None</source>
         <translation>Убрать выделение</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Invert</source>
         <translation>Инвертировать</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Inside Loop</source>
         <translation>Внутри цикла</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Outside Loop</source>
         <translation>Вне цикла</translation>
     </message>
     <message>
+        <location line="-7"/>
         <source>&amp;Select</source>
         <translation>&amp;Выделение</translation>
     </message>
     <message>
+        <location line="+76"/>
         <source>Load Drummap</source>
         <translation>Загрузить драм-карту</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Store Drummap</source>
         <translation>Сохранить драм-карту</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Step Record</source>
         <translation>Пошаговая запись</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Midi Input</source>
         <translation>MIDI-вход</translation>
     </message>
     <message>
+        <location line="+50"/>
         <source>ctrl</source>
         <translation>ctrl</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Add Controller View</source>
         <translation>Показать контроллеры</translation>
     </message>
     <message>
+        <location line="+57"/>
         <source>M</source>
         <translation>M</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Sound</source>
         <translation>Звук</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>QNT</source>
         <translation>КВНТ</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>E-Note</source>
         <translation>E-Нота</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Len</source>
         <translation>Дл</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>A-Note</source>
         <translation>A-Нота</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Ch</source>
         <translation>Кан</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Port</source>
         <translation>Порт</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>LV1</source>
         <translation>LV1</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>LV2</source>
         <translation>LV2</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>LV3</source>
         <translation>LV3</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>LV4</source>
         <translation>LV4</translation>
     </message>
@@ -2759,118 +2540,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
         <translation type="obsolete">драм-карты</translation>
     </message>
     <message>
+        <location line="+383"/>
         <source>Muse: Load Drum Map</source>
         <translation>Muse: Загрузить драм-карту</translation>
     </message>
     <message>
+        <location line="+53"/>
         <source>MusE: Store Drum Map</source>
         <translation>Muse: Сохранить драм-карту</translation>
     </message>
     <message>
+        <location line="-625"/>
         <source>Set Fixed Length</source>
         <translation>Установить фикс. длительность</translation>
     </message>
     <message>
+        <location line="-6"/>
         <source>&amp;Functions</source>
         <translation>&amp;Функции</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Modify Velocity</source>
         <translation>Изменить скорость нажатия</translation>
     </message>
     <message>
+        <location line="-142"/>
+        <location line="+21"/>
         <source>mute instrument</source>
         <translation>заглушить инструмент</translation>
     </message>
     <message>
+        <location line="-20"/>
+        <location line="+21"/>
         <source>sound name</source>
         <translation>название звука</translation>
     </message>
     <message>
+        <location line="-20"/>
+        <location line="+21"/>
         <source>volume percent</source>
         <translation>громкость в процентах</translation>
     </message>
     <message>
+        <location line="-20"/>
+        <location line="+21"/>
         <source>quantisation</source>
         <translation>квантование</translation>
     </message>
     <message>
+        <location line="-20"/>
+        <location line="+21"/>
         <source>this input note triggers the sound</source>
         <translation>эта входящая нота включает звук</translation>
     </message>
     <message>
+        <location line="-20"/>
+        <location line="+21"/>
         <source>note length</source>
         <translation>длина ноты</translation>
     </message>
     <message>
+        <location line="-20"/>
+        <location line="+21"/>
         <source>this is the note which is played</source>
         <translation>это нота, которая воспроизводится</translation>
     </message>
     <message>
+        <location line="-20"/>
         <source>output channel (hold ctl to affect all rows)</source>
         <translation>канал выхода (удерживайте ctrl, чтобы воздействовать на все ряды)</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <location line="+21"/>
         <source>output port</source>
         <translation>порт выхода</translation>
     </message>
     <message>
+        <location line="-20"/>
+        <location line="+21"/>
         <source>shift + control key: draw velocity level 1</source>
         <translation>клавиши shift+control: рисовать уровень 1 скорости нажатия</translation>
     </message>
     <message>
+        <location line="-20"/>
+        <location line="+21"/>
         <source>control key: draw velocity level 2</source>
         <translation>Клавиша control: рисовать уровень 2 скорости нажатия</translation>
     </message>
     <message>
+        <location line="-20"/>
+        <location line="+21"/>
         <source>shift key: draw velocity level 3</source>
         <translation>Клавиша shift: рисовать уровень 3 скорости нажатия</translation>
     </message>
     <message>
+        <location line="-20"/>
+        <location line="+21"/>
         <source>draw velocity level 4</source>
         <translation>рисовать уровень 4 скорости нажатия</translation>
     </message>
     <message>
+        <location line="-5"/>
         <source>output channel (ctl: affect all rows)</source>
         <translation>канал выхода (ctrl: действует на все ряды)</translation>
     </message>
     <message>
+        <location line="+46"/>
         <source>Reset GM Map</source>
         <translation>Настроить карту GM по умолчанию </translation>
     </message>
     <message>
+        <location line="+41"/>
         <source>Previous Part</source>
         <translation>Предыдущая партия</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Next Part</source>
         <translation>Следующая партия</translation>
     </message>
     <message>
+        <location line="+23"/>
+        <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>&amp;Плагины</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Drum tools</source>
         <translation>Инструменты ударных</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>
     </message>
     <message>
+        <location line="+4"/>
         <source>transport</source>
         <translation>транспорт</translation>
     </message>
     <message>
+        <location line="+84"/>
         <source>Vol</source>
         <translation>Громк</translation>
     </message>
     <message>
+        <location line="+471"/>
         <source>Drum map</source>
         <translation>Карта ударных</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Reset the drum map with GM defaults?</source>
         <translation>Сброс карты ударных на GM по умолчанию?</translation>
     </message>
@@ -2878,14 +2740,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
 <context>
     <name>EditCAfterDialog</name>
     <message>
+        <location filename="../../muse/liste/editevent.cpp" line="+428"/>
         <source>MusE: Enter Channel Aftertouch</source>
         <translation>MusE: Ввести Channel Aftertouch</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Time Position</source>
         <translation>Позиция по времени</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Pressure</source>
         <translation>Давление</translation>
     </message>
@@ -2924,58 +2789,73 @@ 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>EditCtrlBase</name>
     <message>
+        <location filename="../../muse/liste/editctrlbase.ui" line="+14"/>
         <source>MusE: Edit Controller Event</source>
         <translation>MusE: Редактировать контроллер</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Time Position</source>
         <translation>Позиция по времени</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Available Controller:</source>
         <translation>Доступный контроллер:</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Create New Controller</source>
         <translation>Создать новый контроллер</translation>
     </message>
     <message>
+        <location line="+486"/>
         <source>textLabel3</source>
         <translation>текстМетка3?</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Value</source>
         <translation>Значение</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Controller</source>
         <translation>Контроллер</translation>
     </message>
     <message>
+        <location line="+45"/>
         <source>H-Bank</source>
         <translation>H-банк</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>L-Bank</source>
         <translation>L-банк</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Program</source>
         <translation>Программа</translation>
     </message>
     <message>
+        <location line="+10"/>
+        <location line="+16"/>
         <source>off</source>
         <translation>выкл</translation>
     </message>
     <message>
+        <location line="+42"/>
         <source>pushButton4</source>
         <translation>кнопка для нажатия4?</translation>
     </message>
     <message>
+        <location line="+35"/>
         <source>&amp;OK</source>
         <translation>&amp;ОК</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>&amp;Cancel</source>
         <translation>О&amp;тмена</translation>
     </message>
@@ -2983,10 +2863,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>
     </message>
     <message>
+        <location line="+2"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
@@ -2994,46 +2876,57 @@ 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>EditGainBase</name>
     <message>
+        <location filename="../../muse/waveedit/editgainbase.ui" line="+14"/>
         <source>MusE: Modify gain</source>
         <translation>MusE: изменить усиление</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Gain</source>
         <translation>Усиление</translation>
     </message>
     <message>
+        <location line="+51"/>
         <source>200%</source>
         <translation>200%</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>100%</source>
         <translation>100%</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>0%</source>
         <translation>0%</translation>
     </message>
     <message>
+        <location line="+51"/>
         <source>&amp;Reset</source>
         <translation>&amp;Сброс</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+R</source>
         <translation>Alt+R</translation>
     </message>
     <message>
+        <location line="+39"/>
         <source>&amp;Apply</source>
         <translation>&amp;Применить</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+A</source>
         <translation>Alt+A</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Отмена</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+C</source>
         <translation>Alt+C</translation>
     </message>
@@ -3041,23 +2934,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
 <context>
     <name>EditInstrument</name>
     <message>
+        <location filename="../../muse/instruments/editinstrument.cpp" line="+296"/>
+        <location line="+34"/>
         <source>MusE: Create file failed</source>
         <translation>MusE: Не удалось создать файл</translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>MusE: Write File failed</source>
         <translation>MusE: Не удалось записать файл</translation>
     </message>
     <message>
+        <location line="+32"/>
+        <location line="+12"/>
+        <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
 </source>
         <translation>Пользовательский инструментальный каталог</translation>
     </message>
     <message>
+        <location line="-292"/>
+        <location line="+292"/>
         <source>
 does not exist yet. Create it now?
 </source>
@@ -3065,35 +2969,52 @@ does not exist yet. Create it now?
     </message>
     <message>
         <source>(You can override with the environment variable MUSEINSTRUMENTS)</source>
-        <translation>(Вы можете переписать с переменной окружения MUSEINSTRUMENTS)</translation>
+        <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>
     </message>
     <message>
+        <location line="-244"/>
+        <location line="+266"/>
         <source>MusE: Save Instrument Definition</source>
         <translation>MusE: Сохранить Определение Инструмента</translation>
     </message>
     <message>
+        <location line="-265"/>
+        <location line="+266"/>
         <source>Instrument Definition (*.idf)</source>
         <translation>Определение инструмента (*.idf)</translation>
     </message>
     <message>
+        <location line="-154"/>
+        <location line="+29"/>
         <source>MusE: Save instrument as</source>
         <translation>MusE: Сохранить инструмент как</translation>
     </message>
     <message>
+        <location line="-29"/>
         <source>Enter a new unique instrument name:</source>
         <translation>Введите неповторяющееся имя инструмента:</translation>
     </message>
     <message>
+        <location line="+30"/>
         <source>The user instrument:
 </source>
         <translation>Инструмент пользователя:</translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>
 already exists. This will overwrite its .idf instrument file.
 Are you sure?</source>
@@ -3102,74 +3023,97 @@ Are you sure?</source>
 Вы уверены?</translation>
     </message>
     <message>
+        <location line="+525"/>
         <source>MusE: Bad instrument name</source>
         <translation>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>
     </message>
     <message>
+        <location line="+136"/>
         <source>MusE: Bad patch name</source>
         <translation>MusE: Неверное имя патча</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Please choose a unique patch name</source>
         <translation>Пожалуйста, выберите неповторяющееся имя патча</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>MusE: Bad patchgroup name</source>
         <translation>MusE: Неверное имя группы</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Please choose a unique patchgroup name</source>
         <translation>Пожалуйста, выберите неповторяющееся имя группы</translation>
     </message>
     <message>
+        <location line="+526"/>
         <source>MusE: Bad controller name</source>
         <translation>MusE: Неверное имя контроллера</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Please choose a unique controller name</source>
         <translation>Пожалуйста, выберите неповторяющееся имя для контроллера</translation>
     </message>
     <message>
+        <location line="+1287"/>
+        <location line="+12"/>
         <source>MusE: Cannot add common controller</source>
         <translation>MusE: Невозможно добавить обычный контроллер</translation>
     </message>
     <message>
+        <location line="-11"/>
         <source>A controller named </source>
         <translation>Контроллер названый </translation>
     </message>
     <message>
+        <location line="+0"/>
+        <location line="+12"/>
         <source> already exists.</source>
         <translation> уже существует.</translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>A controller number </source>
         <translation>Номер контроллера </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>Текущий Инструмент содержит несохраненные данные
 Сохранить этот Инструмент?</translation>
     </message>
     <message>
+        <location line="-3"/>
+        <location line="+5"/>
         <source>&amp;Save</source>
         <translation>&amp;Сохранить</translation>
     </message>
     <message>
+        <location line="-5"/>
+        <location line="+5"/>
         <source>&amp;Nosave</source>
         <translation>&amp;Не сохранять</translation>
     </message>
     <message>
+        <location line="-5"/>
         <source>&amp;Abort</source>
         <translation>&amp;Отмена</translation>
     </message>
@@ -3177,6 +3121,7 @@ Save Current Instrument?</source>
 <context>
     <name>EditInstrumentBase</name>
     <message>
+        <location filename="../../muse/instruments/editinstrumentbase.ui" line="+20"/>
         <source>MusE: Instrument Editor</source>
         <translation>Редактор инструментов</translation>
     </message>
@@ -3189,14 +3134,17 @@ Save Current Instrument?</source>
         <translation type="obsolete">Название патча</translation>
     </message>
     <message>
+        <location line="+119"/>
         <source>High Bank:</source>
         <translation>H-банк:</translation>
     </message>
     <message>
+        <location line="+52"/>
         <source>Low Bank:</source>
         <translation>L-банк:</translation>
     </message>
     <message>
+        <location line="+52"/>
         <source>Program:</source>
         <translation>Программа:</translation>
     </message>
@@ -3214,10 +3162,16 @@ Save Current Instrument?</source>
         <translation type="obsolete">Патч/Группа</translation>
     </message>
     <message>
+        <location line="+141"/>
+        <location line="+747"/>
+        <location line="+201"/>
         <source>&amp;Delete</source>
         <translation>&amp;Удалить</translation>
     </message>
     <message>
+        <location line="-945"/>
+        <location line="+747"/>
+        <location line="+201"/>
         <source>Alt+D</source>
         <translation>Alt+D</translation>
     </message>
@@ -3234,18 +3188,22 @@ Save Current Instrument?</source>
         <translation type="obsolete">Новая Группа</translation>
     </message>
     <message>
+        <location line="-1035"/>
         <source>Drum</source>
         <translation>Ударные</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>GM</source>
         <translation>GM</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>GS</source>
         <translation>GS</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>XG</source>
         <translation>XG</translation>
     </message>
@@ -3258,6 +3216,7 @@ Save Current Instrument?</source>
         <translation type="obsolete">Предустановленный контроллер:</translation>
     </message>
     <message>
+        <location line="+136"/>
         <source>This is a list of commonly used midi controllers.
 Note that in MusE pitch and program changes are
 handled like normal controllers.</source>
@@ -3267,6 +3226,8 @@ handled like normal controllers.</source>
  </translation>
     </message>
     <message>
+        <location line="-368"/>
+        <location line="+441"/>
         <source>Properties</source>
         <translation>Свойства</translation>
     </message>
@@ -3279,30 +3240,38 @@ handled like normal controllers.</source>
         <translation type="obsolete">Тип</translation>
     </message>
     <message>
+        <location line="+49"/>
         <source>Control7</source>
         <translation>Контрл7</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Control14</source>
         <translation>Контрл14</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>RPN</source>
         <translation>RPN</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>NRPN</source>
         <translation>NRPN</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Pitch</source>
         <translation>Высота тона</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Program</source>
         <translation>Программа</translation>
     </message>
     <message>
+        <location line="-118"/>
+        <location line="+142"/>
         <source>H-Ctrl</source>
         <translation>H-Ктрл</translation>
     </message>
@@ -3311,6 +3280,8 @@ handled like normal controllers.</source>
         <translation type="obsolete">Старший байт midi-контроллера</translation>
     </message>
     <message>
+        <location line="-137"/>
+        <location line="+191"/>
         <source>L-Ctrl</source>
         <translation>L-Ктрл</translation>
     </message>
@@ -3323,10 +3294,12 @@ handled like normal controllers.</source>
         <translation type="obsolete">Диапазон</translation>
     </message>
     <message>
+        <location line="+79"/>
         <source>Min</source>
         <translation>Миним</translation>
     </message>
     <message>
+        <location line="+72"/>
         <source>Max</source>
         <translation>Макс</translation>
     </message>
@@ -3335,10 +3308,12 @@ handled like normal controllers.</source>
         <translation type="obsolete">По умолчанию</translation>
     </message>
     <message>
+        <location line="-357"/>
         <source>Name                  </source>
         <translation>Имя                  </translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Type       </source>
         <translation>Тип       </translation>
     </message>
@@ -3371,110 +3346,140 @@ handled like normal controllers.</source>
         <translation type="obsolete">Паника</translation>
     </message>
     <message>
+        <location line="+802"/>
         <source>Hex Entry:</source>
         <translation>Шестнадцатиричный Ввод:</translation>
     </message>
     <message>
+        <location line="+90"/>
         <source>&amp;File</source>
         <translation>&amp;Файл</translation>
     </message>
     <message>
+        <location line="-27"/>
         <source>Tools</source>
         <translation>Инструменты</translation>
     </message>
     <message>
+        <location line="+49"/>
         <source>New</source>
         <translation>Новый</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;New</source>
         <translation>&amp;Новый</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>Open</source>
         <translation>Открыть</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Open...</source>
         <translation>&amp;Открыть...</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>Save</source>
         <translation>Сохранить</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Save</source>
         <translation>&amp;Сохранить</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Save As</source>
         <translation>Сохранить как</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>Save &amp;As...</source>
         <translation>Сохранить &amp;как...</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Exit</source>
         <translation>Выйти</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>E&amp;xit</source>
         <translation>В&amp;ыйти</translation>
     </message>
     <message>
+        <location line="-1448"/>
         <source>Instrument Name:</source>
         <translation>Имя Инструмента:</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Selected instrument name.</source>
         <translation>Имя выбранного инструмента.</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>List of defined instruments.</source>
         <translation>Список назначенных инструментов.</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Pa&amp;tches</source>
         <translation>Па&amp;тчи</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>List of groups and patches.</source>
         <translation>Список групп и патчей.</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Group/Patch</source>
         <translation>Группа/Патч</translation>
     </message>
     <message>
+        <location line="+15"/>
+        <location line="+443"/>
+        <location line="+742"/>
         <source>Name:</source>
         <translation>Имя:</translation>
     </message>
     <message>
+        <location line="-1175"/>
+        <location line="+3"/>
         <source>Group or patch name</source>
         <translation>Группа или имя патча</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Patch high bank number</source>
         <translation>Номер H-банка патча</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Patch high bank number. --- means don&apos;t care.</source>
         <translation>Номер H-банка патча. --- не важно какой.</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>---</source>
         <comment>dont care</comment>
         <translation>---
@@ -3482,138 +3487,175 @@ handled like normal controllers.</source>
 всё равно</translation>
     </message>
     <message>
+        <location line="+46"/>
         <source>Patch low bank number</source>
         <translation>Номер L-банка патча</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Patch low bank number. --- means don&apos;t care.</source>
         <translation>Номер L-банка патча. --- не важно какой.</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>---</source>
         <translation>---</translation>
     </message>
     <message>
+        <location line="+46"/>
+        <location line="+3"/>
         <source>Patch program number</source>
         <translation>Програмный номер патча</translation>
     </message>
     <message>
+        <location line="+36"/>
         <source>Drum patch</source>
         <translation>Патч ударных</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>If set, the patch is available only for drum channels.</source>
         <translation>Если установлено, то этот патч может использоваться только в каналах ударных.</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>GM patch</source>
         <translation>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>Если установлено, то этот патч может использоваться только в типах midi-проектов &quot;GM&quot; или &quot;НЕТ&quot;.</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>GS patch</source>
         <translation>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>Если установлено, то этот патч может использоваться только в типах midi-проектов &quot;GS&quot; или &quot;НЕТ&quot;.</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>XG patch</source>
         <translation>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>Если установлено, то этот патч может использоваться только в типах midi-проектов &quot;XG&quot; или &quot;НЕТ&quot;.</translation>
     </message>
     <message>
+        <location line="+39"/>
         <source>Delete group or patch</source>
         <translation>Удалить группу или патч</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>New patch</source>
         <translation>Новый патч</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>New &amp;Patch</source>
         <translation>Новый &amp;Патч</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+P</source>
         <translation>Alt+P</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>New group</source>
         <translation>Новая группа</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>New &amp;Group</source>
         <translation>Новая &amp;Группа</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+G</source>
         <translation>Alt+G</translation>
     </message>
     <message>
+        <location line="+30"/>
         <source>Contro&amp;ller</source>
         <translation>Контро&amp;ллер</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Common:</source>
         <translation>Обычный:</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>List of defined controllers</source>
         <translation>Список назначенных контроллеров</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>List of defined controllers.</source>
         <translation>Список назначенных контроллеров.</translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>Min  </source>
         <translation>Мин  </translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Max  </source>
         <translation>Макс  </translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Def  </source>
         <translation>Def  </translation>
     </message>
     <message>
+        <location line="+35"/>
         <source>Midi controller name</source>
         <translation>Имя midi-контроллера</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Type:</source>
         <translation>Тип:</translation>
     </message>
     <message>
+        <location line="+10"/>
+        <location line="+3"/>
         <source>Midi controller type</source>
         <translation>Тип midi-контроллера</translation>
     </message>
     <message>
+        <location line="+24"/>
         <source>RPN14</source>
         <translation>RPN14</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>NRPN14</source>
         <translation>NRPN14</translation>
     </message>
     <message>
+        <location line="+53"/>
+        <location line="+3"/>
         <source>Midi controller number high byte</source>
         <translation>Старший байт midi-контроллера</translation>
     </message>
     <message>
+        <location line="+51"/>
         <source>Midi controller number low byte (* means drum controller)</source>
         <translation>Младший байт midi-контроллера (* означает контроллер ударных)</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Midi controller number low byte. 
 If low byte is * then the controller is a 
  &apos;drum controller&apos;. For drum tracks and 
@@ -3634,6 +3676,7 @@ GS/XG типов проектов и инструментов.
 инструментов.</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>*</source>
         <comment>wild card</comment>
         <translation>*
@@ -3641,14 +3684,17 @@ GS/XG типов проектов и инструментов.
 универсальный шаблон</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Range:</source>
         <translation>Диапазон:</translation>
     </message>
     <message>
+        <location line="+48"/>
         <source>Minimum value. If negative, auto-translate.</source>
         <translation>Минимальное значение. Если отрицательное, то авто-перевод.</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Minimum value. If the minimum value 
  is negative, the range will automatically
  be translated to a positive range. 
@@ -3685,38 +3731,52 @@ True range: Min: -8192 Max: 8191 (bias 0)</source>
 Реальный диапазон: Мин: -8192 Макс:8191 (смещение = 0)</translation>
     </message>
     <message>
+        <location line="+69"/>
+        <location line="+3"/>
         <source>Maximum value</source>
         <translation>Максимальное значение</translation>
     </message>
     <message>
+        <location line="+36"/>
         <source>Default:</source>
         <translation>По умолчанию:</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>L-Bank</source>
         <translation>L-банк</translation>
     </message>
     <message>
+        <location line="+10"/>
+        <location line="+16"/>
+        <location line="+26"/>
+        <location line="+198"/>
+        <location line="+53"/>
         <source>off</source>
         <translation>выкл</translation>
     </message>
     <message>
+        <location line="-261"/>
         <source>Progr.</source>
         <translation>Прогр.</translation>
     </message>
     <message>
+        <location line="+35"/>
         <source>???</source>
         <translation>???</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>H-Bank</source>
         <translation>H-банк</translation>
     </message>
     <message>
+        <location line="+44"/>
         <source>Default value. Off: No default.</source>
         <translation>Значение по умолчанию. Выкл: Нет значения по умолчанию.</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Default (initial) value. Off means no default.
 
 If a default value is chosen, the value will be sent
@@ -3749,47 +3809,59 @@ midi-сообщений о контроллерах.
 или редакторе инструментов).</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>off</source>
         <comment>dont care</comment>
         <translation>выкл</translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Add common controller</source>
         <translation>Добавить обычный контроллер</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>&amp;Add</source>
         <translation>&amp;Добавить</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+A</source>
         <translation>Alt+A</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Delete controller</source>
         <translation>Удалить контроллер</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Create a new controller</source>
         <translation>Добавить новый контроллер</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>New &amp;Controller</source>
         <translation>Новый &amp;Контроллер</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+C</source>
         <translation>Alt+C</translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Null Param Hi:</source>
         <translation>Нулевой Парам Ст:</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Null parameter number High byte</source>
         <translation>Старший байт нулевого параметра</translation>
     </message>
     <message>
+        <location line="+3"/>
+        <location line="+53"/>
         <source>If set, these &apos;null&apos; parameter numbers will 
  be sent after each RPN/NRPN event. 
 This prevents subsequent &apos;data&apos; events
@@ -3803,38 +3875,49 @@ Typically, set to 127/127, or an unused
 Обычно, устанавливается 127/127, или &quot;не использовать&quot;.</translation>
     </message>
     <message>
+        <location line="-13"/>
         <source> Lo:</source>
         <translation>  Мл:</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Null parameter number Low byte</source>
         <translation>Младший байт нулевого параметра</translation>
     </message>
     <message>
+        <location line="+34"/>
         <source>S&amp;ysEx</source>
         <translation>S&amp;ysEx</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>SysEx List:</source>
         <translation>Список SysEx:</translation>
     </message>
     <message>
+        <location line="+62"/>
         <source>New SysE&amp;x</source>
         <translation>Новый SysE&amp;x</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+X</source>
         <translation>Alt+X</translation>
     </message>
     <message>
+        <location line="+73"/>
         <source>&amp;Help</source>
         <translation>&amp;Помощь</translation>
     </message>
     <message>
+        <location line="+84"/>
+        <location line="+3"/>
         <source>new item</source>
         <translation>новый пункт</translation>
     </message>
     <message>
+        <location line="+8"/>
+        <location line="+3"/>
         <source>What&apos;s this?</source>
         <translation>Что это?</translation>
     </message>
@@ -3842,18 +3925,22 @@ 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>
     </message>
     <message>
+        <location line="+2"/>
         <source>Time Position</source>
         <translation>Позиция по времени</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Meta Type</source>
         <translation>Метатип</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Enter Hex</source>
         <translation>Ввести Hex</translation>
     </message>
@@ -3892,34 +3979,42 @@ Typically, set to 127/127, or an unused
 <context>
     <name>EditNoteDialogBase</name>
     <message>
+        <location filename="../../muse/widgets/editnotedialogbase.ui" line="+14"/>
         <source>MusE: Enter Note</source>
         <translation>MusE: Ввести ноту</translation>
     </message>
     <message>
+        <location line="+39"/>
         <source>OK</source>
         <translation>ОК</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Length:</source>
         <translation>Длина:</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Time Position:</source>
         <translation>Позиция по времени:</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Pitch:</source>
         <translation>Высота тона:</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Velocity On:</source>
         <translation>Скорость наж:</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Velocity Off:</source>
         <translation>Скорость снятия:</translation>
     </message>
@@ -3927,18 +4022,22 @@ 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>
     </message>
     <message>
+        <location line="+2"/>
         <source>Time Position</source>
         <translation>Позиция по времени</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Pitch</source>
         <translation>Высота тона</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Pressure</source>
         <translation>Давление</translation>
     </message>
@@ -3946,22 +4045,27 @@ Typically, set to 127/127, or an unused
 <context>
     <name>EditSysexDialogBase</name>
     <message>
+        <location filename="../../muse/widgets/editsysexdialogbase.ui" line="+14"/>
         <source>MusE: Enter SysEx</source>
         <translation>MusE: Ввести SysEx</translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>TimePosition:</source>
         <translation>Время:</translation>
     </message>
     <message>
+        <location line="+48"/>
         <source>Comment:</source>
         <translation>Комментарий:</translation>
     </message>
     <message>
+        <location line="+37"/>
         <source>OK</source>
         <translation>ОК</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
@@ -3969,6 +4073,7 @@ Typically, set to 127/127, or an unused
 <context>
     <name>EditToolBar</name>
     <message>
+        <location filename="../../muse/widgets/tools.cpp" line="+17"/>
         <source>Edit Tools</source>
         <translation>Инструменты редактирования</translation>
     </message>
@@ -3976,42 +4081,52 @@ Typically, set to 127/127, or an unused
 <context>
     <name>EffectRack</name>
     <message>
+        <location filename="../../muse/mixer/rack.cpp" line="+102"/>
         <source>effect rack</source>
         <translation>рэк эффектов</translation>
     </message>
     <message>
+        <location line="+84"/>
         <source>move up</source>
         <translation>сдвинуть выше</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>move down</source>
         <translation>сдвинуть ниже</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>remove</source>
         <translation>удалить</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>bypass</source>
         <translation>обойти</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>show gui</source>
         <translation>показать ГИП</translation>
     </message>
     <message>
+        <location line="-6"/>
         <source>new</source>
         <translation>новый</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>change</source>
         <translation>изменить</translation>
     </message>
     <message>
+        <location line="+288"/>
         <source>Replace effect</source>
         <translation>Заменить эффект</translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>Do you really want to replace the effect %1?</source>
         <translation>Вы действительно хотите заменить эффект %1?</translation>
     </message>
@@ -4024,14 +4139,17 @@ Typically, set to 127/127, or an unused
         <translation type="obsolete">&amp;Нет</translation>
     </message>
     <message>
+        <location line="-282"/>
         <source>show native gui</source>
         <translation>показать ГИП</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>save preset</source>
         <translation>сохранить пресет</translation>
     </message>
     <message>
+        <location line="+138"/>
         <source>MusE: Save Preset</source>
         <translation>MusE: Сохранить Пресет</translation>
     </message>
@@ -4039,6 +4157,7 @@ Typically, set to 127/127, or an unused
 <context>
     <name>FLUIDGui</name>
     <message>
+        <location filename="../../synti/fluid/fluidgui.cpp" line="+55"/>
         <source>FLUID: open Soundfile</source>
         <translation>FLUID: открыть звуковой файл</translation>
     </message>
@@ -4046,14 +4165,17 @@ Typically, set to 127/127, or an unused
 <context>
     <name>FLUIDGuiBase</name>
     <message>
+        <location filename="../../synti/fluid/fluidguibase.ui" line="+14"/>
         <source>Form1</source>
         <translation>Форма1</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Soundfont</source>
         <translation>Soundfont</translation>
     </message>
     <message>
+        <location line="+52"/>
         <source>Load</source>
         <translation>Загрузить</translation>
     </message>
@@ -4061,98 +4183,123 @@ Typically, set to 127/127, or an unused
 <context>
     <name>FLUIDSynthGuiBase</name>
     <message>
+        <location filename="../../synti/fluidsynth/fluidsynthguibase.ui" line="+14"/>
         <source>FLUID Synth</source>
         <translation>FLUID Synth</translation>
     </message>
     <message>
+        <location line="+459"/>
         <source>Gain</source>
         <translation>Усиление</translation>
     </message>
     <message>
+        <location line="-264"/>
+        <location line="+235"/>
         <source>Level</source>
         <translation>Уровень</translation>
     </message>
     <message>
+        <location line="-222"/>
         <source>Width</source>
         <translation>Ширина</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Damping</source>
         <translation>Демпфирование</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Room Size</source>
         <translation>Размер помещения</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Reverb</source>
         <translation>Реверб</translation>
     </message>
     <message>
+        <location line="-217"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
+        <location line="-10"/>
         <source>Load</source>
         <translation>Загрузить</translation>
     </message>
     <message>
+        <location line="+272"/>
         <source>Sine</source>
         <translation>Синусоида</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Triangle</source>
         <translation>Треугольная</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Number</source>
         <translation>Число</translation>
     </message>
     <message>
+        <location line="+35"/>
         <source>Speed</source>
         <translation>Скорость</translation>
     </message>
     <message>
+        <location line="+35"/>
         <source>Depth</source>
         <translation>Глубина</translation>
     </message>
     <message>
+        <location line="+48"/>
         <source>Chorus</source>
         <translation>Хорус</translation>
     </message>
     <message>
+        <location line="-180"/>
         <source>CHANNEL SETUP</source>
         <translation>НАСТРОЙКА КАНАЛА</translation>
     </message>
     <message>
+        <location line="-209"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Fontname</source>
         <translation>Назв. SF-банка </translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Chnl</source>
         <translation>Канал</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Soundfont</source>
         <translation>Банк</translation>
     </message>
     <message>
+        <location line="+427"/>
         <source>LOADED SOUNDFONTS</source>
         <translation>ЗАГРУЖЕННЫЕ БАНКИ</translation>
     </message>
     <message>
+        <location line="-472"/>
         <source>Dump Info</source>
         <translation>Дамп Инфо</translation>
     </message>
     <message>
+        <location line="+50"/>
         <source>Drum Chnl</source>
         <translation>Канал ударных</translation>
     </message>
@@ -4164,15 +4311,18 @@ Typically, set to 127/127, or an unused
         <translation type="obsolete">Форма1</translation>
     </message>
     <message>
+        <location filename="../../muse/widgets/fdialogbuttons.ui" line="+38"/>
         <source>Global</source>
         <translation>Общий</translation>
     </message>
     <message>
+        <location line="+25"/>
         <source>User</source>
         <translation>Пользователь
 </translation>
     </message>
     <message>
+        <location line="+25"/>
         <source>Project</source>
         <translation>Проект</translation>
     </message>
@@ -4187,16 +4337,19 @@ Cofiguration</source>
 Конфигурация</translation>
     </message>
     <message>
+        <location line="+55"/>
         <source>only
 Songdata</source>
         <translation>Только
 Данные проекта</translation>
     </message>
     <message>
+        <location line="-129"/>
         <source>fdialogbuttons</source>
         <translation>КнопкиДиалогаФайлов</translation>
     </message>
     <message>
+        <location line="+121"/>
         <source>Songdata +
 Configuration</source>
         <translation>ДанныеПроекта+
@@ -4206,6 +4359,7 @@ Configuration</source>
 <context>
     <name>FluidSynthGui</name>
     <message>
+        <location filename="../../synti/fluidsynth/fluidsynthgui.cpp" line="+165"/>
         <source>Choose soundfont</source>
         <translation>Выберите soundfont</translation>
     </message>
@@ -4221,84 +4375,117 @@ Configuration</source>
     <name>GateTimeBase</name>
     <message>
         <source>MusE: Modify Gate Time</source>
-        <translation>MusE: Изменить время звучания</translation>
+        <translation type="obsolete">MusE: Изменить время звучания</translation>
     </message>
     <message>
         <source>Range</source>
-        <translation>Диапазон</translation>
+        <translation type="obsolete">Диапазон</translation>
     </message>
     <message>
         <source>All Events</source>
-        <translation>Все события</translation>
+        <translation type="obsolete">Все события</translation>
     </message>
     <message>
         <source>Selected Events</source>
-        <translation>Выбранные события</translation>
+        <translation type="obsolete">Выбранные события</translation>
     </message>
     <message>
         <source>Looped Events</source>
-        <translation>События в цикле</translation>
+        <translation type="obsolete">События в цикле</translation>
     </message>
     <message>
         <source>Selected &amp; Looped</source>
-        <translation>Выбранные и в цикле</translation>
+        <translation type="obsolete">Выбранные и в цикле</translation>
     </message>
     <message>
         <source>Values</source>
-        <translation>Значения</translation>
+        <translation type="obsolete">Значения</translation>
     </message>
     <message>
         <source>Rate:</source>
-        <translation>Величина:</translation>
+        <translation type="obsolete">Величина:</translation>
     </message>
     <message>
         <source>Offset:</source>
-        <translation>Смещение:</translation>
+        <translation type="obsolete">Смещение:</translation>
     </message>
     <message>
         <source>%</source>
-        <translation>%</translation>
+        <translation type="obsolete">%</translation>
     </message>
     <message>
         <source>OK</source>
-        <translation>ОК</translation>
+        <translation type="obsolete">ОК</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Отмена</translation>
+        <translation type="obsolete">Отмена</translation>
+    </message>
+</context>
+<context>
+    <name>GlobalSettingsConfig</name>
+    <message>
+        <location filename="../../muse/widgets/genset.cpp" line="+489"/>
+        <source>Selects instruments directory</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>GlobalSettingsDialogBase</name>
     <message>
+        <location filename="../../muse/widgets/gensetbase.ui" line="+14"/>
         <source>MusE: Global Settings</source>
         <translation>MusE: Общие настройки</translation>
     </message>
     <message>
+        <location line="+1302"/>
+        <source>Use project save dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>Some popup menus stay open (else hold Ctrl)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Allows some popup menus to stay open.
+Otherwise, hold Ctrl to keep them open.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
         <source>&amp;Apply</source>
         <translation>&amp;Применить</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>&amp;Ok</source>
         <translation>&amp;ОК</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Отмена</translation>
     </message>
     <message>
+        <location line="-871"/>
         <source>Audio</source>
         <translation>Аудио</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Mixer</source>
         <translation>Микшер</translation>
     </message>
     <message>
+        <location line="+21"/>
+        <location line="+39"/>
         <source>dB</source>
         <translation>Дб</translation>
     </message>
     <message>
+        <location line="-20"/>
         <source>min. Meter Value</source>
         <translation>мин. значение индикатора</translation>
     </message>
@@ -4307,22 +4494,31 @@ Configuration</source>
         <translation type="obsolete">мин. значение ползунка</translation>
     </message>
     <message>
+        <location line="+406"/>
         <source>Midi</source>
         <translation>Midi</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Ticks</source>
         <translation>Тактовые импульсы (тики)</translation>
     </message>
     <message>
+        <location line="-223"/>
+        <location line="+194"/>
+        <location line="+47"/>
         <source>1024</source>
         <translation>1024</translation>
     </message>
     <message>
+        <location line="-236"/>
+        <location line="+194"/>
+        <location line="+47"/>
         <source>2048</source>
         <translation>2048</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>4096</source>
         <translation>4096</translation>
     </message>
@@ -4331,54 +4527,75 @@ Configuration</source>
         <translation type="obsolete">8172</translation>
     </message>
     <message>
+        <location line="+86"/>
         <source>Displayed Resolution
 (Ticks/Quarternote)</source>
         <translation>Отображаемое разрешение
 (Тиков/на четверть)</translation>
     </message>
     <message>
+        <location line="-48"/>
+        <location line="+63"/>
         <source>48</source>
         <translation>48</translation>
     </message>
     <message>
+        <location line="-58"/>
+        <location line="+63"/>
         <source>96</source>
         <translation>96</translation>
     </message>
     <message>
+        <location line="-58"/>
+        <location line="+63"/>
         <source>192</source>
         <translation>192</translation>
     </message>
     <message>
+        <location line="-58"/>
+        <location line="+63"/>
         <source>384</source>
         <translation>384</translation>
     </message>
     <message>
+        <location line="-58"/>
+        <location line="+63"/>
         <source>768</source>
         <translation>768</translation>
     </message>
     <message>
+        <location line="-58"/>
+        <location line="+63"/>
         <source>1536</source>
         <translation>1536</translation>
     </message>
     <message>
+        <location line="-58"/>
+        <location line="+63"/>
         <source>3072</source>
         <translation>3072</translation>
     </message>
     <message>
+        <location line="-58"/>
+        <location line="+63"/>
         <source>6144</source>
         <translation>6144</translation>
     </message>
     <message>
+        <location line="-58"/>
+        <location line="+63"/>
         <source>12288</source>
         <translation>12288</translation>
     </message>
     <message>
+        <location line="-163"/>
         <source>RTC Resolution
 (Ticks/Sec)</source>
         <translation>RTC-разрешение
 (тиков/в сек)</translation>
     </message>
     <message>
+        <location line="+212"/>
         <source>GUI</source>
         <translation>ГИП</translation>
     </message>
@@ -4387,148 +4604,204 @@ Configuration</source>
         <translation type="obsolete">В чём читать справку:</translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>GUI Refresh Rate</source>
         <translation>Частота обновления ГИП</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>/sec</source>
         <translation>/сек</translation>
     </message>
     <message>
+        <location line="-1224"/>
         <source>Application</source>
         <translation>Приложение</translation>
     </message>
     <message>
+        <location line="+389"/>
         <source>Start Muse</source>
         <translation>Запустить Muse</translation>
     </message>
     <message>
+        <location line="+47"/>
         <source>start with last song</source>
         <translation>запустить с последним проектом</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>start with song</source>
         <translation>запустить с проектом</translation>
     </message>
     <message>
+        <location line="-47"/>
         <source>start song:</source>
         <translation>запустить проект:</translation>
     </message>
     <message>
+        <location line="-403"/>
         <source>Views</source>
         <translation>Виды</translation>
     </message>
     <message>
+        <location line="+6"/>
+        <location line="+47"/>
+        <location line="+37"/>
+        <location line="+144"/>
+        <location line="+56"/>
         <source>y-pos</source>
         <translation>y-поз.</translation>
     </message>
     <message>
+        <location line="-274"/>
+        <location line="+57"/>
+        <location line="+47"/>
+        <location line="+7"/>
         <source>show</source>
         <translation>показать</translation>
     </message>
     <message>
+        <location line="-104"/>
+        <location line="+40"/>
+        <location line="+17"/>
+        <location line="+164"/>
+        <location line="+56"/>
         <source>x-pos</source>
         <translation>x-поз.</translation>
     </message>
     <message>
+        <location line="-267"/>
+        <location line="+77"/>
+        <location line="+104"/>
+        <location line="+56"/>
         <source>height</source>
         <translation>высота</translation>
     </message>
     <message>
+        <location line="-227"/>
+        <location line="+57"/>
+        <location line="+124"/>
+        <location line="+56"/>
         <source>width</source>
         <translation>ширина</translation>
     </message>
     <message>
+        <location line="-108"/>
         <source>Big Time</source>
         <translation>Хронометр</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Arranger</source>
         <translation>Компоновщик</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Transport</source>
         <translation>Транспорт</translation>
     </message>
     <message>
+        <location line="+59"/>
+        <location line="+56"/>
+        <location line="+16"/>
+        <location line="+16"/>
+        <location line="+16"/>
         <source>Cur</source>
         <translation>Тек</translation>
     </message>
     <message>
+        <location line="-107"/>
+        <location line="+56"/>
+        <location line="+16"/>
+        <location line="+16"/>
+        <location line="+16"/>
         <source>set current values</source>
         <translation>установить текущее значение</translation>
     </message>
     <message>
+        <location line="+76"/>
         <source>start with template: default.med</source>
         <translation>начать с шаблона: default.med</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>show splash screen</source>
         <translation>показывать заставку</translation>
     </message>
     <message>
+        <location line="+293"/>
         <source>External Waveditor</source>
         <translation>Внешний аудиоредактор</translation>
     </message>
     <message>
+        <location line="+25"/>
         <source>External Waveditor command</source>
         <translation>Команда вызова внешнего аудиоредактора</translation>
     </message>
     <message>
+        <location line="-644"/>
         <source>Mixer A</source>
         <translation>Микшер А</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Mixer B</source>
         <translation>Микшер В</translation>
     </message>
     <message>
+        <location line="+317"/>
         <source>show &quot;Did you know?&quot; dialog</source>
         <translation>показывать окно &quot;Знаете ли вы?&quot;</translation>
     </message>
     <message>
+        <location line="-55"/>
         <source>Start song</source>
         <translation>Запустить проект</translation>
     </message>
     <message>
+        <location line="+140"/>
         <source>min. Slider Val</source>
         <translation>мин. значение слайдера </translation>
     </message>
     <message>
         <source>Use Jack freewheel mode if possible.
 (Speeds up bounce operations).</source>
-        <translation>Использовать Jack freewheel mode, если возможно.
+        <translation type="obsolete">Использовать Jack freewheel mode, если возможно.
 (Ускоряет операции сведения).</translation>
     </message>
     <message>
+        <location line="+60"/>
         <source>Enable denormal protection</source>
         <translation>Разрешить защиту от нарушений режима</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Enable output limiter</source>
         <translation>Разрешить ограничитель выхода</translation>
     </message>
     <message>
         <source>Enable in-place processing for VST plugins.
 (Requires restart.)</source>
-        <translation>Разрешить быструю обработку для VST-плагинов.
+        <translation type="obsolete">Разрешить быструю обработку для VST-плагинов.
 (Требуется перезагрузка.)</translation>
     </message>
     <message>
         <source>Turn this off if VST Ladspa effect rack plugins do not work or feedback loudly, even if they are supposed to be in-place capable.</source>
-        <translation>Отключите, если VST Ladspa-плагины в рэке эффектов не работают или слишком громко звучат, даже если они, предположительно, могут быть быстро обработаны.</translation>
+        <translation type="obsolete">Отключите, если VST Ladspa-плагины в рэке эффектов не работают или слишком громко звучат, даже если они, предположительно, могут быть быстро обработаны.</translation>
     </message>
     <message>
+        <location line="+200"/>
         <source>Note: External editor opened from the internal editor.</source>
         <translation>Примечание: Внешний редактор открывается из внутреннего редактора.</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Dummy Audio Driver (settings require restart)</source>
         <translation>Фиктивный Аудио Драйвер (требует перезагрузки)</translation>
     </message>
     <message>
         <source>Preferred sample rate</source>
-        <translation>Предпочитаемый sample rate (скорость измерения аудиосэмплов)</translation>
+        <translation type="obsolete">Предпочитаемый sample rate (скорость измерения аудиосэмплов)</translation>
     </message>
     <message>
         <source>Actual rate used depends on limitations of
@@ -4536,170 +4809,325 @@ Configuration</source>
  short periods can be used with high sample rates. 
 Period affects midi playback resolution. 
 Shorter periods are desirable.</source>
-        <translation>Реальный sample rate зависит от ограничений таймера,
+        <translation type="obsolete">Реальный sample rate зависит от ограничений таймера,
 который используется. Если используется таймер с 
 высоким  sample rate, то могут применяться более короткие
 периоды (отсчеты). Периоды (отсчеты) влияют на midi-воспроизведение.
 Желательны более короткие периоды. </translation>
     </message>
     <message>
+        <location line="+31"/>
         <source>Hz</source>
         <translation>Гц</translation>
     </message>
     <message>
         <source>Actual rate used now (dummy or not):</source>
-        <translation>Реальный &quot;sample rate&quot; (фиктивный или нет):</translation>
+        <translation type="obsolete">Реальный &quot;sample rate&quot; (фиктивный или нет):</translation>
     </message>
     <message>
         <source>---</source>
-        <translation>---</translation>
+        <translation type="obsolete">---</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Period size (Frames per period):</source>
         <translation>Размер периода (Фреймов на период):</translation>
     </message>
     <message>
+        <location line="-180"/>
+        <location line="+194"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
+        <location line="-320"/>
+        <source>Try to use Jack Freewheel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Speeds bounce operations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Use Jack Freewheel mode if possible.
+This dramatically speeds bounce operations.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>VST in-place</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Enable VST in-place processing (restart required)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Enable VST in-place processing. Turn this off if 
+ 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>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Minimum control period</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Minimum audio controller process period (samples).
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Minimum audio controller process period (samples).
+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>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>1</source>
+        <translation type="unfinished">1</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>2</source>
+        <translation type="unfinished">2</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>4</source>
+        <translation type="unfinished">4</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>8</source>
+        <translation type="unfinished">8</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+194"/>
         <source>32</source>
         <translation>32</translation>
     </message>
     <message>
+        <location line="-189"/>
+        <location line="+194"/>
         <source>64</source>
         <translation>64</translation>
     </message>
     <message>
+        <location line="-189"/>
+        <location line="+194"/>
         <source>128</source>
         <translation>128</translation>
     </message>
     <message>
+        <location line="-189"/>
+        <location line="+194"/>
         <source>256</source>
         <translation>256</translation>
     </message>
     <message>
+        <location line="-189"/>
+        <location line="+194"/>
         <source>512</source>
         <translation>512</translation>
     </message>
     <message>
+        <location line="-68"/>
+        <source>Sample rate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>Shorter periods give better midi playback resolution.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+96"/>
         <source>8192</source>
         <translation>8192</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>16384</source>
         <translation>16384</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>32768</source>
         <translation>32768</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Midi Resolution
 (Ticks/Quarternote)</source>
         <translation>Midi-Разрешение
 (Тиков/На четвертную ноту)</translation>
     </message>
     <message>
+        <location line="+126"/>
+        <source>Instruments Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+85"/>
         <source>Use old-style stop shortcut:</source>
         <translation>Использовать старую &quot;горячую клавишу&quot; для остановки:</translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Move single armed track with selection</source>
         <translation>Назначать &quot;для записи&quot; выбранный трек</translation>
     </message>
     <message>
+        <location line="-791"/>
         <source>On Launch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+736"/>
         <source>Behavior</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>Header</name>
+    <message>
+        <location filename="../../muse/widgets/header.cpp" line="+134"/>
+        <source>Track Info Columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LMaster</name>
     <message>
+        <location filename="../../muse/master/lmaster.cpp" line="+125"/>
         <source>MusE: Mastertrack</source>
         <translation>MusE: Мастер-трек</translation>
     </message>
     <message>
+        <location line="+42"/>
         <source>Tempo</source>
         <translation>Темп</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Timesig</source>
         <translation>Размер</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>new tempo</source>
         <translation>новый темп</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>new signature</source>
         <translation>новый размер</translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Meter</source>
         <translation>Индикатор</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Time</source>
         <translation>Время</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Value</source>
         <translation>Значение</translation>
     </message>
     <message>
+        <location line="-61"/>
         <source>&amp;Edit</source>
         <translation>&amp;Правка</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Insert Tempo</source>
         <translation>Вставить темп</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Insert Signature</source>
         <translation>Вставить размер</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>
     </message>
     <message>
+        <location line="+1"/>
         <source>Edit Value</source>
         <translation>Изменить значение</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Delete Event</source>
         <translation>Удалить событие</translation>
     </message>
     <message>
+        <location line="+29"/>
+        <source>Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>new key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+370"/>
         <source>Reposition of the initial tempo and signature events is not allowed</source>
         <translation>Изменение начального темпа и размера запрещено</translation>
     </message>
     <message>
+        <location line="+54"/>
         <source>MusE: List Editor</source>
         <translation>MusE: Редактор списка событий</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Input error, conversion not OK or value out of range</source>
         <translation>Ошибка ввода, неверная конверсия или значение вне диапазона</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Reposition of tempo and signature events to start position is not allowed!</source>
         <translation>Изменение темпа и размера запрещено</translation>
     </message>
     <message>
+        <location line="-450"/>
         <source>Master tools</source>
         <translation>Основные инструменты</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Edit tools</source>
         <translation>Инструменты редактирования</translation>
     </message>
@@ -4711,6 +5139,7 @@ Shorter periods are desirable.</source>
         <translation type="obsolete">Вставить ноту</translation>
     </message>
     <message>
+        <location filename="../../muse/liste/listedit.cpp" line="+452"/>
         <source>insert Note</source>
         <translation>вставить Ноту</translation>
     </message>
@@ -4719,6 +5148,7 @@ Shorter periods are desirable.</source>
         <translation type="obsolete">Вставить SysEx</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>insert SysEx</source>
         <translation>вставить SysEx</translation>
     </message>
@@ -4727,6 +5157,7 @@ Shorter periods are desirable.</source>
         <translation type="obsolete">Вставить кнтрл</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>insert Ctrl</source>
         <translation>Вставить кнтрл</translation>
     </message>
@@ -4735,6 +5166,7 @@ Shorter periods are desirable.</source>
         <translation type="obsolete">Вставить Meta</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>insert Meta</source>
         <translation>вставить Meta</translation>
     </message>
@@ -4743,6 +5175,7 @@ Shorter periods are desirable.</source>
         <translation type="obsolete">Вставить Channel Aftertouch</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>insert Channel Aftertouch</source>
         <translation>вставить Channel Aftertouch</translation>
     </message>
@@ -4751,26 +5184,32 @@ Shorter periods are desirable.</source>
         <translation type="obsolete">Вставить Key Aftertouch</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>insert Poly Aftertouch</source>
         <translation>вставить Poly Aftertouch</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>&amp;Edit</source>
         <translation>&amp;Правка</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Cut</source>
         <translation>Вырезать</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Copy</source>
         <translation>Скопировать</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Paste</source>
         <translation>Вставить</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Delete Events</source>
         <translation>Удалить события</translation>
     </message>
@@ -4783,10 +5222,12 @@ Shorter periods are desirable.</source>
         <translation type="obsolete">Вставить инструменты</translation>
     </message>
     <message>
+        <location line="+36"/>
         <source>Tick</source>
         <translation>Тик</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Bar</source>
         <translation>Такт</translation>
     </message>
@@ -4795,38 +5236,47 @@ Shorter periods are desirable.</source>
         <translation type="obsolete">Тип</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Ch</source>
         <translation>Кан</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Val A</source>
         <translation>Знач. А</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Val B</source>
         <translation>Знач. B</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Val C</source>
         <translation>Знач. С</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Len</source>
         <translation>Дл</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Comment</source>
         <translation>Комментарий</translation>
     </message>
     <message>
+        <location line="-32"/>
         <source>List tools</source>
         <translation>Инструменты редактора списка</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Insert tools</source>
         <translation>Инструменты для вставки</translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
@@ -4834,22 +5284,27 @@ Shorter periods are desirable.</source>
 <context>
     <name>MITTransposeBase</name>
     <message>
+        <location filename="../../muse/widgets/mittransposebase.ui" line="+14"/>
         <source>MusE: Midi Input Plugin: Transpose</source>
         <translation>MusE: Midi-плагин на входе: Транспонирование</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>On</source>
         <translation>Вкл</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>TriggerKey</source>
         <translation>Кнопка запуска</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Transpose:</source>
         <translation>Транспонировать:</translation>
     </message>
     <message>
+        <location line="+31"/>
         <source>+0</source>
         <translation>+0</translation>
     </message>
@@ -4861,22 +5316,27 @@ Shorter periods are desirable.</source>
         <translation type="obsolete">ничего</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>Имя устройства</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>State</source>
         <translation>Состояние</translation>
     </message>
@@ -4885,114 +5345,210 @@ Shorter periods are desirable.</source>
         <translation type="obsolete">неизвестно</translation>
     </message>
     <message>
+        <location line="-8"/>
         <source>I</source>
         <translation>Вх</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>O</source>
         <translation>Вых</translation>
     </message>
     <message>
+        <location line="-715"/>
         <source>MusE: bad device name</source>
         <translation>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>
     </message>
     <message>
+        <location line="+72"/>
+        <location line="+860"/>
         <source>in</source>
         <translation>в</translation>
     </message>
     <message>
+        <location line="-837"/>
+        <location line="+828"/>
         <source>out</source>
         <translation>вне (из)</translation>
     </message>
     <message>
+        <location line="-772"/>
         <source>Show first aliases</source>
         <translation>Показать первые псевдонимы</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>
+    </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>
     </message>
     <message>
+        <location line="+0"/>
         <source> device</source>
         <translation> устройство</translation>
     </message>
     <message>
+        <location line="+229"/>
+        <location line="+29"/>
         <source>Port Number</source>
         <translation>Номер порта</translation>
     </message>
     <message>
+        <location line="-28"/>
         <source>Enable gui</source>
         <translation>Разрешить ГИП</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Enable reading</source>
         <translation>Разрешить чтение</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Enable writing</source>
         <translation>Разрешить запись</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Port instrument</source>
         <translation>Инструмент, назначенный на порт</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Midi device name. Click to edit (Jack)</source>
         <translation>Имя midi-устройства. Щелкните для редактирования (Jack)</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Connections from Jack Midi outputs</source>
         <translation>Соединения от 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>
+    </message>
+    <message>
         <source>Connect these to new midi tracks</source>
-        <translation>Подсоединить к новым midi-трекам</translation>
+        <translation type="obsolete">Подсоединить к новым midi-трекам</translation>
     </message>
     <message>
         <source>Connect new midi tracks to this (first listed only)</source>
-        <translation>Подсоединять новые midi-треки сюда (только к первому в списке)</translation>
+        <translation type="obsolete">Подсоединять новые midi-треки сюда (только к первому в списке)</translation>
     </message>
     <message>
+        <location line="-45"/>
         <source>Device state</source>
         <translation>Состояние устройства</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Enable gui for device</source>
         <translation>Разрешить ГИП для устройства</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Enable reading from device</source>
         <translation>Разрешить чтение с устройства</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Enable writing to device</source>
         <translation>Разрешить запись на устройство</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>
     </message>
     <message>
+        <location line="+3"/>
         <source>Instrument connected to port</source>
         <translation>Инструмент, подсоединённый к порту</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Connections from Jack Midi output ports</source>
         <translation>Соединения от выходных midi-портов Jack</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Connections to Jack Midi input ports</source>
         <translation>Соединения с входными midi-портами Jack</translation>
     </message>
@@ -5004,7 +5560,7 @@ Example:
  1-3 5    channel 1 2 3 and 5
  all      all channels
  none     no channels</source>
-        <translation>Соединить каналы этого порта с новыми midi-треками.
+        <translation type="obsolete">Соединить каналы этого порта с новыми midi-треками.
 Пример:
 1 2 3    каналы 1 2 и 3
 1-3      то же самое
@@ -5016,36 +5572,44 @@ Example:
         <source>Connect new midi tracks to these channels, on this port.
 See default in channels.
 NOTE: Currently only one output port and channel supported (first found)</source>
-        <translation>Соединить новые midi-треки с этими каналами данного порта.
+        <translation type="obsolete">Соединить новые midi-треки с этими каналами данного порта.
 См. вх. каналы по умолчанию
 Примечание: Пока поддерживается только один порт и канал
 (первый найденный)</translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>State: result of opening the device</source>
         <translation>Состояние: результат открытия устройства</translation>
     </message>
     <message>
+        <location line="+47"/>
         <source>In routes</source>
         <translation>Маршруты входа</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Out routes</source>
         <translation>Маршруты выхода</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Def in ch</source>
         <translation>вх кан по ум</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Def out ch</source>
         <translation>вых кан по ум</translation>
     </message>
     <message>
+        <location line="+86"/>
         <source>&lt;unknown&gt;</source>
         <translation>&lt;неизвестно&gt;</translation>
     </message>
     <message>
+        <location line="+87"/>
+        <location line="+74"/>
         <source>&lt;none&gt;</source>
         <translation>&lt;ничего&gt;</translation>
     </message>
@@ -5053,41 +5617,55 @@ NOTE: Currently only one output port and channel supported (first found)</source
 <context>
     <name>MRConfigBase</name>
     <message>
+        <location filename="../../muse/mplugins/mrconfigbase.ui" line="+14"/>
         <source>MusE: Midi Input Plugin: Remote Control</source>
         <translation>MusE: Входной MIDI-плагин: Дистанц. управление</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Activate</source>
         <translation>Активировать</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>On</source>
         <translation>Вкл</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Actions</source>
         <translation>Действия</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Stop</source>
         <translation>Остановить</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Record</source>
         <translation>Записать</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Goto Left Mark</source>
         <translation>Перейти к левому маркеру</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Play</source>
         <translation>Воспроизвести</translation>
     </message>
+    <message>
+        <location line="+25"/>
+        <source>Insert rest (step rec) </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MTScale</name>
     <message>
+        <location filename="../../muse/widgets/mtscale.cpp" line="+27"/>
         <source>bar scale</source>
         <translation>шкала тактов</translation>
     </message>
@@ -5095,10 +5673,12 @@ NOTE: Currently only one output port and channel supported (first found)</source
 <context>
     <name>MarkerView</name>
     <message>
+        <location filename="../../muse/marker/markerview.cpp" line="+158"/>
         <source>MusE: Marker</source>
         <translation>MusE: Маркер</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>add marker</source>
         <translation>добавить маркер</translation>
     </message>
@@ -5107,6 +5687,7 @@ NOTE: Currently only one output port and channel supported (first found)</source
         <translation type="obsolete">Добавить Маркер</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>delete marker</source>
         <translation>удалить маркер</translation>
     </message>
@@ -5119,34 +5700,42 @@ 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="+26"/>
         <source>Bar:Beat:Tick</source>
         <translation>Такт:Доля:Тик</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Hr:Mn:Sc:Fr:Sf</source>
         <translation>Чс:Мин:Сек:Фрм:Субфрм</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Lock</source>
         <translation>Закрыть</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Text</source>
         <translation>Текст</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Marker Properties</source>
         <translation>Свойства маркера</translation>
     </message>
     <message>
+        <location line="-34"/>
         <source>marker-tools</source>
         <translation>инструменты маркера</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>edit tools</source>
         <translation>инструменты редактирования</translation>
     </message>
@@ -5154,6 +5743,7 @@ NOTE: Currently only one output port and channel supported (first found)</source
 <context>
     <name>MasterEdit</name>
     <message>
+        <location filename="../../muse/master/masteredit.cpp" line="-42"/>
         <source>MusE: Mastertrack</source>
         <translation>MusE: Мастер-трек</translation>
     </message>
@@ -5166,10 +5756,12 @@ NOTE: Currently only one output port and channel supported (first found)</source
         <translation type="obsolete">Разрешить(Мастер)</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>Info</source>
         <translation>Инфо</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Cursor</source>
         <translation>Курсор</translation>
     </message>
@@ -5178,42 +5770,52 @@ NOTE: Currently only one output port and channel supported (first found)</source
         <translation type="obsolete">выкл</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Snap</source>
         <translation>Привязка</translation>
     </message>
     <message>
+        <location line="-10"/>
         <source>time at cursor position</source>
         <translation>время в позиции курсора</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>tempo at cursor position</source>
         <translation>темп в позиции курсора</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>CurPos </source>
         <translation>КурсПоз</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>tempo at current position</source>
         <translation>темп в текущей позиции</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>time signature at current position</source>
         <translation>размер в текущей позиции</translation>
     </message>
     <message>
+        <location line="-38"/>
         <source>Enable</source>
         <translation>Разрешить</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Enable usage of master track</source>
         <translation>Разрешить использование мастер-трека</translation>
     </message>
     <message>
+        <location line="-10"/>
         <source>Master tools</source>
         <translation>Основные инструменты</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Enable master</source>
         <translation>Разрешить мастер(а)</translation>
     </message>
@@ -5221,114 +5823,142 @@ NOTE: Currently only one output port and channel supported (first found)</source
 <context>
     <name>MetronomeConfigBase</name>
     <message>
+        <location filename="../../muse/widgets/metronomebase.ui" line="+14"/>
         <source>MusE: Metronome Config</source>
         <translation>MusE: Настройка метронома</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Metronome</source>
         <translation>Метроном</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Audio Beep</source>
         <translation>Звуковой сигнал</translation>
     </message>
     <message>
+        <location line="+65"/>
         <source>MIDI Click</source>
         <translation>MIDI-щелчок</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>Midi Channel</source>
         <translation>MIDI-канал</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Measure Note</source>
         <translation>Нота на первую долю такта</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Measure Velocity</source>
         <translation>Громкость первой доли такта</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Beat Velocity</source>
         <translation>Громкость слабых долей такта</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Beat Note</source>
         <translation>Нота на слабые доли такта</translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Midi Port</source>
         <translation>MIDI-порт</translation>
     </message>
     <message>
+        <location line="+42"/>
         <source>Precount</source>
         <translation>Предварительный отсчет</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>enable</source>
         <translation>разрешить</translation>
     </message>
     <message>
+        <location line="+34"/>
         <source>Bars</source>
         <translation>Такт(ов)</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>From Mastertrack</source>
         <translation>Из Мастер-трека</translation>
     </message>
     <message>
+        <location line="+34"/>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>Signature</source>
         <translation>Размер</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Prerecord</source>
         <translation>Предзапись</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Preroll</source>
         <translation>Предвоспроизведение</translation>
     </message>
     <message>
+        <location line="+38"/>
         <source>&amp;Apply</source>
         <translation>&amp;Применить</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>&amp;OK</source>
         <translation>&amp;ОК</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Отмена</translation>
     </message>
     <message>
+        <location line="-425"/>
         <source>Choose outputs...</source>
         <translation>Выбрать выходы...</translation>
     </message>
     <message>
+        <location line="+36"/>
         <source>50</source>
         <translation>50</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>% Audio volume</source>
         <translation>% Громкость аудио</translation>
     </message>
     <message>
+        <location line="+324"/>
         <source>Hint: Enable metronome in Transportpanel</source>
         <translation>Подсказка: Активируйте метроном на Транспортной панели</translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>Alt+A</source>
         <translation>Alt+A</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Alt+O</source>
         <translation>Alt+O</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Alt+C</source>
         <translation>Alt+C</translation>
     </message>
@@ -5343,263 +5973,350 @@ NOTE: Currently only one output port and channel supported (first found)</source
 <context>
     <name>MidiControllerEditDialogBase</name>
     <message>
+        <location filename="../../muse/instruments/ccontrolbase.ui" line="+16"/>
         <source>MusE: Define Midi Controller</source>
-        <translation type="obsolete">MusE: Назначить MIDI-контроллер</translation>
+        <translation type="unfinished">MusE: Назначить MIDI-контроллер</translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <source>A&amp;pply</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+30"/>
         <source>Name                  </source>
-        <translation type="obsolete">Имя                  </translation>
+        <translation type="unfinished">Имя                  </translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Type       </source>
-        <translation type="obsolete">Тип       </translation>
+        <translation type="unfinished">Тип       </translation>
     </message>
     <message>
+        <location line="+11"/>
+        <location line="+266"/>
         <source>H-Ctrl</source>
-        <translation type="obsolete">H-Ctrl</translation>
+        <translation type="unfinished">H-Ctrl</translation>
     </message>
     <message>
+        <location line="-255"/>
+        <location line="+283"/>
         <source>L-Ctrl</source>
-        <translation type="obsolete">L-Ctrl</translation>
+        <translation type="unfinished">L-Ctrl</translation>
     </message>
     <message>
+        <location line="-272"/>
         <source>Min Val</source>
-        <translation type="obsolete">Мин знач</translation>
+        <translation type="unfinished">Мин знач</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Max Val</source>
-        <translation type="obsolete">Макс знач</translation>
+        <translation type="unfinished">Макс знач</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>list of defined controllers</source>
-        <translation type="obsolete">Список назначенных контроллеров</translation>
+        <translation type="unfinished">Список назначенных контроллеров</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>This is the MusE list of defined controllers.</source>
-        <translation type="obsolete">Это список назначенных в MusE контроллеров.</translation>
+        <translation type="unfinished">Это список назначенных в MusE контроллеров.</translation>
     </message>
     <message>
+        <location line="+60"/>
         <source>Properties</source>
-        <translation type="obsolete">Свойства</translation>
+        <translation type="unfinished">Свойства</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Name</source>
-        <translation type="obsolete">Имя</translation>
+        <translation type="unfinished">Имя</translation>
     </message>
     <message>
+        <location line="+38"/>
         <source>Max Value</source>
-        <translation type="obsolete">Макс значение</translation>
+        <translation type="unfinished">Макс значение</translation>
     </message>
     <message>
+        <location line="-22"/>
         <source>Min Value</source>
-        <translation type="obsolete">Мин значение</translation>
+        <translation type="unfinished">Мин значение</translation>
     </message>
     <message>
+        <location line="+68"/>
         <source>Control7</source>
-        <translation type="obsolete">Контрл7</translation>
+        <translation type="unfinished">Контрл7</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Control14</source>
-        <translation type="obsolete">Контрл14</translation>
+        <translation type="unfinished">Контрл14</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>RPN</source>
-        <translation type="obsolete">RPN</translation>
+        <translation type="unfinished">RPN</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>NRPN</source>
-        <translation type="obsolete">NRPN</translation>
+        <translation type="unfinished">NRPN</translation>
     </message>
     <message>
+        <location line="-34"/>
         <source>Type</source>
-        <translation type="obsolete">Тип</translation>
+        <translation type="unfinished">Тип</translation>
     </message>
     <message>
+        <location line="-306"/>
         <source>create new entry</source>
-        <translation type="obsolete">Создать новую запись</translation>
+        <translation type="unfinished">Создать новую запись</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>pressing the New button you create a new entry
 in the MusE list of defined controllers</source>
-        <translation type="obsolete">По нажатию кнопки &quot;Новая&quot; создаётся новая
+        <translation type="unfinished">По нажатию кнопки &quot;Новая&quot; создаётся новая
 запись в список назначенных в MusE контроллеров</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>&amp;Delete</source>
-        <translation type="obsolete">&amp;Удалить</translation>
+        <translation type="unfinished">&amp;Удалить</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>delete selected entry</source>
-        <translation type="obsolete">Удалить выделенную запись</translation>
+        <translation type="unfinished">Удалить выделенную запись</translation>
     </message>
     <message>
+        <location line="+25"/>
         <source>&amp;OK</source>
-        <translation type="obsolete">&amp;OK</translation>
+        <translation type="unfinished">&amp;OK</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>&amp;Cancel</source>
-        <translation type="obsolete">&amp;Отмена</translation>
+        <translation type="unfinished">&amp;Отмена</translation>
     </message>
     <message>
+        <location line="-74"/>
         <source>&amp;Add</source>
-        <translation type="obsolete">&amp;Добавить</translation>
+        <translation type="unfinished">&amp;Добавить</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+A</source>
-        <translation type="obsolete">Alt+A</translation>
+        <translation type="unfinished">Alt+A</translation>
     </message>
     <message>
+        <location line="+84"/>
         <source>Predefined Controller:</source>
-        <translation type="obsolete">Уже назначенный контроллер:</translation>
+        <translation type="unfinished">Уже назначенный контроллер:</translation>
     </message>
     <message>
+        <location line="+102"/>
         <source>Managed Controller for Port</source>
-        <translation type="obsolete">Настроенный контроллер для порта</translation>
+        <translation type="unfinished">Настроенный контроллер для порта</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Channel</source>
-        <translation type="obsolete">Канал</translation>
+        <translation type="unfinished">Канал</translation>
     </message>
     <message>
+        <location line="+21"/>
         <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="obsolete">Это список общеупотребительных midi-контроллеров.
+        <translation type="unfinished">Это список общеупотребительных midi-контроллеров.
 Обратите внимание, что управление  высотой тона(pitch) и изменением программ(program change) в MusE,
 такое же, как и управление обычными контроллерами.</translation>
     </message>
     <message>
+        <location line="+131"/>
+        <source>RPN14</source>
+        <translation type="unfinished">RPN14</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>NRPN14</source>
+        <translation type="unfinished">NRPN14</translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>Pitch</source>
-        <translation type="obsolete">Высота тона</translation>
+        <translation type="unfinished">Высота тона</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Program</source>
-        <translation type="obsolete">Программа</translation>
+        <translation type="unfinished">Программа</translation>
     </message>
     <message>
+        <location line="+32"/>
         <source>Midi Controller Number High Byte</source>
-        <translation type="obsolete">Значение Старшего Байта Midi-контроллера</translation>
+        <translation type="unfinished">Значение Старшего Байта Midi-контроллера</translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>Midi Controller Number Low Byte</source>
-        <translation type="obsolete">Значение Младшего Байта Midi-контроллера</translation>
+        <translation type="unfinished">Значение Младшего Байта Midi-контроллера</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Range</source>
-        <translation type="obsolete">Диапазон</translation>
+        <translation type="unfinished">Диапазон</translation>
     </message>
 </context>
 <context>
     <name>MidiFilterConfigBase</name>
     <message>
+        <location filename="../../muse/mplugins/midifilter.ui" line="+20"/>
         <source>MusE:  Midi Input Filter</source>
         <translation>MusE:  Фильтр входящих Midi-событий</translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Record Filter</source>
         <translation>Фильтр записи</translation>
     </message>
     <message>
+        <location line="+18"/>
+        <location line="+112"/>
         <source>Note On</source>
         <translation>Нажатие ноты</translation>
     </message>
     <message>
+        <location line="-99"/>
+        <location line="+112"/>
         <source>Poly Pressure</source>
         <translation>Полифоническое давление</translation>
     </message>
     <message>
+        <location line="-99"/>
+        <location line="+112"/>
         <source>Controller</source>
         <translation>Контроллер</translation>
     </message>
     <message>
+        <location line="-99"/>
+        <location line="+112"/>
         <source>Program Change</source>
         <translation>Смена программы</translation>
     </message>
     <message>
+        <location line="-99"/>
+        <location line="+112"/>
         <source>After Touch</source>
         <translation>Посленажатие</translation>
     </message>
     <message>
+        <location line="-99"/>
+        <location line="+112"/>
         <source>Pitch Bend</source>
         <translation>Изменение высоты тона</translation>
     </message>
     <message>
+        <location line="-99"/>
+        <location line="+112"/>
         <source>Sysex</source>
         <translation>SysEx</translation>
     </message>
     <message>
+        <location line="-96"/>
         <source>Thru Filter</source>
         <translation>Фильтр сквозного канала</translation>
     </message>
     <message>
+        <location line="+112"/>
         <source>Controller Filter</source>
         <translation>Фильтр контроллеров</translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>Channel Filter</source>
         <translation>Фильтр каналов</translation>
     </message>
     <message>
+        <location line="+24"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>13</source>
         <translation>13</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>15</source>
         <translation>15</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>11</source>
         <translation>11</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>1</source>
         <translation>1</translation>
     </message>
@@ -5607,6 +6324,8 @@ handled like normal controllers.</source>
 <context>
     <name>MidiInputTransformDialog</name>
     <message>
+        <location filename="../../muse/mplugins/midiitransform.cpp" line="+703"/>
+        <location line="+2"/>
         <source>New</source>
         <translation>Новый</translation>
     </message>
@@ -5614,214 +6333,334 @@ handled like normal controllers.</source>
 <context>
     <name>MidiInputTransformDialogBase</name>
     <message>
+        <location filename="../../muse/widgets/itransformbase.ui" line="+14"/>
         <source>MusE: Midi Input Transformator</source>
         <translation>MusE: Преобразователь входящих MIDI-сообщений</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Filter</source>
         <translation>Фильтр</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>All</source>
         <translation>Все</translation>
     </message>
     <message>
+        <location line="+5"/>
+        <location line="+91"/>
+        <location line="+60"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Equal</source>
         <translation>Равно</translation>
     </message>
     <message>
+        <location line="-224"/>
+        <location line="+91"/>
+        <location line="+60"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Unequal</source>
         <translation>Не равно</translation>
     </message>
     <message>
+        <location line="-217"/>
         <source>Note</source>
         <translation>Нота</translation>
     </message>
     <message>
+        <location line="+5"/>
+        <location line="+338"/>
         <source>Poly Pressure</source>
         <translation>Полифоническое давление</translation>
     </message>
     <message>
+        <location line="-333"/>
+        <location line="+338"/>
         <source>Control Change</source>
         <translation>Смена контроллера</translation>
     </message>
     <message>
+        <location line="-333"/>
+        <location line="+338"/>
         <source>Aftertouch</source>
         <translation>Посленажатие</translation>
     </message>
     <message>
+        <location line="-333"/>
+        <location line="+338"/>
         <source>Pitch Bend</source>
         <translation>Изменение высоты тона</translation>
     </message>
     <message>
+        <location line="-333"/>
+        <location line="+338"/>
         <source>NRPN</source>
         <translation>NRPN</translation>
     </message>
     <message>
+        <location line="-333"/>
+        <location line="+338"/>
         <source>RPN</source>
         <translation>RPN</translation>
     </message>
     <message>
+        <location line="-330"/>
+        <location line="+369"/>
+        <location line="+43"/>
         <source>Value 2</source>
         <translation>Значение 2</translation>
     </message>
     <message>
+        <location line="-402"/>
+        <location line="+392"/>
+        <location line="+96"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Value 1</source>
         <translation>Значение 1</translation>
     </message>
     <message>
+        <location line="-586"/>
+        <location line="+257"/>
         <source>Event Type</source>
         <translation>Тип события</translation>
     </message>
     <message>
+        <location line="-246"/>
+        <location line="+60"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Ignore</source>
         <translation>Игнорировать</translation>
     </message>
     <message>
+        <location line="-123"/>
+        <location line="+60"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Higher</source>
         <translation>Выше</translation>
     </message>
     <message>
+        <location line="-133"/>
+        <location line="+60"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Lower</source>
         <translation>Ниже</translation>
     </message>
     <message>
+        <location line="-133"/>
+        <location line="+60"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Inside</source>
         <translation>Внутри</translation>
     </message>
     <message>
+        <location line="-133"/>
+        <location line="+60"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Outside</source>
         <translation>Вне</translation>
     </message>
     <message>
+        <location line="+8"/>
+        <location line="+422"/>
         <source>Channel</source>
         <translation>Канал</translation>
     </message>
     <message>
+        <location line="-412"/>
+        <location line="+240"/>
         <source>Port</source>
         <translation>Порт</translation>
     </message>
     <message>
+        <location line="-192"/>
         <source>Processing</source>
         <translation> Обработка</translation>
     </message>
     <message>
+        <location line="+23"/>
+        <location line="+51"/>
+        <location line="+129"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Keep</source>
         <translation>Сохранить</translation>
     </message>
     <message>
+        <location line="-283"/>
+        <location line="+71"/>
+        <location line="+129"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Fix</source>
         <translation>Исправить</translation>
     </message>
     <message>
+        <location line="-257"/>
+        <location line="+129"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Plus</source>
         <translation>Плюс</translation>
     </message>
     <message>
+        <location line="-232"/>
+        <location line="+129"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Minus</source>
         <translation>Минус</translation>
     </message>
     <message>
+        <location line="-232"/>
+        <location line="+129"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Multiply</source>
         <translation>Умножить</translation>
     </message>
     <message>
+        <location line="-232"/>
+        <location line="+129"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Divide</source>
         <translation>Разделить</translation>
     </message>
     <message>
+        <location line="-222"/>
+        <location line="+129"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Invert</source>
         <translation>Инвертировать</translation>
     </message>
     <message>
+        <location line="-232"/>
         <source>ScaleMap</source>
         <translation> Шкала</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Flip</source>
         <translation>Обратить</translation>
     </message>
     <message>
+        <location line="+5"/>
+        <location line="+119"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Dyn</source>
         <translation>Дин</translation>
     </message>
     <message>
+        <location line="-222"/>
+        <location line="+119"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Random</source>
         <translation>Случайно</translation>
     </message>
     <message>
+        <location line="+48"/>
         <source>Modules</source>
         <translation>Модули</translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>enable modul 1</source>
         <translation>разрешить модуль 1</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>enable modul 2</source>
         <translation>разрешить модуль 2</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>enable modul 3</source>
         <translation>разрешить модуль 3</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>enable modul 4</source>
         <translation>разрешить модуль 4</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Preset</source>
         <translation>Пресет</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Name:</source>
         <translation>Имя:</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>Comment:</source>
         <translation>Комментарий:</translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>Function</source>
         <translation>Функция</translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>&amp;New</source>
         <translation>&amp;Новый</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>create new preset</source>
         <translation>создать новый пресет</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>&amp;Delete</source>
         <translation>&amp;Удалить</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>delete preset</source>
         <translation>удалить пресет</translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>&amp;Dismiss</source>
         <translation>&amp;Отклонить</translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>PresetList</source>
         <translation>Список пресетов</translation>
     </message>
@@ -5848,50 +6687,64 @@ handled like normal controllers.</source>
 <context>
     <name>MidiStrip</name>
     <message>
+        <location filename="../../muse/mixer/mstrip.cpp" line="+173"/>
         <source>VariationSend</source>
         <translation>Вариационный посыл</translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>Var</source>
         <translation>Вар</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>ReverbSend</source>
         <translation>Посыл Реверберации</translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>Rev</source>
         <translation>Ревер</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>ChorusSend</source>
         <translation>Посыл Хоруса</translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>Cho</source>
         <translation>Хорус</translation>
     </message>
     <message>
+        <location line="-83"/>
+        <location line="+121"/>
+        <location line="+158"/>
         <source>off</source>
         <translation>выкл</translation>
     </message>
     <message>
+        <location line="-157"/>
         <source>dB</source>
         <translation>Дб</translation>
     </message>
     <message>
+        <location line="+54"/>
         <source>Pan/Balance</source>
         <translation>Пан/Баланс</translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>Pan</source>
         <translation>Пан</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>record</source>
         <translation>запись</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>mute</source>
         <translation>заглушить</translation>
     </message>
@@ -5928,26 +6781,33 @@ handled like normal controllers.</source>
         <translation type="obsolete">тип автоматизации</translation>
     </message>
     <message>
+        <location line="-206"/>
+        <location line="+122"/>
         <source>double click on/off</source>
         <translation>двойной щелчок вкл/выкл</translation>
     </message>
     <message>
+        <location line="+105"/>
         <source>solo mode</source>
         <translation>режим соло</translation>
     </message>
     <message>
+        <location line="+67"/>
         <source>iR</source>
         <translation>вх</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>input routing</source>
         <translation>маршрут входа</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>oR</source>
         <translation>вых</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>output routing</source>
         <translation>маршрут выхода</translation>
     </message>
@@ -5955,82 +6815,107 @@ handled like normal controllers.</source>
 <context>
     <name>MidiSyncConfig</name>
     <message>
+        <location filename="../../muse/widgets/midisyncimpl.cpp" line="+41"/>
+        <location line="+29"/>
         <source>Port Number</source>
         <translation>Номер порта</translation>
     </message>
     <message>
+        <location line="-28"/>
+        <location line="+29"/>
         <source>Name of the midi device associated with this port number</source>
         <translation>Имя MIDI-устройства, ассоциированного с номером этого порта </translation>
     </message>
     <message>
+        <location line="-27"/>
         <source>Midi clock input detected</source>
         <translation>Обнаружен вход midi-clock</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <location line="+29"/>
         <source>Midi tick input detected</source>
         <translation>Обнаружен вход midi-тика</translation>
     </message>
     <message>
+        <location line="-28"/>
         <source>Midi real time input detected</source>
         <translation>Обнаружен midi-вход реального времени</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>MMC input detected</source>
         <translation>Обнаружен вход MMC</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>MTC input detected</source>
         <translation>Обнаружен вход MTC</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Detected SMPTE format</source>
         <translation>Обнаруженые SMPTE форматы</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Receive id number. 127 = Global. Double click to edit.</source>
         <translation>Получить id номер. 127 = Глобально. Двойной щелчок для редактирования.</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Accept midi clock input</source>
         <translation>Принять вход Midi-clock</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Accept midi real time input</source>
         <translation>Принять midi-вход реального времени</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Accept MMC input</source>
         <translation>Принять вход MMC</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Accept MTC input</source>
         <translation>Принять вход MTC</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Receive start rewinds before playing</source>
         <translation>Получить перед воспроизведением сообщение о начале перемотки</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Transmit id number. 127 = Global. Double click to edit.</source>
         <translation>Передать номер id. 127 = Общий. Двойной щелчок для редактирования.</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Send midi clock output</source>
         <translation>Послать выход midi-clock</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Send midi realtime output</source>
         <translation>Послать midi-выход реального времени</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <location line="+49"/>
         <source>Send MMC output</source>
         <translation>Послать выход MMC</translation>
     </message>
     <message>
+        <location line="-48"/>
+        <location line="+49"/>
         <source>Send MTC output</source>
         <translation>Послать выход MTC</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>
@@ -6041,17 +6926,20 @@ Click to force a port to be used.</source>
 использовать порт.</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Midi realtime input detected, including
  start/stop/continue, and song position.</source>
         <translation>Обнаружен midi-вход реального времени,
 с &quot;старт/стоп/продолжить&quot; и позицией проекта.</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>MMC input detected, including stop/play/deferred play, and locate.</source>
         <translation>Обнаружен MMC-вход c &quot;старт/стоп/отложенное воспроизведение&quot;
  и локацией.</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>Обнаружен MTC-вход, с четверть-фреймовой
@@ -6062,6 +6950,7 @@ Current port actually used is red. Click to force a port to be current.</source>
 сделать порт текущим.</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>Обнаруженые форматы SMPTE: 24fps, 25fps, 30fps с пропущенным
@@ -6069,10 +6958,12 @@ Detects format of MTC quarter and full frame, and MMC locate.</source>
 Обнаруживает MTC-формат четверть и полно-фреймовый, и MMC локацию.</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Receive id number. 127 = global receive all, even if not global.</source>
         <translation>Получить номер id. 127 =глобальный получает все, даже если не глобальный.</translation>
     </message>
     <message>
+        <location line="+1"/>
         <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,
@@ -6083,6 +6974,7 @@ Click on detect indicator to force another.</source>
 Авто-получение: если разрешены два или более входов реального времени на порт, то будут использован первый обнаруженный &quot;clock&quot;, пока он не будет потерян, затем будет использован другой. Самое лучшее, если каждый отключит свой &quot;clock&quot; во время остановки, чтобы MusE снова получил &quot;clock&quot; с другого порта. Щелкните по индикатору обнаружения, чтобы сделать по другому.</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Accept midi realtime input, including
  start/stop/continue, and song position.
 Non-clock events (start,stop etc) are
@@ -6098,10 +6990,12 @@ This means you may have several master
 и MusE примет вход от них.</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Accept MMC input, including stop/play/deferred play, and locate.</source>
         <translation>Принять вход MMC,  с &quot;стоп/старт/отложенным воспроизведением&quot; и локацией.</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>Принять вход MTC, с четверть-фреймовой
@@ -6109,6 +7003,7 @@ See &apos;rc&apos; column for more help.</source>
 См. колонку &quot;rc&quot; для получения помощи.</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>
@@ -6118,16 +7013,19 @@ Note: It may be impossible to rewind fast
 для синхронизации с внешним устройством.</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Transmit id number. 127 = global transmit to all.</source>
         <translation>Передавать номер id. 127 =общая передача для всех.</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>Посылать выход midi-clock. Если выбрано &quot;Slave to External Sync&quot;,
 то MusE может снова передать &quot;clock&quot; на любой другой выбранный порт.</translation>
     </message>
     <message>
+        <location line="+2"/>
         <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
@@ -6141,104 +7039,129 @@ Note: It may be impossible to rewind fast
 иметь несколько присоединенных ведомых устройств, и MusE может снова послать сообщения реального времени на любое из них или на все.</translation>
     </message>
     <message>
+        <location line="+142"/>
         <source>Port</source>
         <translation>Порт</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Device Name</source>
         <translation>Имя устройства</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>c</source>
         <translation>c</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>k</source>
         <translation>k</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>r</source>
         <translation>r</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>t</source>
         <translation>t</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>type</source>
         <translation>тип</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>rid</source>
         <translation>rid</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>rc</source>
         <translation>rc</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>rr</source>
         <translation>rr</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>rm</source>
         <translation>rm</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>rt</source>
         <translation>rt</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>rw</source>
         <translation>rw</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>tid</source>
         <translation>tid</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>tc</source>
         <translation>tc</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>tr</source>
         <translation>tr</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>tm</source>
         <translation>tm</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>tt</source>
         <translation>tt</translation>
     </message>
     <message>
+        <location line="+399"/>
         <source>MusE</source>
         <translation>MusE</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Settings have changed
 Apply sync settings?</source>
         <translation>Настройки изменились
 Применить настройки синхронизации?</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>&amp;Apply</source>
         <translation>&amp;Применить</translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>&amp;No</source>
         <translation>&amp;Нет</translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>&amp;Abort</source>
         <translation>&amp;Отмена</translation>
     </message>
     <message>
+        <location line="+125"/>
         <source>&lt;none&gt;</source>
         <translation>&lt;ничего&gt;</translation>
     </message>
@@ -6246,6 +7169,7 @@ Apply sync settings?</source>
 <context>
     <name>MidiSyncConfigBase</name>
     <message>
+        <location filename="../../muse/widgets/midisync.ui" line="+17"/>
         <source>MusE: Midi Sync</source>
         <translation>MusE: MIDI-синхр.</translation>
     </message>
@@ -6314,104 +7238,129 @@ Apply sync settings?</source>
         <translation type="obsolete">Midi Machine Control (MMC)</translation>
     </message>
     <message>
+        <location line="+30"/>
         <source>Apply</source>
         <translation>Применить</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Ok</source>
         <translation>ОК</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>MTC</source>
         <translation>MТC</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>Type:</source>
         <translation>Тип:</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>24</source>
         <translation>24</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>25</source>
         <translation>25</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>30D</source>
         <translation>30D</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>30N</source>
         <translation>30N</translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>Offset:</source>
         <translation>Смещение:</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>hour</source>
         <translation>часов</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>h</source>
         <translation>ч</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>minute</source>
         <translation>минут(а)</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>m</source>
         <translation>м</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>second</source>
         <translation>секунд(а)</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>s</source>
         <translation>с</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>frame</source>
         <translation>фреймов</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>f</source>
         <translation>ф</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>subframe</source>
         <translation>субфреймов</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Sync receiving and sending</source>
         <translation>Получение и отправление синхронизации</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Send and receive Jack transport</source>
         <translation>Отсылать и получать транспорт &quot;Jack&quot;</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Send and receive Jack transport information,
  including stop, start and position.</source>
         <translation>Отсылать и получать информацию с транспорта
 &quot;Jack&quot;, стоп, старт, и позицию.</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Use Jack transport</source>
         <translation>Использовать транспорт &quot;Jack&quot;</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Make MusE the Jack transport Timebase Master</source>
         <translation>Сделать MusE Мастером Базы времени для транспорта &quot;Jack&quot;</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Make MusE the Jack transport Timebase Master.
 Allows Jack to show time as 
  MusE Bars, Beats, and Ticks. 
@@ -6425,14 +7374,17 @@ You can always click here again for Master.</source>
 щелкнуть здесь, чтобы MusE  снова стал Мастером.</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Jack transport Timebase Master</source>
         <translation>Мастер Базы времени транспорта &quot;Jack&quot;</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Control MusE timing by external midi clock or MTC sync</source>
         <translation>Контролировать Muse через внешний midi-clock или MTC синхр</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>When in slave mode, tempo is
  controlled externally.
 MusE can sync to midi clock, or MTC quarter frame sync. 
@@ -6444,14 +7396,17 @@ Enabled inputs in the list will
 входы в списке будут задействованы. (RMC, RMMC, RMTC). </translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Slave to external sync</source>
         <translation>Ведомый для внешней синхронизации</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Send start to first clock delay</source>
         <translation>Посылать &quot;старт&quot; первой задержке &quot;clock&quot;</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Allows &apos;slow sync&apos; devices time
  to synchronize to MusE. This value is the
  delay from sending start to sending
@@ -6462,10 +7417,12 @@ Enabled inputs in the list will
 посылки первого &quot;clock&quot;.</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>ms</source>
         <translation>мс</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Send sync delay</source>
         <translation>Посылать синхр. задержку</translation>
     </message>
@@ -6473,10 +7430,12 @@ Enabled inputs in the list will
 <context>
     <name>MidiTrackInfoBase</name>
     <message>
+        <location filename="../../muse/widgets/mtrackinfobase.ui" line="+38"/>
         <source>MusE: TrackInfo</source>
         <translation>MusE: ТрекИнфо </translation>
     </message>
     <message>
+        <location line="+59"/>
         <source>output channel</source>
         <translation>канал выхода</translation>
     </message>
@@ -6489,6 +7448,8 @@ Enabled inputs in the list will
         <translation type="obsolete">Трек Инфо</translation>
     </message>
     <message>
+        <location line="+249"/>
+        <location line="+91"/>
         <source>%</source>
         <translation>%</translation>
     </message>
@@ -6497,10 +7458,23 @@ Enabled inputs in the list will
         <translation type="obsolete">Имя трека</translation>
     </message>
     <message>
+        <location line="-353"/>
         <source>output port</source>
         <translation>порт выхода</translation>
     </message>
     <message>
+        <location line="+68"/>
+        <source>iR</source>
+        <translation type="unfinished">вх</translation>
+    </message>
+    <message>
+        <location line="+109"/>
+        <location line="+44"/>
+        <location line="+287"/>
+        <location line="+53"/>
+        <location line="+53"/>
+        <location line="+67"/>
+        <location line="+70"/>
         <source>off</source>
         <translation>выкл</translation>
     </message>
@@ -6521,6 +7495,7 @@ Enabled inputs in the list will
         <translation type="obsolete">выбрать патч инструмента</translation>
     </message>
     <message>
+        <location line="-552"/>
         <source>Transp.</source>
         <translation>Трансп.</translation>
     </message>
@@ -6529,26 +7504,47 @@ Enabled inputs in the list will
         <translation type="obsolete">Громкость</translation>
     </message>
     <message>
+        <location line="+210"/>
         <source>Channel Info</source>
         <translation>Инфо о канале</translation>
     </message>
     <message>
+        <location line="+35"/>
+        <source>Rec:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+200"/>
+        <source>Prog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+67"/>
+        <source>Vol</source>
+        <translation type="unfinished">Громк</translation>
+    </message>
+    <message>
+        <location line="+70"/>
         <source>Pan</source>
         <translation>Пан</translation>
     </message>
     <message>
+        <location line="-541"/>
         <source>Delay</source>
         <translation>Задержка</translation>
     </message>
     <message>
+        <location line="+293"/>
         <source>H-Bank</source>
         <translation>H-банк</translation>
     </message>
     <message>
+        <location line="-155"/>
         <source>Compr.</source>
         <translation>Компр.</translation>
     </message>
     <message>
+        <location line="+208"/>
         <source>L-Bank</source>
         <translation>L-банк</translation>
     </message>
@@ -6557,10 +7553,12 @@ Enabled inputs in the list will
         <translation type="obsolete">Прогр.</translation>
     </message>
     <message>
+        <location line="-255"/>
         <source>Velocity</source>
         <translation>Скорость нажатия</translation>
     </message>
     <message>
+        <location line="-47"/>
         <source>Length</source>
         <translation>Длина</translation>
     </message>
@@ -6613,34 +7611,41 @@ recording:
         <translation type="obsolete">Выбор Банка MSB</translation>
     </message>
     <message>
+        <location line="-268"/>
         <source>all midi events are sent to this output channel</source>
         <translation>все midi-события посланы на этот канал выхода</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>Out ch</source>
         <translation>Вых кан</translation>
     </message>
     <message>
+        <location line="+27"/>
         <source>input routing</source>
         <translation>маршрут входа</translation>
     </message>
     <message>
         <source>Inputs</source>
-        <translation>Входы</translation>
+        <translation type="obsolete">Входы</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>output routing</source>
         <translation>маршрут выхода</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>oR</source>
         <translation>вых</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>input detect</source>
         <translation>активность входа</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>
@@ -6648,74 +7653,90 @@ recording:
 выделенных каналах выделенных midi-портов.</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>W</source>
         <translation>W</translation>
     </message>
     <message>
+        <location line="+25"/>
         <source>Midi thru</source>
         <translation>Сквозной midi-канал</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Pass input events through (&apos;thru&apos;) to output.</source>
         <translation>Пропускать входные события через сквозной канал на выход.</translation>
     </message>
     <message>
+        <location line="+288"/>
         <source>Select instrument patch</source>
         <translation>Выбрать патч инструмента</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>&lt;unknown&gt;</source>
         <translation>&lt;неизвестно&gt;</translation>
     </message>
     <message>
         <source>Record:</source>
-        <translation>Записать:</translation>
+        <translation type="obsolete">Записать:</translation>
     </message>
     <message>
+        <location line="+37"/>
         <source>Add all settings to song</source>
         <translation>Добавить все настройки к проекту</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>All</source>
         <translation>Все</translation>
     </message>
     <message>
+        <location line="+31"/>
         <source>Bank Select MSB. Double-click on/off.</source>
         <translation>Банк Выбрать MSB. Двойной щелчок вкл/выкл.</translation>
     </message>
     <message>
+        <location line="+53"/>
         <source>Bank Select LSB. Double-click on/off.</source>
         <translation>Банк Выбрать LSB. Двойной щелчок вкл/выкл.</translation>
     </message>
     <message>
+        <location line="+53"/>
         <source>Program. Double-click on/off.</source>
         <translation>Программа. Двойной щелчок вкл/выкл.</translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>Add bank + prog settings to song</source>
         <translation>Добавить банк и программу в проект</translation>
     </message>
     <message>
         <source>Prog.</source>
-        <translation>Прог.</translation>
+        <translation type="obsolete">Прог.</translation>
     </message>
     <message>
+        <location line="+34"/>
         <source>Volume. Double-click on/off.</source>
         <translation>Громкость. Двойной щелчок вкл/выкл.</translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>Add vol setting to song</source>
         <translation>Добавить настройки громк. в проект</translation>
     </message>
     <message>
         <source>Vol.</source>
-        <translation>Громк.</translation>
+        <translation type="obsolete">Громк.</translation>
     </message>
     <message>
+        <location line="+34"/>
+        <location line="+3"/>
         <source>Change stereo position. Double-click on/off.</source>
         <translation>Изменить стерео позицию. Двойной щелчок вкл/выкл.</translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>Add pan setting to song</source>
         <translation>Добавить настройки панорамы к проекту</translation>
     </message>
@@ -6723,230 +7744,345 @@ recording:
 <context>
     <name>MidiTransformDialogBase</name>
     <message>
+        <location filename="../../muse/widgets/transformbase.ui" line="+14"/>
         <source>MusE: Midi Transformator</source>
         <translation>MusE: Преобразователь MIDI-сообщений</translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>&amp;New</source>
         <translation>&amp;Новая</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>&amp;Delete</source>
         <translation>У&amp;далить</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>&amp;Apply</source>
         <translation>&amp;Применить</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>&amp;OK</source>
         <translation>&amp;ОК</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Отмена</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>PresetList</source>
         <translation>Список пресетов</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>Processing</source>
         <translation>Обработка</translation>
     </message>
     <message>
+        <location line="+12"/>
+        <location line="+425"/>
         <source>Event Type</source>
         <translation>Тип события</translation>
     </message>
     <message>
+        <location line="-414"/>
+        <location line="+56"/>
+        <location line="+104"/>
+        <location line="+54"/>
+        <location line="+55"/>
         <source>Keep</source>
         <translation>Сохранить</translation>
     </message>
     <message>
+        <location line="-264"/>
+        <location line="+76"/>
+        <location line="+104"/>
+        <location line="+54"/>
         <source>Fix</source>
         <translation>Исправить</translation>
     </message>
     <message>
+        <location line="-222"/>
+        <location line="+339"/>
         <source>Note</source>
         <translation>Нота</translation>
     </message>
     <message>
+        <location line="-334"/>
+        <location line="+339"/>
         <source>Poly Pressure</source>
         <translation>Полифоническое нажатие</translation>
     </message>
     <message>
+        <location line="-334"/>
+        <location line="+339"/>
         <source>Control Change</source>
         <translation>Смена контроллера</translation>
     </message>
     <message>
+        <location line="-334"/>
+        <location line="+339"/>
         <source>Aftertouch</source>
         <translation>Посленажатие</translation>
     </message>
     <message>
+        <location line="-334"/>
+        <location line="+339"/>
         <source>Pitch Bend</source>
         <translation>Смена высоты тона</translation>
     </message>
     <message>
+        <location line="-334"/>
+        <location line="+339"/>
         <source>NRPN</source>
         <translation>NRPN</translation>
     </message>
     <message>
+        <location line="-334"/>
+        <location line="+339"/>
         <source>RPN</source>
         <translation>RPN</translation>
     </message>
     <message>
+        <location line="-325"/>
+        <location line="+104"/>
+        <location line="+54"/>
+        <location line="+55"/>
         <source>Plus</source>
         <translation>Плюс</translation>
     </message>
     <message>
+        <location line="-208"/>
+        <location line="+104"/>
+        <location line="+54"/>
+        <location line="+55"/>
         <source>Minus</source>
         <translation>Минус</translation>
     </message>
     <message>
+        <location line="-208"/>
+        <location line="+104"/>
+        <location line="+54"/>
+        <location line="+55"/>
         <source>Multiply</source>
         <translation>Умножить</translation>
     </message>
     <message>
+        <location line="-208"/>
+        <location line="+104"/>
+        <location line="+54"/>
+        <location line="+55"/>
         <source>Divide</source>
         <translation>Разделить</translation>
     </message>
     <message>
+        <location line="-203"/>
+        <location line="+43"/>
+        <location line="+265"/>
         <source>Value 2</source>
         <translation>Значение 2</translation>
     </message>
     <message>
+        <location line="-303"/>
+        <location line="+104"/>
         <source>Invert</source>
         <translation>Инвертировать</translation>
     </message>
     <message>
+        <location line="-99"/>
         <source>ScaleMap</source>
         <translation>Шкала</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Flip</source>
         <translation>Обратить</translation>
     </message>
     <message>
+        <location line="+5"/>
+        <location line="+94"/>
         <source>Dyn</source>
         <translation>Дин</translation>
     </message>
     <message>
+        <location line="-89"/>
+        <location line="+94"/>
         <source>Random</source>
         <translation>Случайно</translation>
     </message>
     <message>
+        <location line="-86"/>
+        <location line="+71"/>
+        <location line="+214"/>
         <source>Value 1</source>
         <translation>Значение 1</translation>
     </message>
     <message>
+        <location line="-265"/>
+        <location line="+324"/>
         <source>Length</source>
         <translation>Длина</translation>
     </message>
     <message>
+        <location line="-314"/>
         <source>Position</source>
         <translation>Позиция</translation>
     </message>
     <message>
+        <location line="+172"/>
         <source>Filter</source>
         <translation>Фильтр</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>All</source>
         <translation>Все</translation>
     </message>
     <message>
+        <location line="+5"/>
+        <location line="+91"/>
+        <location line="+59"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Equal</source>
         <translation>Равные</translation>
     </message>
     <message>
+        <location line="-223"/>
+        <location line="+91"/>
+        <location line="+59"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Unequal</source>
         <translation>Не равные</translation>
     </message>
     <message>
+        <location line="-147"/>
+        <location line="+59"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Ignore</source>
         <translation>Игнорировать</translation>
     </message>
     <message>
+        <location line="-122"/>
+        <location line="+59"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Higher</source>
         <translation>Выше</translation>
     </message>
     <message>
+        <location line="-132"/>
+        <location line="+59"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Lower</source>
         <translation>Ниже</translation>
     </message>
     <message>
+        <location line="-132"/>
+        <location line="+59"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Inside</source>
         <translation>Внутри</translation>
     </message>
     <message>
+        <location line="-132"/>
+        <location line="+59"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Outside</source>
         <translation>Вне</translation>
     </message>
     <message>
+        <location line="-119"/>
         <source>Bar Range</source>
         <translation>Диапазон тактов</translation>
     </message>
     <message>
+        <location line="+197"/>
         <source>Preset</source>
         <translation>Пресет</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Name:</source>
         <translation>Имя:</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Comment:</source>
         <translation>Комментарий:</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Range</source>
         <translation>Диапазон</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>process all events</source>
         <translation>обработать все события</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>selected tracks</source>
         <translation>выделенные треки</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>inside loop</source>
         <translation>Внутри цикла</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Function</source>
         <translation>Функция</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Select</source>
         <translation>Выделить</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Quantize</source>
         <translation>Квантовать</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Transform</source>
         <translation>Преобразовать</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Insert</source>
         <translation>Вставить</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Copy</source>
         <translation>Скопировать</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Extract</source>
         <translation>Извлечь</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Quantize Value</source>
         <translation>Значение квантования</translation>
     </message>
@@ -6954,6 +8090,8 @@ recording:
 <context>
     <name>MidiTransformerDialog</name>
     <message>
+        <location filename="../../muse/miditransform.cpp" line="+248"/>
+        <location line="+2"/>
         <source>New</source>
         <translation>Новый</translation>
     </message>
@@ -6961,6 +8099,7 @@ recording:
 <context>
     <name>MixdownFileDialog</name>
     <message>
+        <location filename="../../muse/widgets/mixdowndialog.cpp" line="+101"/>
         <source>Wave Files (*.wav);;All Files (*)</source>
         <translation>Файлы Wave (*.wav);;Все файлы (*)</translation>
     </message>
@@ -6968,50 +8107,62 @@ recording:
 <context>
     <name>MixdownFileDialogBase</name>
     <message>
+        <location filename="../../muse/widgets/mixdowndialogbase.ui" line="+14"/>
         <source>MusE: Set Mixdown Wavefile</source>
         <translation>MusE: Настроить параметры Wave-файла</translation>
     </message>
     <message>
+        <location line="+39"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>&amp;Cancel</source>
         <translation>О&amp;тменить</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>File Path</source>
         <translation>Путь к файлу</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Channel</source>
         <translation>Канал</translation>
     </message>
     <message>
+        <location line="+31"/>
         <source>Stereo</source>
         <translation>Стерео</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Mono</source>
         <translation>Моно</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>5.1</source>
         <translation>5.1</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>wav,16 Bit</source>
         <translation>wav, 16 бит</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>wav, 24 Bit</source>
         <translation>wav, 24 бита</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>wav, 32 Bit (float)</source>
         <translation>wav, 32 бита (float)</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Format</source>
         <translation>Формат</translation>
     </message>
@@ -7019,6 +8170,8 @@ recording:
 <context>
     <name>MusE</name>
     <message>
+        <location filename="../../muse/app.cpp" line="+201"/>
+        <location filename="../../muse/wave.cpp" line="+810"/>
         <source>Import Wave File</source>
         <translation>Импортировать WAV-файл</translation>
     </message>
@@ -7031,6 +8184,7 @@ recording:
         <translation type="obsolete">отменить действие</translation>
     </message>
     <message>
+        <location line="-119"/>
         <source>Und&amp;o</source>
         <translation>&amp;Отменить действие</translation>
     </message>
@@ -7039,18 +8193,22 @@ recording:
         <translation type="obsolete">повторить </translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Re&amp;do</source>
         <translation>&amp;Повторить</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>undo last change to song</source>
         <translation>отменить последнее изменение в проекте</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>redo last undo</source>
         <translation>повторить последнюю отмену</translation>
     </message>
     <message>
+        <location line="+424"/>
         <source>Transport</source>
         <translation>Транспорт</translation>
     </message>
@@ -7059,6 +8217,7 @@ recording:
         <translation type="obsolete">цикл</translation>
     </message>
     <message>
+        <location line="-410"/>
         <source>Loop</source>
         <translation>Цикл</translation>
     </message>
@@ -7067,6 +8226,7 @@ recording:
         <translation type="obsolete">начало врезки</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Punchin</source>
         <translation>Начало врезки</translation>
     </message>
@@ -7075,6 +8235,7 @@ recording:
         <translation type="obsolete">конец врезки</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Punchout</source>
         <translation>Конец врезки</translation>
     </message>
@@ -7083,6 +8244,7 @@ recording:
         <translation type="obsolete">к началу</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Start</source>
         <translation>К началу</translation>
     </message>
@@ -7091,6 +8253,7 @@ recording:
         <translation type="obsolete">перемотать назад</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Rewind</source>
         <translation>Перемотать назад</translation>
     </message>
@@ -7099,6 +8262,7 @@ recording:
         <translation type="obsolete">перемотать вперёд</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Forward</source>
         <translation>Перемотать вперёд</translation>
     </message>
@@ -7107,6 +8271,7 @@ recording:
         <translation type="obsolete">остановить</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Stop</source>
         <translation>Остановить</translation>
     </message>
@@ -7115,6 +8280,7 @@ recording:
         <translation type="obsolete">воспроизвести</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Play</source>
         <translation>Воспроизвести</translation>
     </message>
@@ -7123,6 +8289,7 @@ recording:
         <translation type="obsolete">записать</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Record</source>
         <translation>Записать</translation>
     </message>
@@ -7131,6 +8298,8 @@ recording:
         <translation type="obsolete">паника</translation>
     </message>
     <message>
+        <location line="+6"/>
+        <location line="+349"/>
         <source>Panic</source>
         <translation>Паника</translation>
     </message>
@@ -7139,6 +8308,7 @@ recording:
         <translation type="obsolete">новый</translation>
     </message>
     <message>
+        <location line="-337"/>
         <source>&amp;New</source>
         <translation>&amp;Новый</translation>
     </message>
@@ -7147,6 +8317,7 @@ recording:
         <translation type="obsolete">открыть</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>&amp;Open</source>
         <translation>&amp;Открыть</translation>
     </message>
@@ -7155,6 +8326,9 @@ recording:
         <translation type="obsolete">сохранить</translation>
     </message>
     <message>
+        <location line="+7"/>
+        <location line="+1168"/>
+        <location line="+1471"/>
         <source>&amp;Save</source>
         <translation>&amp;Сохранить</translation>
     </message>
@@ -7163,238 +8337,298 @@ recording:
         <translation type="obsolete">пианорол</translation>
     </message>
     <message>
+        <location line="-2587"/>
         <source>Pianoroll</source>
         <translation>Пианоролл</translation>
     </message>
     <message>
+        <location line="+251"/>
         <source>File Buttons</source>
         <translation>Файловые кнопки</translation>
     </message>
     <message>
+        <location line="+71"/>
         <source>&amp;File</source>
         <translation>&amp;Файл</translation>
     </message>
     <message>
+        <location line="-376"/>
         <source>Open &amp;Recent</source>
         <translation>Открыть  &amp;Недавние</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Save &amp;As</source>
         <translation>Сохранить &amp;Как</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Import Midifile</source>
         <translation>Импортировать MIDI-файл</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Export Midifile</source>
         <translation>Экспортировать MIDI-файл</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>&amp;Quit</source>
         <translation>Вы&amp;йти</translation>
     </message>
     <message>
+        <location line="+383"/>
         <source>&amp;Edit</source>
         <translation>&amp;Правка</translation>
     </message>
     <message>
+        <location line="-380"/>
         <source>C&amp;ut</source>
         <translation>&amp;Вырезать</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>&amp;Copy</source>
         <translation>С&amp;копировать</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>&amp;Paste</source>
         <translation>&amp;Вставить</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Add Track</source>
         <translation>Добавить трек</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Select &amp;All</source>
         <translation>Выделить &amp;всё</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>&amp;Deselect All</source>
         <translation>&amp;Убрать выделение</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Invert &amp;Selection</source>
         <translation>Обратить в&amp;ыделение</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>&amp;Inside Loop</source>
         <translation>&amp;Внутри цикла</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>&amp;Outside Loop</source>
         <translation>&amp;Вне цикла</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>All &amp;Parts on Track</source>
         <translation>Все &amp;партии в треке</translation>
     </message>
     <message>
+        <location line="-8"/>
         <source>Select</source>
         <translation>Выделить</translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Drums</source>
         <translation>Ударные</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <location line="+6"/>
         <source>List</source>
         <translation>Список</translation>
     </message>
     <message>
+        <location line="-1"/>
         <source>Graphic</source>
         <translation>Графика</translation>
     </message>
     <message>
+        <location line="-2"/>
         <source>Mastertrack</source>
         <translation>Мастер-трек</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Midi &amp;Transform</source>
         <translation>&amp;Преобразовать MIDI-сообщения</translation>
     </message>
     <message>
+        <location line="+374"/>
         <source>Modify Gate Time</source>
         <translation>Изменить время звучания</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Modify Velocity</source>
         <translation>Изменить скорость нажима</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Crescendo</source>
         <translation>Крещендо</translation>
     </message>
     <message>
+        <location line="-344"/>
         <source>Transpose</source>
         <translation>Транспонировать</translation>
     </message>
     <message>
+        <location line="+345"/>
         <source>Thin Out</source>
         <translation>Удалить дубли</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Erase Event</source>
         <translation>Удалить событие</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Note Shift</source>
         <translation>Сдвиг ноты</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Move Clock</source>
         <translation>Передвинуть время</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Copy Measure</source>
         <translation>Скопировать такт</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Erase Measure</source>
         <translation>Стереть такт</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Delete Measure</source>
         <translation>Удалить такт</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Create Measure</source>
         <translation>Создать такт</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Mix Track</source>
         <translation>Микшировать трек</translation>
     </message>
     <message>
+        <location line="-388"/>
         <source>Midi</source>
         <translation>Midi</translation>
     </message>
     <message>
+        <location line="+412"/>
         <source>&amp;Structure</source>
         <translation>&amp;Структура</translation>
     </message>
     <message>
+        <location line="-390"/>
         <source>Global Cut</source>
         <translation>Глобальное вырезание</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Global Insert</source>
         <translation>Глобальная вставка</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Global Split</source>
         <translation>Глобальное разделение</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Copy Range</source>
         <translation>Скопировать диапазон</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Cut Events</source>
         <translation>Вырезать события</translation>
     </message>
     <message>
+        <location line="-19"/>
         <source>Transport Panel</source>
         <translation>Панель транспорта</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Bigtime Window</source>
         <translation>Окно хронометра</translation>
     </message>
     <message>
-        <source>Don't Follow Song</source>
+        <location line="+53"/>
+        <source>Don&apos;t Follow Song</source>
         <translation>не следовать за проектом</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Follow Page</source>
         <translation>следовать постранично</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Follow Continuous</source>
         <translation>следовать плавно</translation>
     </message>
     <message>
+        <location line="-8"/>
         <source>Global Settings</source>
         <translation>Общие настройки</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Follow Song</source>
         <translation>следовать за проектом</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Metronome</source>
         <translation>Метроном</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Midi Sync</source>
         <translation>MIDI-синхр</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Appearance Settings</source>
         <translation>Настройки вида</translation>
     </message>
     <message>
+        <location line="-38"/>
         <source>Midi Input Transform</source>
         <translation>Преобразование входящих MIDI-сообщений</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Midi Input Filter</source>
         <translation>Фильтр входящих MIDI-событий</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Midi Remote Control</source>
         <translation>Дистанционное управление MIDI</translation>
     </message>
     <message>
+        <location line="+386"/>
         <source>&amp;Midi</source>
         <translation>&amp;MIDI</translation>
     </message>
@@ -7403,34 +8637,42 @@ recording:
         <translation type="obsolete">Микшер</translation>
     </message>
     <message>
+        <location line="-391"/>
         <source>Input Plugins</source>
         <translation>Плагины на входе</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Reset Instr.</source>
         <translation>Перезагрузить Инстр.</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Init Instr.</source>
         <translation>Запустить Инстр.</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Local Off</source>
         <translation>откл. локальное управление</translation>
     </message>
     <message>
+        <location line="+406"/>
         <source>&amp;Audio</source>
         <translation>&amp;Аудио</translation>
     </message>
     <message>
+        <location line="-403"/>
         <source>Bounce to Track</source>
         <translation>Свести в трек</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Bounce to File</source>
         <translation>Свести в файл</translation>
     </message>
     <message>
+        <location line="+443"/>
         <source>&amp;Help</source>
         <translation>&amp;Помощь</translation>
     </message>
@@ -7443,40 +8685,53 @@ recording:
         <translation type="obsolete">Неизвестный формат файла</translation>
     </message>
     <message>
+        <location line="+499"/>
         <source>MusE: load project</source>
         <translation>MusE: Открыть проект</translation>
     </message>
     <message>
+        <location line="+76"/>
         <source>MusE: Write File failed</source>
         <translation>MusE: Попытка записать файл не удалась</translation>
     </message>
     <message>
+        <location line="+38"/>
         <source>The current Project contains unsaved data
 Save Current Project?</source>
         <translation>Текущий проект содержит не сохранённые данные.
 Сохранить текущий проект?</translation>
     </message>
     <message>
+        <location line="+1473"/>
+        <location filename="../../muse/importmidi.cpp" line="+68"/>
         <source>&amp;Abort</source>
         <translation>&amp;Отмена</translation>
     </message>
     <message>
+        <location line="-1275"/>
+        <location line="+13"/>
         <source>MusE: Save As</source>
         <translation>MusE: Сохранить как</translation>
     </message>
     <message>
+        <location line="-390"/>
+        <location line="+399"/>
+        <location line="+1199"/>
         <source>MusE: Song: </source>
         <translation>MusE: Проект: </translation>
     </message>
     <message>
+        <location filename="../../muse/importmidi.cpp" line="-12"/>
         <source>MusE: Import Midi</source>
         <translation>MusE: Импорт MIDI</translation>
     </message>
     <message>
+        <location filename="../../muse/exportmidi.cpp" line="+126"/>
         <source>MusE: Export Midi</source>
         <translation>MusE:Экспорт MIDI</translation>
     </message>
     <message>
+        <location filename="../../muse/importmidi.cpp" line="+42"/>
         <source>reading midifile
   </source>
         <translation>читается MIDI-файл
@@ -7484,22 +8739,29 @@ Save Current Project?</source>
   </translation>
     </message>
     <message>
+        <location filename="../../muse/app.cpp" line="-1151"/>
+        <location line="+197"/>
         <source>Nothing to edit</source>
         <translation>Нечего редактировать</translation>
     </message>
     <message>
         <source>MusE: Copy Range</source>
-        <translation>MusE: Скопировать диапазон</translation>
+        <translation type="obsolete">MusE: Скопировать диапазон</translation>
     </message>
     <message>
         <source>not implemented</source>
-        <translation>не реализовано</translation>
+        <translation type="obsolete">не реализовано</translation>
     </message>
     <message>
         <source>MusE: Cut Events</source>
-        <translation>MusE: Вырезать события</translation>
+        <translation type="obsolete">MusE: Вырезать события</translation>
     </message>
     <message>
+        <location line="+763"/>
+        <location line="+10"/>
+        <location line="+31"/>
+        <location line="+34"/>
+        <location line="+8"/>
         <source>MusE: Bounce to Track</source>
         <translation>MusE: Сведение в Трек</translation>
     </message>
@@ -7518,6 +8780,7 @@ select wave track as target</source>
         <translation type="obsolete">трек не выбран</translation>
     </message>
     <message>
+        <location line="+159"/>
         <source>The current Project contains unsaved data
 Load overwrites current Project:
 Save Current Project?</source>
@@ -7526,14 +8789,17 @@ Save Current Project?</source>
 Сохранить текущий проект?</translation>
     </message>
     <message>
+        <location filename="../../muse/help.cpp" line="+33"/>
         <source>no help found at: </source>
         <translation>справка не найдена в: </translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>MusE: Open Help</source>
         <translation>MusE: Открыть справку</translation>
     </message>
     <message>
+        <location filename="../../muse/app.cpp" line="-2499"/>
         <source>Midi Ports / Soft Synth</source>
         <translation>MIDI-порты / Прогр. синтезаторы</translation>
     </message>
@@ -7542,38 +8808,44 @@ Save Current Project?</source>
         <translation type="obsolete">чтобы импортировать аудио-файл, вы должны сначала выделить звуковой трек</translation>
     </message>
     <message>
+        <location line="-112"/>
         <source>Delete Selected Tracks</source>
         <translation>Удалить выделенные треки</translation>
     </message>
     <message>
         <source>View</source>
-        <translation>Вид</translation>
+        <translation type="obsolete">Вид</translation>
     </message>
     <message>
+        <location line="+86"/>
         <source>Restart Audio</source>
         <translation>Перезапустить аудио</translation>
     </message>
     <message>
         <source>Automation</source>
-        <translation>Автоматизация</translation>
+        <translation type="obsolete">Автоматизация</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Mixer Automation</source>
         <translation>Автоматизация микшера</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Take Snapshot</source>
         <translation>Сделать снимок</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Clear Automation Data</source>
         <translation>Удалить Данные Автоматизации</translation>
     </message>
     <message>
         <source>Settings</source>
-        <translation>Настройки</translation>
+        <translation type="obsolete">Настройки</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Configure Shortcuts</source>
         <translation>Настроить горячие клавиши</translation>
     </message>
@@ -7582,18 +8854,22 @@ Save Current Project?</source>
         <translation type="obsolete">Экспорт Midi Файла</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>&amp;Manual</source>
         <translation>&amp;Руководство</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>&amp;MusE Homepage</source>
         <translation>&amp;Домашняя страница MusE</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>&amp;Report Bug...</source>
         <translation>&amp;Сообщить об ошибке...</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>&amp;About MusE</source>
         <translation>&amp;О программе MusE</translation>
     </message>
@@ -7602,30 +8878,36 @@ Save Current Project?</source>
         <translation type="obsolete">Что &amp;Это</translation>
     </message>
     <message>
+        <location line="+679"/>
         <source>Cannot read template</source>
         <translation>Не могу прочитать шаблон</translation>
     </message>
     <message>
+        <location line="+31"/>
         <source>File open error</source>
         <translation>Ошибка при открытии файла</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>File read error</source>
         <translation>Ошибка прочтения файла</translation>
     </message>
     <message>
+        <location line="+200"/>
         <source>MusE: load template</source>
         <translation>MusE: открыть шаблон</translation>
     </message>
     <message>
         <source>MusE: Bounce</source>
-        <translation>MusE: Свести</translation>
+        <translation type="obsolete">MusE: Свести</translation>
     </message>
     <message>
         <source>set left/right marker for bounce range</source>
-        <translation>настройте левый/правый маркеры для установки диапазона сведения</translation>
+        <translation type="obsolete">настройте левый/правый маркеры для установки диапазона сведения</translation>
     </message>
     <message>
+        <location line="+1443"/>
+        <location line="+25"/>
         <source>MusE: Bounce to File</source>
         <translation>MusE: Свести в файл</translation>
     </message>
@@ -7634,34 +8916,42 @@ Save Current Project?</source>
         <translation type="obsolete">выходной трек не найден</translation>
     </message>
     <message>
+        <location filename="../../muse/importmidi.cpp" line="-33"/>
         <source>Add midi file to current project?
 </source>
         <translation>Добавить midi файл в текущий проект?
 </translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>&amp;Add to Project</source>
         <translation>&amp;Добавить в Проект</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>&amp;Replace</source>
         <translation>&amp;Заменить</translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>
 failed: </source>
         <translation>
 не удалось:</translation>
     </message>
     <message>
+        <location filename="../../muse/app.cpp" line="-2525"/>
         <source>Import Part</source>
         <translation>Импортировать Партию</translation>
     </message>
     <message>
+        <location line="+71"/>
         <source>Marker View</source>
         <translation>Маркеры</translation>
     </message>
     <message>
+        <location line="+1088"/>
+        <location line="+1471"/>
         <source>&amp;Skip</source>
         <translation>Не сохранять</translation>
     </message>
@@ -7670,148 +8960,235 @@ failed: </source>
         <translation type="obsolete">Импорт партии действителен только для midi треков!</translation>
     </message>
     <message>
+        <location filename="../../muse/importmidi.cpp" line="+364"/>
         <source>MusE: load part</source>
         <translation>MusE: открыть партию</translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>No track selected for import</source>
         <translation>Не выбран трек для импорта</translation>
     </message>
     <message>
+        <location filename="../../muse/app.cpp" line="-3326"/>
+        <location line="+18"/>
         <source>Failed to start audio!</source>
         <translation>Не могу воспроизводить аудио!</translation>
     </message>
     <message>
+        <location line="-17"/>
         <source>Was not able to start audio, check if jack is running.
 </source>
         <translation>Не могу воспроизводить аудио, проверте работает ли &quot;Jack&quot;.
 </translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Timeout waiting for audio to run. Check if jack is running.
 </source>
         <translation>Ожидание запуска аудио. Проверте, работает ли &quot;Jack&quot;.
  </translation>
     </message>
     <message>
+        <location line="+688"/>
         <source>&amp;Insert</source>
         <translation>&amp;Вставить</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Paste c&amp;lone</source>
         <translation>Вставить к&amp;лон</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Paste to &amp;track</source>
         <translation>Вставить в &amp;трек</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Paste clone to trac&amp;k</source>
         <translation>Вставить клон в &amp;трек</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Insert Empty Measure</source>
         <translation>&amp;Вставить пустой такт</translation>
     </message>
     <message>
+        <location line="-9"/>
+        <source>Find unused wave files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>Score</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>all parts in one staff</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>one staff per part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>New score window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Wave</source>
         <translation>Wave</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Song Info</source>
         <translation>Проект инфо</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Mixer A</source>
         <translation>Микшер А</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Mixer B</source>
         <translation>Микшер В</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Cliplist</source>
         <translation>Список фрагментов</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>&amp;Plugins</source>
         <translation>&amp;Плагины</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Edit Instrument</source>
         <translation>Редактировать Инструмент</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Rhythm Generator</source>
         <translation>Генератор Ритма</translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>Midi File Import/Export</source>
         <translation>Импорт/Экспорт midi-файла</translation>
     </message>
     <message>
+        <location line="+325"/>
+        <source>&amp;View</source>
+        <translation type="unfinished">&amp;Вид</translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <source>A&amp;utomation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Se&amp;ttings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+346"/>
         <source>Unknown File Format: </source>
         <translation>Несзвестный формат файла: </translation>
     </message>
     <message>
+        <location line="+289"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+286"/>
+        <location line="+6"/>
+        <source>New</source>
+        <translation type="unfinished">Новый</translation>
+    </message>
+    <message>
+        <location line="+935"/>
         <source>No wave tracks found</source>
         <translation>wave-треки не найдены</translation>
     </message>
     <message>
+        <location line="+10"/>
+        <location line="+105"/>
         <source>No audio output tracks found</source>
         <translation>Выходные аудио треки не найдены</translation>
     </message>
     <message>
+        <location line="-74"/>
         <source>Select one audio output track,
 and one target wave track</source>
         <translation>Выберите один трек аудио выхода
 и один wave-трек, как цель </translation>
     </message>
     <message>
+        <location line="+34"/>
         <source>Select one target wave track</source>
         <translation>Выделите один wave-трек, как цель (трек назначения) </translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Select one target wave track,
 and one audio output track</source>
         <translation>Выберите один wave-трек, как цель,
 (трек назначения) и один трек аудио выхода</translation>
     </message>
     <message>
+        <location line="+57"/>
         <source>Select one audio output track</source>
         <translation>Выделите один трек аудио выхода</translation>
     </message>
     <message>
+        <location filename="../../muse/importmidi.cpp" line="-26"/>
         <source>Import part is only valid for midi and wave tracks!</source>
         <translation>Импортирование партий допустимо только для midi и wave треков!</translation>
     </message>
     <message>
+        <location line="+147"/>
         <source> out of </source>
         <translation> за </translation>
     </message>
     <message>
+        <location line="+1"/>
         <source> parts</source>
         <translation> партии</translation>
     </message>
     <message>
+        <location line="+0"/>
         <source> part</source>
         <translation> партия</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source> could not be imported.
 Likely the track is the wrong type.</source>
         <translation> не может быть импортирована
 Возможно неверный тип трека.</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>чтобы импортировать аудио файл, вы должны сначала выделить wave-трек</translation>
     </message>
     <message>
+        <location line="+30"/>
         <source>Import Wavefile</source>
         <translation>Импортировать 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>
@@ -7820,18 +9197,22 @@ Do you still want to import it?</source>
 Хотите ли вы импортировать его?</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>&amp;Yes</source>
         <translation>&amp;Да</translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>&amp;No</source>
         <translation>&amp;Нет</translation>
     </message>
     <message>
+        <location filename="../../muse/help.cpp" 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>
@@ -7899,26 +9280,32 @@ browser on your machine.</source>
 <context>
     <name>NoteInfo</name>
     <message>
+        <location filename="../../muse/widgets/noteinfo.cpp" line="+27"/>
         <source>Note Info</source>
         <translation>Информация о ноте</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Start</source>
         <translation>Начало</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Len</source>
         <translation>Дл</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Pitch</source>
         <translation>Высота тона</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Velo On</source>
         <translation>Скор. наж</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Velo Off</source>
         <translation>Скор. снятия</translation>
     </message>
@@ -7926,90 +9313,122 @@ browser on your machine.</source>
 <context>
     <name>OrganGuiBase</name>
     <message>
+        <location filename="../../synti/organ/organguibase.ui" line="+20"/>
         <source>MusE: Organ</source>
         <translation>MusE: Орган</translation>
     </message>
     <message>
+        <location line="+763"/>
         <source>O-1</source>
         <translation>O-1</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Oscillator</source>
         <translation>Осциллятор</translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Brass</source>
         <translation>Медные духовые</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Reed</source>
         <translation>Язычковые деревянные духовые</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Flute</source>
         <translation>Флейта</translation>
     </message>
     <message>
+        <location line="-796"/>
         <source>16&apos;</source>
         <translation>16&apos;</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>4&apos;</source>
         <translation>4&apos;</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>2 2/3&apos;</source>
         <translation>2 2/3&apos;</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>2&apos;</source>
         <translation>2&apos;</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>8&apos;</source>
         <translation>8&apos;</translation>
     </message>
     <message>
+        <location line="-10"/>
         <source>5 1/3&apos;</source>
         <translation>5 1/3&apos;</translation>
     </message>
     <message>
+        <location line="+254"/>
+        <location line="+252"/>
         <source>Release</source>
         <translation>Послезвучие</translation>
     </message>
     <message>
+        <location line="-242"/>
+        <location line="+232"/>
         <source>Sustain</source>
         <translation>Стационарная часть звука</translation>
     </message>
     <message>
+        <location line="-222"/>
+        <location line="+212"/>
         <source>Decay</source>
         <translation>Спад огибающей</translation>
     </message>
     <message>
+        <location line="-196"/>
+        <location line="+186"/>
         <source>Attack</source>
         <translation>Атака</translation>
     </message>
     <message>
+        <location line="-110"/>
+        <location line="+41"/>
+        <location line="+35"/>
+        <location line="+171"/>
+        <location line="+16"/>
+        <location line="+38"/>
         <source>ms</source>
         <translation>мс</translation>
     </message>
     <message>
+        <location line="+112"/>
         <source>Velocity</source>
         <translation>Скорость нажатия</translation>
     </message>
     <message>
+        <location line="-831"/>
         <source>Drawbars</source>
         <translation>Слайдеры регистров</translation>
     </message>
     <message>
+        <location line="+294"/>
         <source>Envelope Hi</source>
         <translation>Верх огибающей</translation>
     </message>
     <message>
+        <location line="+181"/>
+        <location line="+222"/>
         <source>cB</source>
         <translation>cB</translation>
     </message>
     <message>
+        <location line="-184"/>
         <source>Envelope Lo</source>
         <translation>Низ огибающей</translation>
     </message>
@@ -8017,124 +9436,157 @@ browser on your machine.</source>
 <context>
     <name>PartCanvas</name>
     <message>
+        <location filename="../../muse/arranger/pcanvas.cpp" line="+485"/>
         <source>Cannot copy/move/clone to different Track-Type</source>
         <translation>Невозможно копировать/перемещать/клонировать данные в другие типы дорожек</translation>
     </message>
     <message>
+        <location line="+258"/>
         <source>C&amp;ut</source>
         <translation>&amp;Вырезать</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>&amp;Copy</source>
         <translation>С&amp;копировать</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>rename</source>
         <translation>Переименовать</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>color</source>
         <translation>цвет</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>delete</source>
         <translation>удалить</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>split</source>
         <translation>разделить</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>glue</source>
         <translation>склеить</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>de-clone</source>
         <translation>деклонировать</translation>
     </message>
     <message>
         <source>pianoroll</source>
-        <translation>Пианорол</translation>
+        <translation type="obsolete">Пианорол</translation>
     </message>
     <message>
         <source>list</source>
-        <translation>Редактор списка событий</translation>
+        <translation type="obsolete">Редактор списка событий</translation>
     </message>
     <message>
         <source>drums</source>
-        <translation>Редактор ударных</translation>
+        <translation type="obsolete">Редактор ударных</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>wave edit</source>
         <translation>Редактор семплов</translation>
     </message>
     <message>
+        <location line="+1874"/>
         <source>Cannot paste: multiple tracks selected</source>
         <translation>Вставка невозможна: выделено несколько треков</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Cannot paste: no track selected</source>
         <translation>Вставка невозможна: не выделено ни  одного трека</translation>
     </message>
     <message>
+        <location line="+52"/>
         <source>Cannot paste: wrong data type</source>
         <translation>Вставка невозможна: неверный тип данных</translation>
     </message>
     <message>
+        <location line="-32"/>
         <source>Can only paste to midi/drum track</source>
         <translation>Можно вставить только в midi/drum трек</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Can only paste to wave track</source>
         <translation>Можно вставить только в звуковой трек</translation>
     </message>
     <message>
         <source>export</source>
-        <translation>экспорт</translation>
+        <translation type="obsolete">экспорт</translation>
     </message>
     <message>
+        <location line="-1803"/>
         <source>MusE: save part</source>
         <translation>MusE: сохранить партию</translation>
     </message>
     <message>
+        <location line="-163"/>
         <source>s&amp;elect </source>
         <translation>В&amp;ыбрать </translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>clones</source>
         <translation>клоны</translation>
     </message>
     <message>
+        <location line="+36"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <source>save part to disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>file info</source>
         <translation>файл-инфо</translation>
     </message>
     <message>
+        <location line="+127"/>
         <source>Part name</source>
         <translation>Имя партии</translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>Files</source>
         <translation>Файлы</translation>
     </message>
     <message>
+        <location line="+1322"/>
         <source> out of </source>
         <translation> из </translation>
     </message>
     <message>
+        <location line="+1"/>
         <source> parts</source>
         <translation> партии</translation>
     </message>
     <message>
+        <location line="+0"/>
         <source> part</source>
         <translation>партия</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source> could not be pasted.
 Likely the selected track is the wrong type.</source>
         <translation> не может быть вставлена.
 Возможно выбранный трек не того типа.</translation>
     </message>
     <message>
+        <location line="+472"/>
         <source>Can only paste to midi or wave track</source>
         <translation>Можно вставить только в midi или wave треки</translation>
     </message>
@@ -8156,6 +9608,7 @@ Likely the selected track is the wrong type.</source>
 <context>
     <name>PianoRoll</name>
     <message>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="+85"/>
         <source>&amp;Edit</source>
         <translation>&amp;Правка</translation>
     </message>
@@ -8196,6 +9649,7 @@ Likely the selected track is the wrong type.</source>
         <translation type="obsolete">Вне цикла</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>&amp;Select</source>
         <translation>&amp;Выбрать</translation>
     </message>
@@ -8212,6 +9666,7 @@ Likely the selected track is the wrong type.</source>
         <translation type="obsolete">цвета скорости нажатия</translation>
     </message>
     <message>
+        <location line="+36"/>
         <source>&amp;Config</source>
         <translation>&amp;Настроить</translation>
     </message>
@@ -8220,182 +9675,241 @@ Likely the selected track is the wrong type.</source>
         <translation type="obsolete">цвет события</translation>
     </message>
     <message>
+        <location line="+30"/>
         <source>&amp;Functions</source>
         <translation>&amp;Функции</translation>
     </message>
     <message>
         <source>Over Quantize</source>
-        <translation>Квантовка</translation>
+        <translation type="obsolete">Квантовка</translation>
     </message>
     <message>
         <source>Note On Quantize</source>
-        <translation>Квантовка начала ноты</translation>
+        <translation type="obsolete">Квантовка начала ноты</translation>
     </message>
     <message>
         <source>Note On/Off Quantize</source>
-        <translation>Квантовка начала/окончания ноты</translation>
+        <translation type="obsolete">Квантовка начала/окончания ноты</translation>
     </message>
     <message>
         <source>Iterative Quantize</source>
-        <translation>Повторная квантовка</translation>
+        <translation type="obsolete">Повторная квантовка</translation>
     </message>
     <message>
         <source>Config Quant...</source>
-        <translation>Настройка квантования</translation>
+        <translation type="obsolete">Настройка квантования</translation>
     </message>
     <message>
         <source>Modify Gate Time</source>
-        <translation>Изменить время звучания</translation>
+        <translation type="obsolete">Изменить время звучания</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Modify Velocity</source>
         <translation>Изменить скорость нажатия</translation>
     </message>
     <message>
         <source>Crescendo</source>
-        <translation>Крещендо</translation>
+        <translation type="obsolete">Крещендо</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Transpose</source>
         <translation>Транспонировать</translation>
     </message>
     <message>
         <source>Thin Out</source>
-        <translation>Удалить дубли</translation>
+        <translation type="obsolete">Удалить дубли</translation>
     </message>
     <message>
         <source>Erase Event</source>
-        <translation>Удалить событие</translation>
+        <translation type="obsolete">Удалить событие</translation>
     </message>
     <message>
         <source>Note Shift</source>
-        <translation>Сдвиг ноты</translation>
+        <translation type="obsolete">Сдвиг ноты</translation>
     </message>
     <message>
         <source>Move Clock</source>
-        <translation>Сдвинуть время</translation>
+        <translation type="obsolete">Сдвинуть время</translation>
     </message>
     <message>
         <source>Copy Measure</source>
-        <translation>Скопировать такт</translation>
+        <translation type="obsolete">Скопировать такт</translation>
     </message>
     <message>
         <source>Erase Measure</source>
-        <translation>Стереть такт</translation>
+        <translation type="obsolete">Стереть такт</translation>
     </message>
     <message>
         <source>Delete Measure</source>
-        <translation>Удалить такт</translation>
+        <translation type="obsolete">Удалить такт</translation>
     </message>
     <message>
         <source>Create Measure</source>
-        <translation>Создать такт</translation>
+        <translation type="obsolete">Создать такт</translation>
     </message>
     <message>
         <source>Pianoroll Tools</source>
         <translation type="obsolete">Инструменты пианорола</translation>
     </message>
     <message>
+        <location line="+37"/>
         <source>Step Record</source>
         <translation>Пошаговая запись</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Midi Input</source>
         <translation>MIDI-вход</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Play Events</source>
         <translation>Воспроизвести события</translation>
     </message>
     <message>
+        <location line="+37"/>
         <source>ctrl</source>
         <translation>кнтр</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Add Controller View</source>
         <translation>Добавить панель контроллеров</translation>
     </message>
     <message>
+        <location line="-78"/>
         <source>Set Fixed Length</source>
         <translation>Установить фикс. длину</translation>
     </message>
     <message>
+        <location line="-118"/>
         <source>C&amp;ut</source>
         <translation>&amp;Вырезать</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>&amp;Copy</source>
         <translation>С&amp;копировать</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>&amp;Paste</source>
         <translation>&amp;Вставить</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Delete &amp;Events</source>
         <translation>Удалить &amp;События</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Select &amp;All</source>
         <translation>Выбрать &amp;Всё</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>&amp;Deselect All</source>
         <translation>&amp;Убрать выделение</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Invert &amp;Selection</source>
         <translation>Обратить В&amp;ыделение</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>&amp;Inside Loop</source>
         <translation>&amp;Внутри цикла</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>&amp;Outside Loop</source>
         <translation>&amp;Вне цикла</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>&amp;Previous Part</source>
         <translation>&amp;Предыдущая партия</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>&amp;Next Part</source>
         <translation>&amp;Следующая партия</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>&amp;Event Color</source>
         <translation>&amp;Цвет события</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>&amp;Blue</source>
         <translation>&amp;Синий</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>&amp;Pitch colors</source>
         <translation>&amp;Цвета высоты тона</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>&amp;Velocity colors</source>
         <translation>&amp;Цвета скорости нажатия</translation>
     </message>
     <message>
+        <location line="+16"/>
+        <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="+8"/>
         <source>Delete Overlaps</source>
         <translation>Удалить наложения</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>
     </message>
     <message>
+        <location line="+6"/>
         <source>Pianoroll tools</source>
         <translation>Инструменты пианоролла</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>panic</source>
         <translation>паника</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>transport</source>
         <translation>транспорт</translation>
     </message>
@@ -8403,58 +9917,72 @@ Likely the selected track is the wrong type.</source>
 <context>
     <name>PluginDialog</name>
     <message>
+        <location filename="../../muse/plugin.cpp" line="+3032"/>
         <source>MusE: select plugin</source>
         <translation>MusE: выбрать плагин</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Lib</source>
         <translation>Библ.</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Label</source>
         <translation>Метка</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Name</source>
         <translation>Имя</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>CP</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>Создатель</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Copyright</source>
         <translation>Copyright</translation>
     </message>
     <message>
+        <location line="+30"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
@@ -8463,10 +9991,12 @@ Likely the selected track is the wrong type.</source>
         <translation type="obsolete">Стерео и Моно</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Stereo</source>
         <translation>Стерео</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Mono</source>
         <translation>Моно</translation>
     </message>
@@ -8475,18 +10005,22 @@ Likely the selected track is the wrong type.</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>
     </message>
     <message>
+        <location line="-28"/>
         <source>Mono and Stereo</source>
         <translation>Моно и Стерео</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Show All</source>
         <translation>Показать Все</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>Search in &apos;Label&apos; and &apos;Name&apos;:</source>
         <translation>Искать по &quot;Меткам&quot; и &quot;Именам&quot;:</translation>
     </message>
@@ -8494,30 +10028,38 @@ Likely the selected track is the wrong type.</source>
 <context>
     <name>PluginGui</name>
     <message>
+        <location line="+207"/>
         <source>File Buttons</source>
         <translation>Файловые кнопки</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Load Preset</source>
         <translation>Загрузить пресет</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Save Preset</source>
         <translation>Сохранить пресет</translation>
     </message>
     <message>
+        <location line="+6"/>
+        <location line="+3"/>
         <source>bypass plugin</source>
         <translation>обойти плагин</translation>
     </message>
     <message>
+        <location line="+543"/>
         <source>MusE: load preset</source>
         <translation>MusE: загрузить пресет</translation>
     </message>
     <message>
+        <location line="+66"/>
         <source>MusE: save preset</source>
         <translation>MusE: сохранить пресет</translation>
     </message>
     <message>
+        <location line="-41"/>
         <source>Error reading preset. Might not be right type for this plugin</source>
         <translation>Ошибка прочтения пресета. Возможно неверный тип для этого плагина</translation>
     </message>
@@ -8658,6 +10200,7 @@ currently not used</source>
 <context>
     <name>QObject</name>
     <message>
+        <location filename="../../muse/app.cpp" line="-2773"/>
         <source>Other</source>
         <translation>Другой</translation>
     </message>
@@ -8665,26 +10208,34 @@ currently not used</source>
 <context>
     <name>QWidget</name>
     <message>
+        <location filename="../../muse/instruments/minstrument.cpp" line="+56"/>
+        <location filename="../../muse/liste/editevent.cpp" line="-418"/>
         <source>Cannot convert sysex string</source>
         <translation>Невозможно конвертировать строку SysEx</translation>
     </message>
     <message>
+        <location line="+8"/>
+        <location filename="../../muse/liste/editevent.cpp" line="+8"/>
         <source>Hex String too long (2048 bytes limit)</source>
         <translation>Hex-строка слишком длинная (предел составляет 2048 байтов)</translation>
     </message>
     <message>
+        <location line="+189"/>
         <source>generic midi</source>
         <translation>обычный MIDI</translation>
     </message>
     <message>
+        <location filename="../../muse/miditransform.cpp" line="+92"/>
         <source>new</source>
         <translation>новый</translation>
     </message>
     <message>
+        <location filename="../../muse/wave.cpp" line="-675"/>
         <source>create peakfile for </source>
         <translation>создать пиковый файл для </translation>
     </message>
     <message>
+        <location filename="../../muse/widgets/filedialog.cpp" line="+63"/>
         <source>MusE: get file name</source>
         <translation>MusE: получить имя файла</translation>
     </message>
@@ -8711,14 +10262,17 @@ create?</source>
         <translation type="obsolete">Отмена</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>MusE: create directory</source>
         <translation>MusE: создать каталог</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>creating dir failed</source>
         <translation>создание каталога не удалось</translation>
     </message>
     <message>
+        <location line="+396"/>
         <source>File
 </source>
         <translation>Файл</translation>
@@ -8730,6 +10284,7 @@ exists</source>
 существует</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>MusE: write</source>
         <translation>MusE: записать</translation>
     </message>
@@ -8742,35 +10297,43 @@ exists</source>
         <translation type="obsolete">Выйти</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Open File
 </source>
         <translation>Открыть файл</translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>
 failed: </source>
         <translation>
 не удалось:</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>MusE: Open File</source>
         <translation>MusE: Открыть файл</translation>
     </message>
     <message>
+        <location filename="../../muse/route.cpp" line="+1026"/>
+        <location line="+37"/>
         <source>None</source>
         <translation>Ничего</translation>
     </message>
     <message>
+        <location filename="../../muse/waveedit/waveview.cpp" line="+616"/>
         <source>No selection. Ignoring</source>
         <translation>Не выделено. Игнорируется</translation>
     </message>
     <message>
+        <location filename="../../muse/widgets/filedialog.cpp" line="-440"/>
         <source>The directory
 </source>
         <translation>Директория
 </translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>
 does not exist.
 Create it?</source>
@@ -8779,6 +10342,7 @@ Create it?</source>
 Создать?</translation>
     </message>
     <message>
+        <location line="+404"/>
         <source>
 exists. Overwrite?</source>
         <translation>
@@ -8789,470 +10353,584 @@ exists. Overwrite?</source>
     <name>QuantConfig</name>
     <message>
         <source>MusE: Config Quantize</source>
-        <translation>MusE: Настройка Квантования</translation>
+        <translation type="obsolete">MusE: Настройка Квантования</translation>
     </message>
     <message>
         <source>Config Quantize</source>
-        <translation>Настройка Квантования</translation>
+        <translation type="obsolete">Настройка Квантования</translation>
     </message>
     <message>
         <source>Strength</source>
-        <translation>Степень</translation>
+        <translation type="obsolete">Степень</translation>
     </message>
     <message>
         <source>Don´t Quantize</source>
-        <translation>Не Квантовать</translation>
+        <translation type="obsolete">Не Квантовать</translation>
     </message>
     <message>
         <source>Quant Len</source>
-        <translation>Квант Дл</translation>
+        <translation type="obsolete">Квант Дл</translation>
     </message>
 </context>
 <context>
     <name>RhythmBase</name>
     <message>
+        <location filename="../../muse/mplugins/rhythmbase.ui" line="+14"/>
         <source>MusE: Random Rhythm Generator</source>
-        <translation type="obsolete">MusE: Генератор случайного ритма</translation>
+        <translation type="unfinished">MusE: Генератор случайного ритма</translation>
     </message>
     <message>
+        <location line="+21"/>
         <source>Instrument Properties</source>
-        <translation type="obsolete">Свойства Инструмента</translation>
+        <translation type="unfinished">Свойства Инструмента</translation>
     </message>
     <message>
+        <location line="+20"/>
+        <location line="+334"/>
         <source>counts/bar</source>
-        <translation type="obsolete">счет/такт</translation>
+        <translation type="unfinished">счет/такт</translation>
     </message>
     <message>
+        <location line="-324"/>
         <source>steps/count</source>
-        <translation type="obsolete">шаги/счет</translation>
+        <translation type="unfinished">шаги/счет</translation>
     </message>
     <message>
+        <location line="+10"/>
+        <location line="+325"/>
         <source># bars</source>
-        <translation type="obsolete">#такты</translation>
+        <translation type="unfinished">#такты</translation>
     </message>
     <message>
+        <location line="-315"/>
         <source>test</source>
-        <translation type="obsolete">тест</translation>
+        <translation type="unfinished">тест</translation>
     </message>
     <message>
+        <location line="+26"/>
+        <location line="+300"/>
         <source>contrib</source>
-        <translation type="obsolete">внести</translation>
+        <translation type="unfinished">внести</translation>
     </message>
     <message>
+        <location line="-290"/>
         <source>randomize</source>
-        <translation type="obsolete">случайным образом</translation>
+        <translation type="unfinished">случайным образом</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Group 1</source>
-        <translation type="obsolete">Группа 1</translation>
+        <translation type="unfinished">Группа 1</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Group 2</source>
-        <translation type="obsolete">Группа 2</translation>
+        <translation type="unfinished">Группа 2</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Group 3</source>
-        <translation type="obsolete">Группа 3</translation>
+        <translation type="unfinished">Группа 3</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Group 4</source>
-        <translation type="obsolete">Группа 4</translation>
+        <translation type="unfinished">Группа 4</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Group 5</source>
-        <translation type="obsolete">Группа 5</translation>
+        <translation type="unfinished">Группа 5</translation>
     </message>
     <message>
+        <location line="+34"/>
+        <location line="+228"/>
         <source>listen</source>
-        <translation type="obsolete">слушать</translation>
+        <translation type="unfinished">слушать</translation>
     </message>
     <message>
+        <location line="-218"/>
         <source>Instrument</source>
-        <translation type="obsolete">Инструмент</translation>
+        <translation type="unfinished">Инструмент</translation>
     </message>
     <message>
+        <location line="+36"/>
+        <location line="+127"/>
         <source>Group</source>
-        <translation type="obsolete">Группа</translation>
+        <translation type="unfinished">Группа</translation>
     </message>
     <message>
+        <location line="-100"/>
+        <location line="+339"/>
         <source>&amp;New</source>
-        <translation type="obsolete">&amp;Новый</translation>
+        <translation type="unfinished">&amp;Новый</translation>
     </message>
     <message>
+        <location line="-346"/>
         <source>create new entry</source>
-        <translation type="obsolete">создать новую запись</translation>
+        <translation type="unfinished">создать новую запись</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>pressing the New button you create a new entry
 in the MusE list of defined controllers</source>
-        <translation type="obsolete">нажав кнопку &quot;Новая&quot; вы создаёте новую запись
+        <translation type="unfinished">нажав кнопку &quot;Новая&quot; вы создаёте новую запись
 в списке назначенных в MusE контроллеров</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>&amp;Delete</source>
-        <translation type="obsolete">&amp;Удалить</translation>
+        <translation type="unfinished">&amp;Удалить</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>delete selected entry</source>
-        <translation type="obsolete">удалить выделенную запись</translation>
+        <translation type="unfinished">удалить выделенную запись</translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>Up</source>
-        <translation type="obsolete">Вверх</translation>
+        <translation type="unfinished">Вверх</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Down</source>
-        <translation type="obsolete">Вниз</translation>
+        <translation type="unfinished">Вниз</translation>
     </message>
     <message>
+        <location line="+43"/>
         <source>Instrument              </source>
-        <translation type="obsolete">Инструмент</translation>
+        <translation type="unfinished">Инструмент</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>steps/count      </source>
-        <translation type="obsolete">шаги/счет</translation>
+        <translation type="unfinished">шаги/счет</translation>
     </message>
     <message>
+        <location line="-35"/>
         <source>list of defined controllers</source>
-        <translation type="obsolete">список назначенных контроллеров</translation>
+        <translation type="unfinished">список назначенных контроллеров</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>This is the MusE list of defined controllers.</source>
-        <translation type="obsolete">Это список назначенных контроллеров для MusE</translation>
+        <translation type="unfinished">Это список назначенных контроллеров для MusE</translation>
     </message>
     <message>
+        <location line="+217"/>
         <source>&amp;File</source>
-        <translation type="obsolete">&amp;Файл</translation>
+        <translation type="unfinished">&amp;Файл</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>&amp;Edit</source>
-        <translation type="obsolete">&amp;Правка</translation>
+        <translation type="unfinished">&amp;Правка</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>&amp;Help</source>
-        <translation type="obsolete">П&amp;омощь</translation>
+        <translation type="unfinished">П&amp;омощь</translation>
     </message>
     <message>
+        <location line="-43"/>
         <source>Tools</source>
-        <translation type="obsolete">Инструменты</translation>
+        <translation type="unfinished">Инструменты</translation>
     </message>
     <message>
+        <location line="+63"/>
         <source>New</source>
-        <translation type="obsolete">Новый</translation>
+        <translation type="unfinished">Новый</translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Open</source>
-        <translation type="obsolete">Открыть</translation>
+        <translation type="unfinished">Открыть</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Open...</source>
-        <translation type="obsolete">&amp;Открыть...</translation>
+        <translation type="unfinished">&amp;Открыть...</translation>
     </message>
     <message>
+        <location line="+21"/>
         <source>Save</source>
-        <translation type="obsolete">Сохранить</translation>
+        <translation type="unfinished">Сохранить</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Сохранить</translation>
+        <translation type="unfinished">&amp;Сохранить</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Save As</source>
-        <translation type="obsolete">Сохранить как</translation>
+        <translation type="unfinished">Сохранить как</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>Save &amp;As...</source>
-        <translation type="obsolete">Сохранить &amp;как...</translation>
+        <translation type="unfinished">Сохранить &amp;как...</translation>
     </message>
     <message>
+        <location line="+21"/>
         <source>Print</source>
-        <translation type="obsolete">Печать</translation>
+        <translation type="unfinished">Печать</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Print...</source>
-        <translation type="obsolete">&amp;Печать...</translation>
+        <translation type="unfinished">&amp;Печать...</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Exit</source>
-        <translation type="obsolete">Выйти</translation>
+        <translation type="unfinished">Выйти</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>E&amp;xit</source>
-        <translation type="obsolete">В&amp;ыйти</translation>
+        <translation type="unfinished">В&amp;ыйти</translation>
     </message>
     <message>
+        <location line="+21"/>
         <source>Undo</source>
-        <translation type="obsolete">Отмена</translation>
+        <translation type="unfinished">Отмена</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Undo</source>
-        <translation type="obsolete">&amp;Отмена</translation>
+        <translation type="unfinished">&amp;Отмена</translation>
     </message>
     <message>
+        <location line="+21"/>
         <source>Redo</source>
-        <translation type="obsolete">Повторить</translation>
+        <translation type="unfinished">Повторить</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Redo</source>
-        <translation type="obsolete">П&amp;овторить</translation>
+        <translation type="unfinished">П&amp;овторить</translation>
     </message>
     <message>
+        <location line="+21"/>
         <source>Cut</source>
-        <translation type="obsolete">Вырезать</translation>
+        <translation type="unfinished">Вырезать</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Cut</source>
-        <translation type="obsolete">&amp;Вырезать</translation>
+        <translation type="unfinished">&amp;Вырезать</translation>
     </message>
     <message>
+        <location line="+21"/>
         <source>Copy</source>
-        <translation type="obsolete">Скопировать</translation>
+        <translation type="unfinished">Скопировать</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>C&amp;opy</source>
-        <translation type="obsolete">С&amp;копировать</translation>
+        <translation type="unfinished">С&amp;копировать</translation>
     </message>
     <message>
+        <location line="+21"/>
         <source>Paste</source>
-        <translation type="obsolete">Вставить</translation>
+        <translation type="unfinished">Вставить</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Paste</source>
-        <translation type="obsolete">&amp;Вставить</translation>
+        <translation type="unfinished">&amp;Вставить</translation>
     </message>
     <message>
+        <location line="+21"/>
         <source>Find</source>
-        <translation type="obsolete">Найти</translation>
+        <translation type="unfinished">Найти</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Find...</source>
-        <translation type="obsolete">&amp;Найти...</translation>
+        <translation type="unfinished">&amp;Найти...</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Contents</source>
-        <translation type="obsolete">Содержание</translation>
+        <translation type="unfinished">Содержание</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Contents...</source>
-        <translation type="obsolete">&amp;Содержание...</translation>
+        <translation type="unfinished">&amp;Содержание...</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Index</source>
-        <translation type="obsolete">Индекс</translation>
+        <translation type="unfinished">Индекс</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Index...</source>
-        <translation type="obsolete">&amp;Индекс...</translation>
+        <translation type="unfinished">&amp;Индекс...</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>About</source>
-        <translation type="obsolete">О программе</translation>
+        <translation type="unfinished">О программе</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;About...</source>
-        <translation type="obsolete">&amp;О программе...</translation>
+        <translation type="unfinished">&amp;О программе...</translation>
     </message>
     <message>
+        <location line="-314"/>
         <source>&lt;b&gt;Notice!&lt;/b&gt;&lt;br&gt;
 Random Rhythm Generator is not enabled yet!</source>
-        <translation type="obsolete">&lt;b&gt;Уведомление!&lt;/b&gt;&lt;br&gt;
+        <translation type="unfinished">&lt;b&gt;Уведомление!&lt;/b&gt;&lt;br&gt;
 Генератора Случайного Ритма пока ещё нет!</translation>
     </message>
     <message>
+        <location line="+88"/>
         <source>Ctrl+N</source>
-        <translation type="obsolete">Ctrl+N</translation>
+        <translation type="unfinished">Ctrl+N</translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Ctrl+O</source>
-        <translation type="obsolete">Ctrl+O</translation>
+        <translation type="unfinished">Ctrl+O</translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Ctrl+S</source>
-        <translation type="obsolete">Ctrl+S</translation>
+        <translation type="unfinished">Ctrl+S</translation>
     </message>
     <message>
+        <location line="+32"/>
         <source>Ctrl+P</source>
-        <translation type="obsolete">Ctrl+P</translation>
+        <translation type="unfinished">Ctrl+P</translation>
     </message>
     <message>
+        <location line="+32"/>
         <source>Ctrl+Z</source>
-        <translation type="obsolete">Ctrl+Z</translation>
+        <translation type="unfinished">Ctrl+Z</translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Ctrl+Y</source>
-        <translation type="obsolete">Ctrl+Y</translation>
+        <translation type="unfinished">Ctrl+Y</translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Ctrl+X</source>
-        <translation type="obsolete">Ctrl+X</translation>
+        <translation type="unfinished">Ctrl+X</translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Ctrl+C</source>
-        <translation type="obsolete">Ctrl+C</translation>
+        <translation type="unfinished">Ctrl+C</translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Ctrl+V</source>
-        <translation type="obsolete">Ctrl+V</translation>
+        <translation type="unfinished">Ctrl+V</translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Ctrl+F</source>
-        <translation type="obsolete">Ctrl+F</translation>
+        <translation type="unfinished">Ctrl+F</translation>
     </message>
 </context>
 <context>
     <name>RhythmGenerator</name>
     <message>
+        <location filename="../../muse/mplugins/rhythm.cpp" line="+229"/>
         <source>Form3</source>
-        <translation type="obsolete">Форма3</translation>
+        <translation type="unfinished">Форма3</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Instrument Settings:</source>
-        <translation type="obsolete">Настройки инструмента:</translation>
+        <translation type="unfinished">Настройки инструмента:</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Instrument</source>
-        <translation type="obsolete">Инструмент</translation>
+        <translation type="unfinished">Инструмент</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Hi-Hat</source>
-        <translation type="obsolete">Хай-хэт</translation>
+        <translation type="unfinished">Хай-хэт</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>add</source>
-        <translation type="obsolete">добавить</translation>
+        <translation type="unfinished">добавить</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>delete</source>
-        <translation type="obsolete">удалить</translation>
+        <translation type="unfinished">удалить</translation>
     </message>
     <message>
+        <location line="+83"/>
         <source>Group Settings:</source>
-        <translation type="obsolete">Настройки группы:</translation>
+        <translation type="unfinished">Настройки группы:</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Group</source>
-        <translation type="obsolete">Группа</translation>
+        <translation type="unfinished">Группа</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Group 1</source>
-        <translation type="obsolete">Группа 1</translation>
+        <translation type="unfinished">Группа 1</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Group 2</source>
-        <translation type="obsolete">Группа 2</translation>
+        <translation type="unfinished">Группа 2</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Group 3</source>
-        <translation type="obsolete">Группа 3</translation>
+        <translation type="unfinished">Группа 3</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Group 4</source>
-        <translation type="obsolete">Группа 4</translation>
+        <translation type="unfinished">Группа 4</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Group 5</source>
-        <translation type="obsolete">Группа 5</translation>
+        <translation type="unfinished">Группа 5</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>contrib</source>
-        <translation type="obsolete">внести</translation>
+        <translation type="unfinished">внести</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>listen</source>
-        <translation type="obsolete">слушать</translation>
+        <translation type="unfinished">слушать</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>Randomize</source>
-        <translation type="obsolete">Случайным образом</translation>
+        <translation type="unfinished">Случайным образом</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>Rhythm Style:</source>
-        <translation type="obsolete">Ритмический Стиль:</translation>
+        <translation type="unfinished">Ритмический Стиль:</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Clear</source>
-        <translation type="obsolete">Очистить</translation>
+        <translation type="unfinished">Очистить</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Open...</source>
-        <translation type="obsolete">Открыть...</translation>
+        <translation type="unfinished">Открыть...</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Save</source>
-        <translation type="obsolete">Сохранить</translation>
+        <translation type="unfinished">Сохранить</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Save as...</source>
-        <translation type="obsolete">Сохранить как...</translation>
+        <translation type="unfinished">Сохранить как...</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Generate</source>
-        <translation type="obsolete">Сгенерировать</translation>
+        <translation type="unfinished">Сгенерировать</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Close</source>
-        <translation type="obsolete">Закрыть</translation>
+        <translation type="unfinished">Закрыть</translation>
     </message>
     <message>
         <source></source>
         <translation></translation>
     </message>
     <message>
+        <location line="-183"/>
         <source>steps/count</source>
-        <translation type="obsolete">шаги/счет</translation>
+        <translation type="unfinished">шаги/счет</translation>
     </message>
     <message>
+        <location line="+21"/>
         <source>count/bar</source>
-        <translation type="obsolete">счет/такт</translation>
+        <translation type="unfinished">счет/такт</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source># bars</source>
-        <translation type="obsolete">#такты</translation>
+        <translation type="unfinished">#такты</translation>
     </message>
 </context>
 <context>
     <name>RouteDialogBase</name>
     <message>
+        <location filename="../../muse/mixer/routedialogbase.ui" line="+20"/>
         <source>MusE: Routing</source>
         <translation>MusE: Маршруты</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Add Route</source>
         <translation>Добавить маршрут</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Source:</source>
         <translation>Источник:</translation>
     </message>
     <message>
+        <location line="+24"/>
         <source>Destination:</source>
         <translation>Назначение:</translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>Connect</source>
         <translation>Соединить</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>connect source to destination</source>
         <translation>Соединить источник с назначением</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Current Routes</source>
         <translation>Текущие маршруты</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Source</source>
         <translation>Источник</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Destination</source>
         <translation>Назначение</translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Remove</source>
         <translation>Удалить</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>remove selected route</source>
         <translation>Удалить выбранный маршрут</translation>
     </message>
@@ -9260,42 +10938,52 @@ Random Rhythm Generator is not enabled yet!</source>
 <context>
     <name>SS_PluginChooserBase</name>
     <message>
+        <location filename="../../synti/simpledrums/sspluginchooserbase.ui" line="+16"/>
         <source>SimpleDrums - Ladspa Plugin Chooser</source>
         <translation>SimpleDrums - Выбор LADSPA-плагина</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Label</source>
         <translation>Метка</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Inports</source>
         <translation>Порты входа</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Outports</source>
         <translation>Порты выхода</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Creator</source>
         <translation>Создатель</translation>
     </message>
     <message>
+        <location line="+43"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Отменить</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+C</source>
         <translation>Alt+C</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>&amp;OK</source>
         <translation>&amp;ОК</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+O</source>
         <translation>Alt+О</translation>
     </message>
@@ -9304,32 +10992,35 @@ Random Rhythm Generator is not enabled yet!</source>
     <name>SS_PluginFront</name>
     <message>
         <source>Clear and unload effect</source>
-        <translation>Очистить и выгрузить эффект</translation>
+        <translation type="obsolete">Очистить и выгрузить эффект</translation>
     </message>
     <message>
         <source>Load effect</source>
-        <translation>Загрузить эффект</translation>
+        <translation type="obsolete">Загрузить эффект</translation>
     </message>
     <message>
         <source>Toggle display of effect parameters</source>
-        <translation>Переключить дисплей параметров эффекта</translation>
+        <translation type="obsolete">Переключить дисплей параметров эффекта</translation>
     </message>
     <message>
         <source>Turn effect on/off</source>
-        <translation>Эффект вкл/выкл</translation>
+        <translation type="obsolete">Эффект вкл/выкл</translation>
     </message>
 </context>
 <context>
     <name>ScrollScale</name>
     <message>
+        <location filename="../../muse/widgets/scrollscale.cpp" line="+299"/>
         <source>next page</source>
         <translation>след страница</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>previous page</source>
         <translation>пред страница</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>current page number</source>
         <translation>номер текущей страницы</translation>
     </message>
@@ -9337,18 +11028,22 @@ Random Rhythm Generator is not enabled yet!</source>
 <context>
     <name>ShortcutCaptureDialog</name>
     <message>
+        <location filename="../../muse/widgets/shortcutcapturedialog.cpp" line="+30"/>
         <source>Ok</source>
         <translation>OK</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
+        <location line="+52"/>
         <source>Shortcut conflicts with </source>
         <translation>&quot;Горячая клавиша&quot; конфликтует с </translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Undefined</source>
         <translation>Не назначено</translation>
     </message>
@@ -9356,30 +11051,38 @@ Random Rhythm Generator is not enabled yet!</source>
 <context>
     <name>ShortcutCaptureDialogBase</name>
     <message>
+        <location filename="../../muse/widgets/shortcutcapturedialogbase.ui" line="+14"/>
         <source>Enter shortcut sequence</source>
         <translation>Введите последовательность &quot;горячих клавиш&quot;</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Press keys to enter shortcut sequence!</source>
         <translation>Нажмите клавиши  для задания &quot;горячих клавиш&quot;!</translation>
     </message>
     <message>
+        <location line="+25"/>
         <source>Old shortcut:</source>
         <translation>Старое сочетание:</translation>
     </message>
     <message>
+        <location line="+10"/>
+        <location line="+24"/>
         <source>Undefined</source>
         <translation>Не назначено</translation>
     </message>
     <message>
+        <location line="-10"/>
         <source>New shortcut:</source>
         <translation>Новое сочетание:</translation>
     </message>
     <message>
+        <location line="+27"/>
         <source>OK</source>
         <translation>ОК</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
@@ -9387,42 +11090,52 @@ Random Rhythm Generator is not enabled yet!</source>
 <context>
     <name>ShortcutConfigBase</name>
     <message>
+        <location filename="../../muse/widgets/shortcutconfigbase.ui" line="+14"/>
         <source>Configure Keyboard Shortcuts</source>
         <translation>Настроить &quot;горячие клавиши&quot;</translation>
     </message>
     <message>
+        <location line="+34"/>
         <source>Shortcut Category</source>
         <translation>Категория &quot;горячих клавиш&quot;</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>Description</source>
         <translation>Описание</translation>
     </message>
     <message>
+        <location line="-5"/>
         <source>Shortcut</source>
         <translation>&quot;Горячая клавиша&quot;</translation>
     </message>
     <message>
+        <location line="+37"/>
         <source>&amp;Clear</source>
         <translation>&amp;Очистить</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+C</source>
         <translation>Alt+C</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>&amp;Define</source>
         <translation>Н&amp;азначить</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+D</source>
         <translation>Alt+D</translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>&amp;Apply</source>
         <translation>&amp;Применить</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+A</source>
         <translation>Alt+A</translation>
     </message>
@@ -9430,6 +11143,7 @@ Random Rhythm Generator is not enabled yet!</source>
 <context>
     <name>SigScale</name>
     <message>
+        <location filename="../../muse/widgets/sigscale.cpp" line="+27"/>
         <source>signature scale</source>
         <translation>шкала ключей </translation>
     </message>
@@ -9437,6 +11151,7 @@ Random Rhythm Generator is not enabled yet!</source>
 <context>
     <name>SimpleDrumsGuiBase</name>
     <message>
+        <location filename="../../synti/simpledrums/simpledrumsguibase.ui" line="+23"/>
         <source>DrumSynth 0.1</source>
         <translation>DrumSynth 0.1</translation>
     </message>
@@ -9444,25 +11159,29 @@ Random Rhythm Generator is not enabled yet!</source>
 <context>
     <name>SimpleSynthGui</name>
     <message>
+        <location filename="../../synti/simpledrums/simpledrumsgui.cpp" line="+367"/>
         <source>&amp;Load setup</source>
         <translation>З&amp;агрузить настройки</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>&amp;Save setup</source>
         <translation>&amp;Сохранить настройки</translation>
     </message>
     <message>
         <source>Load sample dialog</source>
-        <translation>Загрузить диалог сэмплов</translation>
+        <translation type="obsolete">Загрузить диалог сэмплов</translation>
     </message>
 </context>
 <context>
     <name>Song</name>
     <message>
+        <location filename="../../muse/song.cpp" line="+2344"/>
         <source>Jack shutdown!</source>
         <translation>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:
@@ -9496,55 +11215,76 @@ click on the Restart button.</source>
 </translation>
     </message>
     <message>
+        <location line="+189"/>
         <source>previous event</source>
         <translation>предыдущее событие</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>next event</source>
         <translation>следующее событие</translation>
     </message>
     <message>
+        <location line="+10"/>
+        <location line="+183"/>
         <source>set event</source>
         <translation>настроить событие</translation>
     </message>
     <message>
+        <location line="-181"/>
+        <location line="+183"/>
         <source>add event</source>
         <translation>добавить событие</translation>
     </message>
     <message>
+        <location line="-179"/>
+        <location line="+184"/>
         <source>erase event</source>
         <translation>стереть событие</translation>
     </message>
     <message>
+        <location line="-180"/>
         <source>erase range</source>
         <translation>стереть диапазон</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>clear automation</source>
         <translation>Очистить автоматизацию</translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>Clear all controller events?</source>
         <translation>Очистить все события контроллеров?</translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>&amp;Ok</source>
         <translation>&amp;ОК</translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>&amp;Cancel</source>
         <translation>&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>
+    </message>
+    <message>
         <source>MusE was unable to launch the script
 </source>
-        <translation>MusE не может запустить скрипт</translation>
+        <translation type="obsolete">MusE не может запустить скрипт</translation>
     </message>
     <message>
+        <location line="-1200"/>
         <source>Automation:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9552,22 +11292,32 @@ click on the Restart button.</source>
 <context>
     <name>SongInfo</name>
     <message>
+        <location filename="../../muse/widgets/songinfo.ui" line="+14"/>
         <source>Song Information</source>
         <translation>Информация о проекте</translation>
     </message>
     <message>
+        <location line="+16"/>
+        <source>Show on song load</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Отменить</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+C</source>
         <translation>Alt+C</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>&amp;Ok</source>
         <translation>&amp;ОК</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+O</source>
         <translation>Alt+O</translation>
     </message>
@@ -9575,54 +11325,68 @@ 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>
     </message>
     <message>
+        <location line="+75"/>
         <source>Soft Synthesizer</source>
         <translation>Программный синтезатор</translation>
     </message>
     <message>
+        <location line="+46"/>
         <source>File</source>
         <translation>Файл</translation>
     </message>
     <message>
+        <location line="-115"/>
         <source>Instances</source>
         <translation>Выбранный</translation>
     </message>
     <message>
+        <location line="+10"/>
+        <location line="+115"/>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
+        <location line="-17"/>
         <source>list of available software synthesizers</source>
         <translation>список доступных программных синтезаторов</translation>
     </message>
     <message>
+        <location line="-25"/>
         <source>Add Instance</source>
         <translation>Добавить выбранный</translation>
     </message>
     <message>
+        <location line="-58"/>
         <source>Remove Instance</source>
         <translation>Удалить выбранный</translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>Midi connections</source>
         <translation>MIDI-соединения</translation>
     </message>
     <message>
+        <location line="-38"/>
         <source>Midi Port</source>
         <translation>MIDI-порт</translation>
     </message>
     <message>
+        <location line="+105"/>
         <source>Inst</source>
         <translation>Инстр</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Version</source>
         <translation>Версия</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Description</source>
         <translation>Описание</translation>
     </message>
@@ -9631,81 +11395,155 @@ click on the Restart button.</source>
     <name>TList</name>
     <message>
         <source>Show Gui</source>
-        <translation>Показать ГИП</translation>
+        <translation type="obsolete">Показать ГИП</translation>
     </message>
     <message>
+        <location filename="../../muse/arranger/tlist.cpp" line="-24"/>
         <source>Add Midi Track</source>
         <translation>Добавить MIDI-трек</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Add Drum Track</source>
         <translation>Добавить трек с ударными</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Add Wave Track</source>
         <translation>Добавить Wave-трек</translation>
     </message>
     <message>
+        <location line="+127"/>
+        <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="+130"/>
         <source>Delete Track</source>
         <translation>Удалить трек</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Track Comment</source>
         <translation>Комментарий к треку</translation>
     </message>
     <message>
+        <location line="+428"/>
         <source>Midi</source>
         <translation>MIDI</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Drum</source>
         <translation>Ударные</translation>
     </message>
     <message>
+        <location line="-1252"/>
         <source>MusE: bad trackname</source>
         <translation>MusE: неверное имя трека</translation>
     </message>
     <message>
+        <location line="-53"/>
+        <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="+48"/>
         <source>please choose a unique track name</source>
         <translation>Выберите неповторяющееся имя для трека</translation>
     </message>
     <message>
+        <location line="+203"/>
+        <location line="+53"/>
+        <source>show gui</source>
+        <translation type="unfinished">показать ГИП</translation>
+    </message>
+    <message>
+        <location line="-44"/>
+        <location line="+53"/>
+        <source>show native gui</source>
+        <translation type="unfinished">показать ГИП</translation>
+    </message>
+    <message>
+        <location line="+270"/>
         <source>Add Output</source>
         <translation>Добавить Выход</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Add Group</source>
         <translation>Добавить Группу</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Add Input</source>
         <translation>Добавить Вход</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Add Aux Send</source>
         <translation>Добавить Aux Посыл</translation>
     </message>
     <message>
+        <location line="-420"/>
+        <location line="+1176"/>
         <source>Update drummap?</source>
         <translation>Обновить карту ударных?</translation>
     </message>
     <message>
+        <location line="-1175"/>
         <source>Do you want to use same port for all instruments in the drummap?</source>
         <translation>Вы хотите использовать один и тот же порт для всех инструментов в списке ударных?</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <location line="+1176"/>
         <source>&amp;Yes</source>
         <translation>&amp;Да</translation>
     </message>
     <message>
+        <location line="-1176"/>
+        <location line="+1176"/>
         <source>&amp;No</source>
         <translation>&amp;Нет</translation>
     </message>
     <message>
+        <location line="-1"/>
         <source>Do you want to use same port and channel for all instruments in the drummap?</source>
         <translation>Вы хотите использовать один и тот же порт и канал для всех инструментов в списке ударных?</translation>
     </message>
     <message>
+        <location line="-1386"/>
         <source>&lt;none&gt;</source>
         <translation>&lt;ничего&gt;</translation>
     </message>
@@ -9713,6 +11551,7 @@ click on the Restart button.</source>
 <context>
     <name>TempoSig</name>
     <message>
+        <location filename="../../muse/transport.cpp" line="+103"/>
         <source>Tempo/Sig</source>
         <translation>Темп/Знаки альтерации</translation>
     </message>
@@ -9732,49 +11571,54 @@ click on the Restart button.</source>
 <context>
     <name>Toolbar1</name>
     <message>
+        <location filename="../../muse/widgets/tb1.cpp" line="+21"/>
         <source>Solo</source>
         <translation>Соло</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Cursor</source>
         <translation>Курсор</translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Snap</source>
         <translation>Привязка</translation>
     </message>
     <message>
         <source>Quantize</source>
-        <translation>Квантовать</translation>
+        <translation type="obsolete">Квантовать</translation>
     </message>
     <message>
         <source>To</source>
-        <translation>К</translation>
+        <translation type="obsolete">К</translation>
     </message>
     <message>
         <source>All Events</source>
-        <translation>Все события</translation>
+        <translation type="obsolete">Все события</translation>
     </message>
     <message>
         <source>Looped Ev.</source>
-        <translation>Соб. в цикле</translation>
+        <translation type="obsolete">Соб. в цикле</translation>
     </message>
     <message>
         <source>Selected Ev.</source>
-        <translation>Выделенное соб.</translation>
+        <translation type="obsolete">Выделенное соб.</translation>
     </message>
     <message>
         <source>Looped+Sel.</source>
-        <translation>В цикле+Выделенн.</translation>
+        <translation type="obsolete">В цикле+Выделенн.</translation>
     </message>
 </context>
 <context>
     <name>TrackComment</name>
     <message>
+        <location filename="../../muse/widgets/comment.cpp" line="+41"/>
         <source>MusE: Track Comment</source>
         <translation>MusE: Комментарий к треку</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Track Comment:</source>
         <translation>Комментарий к треку:</translation>
     </message>
@@ -9782,122 +11626,156 @@ click on the Restart button.</source>
 <context>
     <name>Transport</name>
     <message>
+        <location filename="../../muse/transport.cpp" line="+105"/>
         <source>Overdub</source>
         <translation>Наложить</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <location line="+15"/>
         <source>Replace</source>
         <translation>Заменить</translation>
     </message>
     <message>
+        <location line="-10"/>
         <source>Rec Mode</source>
         <translation>Режим записи</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Normal</source>
         <translation>Норм.</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Mix</source>
         <translation>Смешать</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Cycle Rec</source>
         <translation>Циклич. запись</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>punchin</source>
         <translation>нач. врезки</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>loop</source>
         <translation>цикл</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>punchout</source>
         <translation>кнц. врезки</translation>
     </message>
     <message>
+        <location line="+4"/>
+        <location line="+3"/>
         <source>Punch In</source>
         <translation>Начало врезки</translation>
     </message>
     <message>
+        <location line="-2"/>
+        <location line="+3"/>
         <source>Loop</source>
         <translation>Цикл</translation>
     </message>
     <message>
+        <location line="-2"/>
+        <location line="+3"/>
         <source>Punch Out</source>
         <translation>Конец врезки</translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>Left Mark</source>
         <translation>Левый маркер</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Right Mark</source>
         <translation>Правый маркер</translation>
     </message>
     <message>
+        <location line="+47"/>
         <source>rewind to start</source>
         <translation>перемотать к началу</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>rewind</source>
         <translation>перемотать назад</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>forward</source>
         <translation>перемотать вперёд</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>stop</source>
         <translation>остановить</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>play</source>
         <translation>воспроизвести</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>record</source>
         <translation>записать</translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>AC</source>
         <translation>AC</translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>quantize during record</source>
         <translation>квантовать при записи</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Click</source>
         <translation>Метр.</translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>metronom click on/off</source>
         <translation>Метроном вкл/выкл</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Sync</source>
         <translation>Синхр.</translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>external sync on/off</source>
         <translation>Вкл/выкл внешн. синхр.</translation>
     </message>
     <message>
+        <location line="+45"/>
         <source>Master</source>
         <translation>Мастер</translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>use master track</source>
         <translation>использовать мастер-трек</translation>
     </message>
     <message>
+        <location line="-43"/>
         <source>Jack</source>
         <translation>Jack</translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>Jack transport sync on/off</source>
         <translation>Синхр. транспорта &quot;Jack&quot; вкл/выкл</translation>
     </message>
@@ -9906,52 +11784,55 @@ click on the Restart button.</source>
     <name>TransposeDialogBase</name>
     <message>
         <source>MusE: Midi Transpose</source>
-        <translation>MusE: MIDI-транспонирование</translation>
+        <translation type="obsolete">MusE: MIDI-транспонирование</translation>
     </message>
     <message>
         <source>Value</source>
-        <translation>Значение</translation>
+        <translation type="obsolete">Значение</translation>
     </message>
     <message>
         <source>halftones</source>
-        <translation>полутонов</translation>
+        <translation type="obsolete">полутонов</translation>
     </message>
     <message>
         <source>Time</source>
-        <translation>Время</translation>
+        <translation type="obsolete">Время</translation>
     </message>
     <message>
         <source>all</source>
-        <translation>всё</translation>
+        <translation type="obsolete">всё</translation>
     </message>
     <message>
         <source>between markers</source>
-        <translation>между маркерами</translation>
+        <translation type="obsolete">между маркерами</translation>
     </message>
     <message>
         <source>Parts</source>
-        <translation>Партии</translation>
+        <translation type="obsolete">Партии</translation>
     </message>
     <message>
         <source>all in selected tracks</source>
-        <translation>все в выбранных треках</translation>
+        <translation type="obsolete">все в выбранных треках</translation>
     </message>
     <message>
         <source>OK</source>
-        <translation>ОК</translation>
+        <translation type="obsolete">ОК</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Отмена</translation>
+        <translation type="obsolete">Отмена</translation>
     </message>
 </context>
 <context>
     <name>VAMGui</name>
     <message>
+        <location filename="../../synti/vam/vamgui.cpp" line="+569"/>
         <source>MusE: Load VAM Presets</source>
         <translation>MusE: загрузить пресеты VAM</translation>
     </message>
     <message>
+        <location line="+110"/>
+        <location line="+18"/>
         <source>MusE: Save VAM Presets</source>
         <translation>MusE: сохраненить пресеты VAM</translation>
     </message>
@@ -9959,130 +11840,185 @@ click on the Restart button.</source>
 <context>
     <name>VAMGuiBase</name>
     <message>
+        <location filename="../../synti/vam/vamguibase.ui" line="+23"/>
         <source>Virtual Analogue for MusE</source>
         <translation>Виртуальный Аналог для MusE</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>LFO</source>
         <translation>LFO</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Freq</source>
         <translation>Частота</translation>
     </message>
     <message>
+        <location line="+42"/>
+        <location line="+950"/>
+        <location line="+177"/>
         <source>Waveform</source>
         <translation>Форма волны</translation>
     </message>
     <message>
+        <location line="-1116"/>
+        <location line="+956"/>
+        <location line="+177"/>
         <source>Sine</source>
         <translation>Синусоида</translation>
     </message>
     <message>
+        <location line="-1128"/>
+        <location line="+956"/>
+        <location line="+177"/>
         <source>Pulse</source>
         <translation>Пульс</translation>
     </message>
     <message>
+        <location line="-1128"/>
+        <location line="+956"/>
+        <location line="+177"/>
         <source>Saw</source>
         <translation>Пилообразная</translation>
     </message>
     <message>
+        <location line="-1128"/>
+        <location line="+956"/>
+        <location line="+177"/>
         <source>Triangle</source>
         <translation>Треугольная</translation>
     </message>
     <message>
+        <location line="-1122"/>
         <source>Filter</source>
         <translation>Фильтр</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>EnvMod</source>
         <translation>Режим Огибающей</translation>
     </message>
     <message>
+        <location line="+10"/>
+        <location line="+717"/>
+        <location line="+427"/>
         <source>Attack</source>
         <translation>Атака</translation>
     </message>
     <message>
+        <location line="-1134"/>
+        <location line="+645"/>
+        <location line="+531"/>
         <source>Decay</source>
         <translation>Спад</translation>
     </message>
     <message>
+        <location line="-1166"/>
+        <location line="+677"/>
+        <location line="+531"/>
         <source>Sustain</source>
         <translation>Стационарная часть</translation>
     </message>
     <message>
+        <location line="-1198"/>
+        <location line="+677"/>
+        <location line="+401"/>
         <source>Release</source>
         <translation>Послезвучие</translation>
     </message>
     <message>
+        <location line="-972"/>
         <source>Cutoff</source>
         <translation>Отсечка</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Resonance</source>
         <translation>Резонанс</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Invert</source>
         <translation>Инвертировать</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>KeyTrack</source>
         <translation>Трекинг клавиатуры</translation>
     </message>
     <message>
+        <location line="+153"/>
         <source>Presets</source>
         <translation>Пресеты</translation>
     </message>
     <message>
+        <location line="+65"/>
         <source>Set</source>
         <translation>Установить</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>load preset list</source>
         <translation>Загрузить список пресетов</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>save preset list</source>
         <translation>Сохранить список пресетов</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>save preset list to a new file</source>
         <translation>Сохранить список пресетов в новый файл</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>delete preset</source>
         <translation>Удалить пресет</translation>
     </message>
     <message>
+        <location line="+41"/>
         <source>DCO 1</source>
         <translation>DCO 1</translation>
     </message>
     <message>
+        <location line="+12"/>
+        <location line="+538"/>
         <source>Pitch</source>
         <translation>Высота тона</translation>
     </message>
     <message>
+        <location line="-506"/>
+        <location line="+480"/>
         <source>Detune</source>
         <translation>Расстройка</translation>
     </message>
     <message>
+        <location line="-374"/>
+        <location line="+473"/>
         <source>PWM</source>
         <translation>PWM</translation>
     </message>
     <message>
+        <location line="-391"/>
+        <location line="+266"/>
         <source>FM</source>
         <translation>FM</translation>
     </message>
     <message>
+        <location line="-240"/>
+        <location line="+501"/>
         <source>PW</source>
         <translation>PW</translation>
     </message>
     <message>
+        <location line="-314"/>
         <source>DCO 2</source>
         <translation>DCO 2</translation>
     </message>
     <message>
+        <location line="+324"/>
         <source>On</source>
         <translation>Вкл</translation>
     </message>
@@ -10101,6 +12037,7 @@ Jotsif Lindman Hörnlund
 ( jotsif@linux.nu )</translation>
     </message>
     <message utf8="true">
+        <location line="+122"/>
         <source>VAM 1.0beta3
 Virtual Analog for MusE
 Released under GPL.
@@ -10125,58 +12062,59 @@ Robert Jonsson
     <name>VelocityBase</name>
     <message>
         <source>MusE: Modify Velocity</source>
-        <translation>MusE: Изменить скорость нажатия</translation>
+        <translation type="obsolete">MusE: Изменить скорость нажатия</translation>
     </message>
     <message>
         <source>Range</source>
-        <translation>Диапазон</translation>
+        <translation type="obsolete">Диапазон</translation>
     </message>
     <message>
         <source>All Events</source>
-        <translation>Все События</translation>
+        <translation type="obsolete">Все События</translation>
     </message>
     <message>
         <source>Selected Events</source>
-        <translation>Выбранные События</translation>
+        <translation type="obsolete">Выбранные События</translation>
     </message>
     <message>
         <source>Looped Events</source>
-        <translation>События в Цикле</translation>
+        <translation type="obsolete">События в Цикле</translation>
     </message>
     <message>
         <source>Selected &amp; Looped</source>
-        <translation>Выбранные &amp; в Цикле</translation>
+        <translation type="obsolete">Выбранные &amp; в Цикле</translation>
     </message>
     <message>
         <source>Values</source>
-        <translation>Значения</translation>
+        <translation type="obsolete">Значения</translation>
     </message>
     <message>
         <source>Rate:</source>
-        <translation>Частота:</translation>
+        <translation type="obsolete">Частота:</translation>
     </message>
     <message>
         <source>Offset:</source>
-        <translation>Смещение:</translation>
+        <translation type="obsolete">Смещение:</translation>
     </message>
     <message>
         <source>%</source>
-        <translation>%</translation>
+        <translation type="obsolete">%</translation>
     </message>
     <message>
         <source>OK</source>
-        <translation>OК</translation>
+        <translation type="obsolete">OК</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Отмена</translation>
+        <translation type="obsolete">Отмена</translation>
     </message>
 </context>
 <context>
     <name>WTScale</name>
     <message>
+        <location filename="../../muse/widgets/wtscale.cpp" line="+29"/>
         <source>bar scale</source>
-        <translation type="obsolete">линейка тактов</translation>
+        <translation type="unfinished">линейка тактов</translation>
     </message>
 </context>
 <context>
@@ -10190,96 +12128,138 @@ Robert Jonsson
         <translation type="obsolete">weTools</translation>
     </message>
     <message>
+        <location filename="../../muse/waveedit/waveedit.cpp" line="+180"/>
         <source>Solo</source>
         <translation>Соло</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Cursor</source>
         <translation>Курсор</translation>
     </message>
     <message>
+        <location line="-109"/>
         <source>&amp;Edit</source>
         <translation>&amp;Правка</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Func&amp;tions</source>
         <translation>Фу&amp;нкции</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>200%</source>
         <translation>200%</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>150%</source>
         <translation>150%</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>75%</source>
         <translation>75%</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>50%</source>
         <translation>50%</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>25%</source>
         <translation>25%</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Other</source>
         <translation>Другой</translation>
     </message>
     <message>
+        <location line="-22"/>
         <source>&amp;Gain</source>
         <translation>&amp;Усиление</translation>
     </message>
     <message>
+        <location line="+30"/>
+        <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>Редактировать во &amp;внешнем редакторе</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Mute Selection</source>
         <translation>Заглушить выделенное</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Normalize Selection</source>
         <translation>Нормализовать выделенное</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Fade In Selection</source>
         <translation>Нарастание звука в выделенном</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Fade Out Selection</source>
         <translation>Затихание звука в выделенном</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Reverse Selection</source>
         <translation>Перевернуть выделенное</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Select &amp;All</source>
         <translation>Выделить &amp;Всё</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>&amp;Deselect All</source>
         <translation>&amp;Убрать выделение</translation>
     </message>
     <message>
+        <location line="+22"/>
+        <source>WaveEdit tools</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-28"/>
         <source>Select</source>
         <translation>Выделить</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Wave edit tools</source>
         <translation>Инструменты редактирования Wave</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>transport</source>
         <translation>транспорт</translation>
     </message>
     <message>
         <source>Pianoroll tools</source>
-        <translation>Инструменты пианоролла</translation>
+        <translation type="obsolete">Инструменты пианоролла</translation>
     </message>
 </context>
 <context>
@@ -10320,10 +12300,12 @@ Robert Jonsson
 <context>
     <name>WaveView</name>
     <message>
+        <location filename="../../muse/waveedit/waveview.cpp" line="+373"/>
         <source>MusE - file size changed</source>
         <translation>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.
 
@@ -10334,10 +12316,12 @@ Missing data is muted</source>
 Утерянные данные заглушены</translation>
     </message>
     <message>
+        <location line="-15"/>
         <source>MusE - external editor failed</source>
         <translation>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
@@ -10351,6 +12335,7 @@ is set to a valid editor.</source>
 <context>
     <name>freeverb</name>
     <message>
+        <location filename="../plugins/1050.ui" line="+20"/>
         <source>FreeVerb</source>
         <translation>FreeVerb</translation>
     </message>
@@ -10359,226 +12344,283 @@ is set to a valid editor.</source>
         <translation type="obsolete">Размер помещения</translation>
     </message>
     <message>
+        <location line="+106"/>
         <source>Damping</source>
         <translation>Демпфирование</translation>
     </message>
     <message>
+        <location line="+60"/>
         <source>Wet Level</source>
         <translation>Уровень &quot;Влажного&quot; сигнала</translation>
     </message>
     <message>
+        <location filename="../plugins/2142.ui" line="+26"/>
         <source>Tap-Reverberator</source>
         <translation>Пленочный Ревербератор</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Decay [ms]</source>
         <translation>Спад(мсек)</translation>
     </message>
     <message>
+        <location line="+59"/>
+        <location line="+41"/>
         <source>dB</source>
         <translation>дБ</translation>
     </message>
     <message>
+        <location line="-31"/>
         <source>Dry Level [dB]</source>
         <translation>Уровень &quot;Сухого&quot; сигнала [дб]</translation>
     </message>
     <message>
+        <location line="+41"/>
         <source>Wet Level [dB]</source>
         <translation>Уровень &quot;Влажного&quot; сигнала [Дб]</translation>
     </message>
     <message>
+        <location line="+72"/>
         <source>Preset:</source>
         <translation>Пресет:</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>AfterBurn</source>
         <translation>Запаздывающее Нарастание</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>AfterBurn (Long)</source>
         <translation>Запаздывающее Нарастание (Длинное)</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Ambience</source>
         <translation>Окружение</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Ambience (Thick)</source>
         <translation>Окружение (Плотное)</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Ambience (Thick) - HD</source>
         <translation>Окружение (Плотное) - HD</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Cathedral</source>
         <translation>Кафедральный Собор</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Cathedral - HD</source>
         <translation>Кафедральный Собор - HD</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Drum Chamber</source>
         <translation>Комната для Ударных</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Garage</source>
         <translation>Гараж</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Garage (Bright)</source>
         <translation>Гараж (Яркий)</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Gymnasium</source>
         <translation>Гимнастический зал</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Gymnasium (Bright)</source>
         <translation>Гимнастический зал (Яркий)</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Gymnasium (Bright) - HD</source>
         <translation>Гимнастический зал (Яркий) - HD</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Hall (Small)</source>
         <translation>Зал (Небольшой)</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Hall (Medium)</source>
         <translation>Зал (Средний)</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Hall (Large)</source>
         <translation>Зал (Большой)</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Hall (Large) - HD</source>
         <translation>Зал (Большой) - HD</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Plate (Small)</source>
         <translation>Plate реверб (Маленькая)</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Plate (Medium)</source>
         <translation>Plate реверб (Средняя)</translation>
     </message>
     <message>
+        <location filename="../plugins/1050.ui" line="-148"/>
         <source>Room Size</source>
         <translation>Размер помещения</translation>
     </message>
     <message>
+        <location filename="../plugins/2142.ui" line="+5"/>
         <source>Plate (Large)</source>
         <translation>Plate реверб (Большая)</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Plate (Large) - HD</source>
         <translation>Plate реверб (Большая) - HD</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Pulse Chamber</source>
         <translation>Пульсирующая комната</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Pulse Chamber (Reverse)</source>
         <translation>Пульсирующая комната (Реверс)</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Resonator (96 ms)</source>
         <translation>Резонатор (96 мсек)</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Resonator (152 ms)</source>
         <translation>Резонатор (152 мсек)</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Resonator (208 ms)</source>
         <translation>Резонатор (208 мсек)</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Room (Small)</source>
         <translation>Помещение (Маленькое)</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Room (Medium)</source>
         <translation>Помещение (Среднее)</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Room (Large)</source>
         <translation>Помещение (Большое)</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Room (Large) - HD</source>
         <translation>Помещение (Большое) - HD</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Slap Chamber</source>
         <translation>Комната &quot;slap&quot;</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Slap Chamber - HD</source>
         <translation>Комната &quot;slap&quot; - HD</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Slap Chamber (Bright)</source>
         <translation>Комната &quot;slap&quot; (Яркая)</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Slap Chamber (Bright) HD</source>
         <translation>Комната &quot;slap&quot; (Яркая) HD</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Smooth Hall (Small)</source>
         <translation>Ровный зал (Небольшой)</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Smooth Hall (Medium)</source>
         <translation>Ровный зал (Средний)</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Smooth Hall (Large)</source>
         <translation>Ровный зал (Большой)</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Smooth Hall (Large) - HD</source>
         <translation>Ровный зал (Большой) - HD</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Vocal Plate</source>
         <translation>Вокальная Plate-реверб</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Vocal Plate - HD</source>
         <translation>Вокальная Plate-реверб - HD</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Warble Chamber</source>
         <translation>Журчащая комната</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Warehoouse</source>
         <translation>Склад</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Warehouse - HD</source>
         <translation>Склад - HD</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Comb Filters</source>
         <translation>Причесывающие фильтры</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Allpass Filters</source>
         <translation>Широкополосный фильтр</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Bandpass Filters</source>
         <translation>Полосовой фильтр</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Enhanced Stereo</source>
         <translation>Расширенное стерео</translation>
     </message>
diff --git a/muse2/share/locale/muse_sv_SE.ts b/muse2/share/locale/muse_sv_SE.ts
index 95271d8e..7b768e8d 100644
--- a/muse2/share/locale/muse_sv_SE.ts
+++ b/muse2/share/locale/muse_sv_SE.ts
@@ -4,6 +4,7 @@
 <context>
     <name>@default</name>
     <message>
+        <location filename="../../muse/transport.cpp" line="+31"/>
         <source>Click this button to enable recording</source>
         <translation>Klicka här för att spela in</translation>
     </message>
@@ -11,11 +12,12 @@
         <source>sets amount of quantization:
 0   - no quantization
 100 - full quantization</source>
-        <translation type="unfinished">Sätter mängden kvantisering:
+        <translation type="obsolete">Sätter mängden kvantisering:
 0 - ingen kvantisering
 100 - full kvantisering</translation>
     </message>
     <message>
+        <location filename="../../muse/widgets/tools.cpp" line="+16"/>
         <source>select Pointer Tool:
 with the pointer tool you can:
   select parts
@@ -28,88 +30,107 @@ med pekverktyget kan du:
  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>
     </message>
     <message>
+        <location line="+1"/>
         <source>Click this button to start playback</source>
         <translation>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>
     </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>
     </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>
     </message>
     <message>
         <source>don&apos;t quantize notes above this tick limit</source>
-        <translation>Kvantisera inte över denna tick gräns</translation>
+        <translation type="obsolete">Kvantisera inte över denna tick gräns</translation>
     </message>
     <message>
         <source>quantize also note len as default</source>
-        <translation>Kvantisera &quot;note len&quot; som standard</translation>
+        <translation type="obsolete">Kvantisera &quot;note len&quot; som standard</translation>
     </message>
     <message>
+        <location filename="../../muse/app.cpp" line="+71"/>
         <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>
     </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.
 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>
     </message>
     <message>
+        <location line="+2"/>
         <source>loop between left mark and right mark</source>
         <translation>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>
     </message>
     <message>
+        <location line="+1"/>
         <source>record stops at right mark</source>
         <translation>inspelning slutar vid höger markering</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>rewind to start position</source>
         <translation>spola tillbaka till startposition</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>rewind current position</source>
         <translation>flytta markör bakåt</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>move current position</source>
         <translation>flytta markör</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>stop sequencer</source>
         <translation>stoppa sequencer</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>start sequencer play</source>
         <translation>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>
     </message>
     <message>
+        <location line="+1"/>
         <source>send note off to all midi channels</source>
         <translation>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
@@ -121,83 +142,126 @@ med pennverktyget kan du:
 </translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>select Delete Tool:
 with the delete tool you can delete parts</source>
         <translation>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: 
 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:
 med limverktyget kan du limma ihop två parter</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>select Score Tool:
 </source>
         <translation>välj Partiturverktyg:
 </translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>select Quantize Tool:
 insert display quantize event</source>
         <translation>välj Kvantiseringsverktyg:
 sätt in kvantiseringshändelser</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>select Drawing Tool</source>
         <translation>välj Ritverktyg
 </translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>select Muting Tool:
 click on part to mute/unmute</source>
         <translation>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>
     </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>
+    </message>
+    <message>
         <source>rubber</source>
         <translation type="obsolete">sudd</translation>
     </message>
     <message>
+        <location line="-7"/>
         <source>cutter</source>
         <translation>delare</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>score</source>
         <translation>partitur</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>glue</source>
         <translation>lim</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>quantize</source>
         <translation>kvantisering</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>draw</source>
         <translation>rita</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>mute parts</source>
         <translation>tysta parter</translation>
     </message>
     <message>
+        <location filename="../../muse/arranger/arranger.cpp" line="+136"/>
+        <location filename="../../muse/master/masteredit.cpp" line="+127"/>
+        <location filename="../../muse/widgets/comboQuant.cpp" line="+23"/>
+        <location line="+1"/>
+        <location line="+1"/>
+        <location filename="../../muse/widgets/tb1.cpp" line="+31"/>
+        <location line="+1"/>
+        <location line="+1"/>
         <source>Off</source>
         <translation>Av</translation>
     </message>
@@ -206,130 +270,189 @@ klicka på en part för att Tysta/Avtysta</translation>
         <translation type="obsolete">Alla filer (*)</translation>
     </message>
     <message>
+        <location filename="../../muse/app.cpp" line="+645"/>
         <source>Add Midi Track</source>
         <translation type="unfinished">Lägg till Midispår</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Add Drum Track</source>
         <translation type="unfinished">Lägg till Trumspår</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Add Wave Track</source>
         <translation type="unfinished">Lägg till Wavespår</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Add Audio Output</source>
         <translation type="unfinished">Lägg till Ljudutgång</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Add Audio Group</source>
         <translation type="unfinished">Lägg till Ljudgrupp</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Add Audio Input</source>
         <translation type="unfinished">Lägg till Ljudingång</translation>
     </message>
     <message>
+        <location line="+4"/>
         <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>
     </message>
     <message>
+        <location filename="../../muse/app.cpp" line="-66"/>
         <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="+56"/>
+        <location filename="../../muse/arranger/tlist.cpp" line="+970"/>
         <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="+714"/>
         <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="+225"/>
+        <location filename="../../muse/driver/jackmidi.cpp" line="+737"/>
+        <location filename="../../muse/midiport.cpp" line="+1072"/>
+        <location filename="../../muse/track.cpp" line="+782"/>
+        <location line="+16"/>
+        <location line="+30"/>
         <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="+34"/>
+        <location filename="../../muse/driver/jackmidi.cpp" line="+36"/>
+        <location filename="../../muse/midiport.cpp" line="+7"/>
+        <location filename="../../muse/track.cpp" line="-48"/>
+        <location line="+60"/>
         <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="-61"/>
+        <location line="+64"/>
+        <location filename="../../muse/track.cpp" line="-42"/>
+        <location line="+48"/>
         <source> type=&quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location filename="../../muse/driver/jackmidi.cpp" line="-61"/>
+        <location line="+64"/>
+        <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="-69"/>
+        <location filename="../../muse/track.cpp" line="-56"/>
         <source>source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../../muse/midictrl.cpp" line="+227"/>
         <source>Velocity</source>
         <translation type="unfinished">Hastighet</translation>
     </message>
     <message>
+        <location filename="../../muse/midiport.cpp" line="-756"/>
         <source>&lt;none&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+750"/>
+        <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="+1316"/>
         <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>
@@ -337,6 +460,7 @@ klicka på en part för att Tysta/Avtysta</translation>
 <context>
     <name>AboutBox</name>
     <message>
+        <location filename="../../muse/widgets/aboutbox.ui" line="+14"/>
         <source>AboutBox</source>
         <translation type="unfinished">Om</translation>
     </message>
@@ -361,10 +485,12 @@ och mer information.
 Publiserad under GNU Public License</translation>
     </message>
     <message>
+        <location line="+37"/>
         <source>Version 2 pre-alpha</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>(C) Copyright 1999-2010 Werner Schweer and others.
 See http://www.muse-sequencer.org for new versions and
 more information.
@@ -373,10 +499,12 @@ Published under the GNU Public License</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>&amp;Keep On Rocking!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+K</source>
         <translation type="unfinished"></translation>
     </message>
@@ -404,60 +532,78 @@ Published under the GNU Public License</source>
         <translation type="obsolete">audioeditor bakgrundsfärg</translation>
     </message>
     <message>
+        <location filename="../../muse/appearance.cpp" line="+751"/>
         <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>
-        <source>&lt;none&gt;</source>
+        <location line="+2"/>
+        <source>Global opacity (opposite of transparency).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select style sheet</source>
+        <location line="+4"/>
+        <source>Standard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Qt style sheets (*.qss)</source>
+        <location line="+2"/>
+        <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Global opaqueness (inverse of transparency).</source>
+        <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>
@@ -465,25 +611,30 @@ Word-breaking but only with spaces.</source>
     <name>AppearanceDialogBase</name>
     <message>
         <source>MusE: Appearance Settings</source>
-        <translation>MusE: Utseendeinställningar</translation>
+        <translation type="obsolete">MusE: Utseendeinställningar</translation>
     </message>
     <message>
+        <location filename="../../muse/widgets/appearancebase.ui" line="+1681"/>
         <source>Apply</source>
         <translation>Verkställ</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
     <message>
+        <location line="-1668"/>
         <source>Arranger</source>
         <translation>Arrangerare</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Parts</source>
         <translation>Parter</translation>
     </message>
@@ -492,70 +643,86 @@ Word-breaking but only with spaces.</source>
         <translation type="obsolete">visa ramar</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>show names</source>
         <translation>visa namn</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>show events</source>
         <translation>visa händelser(events)</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>show Cakewalk Style</source>
         <translation>använd Cakewalkstil</translation>
     </message>
     <message>
+        <location line="+28"/>
+        <source>y-stretch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+15"/>
         <source>Events</source>
         <translation>Händelser</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>note on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>poly pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>aftertouch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>pitch bend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>program change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>special</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Background picture</source>
         <translation>Bakgrundsbild</translation>
     </message>
     <message>
-        <source>bg</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>select...</source>
-        <translation>välj...</translation>
+        <translation type="obsolete">välj...</translation>
     </message>
     <message>
+        <location line="+58"/>
         <source>show snap grid</source>
         <translation>visa rutnät</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Colors</source>
         <translation>Färger</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Items</source>
         <translation type="unfinished"></translation>
     </message>
@@ -576,149 +743,225 @@ Word-breaking but only with spaces.</source>
         <translation type="obsolete">dynamisk färgallokering för spåraktivitet i arranger</translation>
     </message>
     <message>
+        <location line="+824"/>
         <source>Style/Fonts</source>
         <translation>Stil/Typsnitt</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>QT Theme</source>
         <translation>QT-tema</translation>
     </message>
     <message>
+        <location line="+21"/>
         <source>Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>MusE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Metal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Norwegian Wood</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Platinum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>CDE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Motif</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Motif Plus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+73"/>
         <source>Fonts</source>
         <translation>Typsnitt</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Family</source>
         <translation>Familj</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Size</source>
         <translation>Storlek</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Font 1</source>
         <translation>Typsnitt 1</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Font 2</source>
         <translation>Typsnitt 2</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Font 3</source>
         <translation>Typsnitt 3</translation>
     </message>
     <message>
+        <location line="+50"/>
         <source>Font 0</source>
         <translation>Typsnitt 0</translation>
     </message>
     <message>
+        <location line="+50"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <location line="+157"/>
+        <location line="+47"/>
+        <location line="+7"/>
         <source>Bold</source>
         <translation>Fet</translation>
     </message>
     <message>
+        <location line="-204"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <location line="+136"/>
+        <location line="+54"/>
+        <location line="+7"/>
         <source>Italic</source>
         <translation>Kursiv</translation>
     </message>
     <message>
+        <location line="-433"/>
+        <location line="+7"/>
+        <location line="+242"/>
+        <location line="+13"/>
+        <location line="+13"/>
+        <location line="+13"/>
+        <location line="+97"/>
+        <location line="+61"/>
+        <location line="+13"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-633"/>
+        <source>Color name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Global opacity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+449"/>
         <source>Font 4</source>
         <translation>Typsnitt 4</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Font 5</source>
         <translation>Typsnitt 5</translation>
     </message>
     <message>
+        <location line="-1228"/>
         <source>Palette</source>
         <translation type="unfinished">Palett</translation>
     </message>
     <message>
+        <location line="-257"/>
+        <source>MusE: Appearance settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+193"/>
+        <source>add</source>
+        <translation type="unfinished">lägg till</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>remove</source>
+        <translation type="unfinished">ta bort</translation>
+    </message>
+    <message>
+        <location line="+586"/>
         <source>add to palette</source>
         <translation type="unfinished">lägg till palett</translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>B</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>H</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+30"/>
         <source>V</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>G</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+96"/>
         <source>R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-772"/>
         <source>clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+953"/>
         <source>Style Sheet:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+345"/>
         <source>Font 6</source>
         <translation type="unfinished">Typsnitt 6</translation>
     </message>
-    <message>
-        <source>Global opaqueness</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>Arranger</name>
     <message>
+        <location filename="../../muse/arranger/arranger.cpp" line="-13"/>
         <source>Arranger</source>
         <translation>Arrangerare</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Cursor</source>
         <translation>Markör</translation>
     </message>
@@ -731,94 +974,128 @@ Word-breaking but only with spaces.</source>
         <translation type="obsolete">Takt</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Snap</source>
         <translation type="unfinished">Fäst vid</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Len</source>
         <translation type="unfinished">Längd</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>NO</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>GM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>GS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>XG</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location line="+1"/>
         <source>midi song type</source>
         <translation>typ av midsång</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Pitch</source>
         <translation type="unfinished">Tonhöjd</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>midi pitch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>global midi pitch shift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Tempo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+8"/>
+        <location line="+1"/>
         <source>midi tempo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+60"/>
         <source>TrackInfo</source>
         <translation>Spårinfo</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Track</source>
         <translation>Spår</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Ch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>Automation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Clef</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Master</source>
         <translation type="obsolete">Master</translation>
     </message>
@@ -839,42 +1116,62 @@ Word-breaking but only with spaces.</source>
         <translation type="obsolete">Grupp D</translation>
     </message>
     <message>
+        <location line="-232"/>
         <source>Enable Recording</source>
         <translation type="unfinished">Slå på Inspelning</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Mute/Off Indicator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Solo Indicator</source>
         <translation type="unfinished">Solo-Indikator</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Track Type</source>
         <translation type="unfinished">Spårtyp</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Track Name</source>
         <translation type="unfinished">Spårnamn</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Midi output channel number or audio channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Midi output port or synth midi port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Time Lock</source>
         <translation type="unfinished">Tidlås</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>Automation parameter selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Notation clef</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
         <source>Enable recording. Click to toggle.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Mute indicator. Click to toggle.
 Right-click to toggle track on/off.
 Mute is designed for rapid, repeated action.
@@ -882,28 +1179,33 @@ On/Off is not!</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+1"/>
         <source>Track type. Right-click to change
  midi and drum track types.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Track name. Double-click to edit.
 Right-click for more options.</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+1"/>
         <source>Midi/drum track: Output port.
 Synth track: Assigned midi port.
 Left-click to change.
@@ -911,19 +1213,24 @@ Right-click to show GUI.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Time lock</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>song length - bars</source>
+        <location line="+1"/>
+        <source>Notation clef. Select this tracks notation clef.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Port</source>
+        <location line="+73"/>
+        <location line="+1"/>
+        <source>song length - bars</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;unknown&gt;</source>
+        <location line="+126"/>
+        <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1049,46 +1356,57 @@ Right-click to show GUI.</source>
         <translation type="obsolete">Ingen</translation>
     </message>
     <message>
+        <location filename="../../muse/mixer/amixer.cpp" line="+156"/>
         <source>&amp;Create</source>
         <translation type="unfinished">&amp;Skapa</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <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>Show Inputs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Show Outputs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Show Groups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Show Auxs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Show Synthesizers</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1096,46 +1414,57 @@ Right-click to show GUI.</source>
 <context>
     <name>AudioStrip</name>
     <message>
+        <location filename="../../muse/mixer/astrip.cpp" line="+603"/>
         <source>panorama</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>aux send level</source>
         <translation type="unfinished">aux send nivå</translation>
     </message>
     <message>
+        <location line="+286"/>
         <source>off</source>
         <translation type="unfinished">av</translation>
     </message>
     <message>
+        <location line="-263"/>
         <source>Pan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+93"/>
         <source>1/2 channel</source>
         <translation type="unfinished">1/2 kanal</translation>
     </message>
     <message>
+        <location line="+12"/>
         <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="+64"/>
         <source>dB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+36"/>
         <source>record</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>mute</source>
         <translation type="unfinished">tysta</translation>
     </message>
     <message>
+        <location line="+25"/>
         <source>record downmix</source>
         <translation type="unfinished">spela in nermixning</translation>
     </message>
@@ -1144,6 +1473,7 @@ Right-click to show GUI.</source>
         <translation type="obsolete">pre fader lyssning</translation>
     </message>
     <message>
+        <location line="+37"/>
         <source>iR</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1152,42 +1482,52 @@ Right-click to show GUI.</source>
         <translation type="obsolete">ingångsrouting</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>oR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>output routing</source>
         <translation type="unfinished">utgångsrouting</translation>
     </message>
     <message>
+        <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="+1"/>
         <source>Write</source>
         <translation type="unfinished">Skriv</translation>
     </message>
     <message>
+        <location line="+25"/>
         <source>automation type</source>
         <translation type="unfinished">automationstyp</translation>
     </message>
     <message>
         <source>Channel</source>
-        <translation type="unfinished">Kanal</translation>
+        <translation type="obsolete">Kanal</translation>
     </message>
     <message>
+        <location line="-88"/>
+        <location line="+4"/>
         <source>solo mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>input routing</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1196,55 +1536,62 @@ Right-click to show GUI.</source>
     <name>Awl::MidiVolEntry</name>
     <message>
         <source>off</source>
-        <translation type="unfinished">av</translation>
-    </message>
-    <message>
-        <source>db</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">av</translation>
     </message>
 </context>
 <context>
     <name>Awl::VolEntry</name>
     <message>
         <source>off</source>
-        <translation type="unfinished">av</translation>
+        <translation type="obsolete">av</translation>
     </message>
 </context>
 <context>
     <name>BigTime</name>
     <message>
+        <location filename="../../muse/widgets/bigtime.cpp" line="+78"/>
         <source>MusE: Bigtime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-42"/>
         <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">minut</translation>
     </message>
     <message>
+        <location line="+1"/>
         <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="-2"/>
         <source>subframe</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1252,6 +1599,7 @@ Right-click to show GUI.</source>
 <context>
     <name>ClipListEdit</name>
     <message>
+        <location filename="../../muse/cliplist/cliplist.cpp" line="+103"/>
         <source>MusE: Clip List Editor</source>
         <translation type="unfinished">MusE: Clip-listredigerare</translation>
     </message>
@@ -1259,38 +1607,47 @@ Right-click to show GUI.</source>
 <context>
     <name>ClipListEditorBase</name>
     <message>
+        <location filename="../../muse/widgets/cliplisteditorbase.ui" line="+17"/>
         <source>MusE: ClipList</source>
         <translation>MusE: Clip-lista</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Name</source>
         <translation>Namn</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Refs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Len</source>
         <translation type="unfinished">Längd</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>Clip Properties</source>
         <translation>Clip-egenskaper</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Pos:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Len:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1298,14 +1655,17 @@ Right-click to show GUI.</source>
 <context>
     <name>CommentBase</name>
     <message>
+        <location filename="../../muse/widgets/commentbase.ui" line="+14"/>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>Track Comment</source>
         <translation>Spår-kommentar</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>Track 1</source>
         <translation>Spår 1</translation>
     </message>
@@ -1313,42 +1673,52 @@ Right-click to show GUI.</source>
 <context>
     <name>ConfigMidiFileBase</name>
     <message>
+        <location filename="../../muse/widgets/configmidifilebase.ui" line="+193"/>
         <source>&amp;OK</source>
         <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished">&amp;Avbryt</translation>
     </message>
     <message>
+        <location line="-56"/>
         <source>0 (single track)</source>
         <translation type="unfinished">0 (ett spår)</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>1 (multiple tracks)</source>
         <translation type="unfinished">1 (flera spår)</translation>
     </message>
     <message>
+        <location line="-36"/>
         <source>Format:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-48"/>
         <source>96</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>192</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>384</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+48"/>
         <source>Division:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-20"/>
         <source>Copyright:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1357,46 +1727,57 @@ Right-click to show GUI.</source>
         <translation type="obsolete">Slå på utbyggt smf-format</translation>
     </message>
     <message>
+        <location line="-95"/>
         <source>MusE: Config Midi File Import/Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Import:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Split tracks into &amp;parts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+P</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Split tracks into parts, or one single part</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Export:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+31"/>
         <source>Enable extended smf format (currently not implemented)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Use &amp;2-byte time signatures instead of standard 4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+37"/>
         <source>Save space by replacing note-offs with &amp;zero velocity note-ons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+Z</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1404,14 +1785,18 @@ Right-click to show GUI.</source>
 <context>
     <name>CtrlPanel</name>
     <message>
+        <location filename="../../muse/ctrl/ctrlpanel.cpp" line="+79"/>
         <source>select controller</source>
         <translation>välj controller</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>remove panel</source>
         <translation>ta bort panel</translation>
     </message>
     <message>
+        <location line="+463"/>
+        <location line="+236"/>
         <source>Velocity</source>
         <translation>Hastighet</translation>
     </message>
@@ -1424,248 +1809,378 @@ Right-click to show GUI.</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>
     </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>
+    </message>
 </context>
 <context>
     <name>DeicsOnzeGui</name>
     <message>
+        <location filename="../../synti/deicsonze/deicsonzegui.cpp" line="+1886"/>
+        <location line="+389"/>
         <source>Delete preset</source>
         <translation type="unfinished">Ta bort preset</translation>
     </message>
     <message>
+        <location line="-339"/>
+        <location line="+169"/>
+        <location line="+171"/>
         <source>Do you really want to delete %1 ?</source>
         <translation type="unfinished">Vill du verkligen ta bort %1 ?</translation>
     </message>
     <message>
+        <location line="-338"/>
+        <location line="+170"/>
+        <location line="+170"/>
         <source>&amp;Yes</source>
         <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
+        <location line="-340"/>
+        <location line="+170"/>
+        <location line="+170"/>
         <source>&amp;No</source>
         <translation type="unfinished">&amp;Nej</translation>
     </message>
     <message>
+        <location line="-1745"/>
         <source>Save configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+41"/>
+        <location line="+7"/>
+        <location line="+1172"/>
+        <location line="+7"/>
+        <location line="+218"/>
+        <location line="+7"/>
+        <location line="+160"/>
+        <location line="+7"/>
+        <location line="+165"/>
+        <location line="+7"/>
         <source>Critical Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-1749"/>
+        <location line="+1179"/>
+        <location line="+225"/>
+        <location line="+167"/>
+        <location line="+172"/>
         <source>Cannot open file %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-1736"/>
+        <location line="+1179"/>
+        <location line="+225"/>
+        <location line="+167"/>
+        <location line="+172"/>
         <source>Parsing error for file %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-1709"/>
+        <location line="+1351"/>
         <source>Load category dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-226"/>
         <source>Load set dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+67"/>
         <source>Save set dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+24"/>
         <source>New category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location line="+101"/>
         <source>Delete category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-99"/>
         <source>Load category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Save category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Load set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Save set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Delete set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>New subcategory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
+        <location line="+243"/>
         <source>Delete subcategory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-240"/>
         <source>Load subcategory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Save subcategory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>New preset</source>
         <translation type="unfinished">Ny preset</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Load preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Save preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>No more category supported</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>You can not add more categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+42"/>
+        <location line="+110"/>
         <source>No category selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-109"/>
+        <location line="+110"/>
         <source>You must first select a category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-61"/>
+        <location line="+167"/>
+        <location line="+172"/>
         <source>Replace or add</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+3"/>
+        <location line="+168"/>
+        <location line="+171"/>
         <source>&amp;Replace</source>
         <translation type="unfinished">&amp;Ersätt</translation>
     </message>
     <message>
+        <location line="-339"/>
+        <location line="+168"/>
+        <location line="+171"/>
         <source>&amp;Add</source>
         <translation type="unfinished">&amp;Lägg till</translation>
     </message>
     <message>
+        <location line="-329"/>
+        <location line="+167"/>
+        <location line="+171"/>
         <source>Download error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-337"/>
         <source>There is no more free category slot.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>Save category dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+30"/>
         <source>No more subcategory supported</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>You can not add more subcategories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+42"/>
+        <location line="+113"/>
         <source>No subcategory selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-112"/>
+        <location line="+113"/>
         <source>You must first select a subcategory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-101"/>
         <source>Load subcategory dialog</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+14"/>
         <source>There is no more free subcategory slot.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>Save subcategory dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>No more preset supported</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>You can not add more presets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+39"/>
+        <location line="+3"/>
+        <location line="+111"/>
         <source>No preset selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-113"/>
+        <location line="+3"/>
+        <location line="+111"/>
         <source>You must first select a preset.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-98"/>
         <source>Load preset dialog</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+13"/>
         <source>There is no more free preset slot.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>Save preset dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+120"/>
         <source>Browse set dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+35"/>
         <source>Browse image dialog</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1686,11 +2201,11 @@ Right-click to show GUI.</source>
     </message>
     <message>
         <source>Subcategory</source>
-        <translation type="unfinished">Underkategori</translation>
+        <translation type="obsolete">Underkategori</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation type="unfinished">Kategori</translation>
+        <translation type="obsolete">Kategori</translation>
     </message>
     <message>
         <source>Delete</source>
@@ -1718,11 +2233,11 @@ Right-click to show GUI.</source>
     </message>
     <message>
         <source>Pitch Bend Range</source>
-        <translation type="unfinished">Pitchbend område</translation>
+        <translation type="obsolete">Pitchbend område</translation>
     </message>
     <message>
         <source>Speed</source>
-        <translation type="unfinished">Hastighet</translation>
+        <translation type="obsolete">Hastighet</translation>
     </message>
     <message>
         <source>Square</source>
@@ -1730,966 +2245,92 @@ Right-click to show GUI.</source>
     </message>
     <message>
         <source>LFO Waveform</source>
-        <translation type="unfinished">LFO Vågform</translation>
+        <translation type="obsolete">LFO Vågform</translation>
     </message>
     <message>
         <source>Amplitude Modulation Sensitivity</source>
-        <translation type="unfinished">Amplitudmodulationskänslighet</translation>
+        <translation type="obsolete">Amplitudmodulationskänslighet</translation>
     </message>
     <message>
         <source>Pitch Modulation Sensitivity</source>
-        <translation type="unfinished">Pitchmodulationskänslighet</translation>
+        <translation type="obsolete">Pitchmodulationskänslighet</translation>
     </message>
     <message>
         <source>Pitch Modulation Depth</source>
-        <translation type="unfinished">Pitchmodulationsdjup</translation>
+        <translation type="obsolete">Pitchmodulationsdjup</translation>
     </message>
     <message>
         <source>LFO Speed</source>
-        <translation type="unfinished">LFO Hastighet</translation>
+        <translation type="obsolete">LFO Hastighet</translation>
     </message>
     <message>
         <source>Transpose</source>
-        <translation type="unfinished">Transponera</translation>
+        <translation type="obsolete">Transponera</translation>
     </message>
     <message>
         <source>Modulation Matrix</source>
-        <translation type="unfinished">Modulationsmatris</translation>
+        <translation type="obsolete">Modulationsmatris</translation>
     </message>
     <message>
         <source>Frequency 1</source>
-        <translation type="unfinished">Frekvens 1</translation>
+        <translation type="obsolete">Frekvens 1</translation>
     </message>
     <message>
         <source>Volume</source>
-        <translation type="unfinished">Volym</translation>
-    </message>
-    <message>
-        <source>DeicsOnze</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Preset</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Program numerous</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>INITVOICE</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LBank</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bank numerous</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>NONE</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>HBank</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Prog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Preset</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DeicsOnze v0.5.5 Copyright (c) 2004-2006 Nil Geisweiller. Published under GPL licence.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Global</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pitch Envelope</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PL3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PL2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PL1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PR1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PR2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PR3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pitch modulation depth</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LFO</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LFO Sync</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pitch modulation sensitivity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LFO Delay</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LFO delay</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LFO speed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amplitude modulation depth</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amplitude modulation sensitivity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AMS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PMD</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AMD</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PMS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&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;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Op4 Feedback</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Feedback level of the operator 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Op &amp;1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scaling 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LS1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RS1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rate Scaling</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Attack Rate of the operator 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Level Scaling</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amplitude Envelope 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RR1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D1R1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D1L1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D2R1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Release Rate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message utf8="true">
-        <source>2° Decay Rate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message utf8="true">
-        <source>1° Decay Level</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message utf8="true">
-        <source>1° Decay Rate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Attack Rate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AR1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Detune, OSCWave, EGShift 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DET1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Detune</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EG Shift</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>96dB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>48dB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>24dB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>12dB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wave form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>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;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sensitivity 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>KVS1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amplitude Modulation Enable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AME1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Keyboard Velocity Sensitivity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key Velocity Sensitivity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EBS1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EG Bias Sensitivity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Eg Bias Sensitivity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Coarse 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Coarse Ratio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine Ratio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Freq 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fixed Frequency</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggle Fix Frequency</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>FIX</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OUT 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Output Volume</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Op &amp;2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amplitude Envelope 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D1R2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D1L2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D2R2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RR2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AR2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Frequency 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Coarse 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Freq 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scaling 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LS2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RS2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OUT 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Detune, OSCWave, EGShift 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DET2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sensitivity 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EBS2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>KVS2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AME2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Op &amp;3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amplitude Envelope 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D1R3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D1L3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D2R3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RR3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AR3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scaling 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LS3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RS3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OUT 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Frequency 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Coarse 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Freq 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Detune, OSCWave, EGShift 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DET3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sensitivity 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EBS3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>KVS3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AME3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Op &amp;4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>amplitude Envelope 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AR4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D1R4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D1L4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D2R4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RR4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Frequency 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Coarse 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Freq 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scaling 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LS4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RS4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OUT 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Detune, OSCWave, EGShift 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DET4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sensitivity 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EBS4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>KVS4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AME4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Func</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay Pan Depth</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay Pan LFO Freq</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay Ch Send Level </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Channel Chorus</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay Feedback</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay On/Off, Return Level</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Volym</translation>
     </message>
     <message>
         <source>On</source>
-        <translation type="unfinished">På</translation>
-    </message>
-    <message>
-        <source>Delay Beat Ratio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay BPM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Foot Control</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">På</translation>
     </message>
     <message>
         <source>Pitch</source>
-        <translation type="unfinished">Tonhöjd</translation>
-    </message>
-    <message>
-        <source>Amplitude</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Modulation Wheel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Breath Control</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pitch Bias</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Envelope Bias</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>After Touch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Phony Mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>POLY</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MONO</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Potamento</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Portamento Mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>FINGER</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>FULL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PT</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Portamento Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;horus</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Chorus Parameters</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Channel send level</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>On/Off and Return level</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select LADSPA plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Reverb</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reverb Parameters</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Tonhöjd</translation>
     </message>
     <message>
         <source>&amp;Config</source>
-        <translation type="unfinished">&amp;Inställningar</translation>
-    </message>
-    <message>
-        <source>Font Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Quality</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>High</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Middle</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ultra low</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&amp;Inställningar</translation>
     </message>
     <message>
         <source>Filter</source>
-        <translation type="unfinished">Filter</translation>
-    </message>
-    <message>
-        <source>Save Mode (into the song)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save only the used presets</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save the entire set</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save the configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configuration File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Load...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save as default</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Filter</translation>
     </message>
     <message>
         <source>Colors</source>
-        <translation type="unfinished">Färger</translation>
+        <translation type="obsolete">Färger</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation type="unfinished">Text</translation>
-    </message>
-    <message>
-        <source>Background</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Background</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Red</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Blue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Green</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set Path</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Image in the background :</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Browse...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Load the set at the initialization :</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set Brightness, Detune, Attack and Release of the current channel to default</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Res. Ctrl</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut all notes off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Panic!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Number of Voices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Number of voices</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Text</translation>
     </message>
     <message>
         <source>Enable</source>
-        <translation type="unfinished">Aktivera</translation>
+        <translation type="obsolete">Aktivera</translation>
     </message>
     <message>
         <source>Channel</source>
-        <translation type="unfinished">Kanal</translation>
-    </message>
-    <message>
-        <source>Vol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Channel Ctrl</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Release</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Attack</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Brightness</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Modulation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pan</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Kanal</translation>
     </message>
 </context>
 <context>
     <name>DidYouKnow</name>
     <message>
+        <location filename="../../muse/widgets/didyouknow.ui" line="+14"/>
         <source>Did you know?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Don&apos;t show on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Next tip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Close</source>
         <translation type="unfinished">Stäng</translation>
     </message>
@@ -2697,130 +2338,162 @@ 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="+167"/>
         <source>&amp;File</source>
         <translation>&amp;Arkiv</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Load Map</source>
         <translation>Ladda mappning</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Save Map</source>
         <translation>Spara Mappning</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>&amp;Edit</source>
         <translation>&amp;Redigera</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Cut</source>
         <translation>Klipp ut</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Copy</source>
         <translation>Kopiera</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Paste</source>
         <translation>Klistra in</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Delete Events</source>
         <translation>Ta bort händelser</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>Select All</source>
         <translation>Välj Allt</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Select None</source>
         <translation>Välj Ingen</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Invert</source>
         <translation>Invertera</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Inside Loop</source>
         <translation>I loop</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Outside Loop</source>
         <translation>Utanför loop</translation>
     </message>
     <message>
+        <location line="-7"/>
         <source>&amp;Select</source>
         <translation>&amp;Välj</translation>
     </message>
     <message>
+        <location line="+76"/>
         <source>Load Drummap</source>
         <translation>Ladda trummappning</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Store Drummap</source>
         <translation>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>
     </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>
     </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>
     </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>
     </message>
@@ -2829,118 +2502,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
         <translation type="obsolete">trummappningar</translation>
     </message>
     <message>
+        <location line="+383"/>
         <source>Muse: Load Drum Map</source>
         <translation>Muse: Ladda trummappning</translation>
     </message>
     <message>
+        <location line="+53"/>
         <source>MusE: Store Drum Map</source>
         <translation>MusE: Spara trummappning</translation>
     </message>
     <message>
+        <location line="-625"/>
         <source>Set Fixed Length</source>
         <translation type="unfinished">Sätt fast längd</translation>
     </message>
     <message>
+        <location line="-6"/>
         <source>&amp;Functions</source>
         <translation type="unfinished">&amp;Funktioner</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Modify Velocity</source>
         <translation type="unfinished">Modifiera Velocity</translation>
     </message>
     <message>
+        <location line="-142"/>
+        <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="-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="-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">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="+41"/>
         <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="+23"/>
+        <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">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="+9"/>
         <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>
+    </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="+471"/>
         <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>
@@ -2948,14 +2702,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
 <context>
     <name>EditCAfterDialog</name>
     <message>
+        <location filename="../../muse/liste/editevent.cpp" line="+428"/>
         <source>MusE: Enter Channel Aftertouch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Time Position</source>
         <translation type="unfinished">Tidsposition</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Pressure</source>
         <translation type="unfinished">Tryck</translation>
     </message>
@@ -3016,58 +2773,73 @@ 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>EditCtrlBase</name>
     <message>
+        <location filename="../../muse/liste/editctrlbase.ui" line="+14"/>
         <source>MusE: Edit Controller Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Time Position</source>
         <translation type="unfinished">Tidsposition</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Available Controller:</source>
         <translation type="unfinished">Tillgänglig controller:</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Create New Controller</source>
         <translation type="unfinished">Skapa ny Controller:</translation>
     </message>
     <message>
+        <location line="+486"/>
         <source>textLabel3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Value</source>
         <translation type="unfinished">Värde</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+45"/>
         <source>H-Bank</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>L-Bank</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Program</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
+        <location line="+16"/>
         <source>off</source>
         <translation type="unfinished">av</translation>
     </message>
     <message>
+        <location line="+42"/>
         <source>pushButton4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+35"/>
         <source>&amp;OK</source>
         <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished">&amp;Avbryt</translation>
     </message>
@@ -3075,10 +2847,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 type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Cancel</source>
         <translation type="unfinished">Avbryt</translation>
     </message>
@@ -3086,46 +2860,57 @@ 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>EditGainBase</name>
     <message>
+        <location filename="../../muse/waveedit/editgainbase.ui" line="+14"/>
         <source>MusE: Modify gain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Gain</source>
         <translation type="unfinished">Förstärkning</translation>
     </message>
     <message>
+        <location line="+51"/>
         <source>200%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>100%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>0%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+51"/>
         <source>&amp;Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+39"/>
         <source>&amp;Apply</source>
         <translation type="unfinished">&amp;Verkställ</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+A</source>
         <translation type="unfinished">Alt+L</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished">&amp;Avbryt</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+C</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3133,131 +2918,178 @@ 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="+296"/>
+        <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>
-        <source>(You can override with the environment variable MUSEINSTRUMENTS)</source>
+        <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>
     </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>
@@ -3265,6 +3097,7 @@ Save Current Instrument?</source>
 <context>
     <name>EditInstrumentBase</name>
     <message>
+        <location filename="../../muse/instruments/editinstrumentbase.ui" line="+20"/>
         <source>MusE: Instrument Editor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3277,14 +3110,17 @@ Save Current Instrument?</source>
         <translation type="obsolete">Patchnamn:</translation>
     </message>
     <message>
+        <location line="+119"/>
         <source>High Bank:</source>
         <translation type="unfinished">Hög bank:</translation>
     </message>
     <message>
+        <location line="+52"/>
         <source>Low Bank:</source>
         <translation type="unfinished">Låg bank:</translation>
     </message>
     <message>
+        <location line="+52"/>
         <source>Program:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3293,10 +3129,16 @@ Save Current Instrument?</source>
         <translation type="obsolete">Patch/Grupp;</translation>
     </message>
     <message>
+        <location line="+141"/>
+        <location line="+747"/>
+        <location line="+201"/>
         <source>&amp;Delete</source>
         <translation type="unfinished">&amp;Ta bort</translation>
     </message>
     <message>
+        <location line="-945"/>
+        <location line="+747"/>
+        <location line="+201"/>
         <source>Alt+D</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3309,18 +3151,22 @@ Save Current Instrument?</source>
         <translation type="obsolete">Ny Grupp;</translation>
     </message>
     <message>
+        <location line="-1035"/>
         <source>Drum</source>
         <translation type="unfinished">Trumma</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>GM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>GS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>XG</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3329,6 +3175,7 @@ Save Current Instrument?</source>
         <translation type="obsolete">Fördefinierad controller:</translation>
     </message>
     <message>
+        <location line="+136"/>
         <source>This is a list of commonly used midi controllers.
 Note that in MusE pitch and program changes are
 handled like normal controllers.</source>
@@ -3337,6 +3184,8 @@ Notera att i MusE hanteras tonhöjd och program change som
 vanliga controllers.</translation>
     </message>
     <message>
+        <location line="-368"/>
+        <location line="+441"/>
         <source>Properties</source>
         <translation type="unfinished">Egenskaper</translation>
     </message>
@@ -3349,30 +3198,38 @@ vanliga controllers.</translation>
         <translation type="obsolete">Typ</translation>
     </message>
     <message>
+        <location line="+49"/>
         <source>Control7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Control14</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>RPN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>NRPN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Pitch</source>
         <translation type="unfinished">Tonhöjd</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Program</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-118"/>
+        <location line="+142"/>
         <source>H-Ctrl</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3381,6 +3238,8 @@ vanliga controllers.</translation>
         <translation type="obsolete">Midicontrollernummer, hög byte</translation>
     </message>
     <message>
+        <location line="-137"/>
+        <location line="+191"/>
         <source>L-Ctrl</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3393,18 +3252,22 @@ vanliga controllers.</translation>
         <translation type="obsolete">Område</translation>
     </message>
     <message>
+        <location line="+79"/>
         <source>Min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+72"/>
         <source>Max</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-357"/>
         <source>Name                  </source>
         <translation type="unfinished">Namn</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Type       </source>
         <translation type="unfinished">Typ</translation>
     </message>
@@ -3433,247 +3296,314 @@ vanliga controllers.</translation>
         <translation type="obsolete">Panik</translation>
     </message>
     <message>
+        <location line="+802"/>
         <source>Hex Entry:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+90"/>
         <source>&amp;File</source>
         <translation type="unfinished">&amp;Arkiv</translation>
     </message>
     <message>
+        <location line="-27"/>
         <source>Tools</source>
         <translation type="unfinished">Verktyg</translation>
     </message>
     <message>
+        <location line="+49"/>
         <source>New</source>
         <translation type="unfinished">Ny</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;New</source>
         <translation type="unfinished">&amp;Ny</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>Open</source>
         <translation type="unfinished">Öppna</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Open...</source>
         <translation type="unfinished">&amp;Öppna...</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Ctrl+O</source>
         <translation type="unfinished">Ctrl+Ö</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>Save</source>
         <translation type="unfinished">Spara</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Save</source>
         <translation type="unfinished">&amp;Spara</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Save As</source>
         <translation type="unfinished">Spara som</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>Save &amp;As...</source>
         <translation type="unfinished">S&amp;para som...</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Exit</source>
         <translation type="unfinished">Stäng</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>E&amp;xit</source>
         <translation type="unfinished">S&amp;täng</translation>
     </message>
     <message>
+        <location line="-1448"/>
         <source>Instrument Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Selected instrument name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>List of defined instruments.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Pa&amp;tches</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>List of groups and patches.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Group/Patch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+15"/>
+        <location line="+443"/>
+        <location line="+742"/>
         <source>Name:</source>
         <translation type="unfinished">Namn:</translation>
     </message>
     <message>
+        <location line="-1175"/>
+        <location line="+3"/>
         <source>Group or patch name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Patch high bank number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Patch high bank number. --- means don&apos;t care.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>---</source>
         <comment>dont care</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+46"/>
         <source>Patch low bank number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Patch low bank number. --- means don&apos;t care.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>---</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+46"/>
+        <location line="+3"/>
         <source>Patch program number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+36"/>
         <source>Drum patch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>If set, the patch is available only for drum channels.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>GM patch</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+13"/>
         <source>GS patch</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+10"/>
         <source>XG patch</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+39"/>
         <source>Delete group or patch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>New patch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>New &amp;Patch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+P</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>New group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>New &amp;Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+G</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+30"/>
         <source>Contro&amp;ller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Common:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>List of defined controllers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>List of defined controllers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>Min  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Max  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Def  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+35"/>
         <source>Midi controller name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Type:</source>
         <translation type="unfinished">Typ:</translation>
     </message>
     <message>
+        <location line="+10"/>
+        <location line="+3"/>
         <source>Midi controller type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+24"/>
         <source>RPN14</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>NRPN14</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+53"/>
+        <location line="+3"/>
         <source>Midi controller number high byte</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+51"/>
         <source>Midi controller number low byte (* means drum controller)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Midi controller number low byte. 
 If low byte is * then the controller is a 
  &apos;drum controller&apos;. For drum tracks and 
@@ -3686,19 +3616,23 @@ Examples: The GS and XG instruments&apos;
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>*</source>
         <comment>wild card</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Range:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+48"/>
         <source>Minimum value. If negative, auto-translate.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Minimum value. If the minimum value 
  is negative, the range will automatically
  be translated to a positive range. 
@@ -3721,38 +3655,52 @@ True range: Min: -8192 Max: 8191 (bias 0)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+69"/>
+        <location line="+3"/>
         <source>Maximum value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+36"/>
         <source>Default:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>L-Bank</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
+        <location line="+16"/>
+        <location line="+26"/>
+        <location line="+198"/>
+        <location line="+53"/>
         <source>off</source>
         <translation type="unfinished">av</translation>
     </message>
     <message>
+        <location line="-261"/>
         <source>Progr.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+35"/>
         <source>???</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>H-Bank</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+44"/>
         <source>Default value. Off: No default.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Default (initial) value. Off means no default.
 
 If a default value is chosen, the value will be sent
@@ -3771,47 +3719,59 @@ Caution! Watch out for controllers such as
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>off</source>
         <comment>dont care</comment>
         <translation type="unfinished">av</translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Add common controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>&amp;Add</source>
         <translation type="unfinished">&amp;Lägg till</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+A</source>
         <translation type="unfinished">Alt+L</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Delete controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Create a new controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>New &amp;Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Null Param Hi:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Null parameter number High byte</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
+        <location line="+53"/>
         <source>If set, these &apos;null&apos; parameter numbers will 
  be sent after each RPN/NRPN event. 
 This prevents subsequent &apos;data&apos; events
@@ -3821,38 +3781,49 @@ Typically, set to 127/127, or an unused
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-13"/>
         <source> Lo:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Null parameter number Low byte</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+34"/>
         <source>S&amp;ysEx</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>SysEx List:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+62"/>
         <source>New SysE&amp;x</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+X</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+73"/>
         <source>&amp;Help</source>
         <translation type="unfinished">&amp;Hjälp</translation>
     </message>
     <message>
+        <location line="+84"/>
+        <location line="+3"/>
         <source>new item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+8"/>
+        <location line="+3"/>
         <source>What&apos;s this?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3860,18 +3831,22 @@ 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>
     </message>
     <message>
+        <location line="+2"/>
         <source>Time Position</source>
         <translation>Tidsposition</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Meta Type</source>
         <translation>Metatyp</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Enter Hex</source>
         <translation>Mata in Hex</translation>
     </message>
@@ -3902,34 +3877,42 @@ Typically, set to 127/127, or an unused
 <context>
     <name>EditNoteDialogBase</name>
     <message>
+        <location filename="../../muse/widgets/editnotedialogbase.ui" line="+14"/>
         <source>MusE: Enter Note</source>
         <translation>MusE: Mata in Not</translation>
     </message>
     <message>
+        <location line="+39"/>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Length:</source>
         <translation>Längd:</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Time Position:</source>
         <translation>Tidsposition:</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Pitch:</source>
         <translation>Tonhöjd:</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Velocity On:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Velocity Off:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3937,18 +3920,22 @@ 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>
     </message>
     <message>
+        <location line="+2"/>
         <source>Time Position</source>
         <translation>Tidsposition</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Pitch</source>
         <translation>Tonhöjd</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Pressure</source>
         <translation type="unfinished">Tryck</translation>
     </message>
@@ -3971,22 +3958,27 @@ Typically, set to 127/127, or an unused
 <context>
     <name>EditSysexDialogBase</name>
     <message>
+        <location filename="../../muse/widgets/editsysexdialogbase.ui" line="+14"/>
         <source>MusE: Enter SysEx</source>
         <translation>MusE: Mata in SysEx</translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>TimePosition:</source>
         <translation>Tidsposition:</translation>
     </message>
     <message>
+        <location line="+48"/>
         <source>Comment:</source>
         <translation>Kommentar:</translation>
     </message>
     <message>
+        <location line="+37"/>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
@@ -3994,6 +3986,7 @@ Typically, set to 127/127, or an unused
 <context>
     <name>EditToolBar</name>
     <message>
+        <location filename="../../muse/widgets/tools.cpp" line="+17"/>
         <source>Edit Tools</source>
         <translation>Redigeringsverktyg</translation>
     </message>
@@ -4001,42 +3994,52 @@ Typically, set to 127/127, or an unused
 <context>
     <name>EffectRack</name>
     <message>
+        <location filename="../../muse/mixer/rack.cpp" line="+102"/>
         <source>effect rack</source>
         <translation>effektrack</translation>
     </message>
     <message>
+        <location line="+84"/>
         <source>move up</source>
         <translation>flytta upp</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>move down</source>
         <translation>flytta ner</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>remove</source>
         <translation>ta bort</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>bypass</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>show gui</source>
         <translation>visa gui</translation>
     </message>
     <message>
+        <location line="-6"/>
         <source>new</source>
         <translation>ny</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>change</source>
         <translation>ändra</translation>
     </message>
     <message>
+        <location line="+288"/>
         <source>Replace effect</source>
         <translation type="unfinished">Byt effekt</translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>Do you really want to replace the effect %1?</source>
         <translation type="unfinished">Vill du verkligen ersätta effekten %1?</translation>
     </message>
@@ -4049,14 +4052,17 @@ Typically, set to 127/127, or an unused
         <translation type="obsolete">&amp;Nej</translation>
     </message>
     <message>
+        <location line="-282"/>
         <source>show native gui</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>save preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+138"/>
         <source>MusE: Save Preset</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4082,6 +4088,7 @@ Message:</source>
 <context>
     <name>FLUIDGui</name>
     <message>
+        <location filename="../../synti/fluid/fluidgui.cpp" line="+55"/>
         <source>FLUID: open Soundfile</source>
         <translation type="unfinished">FLUID: öppna ljudbank</translation>
     </message>
@@ -4089,14 +4096,17 @@ Message:</source>
 <context>
     <name>FLUIDGuiBase</name>
     <message>
+        <location filename="../../synti/fluid/fluidguibase.ui" line="+86"/>
         <source>Load</source>
         <translation type="unfinished">Ladda</translation>
     </message>
     <message>
+        <location line="-72"/>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Soundfont</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4104,50 +4114,63 @@ Message:</source>
 <context>
     <name>FLUIDSynthGuiBase</name>
     <message>
+        <location filename="../../synti/fluidsynth/fluidsynthguibase.ui" line="+473"/>
         <source>Gain</source>
         <translation type="unfinished">Förstärkning</translation>
     </message>
     <message>
+        <location line="-225"/>
         <source>Room Size</source>
         <translation type="unfinished">Rumsstorlek</translation>
     </message>
     <message>
+        <location line="-13"/>
         <source>Damping</source>
         <translation type="unfinished">Dämpning</translation>
     </message>
     <message>
+        <location line="-26"/>
+        <location line="+235"/>
         <source>Level</source>
         <translation type="unfinished">Nivå</translation>
     </message>
     <message>
+        <location line="-222"/>
         <source>Width</source>
         <translation type="unfinished">Bredd</translation>
     </message>
     <message>
+        <location line="+152"/>
         <source>Speed</source>
         <translation type="unfinished">Hastighet</translation>
     </message>
     <message>
+        <location line="+35"/>
         <source>Depth</source>
         <translation type="unfinished">Djup</translation>
     </message>
     <message>
+        <location line="-70"/>
         <source>Number</source>
         <translation type="unfinished">Nummer</translation>
     </message>
     <message>
+        <location line="-20"/>
         <source>Type</source>
         <translation type="unfinished">Typ</translation>
     </message>
     <message>
+        <location line="-13"/>
         <source>Sine</source>
         <translation type="unfinished">Sinus</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Triangle</source>
         <translation type="unfinished">Triangel</translation>
     </message>
     <message>
+        <location line="-277"/>
         <source>Load</source>
         <translation type="unfinished">Ladda</translation>
     </message>
@@ -4156,50 +4179,62 @@ Message:</source>
         <translation type="obsolete">Spara</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Delete</source>
         <translation type="unfinished">Ta bort</translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>Fontname</source>
         <translation type="unfinished">Fontnamn</translation>
     </message>
     <message>
+        <location line="-59"/>
         <source>FLUID Synth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+37"/>
         <source>Dump Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Chnl</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Soundfont</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Drum Chnl</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+160"/>
         <source>Reverb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>CHANNEL SETUP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+180"/>
         <source>Chorus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+66"/>
         <source>LOADED SOUNDFONTS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4207,14 +4242,17 @@ Message:</source>
 <context>
     <name>FileDialogButtons</name>
     <message>
+        <location filename="../../muse/widgets/fdialogbuttons.ui" line="+38"/>
         <source>Global</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+25"/>
         <source>User</source>
         <translation>Användare</translation>
     </message>
     <message>
+        <location line="+25"/>
         <source>Project</source>
         <translation>Projekt</translation>
     </message>
@@ -4229,15 +4267,18 @@ Cofiguration</source>
 konfiguration</translation>
     </message>
     <message>
+        <location line="+55"/>
         <source>only
 Songdata</source>
         <translation type="unfinished">bara sångdata</translation>
     </message>
     <message>
+        <location line="-129"/>
         <source>fdialogbuttons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+121"/>
         <source>Songdata +
 Configuration</source>
         <translation type="unfinished"></translation>
@@ -4246,6 +4287,7 @@ Configuration</source>
 <context>
     <name>FluidSynthGui</name>
     <message>
+        <location filename="../../synti/fluidsynth/fluidsynthgui.cpp" line="+165"/>
         <source>Choose soundfont</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4261,84 +4303,109 @@ Configuration</source>
     <name>GateTimeBase</name>
     <message>
         <source>MusE: Modify Gate Time</source>
-        <translation>MusE: Ändra Gate-tid</translation>
+        <translation type="obsolete">MusE: Ändra Gate-tid</translation>
     </message>
     <message>
         <source>Range</source>
-        <translation>Område</translation>
+        <translation type="obsolete">Område</translation>
     </message>
     <message>
         <source>All Events</source>
-        <translation>Alla Händelser</translation>
+        <translation type="obsolete">Alla Händelser</translation>
     </message>
     <message>
         <source>Selected Events</source>
-        <translation>Valda Händelser</translation>
+        <translation type="obsolete">Valda Händelser</translation>
     </message>
     <message>
         <source>Looped Events</source>
-        <translation>Loopade Händelser</translation>
+        <translation type="obsolete">Loopade Händelser</translation>
     </message>
     <message>
         <source>Selected &amp; Looped</source>
-        <translation>Valda &amp; Loopade</translation>
+        <translation type="obsolete">Valda &amp; Loopade</translation>
     </message>
     <message>
         <source>Values</source>
-        <translation>Värden</translation>
+        <translation type="obsolete">Värden</translation>
     </message>
     <message>
         <source>Rate:</source>
-        <translation>Hastighet:</translation>
+        <translation type="obsolete">Hastighet:</translation>
     </message>
     <message>
         <source>Offset:</source>
-        <translation type="unfinished">Offset:</translation>
+        <translation type="obsolete">Offset:</translation>
     </message>
     <message>
-        <source>%</source>
-        <translation type="unfinished"></translation>
+        <source>Cancel</source>
+        <translation type="obsolete">Avbryt</translation>
     </message>
+</context>
+<context>
+    <name>GlobalSettingsConfig</name>
     <message>
-        <source>OK</source>
+        <location filename="../../muse/widgets/genset.cpp" line="+489"/>
+        <source>Selects instruments directory</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Cancel</source>
-        <translation>Avbryt</translation>
-    </message>
 </context>
 <context>
     <name>GlobalSettingsDialogBase</name>
     <message>
+        <location filename="../../muse/widgets/gensetbase.ui" line="+14"/>
         <source>MusE: Global Settings</source>
         <translation>MusE: Globala Inställningar</translation>
     </message>
     <message>
+        <location line="+1302"/>
+        <source>Use project save dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>Some popup menus stay open (else hold Ctrl)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Allows some popup menus to stay open.
+Otherwise, hold Ctrl to keep them open.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
         <source>&amp;Apply</source>
         <translation>&amp;Verkställ</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>&amp;Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Avbryt</translation>
     </message>
     <message>
+        <location line="-871"/>
         <source>Audio</source>
         <translation type="unfinished">Ljud</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Mixer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+21"/>
+        <location line="+39"/>
         <source>dB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-20"/>
         <source>min. Meter Value</source>
         <translation>min. Metervärde</translation>
     </message>
@@ -4347,74 +4414,104 @@ Configuration</source>
         <translation type="obsolete">min. Slider värde</translation>
     </message>
     <message>
+        <location line="+406"/>
         <source>Midi</source>
         <translation type="unfinished">Midi</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Ticks</source>
         <translation type="unfinished">Tick</translation>
     </message>
     <message>
+        <location line="-223"/>
+        <location line="+194"/>
+        <location line="+47"/>
         <source>1024</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-236"/>
+        <location line="+194"/>
+        <location line="+47"/>
         <source>2048</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>4096</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+86"/>
         <source>Displayed Resolution
 (Ticks/Quarternote)</source>
         <translation>Visad upplösning
 (Tick/Kvartsnot)</translation>
     </message>
     <message>
+        <location line="-48"/>
+        <location line="+63"/>
         <source>48</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-58"/>
+        <location line="+63"/>
         <source>96</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-58"/>
+        <location line="+63"/>
         <source>192</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-58"/>
+        <location line="+63"/>
         <source>384</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-58"/>
+        <location line="+63"/>
         <source>768</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-58"/>
+        <location line="+63"/>
         <source>1536</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-58"/>
+        <location line="+63"/>
         <source>3072</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-58"/>
+        <location line="+63"/>
         <source>6144</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-58"/>
+        <location line="+63"/>
         <source>12288</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-163"/>
         <source>RTC Resolution
 (Ticks/Sec)</source>
         <translation>RTC-Upplösning
 (Tick/Sek)</translation>
     </message>
     <message>
+        <location line="+212"/>
         <source>GUI</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4423,312 +4520,489 @@ Configuration</source>
         <translation type="obsolete">Hjälpläsare:</translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>GUI Refresh Rate</source>
         <translation>GUI-uppdateringsfrekvens</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>/sec</source>
         <translation>/sek</translation>
     </message>
     <message>
+        <location line="-1224"/>
         <source>Application</source>
         <translation type="unfinished">Applikation</translation>
     </message>
     <message>
+        <location line="+389"/>
         <source>Start Muse</source>
         <translation type="unfinished">Starta MusE</translation>
     </message>
     <message>
+        <location line="+47"/>
         <source>start with last song</source>
         <translation type="unfinished">starta med föregående sång</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>start with song</source>
         <translation type="unfinished">starta med sång</translation>
     </message>
     <message>
+        <location line="-47"/>
         <source>start song:</source>
         <translation type="unfinished">startsång:</translation>
     </message>
     <message>
+        <location line="-403"/>
         <source>Views</source>
         <translation type="unfinished">Vyer</translation>
     </message>
     <message>
+        <location line="+6"/>
+        <location line="+47"/>
+        <location line="+37"/>
+        <location line="+144"/>
+        <location line="+56"/>
         <source>y-pos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-274"/>
+        <location line="+57"/>
+        <location line="+47"/>
+        <location line="+7"/>
         <source>show</source>
         <translation type="unfinished">visa</translation>
     </message>
     <message>
+        <location line="-104"/>
+        <location line="+40"/>
+        <location line="+17"/>
+        <location line="+164"/>
+        <location line="+56"/>
         <source>x-pos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-267"/>
+        <location line="+77"/>
+        <location line="+104"/>
+        <location line="+56"/>
         <source>height</source>
         <translation type="unfinished">höjd</translation>
     </message>
     <message>
+        <location line="-227"/>
+        <location line="+57"/>
+        <location line="+124"/>
+        <location line="+56"/>
         <source>width</source>
         <translation type="unfinished">bredd</translation>
     </message>
     <message>
+        <location line="-108"/>
         <source>Big Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Arranger</source>
         <translation type="unfinished">Arrangerare</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Transport</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+59"/>
+        <location line="+56"/>
+        <location line="+16"/>
+        <location line="+16"/>
+        <location line="+16"/>
         <source>Cur</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-107"/>
+        <location line="+56"/>
+        <location line="+16"/>
+        <location line="+16"/>
+        <location line="+16"/>
         <source>set current values</source>
         <translation type="unfinished">sätt nuvarande värden</translation>
     </message>
     <message>
+        <location line="+76"/>
         <source>start with template: default.med</source>
         <translation type="unfinished">börja med mall: default.med</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>show splash screen</source>
         <translation type="unfinished">visa splash</translation>
     </message>
     <message>
+        <location line="+293"/>
         <source>External Waveditor</source>
         <translation type="unfinished">Extern Ljudredigerare</translation>
     </message>
     <message>
+        <location line="+25"/>
         <source>External Waveditor command</source>
         <translation type="unfinished">Extern Ljudredigerarkommando</translation>
     </message>
     <message>
+        <location line="-644"/>
         <source>Mixer A</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Mixer B</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+317"/>
         <source>show &quot;Did you know?&quot; dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-55"/>
         <source>Start song</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+140"/>
         <source>min. Slider Val</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use Jack freewheel mode if possible.
-(Speeds up bounce operations).</source>
+        <location line="+60"/>
+        <source>Enable denormal protection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable denormal protection</source>
+        <location line="+10"/>
+        <source>Enable output limiter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable output limiter</source>
+        <location line="+200"/>
+        <source>Note: External editor opened from the internal editor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Dummy Audio Driver (settings require restart)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable in-place processing for VST plugins.
-(Requires restart.)</source>
+        <location line="+31"/>
+        <source>Hz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Turn this off if VST Ladspa effect rack plugins do not work or feedback loudly, even if they are supposed to be in-place capable.</source>
+        <location line="+19"/>
+        <source>Period size (Frames per period):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Note: External editor opened from the internal editor.</source>
+        <location line="-180"/>
+        <location line="+194"/>
+        <source>16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dummy Audio Driver (settings require restart)</source>
+        <location line="-320"/>
+        <source>Try to use Jack Freewheel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Preferred sample rate</source>
+        <location line="+17"/>
+        <source>Speeds bounce operations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Actual rate used depends on limitations of
- timer used. If a high rate timer is available,
- short periods can be used with high sample rates. 
-Period affects midi playback resolution. 
-Shorter periods are desirable.</source>
+        <location line="+3"/>
+        <source>Use Jack Freewheel mode if possible.
+This dramatically speeds bounce operations.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Hz</source>
+        <location line="+38"/>
+        <source>VST in-place</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Actual rate used now (dummy or not):</source>
+        <location line="+10"/>
+        <source>Enable VST in-place processing (restart required)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>---</source>
+        <location line="+3"/>
+        <source>Enable VST in-place processing. Turn this off if 
+ 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>
     </message>
     <message>
-        <source>Period size (Frames per period):</source>
+        <location line="+13"/>
+        <source>Minimum control period</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>16</source>
+        <location line="+7"/>
+        <source>Minimum audio controller process period (samples).
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Minimum audio controller process period (samples).
+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>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+194"/>
         <source>32</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-189"/>
+        <location line="+194"/>
         <source>64</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-189"/>
+        <location line="+194"/>
         <source>128</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-189"/>
+        <location line="+194"/>
         <source>256</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-189"/>
+        <location line="+194"/>
         <source>512</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-68"/>
+        <source>Sample rate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>Shorter periods give better midi playback resolution.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+96"/>
         <source>8192</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>16384</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>32768</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Midi Resolution
 (Ticks/Quarternote)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+126"/>
+        <source>Instruments Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+85"/>
         <source>Use old-style stop shortcut:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Move single armed track with selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-791"/>
         <source>On Launch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+736"/>
         <source>Behavior</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>Header</name>
+    <message>
+        <location filename="../../muse/widgets/header.cpp" line="+134"/>
+        <source>Track Info Columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LMaster</name>
     <message>
+        <location filename="../../muse/master/lmaster.cpp" line="+125"/>
         <source>MusE: Mastertrack</source>
         <translation>MusE: Masterspår</translation>
     </message>
     <message>
+        <location line="+42"/>
         <source>Tempo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Timesig</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>new tempo</source>
         <translation>nytt tempo</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>new signature</source>
         <translation>ny signatur</translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Meter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Time</source>
         <translation>Tid</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Value</source>
         <translation>Värde</translation>
     </message>
     <message>
+        <location line="-61"/>
         <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="+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="+29"/>
+        <source>Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>new key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+370"/>
         <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>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>
     </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="-450"/>
         <source>Master tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Edit tools</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4740,6 +5014,7 @@ Shorter periods are desirable.</source>
         <translation type="obsolete">Mata in Not</translation>
     </message>
     <message>
+        <location filename="../../muse/liste/listedit.cpp" line="+452"/>
         <source>insert Note</source>
         <translation>Mata in Not</translation>
     </message>
@@ -4748,6 +5023,7 @@ Shorter periods are desirable.</source>
         <translation type="obsolete">Mata in SysEx</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>insert SysEx</source>
         <translation>Mata in SysEx</translation>
     </message>
@@ -4756,6 +5032,7 @@ Shorter periods are desirable.</source>
         <translation type="obsolete">Mata in Ctrl</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>insert Ctrl</source>
         <translation>Mata in Ctrl</translation>
     </message>
@@ -4764,6 +5041,7 @@ Shorter periods are desirable.</source>
         <translation type="obsolete">Mata in Meta</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>insert Meta</source>
         <translation>Mata in Meta</translation>
     </message>
@@ -4780,6 +5058,7 @@ Shorter periods are desirable.</source>
         <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>
     </message>
@@ -4788,26 +5067,32 @@ Shorter periods are desirable.</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>
     </message>
     <message>
+        <location line="+13"/>
         <source>&amp;Edit</source>
         <translation>&amp;Redigera</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Cut</source>
         <translation>Klipp ut</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Copy</source>
         <translation>Kopiera</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Paste</source>
         <translation>Klistra in</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Delete Events</source>
         <translation>Ta bort Händelser</translation>
     </message>
@@ -4820,46 +5105,57 @@ Shorter periods are desirable.</source>
         <translation type="obsolete">Inmatningsverktyg</translation>
     </message>
     <message>
+        <location line="+36"/>
         <source>Tick</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+1"/>
         <source>Len</source>
         <translation type="unfinished">Längd</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
+        <location line="-32"/>
         <source>List tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Insert tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Type</source>
         <translation type="unfinished">Typ</translation>
     </message>
@@ -4867,22 +5163,27 @@ Shorter periods are desirable.</source>
 <context>
     <name>MITTransposeBase</name>
     <message>
+        <location filename="../../muse/widgets/mittransposebase.ui" line="+14"/>
         <source>MusE: Midi Input Plugin: Transpose</source>
         <translation>MusE: Midi Inputplugin: Transponering</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>On</source>
         <translation>På</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>TriggerKey</source>
         <translation type="unfinished">TriggNot</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Transpose:</source>
         <translation type="unfinished">Transponering:</translation>
     </message>
     <message>
+        <location line="+31"/>
         <source>+0</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4902,22 +5203,27 @@ Shorter periods are desirable.</source>
         <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>
     </message>
     <message>
+        <location line="+5"/>
         <source>State</source>
         <translation>Status</translation>
     </message>
@@ -4926,158 +5232,238 @@ Shorter periods are desirable.</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>
-        <source>Connect these to new midi tracks</source>
+        <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>
-        <source>Connect new midi tracks to this (first listed only)</source>
+        <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>
     </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>
-        <source>Connect these channels, on this port, to new midi tracks.
-Example:
- 1 2 3    channel 1 2 and 3
- 1-3      same
- 1-3 5    channel 1 2 3 and 5
- all      all channels
- none     no channels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connect new midi tracks to these channels, on this port.
-See default in channels.
-NOTE: Currently only one output port and channel supported (first found)</source>
-        <translation type="unfinished"></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>
     </message>
@@ -5085,41 +5471,55 @@ NOTE: Currently only one output port and channel supported (first found)</source
 <context>
     <name>MRConfigBase</name>
     <message>
+        <location filename="../../muse/mplugins/mrconfigbase.ui" line="+14"/>
         <source>MusE: Midi Input Plugin: Remote Control</source>
         <translation>MusE: Midiinputplugin: Fjärrkontroll</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Activate</source>
         <translation>Aktivera</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>On</source>
         <translation>På</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Stop</source>
         <translation type="unfinished">Stopp</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Record</source>
         <translation type="unfinished">Spela in</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Goto Left Mark</source>
         <translation>Gå till vänster markering</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Play</source>
         <translation type="unfinished">Spela</translation>
     </message>
+    <message>
+        <location line="+25"/>
+        <source>Insert rest (step rec) </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MTScale</name>
     <message>
+        <location filename="../../muse/widgets/mtscale.cpp" line="+27"/>
         <source>bar scale</source>
         <translation>takt skala</translation>
     </message>
@@ -5127,10 +5527,12 @@ NOTE: Currently only one output port and channel supported (first found)</source
 <context>
     <name>MarkerView</name>
     <message>
+        <location filename="../../muse/marker/markerview.cpp" line="+158"/>
         <source>MusE: Marker</source>
         <translation>MusE: Markör</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>add marker</source>
         <translation>lägg till markör</translation>
     </message>
@@ -5139,6 +5541,7 @@ NOTE: Currently only one output port and channel supported (first found)</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>
     </message>
@@ -5151,34 +5554,42 @@ NOTE: Currently only one output port and channel supported (first found)</source
         <translation type="obsolete">&amp;Arkiv</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>&amp;Edit</source>
         <translation>&amp;Redigera</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>Bar:Beat:Tick</source>
         <translation>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>
     </message>
     <message>
+        <location line="+1"/>
         <source>Text</source>
         <translation type="unfinished">Text</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Marker Properties</source>
         <translation>Markörinställningar</translation>
     </message>
     <message>
+        <location line="-34"/>
         <source>marker-tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>edit tools</source>
         <translation type="unfinished">redigeringsverktyg</translation>
     </message>
@@ -5186,6 +5597,7 @@ NOTE: Currently only one output port and channel supported (first found)</source
 <context>
     <name>MasterEdit</name>
     <message>
+        <location filename="../../muse/master/masteredit.cpp" line="-42"/>
         <source>MusE: Mastertrack</source>
         <translation>MusE: Masterspår</translation>
     </message>
@@ -5202,10 +5614,12 @@ NOTE: Currently only one output port and channel supported (first found)</source
         <translation type="obsolete">använd master track</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Cursor</source>
         <translation type="unfinished">Markör</translation>
     </message>
@@ -5214,42 +5628,52 @@ NOTE: Currently only one output port and channel supported (first found)</source
         <translation type="obsolete">Av</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Snap</source>
         <translation>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="+4"/>
         <source>tempo at cursor position</source>
         <translation>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>
     </message>
     <message>
+        <location line="+1"/>
         <source>time signature at current position</source>
         <translation>time signature vid nuvarande position</translation>
     </message>
     <message>
+        <location line="-38"/>
         <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="-10"/>
         <source>Master tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Enable master</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5257,114 +5681,142 @@ NOTE: Currently only one output port and channel supported (first found)</source
 <context>
     <name>MetronomeConfigBase</name>
     <message>
+        <location filename="../../muse/widgets/metronomebase.ui" line="+14"/>
         <source>MusE: Metronome Config</source>
         <translation>MusE: Metronomeconfiguration</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Metronome</source>
         <translation>Metronom</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Audio Beep</source>
         <translation>Audio - Ton</translation>
     </message>
     <message>
+        <location line="+65"/>
         <source>MIDI Click</source>
         <translation type="unfinished">Midiklick</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>Midi Channel</source>
         <translation type="unfinished">Midikanal</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Measure Note</source>
         <translation>Taktnot</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Measure Velocity</source>
         <translation>Taktanslag</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Beat Velocity</source>
         <translation>Slaganslag</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Beat Note</source>
         <translation>Slagnot</translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Midi Port</source>
         <translation type="unfinished">Midiport</translation>
     </message>
     <message>
+        <location line="+42"/>
         <source>Precount</source>
         <translation>Inräkning</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>enable</source>
         <translation>på</translation>
     </message>
     <message>
+        <location line="+34"/>
         <source>Bars</source>
         <translation>Takter</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>From Mastertrack</source>
         <translation>Från Masterspår</translation>
     </message>
     <message>
+        <location line="+34"/>
         <source>/</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>Signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Prerecord</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Preroll</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+38"/>
         <source>&amp;Apply</source>
         <translation>&amp;Verställ</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>&amp;OK</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Avbryt</translation>
     </message>
     <message>
+        <location line="-425"/>
         <source>Choose outputs...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+36"/>
         <source>50</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>% Audio volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+324"/>
         <source>Hint: Enable metronome in Transportpanel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>Alt+A</source>
         <translation type="unfinished">Alt+L</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Alt+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Alt+C</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5390,8 +5842,9 @@ NOTE: Currently only one output port and channel supported (first found)</source
 <context>
     <name>MidiControllerEditDialogBase</name>
     <message>
+        <location filename="../../muse/instruments/ccontrolbase.ui" line="+16"/>
         <source>MusE: Define Midi Controller</source>
-        <translation type="obsolete">MusE: Definiera Midi-controller</translation>
+        <translation type="unfinished">MusE: Definiera Midi-controller</translation>
     </message>
     <message>
         <source>replace controller set</source>
@@ -5406,122 +5859,201 @@ NOTE: Currently only one output port and channel supported (first found)</source
         <translation type="obsolete">spara controller-set</translation>
     </message>
     <message>
+        <location line="+127"/>
         <source>Name                  </source>
-        <translation type="obsolete">Namn</translation>
+        <translation type="unfinished">Namn</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Type       </source>
-        <translation type="obsolete">Typ</translation>
+        <translation type="unfinished">Typ</translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>Min Val</source>
-        <translation type="obsolete">Min.värde</translation>
+        <translation type="unfinished">Min.värde</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Max Val</source>
-        <translation type="obsolete">Max.värde</translation>
+        <translation type="unfinished">Max.värde</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>list of defined controllers</source>
-        <translation type="obsolete">lista med definierade controllers</translation>
+        <translation type="unfinished">lista med definierade controllers</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>This is the MusE list of defined controllers.</source>
-        <translation type="obsolete">Detta är MusEs lista med definierade controllers.</translation>
+        <translation type="unfinished">Detta är MusEs lista med definierade controllers.</translation>
     </message>
     <message>
+        <location line="+60"/>
         <source>Properties</source>
-        <translation type="obsolete">Egenskaper</translation>
+        <translation type="unfinished">Egenskaper</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Name</source>
-        <translation type="obsolete">Namn</translation>
+        <translation type="unfinished">Namn</translation>
     </message>
     <message>
+        <location line="+38"/>
         <source>Max Value</source>
-        <translation type="obsolete">Max.värde</translation>
+        <translation type="unfinished">Max.värde</translation>
     </message>
     <message>
+        <location line="-22"/>
         <source>Min Value</source>
-        <translation type="obsolete">Min.värde</translation>
+        <translation type="unfinished">Min.värde</translation>
     </message>
     <message>
+        <location line="+49"/>
         <source>Type</source>
-        <translation type="obsolete">Typ</translation>
+        <translation type="unfinished">Typ</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation type="obsolete">&amp;Ny</translation>
     </message>
     <message>
+        <location line="-306"/>
         <source>create new entry</source>
-        <translation type="obsolete">skapa nytt inlägg</translation>
+        <translation type="unfinished">skapa nytt inlägg</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>pressing the New button you create a new entry
 in the MusE list of defined controllers</source>
-        <translation type="obsolete">tryck på Ny knappen för att skapa nytt inlägg
+        <translation type="unfinished">tryck på Ny knappen för att skapa nytt inlägg
 i MusEs lista med definierade controllers</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>&amp;Delete</source>
-        <translation type="obsolete">&amp;Ta bort</translation>
+        <translation type="unfinished">&amp;Ta bort</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>delete selected entry</source>
-        <translation type="obsolete">ta bort valt inlägg</translation>
+        <translation type="unfinished">ta bort valt inlägg</translation>
     </message>
     <message>
+        <location line="+25"/>
         <source>&amp;OK</source>
-        <translation type="obsolete">&amp;Ok</translation>
+        <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>&amp;Cancel</source>
-        <translation type="obsolete">&amp;Avbryt</translation>
+        <translation type="unfinished">&amp;Avbryt</translation>
     </message>
     <message>
+        <location line="-74"/>
         <source>&amp;Add</source>
-        <translation type="obsolete">&amp;Lägg till</translation>
+        <translation type="unfinished">&amp;Lägg till</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+A</source>
-        <translation type="obsolete">Alt+L</translation>
+        <translation type="unfinished">Alt+L</translation>
+    </message>
+    <message>
+        <location line="+60"/>
+        <source>A&amp;pply</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+24"/>
         <source>Predefined Controller:</source>
-        <translation type="obsolete">Fördefinieradecontrollers:</translation>
+        <translation type="unfinished">Fördefinieradecontrollers:</translation>
     </message>
     <message>
+        <location line="+28"/>
+        <location line="+266"/>
+        <source>H-Ctrl</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-255"/>
+        <location line="+283"/>
+        <source>L-Ctrl</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-220"/>
         <source>Managed Controller for Port</source>
-        <translation type="obsolete">Hanterad controller för port</translation>
+        <translation type="unfinished">Hanterad controller för port</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Channel</source>
-        <translation type="obsolete">Kanal</translation>
+        <translation type="unfinished">Kanal</translation>
     </message>
     <message>
+        <location line="+21"/>
         <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="obsolete">Detta är en lista med vanligt använda midi-controllers.
+        <translation type="unfinished">Detta är en lista med vanligt använda midi-controllers.
 Notera att tonhöjd- och program-change hanteras
 som vanliga controllers i MusE.</translation>
     </message>
     <message>
+        <location line="+111"/>
+        <source>Control7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Control14</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>RPN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>NRPN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>RPN14</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>NRPN14</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>Pitch</source>
-        <translation type="obsolete">Tonhöjd</translation>
+        <translation type="unfinished">Tonhöjd</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Program</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+32"/>
         <source>Midi Controller Number High Byte</source>
-        <translation type="obsolete">Midicontrollernummer, hög byte</translation>
+        <translation type="unfinished">Midicontrollernummer, hög byte</translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>Midi Controller Number Low Byte</source>
-        <translation type="obsolete">Midicontrollernummer, låg byte</translation>
+        <translation type="unfinished">Midicontrollernummer, låg byte</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Range</source>
-        <translation type="obsolete">Område</translation>
+        <translation type="unfinished">Område</translation>
     </message>
 </context>
 <context>
@@ -5542,114 +6074,149 @@ som vanliga controllers i MusE.</translation>
 <context>
     <name>MidiFilterConfigBase</name>
     <message>
+        <location filename="../../muse/mplugins/midifilter.ui" line="+20"/>
         <source>MusE:  Midi Input Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Record Filter</source>
         <translation type="unfinished">Inspelningsfilter</translation>
     </message>
     <message>
+        <location line="+18"/>
+        <location line="+112"/>
         <source>Note On</source>
         <translation type="unfinished">Noteon</translation>
     </message>
     <message>
+        <location line="-99"/>
+        <location line="+112"/>
         <source>Poly Pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-99"/>
+        <location line="+112"/>
         <source>Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-99"/>
+        <location line="+112"/>
         <source>Program Change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-99"/>
+        <location line="+112"/>
         <source>After Touch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-99"/>
+        <location line="+112"/>
         <source>Pitch Bend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-99"/>
+        <location line="+112"/>
         <source>Sysex</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-96"/>
         <source>Thru Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+112"/>
         <source>Controller Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>Channel Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+24"/>
         <source>14</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>10</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>13</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>15</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5657,6 +6224,8 @@ som vanliga controllers i MusE.</translation>
 <context>
     <name>MidiInputTransformDialog</name>
     <message>
+        <location filename="../../muse/mplugins/midiitransform.cpp" line="+703"/>
+        <location line="+2"/>
         <source>New</source>
         <translation type="unfinished">Ny</translation>
     </message>
@@ -5664,214 +6233,334 @@ som vanliga controllers i MusE.</translation>
 <context>
     <name>MidiInputTransformDialogBase</name>
     <message>
+        <location filename="../../muse/widgets/itransformbase.ui" line="+14"/>
         <source>MusE: Midi Input Transformator</source>
         <translation>MusE: Midi inputtransformator</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Filter</source>
         <translation type="unfinished">Filter</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>All</source>
         <translation type="unfinished">Alla</translation>
     </message>
     <message>
+        <location line="+5"/>
+        <location line="+91"/>
+        <location line="+60"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Equal</source>
         <translation>Lika</translation>
     </message>
     <message>
+        <location line="-224"/>
+        <location line="+91"/>
+        <location line="+60"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Unequal</source>
         <translation type="unfinished">Ej lika</translation>
     </message>
     <message>
+        <location line="-217"/>
         <source>Note</source>
         <translation>Not</translation>
     </message>
     <message>
+        <location line="+5"/>
+        <location line="+338"/>
         <source>Poly Pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-333"/>
+        <location line="+338"/>
         <source>Control Change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-333"/>
+        <location line="+338"/>
         <source>Aftertouch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-333"/>
+        <location line="+338"/>
         <source>Pitch Bend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-333"/>
+        <location line="+338"/>
         <source>NRPN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-333"/>
+        <location line="+338"/>
         <source>RPN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-330"/>
+        <location line="+369"/>
+        <location line="+43"/>
         <source>Value 2</source>
         <translation>Värde 2</translation>
     </message>
     <message>
+        <location line="-402"/>
+        <location line="+392"/>
+        <location line="+96"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Value 1</source>
         <translation>Värde 1</translation>
     </message>
     <message>
+        <location line="-586"/>
+        <location line="+257"/>
         <source>Event Type</source>
         <translation>Händelsetyp</translation>
     </message>
     <message>
+        <location line="-246"/>
+        <location line="+60"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Ignore</source>
         <translation type="unfinished">Ignorera</translation>
     </message>
     <message>
+        <location line="-123"/>
+        <location line="+60"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Higher</source>
         <translation type="unfinished">Högre</translation>
     </message>
     <message>
+        <location line="-133"/>
+        <location line="+60"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Lower</source>
         <translation>Lägre</translation>
     </message>
     <message>
+        <location line="-133"/>
+        <location line="+60"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Inside</source>
         <translation type="unfinished">Innanför</translation>
     </message>
     <message>
+        <location line="-133"/>
+        <location line="+60"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Outside</source>
         <translation type="unfinished">Utanför</translation>
     </message>
     <message>
+        <location line="+8"/>
+        <location line="+422"/>
         <source>Channel</source>
         <translation type="unfinished">Kanal</translation>
     </message>
     <message>
+        <location line="-412"/>
+        <location line="+240"/>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-192"/>
         <source>Processing</source>
         <translation>Bearbetar</translation>
     </message>
     <message>
+        <location line="+23"/>
+        <location line="+51"/>
+        <location line="+129"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Keep</source>
         <translation>Behåll</translation>
     </message>
     <message>
+        <location line="-283"/>
+        <location line="+71"/>
+        <location line="+129"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Fix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-257"/>
+        <location line="+129"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Plus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-232"/>
+        <location line="+129"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Minus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-232"/>
+        <location line="+129"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Multiply</source>
         <translation>Multiplicera</translation>
     </message>
     <message>
+        <location line="-232"/>
+        <location line="+129"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Divide</source>
         <translation type="unfinished">Dela</translation>
     </message>
     <message>
+        <location line="-222"/>
+        <location line="+129"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Invert</source>
         <translation>Invertera</translation>
     </message>
     <message>
+        <location line="-232"/>
         <source>ScaleMap</source>
         <translation type="unfinished">Skalmap</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Flip</source>
         <translation type="unfinished">Vänd</translation>
     </message>
     <message>
+        <location line="+5"/>
+        <location line="+119"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Dyn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-222"/>
+        <location line="+119"/>
+        <location line="+54"/>
+        <location line="+54"/>
         <source>Random</source>
         <translation type="unfinished">Slumpmässig</translation>
     </message>
     <message>
+        <location line="+48"/>
         <source>Modules</source>
         <translation>Moduler</translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>enable modul 1</source>
         <translation>aktivera modul 1</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>enable modul 2</source>
         <translation>aktivera modul 2</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>enable modul 3</source>
         <translation>aktivera modul 3</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>enable modul 4</source>
         <translation>aktivera modul 4</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Name:</source>
         <translation>Namn:</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>Comment:</source>
         <translation type="unfinished">Kommentar:</translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>Function</source>
         <translation type="unfinished">Funktion</translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>&amp;New</source>
         <translation>&amp;Ny</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>create new preset</source>
         <translation type="unfinished">skapa ny preset</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>&amp;Delete</source>
         <translation>&amp;Ta bort</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>delete preset</source>
         <translation>ta bort preset</translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>&amp;Dismiss</source>
         <translation>&amp;Stäng</translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>PresetList</source>
         <translation type="unfinished">Presetlista</translation>
     </message>
@@ -5945,50 +6634,64 @@ som vanliga controllers i MusE.</translation>
 <context>
     <name>MidiStrip</name>
     <message>
+        <location filename="../../muse/mixer/mstrip.cpp" line="+173"/>
         <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="-83"/>
+        <location line="+121"/>
+        <location line="+158"/>
         <source>off</source>
         <translation type="unfinished">av</translation>
     </message>
     <message>
+        <location line="-157"/>
         <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="+20"/>
         <source>record</source>
         <translation type="unfinished">spela in</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>mute</source>
         <translation type="unfinished">tysta</translation>
     </message>
@@ -6013,26 +6716,33 @@ som vanliga controllers i MusE.</translation>
         <translation type="obsolete">automationstyp</translation>
     </message>
     <message>
+        <location line="-206"/>
+        <location line="+122"/>
         <source>double click on/off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+105"/>
         <source>solo mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+67"/>
         <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>
@@ -6040,111 +6750,142 @@ som vanliga controllers i MusE.</translation>
 <context>
     <name>MidiSyncConfig</name>
     <message>
+        <location filename="../../muse/widgets/midisyncimpl.cpp" line="+41"/>
+        <location line="+29"/>
         <source>Port Number</source>
         <translation type="unfinished">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">Namn på midienhet associerad med detta portnummer</translation>
     </message>
     <message>
+        <location line="-27"/>
         <source>Midi clock input detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <location line="+29"/>
         <source>Midi tick input detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-28"/>
         <source>Midi real time input detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>MMC input detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>MTC input detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Detected SMPTE format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Receive id number. 127 = Global. Double click to edit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Accept midi clock input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Accept midi real time input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Accept MMC input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Accept MTC input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Receive start rewinds before playing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Transmit id number. 127 = Global. Double click to edit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Send midi clock output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Send midi realtime output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <location line="+49"/>
         <source>Send MMC output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-48"/>
+        <location line="+49"/>
         <source>Send MTC output</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+3"/>
         <source>Midi realtime input detected, including
  start/stop/continue, and song position.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>MMC input detected, including stop/play/deferred play, and locate.</source>
         <translation type="unfinished"></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>
     </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>
     </message>
     <message>
+        <location line="+2"/>
         <source>Receive id number. 127 = global receive all, even if not global.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <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,
@@ -6154,6 +6895,7 @@ Click on detect indicator to force another.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Accept midi realtime input, including
  start/stop/continue, and song position.
 Non-clock events (start,stop etc) are
@@ -6164,30 +6906,36 @@ This means you may have several master
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Accept MMC input, including stop/play/deferred play, and locate.</source>
         <translation type="unfinished"></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>
     </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>
     </message>
     <message>
+        <location line="+3"/>
         <source>Transmit id number. 127 = global transmit to all.</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+2"/>
         <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
@@ -6197,103 +6945,128 @@ Note: It may be impossible to rewind fast
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+142"/>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Device Name</source>
         <translation type="unfinished">Enhetsnamn</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>c</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>k</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>r</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>t</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>rid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>rc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>rr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>rm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>rt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>rw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>tid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>tc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>tr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>tm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>tt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+399"/>
         <source>MusE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Settings have changed
 Apply sync settings?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>&amp;Apply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>&amp;No</source>
         <translation type="unfinished">&amp;Nej</translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>&amp;Abort</source>
         <translation type="unfinished">&amp;Avbryt</translation>
     </message>
     <message>
+        <location line="+125"/>
         <source>&lt;none&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6301,6 +7074,7 @@ Apply sync settings?</source>
 <context>
     <name>MidiSyncConfigBase</name>
     <message>
+        <location filename="../../muse/widgets/midisync.ui" line="+17"/>
         <source>MusE: Midi Sync</source>
         <translation type="unfinished">MusE: Midisync</translation>
     </message>
@@ -6345,103 +7119,128 @@ Apply sync settings?</source>
         <translation type="obsolete">Midiklocka</translation>
     </message>
     <message>
+        <location line="+30"/>
         <source>Apply</source>
         <translation>Verkställ</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>MTC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>25</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>30D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>30N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>Offset:</source>
         <translation type="unfinished">Offset:</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>hour</source>
         <translation>timma</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>h</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>minute</source>
         <translation type="unfinished">minut</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>second</source>
         <translation type="unfinished">sekund</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>frame</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>f</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>subframe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Sync receiving and sending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Send and receive Jack transport</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Send and receive Jack transport information,
  including stop, start and position.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Use Jack transport</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Make MusE the Jack transport Timebase Master</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Make MusE the Jack transport Timebase Master.
 Allows Jack to show time as 
  MusE Bars, Beats, and Ticks. 
@@ -6451,14 +7250,17 @@ You can always click here again for Master.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Jack transport Timebase Master</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Control MusE timing by external midi clock or MTC sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>When in slave mode, tempo is
  controlled externally.
 MusE can sync to midi clock, or MTC quarter frame sync. 
@@ -6467,14 +7269,17 @@ Enabled inputs in the list will
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Slave to external sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Send start to first clock delay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Allows &apos;slow sync&apos; devices time
  to synchronize to MusE. This value is the
  delay from sending start to sending
@@ -6482,10 +7287,12 @@ Enabled inputs in the list will
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>ms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Send sync delay</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6493,10 +7300,12 @@ Enabled inputs in the list will
 <context>
     <name>MidiTrackInfoBase</name>
     <message>
+        <location filename="../../muse/widgets/mtrackinfobase.ui" line="+38"/>
         <source>MusE: TrackInfo</source>
         <translation type="unfinished">MusE: Spårinfo</translation>
     </message>
     <message>
+        <location line="+59"/>
         <source>output channel</source>
         <translation>utgångskanal</translation>
     </message>
@@ -6509,6 +7318,8 @@ Enabled inputs in the list will
         <translation type="obsolete">Spårinfo</translation>
     </message>
     <message>
+        <location line="+249"/>
+        <location line="+91"/>
         <source>%</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6517,10 +7328,23 @@ Enabled inputs in the list will
         <translation type="obsolete">Spårnamn</translation>
     </message>
     <message>
+        <location line="-353"/>
         <source>output port</source>
         <translation>utgångsport</translation>
     </message>
     <message>
+        <location line="+68"/>
+        <source>iR</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+109"/>
+        <location line="+44"/>
+        <location line="+287"/>
+        <location line="+53"/>
+        <location line="+53"/>
+        <location line="+67"/>
+        <location line="+70"/>
         <source>off</source>
         <translation type="unfinished">av</translation>
     </message>
@@ -6533,6 +7357,7 @@ Enabled inputs in the list will
         <translation type="obsolete">välj instrumentpatch</translation>
     </message>
     <message>
+        <location line="-552"/>
         <source>Transp.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6541,34 +7366,57 @@ Enabled inputs in the list will
         <translation type="obsolete">Volym</translation>
     </message>
     <message>
+        <location line="+210"/>
         <source>Channel Info</source>
         <translation>Kanalinfo</translation>
     </message>
     <message>
+        <location line="+35"/>
+        <source>Rec:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+200"/>
+        <source>Prog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+67"/>
+        <source>Vol</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+70"/>
         <source>Pan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-541"/>
         <source>Delay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+293"/>
         <source>H-Bank</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-155"/>
         <source>Compr.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+208"/>
         <source>L-Bank</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-255"/>
         <source>Velocity</source>
         <translation>Hastighet</translation>
     </message>
     <message>
+        <location line="-47"/>
         <source>Length</source>
         <translation type="unfinished">Längd</translation>
     </message>
@@ -6613,108 +7461,119 @@ inspelning:
         <translation type="obsolete">Välj bank MSB</translation>
     </message>
     <message>
+        <location line="-268"/>
         <source>all midi events are sent to this output channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>Out ch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+27"/>
         <source>input routing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Inputs</source>
-        <translation type="unfinished">Ingångar</translation>
+        <translation type="obsolete">Ingångar</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>output routing</source>
         <translation type="unfinished">utgångsrouting</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>oR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>input detect</source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+5"/>
         <source>W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+25"/>
         <source>Midi thru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Pass input events through (&apos;thru&apos;) to output.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+288"/>
         <source>Select instrument patch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>&lt;unknown&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Record:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="+37"/>
         <source>Add all settings to song</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>All</source>
         <translation type="unfinished">Alla</translation>
     </message>
     <message>
+        <location line="+31"/>
         <source>Bank Select MSB. Double-click on/off.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+53"/>
         <source>Bank Select LSB. Double-click on/off.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+53"/>
         <source>Program. Double-click on/off.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>Add bank + prog settings to song</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Prog.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="+34"/>
         <source>Volume. Double-click on/off.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>Add vol setting to song</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Vol.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="+34"/>
+        <location line="+3"/>
         <source>Change stereo position. Double-click on/off.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>Add pan setting to song</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6722,230 +7581,345 @@ inspelning:
 <context>
     <name>MidiTransformDialogBase</name>
     <message>
+        <location filename="../../muse/widgets/transformbase.ui" line="+14"/>
         <source>MusE: Midi Transformator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>&amp;New</source>
         <translation>&amp;Ny</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>&amp;Delete</source>
         <translation>&amp;Ta bort</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>&amp;Apply</source>
         <translation>&amp;Verkställ</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>&amp;OK</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Avbryt</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>PresetList</source>
         <translation type="unfinished">Presetlista</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>Processing</source>
         <translation>Bearbetar</translation>
     </message>
     <message>
+        <location line="+12"/>
+        <location line="+425"/>
         <source>Event Type</source>
         <translation type="unfinished">Händelsetyp</translation>
     </message>
     <message>
+        <location line="-414"/>
+        <location line="+56"/>
+        <location line="+104"/>
+        <location line="+54"/>
+        <location line="+55"/>
         <source>Keep</source>
         <translation>Behåll</translation>
     </message>
     <message>
+        <location line="-264"/>
+        <location line="+76"/>
+        <location line="+104"/>
+        <location line="+54"/>
         <source>Fix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-222"/>
+        <location line="+339"/>
         <source>Note</source>
         <translation>Not</translation>
     </message>
     <message>
+        <location line="-334"/>
+        <location line="+339"/>
         <source>Poly Pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-334"/>
+        <location line="+339"/>
         <source>Control Change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-334"/>
+        <location line="+339"/>
         <source>Aftertouch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-334"/>
+        <location line="+339"/>
         <source>Pitch Bend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-334"/>
+        <location line="+339"/>
         <source>NRPN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-334"/>
+        <location line="+339"/>
         <source>RPN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-325"/>
+        <location line="+104"/>
+        <location line="+54"/>
+        <location line="+55"/>
         <source>Plus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-208"/>
+        <location line="+104"/>
+        <location line="+54"/>
+        <location line="+55"/>
         <source>Minus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-208"/>
+        <location line="+104"/>
+        <location line="+54"/>
+        <location line="+55"/>
         <source>Multiply</source>
         <translation>Multiplicera</translation>
     </message>
     <message>
+        <location line="-208"/>
+        <location line="+104"/>
+        <location line="+54"/>
+        <location line="+55"/>
         <source>Divide</source>
         <translation type="unfinished">Dela</translation>
     </message>
     <message>
+        <location line="-203"/>
+        <location line="+43"/>
+        <location line="+265"/>
         <source>Value 2</source>
         <translation>Värde 2</translation>
     </message>
     <message>
+        <location line="-303"/>
+        <location line="+104"/>
         <source>Invert</source>
         <translation>Invertera</translation>
     </message>
     <message>
+        <location line="-99"/>
         <source>ScaleMap</source>
         <translation type="unfinished">Skalmap</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Flip</source>
         <translation type="unfinished">Vänd</translation>
     </message>
     <message>
+        <location line="+5"/>
+        <location line="+94"/>
         <source>Dyn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-89"/>
+        <location line="+94"/>
         <source>Random</source>
         <translation>Slumpmässig</translation>
     </message>
     <message>
+        <location line="-86"/>
+        <location line="+71"/>
+        <location line="+214"/>
         <source>Value 1</source>
         <translation>Värde 1</translation>
     </message>
     <message>
+        <location line="-265"/>
+        <location line="+324"/>
         <source>Length</source>
         <translation>Längd</translation>
     </message>
     <message>
+        <location line="-314"/>
         <source>Position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+172"/>
         <source>Filter</source>
         <translation type="unfinished">Filter</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>All</source>
         <translation>Alla</translation>
     </message>
     <message>
+        <location line="+5"/>
+        <location line="+91"/>
+        <location line="+59"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Equal</source>
         <translation type="unfinished">Lika</translation>
     </message>
     <message>
+        <location line="-223"/>
+        <location line="+91"/>
+        <location line="+59"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Unequal</source>
         <translation>Ej lika</translation>
     </message>
     <message>
+        <location line="-147"/>
+        <location line="+59"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Ignore</source>
         <translation>Ignorera</translation>
     </message>
     <message>
+        <location line="-122"/>
+        <location line="+59"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Higher</source>
         <translation>Högre</translation>
     </message>
     <message>
+        <location line="-132"/>
+        <location line="+59"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Lower</source>
         <translation>Lägre</translation>
     </message>
     <message>
+        <location line="-132"/>
+        <location line="+59"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Inside</source>
         <translation>Innanför</translation>
     </message>
     <message>
+        <location line="-132"/>
+        <location line="+59"/>
+        <location line="+39"/>
+        <location line="+39"/>
         <source>Outside</source>
         <translation>Utanför</translation>
     </message>
     <message>
+        <location line="-119"/>
         <source>Bar Range</source>
         <translation type="unfinished">Takt Område</translation>
     </message>
     <message>
+        <location line="+197"/>
         <source>Preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Name:</source>
         <translation>Namn:</translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Comment:</source>
         <translation>Kommentar:</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>Range</source>
         <translation>Område</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>process all events</source>
         <translation type="unfinished">bearbeta alla händelser</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>selected tracks</source>
         <translation type="unfinished">valda spår</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>inside loop</source>
         <translation>I loop</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Function</source>
         <translation type="unfinished">Funktion</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Select</source>
         <translation type="unfinished">Välj</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Quantize</source>
         <translation>Kvantisera</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Delete</source>
         <translation>Ta bort</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Transform</source>
         <translation>Transformera</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Insert</source>
         <translation>Sätt in</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Copy</source>
         <translation>Kopiera</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Extract</source>
         <translation type="unfinished">Extrahera</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Quantize Value</source>
         <translation>Kvantisera värde</translation>
     </message>
@@ -6953,6 +7927,8 @@ inspelning:
 <context>
     <name>MidiTransformerDialog</name>
     <message>
+        <location filename="../../muse/miditransform.cpp" line="+248"/>
+        <location line="+2"/>
         <source>New</source>
         <translation>Ny</translation>
     </message>
@@ -6960,6 +7936,7 @@ inspelning:
 <context>
     <name>MixdownFileDialog</name>
     <message>
+        <location filename="../../muse/widgets/mixdowndialog.cpp" line="+101"/>
         <source>Wave Files (*.wav);;All Files (*)</source>
         <translation>Ljudfiler (*.wav);;Alla filer (*)</translation>
     </message>
@@ -6967,50 +7944,62 @@ inspelning:
 <context>
     <name>MixdownFileDialogBase</name>
     <message>
+        <location filename="../../muse/widgets/mixdowndialogbase.ui" line="+14"/>
         <source>MusE: Set Mixdown Wavefile</source>
         <translation>MusE: Välj mixdown-ljudfil</translation>
     </message>
     <message>
+        <location line="+39"/>
         <source>&amp;OK</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Avbryt</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>File Path</source>
         <translation>Sökväg till fil</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Channel</source>
         <translation>Kanal</translation>
     </message>
     <message>
+        <location line="+31"/>
         <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>5.1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>wav,16 Bit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>wav, 24 Bit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>wav, 32 Bit (float)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7033,6 +8022,8 @@ inspelning:
         <translation type="obsolete">för att importera en ljudfil måste du ha valt ett ljudspår</translation>
     </message>
     <message>
+        <location filename="../../muse/app.cpp" line="+201"/>
+        <location filename="../../muse/wave.cpp" line="+810"/>
         <source>Import Wave File</source>
         <translation>Importera ljudfil</translation>
     </message>
@@ -7045,6 +8036,7 @@ inspelning:
         <translation type="obsolete">ångra</translation>
     </message>
     <message>
+        <location line="-119"/>
         <source>Und&amp;o</source>
         <translation>&amp;Ångra</translation>
     </message>
@@ -7053,34 +8045,42 @@ inspelning:
         <translation type="obsolete">gör om</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Re&amp;do</source>
         <translation>&amp;Gör om</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>undo last change to song</source>
         <translation>ångra sista ändring i sång</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>redo last undo</source>
         <translation>gör om sista ångring</translation>
     </message>
     <message>
+        <location line="+424"/>
         <source>Transport</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-410"/>
         <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>
     </message>
@@ -7089,6 +8089,7 @@ inspelning:
         <translation type="obsolete">flytta tillbaka</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Rewind</source>
         <translation type="unfinished">Flytta tillbaka</translation>
     </message>
@@ -7097,6 +8098,7 @@ inspelning:
         <translation type="obsolete">frammåt</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Forward</source>
         <translation type="unfinished">Frammåt</translation>
     </message>
@@ -7105,6 +8107,7 @@ inspelning:
         <translation type="obsolete">stopp</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Stop</source>
         <translation type="unfinished">Stopp</translation>
     </message>
@@ -7113,6 +8116,7 @@ inspelning:
         <translation type="obsolete">spela</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Play</source>
         <translation type="unfinished">Spela</translation>
     </message>
@@ -7121,6 +8125,7 @@ inspelning:
         <translation type="obsolete">spela in</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Record</source>
         <translation type="unfinished">Spela in</translation>
     </message>
@@ -7129,6 +8134,8 @@ inspelning:
         <translation type="obsolete">panik</translation>
     </message>
     <message>
+        <location line="+6"/>
+        <location line="+349"/>
         <source>Panic</source>
         <translation type="unfinished">Panik</translation>
     </message>
@@ -7137,6 +8144,7 @@ inspelning:
         <translation type="obsolete">ny</translation>
     </message>
     <message>
+        <location line="-337"/>
         <source>&amp;New</source>
         <translation>&amp;Ny</translation>
     </message>
@@ -7145,6 +8153,7 @@ inspelning:
         <translation type="obsolete">öppna</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>&amp;Open</source>
         <translation>&amp;Öppna</translation>
     </message>
@@ -7153,6 +8162,9 @@ inspelning:
         <translation type="obsolete">spara</translation>
     </message>
     <message>
+        <location line="+7"/>
+        <location line="+1168"/>
+        <location line="+1471"/>
         <source>&amp;Save</source>
         <translation>&amp;Spara</translation>
     </message>
@@ -7161,6 +8173,7 @@ inspelning:
         <translation type="obsolete">pianorulle</translation>
     </message>
     <message>
+        <location line="-2587"/>
         <source>Pianoroll</source>
         <translation>Pianorulle</translation>
     </message>
@@ -7169,8 +8182,9 @@ inspelning:
         <translation type="obsolete">partitur</translation>
     </message>
     <message>
+        <location line="-11"/>
         <source>Score</source>
-        <translation type="obsolete">Partitur</translation>
+        <translation type="unfinished">Partitur</translation>
     </message>
     <message>
         <source>marker</source>
@@ -7181,18 +8195,22 @@ inspelning:
         <translation type="obsolete">Markör</translation>
     </message>
     <message>
+        <location line="+262"/>
         <source>File Buttons</source>
         <translation>Arkivknappar</translation>
     </message>
     <message>
+        <location line="+71"/>
         <source>&amp;File</source>
         <translation>&amp;Arkiv</translation>
     </message>
     <message>
+        <location line="-376"/>
         <source>Open &amp;Recent</source>
         <translation>&amp;Nyligen öppnade</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Save &amp;As</source>
         <translation>S&amp;para som</translation>
     </message>
@@ -7201,30 +8219,37 @@ inspelning:
         <translation type="obsolete">&amp;Konfigurera skrivare</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Import Midifile</source>
         <translation>Importera midifil</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Export Midifile</source>
         <translation>Exportera midifil</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>&amp;Quit</source>
         <translation>A&amp;vsluta</translation>
     </message>
     <message>
+        <location line="+383"/>
         <source>&amp;Edit</source>
         <translation>&amp;Redigera</translation>
     </message>
     <message>
+        <location line="-380"/>
         <source>C&amp;ut</source>
         <translation>Klipp &amp;ut</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>&amp;Copy</source>
         <translation>&amp;Kopiera</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>&amp;Paste</source>
         <translation>K&amp;listra in</translation>
     </message>
@@ -7233,154 +8258,193 @@ inspelning:
         <translation type="obsolete">Ta bort spår</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Add Track</source>
         <translation>Lägg Till Spår</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Select &amp;All</source>
         <translation>Markera &amp;Allt</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>&amp;Deselect All</source>
         <translation type="unfinished">A&amp;vmarkera Allt</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Invert &amp;Selection</source>
         <translation>Invertera &amp;Markering</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>&amp;Inside Loop</source>
         <translation>&amp;I Loop</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>&amp;Outside Loop</source>
         <translation>&amp;Utanför Loop</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>All &amp;Parts on Track</source>
         <translation>Alla &amp;Parter i spår</translation>
     </message>
     <message>
+        <location line="-8"/>
         <source>Select</source>
         <translation>Välj</translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Drums</source>
         <translation>Trummor</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <location line="+6"/>
         <source>List</source>
         <translation>Lista</translation>
     </message>
     <message>
+        <location line="-1"/>
         <source>Graphic</source>
         <translation>Grafik</translation>
     </message>
     <message>
+        <location line="-2"/>
         <source>Mastertrack</source>
         <translation>Masterspår</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Midi &amp;Transform</source>
         <translation>Midi &amp;Transform</translation>
     </message>
     <message>
+        <location line="+374"/>
         <source>Modify Gate Time</source>
         <translation>Modifiera Gate Time</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Modify Velocity</source>
         <translation>Modifiera Velocity</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Crescendo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-344"/>
         <source>Transpose</source>
         <translation>Transponera</translation>
     </message>
     <message>
+        <location line="+345"/>
         <source>Thin Out</source>
         <translation>Tunna ut</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Erase Event</source>
         <translation>Ta bort Händelse</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Note Shift</source>
         <translation>Shifta Not</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Move Clock</source>
         <translation>Flytta Klocka</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Copy Measure</source>
         <translation>Kopiera Takt</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Erase Measure</source>
         <translation>Radera Takt</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Delete Measure</source>
         <translation>Ta bort Takt</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Create Measure</source>
         <translation>Skapa Takt</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Mix Track</source>
         <translation>Mixa Spår</translation>
     </message>
     <message>
+        <location line="-388"/>
         <source>Midi</source>
         <translation type="unfinished">Midi</translation>
     </message>
     <message>
+        <location line="+412"/>
         <source>&amp;Structure</source>
         <translation>&amp;Struktur</translation>
     </message>
     <message>
+        <location line="-390"/>
         <source>Global Cut</source>
         <translation>Globalt klipp</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Global Insert</source>
         <translation>Global insättning</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Global Split</source>
         <translation>Global delning</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Copy Range</source>
         <translation>Kopiera Område</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Cut Events</source>
         <translation>Klipp ut Händelse</translation>
     </message>
     <message>
+        <location line="-19"/>
         <source>Transport Panel</source>
         <translation type="unfinished">Transportpanel</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Bigtime Window</source>
         <translation>Bigtime fönster</translation>
     </message>
     <message>
-        <source>Don't Follow Song</source>
+        <location line="+53"/>
+        <source>Don&apos;t Follow Song</source>
         <translation>följ inte Sång</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Follow Page</source>
         <translation>följ sida</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Follow Continuous</source>
         <translation>följ kontinuerligt</translation>
     </message>
@@ -7389,18 +8453,22 @@ inspelning:
         <translation type="obsolete">&amp;Inställningar</translation>
     </message>
     <message>
+        <location line="-8"/>
         <source>Global Settings</source>
         <translation>Globala Inställningar</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Follow Song</source>
         <translation>följ sång</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Metronome</source>
         <translation>Metronom</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Midi Sync</source>
         <translation>Midi Synk</translation>
     </message>
@@ -7409,6 +8477,7 @@ inspelning:
         <translation type="obsolete">Midi Filkonfigurering</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Appearance Settings</source>
         <translation>Utseendeinställningar</translation>
     </message>
@@ -7429,14 +8498,17 @@ inspelning:
         <translation type="obsolete">Spara Inställningar</translation>
     </message>
     <message>
+        <location line="-38"/>
         <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>Midi-fjärrkontroll</translation>
     </message>
@@ -7445,6 +8517,7 @@ inspelning:
         <translation type="obsolete">Slumprytmgenerator</translation>
     </message>
     <message>
+        <location line="+386"/>
         <source>&amp;Midi</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7453,34 +8526,42 @@ inspelning:
         <translation type="obsolete">Definiera Controller</translation>
     </message>
     <message>
+        <location line="-391"/>
         <source>Input Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Reset Instr.</source>
         <translation>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="+406"/>
         <source>&amp;Audio</source>
         <translation type="unfinished">L&amp;jud</translation>
     </message>
     <message>
+        <location line="-403"/>
         <source>Bounce to Track</source>
         <translation>Bounce till Spår</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Bounce to File</source>
         <translation>Bounce till Fil</translation>
     </message>
     <message>
+        <location line="+443"/>
         <source>&amp;Help</source>
         <translation>&amp;Hjälp</translation>
     </message>
@@ -7509,14 +8590,17 @@ inspelning:
         <translation type="obsolete">inget</translation>
     </message>
     <message>
+        <location line="+499"/>
         <source>MusE: load project</source>
         <translation>MusE: Öppna projekt</translation>
     </message>
     <message>
+        <location line="+76"/>
         <source>MusE: Write File failed</source>
         <translation>MusE: Misslyckades med att skriva Fil</translation>
     </message>
     <message>
+        <location line="+38"/>
         <source>The current Project contains unsaved data
 Save Current Project?</source>
         <translation>Det nuvarande Projektet innehåller osparade ändringar
@@ -7527,6 +8611,8 @@ Spara nuvarande Projekt?</translation>
         <translation type="obsolete">&amp;Inte spara</translation>
     </message>
     <message>
+        <location line="+1473"/>
+        <location filename="../../muse/importmidi.cpp" line="+68"/>
         <source>&amp;Abort</source>
         <translation>&amp;Avbryt</translation>
     </message>
@@ -7535,22 +8621,30 @@ Spara nuvarande Projekt?</translation>
         <translation type="obsolete">MusE: Om</translation>
     </message>
     <message>
+        <location line="-1275"/>
+        <location line="+13"/>
         <source>MusE: Save As</source>
         <translation>MusE: Spara Som</translation>
     </message>
     <message>
+        <location line="-390"/>
+        <location line="+399"/>
+        <location line="+1199"/>
         <source>MusE: Song: </source>
         <translation>MusE: Sång:</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 filename="../../muse/exportmidi.cpp" line="+126"/>
         <source>MusE: Export Midi</source>
         <translation type="unfinished">MusE: Exportera Midi</translation>
     </message>
     <message>
+        <location filename="../../muse/importmidi.cpp" line="+42"/>
         <source>reading midifile
   </source>
         <translation type="unfinished">läser midifil</translation>
@@ -7561,22 +8655,29 @@ failed</source>
         <translation type="obsolete">misslyckades</translation>
     </message>
     <message>
+        <location filename="../../muse/app.cpp" line="-1151"/>
+        <location line="+197"/>
         <source>Nothing to edit</source>
         <translation>Inget att redigera</translation>
     </message>
     <message>
         <source>MusE: Copy Range</source>
-        <translation>MusE: Kopiera område</translation>
+        <translation type="obsolete">MusE: Kopiera område</translation>
     </message>
     <message>
         <source>not implemented</source>
-        <translation>ej implementerat</translation>
+        <translation type="obsolete">ej implementerat</translation>
     </message>
     <message>
         <source>MusE: Cut Events</source>
-        <translation>MusE: Klipp ut Händelse</translation>
+        <translation type="obsolete">MusE: Klipp ut Händelse</translation>
     </message>
     <message>
+        <location line="+763"/>
+        <location line="+10"/>
+        <location line="+31"/>
+        <location line="+34"/>
+        <location line="+8"/>
         <source>MusE: Bounce to Track</source>
         <translation>MusE: Bounce till Spår</translation>
     </message>
@@ -7595,6 +8696,7 @@ välj wave-spår som mål</translation>
         <translation type="obsolete">inget spår valt som mål</translation>
     </message>
     <message>
+        <location line="+159"/>
         <source>The current Project contains unsaved data
 Load overwrites current Project:
 Save Current Project?</source>
@@ -7607,10 +8709,12 @@ Spara nuvarande Projekt?</translation>
         <translation type="obsolete">Skriv &amp;över</translation>
     </message>
     <message>
+        <location filename="../../muse/help.cpp" line="+33"/>
         <source>no help found at: </source>
         <translation>ingen h jälp hittad vid:</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>MusE: Open Help</source>
         <translation>Muse: Arkiv hjälp</translation>
     </message>
@@ -7619,38 +8723,40 @@ Spara nuvarande Projekt?</translation>
         <translation type="obsolete">för att importa en ljudfil så måste du första välja ett wavespår</translation>
     </message>
     <message>
+        <location filename="../../muse/app.cpp" line="-2611"/>
         <source>Delete Selected Tracks</source>
         <translation type="unfinished">Ta bort valda spår</translation>
     </message>
     <message>
         <source>View</source>
-        <translation type="unfinished">Vy</translation>
+        <translation type="obsolete">Vy</translation>
     </message>
     <message>
+        <location line="+86"/>
         <source>Restart Audio</source>
         <translation type="unfinished">Starta om Audio</translation>
     </message>
     <message>
-        <source>Automation</source>
-        <translation type="unfinished"></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>
         <source>Settings</source>
-        <translation type="unfinished">Inställningar</translation>
+        <translation type="obsolete">Inställningar</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Configure Shortcuts</source>
         <translation type="unfinished">Konfigurera kortkommandon</translation>
     </message>
@@ -7659,22 +8765,27 @@ Spara nuvarande Projekt?</translation>
         <translation type="obsolete">Midifilexport</translation>
     </message>
     <message>
+        <location line="+14"/>
         <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>
@@ -7683,30 +8794,32 @@ Spara nuvarande Projekt?</translation>
         <translation type="obsolete">Vad är &amp;detta?</translation>
     </message>
     <message>
+        <location line="+679"/>
         <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="+200"/>
         <source>MusE: load template</source>
         <translation type="unfinished">MusE: ladda mall</translation>
     </message>
     <message>
-        <source>MusE: Bounce</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <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>
+        <translation type="obsolete">sätt vänster och höger markör till bounce-område</translation>
     </message>
     <message>
+        <location line="+1443"/>
+        <location line="+25"/>
         <source>MusE: Bounce to File</source>
         <translation type="unfinished">MusE: Bounce till fil</translation>
     </message>
@@ -7715,33 +8828,41 @@ Spara nuvarande Projekt?</translation>
         <translation type="obsolete">hittar inget utgångsspår</translation>
     </message>
     <message>
+        <location filename="../../muse/importmidi.cpp" line="-33"/>
         <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="+33"/>
         <source>
 failed: </source>
         <translation type="unfinished">
 misslyckades:</translation>
     </message>
     <message>
+        <location filename="../../muse/app.cpp" line="-2525"/>
         <source>Import Part</source>
         <translation type="unfinished">Importera Part</translation>
     </message>
     <message>
+        <location line="+71"/>
         <source>Marker View</source>
         <translation type="unfinished">Markörvy</translation>
     </message>
     <message>
+        <location line="+1088"/>
+        <location line="+1471"/>
         <source>&amp;Skip</source>
         <translation type="unfinished">&amp;Hoppa över</translation>
     </message>
@@ -7750,161 +8871,247 @@ misslyckades:</translation>
         <translation type="obsolete">Bara midispår kan importera parter!</translation>
     </message>
     <message>
+        <location filename="../../muse/importmidi.cpp" line="+364"/>
         <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>
+        <location filename="../../muse/app.cpp" line="-3326"/>
+        <location line="+18"/>
         <source>Failed to start audio!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-17"/>
         <source>Was not able to start audio, check if jack is running.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Timeout waiting for audio to run. Check if jack is running.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+688"/>
         <source>&amp;Insert</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Paste c&amp;lone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Paste to &amp;track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Paste clone to trac&amp;k</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Insert Empty Measure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-9"/>
+        <source>Find unused wave files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>all parts in one staff</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>one staff per part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>New score window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Wave</source>
         <translation type="unfinished">Wave</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Song Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <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="+15"/>
         <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="+8"/>
         <source>Rhythm Generator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+33"/>
         <source>Midi File Import/Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+325"/>
+        <source>&amp;View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <source>A&amp;utomation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Se&amp;ttings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+346"/>
         <source>Unknown File Format: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+289"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Avbryt</translation>
+    </message>
+    <message>
+        <location line="+286"/>
+        <location line="+6"/>
+        <source>New</source>
+        <translation type="unfinished">Ny</translation>
+    </message>
+    <message>
+        <location line="+935"/>
         <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="+57"/>
         <source>Select one audio output track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../../muse/importmidi.cpp" line="-26"/>
         <source>Import part is only valid for midi and wave tracks!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+147"/>
         <source> out of </source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+1"/>
         <source> could not be imported.
 Likely the track is the wrong type.</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>
         <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>
     <message>
+        <location filename="../../muse/help.cpp" 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>
@@ -7936,26 +9143,32 @@ browser on your machine.</source>
 <context>
     <name>NoteInfo</name>
     <message>
+        <location filename="../../muse/widgets/noteinfo.cpp" line="+27"/>
         <source>Note Info</source>
         <translation>Notinfo</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Len</source>
         <translation type="unfinished">Längd</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Pitch</source>
         <translation type="unfinished">Tonhöjd</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Velo On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Velo Off</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7975,90 +9188,122 @@ browser on your machine.</source>
         <translation type="obsolete">spara presetlista</translation>
     </message>
     <message>
+        <location filename="../../synti/organ/organguibase.ui" line="+869"/>
         <source>Velocity</source>
         <translation type="unfinished">Hastighet</translation>
     </message>
     <message>
+        <location line="-849"/>
         <source>MusE: Organ</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Drawbars</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>16&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>4&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>2 2/3&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>2&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>5 1/3&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>8&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+232"/>
         <source>Envelope Hi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+12"/>
+        <location line="+252"/>
         <source>Release</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-242"/>
+        <location line="+232"/>
         <source>Sustain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-222"/>
+        <location line="+212"/>
         <source>Decay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-196"/>
+        <location line="+186"/>
         <source>Attack</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-110"/>
+        <location line="+41"/>
+        <location line="+35"/>
+        <location line="+171"/>
+        <location line="+16"/>
+        <location line="+38"/>
         <source>ms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-244"/>
+        <location line="+222"/>
         <source>cB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-184"/>
         <source>Envelope Lo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+232"/>
         <source>O-1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Oscillator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Brass</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Reed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Flute</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8165,44 +9410,53 @@ browser on your machine.</source>
 <context>
     <name>PartCanvas</name>
     <message>
+        <location filename="../../muse/arranger/pcanvas.cpp" line="+485"/>
         <source>Cannot copy/move/clone to different Track-Type</source>
         <translation>Kan inte kopiera/flytta/klona till annan Spårtyp</translation>
     </message>
     <message>
+        <location line="+258"/>
         <source>C&amp;ut</source>
         <translation>Klipp &amp;ut</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>&amp;Copy</source>
         <translation>&amp;Kopiera</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>rename</source>
         <translation>byt namn</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>color</source>
         <translation>färg</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>delete</source>
         <translation>ta bort</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>split</source>
         <translation>dela</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>glue</source>
         <translation>lim</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>de-clone</source>
         <translation>häv kloning</translation>
     </message>
     <message>
         <source>pianoroll</source>
-        <translation>pianorulle</translation>
+        <translation type="obsolete">pianorulle</translation>
     </message>
     <message>
         <source>score</source>
@@ -8210,21 +9464,24 @@ browser on your machine.</source>
     </message>
     <message>
         <source>list</source>
-        <translation>lista</translation>
+        <translation type="obsolete">lista</translation>
     </message>
     <message>
         <source>drums</source>
-        <translation>trummor</translation>
+        <translation type="obsolete">trummor</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>wave edit</source>
         <translation>wave redigering</translation>
     </message>
     <message>
+        <location line="+1874"/>
         <source>Cannot paste: multiple tracks selected</source>
         <translation>Kan inte klistra in: flera spår valda</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Cannot paste: no track selected</source>
         <translation>Kan inte klistra in: inget spår valt</translation>
     </message>
@@ -8237,63 +9494,84 @@ browser on your machine.</source>
         <translation type="obsolete">Kan inte klistra in wavepart på midispår</translation>
     </message>
     <message>
+        <location line="+52"/>
         <source>Cannot paste: wrong data type</source>
         <translation>Kan inte klistra in: fel datatyp</translation>
     </message>
     <message>
+        <location line="-32"/>
         <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="+12"/>
         <source>Can only paste to wave track</source>
         <translation type="unfinished">Kan endast klistra till wavespår</translation>
     </message>
     <message>
         <source>export</source>
-        <translation type="unfinished">exportera</translation>
+        <translation type="obsolete">exportera</translation>
     </message>
     <message>
+        <location line="-1803"/>
         <source>MusE: save part</source>
         <translation type="unfinished">MusE: spara part</translation>
     </message>
     <message>
+        <location line="-163"/>
         <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="+36"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <source>save part to disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>file info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+127"/>
         <source>Part name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1322"/>
         <source> out of </source>
         <translation type="unfinished"></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>
     </message>
     <message>
+        <location line="+1"/>
         <source> could not be pasted.
 Likely the selected track is the wrong type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+472"/>
         <source>Can only paste to midi or wave track</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8301,6 +9579,7 @@ Likely the selected track is the wrong type.</source>
 <context>
     <name>PianoRoll</name>
     <message>
+        <location filename="../../muse/midiedit/pianoroll.cpp" line="+85"/>
         <source>&amp;Edit</source>
         <translation>&amp;Redigera</translation>
     </message>
@@ -8341,6 +9620,7 @@ Likely the selected track is the wrong type.</source>
         <translation type="obsolete">Utanför loop</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>&amp;Select</source>
         <translation>&amp;Välj</translation>
     </message>
@@ -8357,6 +9637,7 @@ Likely the selected track is the wrong type.</source>
         <translation type="obsolete">velocityfärger</translation>
     </message>
     <message>
+        <location line="+36"/>
         <source>&amp;Config</source>
         <translation type="unfinished">&amp;Inställningar</translation>
     </message>
@@ -8365,182 +9646,237 @@ Likely the selected track is the wrong type.</source>
         <translation type="obsolete">händelsefärg</translation>
     </message>
     <message>
+        <location line="+30"/>
         <source>&amp;Functions</source>
         <translation>&amp;Funktioner</translation>
     </message>
     <message>
         <source>Over Quantize</source>
-        <translation>Över Kvantisera</translation>
+        <translation type="obsolete">Över Kvantisera</translation>
     </message>
     <message>
         <source>Note On Quantize</source>
-        <translation>Note On-kvantisera</translation>
+        <translation type="obsolete">Note On-kvantisera</translation>
     </message>
     <message>
         <source>Note On/Off Quantize</source>
-        <translation>Note On/Off Kvantisera</translation>
+        <translation type="obsolete">Note On/Off Kvantisera</translation>
     </message>
     <message>
         <source>Iterative Quantize</source>
-        <translation>Iterativ kvantisering</translation>
+        <translation type="obsolete">Iterativ kvantisering</translation>
     </message>
     <message>
         <source>Config Quant...</source>
-        <translation>Konfigurera Kvant...</translation>
+        <translation type="obsolete">Konfigurera Kvant...</translation>
     </message>
     <message>
         <source>Modify Gate Time</source>
-        <translation>Modifiera Gate Time</translation>
+        <translation type="obsolete">Modifiera Gate Time</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Modify Velocity</source>
         <translation>Modifiera Velocity</translation>
     </message>
     <message>
-        <source>Crescendo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="+8"/>
         <source>Transpose</source>
         <translation>Transponera</translation>
     </message>
     <message>
         <source>Thin Out</source>
-        <translation>Tunna ut</translation>
+        <translation type="obsolete">Tunna ut</translation>
     </message>
     <message>
         <source>Erase Event</source>
-        <translation>Ta bort Händelse</translation>
+        <translation type="obsolete">Ta bort Händelse</translation>
     </message>
     <message>
         <source>Note Shift</source>
-        <translation>Shifta Not</translation>
+        <translation type="obsolete">Shifta Not</translation>
     </message>
     <message>
         <source>Move Clock</source>
-        <translation>Flytta Klocka</translation>
+        <translation type="obsolete">Flytta Klocka</translation>
     </message>
     <message>
         <source>Copy Measure</source>
-        <translation>Kopiera Takt</translation>
+        <translation type="obsolete">Kopiera Takt</translation>
     </message>
     <message>
         <source>Erase Measure</source>
-        <translation>Radera Takt</translation>
+        <translation type="obsolete">Radera Takt</translation>
     </message>
     <message>
         <source>Delete Measure</source>
-        <translation>Ta bort Takt</translation>
+        <translation type="obsolete">Ta bort Takt</translation>
     </message>
     <message>
         <source>Create Measure</source>
-        <translation>Skapa Takt</translation>
+        <translation type="obsolete">Skapa Takt</translation>
     </message>
     <message>
         <source>Pianoroll Tools</source>
         <translation type="obsolete">Verktyg Pianorulle</translation>
     </message>
     <message>
+        <location line="+37"/>
         <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="+6"/>
         <source>Play Events</source>
         <translation>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>
     </message>
     <message>
+        <location line="-78"/>
         <source>Set Fixed Length</source>
         <translation type="unfinished">Sätt fast längd</translation>
     </message>
     <message>
+        <location line="-118"/>
         <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>&amp;Paste</source>
         <translation type="unfinished">K&amp;listra in</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Delete &amp;Events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+8"/>
         <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="+6"/>
         <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="+16"/>
+        <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="+6"/>
         <source>Pianoroll tools</source>
         <translation type="unfinished"></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>
     </message>
@@ -8548,58 +9884,72 @@ Likely the selected track is the wrong type.</source>
 <context>
     <name>PluginDialog</name>
     <message>
+        <location filename="../../muse/plugin.cpp" line="+3032"/>
         <source>MusE: select plugin</source>
         <translation>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>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>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>Avbryt</translation>
     </message>
@@ -8608,10 +9958,12 @@ Likely the selected track is the wrong type.</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>
@@ -8620,18 +9972,22 @@ Likely the selected track is the wrong type.</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>
     </message>
@@ -8639,30 +9995,38 @@ Likely the selected track is the wrong type.</source>
 <context>
     <name>PluginGui</name>
     <message>
+        <location line="+207"/>
         <source>File Buttons</source>
         <translation>Arkiv Knappar</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Load Preset</source>
         <translation>Öppna Preset</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Save Preset</source>
         <translation>Spara Preset</translation>
     </message>
     <message>
+        <location line="+6"/>
+        <location line="+3"/>
         <source>bypass plugin</source>
         <translation>koppla ur plugin</translation>
     </message>
     <message>
+        <location line="+543"/>
         <source>MusE: load preset</source>
         <translation>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>
     </message>
@@ -8834,6 +10198,7 @@ används inte för tillfället</translation>
 <context>
     <name>QObject</name>
     <message>
+        <location filename="../../muse/app.cpp" line="-2773"/>
         <source>Other</source>
         <translation type="unfinished">Andra</translation>
     </message>
@@ -8845,22 +10210,29 @@ används inte för tillfället</translation>
         <translation type="obsolete">Hastighet</translation>
     </message>
     <message>
+        <location filename="../../muse/instruments/minstrument.cpp" line="+56"/>
+        <location filename="../../muse/liste/editevent.cpp" line="-418"/>
         <source>Cannot convert sysex string</source>
         <translation>Kan inte konvertera sysex-sträng</translation>
     </message>
     <message>
+        <location line="+8"/>
+        <location filename="../../muse/liste/editevent.cpp" line="+8"/>
         <source>Hex String too long (2048 bytes limit)</source>
         <translation>Hex-sträng för lång (2048 bytes maxgräns)</translation>
     </message>
     <message>
+        <location line="+189"/>
         <source>generic midi</source>
         <translation type="unfinished">generell midi</translation>
     </message>
     <message>
+        <location filename="../../muse/miditransform.cpp" line="+92"/>
         <source>new</source>
         <translation>ny</translation>
     </message>
     <message>
+        <location filename="../../muse/wave.cpp" line="-675"/>
         <source>create peakfile for </source>
         <translation>skapa &quot;peak&quot;-fil</translation>
     </message>
@@ -8869,6 +10241,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="+63"/>
         <source>MusE: get file name</source>
         <translation>MusE: hämta filnamn</translation>
     </message>
@@ -8894,14 +10267,17 @@ skapa?</translation>
         <translation type="obsolete">Avbryt</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>MusE: create directory</source>
         <translation>MusE: skapa katalog</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>creating dir failed</source>
         <translation>misslyckades med att skapa katalog</translation>
     </message>
     <message>
+        <location line="+396"/>
         <source>File
 </source>
         <translation>Arkiv</translation>
@@ -8912,6 +10288,7 @@ exists</source>
         <translation type="obsolete">existerar</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>MusE: write</source>
         <translation>MusE: skriv</translation>
     </message>
@@ -8924,21 +10301,26 @@ exists</source>
         <translation type="obsolete">Avsluta</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Open File
 </source>
         <translation>Öppna fil</translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>
 failed: </source>
         <translation>
 misslyckades:</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>MusE: Open File</source>
         <translation>MusE: Öppna fil</translation>
     </message>
     <message>
+        <location filename="../../muse/route.cpp" line="+1026"/>
+        <location line="+37"/>
         <source>None</source>
         <translation type="unfinished">Ingen</translation>
     </message>
@@ -8959,21 +10341,25 @@ misslyckades:</translation>
         <translation type="obsolete">Grupp</translation>
     </message>
     <message>
+        <location filename="../../muse/waveedit/waveview.cpp" line="+616"/>
         <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>
@@ -8983,23 +10369,23 @@ exists. Overwrite?</source>
     <name>QuantConfig</name>
     <message>
         <source>MusE: Config Quantize</source>
-        <translation>MusE: Konfigurera Kvantisering</translation>
+        <translation type="obsolete">MusE: Konfigurera Kvantisering</translation>
     </message>
     <message>
         <source>Config Quantize</source>
-        <translation>Konfigurera Kvantisering</translation>
+        <translation type="obsolete">Konfigurera Kvantisering</translation>
     </message>
     <message>
         <source>Strength</source>
-        <translation>Styrka</translation>
+        <translation type="obsolete">Styrka</translation>
     </message>
     <message>
         <source>Don´t Quantize</source>
-        <translation>Kvantisera Inte</translation>
+        <translation type="obsolete">Kvantisera Inte</translation>
     </message>
     <message>
         <source>Quant Len</source>
-        <translation>Kvant Längd</translation>
+        <translation type="obsolete">Kvant Längd</translation>
     </message>
 </context>
 <context>
@@ -9024,309 +10410,501 @@ exists. Overwrite?</source>
 <context>
     <name>RhythmBase</name>
     <message>
+        <location filename="../../muse/mplugins/rhythmbase.ui" line="+14"/>
         <source>MusE: Random Rhythm Generator</source>
-        <translation type="obsolete">MusE: Slumprytmgenerator</translation>
+        <translation type="unfinished">MusE: Slumprytmgenerator</translation>
     </message>
     <message>
+        <location line="+21"/>
         <source>Instrument Properties</source>
-        <translation type="obsolete">Instrumentinställningar</translation>
+        <translation type="unfinished">Instrumentinställningar</translation>
     </message>
     <message>
+        <location line="+20"/>
+        <location line="+334"/>
         <source>counts/bar</source>
-        <translation type="obsolete">slag/takt</translation>
+        <translation type="unfinished">slag/takt</translation>
     </message>
     <message>
+        <location line="-324"/>
+        <source>steps/count</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+325"/>
         <source># bars</source>
-        <translation type="obsolete"># takter</translation>
+        <translation type="unfinished"># takter</translation>
+    </message>
+    <message>
+        <location line="-315"/>
+        <source>test</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+26"/>
+        <location line="+300"/>
+        <source>contrib</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-290"/>
         <source>randomize</source>
-        <translation type="obsolete">slumpa</translation>
+        <translation type="unfinished">slumpa</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Group 1</source>
-        <translation type="obsolete">Grupp 1</translation>
+        <translation type="unfinished">Grupp 1</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Group 2</source>
-        <translation type="obsolete">Grupp 2</translation>
+        <translation type="unfinished">Grupp 2</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Group 3</source>
-        <translation type="obsolete">Grupp 3</translation>
+        <translation type="unfinished">Grupp 3</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Group 4</source>
-        <translation type="obsolete">Grupp 4</translation>
+        <translation type="unfinished">Grupp 4</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Group 5</source>
-        <translation type="obsolete">Grupp 5</translation>
+        <translation type="unfinished">Grupp 5</translation>
     </message>
     <message>
+        <location line="+34"/>
+        <location line="+228"/>
         <source>listen</source>
-        <translation type="obsolete">lyssna</translation>
+        <translation type="unfinished">lyssna</translation>
     </message>
     <message>
+        <location line="-218"/>
         <source>Instrument</source>
-        <translation type="obsolete">Instrument</translation>
+        <translation type="unfinished">Instrument</translation>
     </message>
     <message>
+        <location line="+36"/>
+        <location line="+127"/>
         <source>Group</source>
-        <translation type="obsolete">Grupp</translation>
+        <translation type="unfinished">Grupp</translation>
     </message>
     <message>
+        <location line="-100"/>
+        <location line="+339"/>
         <source>&amp;New</source>
-        <translation type="obsolete">&amp;Ny</translation>
+        <translation type="unfinished">&amp;Ny</translation>
     </message>
     <message>
+        <location line="-346"/>
         <source>create new entry</source>
-        <translation type="obsolete">skapa nytt inlägg</translation>
+        <translation type="unfinished">skapa nytt inlägg</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>pressing the New button you create a new entry
 in the MusE list of defined controllers</source>
-        <translation type="obsolete">skapa nytt inlägg genom att trycka på Ny knappen
+        <translation type="unfinished">skapa nytt inlägg genom att trycka på Ny knappen
 i MusEs lista över definierade controllers</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>&amp;Delete</source>
-        <translation type="obsolete">&amp;Ta bort</translation>
+        <translation type="unfinished">&amp;Ta bort</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>delete selected entry</source>
-        <translation type="obsolete">ta bort valt inlägg</translation>
+        <translation type="unfinished">ta bort valt inlägg</translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>Up</source>
-        <translation type="obsolete">Upp</translation>
+        <translation type="unfinished">Upp</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Down</source>
-        <translation type="obsolete">Ner</translation>
+        <translation type="unfinished">Ner</translation>
     </message>
     <message>
+        <location line="+30"/>
         <source>list of defined controllers</source>
-        <translation type="obsolete">lista med definierade controllers</translation>
+        <translation type="unfinished">lista med definierade controllers</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>This is the MusE list of defined controllers.</source>
-        <translation type="obsolete">Detta är MusEs lista med definierade controllers.</translation>
+        <translation type="unfinished">Detta är MusEs lista med definierade controllers.</translation>
     </message>
     <message>
+        <location line="+10"/>
+        <source>Instrument              </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>steps/count      </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+146"/>
+        <source>&lt;b&gt;Notice!&lt;/b&gt;&lt;br&gt;
+Random Rhythm Generator is not enabled yet!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
         <source>&amp;File</source>
-        <translation type="obsolete">&amp;Arkiv</translation>
+        <translation type="unfinished">&amp;Arkiv</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>&amp;Edit</source>
-        <translation type="obsolete">&amp;Redigera</translation>
+        <translation type="unfinished">&amp;Redigera</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>&amp;Help</source>
-        <translation type="obsolete">&amp;Hjälp</translation>
+        <translation type="unfinished">&amp;Hjälp</translation>
     </message>
     <message>
+        <location line="-43"/>
         <source>Tools</source>
-        <translation type="obsolete">Verktyg</translation>
+        <translation type="unfinished">Verktyg</translation>
     </message>
     <message>
+        <location line="+63"/>
         <source>New</source>
-        <translation type="obsolete">Ny</translation>
+        <translation type="unfinished">Ny</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Ctrl+N</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Open</source>
-        <translation type="obsolete">Öppna</translation>
+        <translation type="unfinished">Öppna</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Open...</source>
-        <translation type="obsolete">&amp;Öppna...</translation>
+        <translation type="unfinished">&amp;Öppna...</translation>
     </message>
     <message>
+        <location line="+6"/>
+        <source>Ctrl+O</source>
+        <translation type="unfinished">Ctrl+Ö</translation>
+    </message>
+    <message>
+        <location line="+15"/>
         <source>Save</source>
-        <translation type="obsolete">Spara</translation>
+        <translation type="unfinished">Spara</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Spara</translation>
+        <translation type="unfinished">&amp;Spara</translation>
     </message>
     <message>
+        <location line="+6"/>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
         <source>Save As</source>
-        <translation type="obsolete">Spara som</translation>
+        <translation type="unfinished">Spara som</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>Save &amp;As...</source>
-        <translation type="obsolete">S&amp;para som...</translation>
+        <translation type="unfinished">S&amp;para som...</translation>
     </message>
     <message>
+        <location line="+21"/>
         <source>Print</source>
-        <translation type="obsolete">Skriv ut</translation>
+        <translation type="unfinished">Skriv ut</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Print...</source>
-        <translation type="obsolete">Skriv &amp;ut...</translation>
+        <translation type="unfinished">Skriv &amp;ut...</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Ctrl+P</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Exit</source>
-        <translation type="obsolete">Stäng</translation>
+        <translation type="unfinished">Stäng</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>E&amp;xit</source>
-        <translation type="obsolete">S&amp;täng</translation>
+        <translation type="unfinished">S&amp;täng</translation>
     </message>
     <message>
+        <location line="+21"/>
         <source>Undo</source>
-        <translation type="obsolete">Ångra</translation>
+        <translation type="unfinished">Ångra</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Undo</source>
-        <translation type="obsolete">&amp;Ångra</translation>
+        <translation type="unfinished">&amp;Ångra</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Ctrl+Z</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Redo</source>
-        <translation type="obsolete">Gör om</translation>
+        <translation type="unfinished">Gör om</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Redo</source>
-        <translation type="obsolete">Gör &amp;om</translation>
+        <translation type="unfinished">Gör &amp;om</translation>
     </message>
     <message>
+        <location line="+6"/>
+        <source>Ctrl+Y</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+15"/>
         <source>Cut</source>
-        <translation type="obsolete">Klipp ut</translation>
+        <translation type="unfinished">Klipp ut</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Cut</source>
-        <translation type="obsolete">Klipp &amp;ut</translation>
+        <translation type="unfinished">Klipp &amp;ut</translation>
     </message>
     <message>
+        <location line="+6"/>
+        <source>Ctrl+X</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+15"/>
         <source>Copy</source>
-        <translation type="obsolete">Kopiera</translation>
+        <translation type="unfinished">Kopiera</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>C&amp;opy</source>
-        <translation type="obsolete">&amp;Öppna</translation>
+        <translation type="unfinished">&amp;Öppna</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Ctrl+C</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Paste</source>
-        <translation type="obsolete">Klistra in</translation>
+        <translation type="unfinished">Klistra in</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Paste</source>
-        <translation type="obsolete">K&amp;listra in</translation>
+        <translation type="unfinished">K&amp;listra in</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Ctrl+V</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Find</source>
-        <translation type="obsolete">Sök</translation>
+        <translation type="unfinished">Sök</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Find...</source>
-        <translation type="obsolete">&amp;Sök...</translation>
+        <translation type="unfinished">&amp;Sök...</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Ctrl+F</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Contents</source>
-        <translation type="obsolete">Innehåll</translation>
+        <translation type="unfinished">Innehåll</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;Contents...</source>
-        <translation type="obsolete">&amp;Innehåll...</translation>
+        <translation type="unfinished">&amp;Innehåll...</translation>
     </message>
     <message>
+        <location line="+14"/>
+        <source>&amp;Index...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Index</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
         <source>About</source>
-        <translation type="obsolete">Om</translation>
+        <translation type="unfinished">Om</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>&amp;About...</source>
-        <translation type="obsolete">&amp;Om...</translation>
+        <translation type="unfinished">&amp;Om...</translation>
     </message>
 </context>
 <context>
     <name>RhythmGenerator</name>
     <message>
+        <location filename="../../muse/mplugins/rhythm.cpp" line="+229"/>
+        <source>Form3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>Instrument Settings:</source>
-        <translation type="obsolete">Instrumentinställningar:</translation>
+        <translation type="unfinished">Instrumentinställningar:</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Instrument</source>
-        <translation type="obsolete">Instrument</translation>
+        <translation type="unfinished">Instrument</translation>
     </message>
     <message>
+        <location line="+4"/>
+        <source>Hi-Hat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>add</source>
-        <translation type="obsolete">lägg till</translation>
+        <translation type="unfinished">lägg till</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>delete</source>
-        <translation type="obsolete">ta bort</translation>
+        <translation type="unfinished">ta bort</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>steps/count</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+21"/>
         <source>count/bar</source>
-        <translation type="obsolete">slag/takt</translation>
+        <translation type="unfinished">slag/takt</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source># bars</source>
-        <translation type="obsolete"># takt</translation>
+        <translation type="unfinished"># takt</translation>
     </message>
     <message>
+        <location line="+34"/>
         <source>Group Settings:</source>
-        <translation type="obsolete">Gruppinställningar:</translation>
+        <translation type="unfinished">Gruppinställningar:</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Group</source>
-        <translation type="obsolete">Grupp</translation>
+        <translation type="unfinished">Grupp</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Group 1</source>
-        <translation type="obsolete">Grupp 1</translation>
+        <translation type="unfinished">Grupp 1</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Group 2</source>
-        <translation type="obsolete">Grupp 2</translation>
+        <translation type="unfinished">Grupp 2</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Group 3</source>
-        <translation type="obsolete">Grupp 3</translation>
+        <translation type="unfinished">Grupp 3</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Group 4</source>
-        <translation type="obsolete">Grupp 4</translation>
+        <translation type="unfinished">Grupp 4</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Group 5</source>
-        <translation type="obsolete">Grupp 5</translation>
+        <translation type="unfinished">Grupp 5</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>contrib</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>listen</source>
-        <translation type="obsolete">lyssna</translation>
+        <translation type="unfinished">lyssna</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>Randomize</source>
-        <translation type="obsolete">Slumpa</translation>
+        <translation type="unfinished">Slumpa</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>Rhythm Style:</source>
-        <translation type="obsolete">Rytmstil:</translation>
+        <translation type="unfinished">Rytmstil:</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Clear</source>
-        <translation type="obsolete">Rensa</translation>
+        <translation type="unfinished">Rensa</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Open...</source>
-        <translation type="obsolete">Öppna...</translation>
+        <translation type="unfinished">Öppna...</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Save</source>
-        <translation type="obsolete">Spara</translation>
+        <translation type="unfinished">Spara</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Save as...</source>
-        <translation type="obsolete">Spara som...</translation>
+        <translation type="unfinished">Spara som...</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Generate</source>
-        <translation type="obsolete">Generera</translation>
+        <translation type="unfinished">Generera</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Close</source>
-        <translation type="obsolete">Stäng</translation>
+        <translation type="unfinished">Stäng</translation>
     </message>
     <message>
         <source></source>
@@ -9336,46 +10914,57 @@ i MusEs lista över definierade controllers</translation>
 <context>
     <name>RouteDialogBase</name>
     <message>
+        <location filename="../../muse/mixer/routedialogbase.ui" line="+20"/>
         <source>MusE: Routing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Add Route</source>
         <translation type="unfinished">Lägg till rutt</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Source:</source>
         <translation type="unfinished">Källa:</translation>
     </message>
     <message>
+        <location line="+24"/>
         <source>Destination:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>Connect</source>
         <translation type="unfinished">Koppla</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>connect source to destination</source>
         <translation type="unfinished">koppla källa till destination</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Current Routes</source>
         <translation type="unfinished">Nuvarande rutter</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Source</source>
         <translation type="unfinished">Källa</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Remove</source>
         <translation type="unfinished">Ta bort</translation>
     </message>
     <message>
+        <location line="-3"/>
         <source>remove selected route</source>
         <translation type="unfinished">Ta bort vald rutt</translation>
     </message>
@@ -9383,66 +10972,57 @@ i MusEs lista över definierade controllers</translation>
 <context>
     <name>SS_PluginChooserBase</name>
     <message>
+        <location filename="../../synti/simpledrums/sspluginchooserbase.ui" line="+16"/>
         <source>SimpleDrums - Ladspa Plugin Chooser</source>
         <translation type="unfinished">SimpleDrums - Ladspa pluginväljare</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Name</source>
         <translation type="unfinished">Namn</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Label</source>
         <translation type="unfinished">Etikett</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Inports</source>
         <translation type="unfinished">Inporta</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Outports</source>
         <translation type="unfinished">Utportar</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Creator</source>
         <translation type="unfinished">Upphovsman</translation>
     </message>
     <message>
+        <location line="+43"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished">&amp;Avbryt</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+C</source>
         <translation type="unfinished">Alt+A</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>&amp;OK</source>
         <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+O</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SS_PluginFront</name>
-    <message>
-        <source>Clear and unload effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Load effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggle display of effect parameters</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Turn effect on/off</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>Score</name>
     <message>
         <source>Dynamics</source>
@@ -9591,14 +11171,17 @@ i MusEs lista över definierade controllers</translation>
 <context>
     <name>ScrollScale</name>
     <message>
+        <location filename="../../muse/widgets/scrollscale.cpp" line="+299"/>
         <source>next page</source>
         <translation>nästa sida</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>previous page</source>
         <translation>förra sidan</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>current page number</source>
         <translation>nuvarande sidnummer</translation>
     </message>
@@ -9606,18 +11189,22 @@ i MusEs lista över definierade controllers</translation>
 <context>
     <name>ShortcutCaptureDialog</name>
     <message>
+        <location filename="../../muse/widgets/shortcutcapturedialog.cpp" line="+30"/>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Cancel</source>
         <translation type="unfinished">Avbryt</translation>
     </message>
     <message>
+        <location line="+52"/>
         <source>Shortcut conflicts with </source>
         <translation type="unfinished">Kortkommando konfliktar med</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Undefined</source>
         <translation type="unfinished">Odefinierad</translation>
     </message>
@@ -9625,30 +11212,38 @@ i MusEs lista över definierade controllers</translation>
 <context>
     <name>ShortcutCaptureDialogBase</name>
     <message>
+        <location filename="../../muse/widgets/shortcutcapturedialogbase.ui" line="+14"/>
         <source>Enter shortcut sequence</source>
         <translation type="unfinished">Ange kortkommandosekvens</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Press keys to enter shortcut sequence!</source>
         <translation type="unfinished">Tryck på tangenter för att ange kortkommandosekvens:</translation>
     </message>
     <message>
+        <location line="+25"/>
         <source>Old shortcut:</source>
         <translation type="unfinished">Gammalt kortkommando</translation>
     </message>
     <message>
+        <location line="+10"/>
+        <location line="+24"/>
         <source>Undefined</source>
         <translation type="unfinished">Odefinierad</translation>
     </message>
     <message>
+        <location line="-10"/>
         <source>New shortcut:</source>
         <translation type="unfinished">Nytt kortkommando</translation>
     </message>
     <message>
+        <location line="+27"/>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Cancel</source>
         <translation type="unfinished">Avbryt</translation>
     </message>
@@ -9656,42 +11251,52 @@ i MusEs lista över definierade controllers</translation>
 <context>
     <name>ShortcutConfigBase</name>
     <message>
+        <location filename="../../muse/widgets/shortcutconfigbase.ui" line="+14"/>
         <source>Configure Keyboard Shortcuts</source>
         <translation type="unfinished">Konfigurera tangentbordskortkommando</translation>
     </message>
     <message>
+        <location line="+34"/>
         <source>Shortcut Category</source>
         <translation type="unfinished">Kortkommandokategori</translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>Description</source>
         <translation type="unfinished">Beskrivning</translation>
     </message>
     <message>
+        <location line="-5"/>
         <source>Shortcut</source>
         <translation type="unfinished">Kortkommando</translation>
     </message>
     <message>
+        <location line="+37"/>
         <source>&amp;Clear</source>
         <translation type="unfinished">&amp;Rensa</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+C</source>
         <translation type="unfinished">Alt+R</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>&amp;Define</source>
         <translation type="unfinished">&amp;Definiera</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>&amp;Apply</source>
         <translation type="unfinished">&amp;Verkställ</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+A</source>
         <translation type="unfinished">Alt+L</translation>
     </message>
@@ -9699,6 +11304,7 @@ i MusEs lista över definierade controllers</translation>
 <context>
     <name>SigScale</name>
     <message>
+        <location filename="../../muse/widgets/sigscale.cpp" line="+27"/>
         <source>signature scale</source>
         <translation>signaturskala</translation>
     </message>
@@ -9706,6 +11312,7 @@ i MusEs lista över definierade controllers</translation>
 <context>
     <name>SimpleDrumsGuiBase</name>
     <message>
+        <location filename="../../synti/simpledrums/simpledrumsguibase.ui" line="+23"/>
         <source>DrumSynth 0.1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9713,25 +11320,25 @@ i MusEs lista över definierade controllers</translation>
 <context>
     <name>SimpleSynthGui</name>
     <message>
+        <location filename="../../synti/simpledrums/simpledrumsgui.cpp" line="+367"/>
         <source>&amp;Load setup</source>
         <translation type="unfinished">&amp;Ladda setup</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>&amp;Save setup</source>
         <translation type="unfinished">&amp;Spara setup</translation>
     </message>
-    <message>
-        <source>Load sample dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>Song</name>
     <message>
+        <location filename="../../muse/song.cpp" line="+2344"/>
         <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:
@@ -9750,55 +11357,71 @@ click on the Restart button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+189"/>
         <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>
-        <source>MusE was unable to launch the script
-</source>
+        <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>
     </message>
@@ -9806,22 +11429,32 @@ click on the Restart button.</source>
 <context>
     <name>SongInfo</name>
     <message>
+        <location filename="../../muse/widgets/songinfo.ui" line="+14"/>
         <source>Song Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+16"/>
+        <source>Show on song load</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished">&amp;Avbryt</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>&amp;Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Alt+O</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9840,54 +11473,68 @@ 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>
     </message>
     <message>
+        <location line="+75"/>
         <source>Soft Synthesizer</source>
         <translation>Mjukvarusynt</translation>
     </message>
     <message>
+        <location line="+46"/>
         <source>File</source>
         <translation>Arkiv</translation>
     </message>
     <message>
+        <location line="-115"/>
         <source>Instances</source>
         <translation>Instanser</translation>
     </message>
     <message>
+        <location line="+10"/>
+        <location line="+115"/>
         <source>Name</source>
         <translation>Namn</translation>
     </message>
     <message>
+        <location line="-17"/>
         <source>list of available software synthesizers</source>
         <translation type="unfinished">lista med tillgängliga mjukvarusyntar</translation>
     </message>
     <message>
+        <location line="-25"/>
         <source>Add Instance</source>
         <translation>Lägg till instans</translation>
     </message>
     <message>
+        <location line="-58"/>
         <source>Remove Instance</source>
         <translation>Ta bort instans</translation>
     </message>
     <message>
+        <location line="-10"/>
         <source>Midi Port</source>
         <translation type="unfinished">Midiport</translation>
     </message>
     <message>
+        <location line="+38"/>
         <source>Midi connections</source>
         <translation type="unfinished">Midikopplingar</translation>
     </message>
     <message>
+        <location line="+67"/>
         <source>Inst</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Description</source>
         <translation type="unfinished">Beskrivning</translation>
     </message>
@@ -9896,33 +11543,40 @@ click on the Restart button.</source>
     <name>TList</name>
     <message>
         <source>Show Gui</source>
-        <translation>Visa Gui</translation>
+        <translation type="obsolete">Visa Gui</translation>
     </message>
     <message>
+        <location filename="../../muse/arranger/tlist.cpp" line="-24"/>
         <source>Add Midi Track</source>
         <translation>Lägg till Midispår</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Add Drum Track</source>
         <translation>Lägg till Trumspår</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Add Wave Track</source>
         <translation>Lägg till Wavespår</translation>
     </message>
     <message>
+        <location line="+289"/>
         <source>Delete Track</source>
         <translation>Ta bort spår</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Track Comment</source>
         <translation>Spårkommentar</translation>
     </message>
     <message>
+        <location line="+428"/>
         <source>Midi</source>
         <translation>Midi</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Drum</source>
         <translation>Trumma</translation>
     </message>
@@ -9954,50 +11608,117 @@ ljudfilerna skall hamna.</translation>
         <translation type="obsolete">Avbryt</translation>
     </message>
     <message>
+        <location line="-1252"/>
         <source>MusE: bad trackname</source>
         <translation type="unfinished">MusE: dåligt spårnamn</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>
     </message>
     <message>
+        <location line="+535"/>
         <source>Add Output</source>
         <translation type="unfinished">Lägg till utgång</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Add Group</source>
         <translation type="unfinished">Lägg till grupp</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Add Input</source>
         <translation type="unfinished">Lägg till ingång</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Add Aux Send</source>
         <translation type="unfinished">Lägg till aux-send</translation>
     </message>
     <message>
+        <location line="-420"/>
+        <location line="+1176"/>
         <source>Update drummap?</source>
         <translation type="unfinished">Updatera trum-map?</translation>
     </message>
     <message>
+        <location line="-1354"/>
+        <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="+173"/>
         <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="+1176"/>
         <source>&amp;Yes</source>
         <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
+        <location line="-1176"/>
+        <location line="+1176"/>
         <source>&amp;No</source>
         <translation type="unfinished">&amp;Nej</translation>
     </message>
     <message>
+        <location line="-1099"/>
+        <location line="+53"/>
+        <source>show gui</source>
+        <translation type="unfinished">visa gui</translation>
+    </message>
+    <message>
+        <location line="-44"/>
+        <location line="+53"/>
+        <source>show native gui</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+394"/>
+        <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="+610"/>
         <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>
     <message>
+        <location line="-1386"/>
         <source>&lt;none&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10005,6 +11726,7 @@ ljudfilerna skall hamna.</translation>
 <context>
     <name>TempoSig</name>
     <message>
+        <location filename="../../muse/transport.cpp" line="+103"/>
         <source>Tempo/Sig</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10012,49 +11734,54 @@ ljudfilerna skall hamna.</translation>
 <context>
     <name>Toolbar1</name>
     <message>
+        <location filename="../../muse/widgets/tb1.cpp" line="+21"/>
         <source>Solo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Cursor</source>
         <translation>Markör</translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Snap</source>
         <translation>Fäst vid</translation>
     </message>
     <message>
         <source>Quantize</source>
-        <translation>Kvantisera</translation>
+        <translation type="obsolete">Kvantisera</translation>
     </message>
     <message>
         <source>To</source>
-        <translation>Till</translation>
+        <translation type="obsolete">Till</translation>
     </message>
     <message>
         <source>All Events</source>
-        <translation>Alla Händelser</translation>
+        <translation type="obsolete">Alla Händelser</translation>
     </message>
     <message>
         <source>Looped Ev.</source>
-        <translation>Loopade Händelser.</translation>
+        <translation type="obsolete">Loopade Händelser.</translation>
     </message>
     <message>
         <source>Selected Ev.</source>
-        <translation>Valda Händelser.</translation>
+        <translation type="obsolete">Valda Händelser.</translation>
     </message>
     <message>
         <source>Looped+Sel.</source>
-        <translation>Loopade och Valda.</translation>
+        <translation type="obsolete">Loopade och Valda.</translation>
     </message>
 </context>
 <context>
     <name>TrackComment</name>
     <message>
+        <location filename="../../muse/widgets/comment.cpp" line="+41"/>
         <source>MusE: Track Comment</source>
         <translation>MusE: Spårkommentar</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Track Comment:</source>
         <translation>Spårkommentar:</translation>
     </message>
@@ -10062,122 +11789,156 @@ 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>
     </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>
     </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>
     </message>
     <message>
+        <location line="+12"/>
         <source>Right Mark</source>
         <translation>Höger Markering</translation>
     </message>
     <message>
+        <location line="+47"/>
         <source>rewind to start</source>
         <translation>flytta tillbaka till början</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>rewind</source>
         <translation>flytta tillbaka</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>forward</source>
         <translation>frammåt</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>stop</source>
         <translation>stopp</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>play</source>
         <translation>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>
     </message>
     <message>
+        <location line="+0"/>
         <source>quantize during record</source>
         <translation>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>
     </message>
     <message>
+        <location line="+3"/>
         <source>Sync</source>
         <translation>Synk</translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>external sync on/off</source>
         <translation>externsynk. av/på</translation>
     </message>
     <message>
+        <location line="+45"/>
         <source>Master</source>
         <translation>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>
     </message>
@@ -10186,52 +11947,51 @@ ljudfilerna skall hamna.</translation>
     <name>TransposeDialogBase</name>
     <message>
         <source>MusE: Midi Transpose</source>
-        <translation>MusE: Miditransponering</translation>
+        <translation type="obsolete">MusE: Miditransponering</translation>
     </message>
     <message>
         <source>Value</source>
-        <translation>Värde</translation>
+        <translation type="obsolete">Värde</translation>
     </message>
     <message>
         <source>halftones</source>
-        <translation>halvtoner</translation>
+        <translation type="obsolete">halvtoner</translation>
     </message>
     <message>
         <source>Time</source>
-        <translation>Tid</translation>
+        <translation type="obsolete">Tid</translation>
     </message>
     <message>
         <source>all</source>
-        <translation>alla</translation>
+        <translation type="obsolete">alla</translation>
     </message>
     <message>
         <source>between markers</source>
-        <translation>mellan markeringar</translation>
+        <translation type="obsolete">mellan markeringar</translation>
     </message>
     <message>
         <source>Parts</source>
-        <translation>Parter</translation>
+        <translation type="obsolete">Parter</translation>
     </message>
     <message>
         <source>all in selected tracks</source>
-        <translation>alla i valda spår</translation>
-    </message>
-    <message>
-        <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">alla i valda spår</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Avbryt</translation>
+        <translation type="obsolete">Avbryt</translation>
     </message>
 </context>
 <context>
     <name>VAMGui</name>
     <message>
+        <location filename="../../synti/vam/vamgui.cpp" line="+679"/>
+        <location line="+18"/>
         <source>MusE: Save VAM Presets</source>
         <translation type="unfinished">MusE: Spara VAM presets</translation>
     </message>
     <message>
+        <location line="-128"/>
         <source>MusE: Load VAM Presets</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10239,134 +11999,190 @@ ljudfilerna skall hamna.</translation>
 <context>
     <name>VAMGuiBase</name>
     <message>
+        <location filename="../../synti/vam/vamguibase.ui" line="+23"/>
         <source>Virtual Analogue for MusE</source>
         <translation type="unfinished">Virtual Analogue för MusE</translation>
     </message>
     <message>
+        <location line="+66"/>
+        <location line="+950"/>
+        <location line="+177"/>
         <source>Waveform</source>
         <translation type="unfinished">Vågform</translation>
     </message>
     <message>
+        <location line="-1116"/>
+        <location line="+956"/>
+        <location line="+177"/>
         <source>Sine</source>
         <translation type="unfinished">Sinus</translation>
     </message>
     <message>
+        <location line="-1128"/>
+        <location line="+956"/>
+        <location line="+177"/>
         <source>Pulse</source>
         <translation type="unfinished">Puls</translation>
     </message>
     <message>
+        <location line="-1128"/>
+        <location line="+956"/>
+        <location line="+177"/>
         <source>Saw</source>
         <translation type="unfinished">Sågtand</translation>
     </message>
     <message>
+        <location line="-1128"/>
+        <location line="+956"/>
+        <location line="+177"/>
         <source>Triangle</source>
         <translation type="unfinished">Triangel</translation>
     </message>
     <message>
+        <location line="-1122"/>
         <source>Filter</source>
         <translation type="unfinished">Filter</translation>
     </message>
     <message>
+        <location line="+184"/>
         <source>Invert</source>
         <translation type="unfinished">Invertera</translation>
     </message>
     <message>
+        <location line="+166"/>
         <source>Presets</source>
         <translation type="unfinished">Preset</translation>
     </message>
     <message>
+        <location line="+78"/>
         <source>load preset list</source>
         <translation type="unfinished">öppna presetlista</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>save preset list</source>
         <translation type="unfinished">spara presetlista</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>save preset list to a new file</source>
         <translation type="unfinished">spara presetlista till ny fil</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>delete preset</source>
         <translation type="unfinished">ta bort preset</translation>
     </message>
     <message>
+        <location line="+53"/>
+        <location line="+538"/>
         <source>Pitch</source>
         <translation type="unfinished">Tonhöjd</translation>
     </message>
     <message>
+        <location line="+219"/>
         <source>On</source>
         <translation type="unfinished">På</translation>
     </message>
     <message>
+        <location line="-1377"/>
         <source>LFO</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Freq</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+91"/>
         <source>EnvMod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
+        <location line="+717"/>
+        <location line="+427"/>
         <source>Attack</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-1134"/>
+        <location line="+645"/>
+        <location line="+531"/>
         <source>Decay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-1166"/>
+        <location line="+677"/>
+        <location line="+531"/>
         <source>Sustain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-1198"/>
+        <location line="+677"/>
+        <location line="+401"/>
         <source>Release</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-972"/>
         <source>Cutoff</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Resonance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>KeyTrack</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+218"/>
         <source>Set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+102"/>
         <source>DCO 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+44"/>
+        <location line="+480"/>
         <source>Detune</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-374"/>
+        <location line="+473"/>
         <source>PWM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-391"/>
+        <location line="+266"/>
         <source>FM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-240"/>
+        <location line="+501"/>
         <source>PW</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-314"/>
         <source>DCO 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message utf8="true">
+        <location line="+446"/>
         <source>VAM 1.0beta3
 Virtual Analog for MusE
 Released under GPL.
@@ -10383,58 +12199,51 @@ Robert Jonsson
     <name>VelocityBase</name>
     <message>
         <source>MusE: Modify Velocity</source>
-        <translation>MusE: Modifiera Velocity</translation>
+        <translation type="obsolete">MusE: Modifiera Velocity</translation>
     </message>
     <message>
         <source>Range</source>
-        <translation>Område</translation>
+        <translation type="obsolete">Område</translation>
     </message>
     <message>
         <source>All Events</source>
-        <translation>Alla Händelser</translation>
+        <translation type="obsolete">Alla Händelser</translation>
     </message>
     <message>
         <source>Selected Events</source>
-        <translation>Valda Händelser</translation>
+        <translation type="obsolete">Valda Händelser</translation>
     </message>
     <message>
         <source>Looped Events</source>
-        <translation>Loopade Händelser</translation>
+        <translation type="obsolete">Loopade Händelser</translation>
     </message>
     <message>
         <source>Selected &amp; Looped</source>
-        <translation>Valda &amp; Loopade</translation>
+        <translation type="obsolete">Valda &amp; Loopade</translation>
     </message>
     <message>
         <source>Values</source>
-        <translation>Värden</translation>
+        <translation type="obsolete">Värden</translation>
     </message>
     <message>
         <source>Rate:</source>
-        <translation>Hastighet:</translation>
+        <translation type="obsolete">Hastighet:</translation>
     </message>
     <message>
         <source>Offset:</source>
-        <translation>Offset:</translation>
-    </message>
-    <message>
-        <source>%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Offset:</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Avbryt</translation>
+        <translation type="obsolete">Avbryt</translation>
     </message>
 </context>
 <context>
     <name>WTScale</name>
     <message>
+        <location filename="../../muse/widgets/wtscale.cpp" line="+29"/>
         <source>bar scale</source>
-        <translation type="obsolete">takt-skala</translation>
+        <translation type="unfinished">takt-skala</translation>
     </message>
 </context>
 <context>
@@ -10452,97 +12261,135 @@ Robert Jonsson
         <translation type="obsolete">Normalisera</translation>
     </message>
     <message>
+        <location filename="../../muse/waveedit/waveedit.cpp" line="+180"/>
         <source>Solo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Cursor</source>
         <translation>Markör</translation>
     </message>
     <message>
+        <location line="-109"/>
         <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="+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>
     </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>
     </message>
     <message>
+        <location line="+30"/>
+        <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="+6"/>
         <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="+22"/>
+        <source>WaveEdit tools</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-28"/>
         <source>Select</source>
         <translation type="unfinished">Välj</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>Wave edit tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>transport</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Pianoroll tools</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>WaveTrackInfoBase</name>
@@ -10574,10 +12421,12 @@ 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>
     </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
@@ -10588,10 +12437,12 @@ 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.
 
@@ -10609,230 +12460,288 @@ Saknat data tystas</translation>
         <translation type="obsolete">Rumstorlek</translation>
     </message>
     <message>
+        <location filename="../plugins/1050.ui" line="+126"/>
         <source>Damping</source>
         <translation type="unfinished">Dämpning</translation>
     </message>
     <message>
+        <location line="-106"/>
         <source>FreeVerb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+18"/>
         <source>Room Size</source>
         <translation type="unfinished">Rumsstorlek</translation>
     </message>
     <message>
+        <location line="+148"/>
         <source>Wet Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../plugins/2142.ui" line="+26"/>
         <source>Tap-Reverberator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Decay [ms]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+59"/>
+        <location line="+41"/>
         <source>dB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-31"/>
         <source>Dry Level [dB]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+41"/>
         <source>Wet Level [dB]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+72"/>
         <source>Preset:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>AfterBurn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>AfterBurn (Long)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Ambience</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Ambience (Thick)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Ambience (Thick) - HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Cathedral</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Cathedral - HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Drum Chamber</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Garage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Garage (Bright)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Gymnasium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Gymnasium (Bright)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Gymnasium (Bright) - HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Hall (Small)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Hall (Medium)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Hall (Large)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Hall (Large) - HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Plate (Small)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Plate (Medium)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Plate (Large)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Plate (Large) - HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Pulse Chamber</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Pulse Chamber (Reverse)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Resonator (96 ms)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Resonator (152 ms)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Resonator (208 ms)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Room (Small)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Room (Medium)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Room (Large)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Room (Large) - HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Slap Chamber</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Slap Chamber - HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Slap Chamber (Bright)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Slap Chamber (Bright) HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Smooth Hall (Small)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Smooth Hall (Medium)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Smooth Hall (Large)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Smooth Hall (Large) - HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Vocal Plate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Vocal Plate - HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Warble Chamber</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Warehoouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Warehouse - HD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Comb Filters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Allpass Filters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Bandpass Filters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Enhanced Stereo</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/muse2/share/templates/audio.med b/muse2/share/templates/audio.med
index 14cd9c47..35f5d8f5 100644
--- a/muse2/share/templates/audio.med
+++ b/muse2/share/templates/audio.med
@@ -33,7 +33,7 @@
       <info>1</info>
       <split>298 298 </split>
       <list>
-        <header> 7 6 5 4 3 2 1 0 8 </header>
+        <header> 9 8 7 6 5 4 3 2 1 0 </header>
         </list>
       <xpos>0</xpos>
       <xmag>266</xmag>
@@ -309,7 +309,7 @@
     <scoreedit>
       <width>880</width>
       <height>466</height>
-      <toolbars>000000ff00000000fd00000000000003700000018500000004000000040000000800000008fc0000000200000002000000030000001e0055006e0064006f002f005200650064006f00200074006f006f006c00730100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000040ffffffff000000000000000000000022004e006500770020006e006f00740065002000730065007400740069006e006700730100000099ffffffff000000000000000000000002000000030000002a005100750061006e007400690073006100740069006f006e002000730065007400740069006e0067007301000000000000024a000000000000000000000012007400720061006e00730070006f00720074010000024a000000fc00000000000000000000000a00700061006e0069006301000003460000011f0000000000000000</toolbars>
+      <toolbars>000000ff00000000fd00000000000003700000018500000004000000040000000800000008fc0000000200000002000000040000001e0055006e0064006f002f005200650064006f00200074006f006f006c00730100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000040ffffffff00000000000000000000002800530074006500700020007200650063006f007200640069006e006700200074006f006f006c00730100000099ffffffff000000000000000000000022004e006500770020006e006f00740065002000730065007400740069006e0067007301000000d9ffffffff000000000000000000000002000000030000002a005100750061006e007400690073006100740069006f006e002000730065007400740069006e0067007301000000000000024a000000000000000000000012007400720061006e00730070006f00720074010000024a000000ff00000000000000000000000a00700061006e006900630100000349ffffffff0000000000000000</toolbars>
       </scoreedit>
     <masteredit>
       <raster>0</raster>
diff --git a/muse2/share/templates/default.med b/muse2/share/templates/default.med
index 8772f759..11d2f33a 100644
--- a/muse2/share/templates/default.med
+++ b/muse2/share/templates/default.med
@@ -33,7 +33,7 @@
       <info>1</info>
       <split>418 456 </split>
       <list>
-        <header> 8 7 6 5 4 3 2 1 0 </header>
+        <header> 9 8 7 6 5 4 3 2 1 0 </header>
         </list>
       <xpos>0</xpos>
       <xmag>266</xmag>
@@ -309,7 +309,7 @@
     <scoreedit>
       <width>880</width>
       <height>466</height>
-      <toolbars>000000ff00000000fd00000000000003700000018500000004000000040000000800000008fc0000000200000002000000030000001e0055006e0064006f002f005200650064006f00200074006f006f006c00730100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000040ffffffff000000000000000000000022004e006500770020006e006f00740065002000730065007400740069006e006700730100000099ffffffff000000000000000000000002000000030000002a005100750061006e007400690073006100740069006f006e002000730065007400740069006e0067007301000000000000024a000000000000000000000012007400720061006e00730070006f00720074010000024a000000fc00000000000000000000000a00700061006e0069006301000003460000011f0000000000000000</toolbars>
+      <toolbars>000000ff00000000fd00000000000003700000018500000004000000040000000800000008fc0000000200000002000000040000001e0055006e0064006f002f005200650064006f00200074006f006f006c00730100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000040ffffffff00000000000000000000002800530074006500700020007200650063006f007200640069006e006700200074006f006f006c00730100000099ffffffff000000000000000000000022004e006500770020006e006f00740065002000730065007400740069006e0067007301000000d9ffffffff000000000000000000000002000000030000002a005100750061006e007400690073006100740069006f006e002000730065007400740069006e0067007301000000000000024a000000000000000000000012007400720061006e00730070006f00720074010000024a000000ff00000000000000000000000a00700061006e006900630100000349ffffffff0000000000000000</toolbars>
       </scoreedit>
     <masteredit>
       <raster>0</raster>
diff --git a/muse2/share/templates/midiGM.med b/muse2/share/templates/midiGM.med
index bbc04498..2fc6bc77 100644
--- a/muse2/share/templates/midiGM.med
+++ b/muse2/share/templates/midiGM.med
@@ -33,7 +33,7 @@
       <info>1</info>
       <split>298 298 </split>
       <list>
-        <header> 7 6 5 4 3 2 1 0 8 </header>
+        <header> 9 8 7 6 5 4 3 2 1 0 </header>
         </list>
       <xpos>0</xpos>
       <xmag>266</xmag>
@@ -357,7 +357,7 @@
     <scoreedit>
       <width>880</width>
       <height>466</height>
-      <toolbars>000000ff00000000fd00000000000003700000018500000004000000040000000800000008fc0000000200000002000000030000001e0055006e0064006f002f005200650064006f00200074006f006f006c00730100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000040ffffffff000000000000000000000022004e006500770020006e006f00740065002000730065007400740069006e006700730100000099ffffffff000000000000000000000002000000030000002a005100750061006e007400690073006100740069006f006e002000730065007400740069006e0067007301000000000000024a000000000000000000000012007400720061006e00730070006f00720074010000024a000000fc00000000000000000000000a00700061006e0069006301000003460000011f0000000000000000</toolbars>
+      <toolbars>000000ff00000000fd00000000000003700000018500000004000000040000000800000008fc0000000200000002000000040000001e0055006e0064006f002f005200650064006f00200074006f006f006c00730100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000040ffffffff00000000000000000000002800530074006500700020007200650063006f007200640069006e006700200074006f006f006c00730100000099ffffffff000000000000000000000022004e006500770020006e006f00740065002000730065007400740069006e0067007301000000d9ffffffff000000000000000000000002000000030000002a005100750061006e007400690073006100740069006f006e002000730065007400740069006e0067007301000000000000024a000000000000000000000012007400720061006e00730070006f00720074010000024a000000ff00000000000000000000000a00700061006e006900630100000349ffffffff0000000000000000</toolbars>
       </scoreedit>
     <masteredit>
       <raster>0</raster>
diff --git a/muse2/share/templates/monorecord.med b/muse2/share/templates/monorecord.med
index fc8b324c..bcb469f5 100644
--- a/muse2/share/templates/monorecord.med
+++ b/muse2/share/templates/monorecord.med
@@ -309,7 +309,7 @@
     <scoreedit>
       <width>880</width>
       <height>466</height>
-      <toolbars>000000ff00000000fd00000000000003700000018500000004000000040000000800000008fc0000000200000002000000030000001e0055006e0064006f002f005200650064006f00200074006f006f006c00730100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000040ffffffff000000000000000000000022004e006500770020006e006f00740065002000730065007400740069006e006700730100000099ffffffff000000000000000000000002000000030000002a005100750061006e007400690073006100740069006f006e002000730065007400740069006e0067007301000000000000024a000000000000000000000012007400720061006e00730070006f00720074010000024a000000fc00000000000000000000000a00700061006e0069006301000003460000011f0000000000000000</toolbars>
+      <toolbars>000000ff00000000fd00000000000003700000018500000004000000040000000800000008fc0000000200000002000000040000001e0055006e0064006f002f005200650064006f00200074006f006f006c00730100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000040ffffffff00000000000000000000002800530074006500700020007200650063006f007200640069006e006700200074006f006f006c00730100000099ffffffff000000000000000000000022004e006500770020006e006f00740065002000730065007400740069006e0067007301000000d9ffffffff000000000000000000000002000000030000002a005100750061006e007400690073006100740069006f006e002000730065007400740069006e0067007301000000000000024a000000000000000000000012007400720061006e00730070006f00720074010000024a000000ff00000000000000000000000a00700061006e006900630100000349ffffffff0000000000000000</toolbars>
       </scoreedit>
     <masteredit>
       <raster>0</raster>
diff --git a/muse2/share/templates/synti.med b/muse2/share/templates/synti.med
index 1a14a9ce..da39fee0 100644
--- a/muse2/share/templates/synti.med
+++ b/muse2/share/templates/synti.med
@@ -33,7 +33,7 @@
       <info>0</info>
       <split>298 298 </split>
       <list>
-        <header> 7 6 5 4 3 2 1 0 8 </header>
+        <header> 9 8 7 6 5 4 3 2 1 0 </header>
         </list>
       <xpos>0</xpos>
       <xmag>266</xmag>
@@ -712,7 +712,7 @@
     <scoreedit>
       <width>880</width>
       <height>466</height>
-      <toolbars>000000ff00000000fd00000000000003700000018500000004000000040000000800000008fc0000000200000002000000030000001e0055006e0064006f002f005200650064006f00200074006f006f006c00730100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000040ffffffff000000000000000000000022004e006500770020006e006f00740065002000730065007400740069006e006700730100000099ffffffff000000000000000000000002000000030000002a005100750061006e007400690073006100740069006f006e002000730065007400740069006e0067007301000000000000024a000000000000000000000012007400720061006e00730070006f00720074010000024a000000fc00000000000000000000000a00700061006e0069006301000003460000011f0000000000000000</toolbars>
+      <toolbars>000000ff00000000fd00000000000003700000018500000004000000040000000800000008fc0000000200000002000000040000001e0055006e0064006f002f005200650064006f00200074006f006f006c00730100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000040ffffffff00000000000000000000002800530074006500700020007200650063006f007200640069006e006700200074006f006f006c00730100000099ffffffff000000000000000000000022004e006500770020006e006f00740065002000730065007400740069006e0067007301000000d9ffffffff000000000000000000000002000000030000002a005100750061006e007400690073006100740069006f006e002000730065007400740069006e0067007301000000000000024a000000000000000000000012007400720061006e00730070006f00720074010000024a000000ff00000000000000000000000a00700061006e006900630100000349ffffffff0000000000000000</toolbars>
       </scoreedit>
     <masteredit>
       <raster>0</raster>
diff --git a/muse2/synti/deicsonze/deicsonzegui.h b/muse2/synti/deicsonze/deicsonzegui.h
index 50fb55f6..4c3d5e8e 100644
--- a/muse2/synti/deicsonze/deicsonzegui.h
+++ b/muse2/synti/deicsonze/deicsonzegui.h
@@ -120,6 +120,8 @@ class QTreePreset:public QTreeWidgetItem {
 //   DeicsOnzeGui
 //---------------------------------------------------------
 class DeicsOnzeGui : public QDialog, public Ui::DeicsOnzeGuiBase, public MessGui {
+    Q_OBJECT
+    
     bool _enabledPreset;
 
     QFramePitchEnvelope* pitchEnvelopeGraph;
@@ -134,7 +136,7 @@ class DeicsOnzeGui : public QDialog, public Ui::DeicsOnzeGuiBase, public MessGui
     std::vector<FloatEntry*> _reverbFloatEntryVector;
     std::vector<CheckBox*> _reverbCheckBoxVector;
 
-    Q_OBJECT
+    
     QString lastDir;
   private slots:
     void readMessage(int);
diff --git a/muse2/synti/deicsonze/deicsonzeplugin.cpp b/muse2/synti/deicsonze/deicsonzeplugin.cpp
index 36684f5f..54eee202 100644
--- a/muse2/synti/deicsonze/deicsonzeplugin.cpp
+++ b/muse2/synti/deicsonze/deicsonzeplugin.cpp
@@ -406,7 +406,7 @@ void DeicsOnzeGui::setChorusCheckBox(double v, int i) {
   else printf("setChorusCheckBox Error : cannot send controller upper than 225\n");
 }
 
-void DeicsOnzeGui::setReverbFloatEntry(double v, int i) {
+void DeicsOnzeGui::setReverbFloatEntry(double /*v*/, int /*i*/) {
   if(_deicsOnze->_pluginIReverb) {
     
 // FIXME FIXME Tim
@@ -420,7 +420,7 @@ void DeicsOnzeGui::setReverbFloatEntry(double v, int i) {
   }
   else printf("Warning : no DeicsOnze reverb loaded\n");
 }
-void DeicsOnzeGui::setReverbSlider(double v, int i) {
+void DeicsOnzeGui::setReverbSlider(double /*v*/, int /*i*/) {
   if(_deicsOnze->_pluginIReverb) {
     
 // FIXME FIXME Tim
@@ -434,7 +434,7 @@ void DeicsOnzeGui::setReverbSlider(double v, int i) {
   }
   else printf("Warning : no DeicsOnze reverb loaded\n");
 }
-void DeicsOnzeGui::setChorusFloatEntry(double v, int i) {
+void DeicsOnzeGui::setChorusFloatEntry(double /*v*/, int /*i*/) {
   if(_deicsOnze->_pluginIReverb) {
     
 // FIXME FIXME Tim
@@ -448,7 +448,7 @@ void DeicsOnzeGui::setChorusFloatEntry(double v, int i) {
   }
   else printf("Warning : no DeicsOnze chorus loaded\n");
 }
-void DeicsOnzeGui::setChorusSlider(double v, int i) {
+void DeicsOnzeGui::setChorusSlider(double /*v*/, int /*i*/) {
   if(_deicsOnze->_pluginIReverb) {  
     
 // FIXME FIXME Tim
diff --git a/muse2/synti/vam/vamgui.h b/muse2/synti/vam/vamgui.h
index 2271c8aa..b5906ae8 100644
--- a/muse2/synti/vam/vamgui.h
+++ b/muse2/synti/vam/vamgui.h
@@ -38,6 +38,8 @@ class QSignalMapper;
 //---------------------------------------------------------
 
 class VAMGui : public QWidget, public Ui::VAMGuiBase, public MessGui {
+      Q_OBJECT
+    
       QSignalMapper* map;
       int ctrlHi;
       int ctrlLo;
@@ -46,7 +48,7 @@ class VAMGui : public QWidget, public Ui::VAMGuiBase, public MessGui {
       SynthGuiCtrl dctrl[NUM_CONTROLLER];
       QString * presetFileName;
 
-      Q_OBJECT
+      
       void sendControllerChange(int ctrl, int val);
       void initParameter();
       void setParam(int, int);