From b8ef2d414dfcda6031128e6d535c9b8b21faa18c Mon Sep 17 00:00:00 2001 From: Adrien David-Sivelle Date: Mon, 13 Jul 2020 22:02:19 -0400 Subject: [PATCH 1/3] Add 2 new instruments: Baritone and Lead vocals Used in barbershop and TTBB choirs, as well as a-capella groups --- src/res/instruments/vocalbaritone.png | Bin 0 -> 3036 bytes src/res/instruments/vocallead.png | Bin 0 -> 2563 bytes src/res/translation/translation_de_DE.ts | 22 ++++++++++++++++------ src/res/translation/translation_es_ES.ts | 22 ++++++++++++++++------ src/res/translation/translation_fr_FR.ts | 22 ++++++++++++++++------ src/res/translation/translation_it_IT.ts | 22 ++++++++++++++++------ src/res/translation/translation_nl_NL.ts | 22 ++++++++++++++++------ src/res/translation/translation_pl_PL.ts | 22 ++++++++++++++++------ src/res/translation/translation_pt_BR.ts | 20 +++++++++++++++----- src/res/translation/translation_pt_PT.ts | 22 ++++++++++++++++------ src/res/translation/translation_sv_SE.ts | 22 ++++++++++++++++------ src/resources.qrc | 2 ++ src/util.cpp | 2 ++ 13 files changed, 147 insertions(+), 53 deletions(-) create mode 100644 src/res/instruments/vocalbaritone.png create mode 100644 src/res/instruments/vocallead.png diff --git a/src/res/instruments/vocalbaritone.png b/src/res/instruments/vocalbaritone.png new file mode 100644 index 0000000000000000000000000000000000000000..b37dfa47d85f6d2d24e8b375bdca6dfec2d06608 GIT binary patch literal 3036 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 literal 0 HcmV?d00001 diff --git a/src/res/instruments/vocallead.png b/src/res/instruments/vocallead.png new file mode 100644 index 0000000000000000000000000000000000000000..59ec9866be7e6ee92f3552a40ec5958d3859055b GIT binary patch literal 2563 zcmY*bc|4n07k*=pU{LKKY9di-Es3P|1{G0B22=Y|+5|xqNh3xW8nu*a2ASGv?b z%u@isA|C+0Wfr$N<3x#Mnina^(Gk!UVHrRYqzs6Q5JNRN z!~h_b4oH0A_=x<@qKIs#=Cc8&Tp&~Y5oQ}~JIWUvx9SHymy*mcV z(Nhp5LEdyXFSeJXgGB%%97PRe_|s6FaOO@Gfa6$*U^tCUg>k~eA|fp~mhevu3lZK4 zqv5bm6!u9=xR>Kmm@R`vgBhcYP=;_TSr`n4V+96TxDbwfDHq)=;UR1`(*li-j*dn} zA4D-&!Dx)RxjEVpi^gINL=1z-m5K^2jxN=o5yiHI z!*?2eU7z2{rU(7oDI)UASfT;ZI~gg9_yv z`2`n~_RimE@jY_l9=>&~f0AMyhLmXMqg7ziR=hB&-(&aYu)qQB5q;qZ(`Qg?j+4(Z zMs1z0&enFfJ{BBM8~Jf*swy~RY_Ge}r0p?jYq@)0eqrL??Xi&GeIBrPHLFmnev_Ms zK1KPc73i>wJlk`!oj4P#M9>W*oy{eSXmhVy8)B4JxY2yych1Jy7ms9h; zkk)5PTW{8`6(hUk;BGHxs8z04P$>WWJ=@>GO>X_Hii|+MRm2yZ@3kcqCDat{nZM|C zvz1x!>s&|NRPBPy^M2rdpiilgs`$$2WNgw%YsXpSX_Hjdb>0Ssgm(o@nm;_?M<@Lljzs+wxzY#c|8A^ zs|3Au2Px^XRyj8*HY)E(2YqVWW$(Zxsz%)6v1JQrw%2u*XMNh%9YDZb{2ppDnWcas z$=DGl)EnaUZ;Z73)1`o8zgQvasjnL1P4cQ(hp#Ew47{7_TuwFhNz{`ykACGldVGDj zfhw;sX^GD0Sr@jY9zA?)yQBI}+bd|pynn^Hur|Q`NfxOHHe5>G4EZsCZ~!%8{B1Bd zMkk7CSn zu-R^6ekocbCk=`}^r`ufpZ6;nHJ?lg z^@@N*3oD&&-)^ym7iQd>1f1=tz3(?hPb0+x=X84;u_^`5T{j|(;CH)g$@ zyJWRybYA27q_?xI83gGqK_R8*o-eR zz5}5v?RL5>d0D{2o3Y}Z1u_as2Pd=zjz(au?jf#M%6f;*^rJ^O-`hRgB?4)M^OV#S zl$^F|XtHm*cmK%@nzN0M-CuuH!+*K*$cU=S)Sr^k`rd|452sRBE~gzzyRXdMXR@z( zEVP^M&J0{aE)O?YtF+tAY^(xdD?iis&%SDY;A)sfUYJ!|OoxQ_u7f#$@=4;uF7nmW zl$BOw-+*M;b7g0QiNOlALBO;A_#)bj`z)%`2#nM$K3u4l8yNPRPz&DHvtSfZ?@Zr! z`Eh?|{qd|qMO|gr_O1_mx;>yzo)?;$bbLH}rnwBt+bs$C1FOEaFMHv!S?u(24QrD# z%VigDE?_t2u{kU?8D)*}BCa6kcciZj%GO`nxYRh*LfHLIMc5Re zv%NhrUh0p{SbUoD{+FLCHs2w_$A%qiZulNgZru#}ix0`m*&gF|Na<-I@`%)sIE|9c zzw?@yAK)*mgIlW7^0ggD%{3*5H27+uVN1UnxL$egRx=|^)h>|4!J0btZdK5w;U;ocQ{YH%to}{z>iFS_U z)S=ji6*T{D*V&9aV8s^8>E>;1vg98r>VM~`KYFUK$Nk3b0{@ny^X?~wU2=>q{w~jF z_cNFJt?P$+eRnk~I@P%u&Y=Q4o6@w#rw>1IJfNdLE>rY?ue+E$-bZ#?@vU)xIPcbS zRrY{`t7?M7!vyah|0JK=U4myezE$l(ccYXw(0;#ue@*V5Ki>All0vq}eA@c`V}~K9 znN5RGe + Vocal Baritone + Gesang Bariton + + + + Vocal Lead + Gesang Lead + + + Vocal Tenor Gesang Tenor - + Vocal Alto Gesang Alt - + Vocal Soprano Gesang Sopran - + Banjo Banjo - + Mandolin Mandoline - + Ukulele - + Bass Ukulele diff --git a/src/res/translation/translation_es_ES.ts b/src/res/translation/translation_es_ES.ts index a85ac8c6..d1928b05 100644 --- a/src/res/translation/translation_es_ES.ts +++ b/src/res/translation/translation_es_ES.ts @@ -2485,36 +2485,46 @@ + Vocal Baritone + Voz Barítono + + + + Vocal Lead + Voz Lead + + + Vocal Tenor Voz Tenor - + Vocal Alto Voz Alto - + Vocal Soprano Voz Soprano - + Banjo Banjo - + Mandolin Mandolina - + Ukulele Ukulele - + Bass Ukulele Ukulele Barítono diff --git a/src/res/translation/translation_fr_FR.ts b/src/res/translation/translation_fr_FR.ts index 4e09feb5..9b4efc50 100644 --- a/src/res/translation/translation_fr_FR.ts +++ b/src/res/translation/translation_fr_FR.ts @@ -2477,36 +2477,46 @@ + Vocal Baritone + Voix bariton + + + + Vocal Lead + Voix lead + + + Vocal Tenor Voix ténor - + Vocal Alto Voix alto - + Vocal Soprano Voix soprano - + Banjo Banjo - + Mandolin Mandoline - + Ukulele Ukulélé - + Bass Ukulele Ukulélé basse diff --git a/src/res/translation/translation_it_IT.ts b/src/res/translation/translation_it_IT.ts index 3948c52d..ef5a7768 100644 --- a/src/res/translation/translation_it_IT.ts +++ b/src/res/translation/translation_it_IT.ts @@ -2437,36 +2437,46 @@ + Vocal Baritone + Voce Baritono + + + + Vocal Lead + Voce Lead + + + Vocal Tenor Voce Tenore - + Vocal Alto Voce Alto - + Vocal Soprano Voce Soprano - + Banjo Banjo - + Mandolin Mandolino - + Ukulele Uculele - + Bass Ukulele Uculele Basso diff --git a/src/res/translation/translation_nl_NL.ts b/src/res/translation/translation_nl_NL.ts index f3f5511f..d6b790ff 100644 --- a/src/res/translation/translation_nl_NL.ts +++ b/src/res/translation/translation_nl_NL.ts @@ -2425,36 +2425,46 @@ + Vocal Baritone + Bairton (stem) + + + + Vocal Lead + Lead (stem) + + + Vocal Tenor Tenor (stem) - + Vocal Alto Alt (stem) - + Vocal Soprano Sopraan (stem) - + Banjo Banjo - + Mandolin Mandoline - + Ukulele Ukelele - + Bass Ukulele Ukelele-bas diff --git a/src/res/translation/translation_pl_PL.ts b/src/res/translation/translation_pl_PL.ts index e0f7108a..3ae4dffe 100644 --- a/src/res/translation/translation_pl_PL.ts +++ b/src/res/translation/translation_pl_PL.ts @@ -2123,36 +2123,46 @@ nie jestem pewna + Vocal Baritone + Baryton + + + + Vocal Lead + Lead + + + Vocal Tenor Tenor - + Vocal Alto Alt - + Vocal Soprano Sopran - + Banjo Banjo - + Mandolin Mandolina - + Ukulele Ukulele - + Bass Ukulele Ukulele basowe diff --git a/src/res/translation/translation_pt_BR.ts b/src/res/translation/translation_pt_BR.ts index 671fb8e7..008365db 100644 --- a/src/res/translation/translation_pt_BR.ts +++ b/src/res/translation/translation_pt_BR.ts @@ -2469,31 +2469,41 @@ + Vocal Baritone + Voz Barítono + + + + Vocal Lead + Voz Lead + + + Vocal Alto Voz Alto - + Vocal Soprano Voz Soprano - + Banjo Banjo - + Mandolin Bandolim - + Ukulele Ukulele - + Bass Ukulele Ukulele Baixo diff --git a/src/res/translation/translation_pt_PT.ts b/src/res/translation/translation_pt_PT.ts index a54ff38c..ce0dd2d7 100644 --- a/src/res/translation/translation_pt_PT.ts +++ b/src/res/translation/translation_pt_PT.ts @@ -2461,36 +2461,46 @@ + Vocal Baritone + Voz Barítono + + + + Vocal Lead + Voz Lead + + + Vocal Tenor Voz Tenor - + Vocal Alto Voz Alto - + Vocal Soprano Voz Soprano - + Banjo Banjo - + Mandolin Bandolim - + Ukulele Ukulele - + Bass Ukulele Ukulele Baixo diff --git a/src/res/translation/translation_sv_SE.ts b/src/res/translation/translation_sv_SE.ts index a1116e68..61c012be 100644 --- a/src/res/translation/translation_sv_SE.ts +++ b/src/res/translation/translation_sv_SE.ts @@ -2119,36 +2119,46 @@ + Vocal Baritone + Sång (baryton) + + + + Vocal Lead + Sång (lead) + + + Vocal Tenor Sång (tenor) - + Vocal Alto Sång (alt) - + Vocal Soprano Sång (sopran) - + Banjo Banjo - + Mandolin Mandolin - + Ukulele Ukulele - + Bass Ukulele Ukulele (bas) diff --git a/src/resources.qrc b/src/resources.qrc index c9bba96e..d0730d72 100755 --- a/src/resources.qrc +++ b/src/resources.qrc @@ -85,6 +85,8 @@ res/instruments/congas.png res/instruments/bongo.png res/instruments/vocalbass.png + res/instruments/vocalbaritone.png + res/instruments/vocallead.png res/instruments/vocaltenor.png res/instruments/vocalalto.png res/instruments/vocalsoprano.png diff --git a/src/util.cpp b/src/util.cpp index 9f3e7cbe..f2c74612 100755 --- a/src/util.cpp +++ b/src/util.cpp @@ -1107,6 +1107,8 @@ CVector& CInstPictures::GetTable ( const bool bRe vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Congas" ), ":/png/instr/res/instruments/congas.png", IC_PERCUSSION_INSTRUMENT ) ); vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Bongo" ), ":/png/instr/res/instruments/bongo.png", IC_PERCUSSION_INSTRUMENT ) ); vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Vocal Bass" ), ":/png/instr/res/instruments/vocalbass.png", IC_OTHER_INSTRUMENT ) ); + vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Vocal Baritone" ), ":/png/instr/res/instruments/vocalbaritone.png", IC_OTHER_INSTRUMENT ) ); + vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Vocal Lead" ), ":/png/instr/res/instruments/vocallead.png", IC_OTHER_INSTRUMENT ) ); 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 ) ); From 397100371eddba17d3d63000ac356cf9330df07a Mon Sep 17 00:00:00 2001 From: Adrien David-Sivelle Date: Tue, 14 Jul 2020 11:15:18 -0400 Subject: [PATCH 2/3] Improve vocal lead icon (larger notes) - Using the same image source than in the original image: https://commons.wikimedia.org/wiki/File:Africa_Music_ZP_8th_notes.svg --- src/res/instruments/vocallead.png | Bin 2563 -> 2640 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/res/instruments/vocallead.png b/src/res/instruments/vocallead.png index 59ec9866be7e6ee92f3552a40ec5958d3859055b..95a7eedec687ce7e0ec6b7ef6869f71a521bf676 100644 GIT binary patch delta 2045 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 Date: Tue, 14 Jul 2020 11:42:06 -0400 Subject: [PATCH 3/3] Fix instrument orders and translations after b8ef2d41 (#460) - Move the new instruments (Vocal lead and baritone) to the end of vecDataBase in util.cpp - Remove the partial translations for vocal leads - Fix lines references for translations that were altered in b8ef2d41 --- src/res/translation/translation_de_DE.ts | 32 ++++++++++++------------ src/res/translation/translation_es_ES.ts | 32 ++++++++++++------------ src/res/translation/translation_fr_FR.ts | 32 ++++++++++++------------ src/res/translation/translation_it_IT.ts | 32 ++++++++++++------------ src/res/translation/translation_nl_NL.ts | 32 ++++++++++++------------ src/res/translation/translation_pl_PL.ts | 32 ++++++++++++------------ src/res/translation/translation_pt_BR.ts | 30 +++++++++++----------- src/res/translation/translation_pt_PT.ts | 32 ++++++++++++------------ src/res/translation/translation_sv_SE.ts | 32 ++++++++++++------------ src/util.cpp | 4 +-- 10 files changed, 145 insertions(+), 145 deletions(-) diff --git a/src/res/translation/translation_de_DE.ts b/src/res/translation/translation_de_DE.ts index 53af4a6a..7d72ef7c 100644 --- a/src/res/translation/translation_de_DE.ts +++ b/src/res/translation/translation_de_DE.ts @@ -2461,49 +2461,49 @@ - Vocal Baritone - Gesang Bariton - - - - Vocal Lead - Gesang Lead - - - Vocal Tenor Gesang Tenor - + Vocal Alto Gesang Alt - + Vocal Soprano Gesang Sopran - + Banjo Banjo - + Mandolin Mandoline - + Ukulele - + Bass Ukulele + + + Vocal Baritone + Gesang Bariton + + + + Vocal Lead + + No Name diff --git a/src/res/translation/translation_es_ES.ts b/src/res/translation/translation_es_ES.ts index d1928b05..2ca3930b 100644 --- a/src/res/translation/translation_es_ES.ts +++ b/src/res/translation/translation_es_ES.ts @@ -2485,49 +2485,49 @@ - Vocal Baritone - Voz Barítono - - - - Vocal Lead - Voz Lead - - - Vocal Tenor Voz Tenor - + Vocal Alto Voz Alto - + Vocal Soprano Voz Soprano - + Banjo Banjo - + Mandolin Mandolina - + Ukulele Ukulele - + Bass Ukulele Ukulele Barítono + + + Vocal Baritone + Voz Barítono + + + + Vocal Lead + + No Name diff --git a/src/res/translation/translation_fr_FR.ts b/src/res/translation/translation_fr_FR.ts index 9b4efc50..03c3ba28 100644 --- a/src/res/translation/translation_fr_FR.ts +++ b/src/res/translation/translation_fr_FR.ts @@ -2477,49 +2477,49 @@ - Vocal Baritone - Voix bariton - - - - Vocal Lead - Voix lead - - - Vocal Tenor Voix ténor - + Vocal Alto Voix alto - + Vocal Soprano Voix soprano - + Banjo Banjo - + Mandolin Mandoline - + Ukulele Ukulélé - + Bass Ukulele Ukulélé basse + + + Vocal Baritone + Voix baryton + + + + Vocal Lead + Voix principale + No Name diff --git a/src/res/translation/translation_it_IT.ts b/src/res/translation/translation_it_IT.ts index ef5a7768..b537269e 100644 --- a/src/res/translation/translation_it_IT.ts +++ b/src/res/translation/translation_it_IT.ts @@ -2437,49 +2437,49 @@ - Vocal Baritone - Voce Baritono - - - - Vocal Lead - Voce Lead - - - Vocal Tenor Voce Tenore - + Vocal Alto Voce Alto - + Vocal Soprano Voce Soprano - + Banjo Banjo - + Mandolin Mandolino - + Ukulele Uculele - + Bass Ukulele Uculele Basso + + + Vocal Baritone + Voce Baritono + + + + Vocal Lead + + No Name diff --git a/src/res/translation/translation_nl_NL.ts b/src/res/translation/translation_nl_NL.ts index d6b790ff..6f6858cc 100644 --- a/src/res/translation/translation_nl_NL.ts +++ b/src/res/translation/translation_nl_NL.ts @@ -2425,49 +2425,49 @@ - Vocal Baritone - Bairton (stem) - - - - Vocal Lead - Lead (stem) - - - Vocal Tenor Tenor (stem) - + Vocal Alto Alt (stem) - + Vocal Soprano Sopraan (stem) - + Banjo Banjo - + Mandolin Mandoline - + Ukulele Ukelele - + Bass Ukulele Ukelele-bas + + + Vocal Baritone + Bariton (stem) + + + + Vocal Lead + + No Name diff --git a/src/res/translation/translation_pl_PL.ts b/src/res/translation/translation_pl_PL.ts index 3ae4dffe..edb92593 100644 --- a/src/res/translation/translation_pl_PL.ts +++ b/src/res/translation/translation_pl_PL.ts @@ -2123,49 +2123,49 @@ nie jestem pewna - Vocal Baritone - Baryton - - - - Vocal Lead - Lead - - - Vocal Tenor Tenor - + Vocal Alto Alt - + Vocal Soprano Sopran - + Banjo Banjo - + Mandolin Mandolina - + Ukulele Ukulele - + Bass Ukulele Ukulele basowe + + + Vocal Baritone + Baryton + + + + Vocal Lead + + No Name diff --git a/src/res/translation/translation_pt_BR.ts b/src/res/translation/translation_pt_BR.ts index 008365db..0a362ae0 100644 --- a/src/res/translation/translation_pt_BR.ts +++ b/src/res/translation/translation_pt_BR.ts @@ -2469,44 +2469,44 @@ - Vocal Baritone - Voz Barítono - - - - Vocal Lead - Voz Lead - - - Vocal Alto Voz Alto - + Vocal Soprano Voz Soprano - + Banjo Banjo - + Mandolin Bandolim - + Ukulele Ukulele - + Bass Ukulele Ukulele Baixo + + + Vocal Baritone + Voz Barítono + + + + Vocal Lead + + No Name diff --git a/src/res/translation/translation_pt_PT.ts b/src/res/translation/translation_pt_PT.ts index ce0dd2d7..0687dab2 100644 --- a/src/res/translation/translation_pt_PT.ts +++ b/src/res/translation/translation_pt_PT.ts @@ -2461,49 +2461,49 @@ - Vocal Baritone - Voz Barítono - - - - Vocal Lead - Voz Lead - - - Vocal Tenor Voz Tenor - + Vocal Alto Voz Alto - + Vocal Soprano Voz Soprano - + Banjo Banjo - + Mandolin Bandolim - + Ukulele Ukulele - + Bass Ukulele Ukulele Baixo + + + Vocal Baritone + Voz Barítono + + + + Vocal Lead + + No Name diff --git a/src/res/translation/translation_sv_SE.ts b/src/res/translation/translation_sv_SE.ts index 61c012be..767d749b 100644 --- a/src/res/translation/translation_sv_SE.ts +++ b/src/res/translation/translation_sv_SE.ts @@ -2119,49 +2119,49 @@ - Vocal Baritone - Sång (baryton) - - - - Vocal Lead - Sång (lead) - - - Vocal Tenor Sång (tenor) - + Vocal Alto Sång (alt) - + Vocal Soprano Sång (sopran) - + Banjo Banjo - + Mandolin Mandolin - + Ukulele Ukulele - + Bass Ukulele Ukulele (bas) + + + Vocal Baritone + Sång (baryton) + + + + Vocal Lead + + CServerDlg diff --git a/src/util.cpp b/src/util.cpp index f2c74612..978e4ae4 100755 --- a/src/util.cpp +++ b/src/util.cpp @@ -1107,8 +1107,6 @@ CVector& CInstPictures::GetTable ( const bool bRe vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Congas" ), ":/png/instr/res/instruments/congas.png", IC_PERCUSSION_INSTRUMENT ) ); vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Bongo" ), ":/png/instr/res/instruments/bongo.png", IC_PERCUSSION_INSTRUMENT ) ); vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Vocal Bass" ), ":/png/instr/res/instruments/vocalbass.png", IC_OTHER_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Vocal Baritone" ), ":/png/instr/res/instruments/vocalbaritone.png", IC_OTHER_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Vocal Lead" ), ":/png/instr/res/instruments/vocallead.png", IC_OTHER_INSTRUMENT ) ); 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 ) ); @@ -1116,6 +1114,8 @@ CVector& CInstPictures::GetTable ( const bool bRe vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Mandolin" ), ":/png/instr/res/instruments/mandolin.png", IC_PLUCKING_INSTRUMENT ) ); vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Ukulele" ), ":/png/instr/res/instruments/ukulele.png", IC_PLUCKING_INSTRUMENT ) ); vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Bass Ukulele" ), ":/png/instr/res/instruments/bassukulele.png", IC_PLUCKING_INSTRUMENT ) ); + vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Vocal Baritone" ), ":/png/instr/res/instruments/vocalbaritone.png", IC_OTHER_INSTRUMENT ) ); + vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Vocal Lead" ), ":/png/instr/res/instruments/vocallead.png", IC_OTHER_INSTRUMENT ) ); // now the table is initialized TableIsInitialized = true;