diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..37d956fd
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+*.po    diff=po
\ No newline at end of file
diff --git a/po/ar.po b/po/ar.po
index 03053d9d..390a84fb 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Spot\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-13 09:18-0500\n"
+"POT-Creation-Date: 2021-12-13 09:46-0500\n"
 "Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -16,11 +16,6 @@ msgstr ""
 msgid "An error occured. Check logs for details!"
 msgstr "حدث خطأ. تحقق من الlog لمزيد التفاصيل!"
 
-#. translators: This is part of a larger label that reads "<Album> by <Artist>"
-#: src/app/components/details/release_details.rs:89
-msgid "by"
-msgstr "بواسطة"
-
 #. translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
 #: src/app/components/labels.rs:5
 msgid "View album"
@@ -64,6 +59,11 @@ msgstr[5] "{} الأغاني الأخرى المحددة"
 msgid "More from {}"
 msgstr "{} المزيد من"
 
+#. translators: This is part of a larger label that reads "<Album> by <Artist>"
+#: src/app/components/labels.rs:48
+msgid "{} by {}"
+msgstr ""
+
 #. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
 #: src/app/components/login/login_model.rs:56
 msgid "Could not save password. Make sure the session keyring is unlocked."
@@ -264,3 +264,6 @@ msgstr "ليس لديك ألبومات مسجلة."
 #: src/app/components/library/library.ui:27
 msgid "Your library will be shown here."
 msgstr "المكتبة خاصتك ستظهر هنا."
+
+#~ msgid "by"
+#~ msgstr "بواسطة"
diff --git a/po/ca.po b/po/ca.po
index 9a3b9d7e..d6b95680 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Spot\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-13 09:18-0500\n"
+"POT-Creation-Date: 2021-12-13 09:46-0500\n"
 "Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -15,11 +15,6 @@ msgstr ""
 msgid "An error occured. Check logs for details!"
 msgstr "Ha ocorregut un error. Comprova els registres per més detalls!"
 
-#. translators: This is part of a larger label that reads "<Album> by <Artist>"
-#: src/app/components/details/release_details.rs:89
-msgid "by"
-msgstr "per"
-
 #. translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
 #: src/app/components/labels.rs:5
 msgid "View album"
@@ -58,6 +53,11 @@ msgstr[1] "{} cançons seleccionades"
 msgid "More from {}"
 msgstr "Més de {}"
 
+#. translators: This is part of a larger label that reads "<Album> by <Artist>"
+#: src/app/components/labels.rs:48
+msgid "{} by {}"
+msgstr ""
+
 #. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
 #: src/app/components/login/login_model.rs:56
 msgid "Could not save password. Make sure the session keyring is unlocked."
@@ -262,3 +262,6 @@ msgstr "No teniu àlbums desats."
 #: src/app/components/library/library.ui:27
 msgid "Your library will be shown here."
 msgstr "Aquí es mostrarà la vostra biblioteca."
+
+#~ msgid "by"
+#~ msgstr "per"
diff --git a/po/cs.po b/po/cs.po
index 8e00eb21..82159766 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Spot\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-13 09:11-0500\n"
+"POT-Creation-Date: 2021-12-13 09:46-0500\n"
 "Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -15,11 +15,6 @@ msgstr ""
 msgid "An error occured. Check logs for details!"
 msgstr "Došlo k chybě. Podrobnosti najdete v protokolu."
 
-#. translators: This is part of a larger label that reads "<Album> by <Artist>"
-#: src/app/components/details/release_details.rs:89
-msgid "by"
-msgstr "od"
-
 #. translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
 #: src/app/components/labels.rs:5
 msgid "View album"
@@ -59,6 +54,11 @@ msgstr[2] "{} skladeb vybráno"
 msgid "More from {}"
 msgstr "Více od {}"
 
+#. translators: This is part of a larger label that reads "<Album> by <Artist>"
+#: src/app/components/labels.rs:48
+msgid "{} by {}"
+msgstr ""
+
 #. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
 #: src/app/components/login/login_model.rs:56
 msgid "Could not save password. Make sure the session keyring is unlocked."
