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

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Melcon Moraes 2020-07-14 19:56:56 -03:00
commit 289e249ac4
22 changed files with 121 additions and 27 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 KiB

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
src/res/translation/translation_de_DE.qm
View file

Binary file not shown.

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

@ -2494,6 +2494,16 @@
<source>Bass Ukulele</source> <source>Bass Ukulele</source>
<translation></translation> <translation></translation>
</message> </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> <message>
<location filename="../../settings.cpp" line="285"/> <location filename="../../settings.cpp" line="285"/>
<source>No Name</source> <source>No Name</source>
@ -3273,17 +3283,17 @@
<context> <context>
<name>QCoreApplication</name> <name>QCoreApplication</name>
<message> <message>
<location filename="../../util.cpp" line="1589"/> <location filename="../../util.cpp" line="1591"/>
<source>, Version </source> <source>, Version </source>
<translation>, Version </translation> <translation>, Version </translation>
</message> </message>
<message> <message>
<location filename="../../util.cpp" line="1602"/> <location filename="../../util.cpp" line="1604"/>
<source>Internet Jam Session Software</source> <source>Internet Jam Session Software</source>
<translation>Internet Jam Session Software</translation> <translation>Internet Jam Session Software</translation>
</message> </message>
<message> <message>
<location filename="../../util.cpp" line="1606"/> <location filename="../../util.cpp" line="1608"/>
<source>Released under the GNU General Public License (GPL)</source> <source>Released under the GNU General Public License (GPL)</source>
<translation>Unter der GNU General Public License (GPL)</translation> <translation>Unter der GNU General Public License (GPL)</translation>
</message> </message>

BIN
src/res/translation/translation_es_ES.qm
View file

Binary file not shown.

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

@ -2518,6 +2518,16 @@
<source>Bass Ukulele</source> <source>Bass Ukulele</source>
<translation>Ukulele Barítono</translation> <translation>Ukulele Barítono</translation>
</message> </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> <message>
<location filename="../../settings.cpp" line="285"/> <location filename="../../settings.cpp" line="285"/>
<source>No Name</source> <source>No Name</source>
@ -3297,17 +3307,17 @@
<context> <context>
<name>QCoreApplication</name> <name>QCoreApplication</name>
<message> <message>
<location filename="../../util.cpp" line="1589"/> <location filename="../../util.cpp" line="1591"/>
<source>, Version </source> <source>, Version </source>
<translation>, Versión </translation> <translation>, Versión </translation>
</message> </message>
<message> <message>
<location filename="../../util.cpp" line="1602"/> <location filename="../../util.cpp" line="1604"/>
<source>Internet Jam Session Software</source> <source>Internet Jam Session Software</source>
<translation>Internet Jam Session Software</translation> <translation>Internet Jam Session Software</translation>
</message> </message>
<message> <message>
<location filename="../../util.cpp" line="1606"/> <location filename="../../util.cpp" line="1608"/>
<source>Released under the GNU General Public License (GPL)</source> <source>Released under the GNU General Public License (GPL)</source>
<translation>Publicado bajo la GNU General Public License (GPL)</translation> <translation>Publicado bajo la GNU General Public License (GPL)</translation>
</message> </message>

BIN
src/res/translation/translation_fr_FR.qm
View file

Binary file not shown.

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

@ -2510,6 +2510,16 @@
<source>Bass Ukulele</source> <source>Bass Ukulele</source>
<translation>Ukulélé basse</translation> <translation>Ukulélé basse</translation>
</message> </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> <message>
<location filename="../../settings.cpp" line="285"/> <location filename="../../settings.cpp" line="285"/>
<source>No Name</source> <source>No Name</source>
@ -3285,17 +3295,17 @@
<context> <context>
<name>QCoreApplication</name> <name>QCoreApplication</name>
<message> <message>
<location filename="../../util.cpp" line="1589"/> <location filename="../../util.cpp" line="1591"/>
<source>, Version </source> <source>, Version </source>
<translation>, version </translation> <translation>, version </translation>
</message> </message>
<message> <message>
<location filename="../../util.cpp" line="1602"/> <location filename="../../util.cpp" line="1604"/>
<source>Internet Jam Session Software</source> <source>Internet Jam Session Software</source>
<translation>Logiciel de bœuf sur Internet</translation> <translation>Logiciel de bœuf sur Internet</translation>
</message> </message>
<message> <message>
<location filename="../../util.cpp" line="1606"/> <location filename="../../util.cpp" line="1608"/>
<source>Released under the GNU General Public License (GPL)</source> <source>Released under the GNU General Public License (GPL)</source>
<translation>Publié sous la licence publique générale GNU (GPL)</translation> <translation>Publié sous la licence publique générale GNU (GPL)</translation>
</message> </message>

BIN
src/res/translation/translation_it_IT.qm
View file

