Commit Graph

2056 Commits

Author SHA1 Message Date
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
Melcon Moraes
ac454db26b Update translation_pt_BR.ts 2020-07-10 12:07:17 -03:00
daryl
839b6def57 translation corrections 2020-07-10 10:08:41 +02:00
daryl
bb4e640426 update Spanish translation 2020-07-09 22:14:32 +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
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
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
Volker Fischer
46bb1435a0 rename variable 2020-07-07 22:07:19 +02:00
Volker Fischer
38cdd659e1 bug fix: if group is set to disabled, reset "previous level" 2020-07-07 22:02:44 +02:00
Volker Fischer
b15e61353b bug fix 2020-07-07 18:38:13 +02:00
Volker Fischer
6a7f0a6dc3 add new register message which contains server version 2020-07-07 18:31:26 +02:00
Volker Fischer
e0750d8b1a remove the version label at the bottom of the server GUI since we now have many settings and we want to clean up a bit -> the version can be seen in the About dialog anyway 2020-07-07 16:35:00 +02:00
Volker Fischer
a8651df25d updates 2020-07-07 16:24:35 +02:00
daryl
80d3e25d83 Update Spanish translation 2020-07-06 22:47:21 +02:00
Volker Fischer
e6a6c8a79e system language: first try to find the complete string, if not found use only first two letters instead 2020-07-06 20:01:40 +02:00
Volker Fischer
1e57b7b0d5 update translation files 2020-07-06 19:32:15 +02:00
Volker Fischer
399f1da5a7 add language selector also in the server GUI 2020-07-06 19:31:42 +02:00
Volker Fischer
bb9b82d2be update German translation 2020-07-06 18:49:02 +02:00
Volker Fischer
c7d82f743d implementation for the client: add support to change language (#297) -> server implementation still TODO 2020-07-06 18:39:35 +02:00
Volker Fischer
3743a6c923 update translation files 2020-07-06 16:35:26 +02:00
Olivier Humbert
752134b1fd
Update French translation 2020-07-06 14:57:06 +02:00
daryl
0e91a42889 update translation 2020-07-06 09:34:15 +02:00
ignotus
8841ce9bbf
Update serverdlg.h 2020-07-06 09:28:12 +02:00
ignotus
963415c10d
Update serverdlg.cpp 2020-07-06 09:23:06 +02:00
ignotus
f3fe7934a0
Update serverdlg.h 2020-07-06 09:19:52 +02:00
Volker Fischer
479ec6f1df store language selection in settings file; add translation help functions in util.h/.cpp 2020-07-05 20:49:43 +02:00
daryl
7dccd4cf7b Spanish translation update 2020-07-05 19:40:09 +02:00
Volker Fischer
b8ed6e9435 bug fix: clip state not correctly reset when changing servers 2020-07-05 16:33:53 +02:00
Volker Fischer
ac06f31e1f only scale instrument picture if its width is too large for Compact skin 2020-07-05 16:18:07 +02:00
Volker Fischer
b8ba6ce8db update translation files 2020-07-05 11:19:45 +02:00
Volker Fischer
0466ff6210 scale instrument picture to a small size if Compact skin is chosen 2020-07-05 09:01:32 +02:00
Volker Fischer
174740fa47 code style changes 2020-07-04 22:25:08 +02:00
Volker Fischer
dc6cfe0b5a moved a server setting in the settings class 2020-07-04 22:20:50 +02:00
Volker Fischer
d479c09307 moved one more settings in the settings class 2020-07-04 20:23:00 +02:00
Volker Fischer
9fe9c4c261 moved some settings from client class in the settings class 2020-07-04 19:55:04 +02:00
Volker Fischer
e6c564a373 merge fixes 2020-07-04 19:11:59 +02:00
Volker Fischer
9b67b0b18d
Merge pull request #429 from gilgongo/master
"Clear" symbol for recording dir
2020-07-04 19:06:41 +02:00
Volker Fischer
ba18f99865
Merge pull request #430 from geheimerEichkater/graphic
Update fronticon.png
2020-07-04 19:06:22 +02:00
geheimerEichkater
ca5b1469cc Update fronticon.png
Upscaled to 45x45 (about 1.5 times bigger)
2020-07-04 18:59:16 +02:00
Jonathan
aafb2a3439
Update serverdlg.cpp 2020-07-04 17:56:35 +01:00
Jonathan
89f5125b63
Add "clear" icon
See https://github.com/corrados/jamulus/issues/228#issuecomment-653781054
2020-07-04 17:20:11 +01:00
Volker Fischer
a73518c9c9 assign colors to the groups 2020-07-04 12:07:51 +02:00
Volker Fischer
68389457bf support sorting by group ID 2020-07-04 11:52:09 +02:00
Volker Fischer
dc577891b4 fixed issue with group checkbox and different skins 2020-07-04 10:46:31 +02:00
Volker Fischer
dab63cda23 initial multi-group support, still some work to do (e.g. the skin change does not work) 2020-07-04 09:45:46 +02:00
Volker Fischer
9af0ae13e9 add special server list filter for filtering occupied servers by using "#" (#397) 2020-07-04 08:24:35 +02:00
Peter L Jones
3b93e67f93 Changes for recorder status and whatsthis 2020-07-02 20:08:53 +01:00
Peter L Jones
eef2973ae0 Save the source 2020-07-02 20:07:40 +01:00
Volker Fischer
c2d98c865e fix: if group, set one fader to 0, set mute, move fader up, unmute -> no grouping anymore 2020-07-02 18:38:26 +02:00
Volker Fischer
4afe5ffc1c merge fix 2020-07-02 18:24:15 +02:00
Volker Fischer
578d3c005d
Merge pull request #415 from geheimerEichkater/graphic
Updated icons
2020-07-02 18:22:08 +02:00
geheimerEichkater
3c8137cdf8 Updated graphics
overlooked icon, aswell as bannersmall for homepage with full logo
2020-07-02 17:58:35 +02:00
Volker Fischer
45eef32b7c bug fix with the fader grouping: if you move one fader quickly to the top and another max out, it happened that the other fader was not exactly on max but a bit below 2020-07-02 17:55:59 +02:00
Volker Fischer
f22762d7ef support storing group state 2020-07-02 17:04:05 +02:00
Martyna27
2ba93e2d13 List of translators updated 2020-07-02 14:42:49 +02:00
Martyna27
5463cec238 Partial update 2020-07-02 13:00:16 +02:00
Volker Fischer
07594d7729 some code improvements 2020-07-01 21:52:17 +02:00