merge fixes

2020-06-05 13:10:59 +02:00 · 2020-06-05 13:10:59 +02:00 · b11b4024fe
commit b11b4024fe
parent 1a6123f499
17 changed files with 672 additions and 612 deletions
--- a/src/clientdlg.cpp
+++ b/src/clientdlg.cpp
@ -119,11 +119,7 @@ CClientDlg::CClientDlg ( CClient*        pNCliP,
        "a microphone signal is fed in to the right audio channel of the "
        "sound card and a reverb effect needs to be applied, set the "
        "channel selector to right and move the fader upwards until the "
-        "desired reverb level is reached." ) + "<br>" + tr (
-        "Reverb requires significant CPU so it should "
-        "only be used on fast PCs. If the reverb level fader is set to "
-        "minimum (the default setting), the effect is "
-        "switched off and does not cause any additional CPU usage." );
+        "desired reverb level is reached." );

    lblAudioReverb->setWhatsThis ( strAudReverb );
    sldAudioReverb->setWhatsThis ( strAudReverb );
@ -156,7 +152,7 @@ CClientDlg::CClientDlg ( CClient*        pNCliP,
    lblDelay->setWhatsThis ( strLEDDelay );
    ledDelay->setWhatsThis ( strLEDDelay );
    ledDelay->setToolTip ( tr ( "If this LED indicator turns red, "
-        "you will not have much fun using the application" ) +
+        "you will not have much fun using the application." ) +
         TOOLTIP_COM_END_TEXT );

    ledDelay->setAccessibleName ( tr ( "Delay status LED indicator" ) );
--- a/src/clientsettingsdlg.cpp
+++ b/src/clientsettingsdlg.cpp
@ -209,7 +209,7 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, QWidget* parent,
        "microphone on the other. In that case the two input signals "
        "can be mixed to one mono channel but the server mix is heard in "
        "stereo." )  + "</li>"
-        "<li>" + tr ("Enabling " ) + "<b>" + tr ( "Stereo" ) + "</b> " + tr ( "mode "
+        "<li>" + tr ( "Enabling " ) + "<b>" + tr ( "Stereo" ) + "</b> " + tr ( "mode "
        "will increase your stream's data rate. Make sure your upload rate does not "
        "exceed the available upload speed of your internet connection." )  + "</li>"
        "</ul>"
--- a/src/connectdlg.cpp
+++ b/src/connectdlg.cpp
@ -52,7 +52,7 @@ CConnectDlg::CConnectDlg ( CClient*        pNCliP,
        "Use the List dropdown to select a genre, click on the server you want "
        "to join and press the Connect button to connect to it. Alternatively, "
        "double click on on the server name. Permanent servers (those that have "
-        "been listed for longer than 24 hours) are shown in bold." ) );
+        "been listed for longer than 48 hours) are shown in bold." ) );

    lvwServers->setAccessibleName ( tr ( "Server list view" ) );

--- 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
@ -67,62 +67,62 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="403"/>
+        <location filename="../../util.cpp" line="405"/>
        <source>For details on the contributions check out the </source>
        <translation>Die Details über die Codebeiträge findet man in der </translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="404"/>
+        <location filename="../../util.cpp" line="406"/>
        <source>Github Contributors list</source>
        <translation>Github Liste der Mitwirkenden</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="408"/>
+        <location filename="../../util.cpp" line="410"/>
        <source>Spanish</source>
        <translation>Spanisch</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="410"/>
+        <location filename="../../util.cpp" line="412"/>
        <source>French</source>
        <translation>Französisch</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="412"/>
+        <location filename="../../util.cpp" line="414"/>
        <source>Portuguese</source>
        <translation>Portugiesisch</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="414"/>
+        <location filename="../../util.cpp" line="416"/>
        <source>Dutch</source>
        <translation>Holländisch</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="416"/>
+        <location filename="../../util.cpp" line="418"/>
        <source>Italian</source>
        <translation>Italienisch</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="418"/>
+        <location filename="../../util.cpp" line="420"/>
        <source>German</source>
        <translation>Deutsch</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="425"/>
+        <location filename="../../util.cpp" line="427"/>
        <source>About </source>
        <translation>Über </translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="442"/>
+        <location filename="../../util.cpp" line="444"/>
        <source>, Version </source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="455"/>
+        <location filename="../../util.cpp" line="457"/>
        <source>Internet Jam Session Software</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="459"/>
+        <location filename="../../util.cpp" line="461"/>
        <source>Released under the GNU General Public License (GPL)</source>
        <translation type="unfinished"></translation>
    </message>
@ -1736,7 +1736,7 @@
    </message>
    <message>
        <location filename="../../connectdlg.cpp" line="49"/>
-        <source>The Connection Setup window shows a list of available servers. Server operators can optionally list their servers by music genre. Use the List dropdown to select a genre, click on the server you want to join and press the Connect button to connect to it. Alternatively, double click on on the server name. Permanent servers (those that have been listed for longer than 24 hours) are shown in bold.</source>
+        <source>The Connection Setup window shows a list of available servers. Server operators can optionally list their servers by music genre. Use the List dropdown to select a genre, click on the server you want to join and press the Connect button to connect to it. Alternatively, double click on on the server name. Permanent servers (those that have been listed for longer than 48 hours) are shown in bold.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
@ -1866,28 +1866,28 @@
 <context>
    <name>CHelpMenu</name>
    <message>
-        <location filename="../../util.cpp" line="841"/>
+        <location filename="../../util.cpp" line="843"/>
        <source>&amp;Help</source>
        <translation>&amp;Hilfe</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="846"/>
-        <location filename="../../util.cpp" line="851"/>
+        <location filename="../../util.cpp" line="848"/>
+        <location filename="../../util.cpp" line="853"/>
        <source>Getting &amp;Started...</source>
        <translation>&amp;Erste Schritte...</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="847"/>
+        <location filename="../../util.cpp" line="849"/>
        <source>Software &amp;Manual...</source>
        <translation>Software&amp;handbuch...</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="854"/>
+        <location filename="../../util.cpp" line="856"/>
        <source>What&apos;s &amp;This</source>
        <translation>Konte&amp;xthilfe</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="856"/>
+        <location filename="../../util.cpp" line="858"/>
        <source>&amp;About...</source>
        <translation>Ü&amp;ber...</translation>
    </message>
@ -1895,102 +1895,102 @@
 <context>
    <name>CLicenceDlg</name>
    <message>
-        <location filename="../../util.cpp" line="481"/>
+        <location filename="../../util.cpp" line="483"/>
        <source>I &amp;agree to the above licence terms</source>
        <translation>Ich &amp;stimme den Lizenzbedingungen zu</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="482"/>
+        <location filename="../../util.cpp" line="484"/>
        <source>Accept</source>
        <translation>Einwilligen</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="483"/>
+        <location filename="../../util.cpp" line="485"/>
        <source>Decline</source>
        <translation>Ablehnen</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="499"/>
+        <location filename="../../util.cpp" line="501"/>
        <source>By connecting to this server and agreeing to this notice, you agree to the following:</source>
        <translation>Durch das Verbinden mit diesem Server und das Akzeptieren des Lizenztextes willigst du folgenden Bedingungen ein:</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="501"/>
