eeva
/
jamulus
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add 2 new instruments: Baritone and Lead vocals 

Used in barbershop and TTBB choirs, as well as a-capella groups
This commit is contained in:
Adrien David-Sivelle 2020-07-13 22:02:19 -04:00
parent 2c99a6fc5b
commit b8ef2d414d
13 changed files with 147 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/res/instruments/vocalbaritone.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
src/res/instruments/vocallead.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.5 KiB

22
src/res/translation/translation_de_DE.ts
View File

@ -2461,36 +2461,46 @@
</message>
<message>
<location filename="../../util.cpp" line="1110"/>
<source>Vocal Baritone</source>
<translation>Gesang Bariton</translation>
</message>
<message>
<location filename="../../util.cpp" line="1111"/>
<source>Vocal Lead</source>
<translation>Gesang Lead</translation>
</message>
<message>
<location filename="../../util.cpp" line="1112"/>
<source>Vocal Tenor</source>
<translation>Gesang Tenor</translation>
</message>
<message>
<location filename="../../util.cpp" line="1111"/>
<location filename="../../util.cpp" line="1113"/>
<source>Vocal Alto</source>
<translation>Gesang Alt</translation>
</message>
<message>
<location filename="../../util.cpp" line="1112"/>
<location filename="../../util.cpp" line="1114"/>
<source>Vocal Soprano</source>
<translation>Gesang Sopran</translation>
</message>
<message>
<location filename="../../util.cpp" line="1113"/>
<location filename="../../util.cpp" line="1115"/>
<source>Banjo</source>
<translation>Banjo</translation>
</message>
<message>
<location filename="../../util.cpp" line="1114"/>
<location filename="../../util.cpp" line="1116"/>
<source>Mandolin</source>
<translation>Mandoline</translation>
</message>
<message>
<location filename="../../util.cpp" line="1115"/>
<location filename="../../util.cpp" line="1117"/>
<source>Ukulele</source>
<translation></translation>
</message>
<message>
<location filename="../../util.cpp" line="1116"/>
<location filename="../../util.cpp" line="1118"/>
<source>Bass Ukulele</source>
<translation></translation>
</message>

22
src/res/translation/translation_es_ES.ts
View File

@ -2485,36 +2485,46 @@
</message>
<message>
<location filename="../../util.cpp" line="1110"/>
<source>Vocal Baritone</source>
<translation>Voz Barítono</translation>
</message>
<message>
<location filename="../../util.cpp" line="1111"/>
<source>Vocal Lead</source>
<translation>Voz Lead</translation>
</message>
<message>
<location filename="../../util.cpp" line="1112"/>
<source>Vocal Tenor</source>
<translation>Voz Tenor</translation>
</message>
<message>
<location filename="../../util.cpp" line="1111"/>
<location filename="../../util.cpp" line="1113"/>
<source>Vocal Alto</source>
<translation>Voz Alto</translation>
</message>
<message>
<location filename="../../util.cpp" line="1112"/>
<location filename="../../util.cpp" line="1114"/>
<source>Vocal Soprano</source>
<translation>Voz Soprano</translation>
</message>
<message>
<location filename="../../util.cpp" line="1113"/>
<location filename="../../util.cpp" line="1115"/>
<source>Banjo</source>
<translation>Banjo</translation>
</message>
<message>
<location filename="../../util.cpp" line="1114"/>
<location filename="../../util.cpp" line="1116"/>
<source>Mandolin</source>
<translation>Mandolina</translation>
</message>
<message>
<location filename="../../util.cpp" line="1115"/>
<location filename="../../util.cpp" line="1117"/>
<source>Ukulele</source>
<translation>Ukulele</translation>
</message>
<message>
<location filename="../../util.cpp" line="1116"/>
<location filename="../../util.cpp" line="1118"/>
<source>Bass Ukulele</source>
<translation>Ukulele Barítono</translation>
</message>

22
src/res/translation/translation_fr_FR.ts
View File