@@ -171,18 +171,22 @@ msgstr "Přidat do playlistu..."
 msgid "Remove"
 msgstr "Odstranit"
 
+#. This refers to a music label
 #: src/app/components/details/release_details.ui:38
 msgid "Label"
 msgstr "Vydavatelství"
 
+#. This refers to a release date
 #: src/app/components/details/release_details.ui:48
 msgid "Released"
 msgstr "Vydáno"
 
+#. This refers to a number of tracks
 #: src/app/components/details/release_details.ui:58
 msgid "Tracks"
 msgstr "Počet skladeb"
 
+#. This refers to the duration of a release
 #: src/app/components/details/release_details.ui:68
 msgid "Duration"
 msgstr "Délka"
@@ -256,3 +260,6 @@ msgstr "Nemáte žádná uložená alba."
 #: src/app/components/library/library.ui:27
 msgid "Your library will be shown here."
 msgstr "Tady bude zobrazena vaše knihovna."
+
+#~ msgid "by"
+#~ msgstr "od"
diff --git a/po/de.po b/po/de.po
index 0e8bdc70..716b67a8 100644
--- a/po/de.po
+++ b/po/de.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Spot\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-13 09:18-0500\n"
+"POT-Creation-Date: 2021-12-13 09:46-0500\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -16,11 +16,6 @@ msgid "An error occured. Check logs for details!"
 msgstr ""
 "Es ist ein Fehler aufgetreten. Überprüfen Sie die Protokolle für Details!"
 
-#. translators: This is part of a larger label that reads "<Album> by <Artist>"
-#: src/app/components/details/release_details.rs:89
-msgid "by"
-msgstr "von"
-
 #. translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
 #: src/app/components/labels.rs:5
 msgid "View album"
@@ -59,6 +54,11 @@ msgstr[1] "{} Titel ausgewählt"
 msgid "More from {}"
 msgstr "Mehr von {}"
 
+#. translators: This is part of a larger label that reads "<Album> by <Artist>"
+#: src/app/components/labels.rs:48
+msgid "{} by {}"
+msgstr ""
+
 #. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
 #: src/app/components/login/login_model.rs:56
 msgid "Could not save password. Make sure the session keyring is unlocked."
@@ -261,3 +261,6 @@ msgstr ""
 #: src/app/components/library/library.ui:27
 msgid "Your library will be shown here."
 msgstr ""
+
+#~ msgid "by"
+#~ msgstr "von"
diff --git a/po/en.po b/po/en.po
index 265cf7ab..281f6dac 100644
--- a/po/en.po
+++ b/po/en.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Spot\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-13 09:18-0500\n"
+"POT-Creation-Date: 2021-12-13 09:46-0500\n"
 "Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -15,11 +15,6 @@ msgstr ""
 msgid "An error occured. Check logs for details!"
 msgstr "An error occured. Check logs for details!"
 
-#. translators: This is part of a larger label that reads "<Album> by <Artist>"
-#: src/app/components/details/release_details.rs:89
-msgid "by"
-msgstr "by"
-
 #. translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
 #: src/app/components/labels.rs:5
 msgid "View album"
@@ -58,6 +53,11 @@ msgstr[1] "{} songs selected"
 msgid "More from {}"
 msgstr "More from {}"
 
+#. translators: This is part of a larger label that reads "<Album> by <Artist>"
+#: src/app/components/labels.rs:48
+msgid "{} by {}"
+msgstr ""
+
 #. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
 #: src/app/components/login/login_model.rs:56
 msgid "Could not save password. Make sure the session keyring is unlocked."
@@ -258,3 +258,6 @@ msgstr ""
 #: src/app/components/library/library.ui:27
 msgid "Your library will be shown here."
 msgstr ""
