Commit graph

2550 commits

Author SHA1 Message Date
Volker Fischer
7df3ce1115 small merge fixes 2020-05-11 17:10:38 +02:00
Volker Fischer
48387d4add
Merge pull request #200 from sthenos/master
Added Oboe support for android implementation (part)
2020-05-11 16:58:56 +02:00
Simon Tomlinson
0b12722460
Merge branch 'master' into master 2020-05-11 08:03:29 +01:00
Simon Tomlinson
c112b1e0fc Added Oboe support code for android audio. There are problems rendering
audio (audio is dithered), still more work required.
2020-05-11 07:36:46 +01:00
Volker Fischer
6840bc10fa
Merge pull request #197 from trebmuh/patch-1
French translation update
2020-05-11 07:53:28 +02:00
Olivier Humbert
95fdf0fc6b
French translation update 2020-05-11 01:19:21 +02:00
Volker Fischer
dc28332ac6 some more German translation 2020-05-10 23:11:29 +02:00
Volker Fischer
82ec4822d4 fixed a typo 2020-05-10 22:55:47 +02:00
Volker Fischer
dd451dc868 added bongo instrument icon created by bspeer (Ticket #131) 2020-05-10 22:32:36 +02:00
Peter L Jones
b60c3cab7b Handle server application closure more cleanly 2020-05-10 18:20:57 +01:00
Volker Fischer
ac3255afbf Fixed a bug with the default server port (Ticket #194) 2020-05-10 19:06:27 +02:00
Volker Fischer
d0608156e2 Merge branch 'master' of https://github.com/corrados/jamulus 2020-05-10 14:33:01 +02:00
Volker Fischer
2da5a989cd some more German translation 2020-05-10 14:32:45 +02:00
ignotus
ef74d744cd
Merge pull request #3 from corrados/master
update
2020-05-10 11:43:06 +02:00
Volker Fischer
ef0d72cbbd
Merge pull request #193 from ignotus666/master
Corrections to Spanish translation
2020-05-10 11:37:50 +02:00
Volker Fischer
1f44b63094 some more German translations 2020-05-10 11:36:56 +02:00
ignotus
378277a530
Corrections to Spanish translation 2020-05-10 11:22:58 +02:00
ignotus
b9723c0b5e
Merge pull request #2 from corrados/master
bug fix: fixed that Jamulus segfaults when jackd is restarted (Ticket…
2020-05-10 10:50:07 +02:00
ignotus
7c6e862ebb
Add files via upload 2020-05-10 10:48:08 +02:00
Volker Fischer
7c9401e266 bug fix: fixed that Jamulus segfaults when jackd is restarted (Ticket #122, #127) 2020-05-10 10:41:49 +02:00
ignotus
97355a5361
Merge pull request #1 from corrados/master
Merge pull request #191 from ignotus666/master
2020-05-10 10:16:23 +02:00
Volker Fischer
e5f3237861
Merge pull request #191 from ignotus666/master
Updated Spanish translation and translator name
2020-05-10 09:09:23 +02:00
ignotus
dd367bae76
Added translator name 2020-05-09 23:56:38 +02:00
ignotus
d1cf481d47
Updated Spanish translation 2020-05-09 23:53:32 +02:00
Volker Fischer
b56912b2b3 added missing tr() functions, WIP German translation, changed --translation in --notranslation so that the translation is on per default 2020-05-09 23:09:56 +02:00
Volker Fischer
ae250f2c16 add lrelease in qmake pro file to auto generate the .qm files 2020-05-09 21:47:14 +02:00
Volker Fischer
36a87e4f2c update 2020-05-09 21:45:08 +02:00
Volker Fischer
fc099ec828 update a name in the About dialog 2020-05-09 21:15:45 +02:00
Volker Fischer
17dcd941b4 add the names of the contributors in the about dialog 2020-05-09 15:27:07 +02:00
Volker Fischer
136d99ecf0 Merge branch 'master' into new_about_dialog 2020-05-09 10:01:51 +02:00
Volker Fischer
9b1e9f9b3e update 2020-05-09 07:13:22 +02:00
Volker Fischer
d69db68576
Merge pull request #188 from ignotus666/master
Added Spanish translation
2020-05-09 07:12:32 +02:00
Volker Fischer
be66900164
Merge pull request #186 from trebmuh/patch-2
French translation update
2020-05-09 07:10:52 +02:00
ignotus
12a2082614
Add files via upload 2020-05-08 22:55:45 +02:00
Olivier Humbert
d1cc6e24a2
French translation update 2020-05-08 18:16:01 +02:00
Volker Fischer
1c4e3edda6 added congas instrument icon created by bspeer (Ticket #131) 2020-05-08 17:51:44 +02:00
Volker Fischer
336471e599
Merge pull request #185 from pljones/prevent-unused-warnings-iUnused
Prevent unused warnings for iUnused
2020-05-08 17:13:54 +02:00
Volker Fischer
b76e1934f6 first tests of new about dialog 2020-05-08 17:09:54 +02:00
Peter L Jones
dd3b3a6278 Prevent unused warnings for iUnused 2020-05-08 13:31:16 +01:00
Volker Fischer
84d53914b9 fix for client port number (avoid socket bind problems if client on the same PC is started before the server) 2020-05-07 20:22:14 +02:00
Volker Fischer
07a92fb2c2 if -p [port] is given for the client, you get [port]+10 -> change this to that you get what you set (if available) 2020-05-07 18:19:12 +02:00
corrados
15d38baae9
Merge pull request #180 from trebmuh/patch-1
deb packaging: build translations at build time
2020-05-07 18:08:37 +02:00
corrados
a00f895000
Merge pull request #183 from Snayler/master
Update pt_PT Translation
2020-05-07 18:07:42 +02:00
Snayler
330e53bca0
Updated pt_PT Translation with missing values 2020-05-07 14:51:07 +01:00
Snayler
b337adc24a
Merge pull request #1 from corrados/master
Update
2020-05-07 14:47:06 +01:00
Volker Fischer
d437b8a662 update translations 2020-05-07 09:50:27 +02:00
Volker Fischer
c5f7f0e2b9 small fix 2020-05-07 09:49:37 +02:00
Volker Fischer
d268e8783b some more removing html code from translation strings 2020-05-07 09:45:11 +02:00
Volker Fischer
48bfa02bb3 some more removing html code from translation strings 2020-05-07 09:38:20 +02:00
Volker Fischer
da30aeae09 some more removing html code from translation strings 2020-05-07 09:30:43 +02:00