Binary file not shown.

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

@ -2470,6 +2470,16 @@
<source>Bass Ukulele</source> <source>Bass Ukulele</source>
<translation>Uculele Basso</translation> <translation>Uculele Basso</translation>
</message> </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> <message>
<location filename="../../settings.cpp" line="285"/> <location filename="../../settings.cpp" line="285"/>
<source>No Name</source> <source>No Name</source>
@ -3237,17 +3247,17 @@
<context> <context>
<name>QCoreApplication</name> <name>QCoreApplication</name>
<message> <message>
<location filename="../../util.cpp" line="1589"/> <location filename="../../util.cpp" line="1591"/>
<source>, Version </source> <source>, Version </source>
<translation>Versione, Versione </translation> <translation>Versione, Versione </translation>
</message> </message>
<message> <message>
<location filename="../../util.cpp" line="1602"/> <location filename="../../util.cpp" line="1604"/>
<source>Internet Jam Session Software</source> <source>Internet Jam Session Software</source>
<translation>Programma per Jam Session su Internet</translation> <translation>Programma per Jam Session su Internet</translation>
</message> </message>
<message> <message>
<location filename="../../util.cpp" line="1606"/> <location filename="../../util.cpp" line="1608"/>
<source>Released under the GNU General Public License (GPL)</source> <source>Released under the GNU General Public License (GPL)</source>
<translation>Rilasciato sotto licensa GNU General Public License (GPL)</translation> <translation>Rilasciato sotto licensa GNU General Public License (GPL)</translation>
</message> </message>

BIN
src/res/translation/translation_nl_NL.qm
View file

Binary file not shown.

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

@ -2458,6 +2458,16 @@
<source>Bass Ukulele</source> <source>Bass Ukulele</source>
<translation>Ukelele-bas</translation> <translation>Ukelele-bas</translation>
</message> </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> <message>
<location filename="../../settings.cpp" line="285"/> <location filename="../../settings.cpp" line="285"/>
<source>No Name</source> <source>No Name</source>
@ -3237,17 +3247,17 @@
<context> <context>
<name>QCoreApplication</name> <name>QCoreApplication</name>
<message> <message>
<location filename="../../util.cpp" line="1589"/> <location filename="../../util.cpp" line="1591"/>
<source>, Version </source> <source>, Version </source>
<translation>, Versie </translation> <translation>, Versie </translation>
</message> </message>
<message> <message>
<location filename="../../util.cpp" line="1602"/> <location filename="../../util.cpp" line="1604"/>
<source>Internet Jam Session Software</source> <source>Internet Jam Session Software</source>
<translation>Internet Jamsessie Software</translation> <translation>Internet Jamsessie Software</translation>
</message> </message>
<message> <message>
<location filename="../../util.cpp" line="1606"/> <location filename="../../util.cpp" line="1608"/>
<source>Released under the GNU General Public License (GPL)</source> <source>Released under the GNU General Public License (GPL)</source>
<translation>Gereleased onder de GNU General Public License (GPL)</translation> <translation>Gereleased onder de GNU General Public License (GPL)</translation>
</message> </message>

BIN
src/res/translation/translation_pl_PL.qm
View file

Binary file not shown.

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

@ -2156,6 +2156,16 @@ nie jestem pewna</translatorcomment>
<source>Bass Ukulele</source> <source>Bass Ukulele</source>
<translation>Ukulele basowe</translation> <translation>Ukulele basowe</translation>
</message> </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> <message>
<location filename="../../settings.cpp" line="285"/> <location filename="../../settings.cpp" line="285"/>
<source>No Name</source> <source>No Name</source>
@ -2868,17 +2878,17 @@ nie jestem pewna</translatorcomment>
<context> <context>
<name>QCoreApplication</name> <name>QCoreApplication</name>
<message> <message>
<location filename="../../util.cpp" line="1589"/> <location filename="../../util.cpp" line="1591"/>
<source>, Version </source> <source>, Version </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../util.cpp" line="1602"/> <location filename="../../util.cpp" line="1604"/>
<source>Internet Jam Session Software</source> <source>Internet Jam Session Software</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../util.cpp" line="1606"/> <location filename="../../util.cpp" line="1608"/>
<source>Released under the GNU General Public License (GPL)</source> <source>Released under the GNU General Public License (GPL)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

BIN
src/res/translation/translation_pt_BR.qm
View file

Binary file not shown.

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