+
+#~ msgid "by"
+#~ msgstr "by"
diff --git a/po/es.po b/po/es.po
index 5116e9d8..8f8fa1c5 100644
--- a/po/es.po
+++ b/po/es.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Spot\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-13 09:18-0500\n"
+"POT-Creation-Date: 2021-12-13 09:46-0500\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -15,11 +15,6 @@ msgstr ""
 msgid "An error occured. Check logs for details!"
 msgstr "Ha ocurrido un error. ¡Revisa los logs para más detalles!"
 
-#. translators: This is part of a larger label that reads "<Album> by <Artist>"
-#: src/app/components/details/release_details.rs:89
-msgid "by"
-msgstr "por"
-
 #. translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
 #: src/app/components/labels.rs:5
 msgid "View album"
@@ -58,6 +53,11 @@ msgstr[1] "{} canciones seleccionadas"
 msgid "More from {}"
 msgstr "Más de {}"
 
+#. translators: This is part of a larger label that reads "<Album> by <Artist>"
+#: src/app/components/labels.rs:48
+msgid "{} by {}"
+msgstr ""
+
 #. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
 #: src/app/components/login/login_model.rs:56
 msgid "Could not save password. Make sure the session keyring is unlocked."
@@ -260,3 +260,6 @@ msgstr "No tienes álbumes guardados."
 #: src/app/components/library/library.ui:27
 msgid "Your library will be shown here."
 msgstr "Tu biblioteca se mostrará aquí."
+
+#~ msgid "by"
+#~ msgstr "por"
diff --git a/po/eu.po b/po/eu.po
index dc0e56ec..a2df0b81 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Spot\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-13 09:18-0500\n"
+"POT-Creation-Date: 2021-12-13 09:46-0500\n"
 "Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -15,11 +15,6 @@ msgstr ""
 msgid "An error occured. Check logs for details!"
 msgstr "Errore bat gertatu da. Egiaztatu xehetasunak erregistroetan!"
 
-#. translators: This is part of a larger label that reads "<Album> by <Artist>"
-#: src/app/components/details/release_details.rs:89
-msgid "by"
-msgstr "by"
-
 #. translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
 #: src/app/components/labels.rs:5
 msgid "View album"
@@ -58,6 +53,11 @@ msgstr[1] "{} Aukeratutako abestiak"
 msgid "More from {}"
 msgstr "Gehiago honi buruz {}"
 
+#. translators: This is part of a larger label that reads "<Album> by <Artist>"
+#: src/app/components/labels.rs:48
+msgid "{} by {}"
+msgstr ""
+
 #. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
 #: src/app/components/login/login_model.rs:56
 msgid "Could not save password. Make sure the session keyring is unlocked."
@@ -260,3 +260,6 @@ msgstr "Ez duzu albumik gordeta."
 #: src/app/components/library/library.ui:27
 msgid "Your library will be shown here."
 msgstr "Zure liburutegia hemen agertuko da."
+
+#~ msgid "by"
+#~ msgstr "by"
diff --git a/po/fi.po b/po/fi.po
index 95500663..669456d6 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Spot\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-13 09:18-0500\n"
+"POT-Creation-Date: 2021-12-13 09:46-0500\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -15,11 +15,6 @@ msgstr ""
 msgid "An error occured. Check logs for details!"
 msgstr "Tapahti virhe. Katso lisätiedot lokista!"
 
-#. translators: This is part of a larger label that reads "<Album> by <Artist>"
-#: src/app/components/details/release_details.rs:89
-msgid "by"
-msgstr "esittäjä"
-
 #. translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
 #: src/app/components/labels.rs:5
 msgid "View album"
@@ -58,6 +53,11 @@ msgstr[1] "{} kappaletta valittu"
 msgid "More from {}"
 msgstr "Lisää esittäjältä {}"
 
+#. translators: This is part of a larger label that reads "<Album> by <Artist>"
+#: src/app/components/labels.rs:48
+msgid "{} by {}"
+msgstr ""
+
 #. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
 #: src/app/components/login/login_model.rs:56
 msgid "Could not save password. Make sure the session keyring is unlocked."
