Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git

3 files changed, 32 insertions, 8 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a3e3212a27..ebd4545163 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -645,8 +645,12 @@
 
 ## [2.3.2](https://launchpad.net/mixxx/+milestone/2.3.2) (Unreleased)
 
-* Improve robustness of file type detection by considering the actual MIME type of the content. [lp:1445885](https://bugs.launchpad.net/mixxx/+bug/1445885) [#4356](https://github.com/mixxxdj/mixxx/pull/4356) [#4357](https://github.com/mixxxdj/mixxx/pull/4357)
 * Playlist: Enable sorting by color [#4352](https://github.com/mixxxdj/mixxx/pull/4352) [lp:1945976](https://bugs.launchpad.net/mixxx/+bug/1945976)
+* Fix crash when using Doubling/Halving/etc. BPM from track's Properties window on tracks without BPM [#4587](https://github.com/mixxxdj/mixxx/pull/4587) [lp:1955853](https://bugs.launchpad.net/mixxx/+bug/1955853)
+* Fix writing metadata on Windows for files that have never been played [#4586](https://github.com/mixxxdj/mixxx/pull/4586) [lp:1955331](https://bugs.launchpad.net/mixxx/+bug/1955331)
+* Preserve file creation time when writing metadata on Windows [#4586](https://github.com/mixxxdj/mixxx/pull/4586) [lp1955314](https://bugs.launchpad.net/mixxx/+bug/1955314)
+* Fix handling of file extension when importing and exporting sampler settings [#4539](https://github.com/mixxxdj/mixxx/pull/4539)
+* Fix crash when using an empty directory as resource path using the `--resource-path` command line option [#4575](https://github.com/mixxxdj/mixxx/pull/4575) [lp1934560](https://bugs.launchpad.net/mixxx/+bug/1934560)
 
 ### Packaging
 
diff --git a/res/linux/org.mixxx.Mixxx.metainfo.xml b/res/linux/org.mixxx.Mixxx.metainfo.xml
index ce9368bd88..ccac0f6f68 100644
--- a/res/linux/org.mixxx.Mixxx.metainfo.xml
+++ b/res/linux/org.mixxx.Mixxx.metainfo.xml
@@ -1104,16 +1104,36 @@
       <description>
  <ul>
   <li>
-   Improve robustness of file type detection by considering the actual MIME type of the content.
-   lp:1445885
-   #4356
-   #4357
-  </li>
-  <li>
    Playlist: Enable sorting by color
    #4352
    lp:1945976
   </li>
+  <li>
+   Fix crash when using Doubling/Halving/etc. BPM from track's Properties window on tracks without BPM
+   #4587
+   lp:1955853
+  </li>
+  <li>
+   Fix writing metadata on Windows for files that have never been played
+   #4586
+   lp:1955331
+  </li>
+  <li>
+   Preserve file creation time when writing metadata on Windows
+   #4586
+   lp1955314
+  </li>
+  <li>
+   Fix handling of file extension when importing and exporting sampler settings
+   #4539
+  </li>
+  <li>
+   Fix crash when using an empty directory as resource path using the
+   --resource-path
+   command line option
+   #4575
+   lp1934560
+  </li>
  </ul>
  <p>
   Packaging
diff --git a/src/mixer/samplerbank.cpp b/src/mixer/samplerbank.cpp
index 561237d7a2..9250319fdf 100644
--- a/src/mixer/samplerbank.cpp
+++ b/src/mixer/samplerbank.cpp
@@ -18,7 +18,7 @@ const ConfigKey kConfigkeyLastImportExportDirectory(
         "[Samplers]", "last_import_export_directory");
 // This is used in multiple tr() calls below which accepts const char* as a key.
 // lupdate finds the single string here.
-const char kSamplerFileType[] = QT_TR_NOOP("Mixxx Sampler Banks (*.xml)");
+const char kSamplerFileType[] = QT_TRANSLATE_NOOP("Mixxx Sampler Banks (*.xml)");
 
 } // anonymous namespace