eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
2861 commits 3 branches 0 tags 26 MiB
Commit graph

2018 commits

Author SHA1 Message Date
Volker Fischer
4707501060 log the number of connected clients on each new connection (#277) 2020-07-18 08:56:52 +02:00
Volker Fischer
7181546359 update 2020-07-18 08:31:54 +02:00
Melcon Moraes
7942558431 Update translation_pt_BR.ts 2020-07-18 02:46:10 -03:00
Melcon Moraes
5d3dd9be0c Merge remote-tracking branch 'upstream/master' 2020-07-18 02:44:10 -03:00
Volker Fischer
a9d85301ad update translations 2020-07-17 22:58:58 +02:00
ignotus
6d32779b42
Merge pull request #2 from corrados/master 
add the names of the instrument icon creators to the contributors lis…
 2020-07-17 22:42:46 +02:00
Volker Fischer
aabe93a074 add the names of the instrument icon creators to the contributors list in the about dialog 2020-07-17 18:29:11 +02:00
ignotus666
9261895b2e Update Spanish translation 2020-07-16 21:55:25 +02:00
Volker Fischer
64494a3e67 fix translation: type="unfinished" was missing 2020-07-16 18:54:10 +02:00
Volker Fischer
6a5e1ba173 update translations 2020-07-16 18:50:44 +02:00
ignotus666
2ec02df04e Updated Spanish translation 2020-07-16 15:43:58 +02:00
Volker Fischer
6409bf1837 move the Mute Myself button up to prevent accidentally disconnecting 2020-07-15 22:25:30 +02:00
Melcon Moraes
289e249ac4 Merge remote-tracking branch 'upstream/master' 2020-07-14 19:56:56 -03:00
Volker Fischer
0521b53e9c update translations 2020-07-14 18:51:04 +02:00
Adrien David-Sivelle
7a394400c8 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
 2020-07-14 11:42:06 -04:00
Adrien David-Sivelle
397100371e 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
 2020-07-14 11:15:18 -04:00
Adrien David-Sivelle
b8ef2d414d Add 2 new instruments: Baritone and Lead vocals 
Used in barbershop and TTBB choirs, as well as a-capella groups
 2020-07-13 22:02:19 -04:00
Melcon Moraes
5d389890f0 Merge remote-tracking branch 'upstream/master' 2020-07-13 17:38:05 -03:00
Melcon Moraes
4620c1b3a6 Update translation_pt_BR.ts 2020-07-13 17:37:42 -03:00
Volker Fischer
2c99a6fc5b update translations 2020-07-13 19:34:50 +02:00
genesisproject2020
1eecaa8a33 Update translation_sv_SE.ts 
Updated with new texts.
 2020-07-12 23:31:47 +02:00
Volker Fischer
57a7027e64 bug fix: instrument names in the profile dialog are no longer translated (worked in v3.5.8) 2020-07-12 12:31:46 +02:00
Volker Fischer
9c3f65da19 update German translation 2020-07-12 10:56:12 +02:00
Volker Fischer
d6bca1e4ed update 2020-07-12 10:39:51 +02:00
Volker Fischer
94505473b1 Merge branch 'master' of https://github.com/corrados/jamulus 
# Conflicts:
#	src/res/translation/translation_nl_NL.qm
 2020-07-12 10:39:14 +02:00
Volker Fischer
c0d63fd5e5 save and restore mixer state (like fader, mute, etc.) (#377) 2020-07-12 10:38:18 +02:00
Volker Fischer
ebfd58e018
Merge pull request #454 from jerogee/update/dutch-translation-3.5.9 
Update Dutch translation for 3.5.9 as part of #77
 2020-07-12 07:32:06 +02:00
jerogee
b28463455a Update Dutch translation for 3.5.9 as part of #77 2020-07-11 23:06:13 +02:00
Volker Fischer
52302446c0 adde Load/StoreFaderSettings 2020-07-11 22:22:13 +02:00
Volker Fischer
619b0176fc update translation 2020-07-11 22:04:59 +02:00
Volker Fischer
d5146419a8
Merge pull request #453 from ignotus666/master 
update Spanish translation
 2020-07-11 22:03:08 +02:00
Volker Fischer
2e6e1c464d update 2020-07-11 22:01:40 +02:00
ignotus666
377d9e2984 update Spanish translation 2020-07-11 21:32:07 +02:00
Volker Fischer
57b14a01ed update translations 2020-07-11 20:31:24 +02:00
Volker Fischer
d3a8861204 Merge branch 'master' of https://github.com/corrados/jamulus 2020-07-11 20:29:40 +02:00
Volker Fischer
3b61a34fc5 update 2020-07-11 20:29:27 +02:00
Volker Fischer
92369dd54f
Merge pull request #450 from genesisproject2020/master 
Swedish updates
 2020-07-11 16:58:05 +02:00
dingodoppelt
3a1645b988 show number of connected clients as well as max clients in serverbrowser 2020-07-11 15:22:30 +02:00
genesisproject2020
85e30f0b6c Swedish updates 2020-07-11 14:05:03 +02:00
genesisproject2020
47da271de7 Update translation_sv_SE.ts 2020-07-11 13:40:12 +02:00
Volker Fischer
829b06d732 update German translation 2020-07-11 12:23:45 +02:00
Volker Fischer
d1938daf23
Merge pull request #449 from trebmuh/patch-1 
French translation update for 3.5.9
 2020-07-11 12:09:28 +02:00
Volker Fischer
11def323dd added context help text for server welcome message edit box 2020-07-11 12:08:19 +02:00
Olivier Humbert
dc2834dc97
French translation update for 3.5.9 2020-07-11 12:08:02 +02:00
Volker Fischer
b0781c7c02 put fader settings load/store in separate functions 2020-07-11 10:40:59 +02:00
Volker Fischer
0f9b422d0f server list/client list connection less message seems to need a mutex at the server 2020-07-11 09:28:44 +02:00
Volker Fischer
3872206f29 update translations 2020-07-11 09:20:16 +02:00
Volker Fischer
51d3c95de0 for server name/city/country and licence, the command line overwrites the ini-file setting 2020-07-10 20:33:05 +02:00
Volker Fischer
10abcff239 since the server GUI custom central server address edit control is now in a different tab, it has to be read/write all the time 2020-07-10 20:32:08 +02:00
Volker Fischer
48dc79efb5 store welcome message set in the GUI in the ini file 2020-07-10 18:51:36 +02:00