@@ -259,3 +259,6 @@ msgstr "Ei tallennettuja albumeja."
 #: src/app/components/library/library.ui:27
 msgid "Your library will be shown here."
 msgstr "Kirjastosi näytetään täällä."
+
+#~ msgid "by"
+#~ msgstr "esittäjä"
diff --git a/po/fr.po b/po/fr.po
index ec015a04..e451003c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Spot\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-13 09:18-0500\n"
+"POT-Creation-Date: 2021-12-13 09:46-0500\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,11 +17,6 @@ msgstr ""
 "Une erreur est survenue. Consultez les journaux de débogage pour plus "
 "d'information."
 
-#. translators: This is part of a larger label that reads "<Album> by <Artist>"
-#: src/app/components/details/release_details.rs:89
-msgid "by"
-msgstr "par"
-
 #. translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
 #: src/app/components/labels.rs:5
 msgid "View album"
@@ -60,6 +55,11 @@ msgstr[1] "{} morceaux sélectionnés"
 msgid "More from {}"
 msgstr "Plus de {}"
 
+#. translators: This is part of a larger label that reads "<Album> by <Artist>"
+#: src/app/components/labels.rs:48
+msgid "{} by {}"
+msgstr ""
+
 #. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
 #: src/app/components/login/login_model.rs:56
 msgid "Could not save password. Make sure the session keyring is unlocked."
@@ -262,3 +262,6 @@ msgstr "Aucun album dans votre bibliothèque."
 #: src/app/components/library/library.ui:27
 msgid "Your library will be shown here."
 msgstr "Vos albums apparaîtrons ici."
+
+#~ msgid "by"
+#~ msgstr "par"
diff --git a/po/ia.po b/po/ia.po
index 7aa3078a..734d515d 100644
--- a/po/ia.po
+++ b/po/ia.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Spot\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-13 09:18-0500\n"
+"POT-Creation-Date: 2021-12-13 09:46-0500\n"
 "Language: ia\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -15,11 +15,6 @@ msgstr ""
 msgid "An error occured. Check logs for details!"
 msgstr "Ocurreva un error. Verifica le registros pro detalios!"
 
-#. translators: This is part of a larger label that reads "<Album> by <Artist>"
-#: src/app/components/details/release_details.rs:89
-msgid "by"
-msgstr "per"
-
 #. translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
 #: src/app/components/labels.rs:5
 msgid "View album"
@@ -58,6 +53,11 @@ msgstr[1] "{} cantos seligite"
 msgid "More from {}"
 msgstr "Plus ab {}"
 
+#. translators: This is part of a larger label that reads "<Album> by <Artist>"
+#: src/app/components/labels.rs:48
+msgid "{} by {}"
+msgstr ""
+
 #. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
 #: src/app/components/login/login_model.rs:56
 msgid "Could not save password. Make sure the session keyring is unlocked."
@@ -260,3 +260,6 @@ msgstr "Tu ha nulle albumes salvate."
 #: src/app/components/library/library.ui:27
 msgid "Your library will be shown here."
 msgstr "Tu bibliotheca essera monstrate ci."
+
+#~ msgid "by"
+#~ msgstr "per"
diff --git a/po/id.po b/po/id.po
index 758e3e4f..0119cb8c 100644
--- a/po/id.po
+++ b/po/id.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Spot\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-13 09:18-0500\n"
+"POT-Creation-Date: 2021-12-13 09:46-0500\n"
 "Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -15,11 +15,6 @@ msgstr ""
 msgid "An error occured. Check logs for details!"
 msgstr "Timbul galat. Periksa log untuk detailnya!"
 
-#. translators: This is part of a larger label that reads "<Album> by <Artist>"
-#: src/app/components/details/release_details.rs:89
-msgid "by"
-msgstr "oleh"
-
 #. translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
 #: src/app/components/labels.rs:5
 msgid "View album"
@@ -57,6 +52,11 @@ msgstr[0] "{} lagu dipilih"
 msgid "More from {}"
 msgstr "Lebih banyak dari {}"
 