@ -2477,36 +2477,46 @@
</message>
<message>
<location filename="../../util.cpp" line="1110"/>
<source>Vocal Baritone</source>
<translation>Voix bariton</translation>
</message>
<message>
<location filename="../../util.cpp" line="1111"/>
<source>Vocal Lead</source>
<translation>Voix lead</translation>
</message>
<message>
<location filename="../../util.cpp" line="1112"/>
<source>Vocal Tenor</source>
<translation>Voix ténor</translation>
</message>
<message>
<location filename="../../util.cpp" line="1111"/>
<location filename="../../util.cpp" line="1113"/>
<source>Vocal Alto</source>
<translation>Voix alto</translation>
</message>
<message>
<location filename="../../util.cpp" line="1112"/>
<location filename="../../util.cpp" line="1114"/>
<source>Vocal Soprano</source>
<translation>Voix soprano</translation>
</message>
<message>
<location filename="../../util.cpp" line="1113"/>
<location filename="../../util.cpp" line="1115"/>
<source>Banjo</source>
<translation>Banjo</translation>
</message>
<message>
<location filename="../../util.cpp" line="1114"/>
<location filename="../../util.cpp" line="1116"/>
<source>Mandolin</source>
<translation>Mandoline</translation>
</message>
<message>
<location filename="../../util.cpp" line="1115"/>
<location filename="../../util.cpp" line="1117"/>
<source>Ukulele</source>
<translation>Ukulélé</translation>
</message>
<message>
<location filename="../../util.cpp" line="1116"/>
<location filename="../../util.cpp" line="1118"/>
<source>Bass Ukulele</source>
<translation>Ukulélé basse</translation>
</message>

22
src/res/translation/translation_it_IT.ts
View File

@ -2437,36 +2437,46 @@
</message>
<message>
<location filename="../../util.cpp" line="1110"/>
<source>Vocal Baritone</source>
<translation>Voce Baritono</translation>
</message>
<message>
<location filename="../../util.cpp" line="1111"/>
<source>Vocal Lead</source>
<translation>Voce Lead</translation>
</message>
<message>
<location filename="../../util.cpp" line="1112"/>
<source>Vocal Tenor</source>
<translation>Voce Tenore</translation>
</message>
<message>
<location filename="../../util.cpp" line="1111"/>
<location filename="../../util.cpp" line="1113"/>
<source>Vocal Alto</source>
<translation>Voce Alto</translation>
</message>
<message>
<location filename="../../util.cpp" line="1112"/>
<location filename="../../util.cpp" line="1114"/>
<source>Vocal Soprano</source>
<translation>Voce Soprano</translation>
</message>
<message>
<location filename="../../util.cpp" line="1113"/>
<location filename="../../util.cpp" line="1115"/>
<source>Banjo</source>
<translation>Banjo</translation>
</message>
<message>
<location filename="../../util.cpp" line="1114"/>
<location filename="../../util.cpp" line="1116"/>
<source>Mandolin</source>
<translation>Mandolino</translation>
</message>
<message>
<location filename="../../util.cpp" line="1115"/>
<location filename="../../util.cpp" line="1117"/>
<source>Ukulele</source>
<translation>Uculele</translation>
</message>
<message>
<location filename="../../util.cpp" line="1116"/>
<location filename="../../util.cpp" line="1118"/>
<source>Bass Ukulele</source>
<translation>Uculele Basso</translation>
</message>

22
src/res/translation/translation_nl_NL.ts
View File