@ -2497,6 +2497,16 @@
<source>Bass Ukulele</source> <source>Bass Ukulele</source>
<translation>Ukulele Baixo</translation> <translation>Ukulele Baixo</translation>
</message> </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> <message>
<location filename="../../settings.cpp" line="285"/> <location filename="../../settings.cpp" line="285"/>
<source>No Name</source> <source>No Name</source>
@ -3276,17 +3286,17 @@
<context> <context>
<name>QCoreApplication</name> <name>QCoreApplication</name>
<message> <message>
<location filename="../../util.cpp" line="1589"/> <location filename="../../util.cpp" line="1591"/>
<source>, Version </source> <source>, Version </source>
<translation>, Versão </translation> <translation>, Versão </translation>
</message> </message>
<message> <message>
<location filename="../../util.cpp" line="1602"/> <location filename="../../util.cpp" line="1604"/>
<source>Internet Jam Session Software</source> <source>Internet Jam Session Software</source>
<translation>Programa de Jam Sessions pela Internet</translation> <translation>Programa de Jam Sessions pela Internet</translation>
</message> </message>
<message> <message>
<location filename="../../util.cpp" line="1606"/> <location filename="../../util.cpp" line="1608"/>
<source>Released under the GNU General Public License (GPL)</source> <source>Released under the GNU General Public License (GPL)</source>
<translation>Lançado sob a Licença Pública Geral GNU (GPL)</translation> <translation>Lançado sob a Licença Pública Geral GNU (GPL)</translation>
</message> </message>

BIN
src/res/translation/translation_pt_PT.qm
View file

Binary file not shown.

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

@ -2494,6 +2494,16 @@
<source>Bass Ukulele</source> <source>Bass Ukulele</source>
<translation>Ukulele Baixo</translation> <translation>Ukulele Baixo</translation>
</message> </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> <message>
<location filename="../../settings.cpp" line="285"/> <location filename="../../settings.cpp" line="285"/>
<source>No Name</source> <source>No Name</source>
@ -3273,17 +3283,17 @@
<context> <context>
<name>QCoreApplication</name> <name>QCoreApplication</name>
<message> <message>
<location filename="../../util.cpp" line="1589"/> <location filename="../../util.cpp" line="1591"/>
<source>, Version </source> <source>, Version </source>
<translation>, Versão </translation> <translation>, Versão </translation>
</message> </message>
<message> <message>
<location filename="../../util.cpp" line="1602"/> <location filename="../../util.cpp" line="1604"/>
<source>Internet Jam Session Software</source> <source>Internet Jam Session Software</source>
<translation>Programa de Jam Sessions pela Internet</translation> <translation>Programa de Jam Sessions pela Internet</translation>
</message> </message>
<message> <message>
<location filename="../../util.cpp" line="1606"/> <location filename="../../util.cpp" line="1608"/>
<source>Released under the GNU General Public License (GPL)</source> <source>Released under the GNU General Public License (GPL)</source>
<translation>Lançado sob a Licença Pública Geral GNU (GPL)</translation> <translation>Lançado sob a Licença Pública Geral GNU (GPL)</translation>
</message> </message>

BIN
src/res/translation/translation_sv_SE.qm
View file

Binary file not shown.

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

@ -2152,6 +2152,16 @@
<source>Bass Ukulele</source> <source>Bass Ukulele</source>
<translation>Ukulele (bas)</translation> <translation>Ukulele (bas)</translation>
</message> </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>
<context> <context>
<name>CServerDlg</name> <name>CServerDlg</name>
@ -2874,17 +2884,17 @@
<context> <context>
<name>QCoreApplication</name> <name>QCoreApplication</name>
<message> <message>
<location filename="../../util.cpp" line="1589"/> <location filename="../../util.cpp" line="1591"/>
<source>, Version </source> <source>, Version </source>
<translation>, Version </translation> <translation>, Version </translation>
</message> </message>
<message> <message>
<location filename="../../util.cpp" line="1602"/> <location filename="../../util.cpp" line="1604"/>
<source>Internet Jam Session Software</source> <source>Internet Jam Session Software</source>
<translation>Internet Jam Session Software</translation> <translation>Internet Jam Session Software</translation>
</message> </message>
<message> <message>
<location filename="../../util.cpp" line="1606"/> <location filename="../../util.cpp" line="1608"/>
<source>Released under the GNU General Public License (GPL)</source> <source>Released under the GNU General Public License (GPL)</source>
<translation>Släppt under GNU General Public License (GPL)</translation> <translation>Släppt under GNU General Public License (GPL)</translation>
</message> </message>

2
src/resources.qrc
View file

@ -85,6 +85,8 @@
<file>res/instruments/congas.png</file> <file>res/instruments/congas.png</file>
<file>res/instruments/bongo.png</file> <file>res/instruments/bongo.png</file>
<file>res/instruments/vocalbass.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/vocaltenor.png</file>
<file>res/instruments/vocalalto.png</file> <file>res/instruments/vocalalto.png</file>
<file>res/instruments/vocalsoprano.png</file> <file>res/instruments/vocalsoprano.png</file>

2
src/util.cpp
View file

@ -1114,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", "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", "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", "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 // now the table is initialized
TableIsInitialized = true; TableIsInitialized = true;