+#. translators: This is part of a larger label that reads "<Album> by <Artist>"
+#: src/app/components/labels.rs:48
+msgid "{} by {}"
+msgstr ""
+
 #. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
 #: src/app/components/login/login_model.rs:56
 msgid "Could not save password. Make sure the session keyring is unlocked."
@@ -258,3 +258,6 @@ msgstr "Anda tidak memiliki album yang disimpan."
 #: src/app/components/library/library.ui:27
 msgid "Your library will be shown here."
 msgstr "Pustaka Anda akan ditampilkan di sini."
+
+#~ msgid "by"
+#~ msgstr "oleh"
diff --git a/po/ja.po b/po/ja.po
index 02d66a62..0c70cf79 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Spot\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-13 09:18-0500\n"
+"POT-Creation-Date: 2021-12-13 09:46-0500\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -15,11 +15,6 @@ msgstr ""
 msgid "An error occured. Check logs for details!"
 msgstr "エラーが発生しました。詳細はログを確認してください。"
 
-#. translators: This is part of a larger label that reads "<Album> by <Artist>"
-#: src/app/components/details/release_details.rs:89
-msgid "by"
-msgstr "by"
-
 #. translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
 #: src/app/components/labels.rs:5
 msgid "View album"
@@ -58,6 +53,11 @@ msgstr[0] "{}曲選択中"
 msgid "More from {}"
 msgstr "詳細"
 
+#. translators: This is part of a larger label that reads "<Album> by <Artist>"
+#: src/app/components/labels.rs:48
+msgid "{} by {}"
+msgstr ""
+
 #. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
 #: src/app/components/login/login_model.rs:56
 msgid "Could not save password. Make sure the session keyring is unlocked."
@@ -260,3 +260,6 @@ msgstr "保存したアルバムがありません。"
 #: src/app/components/library/library.ui:27
 msgid "Your library will be shown here."
 msgstr "ライブラリはここに表示されます。"
+
+#~ msgid "by"
+#~ msgstr "by"
diff --git a/po/nb.po b/po/nb.po
index 2ba90c8e..2519a200 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Spot\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-13 09:18-0500\n"
+"POT-Creation-Date: 2021-12-13 09:46-0500\n"
 "Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -15,11 +15,6 @@ msgstr ""
 msgid "An error occured. Check logs for details!"
 msgstr "En feil oppstod. Sjekk logger for detaljer!"
 
-#. translators: This is part of a larger label that reads "<Album> by <Artist>"
-#: src/app/components/details/release_details.rs:89
-msgid "by"
-msgstr "av"
-
 #. translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
 #: src/app/components/labels.rs:5
 msgid "View album"
@@ -58,6 +53,11 @@ msgstr[1] "{} sanger valgt"
 msgid "More from {}"
 msgstr "Mer fra {}"
 
+#. translators: This is part of a larger label that reads "<Album> by <Artist>"
+#: src/app/components/labels.rs:48
+msgid "{} by {}"
+msgstr ""
+
 #. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
 #: src/app/components/login/login_model.rs:56
 msgid "Could not save password. Make sure the session keyring is unlocked."
@@ -260,3 +260,6 @@ msgstr "Du har ingen lagrede album."
 #: src/app/components/library/library.ui:27
 msgid "Your library will be shown here."
 msgstr "Biblioteket ditt vises her."
+
+#~ msgid "by"
+#~ msgstr "av"
diff --git a/po/nl.po b/po/nl.po
index 21418624..43e4deb0 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Spot\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-13 09:18-0500\n"
+"POT-Creation-Date: 2021-12-13 09:46-0500\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -15,11 +15,6 @@ msgstr ""
 msgid "An error occured. Check logs for details!"
 msgstr "Er is een fout opgetreden - bekijk het logboek!"
 
-#. translators: This is part of a larger label that reads "<Album> by <Artist>"
-#: src/app/components/details/release_details.rs:89
-msgid "by"
-msgstr "van"
-
 #. translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
 #: src/app/components/labels.rs:5
 msgid "View album"