@ -2425,36 +2425,46 @@
</message>
<message>
<location filename="../../util.cpp" line="1110"/>
<source>Vocal Baritone</source>
<translation>Bairton (stem)</translation>
</message>
<message>
<location filename="../../util.cpp" line="1111"/>
<source>Vocal Lead</source>
<translation>Lead (stem)</translation>
</message>
<message>
<location filename="../../util.cpp" line="1112"/>
<source>Vocal Tenor</source>
<translation>Tenor (stem)</translation>
</message>
<message>
<location filename="../../util.cpp" line="1111"/>
<location filename="../../util.cpp" line="1113"/>
<source>Vocal Alto</source>
<translation>Alt (stem)</translation>
</message>
<message>
<location filename="../../util.cpp" line="1112"/>
<location filename="../../util.cpp" line="1114"/>
<source>Vocal Soprano</source>
<translation>Sopraan (stem)</translation>
</message>
<message>
<location filename="../../util.cpp" line="1113"/>
<location filename="../../util.cpp" line="1115"/>
<source>Banjo</source>
<translation>Banjo</translation>
</message>
<message>
<location filename="../../util.cpp" line="1114"/>
<location filename="../../util.cpp" line="1116"/>
<source>Mandolin</source>
<translation>Mandoline</translation>
</message>
<message>
<location filename="../../util.cpp" line="1115"/>
<location filename="../../util.cpp" line="1117"/>
<source>Ukulele</source>
<translation>Ukelele</translation>
</message>
<message>
<location filename="../../util.cpp" line="1116"/>
<location filename="../../util.cpp" line="1118"/>
<source>Bass Ukulele</source>
<translation>Ukelele-bas</translation>
</message>

22
src/res/translation/translation_pl_PL.ts
View File

@ -2123,36 +2123,46 @@ nie jestem pewna</translatorcomment>
</message>
<message>
<location filename="../../util.cpp" line="1110"/>
<source>Vocal Baritone</source>
<translation>Baryton</translation>
</message>
<message>
<location filename="../../util.cpp" line="1111"/>
<source>Vocal Lead</source>
<translation>Lead</translation>
</message>
<message>
<location filename="../../util.cpp" line="1112"/>
<source>Vocal Tenor</source>
<translation>Tenor</translation>
</message>
<message>
<location filename="../../util.cpp" line="1111"/>
<location filename="../../util.cpp" line="1113"/>
<source>Vocal Alto</source>
<translation>Alt</translation>
</message>
<message>
<location filename="../../util.cpp" line="1112"/>
<location filename="../../util.cpp" line="1114"/>
<source>Vocal Soprano</source>
<translation>Sopran</translation>
</message>
<message>
<location filename="../../util.cpp" line="1113"/>
<location filename="../../util.cpp" line="1115"/>
<source>Banjo</source>
<translation>Banjo</translation>
</message>
<message>
<location filename="../../util.cpp" line="1114"/>
<location filename="../../util.cpp" line="1116"/>
<source>Mandolin</source>
<translation>Mandolina</translation>
</message>
<message>
<location filename="../../util.cpp" line="1115"/>
<location filename="../../util.cpp" line="1117"/>
<source>Ukulele</source>
<translation>Ukulele</translation>
</message>
<message>
<location filename="../../util.cpp" line="1116"/>
<location filename="../../util.cpp" line="1118"/>
<source>Bass Ukulele</source>
<translation>Ukulele basowe</translation>
</message>

20
src/res/translation/translation_pt_BR.ts
View File

@ -2469,31 +2469,41 @@
</message>
<message>
<location filename="../../util.cpp" line="1111"/>
<source>Vocal Baritone</source>
<translation>Voz Barítono</translation>
</message>
<message>
<location filename="../../util.cpp" line="1112"/>
<source>Vocal Lead</source>
<translation>Voz Lead</translation>
</message>
<message>
<location filename="../../util.cpp" line="1113"/>
<source>Vocal Alto</source>
<translation>Voz Alto</translation>
</message>
<message>
<location filename="../../util.cpp" line="1112"/>
<location filename="../../util.cpp" line="1114"/>
<source>Vocal Soprano</source>
<translation>Voz Soprano</translation>
</message>
<message>
<location filename="../../util.cpp" line="1113"/>
<location filename="../../util.cpp" line="1115"/>
<source>Banjo</source>
<translation>Banjo</translation>
</message>
<message>
<location filename="../../util.cpp" line="1114"/>
<location filename="../../util.cpp" line="1116"/>
<source>Mandolin</source>
<translation>Bandolim</translation>
</message>
<message>
<location filename="../../util.cpp" line="1115"/>
<location filename="../../util.cpp" line="1117"/>
<source>Ukulele</source>
<translation>Ukulele</translation>
</message>
<message>
<location filename="../../util.cpp" line="1116"/>
<location filename="../../util.cpp" line="1118"/>
<source>Bass Ukulele</source>
<translation>Ukulele Baixo</translation>
</message>

