Skip to content

Commit 30fc492

Browse files
daschuerdaschuer
authored
Merge pull request #2076 from daschuer/release-2.1.8
Release 2.1.8
2 parents 21c79a4 + 607a81d commit 30fc492

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+6390
-6755
lines changed

‎CHANGELOG

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
==== 2.1.8 2019-02-23 ====
1+
==== 2.1.8 2019-04-07 ====
22

33
* Fix a rare chance for a corrupt track file while writing metadata in out of disk situations. lp:1815305
4-
* Fix export of BPM track file metadata. lp:1816490
4+
* Fix export of BPM track file metadata. lp:1816490
5+
* Fix sending of broadcast metadata with TLS enabled libshout 2.4.1. lp:1817395
6+
* Fix resdicovering purged tracks in all cases. lp:1821514
7+
* Fix dropping track from OSX Finder. lp:1822424
58

69
==== 2.1.7 2019-01-15 ====
710

‎build/debian/changelog

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ mixxx (2.1.8-0ubuntu1) bionic; urgency=medium
22

33
* New upstream release
44

5-
-- Daniel Schürmann <[email protected]> Sat, 23 Feb 2019 10:35:15 +0100
5+
-- Daniel Schürmann <[email protected]> Sun, 07 Apr 2019 12:14:46 +0200
66

77
mixxx (2.1.7-0ubuntu1) bionic; urgency=medium
88

‎res/translations/mixxx.ts