@@ -58,6 +53,11 @@ msgstr[1] "{} nummers geselecteerd"
 msgid "More from {}"
 msgstr "Meer van {}"
 
+#. translators: This is part of a larger label that reads "<Album> by <Artist>"
+#: src/app/components/labels.rs:48
+msgid "{} by {}"
+msgstr ""
+
 #. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
 #: src/app/components/login/login_model.rs:56
 msgid "Could not save password. Make sure the session keyring is unlocked."
@@ -260,3 +260,6 @@ msgstr "Je hebt nog geen opgeslagen albums."
 #: src/app/components/library/library.ui:27
 msgid "Your library will be shown here."
 msgstr "Je verzameling wordt hier getoond."
+
+#~ msgid "by"
+#~ msgstr "van"
diff --git a/po/pl.po b/po/pl.po
index 362a6f00..ed8aedd9 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Spot\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-13 09:18-0500\n"
+"POT-Creation-Date: 2021-12-13 09:46-0500\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -16,11 +16,6 @@ msgstr ""
 msgid "An error occured. Check logs for details!"
 msgstr "Wystąpił błąd. Sprawdź logi po więcej informacji!"
 
-#. translators: This is part of a larger label that reads "<Album> by <Artist>"
-#: src/app/components/details/release_details.rs:89
-msgid "by"
-msgstr "przez"
-
 #. translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
 #: src/app/components/labels.rs:5
 msgid "View album"
@@ -61,6 +56,11 @@ msgstr[3] ""
 msgid "More from {}"
 msgstr "Więcej od {}"
 
+#. translators: This is part of a larger label that reads "<Album> by <Artist>"
+#: src/app/components/labels.rs:48
+msgid "{} by {}"
+msgstr ""
+
 #. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
 #: src/app/components/login/login_model.rs:56
 msgid "Could not save password. Make sure the session keyring is unlocked."
@@ -263,3 +263,6 @@ msgstr "Nie masz zapisanych albumów."
 #: src/app/components/library/library.ui:27
 msgid "Your library will be shown here."
 msgstr "Twoja biblioteka będzie tu pokazana."
+
+#~ msgid "by"
+#~ msgstr "przez"
diff --git a/po/pt-br.po b/po/pt-br.po
index 8fa9f79b..4206d9d3 100644
--- a/po/pt-br.po
+++ b/po/pt-br.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Spot\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-13 09:18-0500\n"
+"POT-Creation-Date: 2021-12-13 09:46-0500\n"
 "Language: pt-br\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -15,11 +15,6 @@ msgstr ""
 msgid "An error occured. Check logs for details!"
 msgstr "Ocorreu um erro. Verifique os logs para mais detalhes!"
 
-#. translators: This is part of a larger label that reads "<Album> by <Artist>"
-#: src/app/components/details/release_details.rs:89
-msgid "by"
-msgstr "por"
-
 #. translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
 #: src/app/components/labels.rs:5
 msgid "View album"
@@ -58,6 +53,11 @@ msgstr[1] "{} músicas selecionadas"
 msgid "More from {}"
 msgstr "Mais de {}"
 
+#. translators: This is part of a larger label that reads "<Album> by <Artist>"
+#: src/app/components/labels.rs:48
+msgid "{} by {}"
+msgstr ""
+
 #. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
 #: src/app/components/login/login_model.rs:56
 msgid "Could not save password. Make sure the session keyring is unlocked."
@@ -260,3 +260,6 @@ msgstr ""
 #: src/app/components/library/library.ui:27
 msgid "Your library will be shown here."
 msgstr ""
+
+#~ msgid "by"
+#~ msgstr "por"
diff --git a/po/pt.po b/po/pt.po
index 80c8ea3a..b315fcf0 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Spot\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-13 09:18-0500\n"
+"POT-Creation-Date: 2021-12-13 09:46-0500\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -15,11 +15,6 @@ msgstr ""
 msgid "An error occured. Check logs for details!"
 msgstr "Ocorreu um erro! Verifique os logs para mais detalhes!"
 
