Merge 900e2a46bd into 2f3464403b

src/core/song.cpp

@@ -1138,13 +1138,13 @@ uint qHash(const Song& song) {
 }
 
 bool Song::IsSimilar(const Song& other) const {
-  return title().compare(other.title(), Qt::CaseInsensitive) == 0 &&
+  return basefilename().compare(other.basefilename(), Qt::CaseInsensitive) == 0 &&
          artist().compare(other.artist(), Qt::CaseInsensitive) == 0;
 }
 
 uint HashSimilar(const Song& song) {
   // Should compare the same fields as function IsSimilar
-  return qHash(song.title().toLower()) ^ qHash(song.artist().toLower());
+  return qHash(song.basefilename().toLower()) ^ qHash(song.artist().toLower());
 }
 
 bool Song::IsOnSameAlbum(const Song& other) const {

src/translations/de.po

@@ -42,6 +42,7 @@
 # Martin Brodbeck <martin@brodbeck-online.de>, 2013
 # Martin Herkt <lachs0r@hong-mailing.de>, 2011
 # Martin Herkt <luck3r@phicode.de>, 2010
+# Michael Kohler, 2024
 # MCMicS, 2020
 # Mohamed Sakhri, 2013
 # Mohamed Sakhri, 2013
@@ -70,7 +71,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-04-09 10:24+0000\n"
 "PO-Revision-Date: 2011-10-27 18:53+0000\n"
-"Last-Translator: 6543 <6543@obermui.de>, 2020\n"
+"Last-Translator: Michael Kohler, 2024\n"
 "Language-Team: German (http://app.transifex.com/davidsansome/clementine/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -219,7 +220,7 @@ msgid "1 track"
 msgstr "1 Titel"
 
 msgid "128K MP3"
-msgstr ""
+msgstr "128K MP3"
 
 msgid "128k MP3"
 msgstr "128k MP3"
@@ -240,7 +241,7 @@ msgid "A Grooveshark Anywhere account is required."
 msgstr ""
 
 msgid "A Spotify Premium account is required."
-msgstr ""
+msgstr "Spotify Premium Zugang wird benötigt."
 
 msgid ""
 "A smart playlist is a dynamic list of songs that come from your library.  "
@@ -293,7 +294,7 @@ msgid "Action"
 msgstr "Aktion"
 
 msgid "Active/deactive Wiiremote"
-msgstr ""
+msgstr "Aktivieren/deaktivieren Wiiremote"
 
 msgid "Add Stream"
 msgstr "Datenstrom hinzufügen"
@@ -326,7 +327,7 @@ msgid "Add folder..."
 msgstr "Ordner hinzufügen …"
 
 msgid "Add media"
-msgstr ""
+msgstr "Medien hinzufügen ..."
 
 msgid "Add new folder..."
 msgstr "Neuen Ordner hinzufügen …"
@@ -386,7 +387,7 @@ msgid "Add wiimotedev action"
 msgstr "Aktion für Wii-Fernbedienung hinzufügen"
 
 msgid "Add..."
-msgstr ""
+msgstr "Hinzufügen …"
 
 msgid "Added this month"
 msgstr "Diesen Monat hinzugefügt"
@@ -422,7 +423,7 @@ msgid "Album info on jamendo.com..."
 msgstr "Albuminformationen auf jamendo.com …"
 
 msgid "Albumartist"
-msgstr ""
+msgstr "Albumkünstler"
 
 msgid "Albums with covers"
 msgstr "Alben mit Titelbildern"
@@ -633,7 +634,7 @@ msgid "CUE sheet support"
 msgstr "Unterstützung von Cuesheets"
 
 msgid "Cancel"
-msgstr ""
+msgstr "Abbrechen"
 
 msgid "Change cover art"
 msgstr "Titelbilder ändern"

src/translations/eo.po

@@ -3,10 +3,10 @@
 # This file is distributed under the same license as the Clementine package.
 # 
 # Translators:
-# Adolfo Jayme-Barrientos, 2014
+# Adolfo Jayme Barrientos, 2014
-# Adolfo Jayme-Barrientos, 2018-2022
+# Adolfo Jayme Barrientos, 2018-2022
-# Adolfo Jayme-Barrientos, 2015-2016
+# Adolfo Jayme Barrientos, 2015-2016
-# Adolfo Jayme-Barrientos, 2014
+# Adolfo Jayme Barrientos, 2014
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2010
 msgid ""
 msgstr ""
@@ -14,7 +14,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-04-09 10:24+0000\n"
 "PO-Revision-Date: 2011-10-27 18:53+0000\n"
-"Last-Translator: Adolfo Jayme-Barrientos, 2018-2022\n"
+"Last-Translator: Adolfo Jayme Barrientos, 2018-2022\n"
 "Language-Team: Esperanto (http://app.transifex.com/davidsansome/clementine/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

src/translations/es.po

@@ -4,12 +4,12 @@
 # 
 # Translators:
 # Coroccotta <adiazubierna@gmail.com>, 2012
-# Adolfo Jayme-Barrientos, 2014
+# Adolfo Jayme Barrientos, 2014
-# Adolfo Jayme-Barrientos, 2012-2013,2018,2021
+# Adolfo Jayme Barrientos, 2012-2013,2018,2021
-# Adolfo Jayme-Barrientos, 2016-2022
+# Adolfo Jayme Barrientos, 2016-2022
-# Adolfo Jayme-Barrientos, 2015-2016
+# Adolfo Jayme Barrientos, 2015-2016
-# Adolfo Jayme-Barrientos, 2013
+# Adolfo Jayme Barrientos, 2013
-# Adolfo Jayme-Barrientos, 2014
+# Adolfo Jayme Barrientos, 2014
 # Adrián Prado Castro <adrian.prado@gmail.com>, 2013
 # Adrián Ramirez Escalante <buried.prophet@gmail.com>, 2012
 # Amaury Ortega <amauryocortega@gmail.com>, 2018