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

Fix instrument orders and translations after b8ef2d41 (#460)

Browse source 
- 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
This commit is contained in:
Adrien David-Sivelle 2020-07-14 11:42:06 -04:00
parent 397100371e
commit 7a394400c8
10 changed files with 145 additions and 145 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/res/translation/translation_de_DE.ts
View file

@ -2461,49 +2461,49 @@
</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="1113"/>
<location filename="../../util.cpp" line="1111"/>
<source>Vocal Alto</source>
<translation>Gesang Alt</translation>
</message>
<message>
<location filename="../../util.cpp" line="1114"/>
<location filename="../../util.cpp" line="1112"/>
<source>Vocal Soprano</source>
<translation>Gesang Sopran</translation>
</message>
<message>
<location filename="../../util.cpp" line="1115"/>
<location filename="../../util.cpp" line="1113"/>
<source>Banjo</source>
<translation>Banjo</translation>
</message>
<message>
<location filename="../../util.cpp" line="1116"/>
<location filename="../../util.cpp" line="1114"/>
<source>Mandolin</source>
<translation>Mandoline</translation>
</message>
<message>
<location filename="../../util.cpp" line="1117"/>
<location filename="../../util.cpp" line="1115"/>
<source>Ukulele</source>
<translation></translation>
</message>
<message>
<location filename="../../util.cpp" line="1118"/>
<location filename="../../util.cpp" line="1116"/>
<source>Bass Ukulele</source>
<translation></translation>
</message>
<message>
<location filename="../../util.cpp" line="1117"/>
<source>Vocal Baritone</source>
<translation>Gesang Bariton</translation>
</message>
<message>
<location filename="../../util.cpp" line="1118"/>
<source>Vocal Lead</source>
<translation></translation>
</message>
<message>
<location filename="../../settings.cpp" line="285"/>
<source>No Name</source>

32
src/res/translation/translation_es_ES.ts
View file

@ -2485,49 +2485,49 @@
</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="1113"/>
<location filename="../../util.cpp" line="1111"/>
<source>Vocal Alto</source>
<translation>Voz Alto</translation>
</message>
<message>
<location filename="../../util.cpp" line="1114"/>
<location filename="../../util.cpp" line="1112"/>
<source>Vocal Soprano</source>
<translation>Voz Soprano</translation>
</message>
<message>
<location filename="../../util.cpp" line="1115"/>
<location filename="../../util.cpp" line="1113"/>
<source>Banjo</source>
<translation>Banjo</translation>
</message>
<message>
<location filename="../../util.cpp" line="1116"/>
<location filename="../../util.cpp" line="1114"/>
<source>Mandolin</source>
<translation>Mandolina</translation>
</message>
<message>
<location filename="../../util.cpp" line="1117"/>
<location filename="../../util.cpp" line="1115"/>
<source>Ukulele</source>
<translation>Ukulele</translation>
</message>
<message>
<location filename="../../util.cpp" line="1118"/>
<location filename="../../util.cpp" line="1116"/>
<source>Bass Ukulele</source>
<translation>Ukulele Barítono</translation>
</message>
<message>
<location filename="../../util.cpp" line="1117"/>
<source>Vocal Baritone</source>
<translation>Voz Barítono</translation>
</message>
<message>
<location filename="../../util.cpp" line="1118"/>
<source>Vocal Lead</source>
<translation></translation>
</message>
<message>
<location filename="../../settings.cpp" line="285"/>
<source>No Name</source>

32
src/res/translation/translation_fr_FR.ts
View file

@ -2477,49 +2477,49 @@
</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="1113"/>
<location filename="../../util.cpp" line="1111"/>
<source>Vocal Alto</source>
<translation>Voix alto</translation>
</message>
<message>
<location filename="../../util.cpp" line="1114"/>
<location filename="../../util.cpp" line="1112"/>
<source>Vocal Soprano</source>
<translation>Voix soprano</translation>
</message>
<message>
<location filename="../../util.cpp" line="1115"/>
<location filename="../../util.cpp" line="1113"/>
<source>Banjo</source>
<translation>Banjo</translation>
</message>
<message>
<location filename="../../util.cpp" line="1116"/>
<location filename="../../util.cpp" line="1114"/>
<source>Mandolin</source>
<translation>Mandoline</translation>
</message>
<message>
<location filename="../../util.cpp" line="1117"/>
<location filename="../../util.cpp" line="1115"/>
<source>Ukulele</source>
<translation>Ukulélé</translation>
</message>
<message>
<location filename="../../util.cpp" line="1118"/>
<location filename="../../util.cpp" line="1116"/>
<source>Bass Ukulele</source>
<translation>Ukulélé basse</translation>
</message>
<message>
<location filename="../../util.cpp" line="1117"/>
<source>Vocal Baritone</source>
<translation>Voix baryton</translation>
</message>
<message>
<location filename="../../util.cpp" line="1118"/>
<source>Vocal Lead</source>
<translation>Voix principale</translation>
</message>
<message>
<location filename="../../settings.cpp" line="285"/>
<source>No Name</source>

32
src/res/translation/translation_it_IT.ts
View file

@ -2437,49 +2437,49 @@
</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="1113"/>
<location filename="../../util.cpp" line="1111"/>
<source>Vocal Alto</source>
<translation>Voce Alto</translation>
</message>
<message>
<location filename="../../util.cpp" line="1114"/>
<location filename="../../util.cpp" line="1112"/>
<source>Vocal Soprano</source>
<translation>Voce Soprano</translation>
</message>
<message>
<location filename="../../util.cpp" line="1115"/>
<location filename="../../util.cpp" line="1113"/>
<source>Banjo</source>
<translation>Banjo</translation>
</message>
<message>
<location filename="../../util.cpp" line="1116"/>
<location filename="../../util.cpp" line="1114"/>
<source>Mandolin</source>
<translation>Mandolino</translation>
</message>
<message>
<location filename="../../util.cpp" line="1117"/>
<location filename="../../util.cpp" line="1115"/>
<source>Ukulele</source>
<translation>Uculele</translation>
</message>
<message>
<location filename="../../util.cpp" line="1118"/>
<location filename="../../util.cpp" line="1116"/>
<source>Bass Ukulele</source>
<translation>Uculele Basso</translation>
</message>
<message>
<location filename="../../util.cpp" line="1117"/>
<source>Vocal Baritone</source>
<translation>Voce Baritono</translation>
</message>
<message>
<location filename="../../util.cpp" line="1118"/>
<source>Vocal Lead</source>
<translation></translation>
</message>
<message>
<location filename="../../settings.cpp" line="285"/>
<source>No Name</source>

32
src/res/translation/translation_nl_NL.ts
View file

@ -2425,49 +2425,49 @@
</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="1113"/>
<location filename="../../util.cpp" line="1111"/>
<source>Vocal Alto</source>
<translation>Alt (stem)</translation>
</message>
<message>
<location filename="../../util.cpp" line="1114"/>
<location filename="../../util.cpp" line="1112"/>
<source>Vocal Soprano</source>
<translation>Sopraan (stem)</translation>
</message>
<message>
<location filename="../../util.cpp" line="1115"/>
<location filename="../../util.cpp" line="1113"/>
<source>Banjo</source>
<translation>Banjo</translation>
</message>
<message>
<location filename="../../util.cpp" line="1116"/>
<location filename="../../util.cpp" line="1114"/>
<source>Mandolin</source>
<translation>Mandoline</translation>
</message>
<message>
<location filename="../../util.cpp" line="1117"/>
<location filename="../../util.cpp" line="1115"/>
<source>Ukulele</source>
<translation>Ukelele</translation>
</message>
<message>
<location filename="../../util.cpp" line="1118"/>
<location filename="../../util.cpp" line="1116"/>
<source>Bass Ukulele</source>
<translation>Ukelele-bas</translation>
</message>
<message>
<location filename="../../util.cpp" line="1117"/>
<source>Vocal Baritone</source>
<translation>Bariton (stem)</translation>
</message>
<message>
<location filename="../../util.cpp" line="1118"/>
<source>Vocal Lead</source>
<translation></translation>
</message>
<message>
<location filename="../../settings.cpp" line="285"/>
<source>No Name</source>

32
src/res/translation/translation_pl_PL.ts
View file

@ -2123,49 +2123,49 @@ 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="1113"/>
<location filename="../../util.cpp" line="1111"/>
<source>Vocal Alto</source>
<translation>Alt</translation>
</message>
<message>
<location filename="../../util.cpp" line="1114"/>
<location filename="../../util.cpp" line="1112"/>
<source>Vocal Soprano</source>
<translation>Sopran</translation>
</message>
<message>
<location filename="../../util.cpp" line="1115"/>
<location filename="../../util.cpp" line="1113"/>
<source>Banjo</source>
<translation>Banjo</translation>
</message>
<message>
<location filename="../../util.cpp" line="1116"/>
<location filename="../../util.cpp" line="1114"/>
<source>Mandolin</source>
<translation>Mandolina</translation>
</message>
<message>
<location filename="../../util.cpp" line="1117"/>
<location filename="../../util.cpp" line="1115"/>
<source>Ukulele</source>
<translation>Ukulele</translation>
</message>
<message>
<location filename="../../util.cpp" line="1118"/>
<location filename="../../util.cpp" line="1116"/>
<source>Bass Ukulele</source>
<translation>Ukulele basowe</translation>
</message>
<message>
<location filename="../../util.cpp" line="1117"/>
<source>Vocal Baritone</source>
<translation>Baryton</translation>
</message>
<message>
<location filename="../../util.cpp" line="1118"/>
<source>Vocal Lead</source>
<translation></translation>
</message>
<message>
<location filename="../../settings.cpp" line="285"/>
<source>No Name</source>

30
src/res/translation/translation_pt_BR.ts
View file

@ -2469,44 +2469,44 @@
</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="1114"/>
<location filename="../../util.cpp" line="1112"/>
<source>Vocal Soprano</source>
<translation>Voz Soprano</translation>
</message>
<message>
<location filename="../../util.cpp" line="1115"/>
<location filename="../../util.cpp" line="1113"/>
<source>Banjo</source>
<translation>Banjo</translation>
</message>
<message>
<location filename="../../util.cpp" line="1116"/>
<location filename="../../util.cpp" line="1114"/>
<source>Mandolin</source>
<translation>Bandolim</translation>
</message>
<message>
<location filename="../../util.cpp" line="1117"/>
<location filename="../../util.cpp" line="1115"/>
<source>Ukulele</source>
<translation>Ukulele</translation>
</message>
<message>
<location filename="../../util.cpp" line="1118"/>
<location filename="../../util.cpp" line="1116"/>
<source>Bass Ukulele</source>
<translation>Ukulele Baixo</translation>
</message>
<message>
<location filename="../../util.cpp" line="1117"/>
<source>Vocal Baritone</source>
<translation>Voz Barítono</translation>
</message>
<message>
<location filename="../../util.cpp" line="1118"/>
<source>Vocal Lead</source>
<translation></translation>
</message>
<message>
<location filename="../../settings.cpp" line="285"/>
<source>No Name</source>

32
src/res/translation/translation_pt_PT.ts
View file

@ -2461,49 +2461,49 @@
</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="1113"/>
<location filename="../../util.cpp" line="1111"/>
<source>Vocal Alto</source>
<translation>Voz Alto</translation>
</message>
<message>
<location filename="../../util.cpp" line="1114"/>
<location filename="../../util.cpp" line="1112"/>
<source>Vocal Soprano</source>
<translation>Voz Soprano</translation>
</message>
<message>
<location filename="../../util.cpp" line="1115"/>
<location filename="../../util.cpp" line="1113"/>
<source>Banjo</source>
<translation>Banjo</translation>
</message>
<message>
<location filename="../../util.cpp" line="1116"/>
<location filename="../../util.cpp" line="1114"/>
<source>Mandolin</source>
<translation>Bandolim</translation>
</message>
<message>
<location filename="../../util.cpp" line="1117"/>
<location filename="../../util.cpp" line="1115"/>
<source>Ukulele</source>
<translation>Ukulele</translation>
</message>
<message>
<location filename="../../util.cpp" line="1118"/>
<location filename="../../util.cpp" line="1116"/>
<source>Bass Ukulele</source>
<translation>Ukulele Baixo</translation>
</message>
<message>
<location filename="../../util.cpp" line="1117"/>
<source>Vocal Baritone</source>
<translation>Voz Barítono</translation>
</message>
<message>
<location filename="../../util.cpp" line="1118"/>
<source>Vocal Lead</source>
<translation></translation>
</message>
<message>
<location filename="../../settings.cpp" line="285"/>
<source>No Name</source>

32
src/res/translation/translation_sv_SE.ts
View file

@ -2119,49 +2119,49 @@
</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="1113"/>
<location filename="../../util.cpp" line="1111"/>
<source>Vocal Alto</source>
<translation>Sång (alt)</translation>
</message>
<message>
<location filename="../../util.cpp" line="1114"/>
<location filename="../../util.cpp" line="1112"/>
<source>Vocal Soprano</source>
<translation>Sång (sopran)</translation>
</message>
<message>
<location filename="../../util.cpp" line="1115"/>
<location filename="../../util.cpp" line="1113"/>
<source>Banjo</source>
<translation>Banjo</translation>
</message>
<message>
<location filename="../../util.cpp" line="1116"/>
<location filename="../../util.cpp" line="1114"/>
<source>Mandolin</source>
<translation>Mandolin</translation>
</message>
<message>
<location filename="../../util.cpp" line="1117"/>
<location filename="../../util.cpp" line="1115"/>
<source>Ukulele</source>
<translation>Ukulele</translation>
</message>
<message>
<location filename="../../util.cpp" line="1118"/>
<location filename="../../util.cpp" line="1116"/>
<source>Bass Ukulele</source>
<translation>Ukulele (bas)</translation>
</message>
<message>
<location filename="../../util.cpp" line="1117"/>
<source>Vocal Baritone</source>
<translation>Sång (baryton)</translation>
</message>
<message>
<location filename="../../util.cpp" line="1118"/>
<source>Vocal Lead</source>
<translation></translation>
</message>
</context>
<context>
<name>CServerDlg</name>

4
src/util.cpp
View file

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