-#. translators: This is part of a larger label that reads "<Album> by <Artist>"
-#: src/app/components/details/release_details.rs:89
-msgid "by"
-msgstr "por"
-
 #. translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
 #: src/app/components/labels.rs:5
 msgid "View album"
@@ -58,6 +53,11 @@ msgstr[1] "{} canções selecionadas"
 msgid "More from {}"
 msgstr "Mais de {}"
 
+#. translators: This is part of a larger label that reads "<Album> by <Artist>"
+#: src/app/components/labels.rs:48
+msgid "{} by {}"
+msgstr ""
+
 #. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
 #: src/app/components/login/login_model.rs:56
 msgid "Could not save password. Make sure the session keyring is unlocked."
@@ -260,3 +260,6 @@ msgstr ""
 #: src/app/components/library/library.ui:27
 msgid "Your library will be shown here."
 msgstr ""
+
+#~ msgid "by"
+#~ msgstr "por"
diff --git a/po/ru.po b/po/ru.po
index 081f9103..b250d123 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Spot\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-13 09:18-0500\n"
+"POT-Creation-Date: 2021-12-13 09:46-0500\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -16,11 +16,6 @@ msgstr ""
 msgid "An error occured. Check logs for details!"
 msgstr "Ошибка появилась. Посмотрите в логи за подробностями!"
 
-#. translators: This is part of a larger label that reads "<Album> by <Artist>"
-#: src/app/components/details/release_details.rs:89
-msgid "by"
-msgstr "в исполнении"
-
 #. translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
 #: src/app/components/labels.rs:5
 msgid "View album"
@@ -61,6 +56,11 @@ msgstr[3] ""
 msgid "More from {}"
 msgstr "Больше от {}"
 
+#. translators: This is part of a larger label that reads "<Album> by <Artist>"
+#: src/app/components/labels.rs:48
+msgid "{} by {}"
+msgstr ""
+
 #. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
 #: src/app/components/login/login_model.rs:56
 msgid "Could not save password. Make sure the session keyring is unlocked."
@@ -262,3 +262,6 @@ msgstr "У вас нет сохраненных альбомов."
 #: src/app/components/library/library.ui:27
 msgid "Your library will be shown here."
 msgstr "Здесь будет показана ваша фонотека."
+
+#~ msgid "by"
+#~ msgstr "в исполнении"
diff --git a/po/sl.po b/po/sl.po
index feead44b..ccad2a1d 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Spot\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-13 09:18-0500\n"
+"POT-Creation-Date: 2021-12-13 09:46-0500\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -16,11 +16,6 @@ msgstr ""
 msgid "An error occured. Check logs for details!"
 msgstr "Napaka! Poglej v dnevnik od programa za podrobnosti."
 
-#. translators: This is part of a larger label that reads "<Album> by <Artist>"
-#: src/app/components/details/release_details.rs:89
-msgid "by"
-msgstr "od"
-
 #. translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
 #: src/app/components/labels.rs:5
 msgid "View album"
@@ -61,6 +56,11 @@ msgstr[3] "{} izbranih skladb"
 msgid "More from {}"
 msgstr "Več od {}"
 
+#. translators: This is part of a larger label that reads "<Album> by <Artist>"
+#: src/app/components/labels.rs:48
+msgid "{} by {}"
+msgstr ""
+
 #. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
 #: src/app/components/login/login_model.rs:56
 msgid "Could not save password. Make sure the session keyring is unlocked."
@@ -262,3 +262,6 @@ msgstr "Nimaš shranjenih albumov."
 #: src/app/components/library/library.ui:27
 msgid "Your library will be shown here."
 msgstr "Tvoja zbirka bo prikazana tukaj."