+67-74
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!DOCTYPE TS>
3-
<TS version="2.0" sourcelanguage="en">
3+
<TS version="2.1" sourcelanguage="en">
44
<context>
55
<name>:</name>
66
<message>
@@ -2919,6 +2919,34 @@
29192919
<translation type="unfinished"></translation>
29202920
</message>
29212921
</context>
2922+
<context>
2923+
<name>DlgAbout</name>
2924+
<message>
2925+
<location filename="../../src/dialog/dlgabout.cpp" line="35"/>
2926+
<source>Mixxx %1 Development Team</source>
2927+
<translation type="unfinished"></translation>
2928+
</message>
2929+
<message>
2930+
<location filename="../../src/dialog/dlgabout.cpp" line="36"/>
2931+
<source>With contributions from:</source>
2932+
<translation type="unfinished"></translation>
2933+
</message>
2934+
<message>
2935+
<location filename="../../src/dialog/dlgabout.cpp" line="37"/>
2936+
<source>And special thanks to:</source>
2937+
<translation type="unfinished"></translation>
2938+
</message>
2939+
<message>
2940+
<location filename="../../src/dialog/dlgabout.cpp" line="38"/>
2941+
<source>Past Developers</source>
2942+
<translation type="unfinished"></translation>
2943+
</message>
2944+
<message>
2945+
<location filename="../../src/dialog/dlgabout.cpp" line="39"/>
2946+
<source>Past Contributors</source>
2947+
<translation type="unfinished"></translation>
2948+
</message>
2949+
</context>
29222950
<context>
29232951
<name>DlgAboutDlg</name>
29242952
<message>
@@ -4670,11 +4698,7 @@ CUP mode:
46704698
<location filename="../../src/preferences/dialog/dlgprefeq.cpp" line="262"/>
46714699
<location filename="../../src/preferences/dialog/dlgprefeq.cpp" line="677"/>
46724700
<source>None</source>
4673-
<extracomment>Displayed when no effect is selected
4674-
----------
4675-
Displayed when no effect is selected
4676-
----------
4677-
Displayed when no effect is selected</extracomment>
4701+
<extracomment>Displayed when no effect is selected</extracomment>
46784702
<translation type="unfinished"></translation>
46794703
</message>
46804704
</context>
@@ -5884,11 +5908,7 @@ The loudness target is approximate and assumes track pregain and master output l
58845908
<location filename="../../src/preferences/dialog/dlgprefsounddlg.ui" line="181"/>
58855909
<location filename="../../src/preferences/dialog/dlgprefsounddlg.ui" line="204"/>
58865910
<source> ms</source>
5887-
<extracomment>milliseconds
5888-
----------
5889-
milliseconds
5890-
----------
5891-
milliseconds</extracomment>
5911+
<extracomment>milliseconds</extracomment>
58925912
<translation type="unfinished"></translation>
58935913
</message>
58945914
<message>
@@ -9187,132 +9207,137 @@ Fully right: end of the effect period</source>
91879207
<translation type="unfinished"></translation>
91889208
</message>
91899209
<message>
9190-
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="263"/>
9210+
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="98"/>
9211+
<source>Error setting tls mode:</source>
9212+
<translation type="unfinished"></translation>
9213+
</message>
9214+
<message>
9215+
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="282"/>
91919216
<source>Error setting hostname!</source>
91929217
<translation type="unfinished"></translation>
91939218
</message>
91949219
<message>
9195-
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="270"/>
9220+
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="289"/>
91969221
<source>Error setting port!</source>
91979222
<translation type="unfinished"></translation>
91989223
</message>
91999224
<message>
9200-
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="276"/>
9225+
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="295"/>
92019226
<source>Error setting password!</source>
92029227
<translation type="unfinished"></translation>
92039228
</message>
92049229
<message>
9205-
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="282"/>
9230+
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="301"/>
92069231
<source>Error setting mount!</source>
92079232
<translation type="unfinished"></translation>
92089233
</message>
92099234
<message>
9210-
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="288"/>
9235+
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="307"/>
92119236
<source>Error setting username!</source>
92129237
<translation type="unfinished"></translation>
92139238
</message>
92149239
<message>
9215-
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="293"/>
9240+
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="312"/>
92169241
<source>Error setting stream name!</source>
92179242
<translation type="unfinished"></translation>
92189243
</message>
92199244
<message>
9220-
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="298"/>
9245+
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="317"/>
92219246
<source>Error setting stream description!</source>
92229247
<translation type="unfinished"></translation>
92239248
</message>
92249249
<message>
9225-
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="303"/>
9250+
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="322"/>
92269251
<source>Error setting stream genre!</source>
92279252
<translation type="unfinished"></translation>
92289253
</message>
92299254
<message>
9230-
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="308"/>
9255+
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="327"/>
92319256
<source>Error setting stream url!</source>
92329257
<translation type="unfinished"></translation>
92339258
</message>
92349259
<message>
9235-
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="313"/>
9260+
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="332"/>
92369261
<source>Error setting stream public!</source>
92379262
<translation type="unfinished"></translation>
92389263
</message>
92399264
<message>
9240-
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="339"/>
9265+
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="358"/>
92419266
<source>Broadcasting at 96kHz with Ogg Vorbis is not currently supported. Please try a different sample-rate or switch to a different encoding.</source>
92429267
<translation type="unfinished"></translation>
92439268
</message>
92449269
<message>
9245-
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="342"/>
9270+
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="361"/>
92469271
<source>See https://bugs.launchpad.net/mixxx/+bug/686212 for more information.</source>
92479272
<translation type="unfinished"></translation>
92489273
</message>
92499274
<message>
9250-
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="350"/>
9275+
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="369"/>
92519276
<source>Error setting bitrate</source>
92529277
<translation type="unfinished"></translation>
92539278
</message>
92549279
<message>
9255-
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="365"/>
9280+
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="384"/>
92569281
<source>Error: unknown server protocol!</source>
92579282
<translation type="unfinished"></translation>
92589283
</message>
92599284
<message>
9260-
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="370"/>
9285+
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="389"/>
92619286
<source>Error: libshout only supports Shoutcast with MP3 format!</source>
92629287
<translation type="unfinished"></translation>
92639288
</message>
92649289
<message>
9265-
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="376"/>
9290+
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="395"/>
92669291
<source>Error setting protocol!</source>
92679292
<translation type="unfinished"></translation>
92689293
</message>
92699294
<message>
9270-
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="604"/>
9295+
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="623"/>
92719296
<source>Network cache overflow</source>
92729297
<translation type="unfinished"></translation>
92739298
</message>
92749299
<message>
9275-
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="812"/>
9300+
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="837"/>
92769301
<source>Connection error</source>
92779302
<translation type="unfinished"></translation>
92789303
</message>
92799304
<message>
9280-
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="813"/>
9305+
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="838"/>
92819306
<source>One of the Live Broadcasting connections raised this error:&lt;br&gt;&lt;b&gt;Error with connection &apos;%1&apos;:&lt;/b&gt;&lt;br&gt;</source>
92829307
<translation type="unfinished"></translation>
92839308
</message>
92849309
<message>
9285-
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="827"/>
9310+
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="852"/>
92869311
<source>Connection message</source>
92879312
<translation type="unfinished"></translation>
92889313
</message>
92899314
<message>
9290-
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="828"/>
9315+
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="853"/>
92919316
<source>&lt;b&gt;Message from Live Broadcasting connection &apos;%1&apos;:&lt;/b&gt;&lt;br&gt;</source>
92929317
<translation type="unfinished"></translation>
92939318
</message>
92949319
<message>
9295-
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="878"/>
9320+
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="903"/>
92969321
<source>Lost connection to streaming server and %1 attempts to reconnect have failed.</source>
92979322
<translation type="unfinished"></translation>
92989323
</message>
92999324
<message>
9300-
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="881"/>
9325+
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="906"/>
93019326
<source>Lost connection to streaming server.</source>
93029327
<translation type="unfinished"></translation>
93039328
</message>
93049329
<message>
9305-
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="886"/>
9330+
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="911"/>
93069331
<source>Please check your connection to the Internet.</source>
93079332
<translation type="unfinished"></translation>
93089333
</message>
93099334
<message>
9310-
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="921"/>
9335+
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="946"/>
93119336
<source>Can&apos;t connect to streaming server</source>
93129337
<translation type="unfinished"></translation>
93139338
</message>
93149339
<message>
9315-
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="923"/>
9340+
<location filename="../../src/engine/sidechain/shoutconnection.cpp" line="948"/>
93169341
<source>Please check your connection to the Internet and verify that your username and password are correct.</source>
93179342
<translation type="unfinished"></translation>
93189343
</message>
@@ -9992,7 +10017,6 @@ Fully right: end of the effect period</source>
999210017
<message>
999310018
<location filename="../../src/skin/tooltips.cpp" line="344"/>
999410019
<source>Key</source>
9995-
<extracomment>The musical key of a track</extracomment>
999610020
<translation type="unfinished"></translation>
999710021
</message>
999810022
<message>
@@ -11115,7 +11139,6 @@ Fully right: end of the effect period</source>
1111511139
<message>
1111611140
<location filename="../../src/skin/tooltips.cpp" line="694"/>
1111711141
<source>Track Key</source>
11118-
<extracomment>The musical key of a track</extracomment>
1111911142
<translation type="unfinished"></translation>
1112011143
</message>
1112111144
<message>
@@ -11613,34 +11636,6 @@ Fully right: end of the effect period</source>
1161311636
<translation type="unfinished"></translation>
1161411637
</message>
1161511638
</context>
11616-
<context>
11617-
<name>Ui</name>
11618-
<message>
11619-
<location filename="../../src/dialog/dlgabout.cpp" line="35"/>
11620-
<source>Mixxx %1 Development Team</source>
11621-
<translation type="unfinished"></translation>
11622-
</message>
11623-
<message>
11624-
<location filename="../../src/dialog/dlgabout.cpp" line="36"/>
11625-
<source>With contributions from:</source>
11626-
<translation type="unfinished"></translation>
11627-
</message>
11628-
<message>
11629-
<location filename="../../src/dialog/dlgabout.cpp" line="37"/>
11630-
<source>And special thanks to:</source>
11631-
<translation type="unfinished"></translation>
11632-
</message>
11633-
<message>
11634-
<location filename="../../src/dialog/dlgabout.cpp" line="38"/>
11635-
<source>Past Developers</source>
11636-
<translation type="unfinished"></translation>
11637-
</message>
11638-
<message>
11639-
<location filename="../../src/dialog/dlgabout.cpp" line="39"/>
11640-
<source>Past Contributors</source>
11641-
<translation type="unfinished"></translation>
11642-
</message>
11643-
</context>
1164411639
<context>
1164511640
<name>VSyncThread</name>
1164611641
<message>
@@ -12198,22 +12193,20 @@ Fully right: end of the effect period</source>
1219812193
<context>
1219912194
<name>WOverview</name>
1220012195
<message>
12201-
<location filename="../../src/widget/woverview.cpp" line="370"/>
12196+
<location filename="../../src/widget/woverview.cpp" line="369"/>
1220212197
<source>Ready to play, analyzing ..</source>
1220312198
<extracomment>Text on waveform overview when file is playable but no waveform is visible</extracomment>
1220412199
<translation type="unfinished"></translation>
1220512200
</message>
1220612201
<message>
12207-
<location filename="../../src/widget/woverview.cpp" line="373"/>
12208-
<location filename="../../src/widget/woverview.cpp" line="383"/>
12202+
<location filename="../../src/widget/woverview.cpp" line="372"/>
12203+
<location filename="../../src/widget/woverview.cpp" line="382"/>
1220912204
<source>Loading track ..</source>
12210-
<extracomment>Text on waveform overview when file is cached from source
12211-
----------
12212-
Text on waveform overview when file is cached from source</extracomment>
12205+
<extracomment>Text on waveform overview when file is cached from source</extracomment>
1221312206
<translation type="unfinished"></translation>
1221412207
</message>
1221512208
<message>
12216-
<location filename="../../src/widget/woverview.cpp" line="377"/>
12209+
<location filename="../../src/widget/woverview.cpp" line="376"/>
1221712210
<source>Finalizing ..</source>
1221812211
<extracomment>Text on waveform overview during finalizing of waveform analysis</extracomment>
1221912212
<translation type="unfinished"></translation>

0 commit comments

Comments
 (0)