Merge pull request #283 from atsampson/banjolin

Add banjo and mandolin as instruments

Jamulus.pro

@@ -703,6 +703,8 @@ DISTFILES += ChangeLog \
     src/res/instruments/vocaltenor.png \
     src/res/instruments/vocalalto.png \
     src/res/instruments/vocalsoprano.png \
+    src/res/instruments/banjo.png \
+    src/res/instruments/mandolin.png \
     src/res/flags/flagnone.png \
     src/res/flags/ad.png \
     src/res/flags/ae.png \

src/res/translation/translation_de_DE.ts

@@ -2025,6 +2025,16 @@
         <source>Vocal Soprano</source>
         <translation>Gesang Sopran</translation>
     </message>
+    <message>
+        <location filename="../../util.cpp" line="1018"/>
+        <source>Banjo</source>
+        <translation>Banjo</translation>
+    </message>
+    <message>
+        <location filename="../../util.cpp" line="1019"/>
+        <source>Mandolin</source>
+        <translation>Mandoline</translation>
+    </message>
 </context>
 <context>
     <name>CServerDlg</name>

src/res/translation/translation_es_ES.ts

@@ -2033,6 +2033,16 @@
         <source>Vocal Soprano</source>
         <translation>Voz Soprano</translation>
     </message>
+    <message>
+        <location filename="../../util.cpp" line="1018"/>
+        <source>Banjo</source>
+        <translation>Banjo</translation>
+    </message>
+    <message>
+        <location filename="../../util.cpp" line="1019"/>
+        <source>Mandolin</source>
+        <translation>Mandolina</translation>
+    </message>
 </context>
 <context>
     <name>CServerDlg</name>

src/res/translation/translation_fr_FR.ts

@@ -2045,6 +2045,16 @@
         <source>Vocal Soprano</source>
         <translation>Voix soprano</translation>
     </message>
+    <message>
+        <location filename="../../util.cpp" line="1018"/>
+        <source>Banjo</source>
+        <translation>Banjo</translation>
+    </message>
+    <message>
+        <location filename="../../util.cpp" line="1019"/>
+        <source>Mandolin</source>
+        <translation>Mandoline</translation>
+    </message>
 </context>
 <context>
     <name>CServerDlg</name>

src/res/translation/translation_it_IT.ts

@@ -2013,6 +2013,16 @@
         <source>Vocal Soprano</source>
         <translation>Voce Soprano</translation>
     </message>
+    <message>
+        <location filename="../../util.cpp" line="1018"/>
+        <source>Banjo</source>
+        <translation>Banjo</translation>
+    </message>
+    <message>
+        <location filename="../../util.cpp" line="1019"/>
+        <source>Mandolin</source>
+        <translation>Mandolino</translation>
+    </message>
 </context>
 <context>
     <name>CServerDlg</name>

src/res/translation/translation_nl_NL.ts

@@ -2017,6 +2017,16 @@
         <source>Vocal Soprano</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../util.cpp" line="1018"/>
+        <source>Banjo</source>
+        <translation>Banjo</translation>
+    </message>
+    <message>
+        <location filename="../../util.cpp" line="1019"/>
+        <source>Mandolin</source>
+        <translation>Mandoline</translation>
+    </message>
 </context>
 <context>
     <name>CServerDlg</name>

src/res/translation/translation_pt_PT.ts

@@ -2033,6 +2033,16 @@
         <source>Vocal Soprano</source>
         <translation>Voz Soprano</translation>
     </message>
+    <message>
+        <location filename="../../util.cpp" line="1018"/>
+        <source>Banjo</source>
+        <translation>Banjo</translation>
+    </message>
+    <message>
+        <location filename="../../util.cpp" line="1019"/>
+        <source>Mandolin</source>
+        <translation>Bandolim</translation>
+    </message>
 </context>
 <context>
     <name>CServerDlg</name>

src/resources.qrc

@@ -78,6 +78,8 @@
         <file>res/instruments/vocaltenor.png</file>
         <file>res/instruments/vocalalto.png</file>
         <file>res/instruments/vocalsoprano.png</file>
+        <file>res/instruments/banjo.png</file>
+        <file>res/instruments/mandolin.png</file>
     </qresource>
     <qresource prefix="/png/main">
         <file>res/fronticon.png</file>

src/util.cpp

@@ -1015,6 +1015,8 @@ CVector<CInstPictures::CInstPictProps>& CInstPictures::GetTable()
         vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Vocal Tenor" ), ":/png/instr/res/instruments/vocaltenor.png", IC_OTHER_INSTRUMENT ) );
         vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Vocal Alto" ), ":/png/instr/res/instruments/vocalalto.png", IC_OTHER_INSTRUMENT ) );
         vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Vocal Soprano" ), ":/png/instr/res/instruments/vocalsoprano.png", IC_OTHER_INSTRUMENT ) );
+        vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Banjo" ), ":/png/instr/res/instruments/banjo.png", IC_PLUCKING_INSTRUMENT ) );
+        vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Mandolin" ), ":/png/instr/res/instruments/mandolin.png", IC_PLUCKING_INSTRUMENT ) );
 
         // now the table is initialized
         TableIsInitialized = true;