+
+#~ msgid "by"
+#~ msgstr "od"
diff --git a/po/spot.pot b/po/spot.pot
index 61230bbb..91a72b3b 100644
--- a/po/spot.pot
+++ b/po/spot.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: spot\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-13 09:18-0500\n"
+"POT-Creation-Date: 2021-12-13 09:46-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -23,11 +23,6 @@ msgstr ""
 msgid "An error occured. Check logs for details!"
 msgstr ""
 
-#. translators: This is part of a larger label that reads "<Album> by <Artist>"
-#: src/app/components/details/release_details.rs:89
-msgid "by"
-msgstr ""
-
 #. translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
 #: src/app/components/labels.rs:5
 msgid "View album"
@@ -66,6 +61,11 @@ msgstr[1] ""
 msgid "More from {}"
 msgstr ""
 
+#. translators: This is part of a larger label that reads "<Album> by <Artist>"
+#: src/app/components/labels.rs:48
+msgid "{} by {}"
+msgstr ""
+
 #. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
 #: src/app/components/login/login_model.rs:56
 msgid "Could not save password. Make sure the session keyring is unlocked."
diff --git a/po/tr.po b/po/tr.po
index bc4f38d3..6673c0ef 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Spot\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-13 09:18-0500\n"
+"POT-Creation-Date: 2021-12-13 09:46-0500\n"
 "Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -15,11 +15,6 @@ msgstr ""
 msgid "An error occured. Check logs for details!"
 msgstr "Bir hata meydana geldi. Günlükleri kontrol edin."
 
-#. translators: This is part of a larger label that reads "<Album> by <Artist>"
-#: src/app/components/details/release_details.rs:89
-msgid "by"
-msgstr ""
-
 #. translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
 #: src/app/components/labels.rs:5
 msgid "View album"
@@ -58,6 +53,11 @@ msgstr[1] "{} seçildi"
 msgid "More from {}"
 msgstr "Daha fazla {}"
 
+#. translators: This is part of a larger label that reads "<Album> by <Artist>"
+#: src/app/components/labels.rs:48
+msgid "{} by {}"
+msgstr ""
+
 #. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
 #: src/app/components/login/login_model.rs:56
 msgid "Could not save password. Make sure the session keyring is unlocked."
diff --git a/src/app/components/details/release_details.rs b/src/app/components/details/release_details.rs
index 9fd004db..fd46d752 100644
--- a/src/app/components/details/release_details.rs
+++ b/src/app/components/details/release_details.rs
@@ -1,9 +1,10 @@
-use gettextrs::gettext;
 use gtk::prelude::*;
 use gtk::subclass::prelude::*;
 use gtk::CompositeTemplate;
 use libadwaita::subclass::prelude::*;
 
+use crate::app::components::labels;
+
 mod imp {
 
     use super::*;
@@ -82,13 +83,9 @@ impl ReleaseDetailsWindow {
     ) {
         let widget = self.widget();
 
-        widget.album_artist.set_title(&format!(
-            "{} {} {}",
-            album,
-            // translators: This is part of a larger label that reads "<Album> by <Artist>"
-            gettext("by"),
-            artist
-        ));
+        widget
+            .album_artist
+            .set_title(&labels::album_by_artist_label(album, artist));
 
         widget.label.set_text(label);
         widget.release.set_text(release_date);
diff --git a/src/app/components/labels.rs b/src/app/components/labels.rs
index ca55df7e..3bb216f6 100644
--- a/src/app/components/labels.rs
+++ b/src/app/components/labels.rs
@@ -40,3 +40,16 @@ pub fn more_from_label(artist: &str) -> String {
     }
     gettext!("More from {}", glib::markup_escape_text(artist))
 }
+
+pub fn album_by_artist_label(album: &str, artist: &str) -> String {
+    // this is just to fool xgettext, it doesn't like macros (or rust for that matter) :(
+    if cfg!(debug_assertions) {
+        // translators: This is part of a larger label that reads "<Album> by <Artist>"
+        gettext("{} by {}");
+    }
+    gettext!(
+        "{} by {}",
+        glib::markup_escape_text(album),
+        glib::markup_escape_text(artist)
+    )
+}