Merge pull request #2 from corrados/master

update
2020-06-08 18:43:28 +02:00 · 2020-06-08 18:43:28 +02:00 · 871e0827b3
commit 871e0827b3
parent 88064b5d20 bde6e0b296
18 changed files with 533 additions and 423 deletions
--- a/9
+++ b/9
@ -6,6 +6,8 @@

 3.5.6git

+- support sorting faders by channel name (#178)
+
 - enable/disable recording from command line, coded by pljones (#228)

 - add Audacity "list of files" writer to jam recorder, by pljones (#315)
@ -24,6 +26,13 @@
  by OS level Nap, Sleep, and Thread Priority systems, coded by AronVietti (#23)


+TODO fix Windows installer: fix check for app run, fix Qt dlls missing
+
+
+
+
+
+


 3.5.5 (2020-05-26)
--- a/distributions/debian/changelog
+++ b/distributions/debian/changelog
@ -1,4 +1,4 @@
-jamulus (3.5.2) UNRELEASED; urgency=medium
+jamulus (3.5.6~git-0) UNRELEASED; urgency=medium

  * Initial release.

--- a/distributions/debian/copyright
+++ b/distributions/debian/copyright
@ -9,8 +9,9 @@ License: GPL-2

 Files: debian/*
 Copyright:
+ 2020 Tormod Volden <debian.tormod@gmail.com>
 2020 Olivier Humbert <trebmuh@tuxfamily.org>
- 2019 "Marc Landolt jr" <debian@marclandolt.ch>
+ 2019 Marc Landolt jr <debian@marclandolt.ch>
 License: GPL-2

 License: GPL-2
--- a/distributions/debian/jamulus.install
+++ b/distributions/debian/jamulus.install
@ -0,0 +1 @@
+distributions/jamulus-server.service lib/systemd/system
--- a/distributions/debian/rules
+++ b/distributions/debian/rules
@ -3,19 +3,8 @@
 	dh $@

 override_dh_auto_configure:
-	qmake CONFIG+=noupcasename Jamulus.pro
+	qmake CONFIG+=noupcasename PREFIX=/usr Jamulus.pro

 override_dh_auto_build:
 	cd src/res/translation && lrelease *.ts
 	dh_auto_build
-
-override_dh_usrlocal:
-	echo $$(pwd)
-	mkdir -p $$(pwd)/debian/jamulus/usr/bin/
-	install -D -m 0755 jamulus $$(pwd)/debian/jamulus/usr/bin/
-	mkdir -p $$(pwd)/debian/jamulus/usr/share/applications/
-	install -D -m 0755 $$(pwd)/distributions/jamulus.desktop $$(pwd)/debian/jamulus/usr/share/applications/
-	mkdir -p $$(pwd)/debian/jamulus/usr/share/icons/hicolor/512x512/apps/
-	cp $$(pwd)/distributions/jamulus.png $$(pwd)/debian/jamulus/usr/share/icons/hicolor/512x512/apps/
-	mkdir -p $$(pwd)/debian/jamulus/lib/systemd/system
-	cp $$(pwd)/distributions/jamulus-server.service $$(pwd)/debian/jamulus/lib/systemd/system/
--- a/distributions/debian/source/format
+++ b/distributions/debian/source/format
@ -0,0 +1 @@
+3.0 (quilt)
--- a/src/audiomixerboard.cpp
+++ b/src/audiomixerboard.cpp
@ -28,8 +28,7 @@
 /******************************************************************************\
 * CChanneFader                                                                 *
 \******************************************************************************/
-CChannelFader::CChannelFader ( QWidget*     pNW,
-                               QHBoxLayout* pParentLayout )
+CChannelFader::CChannelFader ( QWidget* pNW )
 {
    // create new GUI control objects and store pointers to them (note that
    // QWidget takes the ownership of the pMainGrid so that this only has
@ -120,9 +119,6 @@ CChannelFader::CChannelFader ( QWidget*     pNW,
    pMainGrid->addWidget ( pMuteSoloBox, 0, Qt::AlignHCenter );
    pMainGrid->addWidget ( pLabelInstBox );

-    // add fader frame to audio mixer board layout
-    pParentLayout->addWidget( pFrame );
-
    // reset current fader
    Reset();

@ -430,15 +426,21 @@ void CChannelFader::SetChannelLevel ( const uint16_t iLevel )
    plbrChannelLevel->setValue ( iLevel );
 }

-void CChannelFader::SetText ( const CChannelInfo& ChanInfo )
+void CChannelFader::SetChannelInfos ( const CChannelInfo& cChanInfo )
 {
+    // init properties for the tool tip
+    int              iTTInstrument = CInstPictures::GetNotUsedInstrument();
+    QLocale::Country eTTCountry    = QLocale::AnyCountry;
+
+
+    // Label text --------------------------------------------------------------
    // store original received name
-    strReceivedName = ChanInfo.strName;
+    strReceivedName = cChanInfo.strName;

    // break text at predefined position
    const int iBreakPos = MAX_LEN_FADER_TAG / 2;

-    QString strModText = ChanInfo.strName;
+    QString strModText = cChanInfo.strName;

    if ( strModText.length() > iBreakPos )
    {
@ -446,13 +448,6 @@ void CChannelFader::SetText ( const CChannelInfo& ChanInfo )
    }

    plblLabel->setText ( strModText );
-}
-
-void CChannelFader::SetChannelInfos ( const CChannelInfo& cChanInfo )
-{
-    // init properties for the tool tip
-    int              iTTInstrument = CInstPictures::GetNotUsedInstrument();
-    QLocale::Country eTTCountry    = QLocale::AnyCountry;


    // Instrument picture ------------------------------------------------------
@ -630,8 +625,11 @@ CAudioMixerBoard::CAudioMixerBoard ( QWidget* parent, Qt::WindowFlags ) :

    for ( int i = 0; i < MAX_NUM_CHANNELS; i++ )
    {
-        vecpChanFader[i] = new CChannelFader ( this, pMainLayout );
+        vecpChanFader[i] = new CChannelFader ( this );
        vecpChanFader[i]->Hide();
+
+        // add fader frame to audio mixer board layout
+        pMainLayout->addWidget ( vecpChanFader[i]->GetMainWidget() );
    }

    // insert horizontal spacer
@ -759,10 +757,42 @@ void CAudioMixerBoard::HideAll()
    bNoFaderVisible = true;
    iMyChannelID    = INVALID_INDEX;

+    // use original order of channel (by server ID)
+    ChangeFaderOrder ( false );
+
    // emit status of connected clients
    emit NumClientsChanged ( 0 ); // -> no clients connected
 }

+void CAudioMixerBoard::ChangeFaderOrder ( const bool bDoSort )
+{
+// TODO better solution to sort by names and get the indexes after sorting (here
+// we utilize the "data" property to store the original ID value)
+    QListWidget ListWidget;
+    for ( int i = 0; i < MAX_NUM_CHANNELS; i++ )
+    {
+        // fill list widget (used for sorting the channels)
+        QListWidgetItem* pNewItem = new QListWidgetItem ( vecpChanFader[i]->GetReceivedName() );
+        pNewItem->setData ( Qt::UserRole, i );
+        ListWidget.addItem ( pNewItem );
+
+        // remove channels from layout (note that we keep the spacer on the right side)
+        pMainLayout->removeWidget ( vecpChanFader[i]->GetMainWidget() );
+    }
+    if ( bDoSort )
+    {
+        ListWidget.sortItems();
+    }
+
+    // add channels to the layout in the new order (since we insert on the left, we
+    // have to use a backwards counting loop)
+    for ( int i = MAX_NUM_CHANNELS - 1; i >= 0; i-- )
+    {
+        // add fader frame to the audio mixer board layout
+        pMainLayout->insertWidget ( 0, vecpChanFader[ListWidget.item ( i )->data ( Qt::UserRole ).toInt()]->GetMainWidget() );
+    }
+}
+
 void CAudioMixerBoard::ApplyNewConClientList ( CVector<CChannelInfo>& vecChanInfo )
 {
    // we want to set the server name only if the very first faders appear
@ -841,10 +871,7 @@ void CAudioMixerBoard::ApplyNewConClientList ( CVector<CChannelInfo>& vecChanInf
                    }
                }

-                // set the text in the fader
-                vecpChanFader[i]->SetText ( vecChanInfo[j] );
-
-                // update other channel infos
+                // set the channel infos
                vecpChanFader[i]->SetChannelInfos ( vecChanInfo[j] );

                bFaderIsUsed = true;
--- a/src/audiomixerboard.h
+++ b/src/audiomixerboard.h
@ -35,6 +35,7 @@
 #include <QDial>
 #include <QSizePolicy>
 #include <QHostAddress>
+#include <QListWidget>
 #include "global.h"
 #include "util.h"
 #include "multicolorledbar.h"
@ -46,9 +47,8 @@ class CChannelFader : public QObject
    Q_OBJECT

 public:
-    CChannelFader ( QWidget* pNW, QHBoxLayout* pParentLayout );
+    CChannelFader ( QWidget* pNW );

-    void SetText ( const CChannelInfo& ChanInfo );
    QString GetReceivedName() { return strReceivedName; }
    void SetChannelInfos ( const CChannelInfo& cChanInfo );
    void Show() { pFrame->show(); }
@ -60,6 +60,7 @@ public:
    void SetDisplayChannelLevel ( const bool eNDCL );
    bool GetDisplayChannelLevel();
    void SetDisplayPans ( const bool eNDP );
+    QFrame* GetMainWidget() { return pFrame; }

    void UpdateSoloState ( const bool bNewOtherSoloState );
    void SetFaderLevel ( const int iLevel );
@ -143,6 +144,7 @@ public:
    CAudioMixerBoard ( QWidget* parent = nullptr, Qt::WindowFlags f = nullptr );

    void HideAll();
+    void ChangeFaderOrder ( const bool bDoSort );
    void ApplyNewConClientList ( CVector<CChannelInfo>& vecChanInfo );
    void SetServerName ( const QString& strNewServerName );
    void SetGUIDesign ( const EGUIDesign eNewDesign );
--- a/src/clientdlg.cpp
+++ b/src/clientdlg.cpp
@ -279,10 +279,18 @@ CClientDlg::CClientDlg ( CClient*        pNCliP,
        SLOT ( close() ), QKeySequence ( Qt::CTRL + Qt::Key_Q ) );


+    // Edit menu  --------------------------------------------------------------
+    pEditMenu = new QMenu ( tr ( "&Edit" ), this );
+
+    pEditMenu->addAction ( tr ( "&Sort Channels by Name..." ), this,
+        SLOT ( OnSortChannelsByName() ), QKeySequence ( Qt::CTRL + Qt::Key_N ) );
+
+
    // Main menu bar -----------------------------------------------------------
    pMenu = new QMenuBar ( this );

    pMenu->addMenu ( pViewMenu );
+    pMenu->addMenu ( pEditMenu );
    pMenu->addMenu ( new CHelpMenu ( true, this ) );

    // Now tell the layout about the menu
--- a/src/clientdlg.h
+++ b/src/clientdlg.h
@ -107,6 +107,7 @@ protected:
    void               UpdateDisplay();

    QMenu*             pViewMenu;
+    QMenu*             pEditMenu;
    QMenuBar*          pMenu;
    QMenu*             pInstrPictPopupMenu;
    QMenu*             pCountryFlagPopupMenu;
@ -151,6 +152,7 @@ public slots:
    void OnOpenGeneralSettings() { ShowGeneralSettings(); }
    void OnOpenChatDialog() { ShowChatWindow(); }
    void OnOpenAnalyzerConsole() { ShowAnalyzerConsole(); }
+    void OnSortChannelsByName() { MainMixerBoard->ChangeFaderOrder ( true ); }

    void OnSettingsStateChanged ( int value );
    void OnChatStateChanged ( int value );
--- a/src/res/translation/translation_de_DE.qm
+++ b/src/res/translation/translation_de_DE.qm
--- a/src/res/translation/translation_de_DE.ts
+++ b/src/res/translation/translation_de_DE.ts
@ -190,17 +190,17 @@
 <context>
    <name>CAudioMixerBoard</name>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="689"/>
+        <location filename="../../audiomixerboard.cpp" line="687"/>
        <source>Server</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="698"/>
+        <location filename="../../audiomixerboard.cpp" line="696"/>
        <source>T R Y I N G   T O   C O N N E C T</source>
        <translation>V E R B I N D U N G S A U F B A U</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="772"/>
+        <location filename="../../audiomixerboard.cpp" line="832"/>
        <source>Personal Mix at the Server: </source>
        <translation>Eigener Mix am Server: </translation>
    </message>
@ -208,7 +208,7 @@
 <context>
    <name>CChannelFader</name>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="130"/>
+        <location filename="../../audiomixerboard.cpp" line="126"/>
        <source>Channel Level</source>
        <translation>Kanalpegel</translation>
    </message>
@ -217,12 +217,12 @@
        <translation type="vanished">Zeigt den Audiopegel vor dem Lautstärkeregler des Kanals. Allen verbundenen Musikern am Server wird ein Audiopegel zugewiesen.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="133"/>
+        <location filename="../../audiomixerboard.cpp" line="129"/>
        <source>Input level of the current audio channel at the server</source>
        <translation>Eingangspegel des aktuellen Musikers am Server</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="136"/>
+        <location filename="../../audiomixerboard.cpp" line="132"/>
        <source>Mixer Fader</source>
        <translation>Kanalregler</translation>
    </message>
@ -231,17 +231,17 @@
        <translation type="vanished">Regelt die Lautstärke des Kanals. Für alle Musiker, die gerade am Server verbunden sind, wird ein Lautstärkeregler angezeigt. Damit kann man seinen eigenen lokalen Mix erstellen.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="139"/>
+        <location filename="../../audiomixerboard.cpp" line="135"/>
        <source>Local mix level setting of the current audio channel at the server</source>
        <translation>Lokale Mixerpegeleinstellung des aktuellen Kanals am Server</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="142"/>
+        <location filename="../../audiomixerboard.cpp" line="138"/>
        <source>Status Indicator</source>
        <translation>Statusanzeige</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="142"/>
+        <location filename="../../audiomixerboard.cpp" line="138"/>
        <source>Shows a status indication about the client which is assigned to this channel. Supported indicators are:</source>
        <translation>Zeigt den Status über den Musiker, der dem Kanal zugewiesen ist. Unterstützte Indikatoren sind:</translation>
    </message>
@ -250,12 +250,12 @@
        <translation type="vanished">Durchgestrichener Lautsprecher: Zeigt an, dass der andere Musiker dich stummgeschaltet hat.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="147"/>
+        <location filename="../../audiomixerboard.cpp" line="143"/>
        <source>Status indicator label</source>
        <translation>Statusanzeige</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="149"/>
+        <location filename="../../audiomixerboard.cpp" line="145"/>
        <source>Panning</source>
        <translation>Pan</translation>
    </message>
@ -264,17 +264,17 @@
        <translation type="vanished">Legt die Pan-Position von Links nach Rechts fest. Der Pan funktioniert nur im Stereo oder Mono-In/Stereo-Out Modus.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="152"/>
+        <location filename="../../audiomixerboard.cpp" line="148"/>
        <source>Local panning position of the current audio channel at the server</source>
        <translation>Lokale Pan-Position von dem aktuellen Audiokanal am Server</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="154"/>
+        <location filename="../../audiomixerboard.cpp" line="150"/>
        <source>With the Mute checkbox, the audio channel can be muted.</source>
        <translation>Mit dem Mute-Schalter kann man den Kanal stumm schalten.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="156"/>
+        <location filename="../../audiomixerboard.cpp" line="152"/>
        <source>Mute button</source>
        <translation>Mute Schalter</translation>
    </message>
@ -283,12 +283,12 @@
        <translation type="vanished">Bei aktiviertem Solo Status hört man nur diesen Kanal. Alle anderen Kanäle sind stumm geschaltet. Es ist möglich mehrere Kanäle auf Solo zu stellen. Dann hört man nur die Kanäle, die auf Solo gestellt wurden.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="162"/>
+        <location filename="../../audiomixerboard.cpp" line="158"/>
        <source>Solo button</source>
        <translation>Solo Schalter</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="164"/>
+        <location filename="../../audiomixerboard.cpp" line="160"/>
        <source>Fader Tag</source>
        <translation>Kanalbeschriftung</translation>
    </message>
@ -297,124 +297,124 @@
        <translation type="vanished">Mit der Kanalbeschriftung wird der verbundene Teilnehmen identifiziert. Der Name, ein Bild des Instruments und eine Flagge des eigenen Landes kann im eigenen Profil ausgewählt werden.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="131"/>
+        <location filename="../../audiomixerboard.cpp" line="127"/>
        <source>Displays the pre-fader audio level of this channel.  All clients connected to the server will be assigned an audio level, the same value for every client.</source>
        <translation>Zeigt den Audiopegel vor dem Lautstärkeregler des Kanals. Allen verbundenen Musikern am Server wird ein Audiopegel zugewiesen.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="136"/>
+        <location filename="../../audiomixerboard.cpp" line="132"/>
        <source>Adjusts the audio level of this channel. All clients connected to the server will be assigned an audio fader, displayed at each client, to adjust the local mix.</source>
        <translation>Regelt die Lautstärke des Kanals. Für alle Musiker, die gerade am Server verbunden sind, wird ein Lautstärkeregler angezeigt. Damit kann man seinen eigenen lokalen Mix erstellen.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="144"/>
+        <location filename="../../audiomixerboard.cpp" line="140"/>
        <source>Speaker with cancellation stroke: Indicates that another client has muted you.</source>
        <translation>Durchgestrichener Lautsprecher: Zeigt an, dass der andere Musiker dich stummgeschaltet hat.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="149"/>
+        <location filename="../../audiomixerboard.cpp" line="145"/>
        <source>Sets the pan from Left to Right of the channel. Works only in stereo or preferably mono in/stereo out mode.</source>
        <translation>Legt die Pan-Position von Links nach Rechts fest. Der Pan funktioniert nur im Stereo oder Mono-In/Stereo-Out Modus.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="158"/>
+        <location filename="../../audiomixerboard.cpp" line="154"/>
        <source>With the Solo checkbox, the audio channel can be set to solo which means that all other channels except the soloed channel are muted. It is possible to set more than one channel to solo.</source>
        <translation>Bei aktiviertem Solo Status hört man nur diesen Kanal. Alle anderen Kanäle sind stumm geschaltet. Es ist möglich mehrere Kanäle auf Solo zu stellen. Dann hört man nur die Kanäle, die auf Solo gestellt wurden.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="164"/>
+        <location filename="../../audiomixerboard.cpp" line="160"/>
        <source>The fader tag identifies the connected client. The tag name, a picture of your instrument and the flag of your country can be set in the main window.</source>
        <translation>Mit der Kanalbeschriftung wird der verbundene Teilnehmen identifiziert. Der Name, ein Bild des Instruments und eine Flagge des eigenen Landes kann im eigenen Profil ausgewählt werden.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="169"/>
+        <location filename="../../audiomixerboard.cpp" line="165"/>
        <source>Mixer channel instrument picture</source>
        <translation>Mixerkanal Instrumentenbild</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="171"/>
+        <location filename="../../audiomixerboard.cpp" line="167"/>
        <source>Mixer channel label (fader tag)</source>
        <translation>Mixerkanalbeschriftung</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="173"/>
+        <location filename="../../audiomixerboard.cpp" line="169"/>
        <source>Mixer channel country flag</source>
        <translation>Mixerkanal Landesflagge</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="209"/>
+        <location filename="../../audiomixerboard.cpp" line="205"/>
        <source>PAN</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="210"/>
+        <location filename="../../audiomixerboard.cpp" line="206"/>
        <source>MUTE</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="211"/>
+        <location filename="../../audiomixerboard.cpp" line="207"/>
        <source>SOLO</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="521"/>
+        <location filename="../../audiomixerboard.cpp" line="516"/>
        <source>Alias/Name</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="527"/>
+        <location filename="../../audiomixerboard.cpp" line="522"/>
        <source>Instrument</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="535"/>
+        <location filename="../../audiomixerboard.cpp" line="530"/>
        <source>Location</source>
        <translation>Standort</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="557"/>
-        <location filename="../../audiomixerboard.cpp" line="561"/>
-        <location filename="../../audiomixerboard.cpp" line="565"/>
+        <location filename="../../audiomixerboard.cpp" line="552"/>
+        <location filename="../../audiomixerboard.cpp" line="556"/>
+        <location filename="../../audiomixerboard.cpp" line="560"/>
        <source>Skill Level</source>
        <translation>Spielstärke</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="557"/>
+        <location filename="../../audiomixerboard.cpp" line="552"/>
        <source>Beginner</source>
        <translation>Anfänger</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="561"/>
+        <location filename="../../audiomixerboard.cpp" line="556"/>
        <source>Intermediate</source>
        <translation>Mittlere Spielstärke</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="565"/>
+        <location filename="../../audiomixerboard.cpp" line="560"/>
        <source>Expert</source>
        <translation>Experte</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="576"/>
+        <location filename="../../audiomixerboard.cpp" line="571"/>
        <source>Musician Profile</source>
        <translation>Profil des Musikers</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="47"/>
-        <location filename="../../audiomixerboard.cpp" line="154"/>
-        <location filename="../../audiomixerboard.cpp" line="219"/>
+        <location filename="../../audiomixerboard.cpp" line="46"/>
+        <location filename="../../audiomixerboard.cpp" line="150"/>
+        <location filename="../../audiomixerboard.cpp" line="215"/>
        <source>Mute</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="43"/>
-        <location filename="../../audiomixerboard.cpp" line="218"/>
+        <location filename="../../audiomixerboard.cpp" line="42"/>
+        <location filename="../../audiomixerboard.cpp" line="214"/>
        <source>Pan</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="48"/>
-        <location filename="../../audiomixerboard.cpp" line="158"/>
-        <location filename="../../audiomixerboard.cpp" line="220"/>
+        <location filename="../../audiomixerboard.cpp" line="47"/>
+        <location filename="../../audiomixerboard.cpp" line="154"/>
+        <location filename="../../audiomixerboard.cpp" line="216"/>
        <source>Solo</source>
        <translation></translation>
    </message>
@ -704,7 +704,7 @@
    </message>
    <message>
        <location filename="../../clientdlg.cpp" line="203"/>
-        <location filename="../../clientdlg.cpp" line="1100"/>
+        <location filename="../../clientdlg.cpp" line="1108"/>
        <source>C&amp;onnect</source>
        <translation>&amp;Verbinden</translation>
    </message>
@ -744,23 +744,33 @@
        <translation>&amp;Beenden</translation>
    </message>
    <message>
-        <location filename="../../clientdlg.cpp" line="326"/>
+        <location filename="../../clientdlg.cpp" line="283"/>
+        <source>&amp;Edit</source>
+        <translation>B&amp;earbeiten</translation>
+    </message>
+    <message>
+        <location filename="../../clientdlg.cpp" line="285"/>
+        <source>&amp;Sort Channels by Name...</source>
+        <translation>&amp;Sortiere Kanäle nach Namen...</translation>
+    </message>
+    <message>
+        <location filename="../../clientdlg.cpp" line="334"/>
        <source>None</source>
        <translation>Keine</translation>
    </message>
    <message>
-        <location filename="../../clientdlg.cpp" line="608"/>
+        <location filename="../../clientdlg.cpp" line="616"/>
        <source>Center</source>
        <translation>Mitte</translation>
    </message>
    <message>
-        <location filename="../../clientdlg.cpp" line="615"/>
+        <location filename="../../clientdlg.cpp" line="623"/>
        <source>R</source>
        <translation></translation>
    </message>
    <message>
        <location filename="../../clientdlg.cpp" line="107"/>
-        <location filename="../../clientdlg.cpp" line="621"/>
+        <location filename="../../clientdlg.cpp" line="629"/>
        <source>L</source>
        <translation></translation>
    </message>
@ -835,22 +845,22 @@
        <translation>Die CPU des Computers ist voll ausgelastet.</translation>
    </message>
    <message>
-        <location filename="../../clientdlg.cpp" line="707"/>
+        <location filename="../../clientdlg.cpp" line="715"/>
        <source>Central Server</source>
        <translation>Zentralserver</translation>
    </message>
    <message>
-        <location filename="../../clientdlg.cpp" line="834"/>
+        <location filename="../../clientdlg.cpp" line="842"/>
        <source>user</source>
        <translation>Musiker</translation>
    </message>
    <message>
-        <location filename="../../clientdlg.cpp" line="839"/>
+        <location filename="../../clientdlg.cpp" line="847"/>
        <source>users</source>
        <translation>Musiker</translation>
    </message>
    <message>
-        <location filename="../../clientdlg.cpp" line="1076"/>
+        <location filename="../../clientdlg.cpp" line="1084"/>
        <source>D&amp;isconnect</source>
        <translation>&amp;Trennen</translation>
    </message>
--- a/src/res/translation/translation_es_ES.ts
+++ b/src/res/translation/translation_es_ES.ts
@ -194,17 +194,17 @@
 <context>
    <name>CAudioMixerBoard</name>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="689"/>
+        <location filename="../../audiomixerboard.cpp" line="687"/>
        <source>Server</source>
        <translation>Servidor</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="698"/>
+        <location filename="../../audiomixerboard.cpp" line="696"/>
        <source>T R Y I N G   T O   C O N N E C T</source>
        <translation>I N T E N T A N D O   C O N E C T A R</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="772"/>
+        <location filename="../../audiomixerboard.cpp" line="832"/>
        <source>Personal Mix at the Server: </source>
        <translation>Mezcla Personal en el Servidor: </translation>
    </message>
@ -212,7 +212,7 @@
 <context>
    <name>CChannelFader</name>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="130"/>
+        <location filename="../../audiomixerboard.cpp" line="126"/>
        <source>Channel Level</source>
        <translation>Nivel Canal</translation>
    </message>
@ -221,12 +221,12 @@
        <translation type="vanished">Muestra el nivel de audio pre-fader de este canal. Todos los clientes conectados al servidor tienen un nivel de audio asignado, el mismo para cada cliente.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="133"/>
+        <location filename="../../audiomixerboard.cpp" line="129"/>
        <source>Input level of the current audio channel at the server</source>
        <translation>Nivel de entrada del canal de audio actual en el servidor</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="136"/>
+        <location filename="../../audiomixerboard.cpp" line="132"/>
        <source>Mixer Fader</source>
        <translation>Fader Mezclador</translation>
    </message>
@ -235,17 +235,17 @@
        <translation type="vanished">Ajusta el nivel de audio de este canal. Todos los clientes conectados al servidor tienen asignado un fader en el cliente, ajustando la mezcla local.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="139"/>
+        <location filename="../../audiomixerboard.cpp" line="135"/>
        <source>Local mix level setting of the current audio channel at the server</source>
        <translation>Ajuste local de la mezcla del canal de audio actual en el servidor</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="142"/>
+        <location filename="../../audiomixerboard.cpp" line="138"/>
        <source>Status Indicator</source>
        <translation>Indicador de Estado</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="142"/>
+        <location filename="../../audiomixerboard.cpp" line="138"/>
        <source>Shows a status indication about the client which is assigned to this channel. Supported indicators are:</source>
        <translation>Muestra una indicación del estado del cliente asignado a este canal. Los indicadores soportados son:</translation>
    </message>
@ -254,12 +254,12 @@
        <translation type="vanished">Altavoz tachado: Indica que el otro cliente te ha muteado.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="147"/>
+        <location filename="../../audiomixerboard.cpp" line="143"/>
        <source>Status indicator label</source>
        <translation>Etiqueta indicador estado</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="149"/>
+        <location filename="../../audiomixerboard.cpp" line="145"/>
        <source>Panning</source>
        <translation>Paneo</translation>
    </message>
@ -268,17 +268,17 @@
        <translation type="vanished">Fija el paneo de Izquierda a Derecha del canal. Solo funciona en estéreo o preferiblemente en modo Entrada mono/Salida estéreo.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="152"/>
+        <location filename="../../audiomixerboard.cpp" line="148"/>
        <source>Local panning position of the current audio channel at the server</source>
        <translation>Posición local del paneo del canal de audio actual en el servidor</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="154"/>
+        <location filename="../../audiomixerboard.cpp" line="150"/>
        <source>With the Mute checkbox, the audio channel can be muted.</source>
        <translation>Activando Mute, se puede mutear el canal de audio.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="156"/>
+        <location filename="../../audiomixerboard.cpp" line="152"/>
        <source>Mute button</source>
        <translation>Botón Mute</translation>
    </message>
@ -287,12 +287,12 @@
        <translation type="vanished">Activando Solo, todos los demás canales de audio excepto este se mutean. Es posible activar esta función para más de un canal.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="162"/>
+        <location filename="../../audiomixerboard.cpp" line="158"/>
        <source>Solo button</source>
        <translation>Botón Solo</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="164"/>
+        <location filename="../../audiomixerboard.cpp" line="160"/>
        <source>Fader Tag</source>
        <translation>Etiqueta Fader</translation>
    </message>
@ -301,124 +301,124 @@
        <translation type="vanished">La etiqueta del fader identifica al cliente conectado. El nombre de la etiqueta, la imagen de tu instrumento y la bandera de tu país se pueden establecer en la ventana principal.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="131"/>
+        <location filename="../../audiomixerboard.cpp" line="127"/>
        <source>Displays the pre-fader audio level of this channel.  All clients connected to the server will be assigned an audio level, the same value for every client.</source>
        <translation>Muestra el nivel de audio pre-fader de este canal. Todos los clientes conectados al servidor tienen un nivel de audio asignado, el mismo valor para cada cliente.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="136"/>
+        <location filename="../../audiomixerboard.cpp" line="132"/>
        <source>Adjusts the audio level of this channel. All clients connected to the server will be assigned an audio fader, displayed at each client, to adjust the local mix.</source>
        <translation>Ajusta el nivel de audio de este canal. Todos los clientes conectados al servidor tendrán asignado un fader, mostrado en cada cliente, para ajustar la mezcla local.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="144"/>
+        <location filename="../../audiomixerboard.cpp" line="140"/>
        <source>Speaker with cancellation stroke: Indicates that another client has muted you.</source>
        <translation>Altavoz tachado: Indica que otro cliente te ha muteado.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="149"/>
+        <location filename="../../audiomixerboard.cpp" line="145"/>
        <source>Sets the pan from Left to Right of the channel. Works only in stereo or preferably mono in/stereo out mode.</source>
        <translation>Fija el paneo de Izquierda a Derecha del canal. Solo funciona en modo estéreo o preferiblemente en modo Entrada mono/Salida estéreo.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="158"/>
+        <location filename="../../audiomixerboard.cpp" line="154"/>
        <source>With the Solo checkbox, the audio channel can be set to solo which means that all other channels except the soloed channel are muted. It is possible to set more than one channel to solo.</source>
        <translation>Activando Solo, todos los demás canales de audio excepto este se mutean. Es posible activar esta función para más de un canal.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="164"/>
+        <location filename="../../audiomixerboard.cpp" line="160"/>
        <source>The fader tag identifies the connected client. The tag name, a picture of your instrument and the flag of your country can be set in the main window.</source>
        <translation>La etiqueta del fader identifica al cliente conectado. El nombre de la etiqueta, la imagen de tu instrumento y la bandera de tu país se pueden establecer en la ventana principal.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="169"/>
+        <location filename="../../audiomixerboard.cpp" line="165"/>
        <source>Mixer channel instrument picture</source>
        <translation>Imagen mezclador canal instrumento</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="171"/>
+        <location filename="../../audiomixerboard.cpp" line="167"/>
        <source>Mixer channel label (fader tag)</source>
        <translation>Etiqueta mezclador canal (etiqueta fader)</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="173"/>
+        <location filename="../../audiomixerboard.cpp" line="169"/>
        <source>Mixer channel country flag</source>
        <translation>Bandera país mezclador canal</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="209"/>
+        <location filename="../../audiomixerboard.cpp" line="205"/>
        <source>PAN</source>
        <translation>PAN</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="210"/>
+        <location filename="../../audiomixerboard.cpp" line="206"/>
        <source>MUTE</source>
        <translation>MUTE</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="211"/>
+        <location filename="../../audiomixerboard.cpp" line="207"/>
        <source>SOLO</source>
        <translation>SOLO</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="521"/>
+        <location filename="../../audiomixerboard.cpp" line="516"/>
        <source>Alias/Name</source>
        <translation>Alias/Nombre</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="527"/>
+        <location filename="../../audiomixerboard.cpp" line="522"/>
        <source>Instrument</source>
        <translation>Instrumento</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="535"/>
+        <location filename="../../audiomixerboard.cpp" line="530"/>
        <source>Location</source>
        <translation>Ubicación</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="557"/>
-        <location filename="../../audiomixerboard.cpp" line="561"/>
-        <location filename="../../audiomixerboard.cpp" line="565"/>
+        <location filename="../../audiomixerboard.cpp" line="552"/>
+        <location filename="../../audiomixerboard.cpp" line="556"/>
+        <location filename="../../audiomixerboard.cpp" line="560"/>
        <source>Skill Level</source>
        <translation>Nivel Habilidad</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="557"/>
+        <location filename="../../audiomixerboard.cpp" line="552"/>
        <source>Beginner</source>
        <translation>Principiante</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="561"/>
+        <location filename="../../audiomixerboard.cpp" line="556"/>
        <source>Intermediate</source>
        <translation>Intermedio</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="565"/>
+        <location filename="../../audiomixerboard.cpp" line="560"/>
        <source>Expert</source>
        <translation>Experto</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="576"/>
+        <location filename="../../audiomixerboard.cpp" line="571"/>
        <source>Musician Profile</source>
        <translation>Perfil Músico</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="47"/>
-        <location filename="../../audiomixerboard.cpp" line="154"/>
-        <location filename="../../audiomixerboard.cpp" line="219"/>
+        <location filename="../../audiomixerboard.cpp" line="46"/>
+        <location filename="../../audiomixerboard.cpp" line="150"/>
+        <location filename="../../audiomixerboard.cpp" line="215"/>
        <source>Mute</source>
        <translation>Mute</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="43"/>
-        <location filename="../../audiomixerboard.cpp" line="218"/>
+        <location filename="../../audiomixerboard.cpp" line="42"/>
+        <location filename="../../audiomixerboard.cpp" line="214"/>
        <source>Pan</source>
        <translation>Paneo</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="48"/>
-        <location filename="../../audiomixerboard.cpp" line="158"/>
-        <location filename="../../audiomixerboard.cpp" line="220"/>
+        <location filename="../../audiomixerboard.cpp" line="47"/>
+        <location filename="../../audiomixerboard.cpp" line="154"/>
+        <location filename="../../audiomixerboard.cpp" line="216"/>
        <source>Solo</source>
        <translation>Solo</translation>
    </message>
@ -716,7 +716,7 @@
    </message>
    <message>
        <location filename="../../clientdlg.cpp" line="203"/>
-        <location filename="../../clientdlg.cpp" line="1100"/>
+        <location filename="../../clientdlg.cpp" line="1108"/>
        <source>C&amp;onnect</source>
        <translation>C&amp;onectar</translation>
    </message>
@ -756,23 +756,33 @@
        <translation>S&amp;alir</translation>
    </message>
    <message>
-        <location filename="../../clientdlg.cpp" line="326"/>
+        <location filename="../../clientdlg.cpp" line="283"/>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../clientdlg.cpp" line="285"/>
+        <source>&amp;Sort Channels by Name...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../clientdlg.cpp" line="334"/>
        <source>None</source>
        <translation>Ninguno</translation>
    </message>
    <message>
-        <location filename="../../clientdlg.cpp" line="608"/>
+        <location filename="../../clientdlg.cpp" line="616"/>
        <source>Center</source>
        <translation>Centro</translation>
    </message>
    <message>
-        <location filename="../../clientdlg.cpp" line="615"/>
+        <location filename="../../clientdlg.cpp" line="623"/>
        <source>R</source>
        <translation>R</translation>
    </message>
    <message>
        <location filename="../../clientdlg.cpp" line="107"/>
-        <location filename="../../clientdlg.cpp" line="621"/>
+        <location filename="../../clientdlg.cpp" line="629"/>
        <source>L</source>
        <translation>L</translation>
    </message>
@ -847,22 +857,22 @@
        <translation>El procesador del cliente o del servidor está al 100%.</translation>
    </message>
    <message>
-        <location filename="../../clientdlg.cpp" line="707"/>
+        <location filename="../../clientdlg.cpp" line="715"/>
        <source>Central Server</source>
        <translation>Servidor Central</translation>
    </message>
    <message>
-        <location filename="../../clientdlg.cpp" line="834"/>
+        <location filename="../../clientdlg.cpp" line="842"/>
        <source>user</source>
        <translation>usuario</translation>
    </message>
    <message>
-        <location filename="../../clientdlg.cpp" line="839"/>
+        <location filename="../../clientdlg.cpp" line="847"/>
        <source>users</source>
        <translation>usuarios</translation>
    </message>
    <message>
-        <location filename="../../clientdlg.cpp" line="1076"/>
+        <location filename="../../clientdlg.cpp" line="1084"/>
        <source>D&amp;isconnect</source>
        <translation>D&amp;esconectar</translation>
    </message>
--- a/src/res/translation/translation_fr_FR.ts
+++ b/src/res/translation/translation_fr_FR.ts
@ -202,17 +202,17 @@
 <context>
    <name>CAudioMixerBoard</name>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="689"/>
+        <location filename="../../audiomixerboard.cpp" line="687"/>
        <source>Server</source>
        <translation>Serveur</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="698"/>
+        <location filename="../../audiomixerboard.cpp" line="696"/>
        <source>T R Y I N G   T O   C O N N E C T</source>
        <translation>T E N T A T I V E   D E   C O N N E X I O N</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="772"/>
+        <location filename="../../audiomixerboard.cpp" line="832"/>
        <source>Personal Mix at the Server: </source>
        <translation>Mixage personnel du serveur : </translation>
    </message>
@ -220,7 +220,7 @@
 <context>
    <name>CChannelFader</name>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="130"/>
+        <location filename="../../audiomixerboard.cpp" line="126"/>
        <source>Channel Level</source>
        <translation>Niveau de canal</translation>
    </message>
@ -229,12 +229,12 @@
        <translation type="vanished">Affiche le niveau audio pré-fader de ce canal.  Tous les clients connectés au serveur se verront attribuer un niveau audio, la même valeur pour chaque client.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="133"/>
+        <location filename="../../audiomixerboard.cpp" line="129"/>
        <source>Input level of the current audio channel at the server</source>
        <translation>Niveau d&apos;entrée du canal audio actuel sur le serveur</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="136"/>
+        <location filename="../../audiomixerboard.cpp" line="132"/>
        <source>Mixer Fader</source>
        <translation>Charriot du mixeur</translation>
    </message>
@ -243,17 +243,17 @@
        <translation type="vanished">Règle le niveau audio de ce canal. Tous les clients connectés au serveur se verront attribuer un chariot audio à chaque client, ce qui permettra d&apos;ajuster le mixage local.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="139"/>
+        <location filename="../../audiomixerboard.cpp" line="135"/>
        <source>Local mix level setting of the current audio channel at the server</source>
        <translation>Réglage du niveau de mixage local du canal audio actuel sur le serveur</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="142"/>
+        <location filename="../../audiomixerboard.cpp" line="138"/>
        <source>Status Indicator</source>
        <translation>Indicateur d&apos;état</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="142"/>
+        <location filename="../../audiomixerboard.cpp" line="138"/>
        <source>Shows a status indication about the client which is assigned to this channel. Supported indicators are:</source>
        <translation>Affiche une indication sur l&apos;état du client qui est affecté à ce canal. Les indicateurs pris en charge sont : </translation>
    </message>
@ -262,12 +262,12 @@
        <translation type="vanished">Haut-parleur avec barre d&apos;annulation : indique que l&apos;autre client vous a mis en sourdine.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="147"/>
+        <location filename="../../audiomixerboard.cpp" line="143"/>
        <source>Status indicator label</source>
        <translation>Étiquette d&apos;indicateur d&apos;état</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="149"/>
+        <location filename="../../audiomixerboard.cpp" line="145"/>
        <source>Panning</source>
        <translation>Panoramique</translation>
    </message>
@ -276,17 +276,17 @@
        <translation type="vanished">Règle la position panoramique du canal de gauche à droite. Fonctionne uniquement en mode stéréo ou de préférence en mode entrée mono/sortie stéréo.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="152"/>
+        <location filename="../../audiomixerboard.cpp" line="148"/>
        <source>Local panning position of the current audio channel at the server</source>
        <translation>Position panoramique locale du canal audio actuel sur le serveur</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="154"/>
+        <location filename="../../audiomixerboard.cpp" line="150"/>
        <source>With the Mute checkbox, the audio channel can be muted.</source>
        <translation>En cochant la case Muet, le canal audio peut être mis en sourdine.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="156"/>
+        <location filename="../../audiomixerboard.cpp" line="152"/>
        <source>Mute button</source>
        <translation>Bouton de sourdine</translation>
    </message>
@ -295,12 +295,12 @@
        <translation type="vanished">En cochant la case Solo, le canal audio peut être réglé sur solo, ce qui signifie que tous les autres canaux, à l&apos;exception du canal actuel, sont mis en sourdine. Il est possible de mettre plus d&apos;un canal en solo.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="162"/>
+        <location filename="../../audiomixerboard.cpp" line="158"/>
        <source>Solo button</source>
        <translation>Bouton de solo</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="164"/>
+        <location filename="../../audiomixerboard.cpp" line="160"/>
        <source>Fader Tag</source>
        <translation>Étiquette de chariot</translation>
    </message>
@ -309,124 +309,124 @@
        <translation type="vanished">L&apos;étiquette de chariot identifie le client connecté. Le nom du tag, la photo de votre instrument et un drapeau de votre pays peuvent être définis dans la fenêtre principale.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="131"/>
+        <location filename="../../audiomixerboard.cpp" line="127"/>
        <source>Displays the pre-fader audio level of this channel.  All clients connected to the server will be assigned an audio level, the same value for every client.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="136"/>
+        <location filename="../../audiomixerboard.cpp" line="132"/>
        <source>Adjusts the audio level of this channel. All clients connected to the server will be assigned an audio fader, displayed at each client, to adjust the local mix.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="144"/>
+        <location filename="../../audiomixerboard.cpp" line="140"/>
        <source>Speaker with cancellation stroke: Indicates that another client has muted you.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="149"/>
+        <location filename="../../audiomixerboard.cpp" line="145"/>
        <source>Sets the pan from Left to Right of the channel. Works only in stereo or preferably mono in/stereo out mode.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="158"/>
+        <location filename="../../audiomixerboard.cpp" line="154"/>
        <source>With the Solo checkbox, the audio channel can be set to solo which means that all other channels except the soloed channel are muted. It is possible to set more than one channel to solo.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="164"/>
+        <location filename="../../audiomixerboard.cpp" line="160"/>
        <source>The fader tag identifies the connected client. The tag name, a picture of your instrument and the flag of your country can be set in the main window.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="169"/>
+        <location filename="../../audiomixerboard.cpp" line="165"/>
        <source>Mixer channel instrument picture</source>
        <translation>Image d&apos;instrument de canal de mixeur</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="171"/>
+        <location filename="../../audiomixerboard.cpp" line="167"/>
        <source>Mixer channel label (fader tag)</source>
        <translation>Label de canal de mixeur (étiquette de chariot)</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="173"/>
+        <location filename="../../audiomixerboard.cpp" line="169"/>
        <source>Mixer channel country flag</source>
        <translation>Drapeau de pays de canal de mixeur</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="209"/>
+        <location filename="../../audiomixerboard.cpp" line="205"/>
        <source>PAN</source>
        <translation>PAN</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="210"/>
+        <location filename="../../audiomixerboard.cpp" line="206"/>
        <source>MUTE</source>
        <translation>MUET</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="211"/>
+        <location filename="../../audiomixerboard.cpp" line="207"/>
        <source>SOLO</source>
        <translation>SOLO</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="521"/>
+        <location filename="../../audiomixerboard.cpp" line="516"/>
        <source>Alias/Name</source>
        <translation>Pseudo/nom</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="527"/>
+        <location filename="../../audiomixerboard.cpp" line="522"/>
        <source>Instrument</source>
        <translation>Instrument</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="535"/>
+        <location filename="../../audiomixerboard.cpp" line="530"/>
        <source>Location</source>
        <translation>Localisation</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="557"/>
-        <location filename="../../audiomixerboard.cpp" line="561"/>
-        <location filename="../../audiomixerboard.cpp" line="565"/>
+        <location filename="../../audiomixerboard.cpp" line="552"/>
+        <location filename="../../audiomixerboard.cpp" line="556"/>
+        <location filename="../../audiomixerboard.cpp" line="560"/>
        <source>Skill Level</source>
        <translation>Niveau de compétence</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="557"/>
+        <location filename="../../audiomixerboard.cpp" line="552"/>
        <source>Beginner</source>
        <translation>Débutant</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="561"/>
+        <location filename="../../audiomixerboard.cpp" line="556"/>
        <source>Intermediate</source>
        <translation>Intermédiaire</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="565"/>
+        <location filename="../../audiomixerboard.cpp" line="560"/>
        <source>Expert</source>
        <translation>Expert</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="576"/>
+        <location filename="../../audiomixerboard.cpp" line="571"/>
        <source>Musician Profile</source>
        <translation>Profil de musicien</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="47"/>
-        <location filename="../../audiomixerboard.cpp" line="154"/>
-        <location filename="../../audiomixerboard.cpp" line="219"/>
+        <location filename="../../audiomixerboard.cpp" line="46"/>
+        <location filename="../../audiomixerboard.cpp" line="150"/>
+        <location filename="../../audiomixerboard.cpp" line="215"/>
        <source>Mute</source>
        <translation>Muet</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="43"/>
-        <location filename="../../audiomixerboard.cpp" line="218"/>
+        <location filename="../../audiomixerboard.cpp" line="42"/>
+        <location filename="../../audiomixerboard.cpp" line="214"/>
        <source>Pan</source>
        <translation>Pan</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="48"/>
-        <location filename="../../audiomixerboard.cpp" line="158"/>
-        <location filename="../../audiomixerboard.cpp" line="220"/>
+        <location filename="../../audiomixerboard.cpp" line="47"/>
+        <location filename="../../audiomixerboard.cpp" line="154"/>
+        <location filename="../../audiomixerboard.cpp" line="216"/>
        <source>Solo</source>
        <translation>Solo</translation>
    </message>
@ -712,7 +712,7 @@
    </message>
    <message>
        <location filename="../../clientdlg.cpp" line="203"/>
-        <location filename="../../clientdlg.cpp" line="1100"/>
+        <location filename="../../clientdlg.cpp" line="1108"/>
        <source>C&amp;onnect</source>
        <translation>Se c&amp;onnecter</translation>
    </message>
@ -752,23 +752,33 @@
        <translation>&amp;Quitter</translation>
    </message>
    <message>
-        <location filename="../../clientdlg.cpp" line="326"/>
+        <location filename="../../clientdlg.cpp" line="283"/>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../clientdlg.cpp" line="285"/>
+        <source>&amp;Sort Channels by Name...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../clientdlg.cpp" line="334"/>
        <source>None</source>
        <translation>Aucun</translation>
    </message>
    <message>
-        <location filename="../../clientdlg.cpp" line="608"/>
+        <location filename="../../clientdlg.cpp" line="616"/>
        <source>Center</source>
        <translation>Centre</translation>
    </message>
    <message>
-        <location filename="../../clientdlg.cpp" line="615"/>
+        <location filename="../../clientdlg.cpp" line="623"/>
        <source>R</source>
        <translation>D</translation>
    </message>
    <message>
        <location filename="../../clientdlg.cpp" line="107"/>
-        <location filename="../../clientdlg.cpp" line="621"/>
+        <location filename="../../clientdlg.cpp" line="629"/>
        <source>L</source>
        <translation>G</translation>
    </message>
@ -843,22 +853,22 @@
        <translation>Le processeur du client ou du serveur est à 100%.</translation>
    </message>
    <message>
-        <location filename="../../clientdlg.cpp" line="707"/>
+        <location filename="../../clientdlg.cpp" line="715"/>
        <source>Central Server</source>
        <translation>Serveur central</translation>
    </message>
    <message>
-        <location filename="../../clientdlg.cpp" line="834"/>
+        <location filename="../../clientdlg.cpp" line="842"/>
        <source>user</source>
        <translation>utilisateur</translation>
    </message>
    <message>
-        <location filename="../../clientdlg.cpp" line="839"/>
+        <location filename="../../clientdlg.cpp" line="847"/>
        <source>users</source>
        <translation>utilisateurs</translation>
    </message>
    <message>
-        <location filename="../../clientdlg.cpp" line="1076"/>
+        <location filename="../../clientdlg.cpp" line="1084"/>
        <source>D&amp;isconnect</source>
        <translation>Dé&amp;connecter</translation>
    </message>
--- a/src/res/translation/translation_it_IT.ts
+++ b/src/res/translation/translation_it_IT.ts
@ -190,17 +190,17 @@
 <context>
    <name>CAudioMixerBoard</name>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="689"/>
+        <location filename="../../audiomixerboard.cpp" line="687"/>
        <source>Server</source>
        <translation>Server</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="698"/>
+        <location filename="../../audiomixerboard.cpp" line="696"/>
        <source>T R Y I N G   T O   C O N N E C T</source>
        <translation>I N   A T T E S A   D I   C O N N E S S I O N E</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="772"/>
+        <location filename="../../audiomixerboard.cpp" line="832"/>
        <source>Personal Mix at the Server: </source>
        <translation>Mixer personale sul Server: </translation>
    </message>
@ -208,27 +208,27 @@
 <context>
    <name>CChannelFader</name>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="43"/>
-        <location filename="../../audiomixerboard.cpp" line="218"/>
+        <location filename="../../audiomixerboard.cpp" line="42"/>
+        <location filename="../../audiomixerboard.cpp" line="214"/>
        <source>Pan</source>
        <translation>Bilanciamento</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="47"/>
-        <location filename="../../audiomixerboard.cpp" line="154"/>
-        <location filename="../../audiomixerboard.cpp" line="219"/>
+        <location filename="../../audiomixerboard.cpp" line="46"/>
+        <location filename="../../audiomixerboard.cpp" line="150"/>
+        <location filename="../../audiomixerboard.cpp" line="215"/>
        <source>Mute</source>
        <translation>Mute</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="48"/>
-        <location filename="../../audiomixerboard.cpp" line="158"/>
-        <location filename="../../audiomixerboard.cpp" line="220"/>
+        <location filename="../../audiomixerboard.cpp" line="47"/>
+        <location filename="../../audiomixerboard.cpp" line="154"/>
+        <location filename="../../audiomixerboard.cpp" line="216"/>
        <source>Solo</source>
        <translation>Solo</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="130"/>
+        <location filename="../../audiomixerboard.cpp" line="126"/>
        <source>Channel Level</source>
        <translation>Volume</translation>
    </message>
@ -237,12 +237,12 @@
        <translation type="vanished">Visualizza il livello audio pre-fader di questo canale. A tutti i client connessi al server verrà assegnato un livello audio, lo stesso valore per ciascun client.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="133"/>
+        <location filename="../../audiomixerboard.cpp" line="129"/>
        <source>Input level of the current audio channel at the server</source>
        <translation>Livello di input del canale audio corrente sul server</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="136"/>
+        <location filename="../../audiomixerboard.cpp" line="132"/>
        <source>Mixer Fader</source>
        <translation>Mixer Fader</translation>
    </message>
@ -251,17 +251,17 @@
        <translation type="vanished">Regola il livello audio di questo canale. A tutti i client connessi al server verrà assegnato un fader audio su ciascun client, regolando il mix locale.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="139"/>
+        <location filename="../../audiomixerboard.cpp" line="135"/>
        <source>Local mix level setting of the current audio channel at the server</source>
        <translation>Impostazione del livello di volume locale del canale audio corrente sul server</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="142"/>
+        <location filename="../../audiomixerboard.cpp" line="138"/>
        <source>Status Indicator</source>
        <translation>Indicatore di Stato</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="142"/>
+        <location filename="../../audiomixerboard.cpp" line="138"/>
        <source>Shows a status indication about the client which is assigned to this channel. Supported indicators are:</source>
        <translation>Visualizza lo stato del client assegnato a questo canale. Gli Stati supportati sono:</translation>
    </message>
@ -270,12 +270,12 @@
        <translation type="vanished">Altoparlante segnato: Indica che un altro client ha messo in mute il tuo canale.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="147"/>
+        <location filename="../../audiomixerboard.cpp" line="143"/>
        <source>Status indicator label</source>
        <translation>Etichetta dell&apos;indicatore di stato</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="149"/>
+        <location filename="../../audiomixerboard.cpp" line="145"/>
        <source>Panning</source>
        <translation>Bilanciamento</translation>
    </message>
@ -284,17 +284,17 @@
        <translation type="vanished">Imposta il Bilanciamento da Sinistra a Destra del canale. Funzione abilitata in modalità stereo oppure in modalità mono in/stereo out.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="152"/>
+        <location filename="../../audiomixerboard.cpp" line="148"/>
        <source>Local panning position of the current audio channel at the server</source>
        <translation>Bilancimento locale del canale audio corrente sul server</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="154"/>
+        <location filename="../../audiomixerboard.cpp" line="150"/>
        <source>With the Mute checkbox, the audio channel can be muted.</source>
        <translation>Quando il Mute è selezionato, il canale audio è mutato.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="156"/>
+        <location filename="../../audiomixerboard.cpp" line="152"/>
        <source>Mute button</source>
        <translation>Pulsante Mute</translation>
    </message>
@ -303,12 +303,12 @@
        <translation type="vanished">Quando il Solo è attivo, il canale audio sarà in modalità solista escludendo gli altri canali che non saranno più udibili. E&apos; possibile attivare il solo su più canali per sentirli contemporaneamente.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="162"/>
+        <location filename="../../audiomixerboard.cpp" line="158"/>
        <source>Solo button</source>
        <translation>Pulsante Solo</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="164"/>
+        <location filename="../../audiomixerboard.cpp" line="160"/>
        <source>Fader Tag</source>
        <translation>Tag Fader</translation>
    </message>
@ -317,104 +317,104 @@
        <translation type="vanished">Il tag fader identifica il client connesso. Il nome del tag, l&apos;immagine del tuo strumento e una bandiera del tuo paese possono essere impostati nella finestra principale del profilo.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="131"/>
+        <location filename="../../audiomixerboard.cpp" line="127"/>
        <source>Displays the pre-fader audio level of this channel.  All clients connected to the server will be assigned an audio level, the same value for every client.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="136"/>
+        <location filename="../../audiomixerboard.cpp" line="132"/>
        <source>Adjusts the audio level of this channel. All clients connected to the server will be assigned an audio fader, displayed at each client, to adjust the local mix.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="144"/>
+        <location filename="../../audiomixerboard.cpp" line="140"/>
        <source>Speaker with cancellation stroke: Indicates that another client has muted you.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="149"/>
+        <location filename="../../audiomixerboard.cpp" line="145"/>
        <source>Sets the pan from Left to Right of the channel. Works only in stereo or preferably mono in/stereo out mode.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="158"/>
+        <location filename="../../audiomixerboard.cpp" line="154"/>
        <source>With the Solo checkbox, the audio channel can be set to solo which means that all other channels except the soloed channel are muted. It is possible to set more than one channel to solo.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="164"/>
+        <location filename="../../audiomixerboard.cpp" line="160"/>
        <source>The fader tag identifies the connected client. The tag name, a picture of your instrument and the flag of your country can be set in the main window.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="169"/>
+        <location filename="../../audiomixerboard.cpp" line="165"/>
        <source>Mixer channel instrument picture</source>
        <translation>Immagine dello strumento</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="171"/>
+        <location filename="../../audiomixerboard.cpp" line="167"/>
        <source>Mixer channel label (fader tag)</source>
        <translation>Etichetta del Canale (fader tag)</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="173"/>
+        <location filename="../../audiomixerboard.cpp" line="169"/>
        <source>Mixer channel country flag</source>
        <translation>Bandiera del Paese</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="209"/>
+        <location filename="../../audiomixerboard.cpp" line="205"/>
        <source>PAN</source>
        <translation>Bil. (L / R)</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="210"/>
+        <location filename="../../audiomixerboard.cpp" line="206"/>
        <source>MUTE</source>
        <translation>MUTE</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="211"/>
+        <location filename="../../audiomixerboard.cpp" line="207"/>
        <source>SOLO</source>
        <translation>SOLO</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="521"/>
+        <location filename="../../audiomixerboard.cpp" line="516"/>
        <source>Alias/Name</source>
        <translation>Identificativo/Nome</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="527"/>
+        <location filename="../../audiomixerboard.cpp" line="522"/>
        <source>Instrument</source>
        <translation>Strumento</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="535"/>
+        <location filename="../../audiomixerboard.cpp" line="530"/>
        <source>Location</source>
        <translation>Località</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="557"/>
-        <location filename="../../audiomixerboard.cpp" line="561"/>
-        <location filename="../../audiomixerboard.cpp" line="565"/>
+        <location filename="../../audiomixerboard.cpp" line="552"/>
+        <location filename="../../audiomixerboard.cpp" line="556"/>
+        <location filename="../../audiomixerboard.cpp" line="560"/>
        <source>Skill Level</source>
        <translation>Livello di Preparazione</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="557"/>
+        <location filename="../../audiomixerboard.cpp" line="552"/>
        <source>Beginner</source>
        <translation>Principiante</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="561"/>
+        <location filename="../../audiomixerboard.cpp" line="556"/>
        <source>Intermediate</source>
        <translation>Livello Intermedio</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="565"/>
+        <location filename="../../audiomixerboard.cpp" line="560"/>
        <source>Expert</source>
        <translation>Esperto</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="576"/>
+        <location filename="../../audiomixerboard.cpp" line="571"/>
        <source>Musician Profile</source>
        <translation>Profilo del Musicista</translation>
    </message>
@ -549,7 +549,7 @@
    </message>
    <message>
        <location filename="../../clientdlg.cpp" line="107"/>
-        <location filename="../../clientdlg.cpp" line="621"/>
+        <location filename="../../clientdlg.cpp" line="629"/>
        <source>L</source>
        <translation>L</translation>
    </message>
@ -772,7 +772,7 @@
    </message>
    <message>
        <location filename="../../clientdlg.cpp" line="203"/>
-        <location filename="../../clientdlg.cpp" line="1100"/>
+        <location filename="../../clientdlg.cpp" line="1108"/>
        <source>C&amp;onnect</source>
        <translation>C&amp;onnetti</translation>
    </message>
@ -812,37 +812,47 @@
        <translation>&amp;Uscita</translation>
    </message>
    <message>
-        <location filename="../../clientdlg.cpp" line="326"/>
+        <location filename="../../clientdlg.cpp" line="283"/>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../clientdlg.cpp" line="285"/>
+        <source>&amp;Sort Channels by Name...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../clientdlg.cpp" line="334"/>
        <source>None</source>
        <translation>Nullo</translation>
    </message>
    <message>
-        <location filename="../../clientdlg.cpp" line="608"/>
+        <location filename="../../clientdlg.cpp" line="616"/>
        <source>Center</source>
        <translation>Centro</translation>
    </message>
    <message>
-        <location filename="../../clientdlg.cpp" line="615"/>
+        <location filename="../../clientdlg.cpp" line="623"/>
        <source>R</source>
        <translation>R</translation>
    </message>
    <message>
-        <location filename="../../clientdlg.cpp" line="707"/>
+        <location filename="../../clientdlg.cpp" line="715"/>
        <source>Central Server</source>
        <translation>Server Centrale</translation>
    </message>
    <message>
-        <location filename="../../clientdlg.cpp" line="834"/>
+        <location filename="../../clientdlg.cpp" line="842"/>
        <source>user</source>
        <translation>utente</translation>
    </message>
    <message>
-        <location filename="../../clientdlg.cpp" line="839"/>
+        <location filename="../../clientdlg.cpp" line="847"/>
        <source>users</source>
        <translation>utenti</translation>
    </message>
    <message>
-        <location filename="../../clientdlg.cpp" line="1076"/>
+        <location filename="../../clientdlg.cpp" line="1084"/>
        <source>D&amp;isconnect</source>
        <translation>D&amp;isconnetti</translation>
    </message>
--- a/src/res/translation/translation_nl_NL.ts
+++ b/src/res/translation/translation_nl_NL.ts
@ -190,17 +190,17 @@
 <context>
    <name>CAudioMixerBoard</name>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="689"/>
+        <location filename="../../audiomixerboard.cpp" line="687"/>
        <source>Server</source>
        <translation>Server</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="698"/>
+        <location filename="../../audiomixerboard.cpp" line="696"/>
        <source>T R Y I N G   T O   C O N N E C T</source>
        <translation>A A N  H E T  V E R B I N D E N</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="772"/>
+        <location filename="../../audiomixerboard.cpp" line="832"/>
        <source>Personal Mix at the Server: </source>
        <translation type="unfinished"></translation>
    </message>
@ -208,27 +208,27 @@
 <context>
    <name>CChannelFader</name>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="43"/>
-        <location filename="../../audiomixerboard.cpp" line="218"/>
+        <location filename="../../audiomixerboard.cpp" line="42"/>
+        <location filename="../../audiomixerboard.cpp" line="214"/>
        <source>Pan</source>
        <translation type="unfinished">Pan</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="47"/>
-        <location filename="../../audiomixerboard.cpp" line="154"/>
-        <location filename="../../audiomixerboard.cpp" line="219"/>
+        <location filename="../../audiomixerboard.cpp" line="46"/>
+        <location filename="../../audiomixerboard.cpp" line="150"/>
+        <location filename="../../audiomixerboard.cpp" line="215"/>
        <source>Mute</source>
        <translation>Demp</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="48"/>
-        <location filename="../../audiomixerboard.cpp" line="158"/>
-        <location filename="../../audiomixerboard.cpp" line="220"/>
+        <location filename="../../audiomixerboard.cpp" line="47"/>
+        <location filename="../../audiomixerboard.cpp" line="154"/>
+        <location filename="../../audiomixerboard.cpp" line="216"/>
        <source>Solo</source>
        <translation>Solo</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="130"/>
+        <location filename="../../audiomixerboard.cpp" line="126"/>
        <source>Channel Level</source>
        <translation>Kanaalniveau</translation>
    </message>
@ -237,12 +237,12 @@
        <translation type="vanished">Geeft het pre-fader-audioniveau van dit kanaal weer.  Alle verbonden clients op de server krijgen een audioniveau toegewezen, dezelfde waarde voor elke client.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="133"/>
+        <location filename="../../audiomixerboard.cpp" line="129"/>
        <source>Input level of the current audio channel at the server</source>
        <translation>Invoerniveau van het huidige audiokanaal op de server</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="136"/>
+        <location filename="../../audiomixerboard.cpp" line="132"/>
        <source>Mixer Fader</source>
        <translation>Mixer Fader</translation>
    </message>
@ -251,42 +251,42 @@
        <translation type="vanished">Past het geluidsniveau van dit kanaal aan. Alle verbonden clients op de server krijgen een audiofader toegewezen bij elke client, waarbij de lokale mix wordt aangepast.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="139"/>
+        <location filename="../../audiomixerboard.cpp" line="135"/>
        <source>Local mix level setting of the current audio channel at the server</source>
        <translation>Lokale instelling van het mixniveau van het huidige audiokanaal op de server</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="142"/>
+        <location filename="../../audiomixerboard.cpp" line="138"/>
        <source>Status Indicator</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="142"/>
+        <location filename="../../audiomixerboard.cpp" line="138"/>
        <source>Shows a status indication about the client which is assigned to this channel. Supported indicators are:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="147"/>
+        <location filename="../../audiomixerboard.cpp" line="143"/>
        <source>Status indicator label</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="149"/>
+        <location filename="../../audiomixerboard.cpp" line="145"/>
        <source>Panning</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="152"/>
+        <location filename="../../audiomixerboard.cpp" line="148"/>
        <source>Local panning position of the current audio channel at the server</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="154"/>
+        <location filename="../../audiomixerboard.cpp" line="150"/>
        <source>With the Mute checkbox, the audio channel can be muted.</source>
        <translation>Met het selectievakje Demp kan het audiokanaal worden gedempt.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="156"/>
+        <location filename="../../audiomixerboard.cpp" line="152"/>
        <source>Mute button</source>
        <translation>Dempknop</translation>
    </message>
@ -295,12 +295,12 @@
        <translation type="vanished">Met het selectievakje Solo kan het audiokanaal worden ingesteld op solo, zodat alle overige kanalen worden gedempt. Het is mogelijk om meer dan één kanaal op solo in te stellen.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="162"/>
+        <location filename="../../audiomixerboard.cpp" line="158"/>
        <source>Solo button</source>
        <translation>Soloknop</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="164"/>
+        <location filename="../../audiomixerboard.cpp" line="160"/>
        <source>Fader Tag</source>
        <translation>Fader tag</translation>
    </message>
@ -309,104 +309,104 @@
        <translation type="vanished">De fadertag identificeert de verbonden client. De tagnaam, de afbeelding van uw instrument en een vlag van uw land kunnen in het hoofdvenster worden ingesteld.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="131"/>
+        <location filename="../../audiomixerboard.cpp" line="127"/>
        <source>Displays the pre-fader audio level of this channel.  All clients connected to the server will be assigned an audio level, the same value for every client.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="136"/>
+        <location filename="../../audiomixerboard.cpp" line="132"/>
        <source>Adjusts the audio level of this channel. All clients connected to the server will be assigned an audio fader, displayed at each client, to adjust the local mix.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="144"/>
+        <location filename="../../audiomixerboard.cpp" line="140"/>
        <source>Speaker with cancellation stroke: Indicates that another client has muted you.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="149"/>
+        <location filename="../../audiomixerboard.cpp" line="145"/>
        <source>Sets the pan from Left to Right of the channel. Works only in stereo or preferably mono in/stereo out mode.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="158"/>
+        <location filename="../../audiomixerboard.cpp" line="154"/>
        <source>With the Solo checkbox, the audio channel can be set to solo which means that all other channels except the soloed channel are muted. It is possible to set more than one channel to solo.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="164"/>
+        <location filename="../../audiomixerboard.cpp" line="160"/>
        <source>The fader tag identifies the connected client. The tag name, a picture of your instrument and the flag of your country can be set in the main window.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="169"/>
+        <location filename="../../audiomixerboard.cpp" line="165"/>
        <source>Mixer channel instrument picture</source>
        <translation>Afbeelding van het mengkanaalinstrument</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="171"/>
+        <location filename="../../audiomixerboard.cpp" line="167"/>
        <source>Mixer channel label (fader tag)</source>
        <translation>Label van het mengkanaal (faderlabel)</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="173"/>
+        <location filename="../../audiomixerboard.cpp" line="169"/>
        <source>Mixer channel country flag</source>
        <translation>Landvlag van het kanaal</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="209"/>
+        <location filename="../../audiomixerboard.cpp" line="205"/>
        <source>PAN</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="210"/>
+        <location filename="../../audiomixerboard.cpp" line="206"/>
        <source>MUTE</source>
        <translation>DEMP</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="211"/>
+        <location filename="../../audiomixerboard.cpp" line="207"/>
        <source>SOLO</source>
        <translation>SOLO</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="521"/>
+        <location filename="../../audiomixerboard.cpp" line="516"/>
        <source>Alias/Name</source>
        <translation>Alias/Naam</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="527"/>
+        <location filename="../../audiomixerboard.cpp" line="522"/>
        <source>Instrument</source>
        <translation>Instrument</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="535"/>
+        <location filename="../../audiomixerboard.cpp" line="530"/>
        <source>Location</source>
        <translation>Locatie</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="557"/>
-        <location filename="../../audiomixerboard.cpp" line="561"/>
-        <location filename="../../audiomixerboard.cpp" line="565"/>
+        <location filename="../../audiomixerboard.cpp" line="552"/>
+        <location filename="../../audiomixerboard.cpp" line="556"/>
+        <location filename="../../audiomixerboard.cpp" line="560"/>
        <source>Skill Level</source>
        <translation>Vaardigheidssniveau</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="557"/>
+        <location filename="../../audiomixerboard.cpp" line="552"/>
        <source>Beginner</source>
        <translation>Beginner</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="561"/>
+        <location filename="../../audiomixerboard.cpp" line="556"/>
        <source>Intermediate</source>
        <translation>Gemiddeld</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="565"/>
+        <location filename="../../audiomixerboard.cpp" line="560"/>
        <source>Expert</source>
        <translation>Gevorderd</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="576"/>
+        <location filename="../../audiomixerboard.cpp" line="571"/>
        <source>Musician Profile</source>
        <translation>Muzikantenprofiel</translation>
    </message>
@ -541,7 +541,7 @@
    </message>
    <message>
        <location filename="../../clientdlg.cpp" line="107"/>
-        <location filename="../../clientdlg.cpp" line="621"/>
+        <location filename="../../clientdlg.cpp" line="629"/>
        <source>L</source>
        <translation>L</translation>
    </message>
@ -764,7 +764,7 @@
    </message>
    <message>
        <location filename="../../clientdlg.cpp" line="203"/>
-        <location filename="../../clientdlg.cpp" line="1100"/>
+        <location filename="../../clientdlg.cpp" line="1108"/>
        <source>C&amp;onnect</source>
        <translation>C&amp;onnect</translation>
    </message>
@ -804,37 +804,47 @@
        <translation>E&amp;xit</translation>
    </message>
    <message>
-        <location filename="../../clientdlg.cpp" line="326"/>
+        <location filename="../../clientdlg.cpp" line="283"/>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../clientdlg.cpp" line="285"/>
+        <source>&amp;Sort Channels by Name...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../clientdlg.cpp" line="334"/>
        <source>None</source>
        <translation>Geen</translation>
    </message>
    <message>
-        <location filename="../../clientdlg.cpp" line="608"/>
+        <location filename="../../clientdlg.cpp" line="616"/>
        <source>Center</source>
        <translation>Centrum</translation>
    </message>
    <message>
-        <location filename="../../clientdlg.cpp" line="615"/>
+        <location filename="../../clientdlg.cpp" line="623"/>
        <source>R</source>
        <translation>R</translation>
    </message>
    <message>
-        <location filename="../../clientdlg.cpp" line="707"/>
+        <location filename="../../clientdlg.cpp" line="715"/>
        <source>Central Server</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../clientdlg.cpp" line="834"/>
+        <location filename="../../clientdlg.cpp" line="842"/>
        <source>user</source>
        <translation>gebruiker</translation>
    </message>
    <message>
-        <location filename="../../clientdlg.cpp" line="839"/>
+        <location filename="../../clientdlg.cpp" line="847"/>
        <source>users</source>
        <translation>gebruikers</translation>
    </message>
    <message>
-        <location filename="../../clientdlg.cpp" line="1076"/>
+        <location filename="../../clientdlg.cpp" line="1084"/>
        <source>D&amp;isconnect</source>
        <translation>&amp;Afmelden</translation>
    </message>
--- a/src/res/translation/translation_pl_PL.ts
+++ b/src/res/translation/translation_pl_PL.ts
@ -158,17 +158,17 @@
 <context>
    <name>CAudioMixerBoard</name>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="689"/>
+        <location filename="../../audiomixerboard.cpp" line="687"/>
        <source>Server</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="698"/>
+        <location filename="../../audiomixerboard.cpp" line="696"/>
        <source>T R Y I N G   T O   C O N N E C T</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="772"/>
+        <location filename="../../audiomixerboard.cpp" line="832"/>
        <source>Personal Mix at the Server: </source>
        <translation type="unfinished"></translation>
    </message>
@ -176,189 +176,189 @@
 <context>
    <name>CChannelFader</name>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="43"/>
-        <location filename="../../audiomixerboard.cpp" line="218"/>
+        <location filename="../../audiomixerboard.cpp" line="42"/>
+        <location filename="../../audiomixerboard.cpp" line="214"/>
        <source>Pan</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <location filename="../../audiomixerboard.cpp" line="46"/>
+        <location filename="../../audiomixerboard.cpp" line="150"/>
+        <location filename="../../audiomixerboard.cpp" line="215"/>
+        <source>Mute</source>
+        <translation type="unfinished"></translation>
+    </message>
    <message>
        <location filename="../../audiomixerboard.cpp" line="47"/>
        <location filename="../../audiomixerboard.cpp" line="154"/>
-        <location filename="../../audiomixerboard.cpp" line="219"/>
-        <source>Mute</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../audiomixerboard.cpp" line="48"/>
-        <location filename="../../audiomixerboard.cpp" line="158"/>
-        <location filename="../../audiomixerboard.cpp" line="220"/>
+        <location filename="../../audiomixerboard.cpp" line="216"/>
        <source>Solo</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="130"/>
+        <location filename="../../audiomixerboard.cpp" line="126"/>
        <source>Channel Level</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="133"/>
+        <location filename="../../audiomixerboard.cpp" line="129"/>
        <source>Input level of the current audio channel at the server</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="136"/>
+        <location filename="../../audiomixerboard.cpp" line="132"/>
        <source>Mixer Fader</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="139"/>
+        <location filename="../../audiomixerboard.cpp" line="135"/>
        <source>Local mix level setting of the current audio channel at the server</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="142"/>
+        <location filename="../../audiomixerboard.cpp" line="138"/>
        <source>Status Indicator</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="142"/>
+        <location filename="../../audiomixerboard.cpp" line="138"/>
        <source>Shows a status indication about the client which is assigned to this channel. Supported indicators are:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="147"/>
+        <location filename="../../audiomixerboard.cpp" line="143"/>
        <source>Status indicator label</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="149"/>
+        <location filename="../../audiomixerboard.cpp" line="145"/>
        <source>Panning</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="152"/>
+        <location filename="../../audiomixerboard.cpp" line="148"/>
        <source>Local panning position of the current audio channel at the server</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="154"/>
+        <location filename="../../audiomixerboard.cpp" line="150"/>
        <source>With the Mute checkbox, the audio channel can be muted.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="156"/>
+        <location filename="../../audiomixerboard.cpp" line="152"/>
        <source>Mute button</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="162"/>
+        <location filename="../../audiomixerboard.cpp" line="158"/>
        <source>Solo button</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="164"/>
+        <location filename="../../audiomixerboard.cpp" line="160"/>
        <source>Fader Tag</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="131"/>
+        <location filename="../../audiomixerboard.cpp" line="127"/>
        <source>Displays the pre-fader audio level of this channel.  All clients connected to the server will be assigned an audio level, the same value for every client.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="136"/>
+        <location filename="../../audiomixerboard.cpp" line="132"/>
        <source>Adjusts the audio level of this channel. All clients connected to the server will be assigned an audio fader, displayed at each client, to adjust the local mix.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="144"/>
+        <location filename="../../audiomixerboard.cpp" line="140"/>
        <source>Speaker with cancellation stroke: Indicates that another client has muted you.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="149"/>
+        <location filename="../../audiomixerboard.cpp" line="145"/>
        <source>Sets the pan from Left to Right of the channel. Works only in stereo or preferably mono in/stereo out mode.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="158"/>
+        <location filename="../../audiomixerboard.cpp" line="154"/>
        <source>With the Solo checkbox, the audio channel can be set to solo which means that all other channels except the soloed channel are muted. It is possible to set more than one channel to solo.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="164"/>
+        <location filename="../../audiomixerboard.cpp" line="160"/>
        <source>The fader tag identifies the connected client. The tag name, a picture of your instrument and the flag of your country can be set in the main window.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="169"/>
+        <location filename="../../audiomixerboard.cpp" line="165"/>
        <source>Mixer channel instrument picture</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="171"/>
+        <location filename="../../audiomixerboard.cpp" line="167"/>
        <source>Mixer channel label (fader tag)</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="173"/>
+        <location filename="../../audiomixerboard.cpp" line="169"/>
        <source>Mixer channel country flag</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="209"/>
+        <location filename="../../audiomixerboard.cpp" line="205"/>
        <source>PAN</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="210"/>
+        <location filename="../../audiomixerboard.cpp" line="206"/>
        <source>MUTE</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="211"/>
+        <location filename="../../audiomixerboard.cpp" line="207"/>
        <source>SOLO</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="521"/>
+        <location filename="../../audiomixerboard.cpp" line="516"/>
        <source>Alias/Name</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="527"/>
+        <location filename="../../audiomixerboard.cpp" line="522"/>
        <source>Instrument</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="535"/>
+        <location filename="../../audiomixerboard.cpp" line="530"/>
        <source>Location</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="557"/>
-        <location filename="../../audiomixerboard.cpp" line="561"/>
-        <location filename="../../audiomixerboard.cpp" line="565"/>
+        <location filename="../../audiomixerboard.cpp" line="552"/>
+        <location filename="../../audiomixerboard.cpp" line="556"/>
+        <location filename="../../audiomixerboard.cpp" line="560"/>
        <source>Skill Level</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="557"/>
+        <location filename="../../audiomixerboard.cpp" line="552"/>
        <source>Beginner</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="561"/>
+        <location filename="../../audiomixerboard.cpp" line="556"/>
        <source>Intermediate</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="565"/>
+        <location filename="../../audiomixerboard.cpp" line="560"/>
        <source>Expert</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="576"/>
+        <location filename="../../audiomixerboard.cpp" line="571"/>
        <source>Musician Profile</source>
        <translation type="unfinished"></translation>
    </message>
@ -453,7 +453,7 @@
    </message>
    <message>
        <location filename="../../clientdlg.cpp" line="107"/>
-        <location filename="../../clientdlg.cpp" line="621"/>
+        <location filename="../../clientdlg.cpp" line="629"/>
        <source>L</source>
        <translation type="unfinished"></translation>
    </message>
@ -624,7 +624,7 @@
    </message>
    <message>
        <location filename="../../clientdlg.cpp" line="203"/>
-        <location filename="../../clientdlg.cpp" line="1100"/>
+        <location filename="../../clientdlg.cpp" line="1108"/>
        <source>C&amp;onnect</source>
        <translation type="unfinished"></translation>
    </message>
@ -664,37 +664,47 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../clientdlg.cpp" line="326"/>
+        <location filename="../../clientdlg.cpp" line="283"/>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../clientdlg.cpp" line="285"/>
+        <source>&amp;Sort Channels by Name...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../clientdlg.cpp" line="334"/>
        <source>None</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../clientdlg.cpp" line="608"/>
+        <location filename="../../clientdlg.cpp" line="616"/>
        <source>Center</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../clientdlg.cpp" line="615"/>
+        <location filename="../../clientdlg.cpp" line="623"/>
        <source>R</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../clientdlg.cpp" line="707"/>
+        <location filename="../../clientdlg.cpp" line="715"/>
        <source>Central Server</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../clientdlg.cpp" line="834"/>
+        <location filename="../../clientdlg.cpp" line="842"/>
        <source>user</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../clientdlg.cpp" line="839"/>
+        <location filename="../../clientdlg.cpp" line="847"/>
        <source>users</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../clientdlg.cpp" line="1076"/>
+        <location filename="../../clientdlg.cpp" line="1084"/>
        <source>D&amp;isconnect</source>
        <translation type="unfinished"></translation>
    </message>
--- a/src/res/translation/translation_pt_PT.ts
+++ b/src/res/translation/translation_pt_PT.ts
@ -202,17 +202,17 @@
 <context>
    <name>CAudioMixerBoard</name>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="689"/>
+        <location filename="../../audiomixerboard.cpp" line="687"/>
        <source>Server</source>
        <translation>Servidor</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="698"/>
+        <location filename="../../audiomixerboard.cpp" line="696"/>
        <source>T R Y I N G   T O   C O N N E C T</source>
        <translation>T E N T A N D O   L I G A R</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="772"/>
+        <location filename="../../audiomixerboard.cpp" line="832"/>
        <source>Personal Mix at the Server: </source>
        <translation>Mistura Pessoal no Servidor: </translation>
    </message>
@ -220,7 +220,7 @@
 <context>
    <name>CChannelFader</name>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="130"/>
+        <location filename="../../audiomixerboard.cpp" line="126"/>
        <source>Channel Level</source>
        <translation>Nível do Canal</translation>
    </message>
@ -229,12 +229,12 @@
        <translation type="vanished">Mostra o nível de áudio pré-fader deste canal. Todos os clientes ligados ao servidor terão atribuído um nível de áudio, o mesmo valor para cada cliente.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="133"/>
+        <location filename="../../audiomixerboard.cpp" line="129"/>
        <source>Input level of the current audio channel at the server</source>
        <translation>Nível de entrada deste canal de áudio do servidor</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="136"/>
+        <location filename="../../audiomixerboard.cpp" line="132"/>
        <source>Mixer Fader</source>
        <translation>Fader da Mistura</translation>
    </message>
@ -243,17 +243,17 @@
        <translation type="vanished">Ajusta o nível de áudio deste canal. Por cada cliente ligado ao servidor será atribuído um fader de áudio em todos os clientes, podendo cada um ajustar a sua mistura local.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="139"/>
+        <location filename="../../audiomixerboard.cpp" line="135"/>
        <source>Local mix level setting of the current audio channel at the server</source>
        <translation>Configuração do nível de mistura local deste canal de áudio do servidor</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="142"/>
+        <location filename="../../audiomixerboard.cpp" line="138"/>
        <source>Status Indicator</source>
        <translation>Indicador de Estado</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="142"/>
+        <location filename="../../audiomixerboard.cpp" line="138"/>
        <source>Shows a status indication about the client which is assigned to this channel. Supported indicators are:</source>
        <translation>Mostra uma indicação de estado sobre o cliente que está atribuído a este canal. Os indicadores suportados são:</translation>
    </message>
@ -262,12 +262,12 @@
        <translation type="vanished">Alti-falante com sinal de proibição: Indica que o cliente silenciou o teu canal.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="147"/>
+        <location filename="../../audiomixerboard.cpp" line="143"/>
        <source>Status indicator label</source>
        <translation>Etiqueta do indicador de estado</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="149"/>
+        <location filename="../../audiomixerboard.cpp" line="145"/>
        <source>Panning</source>
        <translation>Panorâmica</translation>
    </message>
@ -276,17 +276,17 @@
        <translation type="vanished">Define a posição de panorâmica da esquerda para a direita do canal. Funciona apenas no modo estéreo ou, de preferência, no modo Entrada Mono/Saída Estéreo.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="152"/>
+        <location filename="../../audiomixerboard.cpp" line="148"/>
        <source>Local panning position of the current audio channel at the server</source>
        <translation>Posição de panorâmica local do canal de áudio actual no servidor</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="154"/>
+        <location filename="../../audiomixerboard.cpp" line="150"/>
        <source>With the Mute checkbox, the audio channel can be muted.</source>
        <translation>Com a caixa de seleção Mute, o canal de áudio pode ser silenciado.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="156"/>
+        <location filename="../../audiomixerboard.cpp" line="152"/>
        <source>Mute button</source>
        <translation>Botão Mute</translation>
    </message>
@ -295,12 +295,12 @@
        <translation type="vanished">Com a caixa de seleção Solo, o canal de áudio pode ser definido como solo, o que significa que todos os outros canais, exceto o canal atual, serão silenciados. É possível definir mais que um canal no modo solo.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="162"/>
+        <location filename="../../audiomixerboard.cpp" line="158"/>
        <source>Solo button</source>
        <translation>Botão Solo</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="164"/>
+        <location filename="../../audiomixerboard.cpp" line="160"/>
        <source>Fader Tag</source>
        <translation>Identificador do Fader</translation>
    </message>
@ -309,124 +309,124 @@
        <translation type="vanished">O Identificador do fader identifica o cliente ligado. O nome no identificador, a imagem do instrumento e a bandeira do país podem ser definidos no Meu Perfil.</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="131"/>
+        <location filename="../../audiomixerboard.cpp" line="127"/>
        <source>Displays the pre-fader audio level of this channel.  All clients connected to the server will be assigned an audio level, the same value for every client.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="136"/>
+        <location filename="../../audiomixerboard.cpp" line="132"/>
        <source>Adjusts the audio level of this channel. All clients connected to the server will be assigned an audio fader, displayed at each client, to adjust the local mix.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="144"/>
+        <location filename="../../audiomixerboard.cpp" line="140"/>
        <source>Speaker with cancellation stroke: Indicates that another client has muted you.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="149"/>
+        <location filename="../../audiomixerboard.cpp" line="145"/>
        <source>Sets the pan from Left to Right of the channel. Works only in stereo or preferably mono in/stereo out mode.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="158"/>
+        <location filename="../../audiomixerboard.cpp" line="154"/>
        <source>With the Solo checkbox, the audio channel can be set to solo which means that all other channels except the soloed channel are muted. It is possible to set more than one channel to solo.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="164"/>
+        <location filename="../../audiomixerboard.cpp" line="160"/>
        <source>The fader tag identifies the connected client. The tag name, a picture of your instrument and the flag of your country can be set in the main window.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="169"/>
+        <location filename="../../audiomixerboard.cpp" line="165"/>
        <source>Mixer channel instrument picture</source>
        <translation>Imagem do instrumento do canal da mistura</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="171"/>
+        <location filename="../../audiomixerboard.cpp" line="167"/>
        <source>Mixer channel label (fader tag)</source>
        <translation>Identificação do canal da mistura (identificador do fader)</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="173"/>
+        <location filename="../../audiomixerboard.cpp" line="169"/>
        <source>Mixer channel country flag</source>
        <translation>Bandeira do país do canal da mistura</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="209"/>
+        <location filename="../../audiomixerboard.cpp" line="205"/>
        <source>PAN</source>
        <translation>PAN</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="210"/>
+        <location filename="../../audiomixerboard.cpp" line="206"/>
        <source>MUTE</source>
        <translation>MUTE</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="211"/>
+        <location filename="../../audiomixerboard.cpp" line="207"/>
        <source>SOLO</source>
        <translation>SOLO</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="521"/>
+        <location filename="../../audiomixerboard.cpp" line="516"/>
        <source>Alias/Name</source>
        <translation>Nome/Alcunha</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="527"/>
+        <location filename="../../audiomixerboard.cpp" line="522"/>
        <source>Instrument</source>
        <translation>Instrumento</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="535"/>
+        <location filename="../../audiomixerboard.cpp" line="530"/>
        <source>Location</source>
        <translation>Localização</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="557"/>
-        <location filename="../../audiomixerboard.cpp" line="561"/>
-        <location filename="../../audiomixerboard.cpp" line="565"/>
+        <location filename="../../audiomixerboard.cpp" line="552"/>
+        <location filename="../../audiomixerboard.cpp" line="556"/>
+        <location filename="../../audiomixerboard.cpp" line="560"/>
        <source>Skill Level</source>
        <translation>Nível de Habilidade</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="557"/>
+        <location filename="../../audiomixerboard.cpp" line="552"/>
        <source>Beginner</source>
        <translation>Principiante</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="561"/>
+        <location filename="../../audiomixerboard.cpp" line="556"/>
        <source>Intermediate</source>
        <translation>Intermediário</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="565"/>
+        <location filename="../../audiomixerboard.cpp" line="560"/>
        <source>Expert</source>
        <translation>Avançado</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="576"/>
+        <location filename="../../audiomixerboard.cpp" line="571"/>
        <source>Musician Profile</source>
        <translation>Perfil do músico</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="47"/>
-        <location filename="../../audiomixerboard.cpp" line="154"/>
-        <location filename="../../audiomixerboard.cpp" line="219"/>
+        <location filename="../../audiomixerboard.cpp" line="46"/>
+        <location filename="../../audiomixerboard.cpp" line="150"/>
+        <location filename="../../audiomixerboard.cpp" line="215"/>
        <source>Mute</source>
        <translation>Mute</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="43"/>
-        <location filename="../../audiomixerboard.cpp" line="218"/>
+        <location filename="../../audiomixerboard.cpp" line="42"/>
+        <location filename="../../audiomixerboard.cpp" line="214"/>
        <source>Pan</source>
        <translation>Pan</translation>
    </message>
    <message>
-        <location filename="../../audiomixerboard.cpp" line="48"/>
-        <location filename="../../audiomixerboard.cpp" line="158"/>
-        <location filename="../../audiomixerboard.cpp" line="220"/>
+        <location filename="../../audiomixerboard.cpp" line="47"/>
+        <location filename="../../audiomixerboard.cpp" line="154"/>
+        <location filename="../../audiomixerboard.cpp" line="216"/>
        <source>Solo</source>
        <translation>Solo</translation>
    </message>
@ -708,7 +708,7 @@
    </message>
    <message>
        <location filename="../../clientdlg.cpp" line="203"/>
-        <location filename="../../clientdlg.cpp" line="1100"/>
+        <location filename="../../clientdlg.cpp" line="1108"/>
        <source>C&amp;onnect</source>
        <translation>&amp;Ligar</translation>
    </message>
@ -748,23 +748,33 @@
        <translation>&amp;Sair</translation>
    </message>
    <message>
-        <location filename="../../clientdlg.cpp" line="326"/>
+        <location filename="../../clientdlg.cpp" line="283"/>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../clientdlg.cpp" line="285"/>
+        <source>&amp;Sort Channels by Name...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../clientdlg.cpp" line="334"/>
        <source>None</source>
        <translation>Nenhum</translation>
    </message>
    <message>
-        <location filename="../../clientdlg.cpp" line="608"/>
+        <location filename="../../clientdlg.cpp" line="616"/>
        <source>Center</source>
        <translation>Centro</translation>
    </message>
    <message>
-        <location filename="../../clientdlg.cpp" line="615"/>
+        <location filename="../../clientdlg.cpp" line="623"/>
        <source>R</source>
        <translation>R</translation>
    </message>
    <message>
        <location filename="../../clientdlg.cpp" line="107"/>
-        <location filename="../../clientdlg.cpp" line="621"/>
+        <location filename="../../clientdlg.cpp" line="629"/>
        <source>L</source>
        <translation>L</translation>
    </message>
@ -839,22 +849,22 @@
        <translation>O CPU do cliente ou servidor está a 100%.</translation>
    </message>
    <message>
-        <location filename="../../clientdlg.cpp" line="707"/>
+        <location filename="../../clientdlg.cpp" line="715"/>
        <source>Central Server</source>
        <translation>Servidor Central</translation>
    </message>
    <message>
-        <location filename="../../clientdlg.cpp" line="834"/>
+        <location filename="../../clientdlg.cpp" line="842"/>
        <source>user</source>
        <translation>utilizador</translation>
    </message>
    <message>
-        <location filename="../../clientdlg.cpp" line="839"/>
+        <location filename="../../clientdlg.cpp" line="847"/>
        <source>users</source>
        <translation>utilizadores</translation>
    </message>
    <message>
-        <location filename="../../clientdlg.cpp" line="1076"/>
+        <location filename="../../clientdlg.cpp" line="1084"/>
        <source>D&amp;isconnect</source>
        <translation>Desl&amp;igar</translation>
    </message>
				`@ -0,0 +1 @@`
				`distributions/jamulus-server.service lib/systemd/system`