22
src/res/translation/translation_pt_PT.ts
View File

@ -2461,36 +2461,46 @@
</message>
<message>
<location filename="../../util.cpp" line="1110"/>
<source>Vocal Baritone</source>
<translation>Voz Barítono</translation>
</message>
<message>
<location filename="../../util.cpp" line="1111"/>
<source>Vocal Lead</source>
<translation>Voz Lead</translation>
</message>
<message>
<location filename="../../util.cpp" line="1112"/>
<source>Vocal Tenor</source>
<translation>Voz Tenor</translation>
</message>
<message>
<location filename="../../util.cpp" line="1111"/>
<location filename="../../util.cpp" line="1113"/>
<source>Vocal Alto</source>
<translation>Voz Alto</translation>
</message>
<message>
<location filename="../../util.cpp" line="1112"/>
<location filename="../../util.cpp" line="1114"/>
<source>Vocal Soprano</source>
<translation>Voz Soprano</translation>
</message>
<message>
<location filename="../../util.cpp" line="1113"/>
<location filename="../../util.cpp" line="1115"/>
<source>Banjo</source>
<translation>Banjo</translation>
</message>
<message>
<location filename="../../util.cpp" line="1114"/>
<location filename="../../util.cpp" line="1116"/>
<source>Mandolin</source>
<translation>Bandolim</translation>
</message>
<message>
<location filename="../../util.cpp" line="1115"/>
<location filename="../../util.cpp" line="1117"/>
<source>Ukulele</source>
<translation>Ukulele</translation>
</message>
<message>
<location filename="../../util.cpp" line="1116"/>
<location filename="../../util.cpp" line="1118"/>
<source>Bass Ukulele</source>
<translation>Ukulele Baixo</translation>
</message>

22
src/res/translation/translation_sv_SE.ts
View File

@ -2119,36 +2119,46 @@
</message>
<message>
<location filename="../../util.cpp" line="1110"/>
<source>Vocal Baritone</source>
<translation>Sång (baryton)</translation>
</message>
<message>
<location filename="../../util.cpp" line="1111"/>
<source>Vocal Lead</source>
<translation>Sång (lead)</translation>
</message>
<message>
<location filename="../../util.cpp" line="1112"/>
<source>Vocal Tenor</source>
<translation>Sång (tenor)</translation>
</message>
<message>
<location filename="../../util.cpp" line="1111"/>
<location filename="../../util.cpp" line="1113"/>
<source>Vocal Alto</source>
<translation>Sång (alt)</translation>
</message>
<message>
<location filename="../../util.cpp" line="1112"/>
<location filename="../../util.cpp" line="1114"/>
<source>Vocal Soprano</source>
<translation>Sång (sopran)</translation>
</message>
<message>
<location filename="../../util.cpp" line="1113"/>
<location filename="../../util.cpp" line="1115"/>
<source>Banjo</source>
<translation>Banjo</translation>
</message>
<message>
<location filename="../../util.cpp" line="1114"/>
<location filename="../../util.cpp" line="1116"/>
<source>Mandolin</source>
<translation>Mandolin</translation>
</message>
<message>
<location filename="../../util.cpp" line="1115"/>
<location filename="../../util.cpp" line="1117"/>
<source>Ukulele</source>
<translation>Ukulele</translation>
</message>
<message>
<location filename="../../util.cpp" line="1116"/>
<location filename="../../util.cpp" line="1118"/>
<source>Bass Ukulele</source>
<translation>Ukulele (bas)</translation>
</message>

2
src/resources.qrc
View File

@ -85,6 +85,8 @@
<file>res/instruments/congas.png</file>
<file>res/instruments/bongo.png</file>
<file>res/instruments/vocalbass.png</file>
<file>res/instruments/vocalbaritone.png</file>
<file>res/instruments/vocallead.png</file>
<file>res/instruments/vocaltenor.png</file>
<file>res/instruments/vocalalto.png</file>
<file>res/instruments/vocalsoprano.png</file>

2
src/util.cpp
View File

@ -1107,6 +1107,8 @@ CVector<CInstPictures::CInstPictProps>& 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 ) );