Commit graph

2831 commits

Author SHA1 Message Date
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
ignotus
5666cb7276
Merge pull request #5 from corrados/master
update
2020-07-11 21:23:15 +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
Volker Fischer
c86340a74b update 2020-07-11 16:56:59 +02:00
Volker Fischer
7b8cfd6387
Merge pull request #452 from dingodoppelt/showmaxclients
show number of connected clients as well as max clients in serverbrowser
2020-07-11 16:55:11 +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
Volker Fischer
71c1067905
Merge pull request #446 from melcon/master
Update translation_pt_BR.ts
2020-07-10 17:43:34 +02:00
Melcon Moraes
ac454db26b Update translation_pt_BR.ts 2020-07-10 12:07:17 -03:00
Volker Fischer
e6e627ab12
Merge pull request #445 from ignotus666/master
translation corrections
2020-07-10 11:24:52 +02:00
daryl
839b6def57 translation corrections 2020-07-10 10:08:41 +02:00
Volker Fischer
bbe1a3b1c4
Merge pull request #444 from ignotus666/master
Update Spanish translation
2020-07-10 06:56:15 +02:00
daryl
bb4e640426 update Spanish translation 2020-07-09 22:14:32 +02:00
ignotus
ff396dba24
Merge pull request #4 from corrados/master
update
2020-07-09 22:08:27 +02:00
Volker Fischer
0a0de6edc2 insert a spacer in the GUI options tab 2020-07-09 20:21:03 +02:00
Volker Fischer
d4a8875c8b merge fixes, update translations 2020-07-09 20:15:52 +02:00
Volker Fischer
2744b376e5
Merge pull request #442 from genesisproject2020/master
update translation
2020-07-09 20:07:59 +02:00
Volker Fischer
e7daf34063 added a GUI control to set the server Welcome Message in the server GUI 2020-07-09 20:03:09 +02:00
ignotus
8b54adcbba
Merge pull request #3 from corrados/master
update
2020-07-09 19:47:14 +02:00
Volker Fischer
8cd4f5b3e8 move vecWindowPosMain in the settings base class 2020-07-09 18:19:33 +02:00
Volker Fischer
d0f4b9b6a0 introduce a tab widget for the server GUI (as proposed in #367) 2020-07-09 16:13:40 +02:00
Volker Fischer
663de1d92e
Merge pull request #441 from melcon/master
Update translation_pt_BR.ts
2020-07-09 07:45:35 +02:00
Melcon Moraes
1dff704163 Update translation_pt_BR.ts 2020-07-09 00:11:25 -03:00
genesisproject2020
e4b683c4df Update translation_sv_SE.ts
Update
2020-07-08 23:52:04 +02:00
genesisproject2020
96cb2fee33 Update translation_sv_SE.ts 2020-07-08 23:42:46 +02:00
ignotus
1df53d8bf7
Merge pull request #2 from corrados/master
update
2020-07-08 22:50:32 +02:00
Volker Fischer
91d5560f94 update 2020-07-08 19:17:58 +02:00