+        <location filename="../../util.cpp" line="503"/>
        <source>You agree that all data, sounds, or other works transmitted to this server are owned and created by you or your licensors, and that you are making these data, sounds or other works available via the following Creative Commons License (for more information on this license, see </source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="509"/>
+        <location filename="../../util.cpp" line="511"/>
        <source>You are free to:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="511"/>
+        <location filename="../../util.cpp" line="513"/>
        <source>Share</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="512"/>
+        <location filename="../../util.cpp" line="514"/>
        <source>copy and redistribute the material in any medium or format</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="513"/>
+        <location filename="../../util.cpp" line="515"/>
        <source>Adapt</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="514"/>
+        <location filename="../../util.cpp" line="516"/>
        <source>remix, transform, and build upon the material</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="515"/>
+        <location filename="../../util.cpp" line="517"/>
        <source>The licensor cannot revoke these freedoms as long as you follow the license terms.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="517"/>
+        <location filename="../../util.cpp" line="519"/>
        <source>Under the following terms:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="519"/>
+        <location filename="../../util.cpp" line="521"/>
        <source>Attribution</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="520"/>
+        <location filename="../../util.cpp" line="522"/>
        <source>You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="523"/>
+        <location filename="../../util.cpp" line="525"/>
        <source>NonCommercial</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="524"/>
+        <location filename="../../util.cpp" line="526"/>
        <source>You may not use the material for commercial purposes.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="525"/>
+        <location filename="../../util.cpp" line="527"/>
        <source>ShareAlike</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="526"/>
+        <location filename="../../util.cpp" line="528"/>
        <source>If you remix, transform, or build upon the material, you must distribute your contributions under the same license as the original.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="528"/>
+        <location filename="../../util.cpp" line="530"/>
        <source>No additional restrictions</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="529"/>
+        <location filename="../../util.cpp" line="531"/>
        <source>You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits.</source>
        <translation type="unfinished"></translation>
    </message>
@ -2002,85 +2002,85 @@
        <translation type="vanished"> Server. Dieses Schild wird auch bei allen anderen Musikern, die mit dem gleichen Server verbunden sind, angezeigt. Wenn der Name leer gelassen wurde, dann wird die IP-Adresse stattdessen angezeigt.</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="717"/>
+        <location filename="../../util.cpp" line="719"/>
        <source>Alias or name edit box</source>
        <translation>Alias oder Name Eingabefeld</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="719"/>
+        <location filename="../../util.cpp" line="721"/>
        <source>Instrument picture button</source>
        <translation>Instrumentenbild Knopf</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="721"/>
+        <location filename="../../util.cpp" line="723"/>
        <source>Country flag button</source>
        <translation>Landesflagge Knopf</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="723"/>
+        <location filename="../../util.cpp" line="725"/>
        <source>City edit box</source>
        <translation>Stadt Eingabefeld</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="725"/>
+        <location filename="../../util.cpp" line="727"/>
        <source>Skill level combo box</source>
        <translation>Fähigkeit Auswahlbox</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="671"/>
-        <location filename="../../util.cpp" line="683"/>
-        <location filename="../../util.cpp" line="977"/>
+        <location filename="../../util.cpp" line="673"/>
+        <location filename="../../util.cpp" line="685"/>
+        <location filename="../../util.cpp" line="979"/>
        <source>None</source>
        <translation>Kein</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="558"/>
-        <location filename="../../util.cpp" line="706"/>
+        <location filename="../../util.cpp" line="560"/>
+        <location filename="../../util.cpp" line="708"/>
        <source>Musician Profile</source>
        <translation>Musikerprofil</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="563"/>
+        <location filename="../../util.cpp" line="565"/>
        <source>Alias/Name</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="565"/>
+        <location filename="../../util.cpp" line="567"/>
        <source>Instrument</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="567"/>
+        <location filename="../../util.cpp" line="569"/>
        <source>Country</source>
        <translation>Land</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="569"/>
+        <location filename="../../util.cpp" line="571"/>
        <source>City</source>
        <translation>Stadt</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="571"/>
+        <location filename="../../util.cpp" line="573"/>
        <source>Skill</source>
        <translation>Können</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="573"/>
+        <location filename="../../util.cpp" line="575"/>
        <source>&amp;Close</source>
        <translation>&amp;Schließen</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="689"/>
+        <location filename="../../util.cpp" line="691"/>
        <source>Beginner</source>
        <translation>Anfänger</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="695"/>
+        <location filename="../../util.cpp" line="697"/>
        <source>Intermediate</source>
        <translation>Mittlere Spielstärke</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="701"/>
+        <location filename="../../util.cpp" line="703"/>
        <source>Expert</source>
        <translation>Experte</translation>
    </message>
@ -2093,215 +2093,225 @@
        <translation type="vanished">Was man hier sieht wird auch am Fader im Mixer angezeigt, wenn du mit einem </translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="707"/>
+        <location filename="../../util.cpp" line="709"/>
        <source>Write your name or an alias here so the other musicians you want to play with know who you are. You may also add a picture of the instrument you play and a flag of the country you are located in. Your city and skill level playing your instrument may also be added.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="711"/>
+        <location filename="../../util.cpp" line="713"/>
        <source>What you set here will appear at your fader on the mixer board when you are connected to a Jamulus server. This tag will also be shown at each client which is connected to the same server as you. If the name is left empty, the IP address is shown instead.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="978"/>
+        <location filename="../../util.cpp" line="980"/>
        <source>Drum Set</source>
        <translation>Schlagzeug</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="979"/>
+        <location filename="../../util.cpp" line="981"/>
        <source>Djembe</source>
        <translation>Djembe</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="980"/>
+        <location filename="../../util.cpp" line="982"/>
        <source>Electric Guitar</source>
        <translation>E-Gitarre</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="981"/>
+        <location filename="../../util.cpp" line="983"/>
        <source>Acoustic Guitar</source>
        <translation>Akustikgitarre</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="982"/>
+        <location filename="../../util.cpp" line="984"/>
        <source>Bass Guitar</source>
        <translation>E-Bass</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="983"/>
+        <location filename="../../util.cpp" line="985"/>
        <source>Keyboard</source>
        <translation>Keyboard</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="984"/>
+        <location filename="../../util.cpp" line="986"/>
        <source>Synthesizer</source>
        <translation>Synthesizer</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="985"/>
+        <location filename="../../util.cpp" line="987"/>
        <source>Grand Piano</source>
        <translation>Flügel</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="986"/>
+        <location filename="../../util.cpp" line="988"/>
        <source>Accordion</source>
        <translation>Akkordeon</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="987"/>
+        <location filename="../../util.cpp" line="989"/>
        <source>Vocal</source>
        <translation>Gesang</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="988"/>
+        <location filename="../../util.cpp" line="990"/>
        <source>Microphone</source>
        <translation>Mikrofon</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="989"/>
+        <location filename="../../util.cpp" line="991"/>
        <source>Harmonica</source>
        <translation>Mundharmonika</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="990"/>
+        <location filename="../../util.cpp" line="992"/>
        <source>Trumpet</source>
        <translation>Trompete</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="991"/>
+        <location filename="../../util.cpp" line="993"/>
        <source>Trombone</source>
        <translation>Posaune</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="992"/>
+        <location filename="../../util.cpp" line="994"/>
        <source>French Horn</source>
        <translation>Waldhorn</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="993"/>
+        <location filename="../../util.cpp" line="995"/>
        <source>Tuba</source>
        <translation>Tuba</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="994"/>
+        <location filename="../../util.cpp" line="996"/>
        <source>Saxophone</source>
        <translation>Saxophon</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="995"/>
+        <location filename="../../util.cpp" line="997"/>
        <source>Clarinet</source>
        <translation>Klarinette</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="996"/>
+        <location filename="../../util.cpp" line="998"/>
        <source>Flute</source>
        <translation>Flöte</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="997"/>
+        <location filename="../../util.cpp" line="999"/>
        <source>Violin</source>
        <translation>Violine</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="998"/>
+        <location filename="../../util.cpp" line="1000"/>
        <source>Cello</source>
        <translation>Cello</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="999"/>
+        <location filename="../../util.cpp" line="1001"/>
        <source>Double Bass</source>
        <translation>Kontrabass</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1000"/>
+        <location filename="../../util.cpp" line="1002"/>
        <source>Recorder</source>
        <translation>Recorder</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1001"/>
+        <location filename="../../util.cpp" line="1003"/>
        <source>Streamer</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1002"/>
+        <location filename="../../util.cpp" line="1004"/>
        <source>Listener</source>
        <translation>Zuhörer</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1003"/>
+        <location filename="../../util.cpp" line="1005"/>
        <source>Guitar+Vocal</source>
        <translation>Gitarre+Gesang</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1004"/>
+        <location filename="../../util.cpp" line="1006"/>
        <source>Keyboard+Vocal</source>
        <translation>Keyboard+Gesang</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1005"/>
+        <location filename="../../util.cpp" line="1007"/>
        <source>Bodhran</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1006"/>
+        <location filename="../../util.cpp" line="1008"/>
        <source>Bassoon</source>
        <translation>Fagott</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1007"/>
+        <location filename="../../util.cpp" line="1009"/>
        <source>Oboe</source>
        <translation>Oboe</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1008"/>
+        <location filename="../../util.cpp" line="1010"/>
        <source>Harp</source>
        <translation>Harfe</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1009"/>
+        <location filename="../../util.cpp" line="1011"/>
        <source>Viola</source>
        <translation>Viola</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1010"/>
+        <location filename="../../util.cpp" line="1012"/>
        <source>Congas</source>
        <translation>Congas</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1011"/>
+        <location filename="../../util.cpp" line="1013"/>
        <source>Bongo</source>
        <translation>Bongos</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1012"/>
+        <location filename="../../util.cpp" line="1014"/>
        <source>Vocal Bass</source>
        <translation>Gesang Bass</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1013"/>
+        <location filename="../../util.cpp" line="1015"/>
        <source>Vocal Tenor</source>
        <translation>Gesang Tenor</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1014"/>
+        <location filename="../../util.cpp" line="1016"/>
        <source>Vocal Alto</source>
        <translation>Gesang Alt</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1015"/>
+        <location filename="../../util.cpp" line="1017"/>
        <source>Vocal Soprano</source>
        <translation>Gesang Sopran</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1016"/>
+        <location filename="../../util.cpp" line="1018"/>
        <source>Banjo</source>
        <translation>Banjo</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1017"/>
+        <location filename="../../util.cpp" line="1019"/>
        <source>Mandolin</source>
        <translation>Mandoline</translation>
    </message>
+    <message>
+        <location filename="../../util.cpp" line="1020"/>
+        <source>Ukulele</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../util.cpp" line="1021"/>
+        <source>Bass Ukulele</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>CServerDlg</name>
--- a/src/res/translation/translation_es_ES.qm
+++ b/src/res/translation/translation_es_ES.qm
--- a/src/res/translation/translation_es_ES.ts
+++ b/src/res/translation/translation_es_ES.ts
@ -71,62 +71,62 @@
        <translation>Iconos de banderas nacionales de Mark James</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="403"/>
+        <location filename="../../util.cpp" line="405"/>
        <source>For details on the contributions check out the </source>
        <translation>Para más detalles sobre los contribuidores consulta la </translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="404"/>
+        <location filename="../../util.cpp" line="406"/>
        <source>Github Contributors list</source>
        <translation>lista de Contribuidores en Github</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="408"/>
+        <location filename="../../util.cpp" line="410"/>
        <source>Spanish</source>
        <translation>Español</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="410"/>
+        <location filename="../../util.cpp" line="412"/>
        <source>French</source>
        <translation>Francés</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="412"/>
+        <location filename="../../util.cpp" line="414"/>
        <source>Portuguese</source>
        <translation>Portugués</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="414"/>
+        <location filename="../../util.cpp" line="416"/>
        <source>Dutch</source>
        <translation>Neerlandés</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="416"/>
+        <location filename="../../util.cpp" line="418"/>
        <source>Italian</source>
        <translation>Italiano</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="418"/>
+        <location filename="../../util.cpp" line="420"/>
        <source>German</source>
        <translation>Alemán</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="425"/>
+        <location filename="../../util.cpp" line="427"/>
        <source>About </source>
        <translation>Acerca de </translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="442"/>
+        <location filename="../../util.cpp" line="444"/>
        <source>, Version </source>
        <translation>, Versión </translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="455"/>
+        <location filename="../../util.cpp" line="457"/>
        <source>Internet Jam Session Software</source>
        <translation>Internet Jam Session Software</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="459"/>
+        <location filename="../../util.cpp" line="461"/>
        <source>Released under the GNU General Public License (GPL)</source>
        <translation>Publicado bajo la GNU General Public License (GPL)</translation>
    </message>
@ -1743,9 +1743,13 @@
        <translation type="vanished">. Hay disponible una lista de las direcciones IP o URLs utilizadas más recientemente para su selección.</translation>
    </message>
    <message>
-        <location filename="../../connectdlg.cpp" line="49"/>
        <source>The Connection Setup window shows a list of available servers. Server operators can optionally list their servers by music genre. Use the List dropdown to select a genre, click on the server you want to join and press the Connect button to connect to it. Alternatively, double click on on the server name. Permanent servers (those that have been listed for longer than 24 hours) are shown in bold.</source>
-        <translation>La ventana de Conexión muestra una lista de servidores disponibles. Opcionalmente los administradores de los servidores pueden listar sus servidores por género musical. Utiliza el menú Lista para escoger un género, escoge un servidor de la lista y pulsa el botón de Conectar para conectarte a él. También es posible realizar la conexión haciendo doble clic en un servidor de la lista. Los servidores permanentes (aquellos que llevan más de 24 horas en la lista) se muestran en negrita.</translation>
+        <translation type="vanished">La ventana de Conexión muestra una lista de servidores disponibles. Opcionalmente los administradores de los servidores pueden listar sus servidores por género musical. Utiliza el menú Lista para escoger un género, escoge un servidor de la lista y pulsa el botón de Conectar para conectarte a él. También es posible realizar la conexión haciendo doble clic en un servidor de la lista. Los servidores permanentes (aquellos que llevan más de 24 horas en la lista) se muestran en negrita.</translation>
+    </message>
+    <message>
+        <location filename="../../connectdlg.cpp" line="49"/>
+        <source>The Connection Setup window shows a list of available servers. Server operators can optionally list their servers by music genre. Use the List dropdown to select a genre, click on the server you want to join and press the Connect button to connect to it. Alternatively, double click on on the server name. Permanent servers (those that have been listed for longer than 48 hours) are shown in bold.</source>
+        <translation type="unfinished">La ventana de Conexión muestra una lista de servidores disponibles. Opcionalmente los administradores de los servidores pueden listar sus servidores por género musical. Utiliza el menú Lista para escoger un género, escoge un servidor de la lista y pulsa el botón de Conectar para conectarte a él. También es posible realizar la conexión haciendo doble clic en un servidor de la lista. Los servidores permanentes (aquellos que llevan más de 24 horas en la lista) se muestran en negrita. {48 ?}</translation>
    </message>
    <message>
        <location filename="../../connectdlg.cpp" line="60"/>
@ -1874,28 +1878,28 @@
 <context>
    <name>CHelpMenu</name>
    <message>
-        <location filename="../../util.cpp" line="841"/>
+        <location filename="../../util.cpp" line="843"/>
        <source>&amp;Help</source>
        <translation>&amp;Ayuda</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="846"/>
-        <location filename="../../util.cpp" line="851"/>
+        <location filename="../../util.cpp" line="848"/>
+        <location filename="../../util.cpp" line="853"/>
        <source>Getting &amp;Started...</source>
        <translation>Cómo &amp;Empezar...</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="847"/>
+        <location filename="../../util.cpp" line="849"/>
        <source>Software &amp;Manual...</source>
        <translation>Manual del &amp;Software...</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="854"/>
+        <location filename="../../util.cpp" line="856"/>
        <source>What&apos;s &amp;This</source>
        <translation>Qué es &amp;Esto</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="856"/>
+        <location filename="../../util.cpp" line="858"/>
        <source>&amp;About...</source>
        <translation>&amp;Acerca de...</translation>
    </message>
@ -1903,102 +1907,102 @@
 <context>
    <name>CLicenceDlg</name>
    <message>
-        <location filename="../../util.cpp" line="481"/>
+        <location filename="../../util.cpp" line="483"/>
        <source>I &amp;agree to the above licence terms</source>
        <translation>&amp;Acepto los términos de la licencia arriba expuestos</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="482"/>
+        <location filename="../../util.cpp" line="484"/>
        <source>Accept</source>
        <translation>Acepto</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="483"/>
+        <location filename="../../util.cpp" line="485"/>
        <source>Decline</source>
        <translation>No Acepto</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="499"/>
+        <location filename="../../util.cpp" line="501"/>
        <source>By connecting to this server and agreeing to this notice, you agree to the following:</source>
        <translation>Al conectarte a este servidor y aceptar esta notificación, aceptas lo siguiente:</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="501"/>
+        <location filename="../../util.cpp" line="503"/>
        <source>You agree that all data, sounds, or other works transmitted to this server are owned and created by you or your licensors, and that you are making these data, sounds or other works available via the following Creative Commons License (for more information on this license, see </source>
        <translation>Ud. declara que todos los datos, audios u otras obras transmitidas a este servidor son la propiedad de Ud. y creadas por Ud. o sus licenciatarios, y que pone a disposición de terceras partes estos datos, audios u otras obras mediante la siguiente Licencia Creative Commons (para más información sobre esta licencia, ver </translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="509"/>
+        <location filename="../../util.cpp" line="511"/>
        <source>You are free to:</source>
        <translation>Ud. es libre de:</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="511"/>
+        <location filename="../../util.cpp" line="513"/>
        <source>Share</source>
        <translation>Compartir</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="512"/>
+        <location filename="../../util.cpp" line="514"/>
        <source>copy and redistribute the material in any medium or format</source>
        <translation>copiar y redistribuir el material en cualquier medio o formato</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="513"/>
+        <location filename="../../util.cpp" line="515"/>
        <source>Adapt</source>
        <translation>Adaptar</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="514"/>
+        <location filename="../../util.cpp" line="516"/>
        <source>remix, transform, and build upon the material</source>
        <translation>remezclar, transformar y construir a partir del material</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="515"/>
+        <location filename="../../util.cpp" line="517"/>
        <source>The licensor cannot revoke these freedoms as long as you follow the license terms.</source>
        <translation>El licenciante no puede revocar estas libertades en tanto Ud. siga los términos de la licencia.</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="517"/>
+        <location filename="../../util.cpp" line="519"/>
        <source>Under the following terms:</source>
        <translation>Bajo los siguientes términos:</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="519"/>
+        <location filename="../../util.cpp" line="521"/>
        <source>Attribution</source>
        <translation>Atribución</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="520"/>
+        <location filename="../../util.cpp" line="522"/>
        <source>You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use.</source>
        <translation>Ud. debe dar crédito de manera adecuada, brindar un enlace a la licencia, e indicar si se han realizado cambios. Puede hacerlo en cualquier forma razonable, pero no de forma tal que sugiera que Ud. o su uso tienen el apoyo de la licenciante.</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="523"/>
+        <location filename="../../util.cpp" line="525"/>
        <source>NonCommercial</source>
        <translation>No-Comercial</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="524"/>
+        <location filename="../../util.cpp" line="526"/>
        <source>You may not use the material for commercial purposes.</source>
        <translation>No puede utilizar el material con fines comerciales.</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="525"/>
+        <location filename="../../util.cpp" line="527"/>
        <source>ShareAlike</source>
        <translation>ShareAlike</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="526"/>
+        <location filename="../../util.cpp" line="528"/>
        <source>If you remix, transform, or build upon the material, you must distribute your contributions under the same license as the original.</source>
        <translation>Si remezcla, transforma o construye sobre el material, debe distribuir sus contribuciones bajo la misma licencia que el original.</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="528"/>
+        <location filename="../../util.cpp" line="530"/>
        <source>No additional restrictions</source>
        <translation>Sin restricciones adicionales</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="529"/>
+        <location filename="../../util.cpp" line="531"/>
        <source>You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits.</source>
        <translation>No puede aplicar términos legales o medidas tecnológicas que restringan legalmente a otras personas de hacer cualquier cosa permitida por la licencia.</translation>
    </message>
@ -2010,85 +2014,85 @@
        <translation type="vanished"> Esta etiqueta también se mostrará a cada cliente conectado al mismo servidor que tú. Se se deja vacío, se muestra la dirección IP en su lugar.</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="717"/>
+        <location filename="../../util.cpp" line="719"/>
        <source>Alias or name edit box</source>
        <translation>Campo para alias o nombre</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="719"/>
+        <location filename="../../util.cpp" line="721"/>
        <source>Instrument picture button</source>
        <translation>Botón imagen instrumento</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="721"/>
+        <location filename="../../util.cpp" line="723"/>
        <source>Country flag button</source>
        <translation>Botón bandera país</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="723"/>
+        <location filename="../../util.cpp" line="725"/>
        <source>City edit box</source>
        <translation>Ciudad</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="725"/>
+        <location filename="../../util.cpp" line="727"/>
        <source>Skill level combo box</source>
        <translation>Nivel de habilidad</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="671"/>
-        <location filename="../../util.cpp" line="683"/>
-        <location filename="../../util.cpp" line="977"/>
+        <location filename="../../util.cpp" line="673"/>
+        <location filename="../../util.cpp" line="685"/>
+        <location filename="../../util.cpp" line="979"/>
        <source>None</source>
        <translation>Ninguno</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="558"/>
-        <location filename="../../util.cpp" line="706"/>
+        <location filename="../../util.cpp" line="560"/>
+        <location filename="../../util.cpp" line="708"/>
        <source>Musician Profile</source>
        <translation>Perfil Músico</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="563"/>
+        <location filename="../../util.cpp" line="565"/>
        <source>Alias/Name</source>
        <translation>Alias/Nombre</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="565"/>
+        <location filename="../../util.cpp" line="567"/>
        <source>Instrument</source>
        <translation>Instrumento</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="567"/>
+        <location filename="../../util.cpp" line="569"/>
        <source>Country</source>
        <translation>País</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="569"/>
+        <location filename="../../util.cpp" line="571"/>
        <source>City</source>
        <translation>Ciudad</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="571"/>
+        <location filename="../../util.cpp" line="573"/>
        <source>Skill</source>
        <translation>Habilidad</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="573"/>
+        <location filename="../../util.cpp" line="575"/>
        <source>&amp;Close</source>
        <translation>&amp;Cerrar</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="689"/>
+        <location filename="../../util.cpp" line="691"/>
        <source>Beginner</source>
        <translation>Principiante</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="695"/>
+        <location filename="../../util.cpp" line="697"/>
        <source>Intermediate</source>
        <translation>Intermedio</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="701"/>
+        <location filename="../../util.cpp" line="703"/>
        <source>Expert</source>
        <translation>Experto</translation>
    </message>
@ -2101,215 +2105,225 @@
        <translation type="vanished">Lo que introduzcas aquí aparecerá en tu fader del mezclador cuando te conectes a un servidor </translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="707"/>
+        <location filename="../../util.cpp" line="709"/>
        <source>Write your name or an alias here so the other musicians you want to play with know who you are. You may also add a picture of the instrument you play and a flag of the country you are located in. Your city and skill level playing your instrument may also be added.</source>
        <translation>Escribe tu nombre o alias aquí para que otros músicos con quien quieras tocar te reconozcan. Puedes además añadir una imagen del instrumento que tocas y la bandera del país donde vives. La ciudad donde vives y tu nivel de habilidad con el instrumento también pueden añadirse.</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="711"/>
+        <location filename="../../util.cpp" line="713"/>
        <source>What you set here will appear at your fader on the mixer board when you are connected to a Jamulus server. This tag will also be shown at each client which is connected to the same server as you. If the name is left empty, the IP address is shown instead.</source>
        <translation>Lo que introduzcas aquí aparecerá en tu fader del mezclador cuando te conectes a un servidor. Esta etiqueta también se mostrará en cada cliente conectado al mismo servidor que tú. Si se deja el nombre vacío, se muestra la dirección IP en su lugar.</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="978"/>
+        <location filename="../../util.cpp" line="980"/>
        <source>Drum Set</source>
        <translation>Batería</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="979"/>
+        <location filename="../../util.cpp" line="981"/>
        <source>Djembe</source>
        <translation>Djembé</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="980"/>
+        <location filename="../../util.cpp" line="982"/>
        <source>Electric Guitar</source>
        <translation>Guitarra Eléctrica</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="981"/>
+        <location filename="../../util.cpp" line="983"/>
        <source>Acoustic Guitar</source>
        <translation>Guitarra Acústica</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="982"/>
+        <location filename="../../util.cpp" line="984"/>
        <source>Bass Guitar</source>
        <translation>Bajo Eléctrico</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="983"/>
+        <location filename="../../util.cpp" line="985"/>
        <source>Keyboard</source>
        <translation>Teclado</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="984"/>
+        <location filename="../../util.cpp" line="986"/>
        <source>Synthesizer</source>
        <translation>Sintetizador</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="985"/>
+        <location filename="../../util.cpp" line="987"/>
        <source>Grand Piano</source>
        <translation>Piano de Cola</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="986"/>
+        <location filename="../../util.cpp" line="988"/>
        <source>Accordion</source>
        <translation>Acordeón</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="987"/>
+        <location filename="../../util.cpp" line="989"/>
        <source>Vocal</source>
        <translation>Voz</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="988"/>
+        <location filename="../../util.cpp" line="990"/>
        <source>Microphone</source>
        <translation>Micrófono</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="989"/>
+        <location filename="../../util.cpp" line="991"/>
        <source>Harmonica</source>
        <translation>Armónica</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="990"/>
+        <location filename="../../util.cpp" line="992"/>
        <source>Trumpet</source>
        <translation>Trompeta</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="991"/>
+        <location filename="../../util.cpp" line="993"/>
        <source>Trombone</source>
        <translation>Trombón</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="992"/>
+        <location filename="../../util.cpp" line="994"/>
        <source>French Horn</source>
        <translation>Trompa</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="993"/>
+        <location filename="../../util.cpp" line="995"/>
        <source>Tuba</source>
        <translation>Tuba</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="994"/>
+        <location filename="../../util.cpp" line="996"/>
        <source>Saxophone</source>
        <translation>Saxofón</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="995"/>
+        <location filename="../../util.cpp" line="997"/>
        <source>Clarinet</source>
        <translation>Clarinete</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="996"/>
+        <location filename="../../util.cpp" line="998"/>
        <source>Flute</source>
        <translation>Flauta</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="997"/>
+        <location filename="../../util.cpp" line="999"/>
        <source>Violin</source>
        <translation>Violín</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="998"/>
+        <location filename="../../util.cpp" line="1000"/>
        <source>Cello</source>
        <translation>Violonchelo</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="999"/>
+        <location filename="../../util.cpp" line="1001"/>
        <source>Double Bass</source>
        <translation>Contrabajo</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1000"/>
+        <location filename="../../util.cpp" line="1002"/>
        <source>Recorder</source>
        <translation>Grabadora</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1001"/>
+        <location filename="../../util.cpp" line="1003"/>
        <source>Streamer</source>
        <translation>Streamer</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1002"/>
+        <location filename="../../util.cpp" line="1004"/>
        <source>Listener</source>
        <translation>Oyente</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1003"/>
+        <location filename="../../util.cpp" line="1005"/>
        <source>Guitar+Vocal</source>
        <translation>Guitarra+Voz</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1004"/>
+        <location filename="../../util.cpp" line="1006"/>
        <source>Keyboard+Vocal</source>
        <translation>Teclado+Voz</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1005"/>
+        <location filename="../../util.cpp" line="1007"/>
        <source>Bodhran</source>
        <translation>Bodhran</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1006"/>
+        <location filename="../../util.cpp" line="1008"/>
        <source>Bassoon</source>
        <translation>Fagot</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1007"/>
+        <location filename="../../util.cpp" line="1009"/>
        <source>Oboe</source>
        <translation>Oboe</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1008"/>
+        <location filename="../../util.cpp" line="1010"/>
        <source>Harp</source>
        <translation>Arpa</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1009"/>
+        <location filename="../../util.cpp" line="1011"/>
        <source>Viola</source>
        <translation>Viola</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1010"/>
+        <location filename="../../util.cpp" line="1012"/>
        <source>Congas</source>
        <translation>Congas</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1011"/>
+        <location filename="../../util.cpp" line="1013"/>
        <source>Bongo</source>
        <translation>Bongo</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1012"/>
+        <location filename="../../util.cpp" line="1014"/>
        <source>Vocal Bass</source>
        <translation>Voz bajo</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1013"/>
+        <location filename="../../util.cpp" line="1015"/>
        <source>Vocal Tenor</source>
        <translation>Voz Tenor</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1014"/>
+        <location filename="../../util.cpp" line="1016"/>
        <source>Vocal Alto</source>
        <translation>Voz Alto</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1015"/>
+        <location filename="../../util.cpp" line="1017"/>
        <source>Vocal Soprano</source>
        <translation>Voz Soprano</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1016"/>
+        <location filename="../../util.cpp" line="1018"/>
        <source>Banjo</source>
        <translation>Banjo</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1017"/>
+        <location filename="../../util.cpp" line="1019"/>
        <source>Mandolin</source>
        <translation>Mandolina</translation>
    </message>
+    <message>
+        <location filename="../../util.cpp" line="1020"/>
+        <source>Ukulele</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../util.cpp" line="1021"/>
+        <source>Bass Ukulele</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>CServerDlg</name>
--- a/src/res/translation/translation_fr_FR.qm
+++ b/src/res/translation/translation_fr_FR.qm
--- a/src/res/translation/translation_fr_FR.ts
+++ b/src/res/translation/translation_fr_FR.ts
@ -71,62 +71,62 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="403"/>
+        <location filename="../../util.cpp" line="405"/>
        <source>For details on the contributions check out the </source>
        <translation>Pour plus de détails sur les contributions, consultez la </translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="404"/>
+        <location filename="../../util.cpp" line="406"/>
        <source>Github Contributors list</source>
        <translation>liste de contributeurs sur github</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="408"/>
+        <location filename="../../util.cpp" line="410"/>
        <source>Spanish</source>
        <translation>Espagnol</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="410"/>
+        <location filename="../../util.cpp" line="412"/>
        <source>French</source>
        <translation>Français</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="412"/>
+        <location filename="../../util.cpp" line="414"/>
        <source>Portuguese</source>
        <translation>Portugais</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="414"/>
+        <location filename="../../util.cpp" line="416"/>
        <source>Dutch</source>
        <translation>Néerlandais</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="416"/>
+        <location filename="../../util.cpp" line="418"/>
        <source>Italian</source>
        <translation>Italien</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="418"/>
+        <location filename="../../util.cpp" line="420"/>
        <source>German</source>
        <translation>Allemand</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="425"/>
+        <location filename="../../util.cpp" line="427"/>
        <source>About </source>
        <translation>À propos</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="442"/>
+        <location filename="../../util.cpp" line="444"/>
        <source>, Version </source>
        <translation>, version </translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="455"/>
+        <location filename="../../util.cpp" line="457"/>
        <source>Internet Jam Session Software</source>
        <translation>Logiciels de bœuf sur Internet</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="459"/>
+        <location filename="../../util.cpp" line="461"/>
        <source>Released under the GNU General Public License (GPL)</source>
        <translation type="unfinished"></translation>
    </message>
@ -1756,7 +1756,7 @@
    </message>
    <message>
        <location filename="../../connectdlg.cpp" line="49"/>
-        <source>The Connection Setup window shows a list of available servers. Server operators can optionally list their servers by music genre. Use the List dropdown to select a genre, click on the server you want to join and press the Connect button to connect to it. Alternatively, double click on on the server name. Permanent servers (those that have been listed for longer than 24 hours) are shown in bold.</source>
+        <source>The Connection Setup window shows a list of available servers. Server operators can optionally list their servers by music genre. Use the List dropdown to select a genre, click on the server you want to join and press the Connect button to connect to it. Alternatively, double click on on the server name. Permanent servers (those that have been listed for longer than 48 hours) are shown in bold.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
@ -1886,28 +1886,28 @@
 <context>
    <name>CHelpMenu</name>
    <message>
-        <location filename="../../util.cpp" line="841"/>
+        <location filename="../../util.cpp" line="843"/>
        <source>&amp;Help</source>
        <translation>&amp;Aide</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="846"/>
-        <location filename="../../util.cpp" line="851"/>
+        <location filename="../../util.cpp" line="848"/>
+        <location filename="../../util.cpp" line="853"/>
        <source>Getting &amp;Started...</source>
        <translation>Premier pa&amp;s...</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="847"/>
+        <location filename="../../util.cpp" line="849"/>
        <source>Software &amp;Manual...</source>
        <translation>&amp;Manuel du logiciel...</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="854"/>
+        <location filename="../../util.cpp" line="856"/>
        <source>What&apos;s &amp;This</source>
        <translation>Qu&apos;est-ce que c&apos;est ?</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="856"/>
+        <location filename="../../util.cpp" line="858"/>
        <source>&amp;About...</source>
        <translation>À &amp;propos</translation>
    </message>
@ -1915,102 +1915,102 @@
 <context>
    <name>CLicenceDlg</name>
    <message>
-        <location filename="../../util.cpp" line="481"/>
+        <location filename="../../util.cpp" line="483"/>
        <source>I &amp;agree to the above licence terms</source>
        <translation>J&apos;&amp;accepte les conditions de licence ci-dessus</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="482"/>
+        <location filename="../../util.cpp" line="484"/>
        <source>Accept</source>
        <translation>Accepter</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="483"/>
+        <location filename="../../util.cpp" line="485"/>
        <source>Decline</source>
        <translation>Décliner</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="499"/>
+        <location filename="../../util.cpp" line="501"/>
        <source>By connecting to this server and agreeing to this notice, you agree to the following:</source>
        <translation>En vous connectant à ce serveur et en acceptant le présent avis, vous acceptez ce qui suit :</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="501"/>
+        <location filename="../../util.cpp" line="503"/>
        <source>You agree that all data, sounds, or other works transmitted to this server are owned and created by you or your licensors, and that you are making these data, sounds or other works available via the following Creative Commons License (for more information on this license, see </source>
        <translation>Vous acceptez que toutes les données, sons ou autres œuvres transmises à ce serveur soient détenus et créés par vous ou vos ayant-droits, et que vous rendiez ces données, sons ou autres œuvres disponibles via la licence Creative Commons suivante (pour plus d&apos;informations sur cette licence, voir </translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="509"/>
+        <location filename="../../util.cpp" line="511"/>
        <source>You are free to:</source>
        <translation>Vous êtes libres de :</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="511"/>
+        <location filename="../../util.cpp" line="513"/>
        <source>Share</source>
        <translation>Partager</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="512"/>
+        <location filename="../../util.cpp" line="514"/>
        <source>copy and redistribute the material in any medium or format</source>
        <translation>copier et redistribuer le matériel sur tout support ou format</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="513"/>
+        <location filename="../../util.cpp" line="515"/>
        <source>Adapt</source>
        <translation>Adapter</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="514"/>
+        <location filename="../../util.cpp" line="516"/>
        <source>remix, transform, and build upon the material</source>
        <translation>remixer, transformer et développer à partir du matériel</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="515"/>
+        <location filename="../../util.cpp" line="517"/>
        <source>The licensor cannot revoke these freedoms as long as you follow the license terms.</source>
        <translation>Le donneur de licence ne peut pas révoquer ces libertés tant que vous respectez les conditions de la licence.</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="517"/>
+        <location filename="../../util.cpp" line="519"/>
        <source>Under the following terms:</source>
        <translation>Dans les conditions suivantes :</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="519"/>
+        <location filename="../../util.cpp" line="521"/>
        <source>Attribution</source>
        <translation>Attribution</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="520"/>
+        <location filename="../../util.cpp" line="522"/>
        <source>You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use.</source>
        <translation>Vous devez donner un crédit approprié, fournir un lien vers la licence et indiquer si des modifications ont été apportées. Vous pouvez le faire de toute manière raisonnable, mais pas d&apos;une manière qui suggère que le donneur de licence vous cautionne ou cautionne votre utilisation.</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="523"/>
+        <location filename="../../util.cpp" line="525"/>
        <source>NonCommercial</source>
        <translation>Non commercial</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="524"/>
+        <location filename="../../util.cpp" line="526"/>
        <source>You may not use the material for commercial purposes.</source>
        <translation>Vous ne pouvez pas utiliser le matériel à des fins commerciales.</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="525"/>
+        <location filename="../../util.cpp" line="527"/>
        <source>ShareAlike</source>
        <translation>Partager à l&apos;identique</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="526"/>
+        <location filename="../../util.cpp" line="528"/>
        <source>If you remix, transform, or build upon the material, you must distribute your contributions under the same license as the original.</source>
        <translation>Si vous remixez, transformez ou développez à partir du matériel, vous devez distribuer vos contributions sous la même licence que l&apos;original.</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="528"/>
+        <location filename="../../util.cpp" line="530"/>
        <source>No additional restrictions</source>
        <translation>Aucune restriction supplémentaire</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="529"/>
+        <location filename="../../util.cpp" line="531"/>
        <source>You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits.</source>
        <translation>Vous ne pouvez pas appliquer des termes juridiques ou des mesures technologiques qui empêchent légalement d&apos;autres personnes de faire ce que la licence autorise.</translation>
    </message>
@ -2022,85 +2022,85 @@
        <translation type="vanished"> . Cette balise apparaîtra également sur chaque client connecté au même serveur que vous. Si le nom est laissé vide, l&apos;adresse IP est affichée à la place.</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="717"/>
+        <location filename="../../util.cpp" line="719"/>
        <source>Alias or name edit box</source>
        <translation>Dialogue d&apos;édition de pseudo ou de nom</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="719"/>
+        <location filename="../../util.cpp" line="721"/>
        <source>Instrument picture button</source>
        <translation>Bouton d&apos;image d&apos;instrument</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="721"/>
+        <location filename="../../util.cpp" line="723"/>
        <source>Country flag button</source>
        <translation>Bouton de drapeau de pays</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="723"/>
+        <location filename="../../util.cpp" line="725"/>
        <source>City edit box</source>
        <translation>Dialogue d&apos;édition de ville</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="725"/>
+        <location filename="../../util.cpp" line="727"/>
        <source>Skill level combo box</source>
        <translation>Choix déroulant de niveau de compétence</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="671"/>
-        <location filename="../../util.cpp" line="683"/>
-        <location filename="../../util.cpp" line="977"/>
+        <location filename="../../util.cpp" line="673"/>
+        <location filename="../../util.cpp" line="685"/>
+        <location filename="../../util.cpp" line="979"/>
        <source>None</source>
        <translation>Aucune</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="558"/>
-        <location filename="../../util.cpp" line="706"/>
+        <location filename="../../util.cpp" line="560"/>
+        <location filename="../../util.cpp" line="708"/>
        <source>Musician Profile</source>
        <translation>Profil de musicien</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="563"/>
+        <location filename="../../util.cpp" line="565"/>
        <source>Alias/Name</source>
        <translation>Pseudo/nom</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="565"/>
+        <location filename="../../util.cpp" line="567"/>
        <source>Instrument</source>
        <translation>Instrument</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="567"/>
+        <location filename="../../util.cpp" line="569"/>
        <source>Country</source>
        <translation>Pays</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="569"/>
+        <location filename="../../util.cpp" line="571"/>
        <source>City</source>
        <translation>Ville</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="571"/>
+        <location filename="../../util.cpp" line="573"/>
        <source>Skill</source>
        <translation>Compétence</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="573"/>
+        <location filename="../../util.cpp" line="575"/>
        <source>&amp;Close</source>
        <translation>&amp;Fermer</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="689"/>
+        <location filename="../../util.cpp" line="691"/>
        <source>Beginner</source>
        <translation>Débutant</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="695"/>
+        <location filename="../../util.cpp" line="697"/>
        <source>Intermediate</source>
        <translation>Intermédiaire</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="701"/>
+        <location filename="../../util.cpp" line="703"/>
        <source>Expert</source>
        <translation>Expert</translation>
    </message>
@ -2113,215 +2113,225 @@
        <translation type="vanished">Ce que vous réglez ici apparaîtra au niveau de votre fader sur la table de mixage lorsque vous serez connecté à un serveur </translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="707"/>
+        <location filename="../../util.cpp" line="709"/>
        <source>Write your name or an alias here so the other musicians you want to play with know who you are. You may also add a picture of the instrument you play and a flag of the country you are located in. Your city and skill level playing your instrument may also be added.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="711"/>
+        <location filename="../../util.cpp" line="713"/>
        <source>What you set here will appear at your fader on the mixer board when you are connected to a Jamulus server. This tag will also be shown at each client which is connected to the same server as you. If the name is left empty, the IP address is shown instead.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="978"/>
+        <location filename="../../util.cpp" line="980"/>
        <source>Drum Set</source>
        <translation>Batterie</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="979"/>
+        <location filename="../../util.cpp" line="981"/>
        <source>Djembe</source>
        <translation>Djembé</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="980"/>
+        <location filename="../../util.cpp" line="982"/>
        <source>Electric Guitar</source>
        <translation>Guitare électrique</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="981"/>
+        <location filename="../../util.cpp" line="983"/>
        <source>Acoustic Guitar</source>
        <translation>Guitare accoustique</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="982"/>
+        <location filename="../../util.cpp" line="984"/>
        <source>Bass Guitar</source>
        <translation>Guitare basse</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="983"/>
+        <location filename="../../util.cpp" line="985"/>
        <source>Keyboard</source>
        <translation>Clavier</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="984"/>
+        <location filename="../../util.cpp" line="986"/>
        <source>Synthesizer</source>
        <translation>Synthétiseur</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="985"/>
+        <location filename="../../util.cpp" line="987"/>
        <source>Grand Piano</source>
        <translation>Piano à queue</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="986"/>
+        <location filename="../../util.cpp" line="988"/>
        <source>Accordion</source>
        <translation>Accordéon</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="987"/>
+        <location filename="../../util.cpp" line="989"/>
        <source>Vocal</source>
        <translation>Voix</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="988"/>
+        <location filename="../../util.cpp" line="990"/>
        <source>Microphone</source>
        <translation>Microphone</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="989"/>
+        <location filename="../../util.cpp" line="991"/>
        <source>Harmonica</source>
        <translation>Harmonica</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="990"/>
+        <location filename="../../util.cpp" line="992"/>
        <source>Trumpet</source>
        <translation>Trompette</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="991"/>
+        <location filename="../../util.cpp" line="993"/>
        <source>Trombone</source>
        <translation>Trombone</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="992"/>
+        <location filename="../../util.cpp" line="994"/>
        <source>French Horn</source>
        <translation>Cor d&apos;harmonie</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="993"/>
+        <location filename="../../util.cpp" line="995"/>
        <source>Tuba</source>
        <translation>Tuba</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="994"/>
+        <location filename="../../util.cpp" line="996"/>
        <source>Saxophone</source>
        <translation>Saxophone</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="995"/>
+        <location filename="../../util.cpp" line="997"/>
        <source>Clarinet</source>
        <translation>Clarinette</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="996"/>
+        <location filename="../../util.cpp" line="998"/>
        <source>Flute</source>
        <translation>Flute</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="997"/>
+        <location filename="../../util.cpp" line="999"/>
        <source>Violin</source>
        <translation>Violon</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="998"/>
+        <location filename="../../util.cpp" line="1000"/>
        <source>Cello</source>
        <translation>Violoncelle</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="999"/>
+        <location filename="../../util.cpp" line="1001"/>
        <source>Double Bass</source>
        <translation>Contrebasse</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1000"/>
+        <location filename="../../util.cpp" line="1002"/>
        <source>Recorder</source>
        <translation>Enregistreur</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1001"/>
+        <location filename="../../util.cpp" line="1003"/>
        <source>Streamer</source>
        <translation>Diffuseur</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1002"/>
+        <location filename="../../util.cpp" line="1004"/>
        <source>Listener</source>
        <translation>Auditeur</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1003"/>
+        <location filename="../../util.cpp" line="1005"/>
        <source>Guitar+Vocal</source>
        <translation>Guitare+voix</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1004"/>
+        <location filename="../../util.cpp" line="1006"/>
        <source>Keyboard+Vocal</source>
        <translation>Clavier+voix</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1005"/>
+        <location filename="../../util.cpp" line="1007"/>
        <source>Bodhran</source>
        <translation>Bodhran</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1006"/>
+        <location filename="../../util.cpp" line="1008"/>
        <source>Bassoon</source>
        <translation>Basson</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1007"/>
+        <location filename="../../util.cpp" line="1009"/>
        <source>Oboe</source>
        <translation>Hautbois</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1008"/>
+        <location filename="../../util.cpp" line="1010"/>
        <source>Harp</source>
        <translation>Harpe</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1009"/>
+        <location filename="../../util.cpp" line="1011"/>
        <source>Viola</source>
        <translation>Alto</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1010"/>
+        <location filename="../../util.cpp" line="1012"/>
        <source>Congas</source>
        <translation>Congas</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1011"/>
+        <location filename="../../util.cpp" line="1013"/>
        <source>Bongo</source>
        <translation>Bongo</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1012"/>
+        <location filename="../../util.cpp" line="1014"/>
        <source>Vocal Bass</source>
        <translation>Voix basse</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1013"/>
+        <location filename="../../util.cpp" line="1015"/>
        <source>Vocal Tenor</source>
        <translation>Voix ténor</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1014"/>
+        <location filename="../../util.cpp" line="1016"/>
        <source>Vocal Alto</source>
        <translation>Voix alto</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1015"/>
+        <location filename="../../util.cpp" line="1017"/>
        <source>Vocal Soprano</source>
        <translation>Voix soprano</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1016"/>
+        <location filename="../../util.cpp" line="1018"/>
        <source>Banjo</source>
        <translation>Banjo</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1017"/>
+        <location filename="../../util.cpp" line="1019"/>
        <source>Mandolin</source>
        <translation>Mandoline</translation>
    </message>
+    <message>
+        <location filename="../../util.cpp" line="1020"/>
+        <source>Ukulele</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../util.cpp" line="1021"/>
+        <source>Bass Ukulele</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>CServerDlg</name>
--- a/src/res/translation/translation_it_IT.qm
+++ b/src/res/translation/translation_it_IT.qm
--- a/src/res/translation/translation_it_IT.ts
+++ b/src/res/translation/translation_it_IT.ts
@ -67,62 +67,62 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="403"/>
+        <location filename="../../util.cpp" line="405"/>
        <source>For details on the contributions check out the </source>
        <translation>Per maggiori informazioni su chi ha contribuito, visitare </translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="404"/>
+        <location filename="../../util.cpp" line="406"/>
        <source>Github Contributors list</source>
        <translation>Lista dei collaboratori su Github</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="408"/>
+        <location filename="../../util.cpp" line="410"/>
        <source>Spanish</source>
        <translation>Spagnolo</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="410"/>
+        <location filename="../../util.cpp" line="412"/>
        <source>French</source>
        <translation>Francese</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="412"/>
+        <location filename="../../util.cpp" line="414"/>
        <source>Portuguese</source>
        <translation>Portoghese</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="414"/>
+        <location filename="../../util.cpp" line="416"/>
        <source>Dutch</source>
        <translation>Olandese</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="416"/>
+        <location filename="../../util.cpp" line="418"/>
        <source>Italian</source>
        <translation>Italiano</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="418"/>
+        <location filename="../../util.cpp" line="420"/>
        <source>German</source>
        <translation>Tedesco</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="425"/>
+        <location filename="../../util.cpp" line="427"/>
        <source>About </source>
        <translation>Informazioni su </translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="442"/>
+        <location filename="../../util.cpp" line="444"/>
        <source>, Version </source>
        <translation>, Versione </translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="455"/>
+        <location filename="../../util.cpp" line="457"/>
        <source>Internet Jam Session Software</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="459"/>
+        <location filename="../../util.cpp" line="461"/>
        <source>Released under the GNU General Public License (GPL)</source>
        <translation type="unfinished"></translation>
    </message>
@ -1720,7 +1720,7 @@
    </message>
    <message>
        <location filename="../../connectdlg.cpp" line="49"/>
-        <source>The Connection Setup window shows a list of available servers. Server operators can optionally list their servers by music genre. Use the List dropdown to select a genre, click on the server you want to join and press the Connect button to connect to it. Alternatively, double click on on the server name. Permanent servers (those that have been listed for longer than 24 hours) are shown in bold.</source>
+        <source>The Connection Setup window shows a list of available servers. Server operators can optionally list their servers by music genre. Use the List dropdown to select a genre, click on the server you want to join and press the Connect button to connect to it. Alternatively, double click on on the server name. Permanent servers (those that have been listed for longer than 48 hours) are shown in bold.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
@ -1850,28 +1850,28 @@
 <context>
    <name>CHelpMenu</name>
    <message>
-        <location filename="../../util.cpp" line="841"/>
+        <location filename="../../util.cpp" line="843"/>
        <source>&amp;Help</source>
        <translation>&amp;Aiuto</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="846"/>
-        <location filename="../../util.cpp" line="851"/>
+        <location filename="../../util.cpp" line="848"/>
+        <location filename="../../util.cpp" line="853"/>
        <source>Getting &amp;Started...</source>
        <translation>&amp;Introduzione...</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="847"/>
+        <location filename="../../util.cpp" line="849"/>
        <source>Software &amp;Manual...</source>
        <translation>&amp;Manuale Software...</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="854"/>
+        <location filename="../../util.cpp" line="856"/>
        <source>What&apos;s &amp;This</source>
        <translation>&amp;Cos&apos;è Questo</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="856"/>
+        <location filename="../../util.cpp" line="858"/>
        <source>&amp;About...</source>
        <translation>I&amp;nformazioni su...</translation>
    </message>
@ -1879,102 +1879,102 @@
 <context>
    <name>CLicenceDlg</name>
    <message>
-        <location filename="../../util.cpp" line="481"/>
+        <location filename="../../util.cpp" line="483"/>
        <source>I &amp;agree to the above licence terms</source>
        <translation>&amp;Accetto i termini di licenza</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="482"/>
+        <location filename="../../util.cpp" line="484"/>
        <source>Accept</source>
        <translation>Accetto</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="483"/>
+        <location filename="../../util.cpp" line="485"/>
        <source>Decline</source>
        <translation>Declino</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="499"/>
+        <location filename="../../util.cpp" line="501"/>
        <source>By connecting to this server and agreeing to this notice, you agree to the following:</source>
        <translation>Collegandosi a questo server e accettando questo avviso, si accetta quanto segue:</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="501"/>
+        <location filename="../../util.cpp" line="503"/>
        <source>You agree that all data, sounds, or other works transmitted to this server are owned and created by you or your licensors, and that you are making these data, sounds or other works available via the following Creative Commons License (for more information on this license, see </source>
        <translation>Dichiari che tutti i dati, audio o altre opere trasmessi a questo server sono di tua proprietà e creati da te o dai tuoi licenziatari e che rendi questi dati, audio o altre opere disponibili a terzi mediante la seguente Licenza Creative Commons (per ulteriori informazioni su questa licenza, vedere </translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="509"/>
+        <location filename="../../util.cpp" line="511"/>
        <source>You are free to:</source>
        <translation>Sei libero di:</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="511"/>
+        <location filename="../../util.cpp" line="513"/>
        <source>Share</source>
        <translation>Condividere</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="512"/>
+        <location filename="../../util.cpp" line="514"/>
        <source>copy and redistribute the material in any medium or format</source>
        <translation>copiare e ridistribuire il materiale in qualsiasi supporto o formato</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="513"/>
+        <location filename="../../util.cpp" line="515"/>
        <source>Adapt</source>
        <translation>Adattare</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="514"/>
+        <location filename="../../util.cpp" line="516"/>
        <source>remix, transform, and build upon the material</source>
        <translation>remixare, trasformare e modificare il materiale</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="515"/>
+        <location filename="../../util.cpp" line="517"/>
        <source>The licensor cannot revoke these freedoms as long as you follow the license terms.</source>
        <translation>Il licenziante non può revocare queste libertà fintanto che segui i termini della licenza.</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="517"/>
+        <location filename="../../util.cpp" line="519"/>
        <source>Under the following terms:</source>
        <translation>Sotto i seguenti requisiti:</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="519"/>
+        <location filename="../../util.cpp" line="521"/>
        <source>Attribution</source>
        <translation>Attribuzione</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="520"/>
+        <location filename="../../util.cpp" line="522"/>
        <source>You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use.</source>
        <translation>È necessario accreditare in modo appropriato, fornire un collegamento alla licenza e indicare se sono state apportate modifiche. Puoi farlo in modo ragionevole, ma non in modo tale da suggerire a te o al tuo utilizzo il supporto del licenziante.</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="523"/>
+        <location filename="../../util.cpp" line="525"/>
        <source>NonCommercial</source>
        <translation>Non Commerciale</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="524"/>
+        <location filename="../../util.cpp" line="526"/>
        <source>You may not use the material for commercial purposes.</source>
        <translation>Non è possibile utilizzare il materiale a fini commerciali.</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="525"/>
+        <location filename="../../util.cpp" line="527"/>
        <source>ShareAlike</source>
        <translation>Condividere allo stesso modo</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="526"/>
+        <location filename="../../util.cpp" line="528"/>
        <source>If you remix, transform, or build upon the material, you must distribute your contributions under the same license as the original.</source>
        <translation>Se remixate, trasformate o sviluppate il materiale, dovete distribuire i vostri contributi con la stessa licenza dell&apos;originale.</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="528"/>
+        <location filename="../../util.cpp" line="530"/>
        <source>No additional restrictions</source>
        <translation>Nessuna restrizione aggiuntiva</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="529"/>
+        <location filename="../../util.cpp" line="531"/>
        <source>You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits.</source>
        <translation>Non è possibile applicare termini legali o misure tecnologiche che impediscono legalmente ad altre persone di fare qualsiasi cosa consentita dalla licenza.</translation>
    </message>
@ -1982,60 +1982,60 @@
 <context>
    <name>CMusProfDlg</name>
    <message>
-        <location filename="../../util.cpp" line="558"/>
-        <location filename="../../util.cpp" line="706"/>
+        <location filename="../../util.cpp" line="560"/>
+        <location filename="../../util.cpp" line="708"/>
        <source>Musician Profile</source>
        <translation>Profilo del Musicista</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="563"/>
+        <location filename="../../util.cpp" line="565"/>
        <source>Alias/Name</source>
        <translation>Nome/Alias</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="565"/>
+        <location filename="../../util.cpp" line="567"/>
        <source>Instrument</source>
        <translation>Strumento</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="567"/>
+        <location filename="../../util.cpp" line="569"/>
        <source>Country</source>
        <translation>Paese</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="569"/>
+        <location filename="../../util.cpp" line="571"/>
        <source>City</source>
        <translation>Città</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="571"/>
+        <location filename="../../util.cpp" line="573"/>
        <source>Skill</source>
        <translation>Livello</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="573"/>
+        <location filename="../../util.cpp" line="575"/>
        <source>&amp;Close</source>
        <translation>&amp;Chiudi</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="671"/>
-        <location filename="../../util.cpp" line="683"/>
-        <location filename="../../util.cpp" line="977"/>
+        <location filename="../../util.cpp" line="673"/>
+        <location filename="../../util.cpp" line="685"/>
+        <location filename="../../util.cpp" line="979"/>
        <source>None</source>
        <translation>None</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="689"/>
+        <location filename="../../util.cpp" line="691"/>
        <source>Beginner</source>
        <translation>Principiante</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="695"/>
+        <location filename="../../util.cpp" line="697"/>
        <source>Intermediate</source>
        <translation>Intermedio</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="701"/>
+        <location filename="../../util.cpp" line="703"/>
        <source>Expert</source>
        <translation>Esperto</translation>
    </message>
@ -2052,240 +2052,250 @@
        <translation type="vanished"> questo tag verrà mostrato anche a ciascun client connesso allo stesso server. Se viene lasciato vuoto, verrà visualizzato l&apos;indirizzo IP.</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="707"/>
+        <location filename="../../util.cpp" line="709"/>
        <source>Write your name or an alias here so the other musicians you want to play with know who you are. You may also add a picture of the instrument you play and a flag of the country you are located in. Your city and skill level playing your instrument may also be added.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="711"/>
+        <location filename="../../util.cpp" line="713"/>
        <source>What you set here will appear at your fader on the mixer board when you are connected to a Jamulus server. This tag will also be shown at each client which is connected to the same server as you. If the name is left empty, the IP address is shown instead.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="717"/>
+        <location filename="../../util.cpp" line="719"/>
        <source>Alias or name edit box</source>
        <translation>Box di modifica Nome o Alias</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="719"/>
+        <location filename="../../util.cpp" line="721"/>
        <source>Instrument picture button</source>
        <translation>Immagine dello strumento</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="721"/>
+        <location filename="../../util.cpp" line="723"/>
        <source>Country flag button</source>
        <translation>Pulsante bandiera del paese</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="723"/>
+        <location filename="../../util.cpp" line="725"/>
        <source>City edit box</source>
        <translation>Box di modifica Città</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="725"/>
+        <location filename="../../util.cpp" line="727"/>
        <source>Skill level combo box</source>
        <translation>Livello di Abilità</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="978"/>
+        <location filename="../../util.cpp" line="980"/>
        <source>Drum Set</source>
        <translation>Batteria</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="979"/>
+        <location filename="../../util.cpp" line="981"/>
        <source>Djembe</source>
        <translation>Djembe</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="980"/>
+        <location filename="../../util.cpp" line="982"/>
        <source>Electric Guitar</source>
        <translation>Chitarra elettrica</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="981"/>
+        <location filename="../../util.cpp" line="983"/>
        <source>Acoustic Guitar</source>
        <translation>Chitarra Acustica</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="982"/>
+        <location filename="../../util.cpp" line="984"/>
        <source>Bass Guitar</source>
        <translation>Basso Elettrico</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="983"/>
+        <location filename="../../util.cpp" line="985"/>
        <source>Keyboard</source>
        <translation>Tastiera</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="984"/>
+        <location filename="../../util.cpp" line="986"/>
        <source>Synthesizer</source>
        <translation>Sintetizzatore</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="985"/>
+        <location filename="../../util.cpp" line="987"/>
        <source>Grand Piano</source>
        <translation>Grand Piano</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="986"/>
+        <location filename="../../util.cpp" line="988"/>
        <source>Accordion</source>
        <translation>Fisarmonica</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="987"/>
+        <location filename="../../util.cpp" line="989"/>
        <source>Vocal</source>
        <translation>Voce</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="988"/>
+        <location filename="../../util.cpp" line="990"/>
        <source>Microphone</source>
        <translation>Microfono</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="989"/>
+        <location filename="../../util.cpp" line="991"/>
        <source>Harmonica</source>
        <translation>Armonica</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="990"/>
+        <location filename="../../util.cpp" line="992"/>
        <source>Trumpet</source>
        <translation>Tromba</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="991"/>
+        <location filename="../../util.cpp" line="993"/>
        <source>Trombone</source>
        <translation>Trombone</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="992"/>
+        <location filename="../../util.cpp" line="994"/>
        <source>French Horn</source>
        <translation>Corno Francese</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="993"/>
+        <location filename="../../util.cpp" line="995"/>
        <source>Tuba</source>
        <translation>Tuba</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="994"/>
+        <location filename="../../util.cpp" line="996"/>
        <source>Saxophone</source>
        <translation>Sassofono</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="995"/>
+        <location filename="../../util.cpp" line="997"/>
        <source>Clarinet</source>
        <translation>Clarinet</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="996"/>
+        <location filename="../../util.cpp" line="998"/>
        <source>Flute</source>
        <translation>Flauto</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="997"/>
+        <location filename="../../util.cpp" line="999"/>
        <source>Violin</source>
        <translation>Violino</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="998"/>
+        <location filename="../../util.cpp" line="1000"/>
        <source>Cello</source>
        <translation>Cello</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="999"/>
+        <location filename="../../util.cpp" line="1001"/>
        <source>Double Bass</source>
        <translation>Contrabbasso</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1000"/>
+        <location filename="../../util.cpp" line="1002"/>
        <source>Recorder</source>
        <translation>Recorder</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1001"/>
+        <location filename="../../util.cpp" line="1003"/>
        <source>Streamer</source>
        <translation>Streamer</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1002"/>
+        <location filename="../../util.cpp" line="1004"/>
        <source>Listener</source>
        <translation>Ascoltatore</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1003"/>
+        <location filename="../../util.cpp" line="1005"/>
        <source>Guitar+Vocal</source>
        <translation>Chitarra+Voce</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1004"/>
+        <location filename="../../util.cpp" line="1006"/>
        <source>Keyboard+Vocal</source>
        <translation>Tastiera+Voce</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1005"/>
+        <location filename="../../util.cpp" line="1007"/>
        <source>Bodhran</source>
        <translation>Bodhran</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1006"/>
+        <location filename="../../util.cpp" line="1008"/>
        <source>Bassoon</source>
        <translation>Fagotto</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1007"/>
+        <location filename="../../util.cpp" line="1009"/>
        <source>Oboe</source>
        <translation>Oboe</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1008"/>
+        <location filename="../../util.cpp" line="1010"/>
        <source>Harp</source>
        <translation>Arpa</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1009"/>
+        <location filename="../../util.cpp" line="1011"/>
        <source>Viola</source>
        <translation>Viola</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1010"/>
+        <location filename="../../util.cpp" line="1012"/>
        <source>Congas</source>
        <translation>Congas</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1011"/>
+        <location filename="../../util.cpp" line="1013"/>
        <source>Bongo</source>
        <translation>Bongo</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1012"/>
+        <location filename="../../util.cpp" line="1014"/>
        <source>Vocal Bass</source>
        <translation>Voce Basso</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1013"/>
+        <location filename="../../util.cpp" line="1015"/>
        <source>Vocal Tenor</source>
        <translation>Voce Tenore</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1014"/>
+        <location filename="../../util.cpp" line="1016"/>
        <source>Vocal Alto</source>
        <translation>Voce Alto</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1015"/>
+        <location filename="../../util.cpp" line="1017"/>
        <source>Vocal Soprano</source>
        <translation>Voce Soprano</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1016"/>
+        <location filename="../../util.cpp" line="1018"/>
        <source>Banjo</source>
        <translation>Banjo</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1017"/>
+        <location filename="../../util.cpp" line="1019"/>
        <source>Mandolin</source>
        <translation>Mandolino</translation>
    </message>
+    <message>
+        <location filename="../../util.cpp" line="1020"/>
+        <source>Ukulele</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../util.cpp" line="1021"/>
+        <source>Bass Ukulele</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>CServerDlg</name>
--- a/src/res/translation/translation_nl_NL.qm
+++ b/src/res/translation/translation_nl_NL.qm
--- a/src/res/translation/translation_nl_NL.ts
+++ b/src/res/translation/translation_nl_NL.ts
@ -67,62 +67,62 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="403"/>
+        <location filename="../../util.cpp" line="405"/>
        <source>For details on the contributions check out the </source>
        <translation>Voor details over de bijdragen, zie de </translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="404"/>
+        <location filename="../../util.cpp" line="406"/>
        <source>Github Contributors list</source>
        <translation>Github Bijdragerslijst</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="408"/>
+        <location filename="../../util.cpp" line="410"/>
        <source>Spanish</source>
        <translation>Spaans</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="410"/>
+        <location filename="../../util.cpp" line="412"/>
        <source>French</source>
        <translation>Frans</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="412"/>
+        <location filename="../../util.cpp" line="414"/>
        <source>Portuguese</source>
        <translation>Portugees</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="414"/>
+        <location filename="../../util.cpp" line="416"/>
        <source>Dutch</source>
        <translation>Nederlands</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="416"/>
+        <location filename="../../util.cpp" line="418"/>
        <source>Italian</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="418"/>
+        <location filename="../../util.cpp" line="420"/>
        <source>German</source>
        <translation>Duits</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="425"/>
+        <location filename="../../util.cpp" line="427"/>
        <source>About </source>
        <translation>Over </translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="442"/>
+        <location filename="../../util.cpp" line="444"/>
        <source>, Version </source>
        <translation>, Versie </translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="455"/>
+        <location filename="../../util.cpp" line="457"/>
        <source>Internet Jam Session Software</source>
        <translation>Internet Jamsessie Software</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="459"/>
+        <location filename="../../util.cpp" line="461"/>
        <source>Released under the GNU General Public License (GPL)</source>
        <translation type="unfinished"></translation>
    </message>
@ -1712,7 +1712,7 @@
    </message>
    <message>
        <location filename="../../connectdlg.cpp" line="49"/>
-        <source>The Connection Setup window shows a list of available servers. Server operators can optionally list their servers by music genre. Use the List dropdown to select a genre, click on the server you want to join and press the Connect button to connect to it. Alternatively, double click on on the server name. Permanent servers (those that have been listed for longer than 24 hours) are shown in bold.</source>
+        <source>The Connection Setup window shows a list of available servers. Server operators can optionally list their servers by music genre. Use the List dropdown to select a genre, click on the server you want to join and press the Connect button to connect to it. Alternatively, double click on on the server name. Permanent servers (those that have been listed for longer than 48 hours) are shown in bold.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
@ -1842,28 +1842,28 @@
 <context>
    <name>CHelpMenu</name>
    <message>
-        <location filename="../../util.cpp" line="841"/>
+        <location filename="../../util.cpp" line="843"/>
        <source>&amp;Help</source>
        <translation>&amp;Hulp</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="846"/>
-        <location filename="../../util.cpp" line="851"/>
+        <location filename="../../util.cpp" line="848"/>
+        <location filename="../../util.cpp" line="853"/>
        <source>Getting &amp;Started...</source>
        <translation>Aan de slag...</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="847"/>
+        <location filename="../../util.cpp" line="849"/>
        <source>Software &amp;Manual...</source>
        <translation>Softwarehandleiding...</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="854"/>
+        <location filename="../../util.cpp" line="856"/>
        <source>What&apos;s &amp;This</source>
        <translation>Wat Is Dit</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="856"/>
+        <location filename="../../util.cpp" line="858"/>
        <source>&amp;About...</source>
        <translation>&amp;Over...</translation>
    </message>
@ -1871,102 +1871,102 @@
 <context>
    <name>CLicenceDlg</name>
    <message>
-        <location filename="../../util.cpp" line="481"/>
+        <location filename="../../util.cpp" line="483"/>
        <source>I &amp;agree to the above licence terms</source>
        <translation>Ik stem in met bovenstaande licentievoorwaarden</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="482"/>
+        <location filename="../../util.cpp" line="484"/>
        <source>Accept</source>
        <translation>Accepteer</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="483"/>
+        <location filename="../../util.cpp" line="485"/>
        <source>Decline</source>
        <translation>Niet akkoord</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="499"/>
+        <location filename="../../util.cpp" line="501"/>
        <source>By connecting to this server and agreeing to this notice, you agree to the following:</source>
        <translation>Door verbinding te maken met deze server en akkoord te gaan met deze mededeling, gaat u akkoord met het volgende:</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="501"/>
+        <location filename="../../util.cpp" line="503"/>
        <source>You agree that all data, sounds, or other works transmitted to this server are owned and created by you or your licensors, and that you are making these data, sounds or other works available via the following Creative Commons License (for more information on this license, see </source>
        <translation>U gaat ermee akkoord dat alle gegevens, geluiden of andere werken die naar deze server worden verzonden, eigendom zijn van en gemaakt zijn door u of uw licentiegevers, en dat u deze gegevens, geluiden of andere werken beschikbaar stelt via de volgende Creative Commons Licentie (voor meer informatie over deze licentie, zie </translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="509"/>
+        <location filename="../../util.cpp" line="511"/>
        <source>You are free to:</source>
        <translation>Je staat vrij om:</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="511"/>
+        <location filename="../../util.cpp" line="513"/>
        <source>Share</source>
        <translation>het materiaal</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="512"/>
+        <location filename="../../util.cpp" line="514"/>
        <source>copy and redistribute the material in any medium or format</source>
        <translation> te delen, te kopiëren en te herdistribueren in elk medium of formaat</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="513"/>
+        <location filename="../../util.cpp" line="515"/>
        <source>Adapt</source>
        <translation>Aanpassen</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="514"/>
+        <location filename="../../util.cpp" line="516"/>
        <source>remix, transform, and build upon the material</source>
        <translation>remixen, transformeren en bouwen op het materiaal</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="515"/>
+        <location filename="../../util.cpp" line="517"/>
        <source>The licensor cannot revoke these freedoms as long as you follow the license terms.</source>
        <translation>De licentiegever kan deze vrijheden niet herroepen zolang u zich aan de licentievoorwaarden houdt.</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="517"/>
+        <location filename="../../util.cpp" line="519"/>
        <source>Under the following terms:</source>
        <translation>Onder de volgende voorwaarden:</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="519"/>
+        <location filename="../../util.cpp" line="521"/>
        <source>Attribution</source>
        <translation>Naamsvermelding</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="520"/>
+        <location filename="../../util.cpp" line="522"/>
        <source>You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use.</source>
        <translation>U moet de juiste erkenning geven, een link naar de licentie geven en aangeven of er wijzigingen zijn aangebracht. U mag dit op elke redelijke manier doen, maar niet op een manier die suggereert dat de licentiegever u of uw gebruik goedkeurt.</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="523"/>
+        <location filename="../../util.cpp" line="525"/>
        <source>NonCommercial</source>
        <translation>Niet-commercieel</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="524"/>
+        <location filename="../../util.cpp" line="526"/>
        <source>You may not use the material for commercial purposes.</source>
        <translation>U mag het materiaal niet voor commerciële doeleinden gebruiken.</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="525"/>
+        <location filename="../../util.cpp" line="527"/>
        <source>ShareAlike</source>
        <translation>hareAlike</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="526"/>
+        <location filename="../../util.cpp" line="528"/>
        <source>If you remix, transform, or build upon the material, you must distribute your contributions under the same license as the original.</source>
        <translation>Als u het materiaal remixt, transformeert of uitbouwt, moet u uw bijdragen distribueren onder dezelfde licentie als het origineel.</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="528"/>
+        <location filename="../../util.cpp" line="530"/>
        <source>No additional restrictions</source>
        <translation>Geen extra beperkingen</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="529"/>
+        <location filename="../../util.cpp" line="531"/>
        <source>You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits.</source>
        <translation>U mag geen wettelijke voorwaarden of technologische maatregelen toepassen die anderen wettelijk beperken om iets te doen wat de licentie toestaat.</translation>
    </message>
@ -1974,60 +1974,60 @@
 <context>
    <name>CMusProfDlg</name>
    <message>
-        <location filename="../../util.cpp" line="558"/>
-        <location filename="../../util.cpp" line="706"/>
+        <location filename="../../util.cpp" line="560"/>
+        <location filename="../../util.cpp" line="708"/>
        <source>Musician Profile</source>
        <translation>Muzikantenprofiel</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="563"/>
+        <location filename="../../util.cpp" line="565"/>
        <source>Alias/Name</source>
        <translation>Alias/Naam</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="565"/>
+        <location filename="../../util.cpp" line="567"/>
        <source>Instrument</source>
        <translation>Instrument</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="567"/>
+        <location filename="../../util.cpp" line="569"/>
        <source>Country</source>
        <translation>Land</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="569"/>
+        <location filename="../../util.cpp" line="571"/>
        <source>City</source>
        <translation>Stad</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="571"/>
+        <location filename="../../util.cpp" line="573"/>
        <source>Skill</source>
        <translation>Vaardigheid</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="573"/>
+        <location filename="../../util.cpp" line="575"/>
        <source>&amp;Close</source>
        <translation>&amp;Sluiten</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="671"/>
-        <location filename="../../util.cpp" line="683"/>
-        <location filename="../../util.cpp" line="977"/>
+        <location filename="../../util.cpp" line="673"/>
+        <location filename="../../util.cpp" line="685"/>
+        <location filename="../../util.cpp" line="979"/>
        <source>None</source>
        <translation>Geen</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="689"/>
+        <location filename="../../util.cpp" line="691"/>
        <source>Beginner</source>
        <translation>Beginner</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="695"/>
+        <location filename="../../util.cpp" line="697"/>
        <source>Intermediate</source>
        <translation>Gemiddeld</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="701"/>
+        <location filename="../../util.cpp" line="703"/>
        <source>Expert</source>
        <translation>Gevorderd</translation>
    </message>
@ -2044,240 +2044,250 @@
        <translation type="vanished"> server. Deze tag zal ook verschijnen op elke client die verbonden is met dezelfde server als u. Als de naam leeg is, wordt in plaats daarvan het IP-adres getoond.</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="707"/>
+        <location filename="../../util.cpp" line="709"/>
        <source>Write your name or an alias here so the other musicians you want to play with know who you are. You may also add a picture of the instrument you play and a flag of the country you are located in. Your city and skill level playing your instrument may also be added.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="711"/>
+        <location filename="../../util.cpp" line="713"/>
        <source>What you set here will appear at your fader on the mixer board when you are connected to a Jamulus server. This tag will also be shown at each client which is connected to the same server as you. If the name is left empty, the IP address is shown instead.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="717"/>
+        <location filename="../../util.cpp" line="719"/>
        <source>Alias or name edit box</source>
        <translation>Alias of naam bewerkingsvak</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="719"/>
+        <location filename="../../util.cpp" line="721"/>
        <source>Instrument picture button</source>
        <translation>Afbeelding van het instrument</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="721"/>
+        <location filename="../../util.cpp" line="723"/>
        <source>Country flag button</source>
        <translation>Landvlag knop</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="723"/>
+        <location filename="../../util.cpp" line="725"/>
        <source>City edit box</source>
        <translation>Bewerkingsbox voor de stad</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="725"/>
+        <location filename="../../util.cpp" line="727"/>
        <source>Skill level combo box</source>
        <translation>Combo-box voor vaardigheidsniveau</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="978"/>
+        <location filename="../../util.cpp" line="980"/>
        <source>Drum Set</source>
        <translation>Drumstel</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="979"/>
+        <location filename="../../util.cpp" line="981"/>
        <source>Djembe</source>
        <translation>Djembe</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="980"/>
+        <location filename="../../util.cpp" line="982"/>
        <source>Electric Guitar</source>
        <translation>Elektrische Gitaar</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="981"/>
+        <location filename="../../util.cpp" line="983"/>
        <source>Acoustic Guitar</source>
        <translation>Akoestische Gitaar</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="982"/>
+        <location filename="../../util.cpp" line="984"/>
        <source>Bass Guitar</source>
        <translation>Basgitaar</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="983"/>
+        <location filename="../../util.cpp" line="985"/>
        <source>Keyboard</source>
        <translation>Toetsenbord</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="984"/>
+        <location filename="../../util.cpp" line="986"/>
        <source>Synthesizer</source>
        <translation>Synthesizer</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="985"/>
+        <location filename="../../util.cpp" line="987"/>
        <source>Grand Piano</source>
        <translation>Piano</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="986"/>
+        <location filename="../../util.cpp" line="988"/>
        <source>Accordion</source>
        <translation>Accordeon</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="987"/>
+        <location filename="../../util.cpp" line="989"/>
        <source>Vocal</source>
        <translation>Vocaal</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="988"/>
+        <location filename="../../util.cpp" line="990"/>
        <source>Microphone</source>
        <translation>Microfoon</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="989"/>
+        <location filename="../../util.cpp" line="991"/>
        <source>Harmonica</source>
        <translation>Harmonica</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="990"/>
+        <location filename="../../util.cpp" line="992"/>
        <source>Trumpet</source>
        <translation>Trompet</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="991"/>
+        <location filename="../../util.cpp" line="993"/>
        <source>Trombone</source>
        <translation>Trombone</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="992"/>
+        <location filename="../../util.cpp" line="994"/>
        <source>French Horn</source>
        <translation>Hoorn</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="993"/>
+        <location filename="../../util.cpp" line="995"/>
        <source>Tuba</source>
        <translation>Tuba</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="994"/>
+        <location filename="../../util.cpp" line="996"/>
        <source>Saxophone</source>
        <translation>Saxofoon</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="995"/>
+        <location filename="../../util.cpp" line="997"/>
        <source>Clarinet</source>
        <translation>Klarinet</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="996"/>
+        <location filename="../../util.cpp" line="998"/>
        <source>Flute</source>
        <translation>Fluit</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="997"/>
+        <location filename="../../util.cpp" line="999"/>
        <source>Violin</source>
        <translation>Viool</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="998"/>
+        <location filename="../../util.cpp" line="1000"/>
        <source>Cello</source>
        <translation>Cello</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="999"/>
+        <location filename="../../util.cpp" line="1001"/>
        <source>Double Bass</source>
        <translation>Contrabas</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1000"/>
+        <location filename="../../util.cpp" line="1002"/>
        <source>Recorder</source>
        <translation>Opnemer</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1001"/>
+        <location filename="../../util.cpp" line="1003"/>
        <source>Streamer</source>
        <translation>Streamer</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1002"/>
+        <location filename="../../util.cpp" line="1004"/>
        <source>Listener</source>
        <translation>Luisteraar</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1003"/>
+        <location filename="../../util.cpp" line="1005"/>
        <source>Guitar+Vocal</source>
        <translation>Gitaar+Vocaal</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1004"/>
+        <location filename="../../util.cpp" line="1006"/>
        <source>Keyboard+Vocal</source>
        <translation>Toetsenbord+Vocaal</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1005"/>
+        <location filename="../../util.cpp" line="1007"/>
        <source>Bodhran</source>
        <translation>Bodhran</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1006"/>
+        <location filename="../../util.cpp" line="1008"/>
        <source>Bassoon</source>
        <translation>Fagot</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1007"/>
+        <location filename="../../util.cpp" line="1009"/>
        <source>Oboe</source>
        <translation>Hobo</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1008"/>
+        <location filename="../../util.cpp" line="1010"/>
        <source>Harp</source>
        <translation>Harp</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1009"/>
+        <location filename="../../util.cpp" line="1011"/>
        <source>Viola</source>
        <translation>Viola</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1010"/>
+        <location filename="../../util.cpp" line="1012"/>
        <source>Congas</source>
        <translation>Congas</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1011"/>
+        <location filename="../../util.cpp" line="1013"/>
        <source>Bongo</source>
        <translation>Bongo</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1012"/>
+        <location filename="../../util.cpp" line="1014"/>
        <source>Vocal Bass</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1013"/>
+        <location filename="../../util.cpp" line="1015"/>
        <source>Vocal Tenor</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1014"/>
+        <location filename="../../util.cpp" line="1016"/>
        <source>Vocal Alto</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1015"/>
+        <location filename="../../util.cpp" line="1017"/>
        <source>Vocal Soprano</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1016"/>
+        <location filename="../../util.cpp" line="1018"/>
        <source>Banjo</source>
        <translation>Banjo</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1017"/>
+        <location filename="../../util.cpp" line="1019"/>
        <source>Mandolin</source>
        <translation>Mandoline</translation>
    </message>
+    <message>
+        <location filename="../../util.cpp" line="1020"/>
+        <source>Ukulele</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../util.cpp" line="1021"/>
+        <source>Bass Ukulele</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>CServerDlg</name>
--- a/src/res/translation/translation_pt_PT.qm
+++ b/src/res/translation/translation_pt_PT.qm
--- a/src/res/translation/translation_pt_PT.ts
+++ b/src/res/translation/translation_pt_PT.ts
@ -71,62 +71,62 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="403"/>
+        <location filename="../../util.cpp" line="405"/>
        <source>For details on the contributions check out the </source>
        <translation>Para detalhes sobre as contribuições, consulte a </translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="404"/>
+        <location filename="../../util.cpp" line="406"/>
        <source>Github Contributors list</source>
        <translation>lista de colaboradores do Github</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="408"/>
+        <location filename="../../util.cpp" line="410"/>
        <source>Spanish</source>
        <translation>Espanhol</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="410"/>
+        <location filename="../../util.cpp" line="412"/>
        <source>French</source>
        <translation>Francês</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="412"/>
+        <location filename="../../util.cpp" line="414"/>
        <source>Portuguese</source>
        <translation>Português</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="414"/>
+        <location filename="../../util.cpp" line="416"/>
        <source>Dutch</source>
        <translation>Holandês</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="416"/>
+        <location filename="../../util.cpp" line="418"/>
        <source>Italian</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="418"/>
+        <location filename="../../util.cpp" line="420"/>
        <source>German</source>
        <translation>Alemão</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="425"/>
+        <location filename="../../util.cpp" line="427"/>
        <source>About </source>
        <translation>Sobre o </translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="442"/>
+        <location filename="../../util.cpp" line="444"/>
        <source>, Version </source>
        <translation>, Versão </translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="455"/>
+        <location filename="../../util.cpp" line="457"/>
        <source>Internet Jam Session Software</source>
        <translation>Programa de Jam Sessions pela Internet</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="459"/>
+        <location filename="../../util.cpp" line="461"/>
        <source>Released under the GNU General Public License (GPL)</source>
        <translation type="unfinished"></translation>
    </message>
@ -1740,7 +1740,7 @@
    </message>
    <message>
        <location filename="../../connectdlg.cpp" line="49"/>
-        <source>The Connection Setup window shows a list of available servers. Server operators can optionally list their servers by music genre. Use the List dropdown to select a genre, click on the server you want to join and press the Connect button to connect to it. Alternatively, double click on on the server name. Permanent servers (those that have been listed for longer than 24 hours) are shown in bold.</source>
+        <source>The Connection Setup window shows a list of available servers. Server operators can optionally list their servers by music genre. Use the List dropdown to select a genre, click on the server you want to join and press the Connect button to connect to it. Alternatively, double click on on the server name. Permanent servers (those that have been listed for longer than 48 hours) are shown in bold.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
@ -1870,28 +1870,28 @@
 <context>
    <name>CHelpMenu</name>
    <message>
-        <location filename="../../util.cpp" line="841"/>
+        <location filename="../../util.cpp" line="843"/>
        <source>&amp;Help</source>
        <translation>&amp;Ajuda</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="846"/>
-        <location filename="../../util.cpp" line="851"/>
+        <location filename="../../util.cpp" line="848"/>
+        <location filename="../../util.cpp" line="853"/>
        <source>Getting &amp;Started...</source>
        <translation>Como Começa&amp;r...</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="847"/>
+        <location filename="../../util.cpp" line="849"/>
        <source>Software &amp;Manual...</source>
        <translation>&amp;Manual do Programa...</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="854"/>
+        <location filename="../../util.cpp" line="856"/>
        <source>What&apos;s &amp;This</source>
        <translation>O que é &amp;isto</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="856"/>
+        <location filename="../../util.cpp" line="858"/>
        <source>&amp;About...</source>
        <translation>&amp;Sobre...</translation>
    </message>
@ -1899,102 +1899,102 @@
 <context>
    <name>CLicenceDlg</name>
    <message>
-        <location filename="../../util.cpp" line="481"/>
+        <location filename="../../util.cpp" line="483"/>
        <source>I &amp;agree to the above licence terms</source>
        <translation>Eu &amp;aceito os termos da licença acima</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="482"/>
+        <location filename="../../util.cpp" line="484"/>
        <source>Accept</source>
        <translation>Aceitar</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="483"/>
+        <location filename="../../util.cpp" line="485"/>
        <source>Decline</source>
        <translation>Rejeitar</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="499"/>
+        <location filename="../../util.cpp" line="501"/>
        <source>By connecting to this server and agreeing to this notice, you agree to the following:</source>
        <translation>Ao ligar-se a este servidor e concordar com este aviso, está a concordar com o seguinte:</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="501"/>
+        <location filename="../../util.cpp" line="503"/>
        <source>You agree that all data, sounds, or other works transmitted to this server are owned and created by you or your licensors, and that you are making these data, sounds or other works available via the following Creative Commons License (for more information on this license, see </source>
        <translation>Você concorda que todos os dados, sons ou outros trabalhos transmitidos para este servidor pertencem e são criados por você ou por seus licenciadores, e que você está disponibilizando esses dados, sons ou outros trabalhos através da seguinte licença Creative Commons (para obter mais informações sobre esta licença, consulte </translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="509"/>
+        <location filename="../../util.cpp" line="511"/>
        <source>You are free to:</source>
        <translation>Você tem o direito de:</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="511"/>
+        <location filename="../../util.cpp" line="513"/>
        <source>Share</source>
        <translation>Compartilhar</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="512"/>
+        <location filename="../../util.cpp" line="514"/>
        <source>copy and redistribute the material in any medium or format</source>
        <translation>copiar e redistribuir o material em qualquer suporte ou formato</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="513"/>
+        <location filename="../../util.cpp" line="515"/>
        <source>Adapt</source>
        <translation>Adaptar</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="514"/>
+        <location filename="../../util.cpp" line="516"/>
        <source>remix, transform, and build upon the material</source>
        <translation>remisturar, transformar, e criar a partir do material</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="515"/>
+        <location filename="../../util.cpp" line="517"/>
        <source>The licensor cannot revoke these freedoms as long as you follow the license terms.</source>
        <translation>O licenciante não pode revogar estes direitos desde que você respeite os termos da licença.</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="517"/>
+        <location filename="../../util.cpp" line="519"/>
        <source>Under the following terms:</source>
        <translation>De acordo com os termos seguintes:</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="519"/>
+        <location filename="../../util.cpp" line="521"/>
        <source>Attribution</source>
        <translation>Atribuição</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="520"/>
+        <location filename="../../util.cpp" line="522"/>
        <source>You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use.</source>
        <translation>Você deve atribuir o devido crédito, fornecer um link para a licença, e indicar se foram feitas alterações. Você pode fazê-lo de qualquer forma razoável, mas não de uma forma que sugira que o licenciante o apoia ou aprova o seu uso.</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="523"/>
+        <location filename="../../util.cpp" line="525"/>
        <source>NonCommercial</source>
        <translation>NãoComercial</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="524"/>
+        <location filename="../../util.cpp" line="526"/>
        <source>You may not use the material for commercial purposes.</source>
        <translation>Você não pode usar o material para fins comerciais.</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="525"/>
+        <location filename="../../util.cpp" line="527"/>
        <source>ShareAlike</source>
        <translation>CompartilhaIgual</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="526"/>
+        <location filename="../../util.cpp" line="528"/>
        <source>If you remix, transform, or build upon the material, you must distribute your contributions under the same license as the original.</source>
        <translation>Se você remisturar, transformar, ou criar a partir do material, tem de distribuir as suas contribuições ao abrigo da mesma licença que o original.</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="528"/>
+        <location filename="../../util.cpp" line="530"/>
        <source>No additional restrictions</source>
        <translation>Sem restrições adicionais</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="529"/>
+        <location filename="../../util.cpp" line="531"/>
        <source>You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits.</source>
        <translation>Você não pode aplicar termos jurídicos ou medidas de caráter tecnológico que restrinjam legalmente outros de fazerem algo que a licença permita.</translation>
    </message>
@ -2006,85 +2006,85 @@
        <translation type="vanished">. Esta identificação também será exibida em cada cliente ligado ao mesmo servidor que você. Se o nome estiver vazio, o endereço IP será mostrado.</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="717"/>
+        <location filename="../../util.cpp" line="719"/>
        <source>Alias or name edit box</source>
        <translation>Caixa de edição do nome ou pseudônimo</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="719"/>
+        <location filename="../../util.cpp" line="721"/>
        <source>Instrument picture button</source>
        <translation>Botão da imagem do instrumento</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="721"/>
+        <location filename="../../util.cpp" line="723"/>
        <source>Country flag button</source>
        <translation>Botão da bandeira do país</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="723"/>
+        <location filename="../../util.cpp" line="725"/>
        <source>City edit box</source>
        <translation>Caixa de edição da cidade</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="725"/>
+        <location filename="../../util.cpp" line="727"/>
        <source>Skill level combo box</source>
        <translation>Caixa do nível de habilidade</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="671"/>
-        <location filename="../../util.cpp" line="683"/>
-        <location filename="../../util.cpp" line="977"/>
+        <location filename="../../util.cpp" line="673"/>
+        <location filename="../../util.cpp" line="685"/>
+        <location filename="../../util.cpp" line="979"/>
        <source>None</source>
        <translation>Nenhum</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="558"/>
-        <location filename="../../util.cpp" line="706"/>
+        <location filename="../../util.cpp" line="560"/>
+        <location filename="../../util.cpp" line="708"/>
        <source>Musician Profile</source>
        <translation>Perfil do músico</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="563"/>
+        <location filename="../../util.cpp" line="565"/>
        <source>Alias/Name</source>
        <translation>Nome/Alcunha</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="565"/>
+        <location filename="../../util.cpp" line="567"/>
        <source>Instrument</source>
        <translation>Instrumento</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="567"/>
+        <location filename="../../util.cpp" line="569"/>
        <source>Country</source>
        <translation>País</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="569"/>
+        <location filename="../../util.cpp" line="571"/>
        <source>City</source>
        <translation>Cidade</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="571"/>
+        <location filename="../../util.cpp" line="573"/>
        <source>Skill</source>
        <translation>Habilidade</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="573"/>
+        <location filename="../../util.cpp" line="575"/>
        <source>&amp;Close</source>
        <translation>&amp;Fechar</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="689"/>
+        <location filename="../../util.cpp" line="691"/>
        <source>Beginner</source>
        <translation>Principiante</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="695"/>
+        <location filename="../../util.cpp" line="697"/>
        <source>Intermediate</source>
        <translation>Intermediário</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="701"/>
+        <location filename="../../util.cpp" line="703"/>
        <source>Expert</source>
        <translation>Avançado</translation>
    </message>
@ -2097,215 +2097,225 @@
        <translation type="vanished">O que definir aqui aparecerá por baixo do seu fader na secção de mistura quando estiver ligado a um servidor </translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="707"/>
+        <location filename="../../util.cpp" line="709"/>
        <source>Write your name or an alias here so the other musicians you want to play with know who you are. You may also add a picture of the instrument you play and a flag of the country you are located in. Your city and skill level playing your instrument may also be added.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="711"/>
+        <location filename="../../util.cpp" line="713"/>
        <source>What you set here will appear at your fader on the mixer board when you are connected to a Jamulus server. This tag will also be shown at each client which is connected to the same server as you. If the name is left empty, the IP address is shown instead.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="978"/>
+        <location filename="../../util.cpp" line="980"/>
        <source>Drum Set</source>
        <translation>Bateria</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="979"/>
+        <location filename="../../util.cpp" line="981"/>
        <source>Djembe</source>
        <translation>Djembe</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="980"/>
+        <location filename="../../util.cpp" line="982"/>
        <source>Electric Guitar</source>
        <translation>Guitarra Elétrica</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="981"/>
+        <location filename="../../util.cpp" line="983"/>
        <source>Acoustic Guitar</source>
        <translation>Guitarra Acústica</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="982"/>
+        <location filename="../../util.cpp" line="984"/>
        <source>Bass Guitar</source>
        <translation>Baixo</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="983"/>
+        <location filename="../../util.cpp" line="985"/>
        <source>Keyboard</source>
        <translation>Teclado</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="984"/>
+        <location filename="../../util.cpp" line="986"/>
        <source>Synthesizer</source>
        <translation>Sintetizador</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="985"/>
+        <location filename="../../util.cpp" line="987"/>
        <source>Grand Piano</source>
        <translation>Piano de Cauda</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="986"/>
+        <location filename="../../util.cpp" line="988"/>
        <source>Accordion</source>
        <translation>Acordeão</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="987"/>
+        <location filename="../../util.cpp" line="989"/>
        <source>Vocal</source>
        <translation>Voz</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="988"/>
+        <location filename="../../util.cpp" line="990"/>
        <source>Microphone</source>
        <translation>Microfone</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="989"/>
+        <location filename="../../util.cpp" line="991"/>
        <source>Harmonica</source>
        <translation>Harmónica</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="990"/>
+        <location filename="../../util.cpp" line="992"/>
        <source>Trumpet</source>
        <translation>Trompete</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="991"/>
+        <location filename="../../util.cpp" line="993"/>
        <source>Trombone</source>
        <translation>Trombone</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="992"/>
+        <location filename="../../util.cpp" line="994"/>
        <source>French Horn</source>
        <translation>Trompa Francesa</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="993"/>
+        <location filename="../../util.cpp" line="995"/>
        <source>Tuba</source>
        <translation>Tuba</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="994"/>
+        <location filename="../../util.cpp" line="996"/>
        <source>Saxophone</source>
        <translation>Saxofone</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="995"/>
+        <location filename="../../util.cpp" line="997"/>
        <source>Clarinet</source>
        <translation>Clarinete</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="996"/>
+        <location filename="../../util.cpp" line="998"/>
        <source>Flute</source>
        <translation>Flauta</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="997"/>
+        <location filename="../../util.cpp" line="999"/>
        <source>Violin</source>
        <translation>Violino</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="998"/>
+        <location filename="../../util.cpp" line="1000"/>
        <source>Cello</source>
        <translation>Violoncelo</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="999"/>
+        <location filename="../../util.cpp" line="1001"/>
        <source>Double Bass</source>
        <translation>Contrabaixo</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1000"/>
+        <location filename="../../util.cpp" line="1002"/>
        <source>Recorder</source>
        <translation>Gravador</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1001"/>
+        <location filename="../../util.cpp" line="1003"/>
        <source>Streamer</source>
        <translation>Streamer</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1002"/>
+        <location filename="../../util.cpp" line="1004"/>
        <source>Listener</source>
        <translation>Ouvinte</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1003"/>
+        <location filename="../../util.cpp" line="1005"/>
        <source>Guitar+Vocal</source>
        <translation>Guitarra+Voz</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1004"/>
+        <location filename="../../util.cpp" line="1006"/>
        <source>Keyboard+Vocal</source>
        <translation>Teclado+Voz</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1005"/>
+        <location filename="../../util.cpp" line="1007"/>
        <source>Bodhran</source>
        <translation>Bodhrán</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1006"/>
+        <location filename="../../util.cpp" line="1008"/>
        <source>Bassoon</source>
        <translation>Fagote</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1007"/>
+        <location filename="../../util.cpp" line="1009"/>
        <source>Oboe</source>
        <translation>Oboé</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1008"/>
+        <location filename="../../util.cpp" line="1010"/>
        <source>Harp</source>
        <translation>Harpa</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1009"/>
+        <location filename="../../util.cpp" line="1011"/>
        <source>Viola</source>
        <translation>Viola de Arco</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1010"/>
+        <location filename="../../util.cpp" line="1012"/>
        <source>Congas</source>
        <translation>Congas</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1011"/>
+        <location filename="../../util.cpp" line="1013"/>
        <source>Bongo</source>
        <translation>Bongo</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1012"/>
+        <location filename="../../util.cpp" line="1014"/>
        <source>Vocal Bass</source>
        <translation>Voz Baixo</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1013"/>
+        <location filename="../../util.cpp" line="1015"/>
        <source>Vocal Tenor</source>
        <translation>Voz Tenor</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1014"/>
+        <location filename="../../util.cpp" line="1016"/>
        <source>Vocal Alto</source>
        <translation>Voz Alto</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1015"/>
+        <location filename="../../util.cpp" line="1017"/>
        <source>Vocal Soprano</source>
        <translation>Voz Soprano</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1016"/>
+        <location filename="../../util.cpp" line="1018"/>
        <source>Banjo</source>
        <translation>Banjo</translation>
    </message>
    <message>
-        <location filename="../../util.cpp" line="1017"/>
+        <location filename="../../util.cpp" line="1019"/>
        <source>Mandolin</source>
        <translation>Bandolim</translation>
    </message>
+    <message>
+        <location filename="../../util.cpp" line="1020"/>
+        <source>Ukulele</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../util.cpp" line="1021"/>
+        <source>Bass Ukulele</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>CServerDlg</name>
--- a/src/serverdlg.cpp
+++ b/src/serverdlg.cpp
@ -125,13 +125,13 @@ CServerDlg::CServerDlg ( CServer*        pNServP,
    chbEnableRecorder->setAccessibleName( tr ( "Checkbox to turn on or off server recording" ) );
    chbEnableRecorder->setWhatsThis( "<b>" + tr ( "Enable Recorder" ) + ":</b>"
        + tr ( "Checked when the recorder is enabled, otherwise unchecked. "
-               "The recorder will run when a session is in progress, if (set up correctly and) enabled.") );
+               "The recorder will run when a session is in progress, if (set up correctly and) enabled." ) );

    // current session directory
    edtCurrentSessionDir->setAccessibleName( tr ( "Current session directory text box (read-only)" ) );
    edtCurrentSessionDir->setWhatsThis( "<b>" + tr ( "Current Session Directory" ) + ":</b>"
        +  tr ( "Enabled during recording and holds the current recording session directory. "
-                "Disabled after recording or when the recorder is not enabled.") );
+                "Disabled after recording or when the recorder is not enabled." ) );

    // recorder status
    lblRecorderStatus->setAccessibleName ( tr ( "Recorder status label" ) );
--- a/src/util.cpp
+++ b/src/util.cpp
@ -706,7 +706,7 @@ CMusProfDlg::CMusProfDlg ( CClient* pNCliP,
    // Add help text to controls -----------------------------------------------
    // fader tag
    QString strFaderTag = "<b>" + tr ( "Musician Profile" ) + ":</b> " +
-         tr ("Write your name or an alias here so the other musicians you want to "
+         tr ( "Write your name or an alias here so the other musicians you want to "
        "play with know who you are. You may also add a picture of the instrument "
        "you play and a flag of the country you are located in. "
        "Your city and skill level playing your instrument may also be added." ) +