New upstream version 44.0

author: Nathan Pratta Teodosio <nathan.teodosio@canonical.com> 2023-03-23 10:22:25 -0300
committer: Nathan Pratta Teodosio <nathan.teodosio@canonical.com> 2023-03-23 10:22:25 -0300
commit: 030555bcc6344332989199b3bf33b0adab47bab2 (patch)
tree: f83df2b065ee6038777c5eea9846b8e253cfa558
parent: 079c8cd8284a3c22e14b611e19a02e61a0e36721 (diff)
parent: 11fa1a75fc1377a4afdbffe60c8890fdfe713a3f (diff)
183 files changed, 9620 insertions, 8470 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fdbf4bad..5a22033a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,12 +25,14 @@ nightly:
 
 flake8:
   stage: check
+  image: registry.fedoraproject.org/fedora:latest
   script:
     - dnf install -y python3-flake8
     - flake8 --ignore E402,W503 --show-source gnomemusic/
 
 mypy:
   stage: check
+  image: registry.fedoraproject.org/fedora:latest
   script:
     - dnf install -y python3-mypy
     - mypy --ignore-missing-imports --disallow-incomplete-defs gnomemusic
diff --git a/.gitlab/issue_templates/default.md b/.gitlab/issue_templates/default.md
new file mode 100644
index 00000000..e312ce03
--- /dev/null
+++ b/.gitlab/issue_templates/default.md
@@ -0,0 +1,40 @@
+## Description
+
+[Description of the bug or feature]
+
+
+## Steps To Reproduce
+
+- Step 1
+- Step 2
+- Step 3
+
+
+## Expected Behaviour
+
+[What you expected to happen]
+
+
+## Actual Behaviour
+
+[What actually happened]
+
+
+## Specifications
+
+Gnome Music Version:
+
+Desktop Environment:
+
+Wayland or Xorg: 
+
+Flatpak or Native: 
+
+Tracker Version: 
+
+Grilo Version:
+
+
+## Additional Information
+
+
diff --git a/.gitmodules b/.gitmodules
index 9b66516e..6f6409cc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,3 @@
-[submodule "subprojects/libgd"]
-	path = subprojects/libgd
-	url = https://gitlab.gnome.org/GNOME/libgd.git
 [submodule "subprojects/shared-modules"]
 	path = subprojects/shared-modules
 	url = https://github.com/flathub/shared-modules.git
-[submodule "subprojects/gfm"]
-	path = subprojects/gfm
-	url = https://gitlab.gnome.org/mschraal/gfm.git
diff --git a/NEWS b/NEWS
index b325af5b..b4e48143 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,40 @@
-Overview of changes in 42.1
+Overview of changes in 44.0
 ===========================
 
+• Update appdata for the 44.0 release
+
+Overview of changes in 44.rc
+============================
+
+• Shortcuts menu cleanups
+• Misc focus fixes in album widgets
+• Decrease memory usage in SongsView
+
+Bugs Fixed:
+ SongView popup is a memory hog (#495)
+ Shuffle on/off mixup (#543)
+ Default template for issues (#525)
+
+Thanks to our contributors this release:
+ Andre Klapper
+ Automeris Naranja
+ Ezike Ebuka
+ Jean Felder
+ Marinus Schraal
+ Sabri Ünal
+
+
+Overview of changes in 44.beta
+==============================
+
 • Make shuffle shuffle again
 • Fix time display in RTL languages
+• Port to soup 3
+• Port about to AdwAboutWindow
 • No longer mismatch art on scrolling
 • Fix async queue block on fresh art retrieval
+• Use new GNOME Settings app id in flatpak
+• Fix welcome image rendering
 
 Bugs fixed:
  Rework ArtStack to handle cycling widgets better (#500)
@@ -12,16 +42,54 @@ Bugs fixed:
  Time is reversed in RTL (#509)
 
 Thanks to our contributors this release:
+ Carlos Garnacho
+ Christopher Davis
+ Georges Basile Stavracas Neto
+ Jean Felder
  Marinus Schraal
  Yosef Or Boczko
 
 Updated or added translations:
- Latvian
- Dutch
+ Abkhazian
+ Basque
+ Belarusian
+ Brazilian Portuguese
+ Bulgarian
  Catalan
- Icelandic
- French
  Chinese (China)
+ Chinese (Taiwan)
+ Croatian
+ Czech
+ Danish
+ Dutch
+ Finnish
+ French
+ Friulian
+ Galician
+ Georgian
+ German
+ Greek
+ Hebrew
+ Hungarian
+ Icelandic
+ Indonesian
+ Kazakh
+ Korean
+ Latvian
+ Lithuanian
+ Nepali
+ Occitan
+ Persian
+ Polish
+ Portuguese
+ Russian
+ Serbian
+ Slovak
+ Slovenian
+ Spanish
+ Swedish
+ Turkish
+ Ukrainian
 
 
 Overview of changes in 42.0
diff --git a/README.md b/README.md
index d06c9400..6abac74c 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,10 @@
-Music is the new GNOME music playing application.
+Music is the GNOME music playing application.
 
 # Where can I find more?
 
-Music has a wiki page at
-https://wiki.gnome.org/Apps/Music.
+Music has a wiki page at https://wiki.gnome.org/Apps/Music.
 
-You can join the developers on IRC: [#gnome-music](irc://irc.gnome.org/gnome-music) on [GIMPNet](https://wiki.gnome.org/Community/GettingInTouch/IRC).
+You can join the developers on IRC: [#gnome-music](irc://irc.libera.chat/gnome-music) on [Libera Chat](https://wiki.gnome.org/GettingInTouch/IRC).
 
 # Join the development
 
@@ -139,15 +138,6 @@ def selected(self, value: bool) -> None:
 
 ### PyGObject specifics
 
-#### Treemodel
-
-Use PyGObject shorthands for manipulating `GtkTreeModel` & `GtkListStore`:
-
-```python
-model[iter][0] = "artist"
-artist, title = model[iter][1, 4]
-```
-
 #### Properties
 
 Most objects in Music are derived from GObject and have properties. Use [PyGObject properties](https://pygobject.readthedocs.io/en/latest/guide/api/properties.html) through decorator usage if you add properties to your code.
@@ -184,9 +174,7 @@ Note that GObject multi-word properties are separated by `-` as in `'selection-m
 
 #### Templates
 
-Recent PyGObject (3.29.1 and up) allows template usage and Music is [starting to convert](https://gitlab.gnome.org/GNOME/gnome-music/issues/183) to using this to build the user interface. More information can be found in the PyGObject source and [examples](https://gitlab.gnome.org/GNOME/gnome-music/blob/master/gnomemusic/widgets/songwidget.py) in the Music code.
-
-The basic usage in Python is as follows, with the `widget.ui` file being a regular GTK template:
+Music uses ui templates extensively for building the user interface. The basic usage in Python is as follows, with the `widget.ui` file being a regular GTK template:
 
 ```python
 @Gtk.Template(resource_path="/org/gnome/Music/widget.ui")
diff --git a/data/icons/welcome-music.svg b/data/icons/welcome-music.svg
index bf375cc6..e8c9ed18 100644
--- a/data/icons/welcome-music.svg
+++ b/data/icons/welcome-music.svg
@@ -1 +1,551 @@
-<svg height="300" width="400" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="d"><stop style="stop-color:#bfbebc;stop-opacity:1" offset="0"/><stop style="stop-color:#9f9e9b;stop-opacity:.94509804" offset=".854"/><stop style="stop-color:#b8b7b4;stop-opacity:.93725497" offset="1"/></linearGradient><linearGradient id="e"><stop style="stop-color:#555458;stop-opacity:1" offset="0"/><stop style="stop-color:#77767b;stop-opacity:1" offset="1"/></linearGradient><linearGradient id="c"><stop style="stop-color:#5e5c64;stop-opacity:1" offset="0"/><stop style="stop-color:#737178;stop-opacity:1" offset=".033"/><stop style="stop-color:#64626a;stop-opacity:1" offset=".103"/><stop style="stop-color:#5e5c64;stop-opacity:1" offset=".613"/><stop style="stop-color:#5d5a63;stop-opacity:1" offset=".729"/><stop style="stop-color:#4a494f;stop-opacity:1" offset="1"/></linearGradient><linearGradient id="b"><stop style="stop-color:#5e5c64;stop-opacity:1" offset="0"/><stop style="stop-color:#65636a;stop-opacity:1" offset=".033"/><stop style="stop-color:#4c4a51;stop-opacity:1" offset=".103"/><stop style="stop-color:#4e4d53;stop-opacity:1" offset=".708"/><stop style="stop-color:#525057;stop-opacity:1" offset=".832"/><stop style="stop-color:#38373c;stop-opacity:1" offset="1"/></linearGradient><linearGradient xlink:href="#a" id="f" x1="59.78" y1="600.527" x2="1130.727" y2="600.527" gradientUnits="userSpaceOnUse"/><linearGradient id="a"><stop style="stop-color:#2ec27e;stop-opacity:1" offset="0"/><stop style="stop-color:#62a0ea;stop-opacity:1" offset="1"/></linearGradient><linearGradient xlink:href="#b" id="i" gradientUnits="userSpaceOnUse" gradientTransform="translate(230 179)" x1="605.074" y1="363.148" x2="689.59" y2="363.148"/><linearGradient xlink:href="#c" id="j" gradientUnits="userSpaceOnUse" gradientTransform="translate(230 179)" x1="604.913" y1="412.037" x2="695.556" y2="412.037"/><radialGradient xlink:href="#d" id="k" gradientUnits="userSpaceOnUse" gradientTransform="translate(103.628 87.555) scale(1.23242)" cx="543.718" cy="393.443" fx="543.718" fy="393.443" r="50"/><radialGradient xlink:href="#e" id="l" cx="545" cy="387.793" fx="545" fy="387.793" r="29.997" gradientUnits="userSpaceOnUse" gradientTransform="translate(-415.981 -290.826) scale(2.18529)"/><radialGradient xlink:href="#d" id="m" cx="543.718" cy="393.443" fx="543.718" fy="393.443" r="50" gradientUnits="userSpaceOnUse" gradientTransform="translate(103.628 87.555) scale(1.23242)"/><clipPath clipPathUnits="userSpaceOnUse" id="g"><rect ry="32" rx="32" y="-116" x="32.5" height="320" width="447" style="opacity:1;fill:#fb8c14;fill-opacity:1;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:4,2;stroke-dashoffset:0;stroke-opacity:1"/></clipPath><clipPath clipPathUnits="userSpaceOnUse" id="h"><path style="opacity:1;fill:#949390;fill-opacity:1;stroke:none;stroke-width:16;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:11.2;stroke-opacity:1" d="M208 4h96v48h-96z"/></clipPath></defs><g transform="matrix(.3343 0 0 .3343 9.493 -41.078)" style="display:inline"><path style="display:inline;fill:url(#f);fill-opacity:1;stroke:none;stroke-width:2.68319;stroke-linejoin:round;stop-color:#000" d="M830.003 275.638v107.317a13.27 13.27 135 0 1-13.27 13.27h-.291a13.27 13.27 45 0 1-13.271-13.27 26.977 26.977 45 0 0-26.977-26.977 26.832 26.832 134.69 0 0-26.687 26.977v123.14a13.27 13.27 135 0 1-13.27 13.27h-.291a13.27 13.27 45 0 1-13.27-13.27v-17.44a24 24 45 0 0-24-24h-5.664a24 24 135 0 0-24 24v23.093a13.27 13.27 135 0 1-13.271 13.27h-.29a13.27 13.27 45 0 1-13.271-13.27v-51.275a24 24 45 0 0-24-24h-5.664a24 24 135 0 0-24 24v2.978a13.27 13.27 135 0 1-13.27 13.27h-.291a13.27 13.27 45 0 1-13.271-13.27V342.707a26.977 26.977 45 0 0-26.977-26.977 26.832 26.832 134.69 0 0-26.687 26.977v67.08a13.27 13.27 135 0 1-13.27 13.27h-.291a13.27 13.27 45 0 1-13.27-13.27 26.977 26.977 45 0 0-26.978-26.977 26.832 26.832 134.69 0 0-26.686 26.977 13.27 13.27 135 0 1-13.271 13.27h-.29a13.27 13.27 45 0 1-13.271-13.27v-134.16a26.977 26.977 45 0 0-26.978-26.977 26.832 26.832 134.69 0 0-26.686 26.977v93.912a13.27 13.27 135 0 1-13.27 13.27h-.291a13.27 13.27 45 0 1-13.271-13.27 26.977 26.977 45 0 0-26.977-26.977 26.832 26.832 134.69 0 0-26.687 26.977v80.496a13.27 13.27 135 0 1-13.27 13.27h-.291a13.27 13.27 45 0 1-13.27-13.27 26.977 26.977 45 0 0-26.978-26.978 26.832 26.832 134.69 0 0-26.686 26.978v53.663a13.27 13.27 135 0 1-13.271 13.271h-.29a13.27 13.27 45 0 1-13.271-13.27 26.977 26.977 45 0 0-26.978-26.978 26.832 26.832 134.69 0 0-26.686 26.977 22.861 22.861 137.566 0 1-23.999 21.94l-27.696-.318a23.726 23.726 135.328 0 0-23.998 23.725 24.049 24.049 45.036 0 0 24 24.03l27.693.078a24.068 24.068 45.08 0 1 24 24.068v.071a26.977 26.977 45 0 0 26.977 26.977 26.832 26.832 134.69 0 0 26.687-26.977 13.257 13.257 135.059 0 1 13.27-13.243h.29a13.27 13.27 45 0 1 13.272 13.27v53.664a26.977 26.977 45 0 0 26.977 26.977 26.832 26.832 134.69 0 0 26.686-26.977 13.27 13.27 135 0 1 13.271-13.27h.29a13.27 13.27 45 0 1 13.271 13.27v80.496a26.977 26.977 45 0 0 26.977 26.977 26.832 26.832 134.69 0 0 26.687-26.977 13.27 13.27 135 0 1 13.27-13.27h.291a13.27 13.27 45 0 1 13.27 13.27v93.911a26.977 26.977 45 0 0 26.978 26.978 26.832 26.832 134.69 0 0 26.687-26.978V691.231a13.27 13.27 135 0 1 13.27-13.27h.29a13.27 13.27 45 0 1 13.272 13.27 26.977 26.977 45 0 0 26.977 26.977 26.832 26.832 134.69 0 0 26.686-26.977 13.27 13.27 135 0 1 13.271-13.27h.29a13.27 13.27 45 0 1 13.271 13.27v67.08a26.977 26.977 45 0 0 26.977 26.977 26.832 26.832 134.69 0 0 26.687-26.977V637.567a13.27 13.27 135 0 1 13.27-13.27h.291a13.27 13.27 45 0 1 13.27 13.27 26.977 26.977 45 0 0 26.978 26.977 26.832 26.832 134.69 0 0 26.687-26.977V589.27A13.27 13.27 135 0 1 655.45 576h.29a13.27 13.27 45 0 1 13.272 13.27 26.977 26.977 45 0 0 26.977 26.977 26.832 26.832 134.69 0 0 26.686-26.977A13.27 13.27 135 0 1 735.946 576h.29a13.27 13.27 45 0 1 13.271 13.27v128.793a26.977 26.977 45 0 0 26.977 26.977 26.832 26.832 134.69 0 0 26.687-26.977 13.27 13.27 135 0 1 13.27-13.27h.291a13.27 13.27 45 0 1 13.27 13.27v81.891a26.977 26.977 45 0 0 26.978 26.978 26.832 26.832 134.69 0 0 26.687-26.978v-93.911a13.27 13.27 135 0 1 13.27-13.27h.29a13.27 13.27 45 0 1 13.272 13.27 26.977 26.977 45 0 0 26.977 26.977 26.832 26.832 134.69 0 0 26.686-26.977V597.319a13.27 13.27 135 0 1 13.271-13.27h.29a13.27 13.27 45 0 1 13.271 13.27 26.977 26.977 45 0 0 26.977 26.978 26.832 26.832 134.69 0 0 26.687-26.978v-.274a23.935 23.935 135.077 0 1 24-23.935l17.247.047a23.935 23.935 135.077 0 0 24-23.936 23.62 23.62 44.117 0 0-24-23.271l-17.247.026a23.963 23.963 44.956 0 1-24-23.963 26.148 26.148 43.153 0 0-26.977-25.292 26.832 26.832 134.69 0 0-26.687 26.977 13.27 13.27 135 0 1-13.27 13.271h-.291a13.27 13.27 45 0 1-13.27-13.27v-134.15a26.977 26.977 45 0 0-26.978-26.977A26.832 26.832 134.69 0 0 910.5 369.55a13.27 13.27 135 0 1-13.271 13.271h-.29a13.27 13.27 45 0 1-13.271-13.27v-93.912a26.977 26.977 45 0 0-26.978-26.977 26.832 26.832 134.69 0 0-26.686 26.977z"/><g style="display:inline;enable-background:new" transform="rotate(180 -341.374 379.724) scale(1.76362)"><rect ry="8" rx="8" y="217.775" x="-686.787" height="80" width="111.75" style="display:inline;opacity:1;fill:#d5d3cf;fill-opacity:1;stroke:none;stroke-width:.25;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1,.5;stroke-dashoffset:0;stroke-opacity:1;enable-background:new"/><rect ry="4" rx="4" y="225.775" x="-678.912" height="56" width="96" style="display:inline;opacity:1;fill:#ed333b;fill-opacity:1;stroke:none;stroke-width:.25;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1,.5;stroke-dashoffset:0;stroke-opacity:1;enable-background:new"/><rect ry="7.988" rx="7.988" y="245.775" x="-658.9" height="15.975" width="55.975" style="display:inline;opacity:1;fill:#d5d3cf;fill-opacity:1;stroke:#d5d3cf;stroke-width:8;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:11.2;stroke-opacity:1;enable-background:new"/><circle r="7.988" cy="253.762" cx="-650.912" style="display:inline;opacity:1;fill:#424048;fill-opacity:1;stroke:none;stroke-width:.25;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1,.5;stroke-dashoffset:0;stroke-opacity:1;enable-background:new"/><circle style="display:inline;opacity:1;fill:#424048;fill-opacity:1;stroke:none;stroke-width:.25;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1,.5;stroke-dashoffset:0;stroke-opacity:1;enable-background:new" cx="-610.912" cy="253.762" r="7.988"/><g transform="matrix(.25 0 0 .25 -694.912 246.775)" style="display:inline;fill:#949390;fill-opacity:1;stroke:#949390;stroke-opacity:1;enable-background:new" clip-path="url(#g)"><path style="fill:#949390;fill-opacity:1;stroke:#949390;stroke-width:32;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" d="M128 236h256l-32-96H160Z"/></g><g transform="matrix(.25 0 0 .25 -694.912 246.775)" style="display:inline;fill:#424048;fill-opacity:1;enable-background:new"><circle style="opacity:1;fill:#424048;fill-opacity:1;stroke:none;stroke-width:32;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:4,2;stroke-dashoffset:0;stroke-opacity:1" cx="56" cy="-92" r="8"/><circle r="8" cy="164" cx="56" style="opacity:1;fill:#424048;fill-opacity:1;stroke:none;stroke-width:32;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:4,2;stroke-dashoffset:0;stroke-opacity:1"/><circle r="8" cy="-92" cx="456" style="opacity:1;fill:#424048;fill-opacity:1;stroke:none;stroke-width:32;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:4,2;stroke-dashoffset:0;stroke-opacity:1"/><circle style="opacity:1;fill:#424048;fill-opacity:1;stroke:none;stroke-width:32;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:4,2;stroke-dashoffset:0;stroke-opacity:1" cx="456" cy="164" r="8"/></g><path style="display:inline;opacity:1;fill:#949390;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:11.2;stroke-opacity:1;enable-background:new" d="M-636.912 247.775h12v11.975h-12z"/><path style="display:inline;opacity:1;fill:#fff;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:11.2;stroke-opacity:1;enable-background:new" d="M-678.912 231.775h96v4h-96zm0 40h96v4h-96z"/><path d="M-686.787 285.775v4c0 4.432 3.568 8 8 8h95.75c4.432 0 8-3.568 8-8v-4c0 4.432-3.568 8-8 8h-95.75c-4.432 0-8-3.568-8-8z" style="display:inline;opacity:1;fill:#f3f7fb;fill-opacity:1;stroke:none;stroke-width:.25;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1,.5;stroke-dashoffset:0;stroke-opacity:1;enable-background:new"/></g><g style="display:inline;enable-background:new" transform="rotate(90 -191.262 955.728) scale(1.76362)"><rect ry="8" rx="8" y="273.775" x="-424.787" height="24" width="112" style="display:inline;opacity:1;fill:#1a5fb4;fill-opacity:1;stroke:none;stroke-width:.25;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1,.5;stroke-dashoffset:0;stroke-opacity:1;enable-background:new"/><rect style="display:inline;opacity:1;fill:#62a0ea;fill-opacity:1;stroke:none;stroke-width:.25;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1,.5;stroke-dashoffset:0;stroke-opacity:1;enable-background:new" width="112" height="76" x="-424.787" y="217.775" rx="8" ry="8"/><path style="display:inline;fill:#3584e4;fill-opacity:1;stroke:#3584e4;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;enable-background:new" d="M-396.787 291.775h56l-4-10h-48z"/><g transform="translate(-432.787 21.775)" style="display:inline;enable-background:new"><circle r="2" cy="202" cx="14" style="display:inline;opacity:1;fill:#424048;fill-opacity:1;stroke:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1,.5;stroke-dashoffset:0;stroke-opacity:1;enable-background:new"/><circle style="display:inline;opacity:1;fill:#424048;fill-opacity:1;stroke:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1,.5;stroke-dashoffset:0;stroke-opacity:1;enable-background:new" cx="14" cy="266" r="2"/><circle style="display:inline;opacity:1;fill:#424048;fill-opacity:1;stroke:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1,.5;stroke-dashoffset:0;stroke-opacity:1;enable-background:new" cx="114" cy="202" r="2"/><circle r="2" cy="266" cx="114" style="display:inline;opacity:1;fill:#424048;fill-opacity:1;stroke:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1,.5;stroke-dashoffset:0;stroke-opacity:1;enable-background:new"/></g><path style="display:inline;opacity:1;fill:#1a5fb4;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;enable-background:new" d="M-400.787 291.775h64v6h-64z"/><path style="display:inline;opacity:1;fill:#f6f5f4;fill-opacity:1;stroke:none;stroke-width:.25;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1,.5;stroke-dashoffset:0;stroke-opacity:1;enable-background:new" d="M-408.787 225.775h80l8 8v44h-96v-44z"/><g transform="translate(-432.787 21.775)" style="display:inline;enable-background:new"><path style="display:inline;opacity:1;fill:#424048;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;enable-background:new" d="M16 218h96v28H16Z"/><circle r="6" cy="232" cx="40" style="display:inline;opacity:1;fill:#f6f5f4;fill-opacity:1;stroke:none;stroke-width:.25;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1,.5;stroke-dashoffset:0;stroke-opacity:1;enable-background:new"/><circle style="display:inline;opacity:1;fill:#f6f5f4;fill-opacity:1;stroke:none;stroke-width:.25;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1,.5;stroke-dashoffset:0;stroke-opacity:1;enable-background:new" cx="88" cy="232" r="6"/><path style="display:inline;opacity:1;fill:#949390;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:11.2;stroke-opacity:1;enable-background:new" d="M52 226h24v12H52Z"/><path d="M272 28c0 61.856-50.144 112-112 112S48 89.856 48 28 98.144-84 160-84 272-33.856 272 28z" clip-path="url(#h)" style="display:inline;opacity:.5;fill:#424048;fill-opacity:1;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:4,2;stroke-dashoffset:0;stroke-opacity:1;enable-background:new" transform="matrix(.25 0 0 .25 0 225)"/></g></g><g transform="translate(-1317.014 -691.54) scale(2.52414)"><ellipse style="display:inline;fill:#494949;fill-opacity:1;stroke:none;stroke-width:2.00885;stroke-linejoin:round;stop-color:#000" cx="775" cy="519.485" rx="50" ry="50.444"/><path style="display:inline;fill:#3f3f3f;fill-opacity:1;stroke:none;stroke-width:2;stroke-linejoin:round;stop-color:#000" d="M810 508h55v30h-55z"/><circle style="display:inline;fill:#3f3f3f;fill-opacity:1;stroke:none;stroke-width:2;stroke-linejoin:round;stop-color:#000" cx="775" cy="521.929" r="50"/><circle style="display:inline;fill:#373737;fill-opacity:1;stroke:none;stroke-width:1.19986;stroke-linejoin:round;stop-color:#000" cx="775" cy="521.797" r="29.997"/><path style="display:inline;fill:#3f3f3f;fill-opacity:1;stroke:none;stroke-width:1.74773;stroke-linejoin:round;stop-color:#000" d="M823 568h42v30h-42c3.187-9.984 2.097-19.99 0-30z"/><rect style="display:inline;fill:#231e30;fill-opacity:1;stroke:none;stroke-width:2.08893;stroke-linejoin:round;stop-color:#000" width="55" height="60" x="835" y="553" rx="7.428" ry="8.103"/><path style="display:inline;fill:url(#i);fill-opacity:1;stroke:none;stroke-width:1.90693;stroke-linejoin:round;stop-color:#000" d="M842.427 498c-4.115 0-7.427 3-7.427 3v40.248c0 .307.03.605.074.9A5 5 0 0 0 840 548h56.28A23.644 23.644 0 0 1 920 571.719V578a5 5 0 0 0 10 0v-6.281c0-7.1-2.223-13.699-6-19.145V522l-19-18h-15.05c-.409-3.384-3.543-6-7.378-6z"/><path style="font-variation-settings:normal;display:inline;vector-effect:none;fill:url(#j);fill-opacity:1;stroke:none;stroke-width:1.90693;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000" d="M930 528c0 19.8-14.91 28.063-30 28h-65v52a5 5 0 0 0 5 5h60c14.912 0 30-14.913 30-30v-5z"/><path style="font-variation-settings:normal;display:inline;vector-effect:none;fill:none;fill-opacity:1;stroke:#6d6b75;stroke-width:10;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000" d="M840 501h56.281A28.718 28.718 45 0 1 925 529.718 27.527 27.527 137.537 0 1 896.28 556H840"/><path style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#777;fill-opacity:1;stroke:none;stroke-width:1.90693;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000" d="M823 508h12v1h-12z"/><path style="display:inline;fill:none;stroke:#c061cb;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M805 409h90.145A19.855 19.855 45 0 1 915 428.855 17.658 17.658 142.664 0 1 895.145 444H694.249a17.418 17.418 135 0 0-17.418 17.418v110.164A17.418 17.418 45 0 0 694.249 589h51.463"/><rect style="display:inline;fill:#613583;stroke:none;stroke-width:2;stroke-linejoin:round;stop-color:#000" width="28" height="10" x="788" y="404" rx="5" ry="5"/><rect style="display:inline;fill:#deddda;stroke:none;stroke-width:2;stroke-linejoin:round;stop-color:#000" width="18" height="4" x="775" y="407" rx="2" ry="2"/><circle style="display:inline;fill:#deddda;stroke:none;stroke-width:1.39585;stroke-linejoin:round;stop-color:#000" cx="778.338" cy="409" r="3.49"/><path style="display:inline;fill:#dadad9;fill-opacity:1;stroke:none;stroke-width:.761396px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m776.41 406.07-1.714.888a2.313 2.313 89.617 0 0 .028 4.12l1.755.881a.355.355 147.997 0 0 .514-.321l-.059-5.254a.359.359 30.978 0 0-.523-.314z"/><path style="display:inline;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:2;stroke-linejoin:round;stop-color:#000" d="M782.95 407a2 2 0 0 0-.478.07 2 2 0 0 1 1.475 1.93 2 2 0 0 1-1.47 1.93 2 2 0 0 0 .523.07 2 2 0 0 0 2-2 2 2 0 0 0-2-2 2 2 0 0 0-.05 0zm3.05 0a2 2 0 0 0-.479.07 2 2 0 0 1 1.475 1.93 2 2 0 0 1-1.47 1.93 2 2 0 0 0 .523.07 2 2 0 0 0 2-2 2 2 0 0 0-2-2 2 2 0 0 0-.05 0z"/><circle style="display:inline;fill:#5d5d5d;fill-opacity:1;stroke:none;stroke-width:2;stroke-linejoin:round;stop-color:#000" cx="775" cy="576.799" r="50"/><circle style="display:inline;fill:url(#k);fill-opacity:1;stroke:none;stroke-width:2;stroke-linejoin:round;stop-color:#000" cx="775" cy="584.048" r="50"/><circle style="display:inline;fill:url(#l);fill-opacity:1;stroke:none;stroke-width:1.19986;stroke-linejoin:round;stop-color:#000" cx="775" cy="584.048" r="29.997"/><path style="color:#000;font-style:normal;font-variant:normal;font-weight:400;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000;solid-opacity:1;vector-effect:none;fill:url(#m);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000" d="M765 549c2.655 11.465 4 23.232 4 35s-1.345 23.535-4 35h20a155.291 155.291 0 0 1-4-35c0-11.768 1.345-23.535 4-35z"/><path style="display:inline;fill:none;fill-opacity:1;stroke:#a6a6a6;stroke-width:1.89499;stroke-linejoin:round;stroke-opacity:1;stop-color:#000" d="M741.5 550.549a47.375 47.375 0 0 1 66.999 0"/><path style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#777;fill-opacity:1;stroke:none;stroke-width:1.90693;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000" d="M823 567h12v1h-12z"/></g><rect style="fill:#949390;fill-opacity:1;stroke:none;stroke-width:56.7699;stroke-linecap:round;stroke-linejoin:round;stop-color:#000" width="13.246" height="3.785" x="373.788" y="236.387" rx="0" ry="0"/><rect style="fill:#949390;fill-opacity:1;stroke:none;stroke-width:111.494;stroke-linecap:round;stroke-linejoin:round;stop-color:#000" width="51.093" height="3.785" x="407.85" y="236.387" rx="0" ry="0"/><rect style="fill:#949390;fill-opacity:1;stroke:none;stroke-width:56.7699;stroke-linecap:round;stroke-linejoin:round;stop-color:#000" width="13.246" height="3.785" x="472.189" y="236.387" rx="0" ry="0"/></g></svg>
-\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   height="600"
+   width="800"
+   version="1.1"
+   id="svg181"
+   sodipodi:docname="welcome-music.svg"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview183"
+     pagecolor="#ffffff"
+     bordercolor="#999999"
+     borderopacity="1"
+     inkscape:pageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="1"
+     inkscape:cx="284.5"
+     inkscape:cy="485"
+     inkscape:window-width="3840"
+     inkscape:window-height="2091"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg181" />
+  <defs
+     id="defs57">
+    <linearGradient
+       id="d">
+      <stop
+         style="stop-color:#bfbebc;stop-opacity:1"
+         offset="0"
+         id="stop2" />
+      <stop
+         style="stop-color:#9f9e9b;stop-opacity:.94509804"
+         offset=".854"
+         id="stop4" />
+      <stop
+         style="stop-color:#b8b7b4;stop-opacity:.93725497"
+         offset="1"
+         id="stop6" />
+    </linearGradient>
+    <linearGradient
+       id="e">
+      <stop
+         style="stop-color:#555458;stop-opacity:1"
+         offset="0"
+         id="stop9" />
+      <stop
+         style="stop-color:#77767b;stop-opacity:1"
+         offset="1"
+         id="stop11" />
+    </linearGradient>
+    <linearGradient
+       id="c">
+      <stop
+         style="stop-color:#5e5c64;stop-opacity:1"
+         offset="0"
+         id="stop14" />
+      <stop
+         style="stop-color:#737178;stop-opacity:1"
+         offset=".033"
+         id="stop16" />
+      <stop
+         style="stop-color:#64626a;stop-opacity:1"
+         offset=".103"
+         id="stop18" />
+      <stop
+         style="stop-color:#5e5c64;stop-opacity:1"
+         offset=".613"
+         id="stop20" />
+      <stop
+         style="stop-color:#5d5a63;stop-opacity:1"
+         offset=".729"
+         id="stop22" />
+      <stop
+         style="stop-color:#4a494f;stop-opacity:1"
+         offset="1"
+         id="stop24" />
+    </linearGradient>
+    <linearGradient
+       id="b">
+      <stop
+         style="stop-color:#5e5c64;stop-opacity:1"
+         offset="0"
+         id="stop27" />
+      <stop
+         style="stop-color:#65636a;stop-opacity:1"
+         offset=".033"
+         id="stop29" />
+      <stop
+         style="stop-color:#4c4a51;stop-opacity:1"
+         offset=".103"
+         id="stop31" />
+      <stop
+         style="stop-color:#4e4d53;stop-opacity:1"
+         offset=".708"
+         id="stop33" />
+      <stop
+         style="stop-color:#525057;stop-opacity:1"
+         offset=".832"
+         id="stop35" />
+      <stop
+         style="stop-color:#38373c;stop-opacity:1"
+         offset="1"
+         id="stop37" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#a"
+       id="f"
+       x1="59.779999"
+       y1="600.52698"
+       x2="1130.7271"
+       y2="600.52698"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="a">
+      <stop
+         style="stop-color:#2ec27e;stop-opacity:1"
+         offset="0"
+         id="stop41" />
+      <stop
+         style="stop-color:#62a0ea;stop-opacity:1"
+         offset="1"
+         id="stop43" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#b"
+       id="i"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(230,179)"
+       x1="605.07397"
+       y1="363.14801"
+       x2="689.59003"
+       y2="363.14801" />
+    <linearGradient
+       xlink:href="#c"
+       id="j"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(230,179)"
+       x1="604.91302"
+       y1="412.03699"
+       x2="695.55603"
+       y2="412.03699" />
+    <radialGradient
+       xlink:href="#d"
+       id="k"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.23242,0,0,1.23242,103.628,87.555)"
+       cx="543.71802"
+       cy="393.44299"
+       fx="543.71802"
+       fy="393.44299"
+       r="50" />
+    <radialGradient
+       xlink:href="#e"
+       id="l"
+       cx="545"
+       cy="387.793"
+       fx="545"
+       fy="387.793"
+       r="29.997"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.18529,0,0,2.18529,-415.981,-290.826)" />
+    <radialGradient
+       xlink:href="#d"
+       id="m"
+       cx="543.71802"
+       cy="393.44299"
+       fx="543.71802"
+       fy="393.44299"
+       r="50"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.23242,0,0,1.23242,103.628,87.555)" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="g">
+      <rect
+         ry="32"
+         rx="32"
+         y="-116"
+         x="32.5"
+         height="320"
+         width="447"
+         style="opacity:1;fill:#fb8c14;fill-opacity:1;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:4, 2;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect51" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="h">
+      <path
+         style="opacity:1;fill:#949390;fill-opacity:1;stroke:none;stroke-width:16;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:11.2;stroke-opacity:1"
+         d="m 208,4 h 96 v 48 h -96 z"
+         id="path54" />
+    </clipPath>
+  </defs>
+  <g
+     transform="matrix(0.6666321,0,0,0.66706216,21.101698,-82.283362)"
+     style="display:inline"
+     id="g179">
+    <path
+       style="display:inline;fill:url(#f);fill-opacity:1;stroke:none;stroke-width:2.68319;stroke-linejoin:round;stop-color:#000000"
+       d="m 830.003,275.638 v 107.317 a 13.27,13.27 135 0 1 -13.27,13.27 h -0.291 a 13.27,13.27 45 0 1 -13.271,-13.27 26.977,26.977 45 0 0 -26.977,-26.977 26.832,26.832 134.69 0 0 -26.687,26.977 v 123.14 a 13.27,13.27 135 0 1 -13.27,13.27 h -0.291 a 13.27,13.27 45 0 1 -13.27,-13.27 v -17.44 a 24,24 45 0 0 -24,-24 h -5.664 a 24,24 135 0 0 -24,24 v 23.093 a 13.27,13.27 135 0 1 -13.271,13.27 h -0.29 a 13.27,13.27 45 0 1 -13.271,-13.27 v -51.275 a 24,24 45 0 0 -24,-24 h -5.664 a 24,24 135 0 0 -24,24 v 2.978 a 13.27,13.27 135 0 1 -13.27,13.27 h -0.291 a 13.27,13.27 45 0 1 -13.271,-13.27 V 342.707 A 26.977,26.977 45 0 0 534.707,315.73 26.832,26.832 134.69 0 0 508.02,342.707 v 67.08 a 13.27,13.27 135 0 1 -13.27,13.27 h -0.291 a 13.27,13.27 45 0 1 -13.27,-13.27 26.977,26.977 45 0 0 -26.978,-26.977 26.832,26.832 134.69 0 0 -26.686,26.977 13.27,13.27 135 0 1 -13.271,13.27 h -0.29 a 13.27,13.27 45 0 1 -13.271,-13.27 v -134.16 a 26.977,26.977 45 0 0 -26.978,-26.977 26.832,26.832 134.69 0 0 -26.686,26.977 v 93.912 a 13.27,13.27 135 0 1 -13.27,13.27 h -0.291 a 13.27,13.27 45 0 1 -13.271,-13.27 26.977,26.977 45 0 0 -26.977,-26.977 26.832,26.832 134.69 0 0 -26.687,26.977 v 80.496 a 13.27,13.27 135 0 1 -13.27,13.27 h -0.291 a 13.27,13.27 45 0 1 -13.27,-13.27 26.977,26.977 45 0 0 -26.978,-26.978 26.832,26.832 134.69 0 0 -26.686,26.978 v 53.663 a 13.27,13.27 135 0 1 -13.271,13.271 h -0.29 a 13.27,13.27 45 0 1 -13.271,-13.27 26.977,26.977 45 0 0 -26.978,-26.978 26.832,26.832 134.69 0 0 -26.686,26.977 22.861,22.861 137.566 0 1 -23.999,21.94 L 53.847,525.32 a 23.726,23.726 135.328 0 0 -23.998,23.725 24.049,24.049 45.036 0 0 24,24.03 l 27.693,0.078 a 24.068,24.068 45.08 0 1 24,24.068 v 0.071 a 26.977,26.977 45 0 0 26.977,26.977 26.832,26.832 134.69 0 0 26.687,-26.977 13.257,13.257 135.059 0 1 13.27,-13.243 h 0.29 a 13.27,13.27 45 0 1 13.272,13.27 v 53.664 a 26.977,26.977 45 0 0 26.977,26.977 26.832,26.832 134.69 0 0 26.686,-26.977 13.27,13.27 135 0 1 13.271,-13.27 h 0.29 a 13.27,13.27 45 0 1 13.271,13.27 v 80.496 a 26.977,26.977 45 0 0 26.977,26.977 26.832,26.832 134.69 0 0 26.687,-26.977 13.27,13.27 135 0 1 13.27,-13.27 h 0.291 a 13.27,13.27 45 0 1 13.27,13.27 v 93.911 a 26.977,26.977 45 0 0 26.978,26.978 26.832,26.832 134.69 0 0 26.687,-26.978 V 691.231 a 13.27,13.27 135 0 1 13.27,-13.27 h 0.29 a 13.27,13.27 45 0 1 13.272,13.27 26.977,26.977 45 0 0 26.977,26.977 26.832,26.832 134.69 0 0 26.686,-26.977 13.27,13.27 135 0 1 13.271,-13.27 h 0.29 a 13.27,13.27 45 0 1 13.271,13.27 v 67.08 a 26.977,26.977 45 0 0 26.977,26.977 26.832,26.832 134.69 0 0 26.687,-26.977 V 637.567 a 13.27,13.27 135 0 1 13.27,-13.27 h 0.291 a 13.27,13.27 45 0 1 13.27,13.27 26.977,26.977 45 0 0 26.978,26.977 26.832,26.832 134.69 0 0 26.687,-26.977 V 589.27 A 13.27,13.27 135 0 1 655.45,576 h 0.29 a 13.27,13.27 45 0 1 13.272,13.27 26.977,26.977 45 0 0 26.977,26.977 26.832,26.832 134.69 0 0 26.686,-26.977 13.27,13.27 135 0 1 13.271,-13.27 h 0.29 a 13.27,13.27 45 0 1 13.271,13.27 v 128.793 a 26.977,26.977 45 0 0 26.977,26.977 26.832,26.832 134.69 0 0 26.687,-26.977 13.27,13.27 135 0 1 13.27,-13.27 h 0.291 a 13.27,13.27 45 0 1 13.27,13.27 v 81.891 a 26.977,26.977 45 0 0 26.978,26.978 26.832,26.832 134.69 0 0 26.687,-26.978 v -93.911 a 13.27,13.27 135 0 1 13.27,-13.27 h 0.29 a 13.27,13.27 45 0 1 13.272,13.27 26.977,26.977 45 0 0 26.977,26.977 26.832,26.832 134.69 0 0 26.686,-26.977 V 597.319 a 13.27,13.27 135 0 1 13.271,-13.27 h 0.29 a 13.27,13.27 45 0 1 13.271,13.27 26.977,26.977 45 0 0 26.977,26.978 26.832,26.832 134.69 0 0 26.687,-26.978 v -0.274 a 23.935,23.935 135.077 0 1 24,-23.935 l 17.247,0.047 a 23.935,23.935 135.077 0 0 24,-23.936 23.62,23.62 44.117 0 0 -24,-23.271 l -17.247,0.026 a 23.963,23.963 44.956 0 1 -24,-23.963 26.148,26.148 43.153 0 0 -26.977,-25.292 26.832,26.832 134.69 0 0 -26.687,26.977 13.27,13.27 135 0 1 -13.27,13.271 h -0.291 a 13.27,13.27 45 0 1 -13.27,-13.27 V 369.549 A 26.977,26.977 45 0 0 937.185,342.572 26.832,26.832 134.69 0 0 910.5,369.55 13.27,13.27 135 0 1 897.229,382.821 h -0.29 a 13.27,13.27 45 0 1 -13.271,-13.27 v -93.912 a 26.977,26.977 45 0 0 -26.978,-26.977 26.832,26.832 134.69 0 0 -26.686,26.977 z"
+       id="path59" />
+    <g
+       style="display:inline;enable-background:new"
+       transform="matrix(-1.76362,0,0,-1.76362,-682.748,759.448)"
+       id="g91">
+      <rect
+         ry="8"
+         rx="8"
+         y="217.77499"
+         x="-686.78699"
+         height="80"
+         width="111.75"
+         style="display:inline;opacity:1;fill:#d5d3cf;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1, 0.5;stroke-dashoffset:0;stroke-opacity:1;enable-background:new"
+         id="rect61" />
+      <rect
+         ry="4"
+         rx="4"
+         y="225.77499"
+         x="-678.91199"
+         height="56"
+         width="96"
+         style="display:inline;opacity:1;fill:#ed333b;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1, 0.5;stroke-dashoffset:0;stroke-opacity:1;enable-background:new"
+         id="rect63" />
+      <rect
+         ry="7.9879999"
+         rx="7.9879999"
+         y="245.77499"
+         x="-658.90002"
+         height="15.975"
+         width="55.974998"
+         style="display:inline;opacity:1;fill:#d5d3cf;fill-opacity:1;stroke:#d5d3cf;stroke-width:8;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:11.2;stroke-opacity:1;enable-background:new"
+         id="rect65" />
+      <circle
+         r="7.9879999"
+         cy="253.76199"
+         cx="-650.91199"
+         style="display:inline;opacity:1;fill:#424048;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1, 0.5;stroke-dashoffset:0;stroke-opacity:1;enable-background:new"
+         id="circle67" />
+      <circle
+         style="display:inline;opacity:1;fill:#424048;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1, 0.5;stroke-dashoffset:0;stroke-opacity:1;enable-background:new"
+         cx="-610.91199"
+         cy="253.76199"
+         r="7.9879999"
+         id="circle69" />
+      <g
+         transform="matrix(0.25,0,0,0.25,-694.912,246.775)"
+         style="display:inline;fill:#949390;fill-opacity:1;stroke:#949390;stroke-opacity:1;enable-background:new"
+         clip-path="url(#g)"
+         id="g73">
+        <path
+           style="fill:#949390;fill-opacity:1;stroke:#949390;stroke-width:32;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+           d="M 128,236 H 384 L 352,140 H 160 Z"
+           id="path71" />
+      </g>
+      <g
+         transform="matrix(0.25,0,0,0.25,-694.912,246.775)"
+         style="display:inline;fill:#424048;fill-opacity:1;enable-background:new"
+         id="g83">
+        <circle
+           style="opacity:1;fill:#424048;fill-opacity:1;stroke:none;stroke-width:32;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:4, 2;stroke-dashoffset:0;stroke-opacity:1"
+           cx="56"
+           cy="-92"
+           r="8"
+           id="circle75" />
+        <circle
+           r="8"
+           cy="164"
+           cx="56"
+           style="opacity:1;fill:#424048;fill-opacity:1;stroke:none;stroke-width:32;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:4, 2;stroke-dashoffset:0;stroke-opacity:1"
+           id="circle77" />
+        <circle
+           r="8"
+           cy="-92"
+           cx="456"
+           style="opacity:1;fill:#424048;fill-opacity:1;stroke:none;stroke-width:32;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:4, 2;stroke-dashoffset:0;stroke-opacity:1"
+           id="circle79" />
+        <circle
+           style="opacity:1;fill:#424048;fill-opacity:1;stroke:none;stroke-width:32;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:4, 2;stroke-dashoffset:0;stroke-opacity:1"
+           cx="456"
+           cy="164"
+           r="8"
+           id="circle81" />
+      </g>
+      <path
+         style="display:inline;opacity:1;fill:#949390;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:11.2;stroke-opacity:1;enable-background:new"
+         d="m -636.912,247.775 h 12 v 11.975 h -12 z"
+         id="path85" />
+      <path
+         style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:11.2;stroke-opacity:1;enable-background:new"
+         d="m -678.912,231.775 h 96 v 4 h -96 z m 0,40 h 96 v 4 h -96 z"
+         id="path87" />
+      <path
+         d="m -686.787,285.775 v 4 c 0,4.432 3.568,8 8,8 h 95.75 c 4.432,0 8,-3.568 8,-8 v -4 c 0,4.432 -3.568,8 -8,8 h -95.75 c -4.432,0 -8,-3.568 -8,-8 z"
+         style="display:inline;opacity:1;fill:#f3f7fb;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1, 0.5;stroke-dashoffset:0;stroke-opacity:1;enable-background:new"
+         id="path89" />
+    </g>
+    <g
+       style="display:inline;enable-background:new"
+       transform="matrix(0,1.76362,-1.76362,0,764.466,1146.99)"
+       id="g125">
+      <rect
+         ry="8"
+         rx="8"
+         y="273.77499"
+         x="-424.78699"
+         height="24"
+         width="112"
+         style="display:inline;opacity:1;fill:#1a5fb4;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1, 0.5;stroke-dashoffset:0;stroke-opacity:1;enable-background:new"
+         id="rect93" />
+      <rect
+         style="display:inline;opacity:1;fill:#62a0ea;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1, 0.5;stroke-dashoffset:0;stroke-opacity:1;enable-background:new"
+         width="112"
+         height="76"
+         x="-424.78699"
+         y="217.77499"
+         rx="8"
+         ry="8"
+         id="rect95" />
+      <path
+         style="display:inline;fill:#3584e4;fill-opacity:1;stroke:#3584e4;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;enable-background:new"
+         d="m -396.787,291.775 h 56 l -4,-10 h -48 z"
+         id="path97" />
+      <g
+         transform="translate(-432.787,21.775)"
+         style="display:inline;enable-background:new"
+         id="g107">
+        <circle
+           r="2"
+           cy="202"
+           cx="14"
+           style="display:inline;opacity:1;fill:#424048;fill-opacity:1;stroke:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1, 0.5;stroke-dashoffset:0;stroke-opacity:1;enable-background:new"
+           id="circle99" />
+        <circle
+           style="display:inline;opacity:1;fill:#424048;fill-opacity:1;stroke:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1, 0.5;stroke-dashoffset:0;stroke-opacity:1;enable-background:new"
+           cx="14"
+           cy="266"
+           r="2"
+           id="circle101" />
+        <circle
+           style="display:inline;opacity:1;fill:#424048;fill-opacity:1;stroke:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1, 0.5;stroke-dashoffset:0;stroke-opacity:1;enable-background:new"
+           cx="114"
+           cy="202"
+           r="2"
+           id="circle103" />
+        <circle
+           r="2"
+           cy="266"
+           cx="114"
+           style="display:inline;opacity:1;fill:#424048;fill-opacity:1;stroke:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1, 0.5;stroke-dashoffset:0;stroke-opacity:1;enable-background:new"
+           id="circle105" />
+      </g>
+      <path
+         style="display:inline;opacity:1;fill:#1a5fb4;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;enable-background:new"
+         d="m -400.787,291.775 h 64 v 6 h -64 z"
+         id="path109" />
+      <path
+         style="display:inline;opacity:1;fill:#f6f5f4;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1, 0.5;stroke-dashoffset:0;stroke-opacity:1;enable-background:new"
+         d="m -408.787,225.775 h 80 l 8,8 v 44 h -96 v -44 z"
+         id="path111" />
+      <g
+         transform="translate(-432.787,21.775)"
+         style="display:inline;enable-background:new"
+         id="g123">
+        <path
+           style="display:inline;opacity:1;fill:#424048;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;enable-background:new"
+           d="m 16,218 h 96 v 28 H 16 Z"
+           id="path113" />
+        <circle
+           r="6"
+           cy="232"
+           cx="40"
+           style="display:inline;opacity:1;fill:#f6f5f4;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1, 0.5;stroke-dashoffset:0;stroke-opacity:1;enable-background:new"
+           id="circle115" />
+        <circle
+           style="display:inline;opacity:1;fill:#f6f5f4;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1, 0.5;stroke-dashoffset:0;stroke-opacity:1;enable-background:new"
+           cx="88"
+           cy="232"
+           r="6"
+           id="circle117" />
+        <path
+           style="display:inline;opacity:1;fill:#949390;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:11.2;stroke-opacity:1;enable-background:new"
+           d="m 52,226 h 24 v 12 H 52 Z"
+           id="path119" />
+        <path
+           d="M 272,28 C 272,89.856 221.856,140 160,140 98.144,140 48,89.856 48,28 48,-33.856 98.144,-84 160,-84 c 61.856,0 112,50.144 112,112 z"
+           clip-path="url(#h)"
+           style="display:inline;opacity:0.5;fill:#424048;fill-opacity:1;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:4, 2;stroke-dashoffset:0;stroke-opacity:1;enable-background:new"
+           transform="matrix(0.25,0,0,0.25,0,225)"
+           id="path121" />
+      </g>
+    </g>
+    <g
+       transform="matrix(2.52414,0,0,2.52414,-1317.014,-691.54)"
+       id="g171">
+      <ellipse
+         style="display:inline;fill:#494949;fill-opacity:1;stroke:none;stroke-width:2.00885;stroke-linejoin:round;stop-color:#000000"
+         cx="775"
+         cy="519.48499"
+         rx="50"
+         ry="50.444"
+         id="ellipse127" />
+      <path
+         style="display:inline;fill:#3f3f3f;fill-opacity:1;stroke:none;stroke-width:2;stroke-linejoin:round;stop-color:#000000"
+         d="m 810,508 h 55 v 30 h -55 z"
+         id="path129" />
+      <circle
+         style="display:inline;fill:#3f3f3f;fill-opacity:1;stroke:none;stroke-width:2;stroke-linejoin:round;stop-color:#000000"
+         cx="775"
+         cy="521.92902"
+         r="50"
+         id="circle131" />
+      <circle
+         style="display:inline;fill:#373737;fill-opacity:1;stroke:none;stroke-width:1.19986;stroke-linejoin:round;stop-color:#000000"
+         cx="775"
+         cy="521.797"
+         r="29.997"
+         id="circle133" />
+      <path
+         style="display:inline;fill:#3f3f3f;fill-opacity:1;stroke:none;stroke-width:1.74773;stroke-linejoin:round;stop-color:#000000"
+         d="m 823,568 h 42 v 30 h -42 c 3.187,-9.984 2.097,-19.99 0,-30 z"
+         id="path135" />
+      <rect
+         style="display:inline;fill:#231e30;fill-opacity:1;stroke:none;stroke-width:2.08893;stroke-linejoin:round;stop-color:#000000"
+         width="55"
+         height="60"
+         x="835"
+         y="553"
+         rx="7.428"
+         ry="8.1029997"
+         id="rect137" />
+      <path
+         style="display:inline;fill:url(#i);fill-opacity:1;stroke:none;stroke-width:1.90693;stroke-linejoin:round;stop-color:#000000"
+         d="m 842.427,498 c -4.115,0 -7.427,3 -7.427,3 v 40.248 c 0,0.307 0.03,0.605 0.074,0.9 A 5,5 0 0 0 840,548 h 56.28 A 23.644,23.644 0 0 1 920,571.719 V 578 a 5,5 0 0 0 10,0 v -6.281 c 0,-7.1 -2.223,-13.699 -6,-19.145 V 522 l -19,-18 h -15.05 c -0.409,-3.384 -3.543,-6 -7.378,-6 z"
+         id="path139" />
+      <path
+         style="font-variation-settings:normal;display:inline;vector-effect:none;fill:url(#j);fill-opacity:1;stroke:none;stroke-width:1.90693;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+         d="m 930,528 c 0,19.8 -14.91,28.063 -30,28 h -65 v 52 a 5,5 0 0 0 5,5 h 60 c 14.912,0 30,-14.913 30,-30 v -5 z"
+         id="path141" />
+      <path
+         style="font-variation-settings:normal;display:inline;vector-effect:none;fill:none;fill-opacity:1;stroke:#6d6b75;stroke-width:10;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+         d="m 840,501 h 56.281 A 28.718,28.718 45 0 1 925,529.718 27.527,27.527 137.537 0 1 896.28,556 H 840"
+         id="path143" />
+      <path
+         style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#777777;fill-opacity:1;stroke:none;stroke-width:1.90693;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+         d="m 823,508 h 12 v 1 h -12 z"
+         id="path145" />
+      <path
+         style="display:inline;fill:none;stroke:#c061cb;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 805,409 h 90.145 A 19.855,19.855 45 0 1 915,428.855 17.658,17.658 142.664 0 1 895.145,444 H 694.249 a 17.418,17.418 135 0 0 -17.418,17.418 V 571.582 A 17.418,17.418 45 0 0 694.249,589 h 51.463"
+         id="path147" />
+      <rect
+         style="display:inline;fill:#613583;stroke:none;stroke-width:2;stroke-linejoin:round;stop-color:#000000"
+         width="28"
+         height="10"
+         x="788"
+         y="404"
+         rx="5"
+         ry="5"
+         id="rect149" />
+      <rect
+         style="display:inline;fill:#deddda;stroke:none;stroke-width:2;stroke-linejoin:round;stop-color:#000000"
+         width="18"
+         height="4"
+         x="775"
+         y="407"
+         rx="2"
+         ry="2"
+         id="rect151" />
+      <circle
+         style="display:inline;fill:#deddda;stroke:none;stroke-width:1.39585;stroke-linejoin:round;stop-color:#000000"
+         cx="778.33801"
+         cy="409"
+         r="3.49"
+         id="circle153" />
+      <path
+         style="display:inline;fill:#dadad9;fill-opacity:1;stroke:none;stroke-width:0.761396px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 776.41,406.07 -1.714,0.888 a 2.313,2.313 89.617 0 0 0.028,4.12 l 1.755,0.881 a 0.355,0.355 147.997 0 0 0.514,-0.321 l -0.059,-5.254 a 0.359,0.359 30.978 0 0 -0.523,-0.314 z"
+         id="path155" />
+      <path
+         style="display:inline;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:2;stroke-linejoin:round;stop-color:#000000"
+         d="m 782.95,407 a 2,2 0 0 0 -0.478,0.07 2,2 0 0 1 1.475,1.93 2,2 0 0 1 -1.47,1.93 2,2 0 0 0 0.523,0.07 2,2 0 0 0 2,-2 2,2 0 0 0 -2,-2 2,2 0 0 0 -0.05,0 z m 3.05,0 a 2,2 0 0 0 -0.479,0.07 2,2 0 0 1 1.475,1.93 2,2 0 0 1 -1.47,1.93 2,2 0 0 0 0.523,0.07 2,2 0 0 0 2,-2 2,2 0 0 0 -2,-2 2,2 0 0 0 -0.05,0 z"
+         id="path157" />
+      <circle
+         style="display:inline;fill:#5d5d5d;fill-opacity:1;stroke:none;stroke-width:2;stroke-linejoin:round;stop-color:#000000"
+         cx="775"
+         cy="576.79901"
+         r="50"
+         id="circle159" />
+      <circle
+         style="display:inline;fill:url(#k);fill-opacity:1;stroke:none;stroke-width:2;stroke-linejoin:round;stop-color:#000000"
+         cx="775"
+         cy="584.04797"
+         r="50"
+         id="circle161" />
+      <circle
+         style="display:inline;fill:url(#l);fill-opacity:1;stroke:none;stroke-width:1.19986;stroke-linejoin:round;stop-color:#000000"
+         cx="775"
+         cy="584.04797"
+         r="29.997"
+         id="circle163" />
+      <path
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:400;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#m);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000"
+         d="m 765,549 c 2.655,11.465 4,23.232 4,35 0,11.768 -1.345,23.535 -4,35 h 20 a 155.291,155.291 0 0 1 -4,-35 c 0,-11.768 1.345,-23.535 4,-35 z"
+         id="path165" />
+      <path
+         style="display:inline;fill:none;fill-opacity:1;stroke:#a6a6a6;stroke-width:1.89499;stroke-linejoin:round;stroke-opacity:1;stop-color:#000000"
+         d="m 741.5,550.549 a 47.375,47.375 0 0 1 66.999,0"
+         id="path167" />
+      <path
+         style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#777777;fill-opacity:1;stroke:none;stroke-width:1.90693;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+         d="m 823,567 h 12 v 1 h -12 z"
+         id="path169" />
+    </g>
+    <rect
+       style="fill:#949390;fill-opacity:1;stroke:none;stroke-width:56.7699;stroke-linecap:round;stroke-linejoin:round;stop-color:#000000"
+       width="13.246"
+       height="3.7850001"
+       x="373.78799"
+       y="236.38699"
+       rx="0"
+       ry="0"
+       id="rect173" />
+    <rect
+       style="fill:#949390;fill-opacity:1;stroke:none;stroke-width:111.494;stroke-linecap:round;stroke-linejoin:round;stop-color:#000000"
+       width="51.092999"
+       height="3.7850001"
+       x="407.85001"
+       y="236.38699"
+       rx="0"
+       ry="0"
+       id="rect175" />
+    <rect
+       style="fill:#949390;fill-opacity:1;stroke:none;stroke-width:56.7699;stroke-linecap:round;stroke-linejoin:round;stop-color:#000000"
+       width="13.246"
+       height="3.7850001"
+       x="472.189"
+       y="236.38699"
+       rx="0"
+       ry="0"
+       id="rect177" />
+  </g>
+</svg>
diff --git a/data/meson.build b/data/meson.build
index cbc6233a..e67c1a31 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -6,8 +6,7 @@ gnome.compile_resources(
   gresource_bundle: true,
   source_dir: meson.current_build_dir(),
   install_dir: PKGDATA_DIR,
-  install: true,
-  dependencies: about_dialog
+  install: true
 )
 
 schema_src = PROJECT_RDNN_NAME + '.gschema.xml'
diff --git a/data/org.gnome.Music.appdata.xml.in.in b/data/org.gnome.Music.appdata.xml.in.in
index eb45e89f..cc6a550b 100644
--- a/data/org.gnome.Music.appdata.xml.in.in
+++ b/data/org.gnome.Music.appdata.xml.in.in
@@ -28,6 +28,21 @@
     </screenshot>
   </screenshots>
   <releases>
+    <release version="44.0" date="2023-03-22">
+      <description>
+        <p>
+          First stable release for GNOME 44. This version mostly consists
+          of stability improvements. There are also some notable
+          improvements:
+        </p>
+        <ul>
+          <li>Port to soup 3</li>
+          <li>Fix shuffle</li>
+          <li>Decrease memory usage in SongsView</li>
+        </ul>
+        <p>This release also updates translations.</p>
+      </description>
+    </release>
     <release version="42.1" date="2022-04-25">
       <description>
         <ul>
diff --git a/data/org.gnome.Music.gresource.xml b/data/org.gnome.Music.gresource.xml
index 2be39220..77029c6d 100644
--- a/data/org.gnome.Music.gresource.xml
+++ b/data/org.gnome.Music.gresource.xml
@@ -4,7 +4,6 @@
     <file alias="gtk/help-overlay.ui" preprocess="xml-stripblanks">ui/help-overlay.ui</file>
     <file>style.css</file>
     <file>icons/welcome-music.svg</file>
-    <file preprocess="xml-stripblanks">ui/AboutDialog.ui</file>
     <file preprocess="xml-stripblanks">ui/AlbumCover.ui</file>
     <file preprocess="xml-stripblanks">ui/AlbumCoverListItem.ui</file>
     <file preprocess="xml-stripblanks">ui/AlbumWidget.ui</file>
diff --git a/data/ui/AboutDialog.ui.in b/data/ui/AboutDialog.ui.in
deleted file mode 100644
index 96321f8d..00000000
--- a/data/ui/AboutDialog.ui.in
+++ /dev/null
@@ -1,223 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <!-- interface-requires gtk+ 3.0 -->
-  <template class="AboutDialog" parent="GtkAboutDialog">
-    <property name="focusable">False</property>
-    <property name="modal">True</property>
-    <property name="program_name">@PROGRAM_NAME@</property>
-    <property name="version">@PACKAGE_VERSION@</property>
-    <property name="copyright" translatable="yes">Copyright © 2018 GNOME Music Developers</property>
-    <property name="comments" translatable="yes">A music player and management application for GNOME.</property>
-    <property name="website">@PACKAGE_URL@</property>
-    <property name="website_label" translatable="yes">Visit GNOME Music website</property>
-    <property name="license" translatable="yes">GNOME Music is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
-GNOME Music is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with GNOME Music; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-The GNOME Music authors hereby grant permission for non-GPL compatible GStreamer plugins to be used and distributed together with GStreamer and GNOME Music.  This permission is above and beyond the permissions granted by the GPL license by which GNOME Music is covered.  If you modify this code, you may extend this exception to your version of the code, but you are not obligated to do so.  If you do not wish to do so, delete this exception statement from your version.</property>
-    <property name="authors">Abhinav Singh
-Adam Blanchet
-Adrian Solom
-Alberto Fanjul
-Alexander Mikhaylenko
-Andre Klapper
-Andreas Nilsson
-Apostol Bakalov
-Arnel A. Borja
-Ashwani Singh Tanwar
-Ashwin Mohan
-Atharva Veer
-Benoît Legat
-Bilal Elmoussaoui
-Billy Barrow
-Bruce Cowan
-Carlos Garnacho
-Carlos Soriano
-Chinmay Gurjar
-Christophe van den Abbeele
-Christopher Davis
-Clayton G. Hobbs
-Divyanshu Vishwakarma
-Eslam Mostafa
-Elias Entrup
-Erik Inkinen
-Evan Nehring
-Evandro Giovanini
-Fabiano Fidêncio
-Felipe Borges
-Florian Darfeuille
-Gaurav Narula
-Georges Basile Stavracas Neto
-Guillaume Quintard
-Gyanesh Malhotra
-Harry Xie
-Hugo Posnic
-Ishaan Shah
-Islam Bahnasy
-Jakub Steiner
-James A. Baker
-Jan Alexander Steffens
-Janne Körkkö
-Jan-Michael Brummer
-Jean Felder
-Jeremy Bicha
-Jesus Bermudez Velazquez
-Jordan Petridis
-Juan José González
-Juan Suarez
-Kainaat Singh
-Kalev Lember
-Kevin Haller
-Konstantin Pospelov
-Koushik Sahu
-Lucy Coleclough
-Marinus Schraal
-Michael Catanzaro
-Mohanna Datta Yelugoti
-Nick Richards
-Niels De Graef
-Nikolay Yanchuk
-Nils Reuße
-Pablo Palácios
-Phil Dawson
-Piotr Drąg
-Prashant Tyagi
-Rafael Coelho
-Rashi Sah
-Rasmus Thomsen
-Reuben Dsouza
-Robert Greener
-Sabri Ünal
-Sagar Lakhani
-Sai Suman Prayaga
-Sam Hewitt
-Sam Thursfield
-Sambhav Kothari
-Seif Lotfy
-Shivani Poddar
-Shivansh Handa
-Simon McVittie
-Sophie Herold
-Subhadip Jana
-Sumaid Syed
-Suyash Garg
-Tapasweni Pathak
-Taylor Garcia
-Tjipke van der Heide
-Vadim Rutkovsky
-Veerasamy Sevagen
-Vineet Reddy
-Weifang Lai
-Yann Delaby
-Yash Singh
-    </property>
-    <property name="artists">Allan Day
-Jakub Steiner
-William Jon McCann
-    </property>
-    <property name="translator_credits">Adolfo Jayme Barrientos
-அருள்ராஜன் அ லை
-A S Alam
-Alain Lojewski
-Alan Mortensen
-Aleksandr Melman
-Alexander Shopov
-Alexandre Franke
-Anders Jonsson
-Andika Triwidada
-Anish Sheela
-Arash Mousavi
-Asier Sarasua Garmendia
-Ask Hjorth Larsen
-Aurimas Černius
-Balázs Meskó
-Balázs Úr
-Baurzhan Muftakhidinov
-Bruce Cowan
-Boyuan Yang
-Carmen Bianca Bakker
-Cédric Valmary
-Chao-Hsiung Liao
-Charles Monzat
-Cheng Lu
-Cheng-Chia Tseng
-Claude Paroz
-Danial Behzadi
-Daniel Korostil
-Daniel Mustieles García
-Daniel Șerbănescu
-David King
-Dušan Kazik
-Efstathios Iosifidis
-Emin Tufan Çetin
-Enrico Nicoletto
-Fábio Nogueira
-Fabio Tomat
-Florentina Mușat
-Fran Diéguez
-Furkan Tokaç
-Gábor Kelemen
-Gil Forcada Codinachs
-Goran Vidović
-Guillaume Bernard
-Henrique Machado Campos
-Hugo Carvalho
-Inaki Larranaga Murgoitio
-Jiri Grönroos
-Joe Hansen
-Jor Teron
-Jordi Mas
-Juliano Camargo
-Julien Humbert
-Justin van Steijn
-Kjartan Maraas
-Kristjan Schmidt
-Kukuh Syafaat
-Luna Jernberg
-Марко Костић
-Marek Černocký
-Mario Blättermann
-Matej Urbančič
-Matheus Barbosa
-Milo Casagrande
-Mingcong Bai
-Mpho Jele
-Мирослав Николић
-Милош Поповић
-Nathan Follens
-Osman Karagöz
-Petr Kovář
-Philipp Kiemle
-Piotr Drąg
-Quentin Pagès
-Rafael Fontenelle
-Rodrigo Lledó Milanca
-Ryuta Fujii
-Rūdolfs Mazurs
-Sabri Ünal
-Sebastian Rasmussen
-Seong-ho Cho
-Stas Solovey
-Sveinn í Felli
-Tiago Santos
-Tim Sabsch
-Tjipke van der Heide
-Tom Tryfonidis
-Trần Ngọc Quân
-Vinzenz Vietzke
-Xavi Ivars
-Yaron Shahrabani
-Yi-Jyun Pan
-Yosef Or Boczko
-Yuras Shumovich
-Yuri Chornoivan
-Yuri Myasoedov
-Zander Brown
-Zmicer Turok
-    </property>
-    <property name="logo_icon_name">@APPID@</property>
-    <property name="wrap_license">True</property>
-  </template>
-</interface>
diff --git a/data/ui/AlbumCoverListItem.ui b/data/ui/AlbumCoverListItem.ui
index 1eacc4f6..8fa7acce 100644
--- a/data/ui/AlbumCoverListItem.ui
+++ b/data/ui/AlbumCoverListItem.ui
@@ -2,7 +2,6 @@
 <interface>
   <requires lib="gtk" version="4.0"/>
   <object class="GtkBox" id="_album_cover">
-    <property name="focusable">False</property>
     <property name="has_tooltip">True</property>
     <property name="valign">start</property>
     <property name="orientation">vertical</property>
diff --git a/data/ui/EmptyView.ui b/data/ui/EmptyView.ui
index 2be102a9..ea571e10 100644
--- a/data/ui/EmptyView.ui
+++ b/data/ui/EmptyView.ui
@@ -10,32 +10,38 @@
       </object>
     </child>
   </template>
-  <object class="GtkBox" id="_initial_state">
-    <property name="valign">start</property>
-    <property name="orientation">vertical</property>
+  <object class="AdwClamp" id="_initial_state">
+    <property name="maximum-size">620</property>
+    <property name="tightening-threshold">500</property>
     <child>
-      <object class="GtkPicture">
-        <property name="can-shrink">true</property>
-        <property name="keep-aspect-ratio">true</property>
-        <property name="file">resource:///org/gnome/Music/icons/welcome-music.svg</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkLabel" id="_title_label">
-        <property name="justify">center</property>
-        <property name="label" translatable="yes">Welcome to Music</property>
-        <style>
-          <class name="large-title"/>
-        </style>
-      </object>
-    </child>
-    <child>
-      <object class="GtkLabel" id="_description_label">
-        <property name="justify">center</property>
-        <property name="use-markup">True</property>
-        <style>
-          <class name="body"/>
-        </style>
+      <object class="GtkBox">
+        <property name="valign">start</property>
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkPicture">
+            <property name="can-shrink">true</property>
+            <property name="keep-aspect-ratio">true</property>
+            <property name="file">resource:///org/gnome/Music/icons/welcome-music.svg</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLabel" id="_title_label">
+            <property name="justify">center</property>
+            <property name="label" translatable="yes">Welcome to Music</property>
+            <style>
+              <class name="title-1"/>
+            </style>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLabel" id="_description_label">
+            <property name="justify">center</property>
+            <property name="use-markup">True</property>
+            <style>
+              <class name="body"/>
+            </style>
+          </object>
+        </child>
       </object>
     </child>
   </object>
diff --git a/data/ui/HeaderBar.ui b/data/ui/HeaderBar.ui
index 0e57db65..7064e406 100644
--- a/data/ui/HeaderBar.ui
+++ b/data/ui/HeaderBar.ui
@@ -13,6 +13,7 @@
             <property name="valign">center</property>
             <property name="sensitive">True</property>
             <property name="icon-name">open-menu-symbolic</property>
+            <property name="primary">True</property>
             <property name="tooltip_text" translatable="yes">Menu</property>
           </object>
         </child>
diff --git a/data/ui/InitialState.ui b/data/ui/InitialState.ui
deleted file mode 100644
index 1b10fc40..00000000
--- a/data/ui/InitialState.ui
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="InitialState" id="_initial_state">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="valign">start</property>
-    <property name="orientation">vertical</property>
-    <child>
-      <object class="GtkLabel" id="_title_label">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="justify">center</property>
-        <property name="text" translatable="yes">Welcome to Music</property>
-        <style>
-          <class name="title"/>
-          <class name="large-title"/>
-        </style>
-      </object>
-    </child>
-    <child>
-      <object class="GtkLabel" id="_description_label">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="justify">center</property>
-        <property name="text" translatable="yes">The contents of your Music Folder will appear here</property>
-        <style>
-          <class name="description"/>
-          <class name="body"/>
-        </style>
-      </object>
-    </child>
-  </object>
-</interface>
diff --git a/data/ui/PlaylistDialog.ui b/data/ui/PlaylistDialog.ui
index f039604d..51e58c87 100644
--- a/data/ui/PlaylistDialog.ui
+++ b/data/ui/PlaylistDialog.ui
@@ -190,11 +190,13 @@
     <child internal-child="action_area">
       <object class="GtkBox">
         <property name="focusable">False</property>
+        <property name="visible">False</property>
       </object>
     </child>
   </template>
   <object class="GtkHeaderBar" id="_title_bar">
     <property name="focusable">False</property>
+    <property name="show_title_buttons">False</property>
     <property name="title-widget">
       <object class="GtkLabel">
         <property name="label" translatable="yes">Add to Playlist</property>
diff --git a/data/ui/SongWidget.ui b/data/ui/SongWidget.ui
index 482fd763..050f3b08 100644
--- a/data/ui/SongWidget.ui
+++ b/data/ui/SongWidget.ui
@@ -2,7 +2,6 @@
 <interface>
   <requires lib="gtk" version="4.0"/>
   <template class="SongWidget" parent="GtkListBoxRow">
-    <property name="focusable">False</property>
     <property name="selectable">False</property>
     <child>
       <object class="GtkBox" id="box1">
diff --git a/data/ui/help-overlay.ui b/data/ui/help-overlay.ui
index f7123b77..809063b7 100644
--- a/data/ui/help-overlay.ui
+++ b/data/ui/help-overlay.ui
@@ -12,7 +12,7 @@
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="title" translatable="yes" context="shortcut window">Close window</property>
-                <property name="accelerator">&lt;Primary&gt;Q</property>
+                <property name="action-name">app.quit</property>
               </object>
             </child>
             <child>
@@ -24,13 +24,13 @@
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="title" translatable="yes" context="shortcut window">Help</property>
-                <property name="accelerator">F1</property>
+                <property name="action-name">app.help</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="title" translatable="yes" context="shortcut window">Shortcuts</property>
-                <property name="accelerator">&lt;Primary&gt;question</property>
+                <property name="action-name">win.show-help-overlay</property>
               </object>
             </child>
           </object>
diff --git a/data/ui/meson.build b/data/ui/meson.build
deleted file mode 100644
index 73d1f554..00000000
--- a/data/ui/meson.build
+++ /dev/null
@@ -1,24 +0,0 @@
-# AboutDialog.ui configuration
-VCS_TAG = ''
-if get_option('profile') != 'default'
-  git = find_program('git', required : false)
-  if git.found()
-    VCS_TAG = run_command('git', 'rev-parse', '--short', 'HEAD').stdout().strip()
-  endif
-  if VCS_TAG == ''
-    VCS_TAG = '-devel'
-  else
-    VCS_TAG = '-@0@'.format(VCS_TAG)
-  endif
-endif
-about_dialog_conf = configuration_data()
-about_dialog_conf.set('PACKAGE_VERSION', '@0@@1@'.format(meson.project_version(), VCS_TAG))
-about_dialog_conf.set('PACKAGE_URL', PACKAGE_URL)
-about_dialog_conf.set('PROGRAM_NAME', 'Music' + NAME_SUFFIX)
-about_dialog_conf.set('APPID', APPLICATION_ID)
-
-about_dialog = configure_file(
-  input: 'AboutDialog.ui.in',
-  output: 'AboutDialog.ui',
-  configuration: about_dialog_conf
-)
-\ No newline at end of file
diff --git a/gnome-music.in b/gnome-music.in
index 3cc186f0..7f69c1b0 100755
--- a/gnome-music.in
+++ b/gnome-music.in
@@ -51,7 +51,7 @@ Adw.init()
 
 LOCALE_DIR = '@localedir@'
 PKGDATA_DIR = '@pkgdatadir@'
-
+VERSION = '@version@'
 
 def set_exception_hook():
     """Configures sys.excepthook to enforce Gtk application exiting."""
@@ -92,7 +92,7 @@ def run_application():
     """Runs GNOME Music application and returns its exit code."""
     from gnomemusic.application import Application
 
-    app = Application('@application_id@')
+    app = Application('@application_id@', VERSION)
     signal.signal(signal.SIGINT, signal.SIG_DFL)
     return app.run(sys.argv)
 
diff --git a/gnomemusic/about.py b/gnomemusic/about.py
new file mode 100644
index 00000000..1d6a708b
--- /dev/null
+++ b/gnomemusic/about.py
@@ -0,0 +1,258 @@
+# aboutwindow.py
+#
+# Copyright 2022 Christopher Davis <christopherdavis@gnome.org>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+from gettext import gettext as _
+
+from gi.repository import Adw, Gtk
+
+
+def show_about(app_id, version, parent):
+    developers = [
+        "Abhinav Singh",
+        "Adam Blanchet",
+        "Adrian Solom",
+        "Alberto Fanjul",
+        "Alexander Mikhaylenko",
+        "Andre Klapper",
+        "Andreas Nilsson",
+        "Apostol Bakalov",
+        "Arnel A. Borja",
+        "Ashwani Singh Tanwar",
+        "Ashwin Mohan",
+        "Atharva Veer",
+        "Automeris Naranja",
+        "Benoît Legat",
+        "Bilal Elmoussaoui",
+        "Billy Barrow",
+        "Bruce Cowan",
+        "Carlos Garnacho",
+        "Carlos Soriano",
+        "Chinmay Gurjar",
+        "Christophe van den Abbeele",
+        "Christopher Davis",
+        "Clayton G. Hobbs",
+        "Divyanshu Vishwakarma",
+        "Eslam Mostafa",
+        "Elias Entrup",
+        "Erik Inkinen",
+        "Evan Nehring",
+        "Evandro Giovanini",
+        "Ezike Ebuka",
+        "Fabiano Fidêncio",
+        "Felipe Borges",
+        "Florian Darfeuille",
+        "Gaurav Narula",
+        "Georges Basile Stavracas Neto",
+        "Guillaume Quintard",
+        "Gyanesh Malhotra",
+        "Harry Xie",
+        "Hugo Posnic",
+        "Ishaan Shah",
+        "Islam Bahnasy",
+        "Jakub Steiner",
+        "James A. Baker",
+        "Jan Alexander Steffens",
+        "Janne Körkkö",
+        "Jan-Michael Brummer",
+        "Jean Felder",
+        "Jeremy Bicha",
+        "Jesus Bermudez Velazquez",
+        "Jordan Petridis",
+        "Juan José González",
+        "Juan Suarez",
+        "Kainaat Singh",
+        "Kalev Lember",
+        "Kevin Haller",
+        "Konstantin Pospelov",
+        "Koushik Sahu",
+        "Lucy Coleclough",
+        "Marinus Schraal",
+        "Michael Catanzaro",
+        "Mohanna Datta Yelugoti",
+        "Nick Richards",
+        "Niels De Graef",
+        "Nikolay Yanchuk",
+        "Nils Reuße",
+        "Pablo Palácios",
+        "Phil Dawson",
+        "Piotr Drąg",
+        "Prashant Tyagi",
+        "Rafael Coelho",
+        "Rashi Sah",
+        "Rasmus Thomsen",
+        "Reuben Dsouza",
+        "Robert Greener",
+        "Sabri Ünal",
+        "Sagar Lakhani",
+        "Sai Suman Prayaga",
+        "Sam Hewitt",
+        "Sam Thursfield",
+        "Sambhav Kothari",
+        "Seif Lotfy",
+        "Shivani Poddar",
+        "Shivansh Handa",
+        "Simon McVittie",
+        "Sophie Herold",
+        "Subhadip Jana",
+        "Sumaid Syed",
+        "Suyash Garg",
+        "Tapasweni Pathak",
+        "Taylor Garcia",
+        "Tjipke van der Heide",
+        "Vadim Rutkovsky",
+        "Veerasamy Sevagen",
+        "Vineet Reddy",
+        "Weifang Lai",
+        "Yann Delaby",
+        "Yash Singh",
+        "Yosef Or Boczko"
+    ]
+
+    designers = [
+        "Allan Day",
+        "Jakub Steiner",
+        "William Jon McCann"
+    ]
+
+    translators = [
+        "Adolfo Jayme Barrientos",
+        "அருள்ராஜன் அ லை",
+        "A S Alam",
+        "Alain Lojewski",
+        "Alan Mortensen",
+        "Aleksandr Melman",
+        "Alexander Shopov",
+        "Alexandre Franke",
+        "Alexey Rubtsov",
+        "Anders Jonsson",
+        "Andika Triwidada",
+        "Anish Sheela",
+        "Arash Mousavi",
+        "Asier Sarasua Garmendia",
+        "Ask Hjorth Larsen",
+        "Aurimas Černius",
+        "Balázs Meskó",
+        "Balázs Úr",
+        "Baurzhan Muftakhidinov",
+        "Bruce Cowan",
+        "Boyuan Yang",
+        "Carmen Bianca Bakker",
+        "Cédric Valmary",
+        "Chao-Hsiung Liao",
+        "Charles Monzat",
+        "Cheng Lu",
+        "Cheng-Chia Tseng",
+        "Claude Paroz",
+        "Danial Behzadi",
+        "Daniel Korostil",
+        "Daniel Mustieles García",
+        "Daniel Șerbănescu",
+        "David King",
+        "Dušan Kazik",
+        "Efstathios Iosifidis",
+        "Emin Tufan Çetin",
+        "Enrico Nicoletto",
+        "Fábio Nogueira",
+        "Fabio Tomat",
+        "Florentina Mușat",
+        "Fran Diéguez",
+        "Furkan Tokaç",
+        "Gábor Kelemen",
+        "Gil Forcada Codinachs",
+        "Goran Vidović",
+        "Guillaume Bernard",
+        "Henrique Machado Campos",
+        "Hugo Carvalho",
+        "Inaki Larranaga Murgoitio",
+        "Jiri Grönroos",
+        "Joe Hansen",
+        "Jor Teron",
+        "Jordi Mas",
+        "Juliano Camargo",
+        "Julien Humbert",
+        "Justin van Steijn",
+        "Kjartan Maraas",
+        "Kristjan Schmidt",
+        "Kukuh Syafaat",
+        "Leônidas Araújo",
+        "Luna Jernberg",
+        "Марко Костић",
+        "Marek Černocký",
+        "Mario Blättermann",
+        "Matej Urbančič",
+        "Matheus Barbosa",
+        "Milo Casagrande",
+        "Mingcong Bai",
+        "Mpho Jele",
+        "Мирослав Николић",
+        "Милош Поповић",
+        "Nart Tlisha",
+        "Nathan Follens",
+        "Osman Karagöz",
+        "Pawan Chitrakar",
+        "Petr Kovář",
+        "Philipp Kiemle",
+        "Piotr Drąg",
+        "Quentin Pagès",
+        "Rafael Fontenelle",
+        "Rodrigo Lledó Milanca",
+        "Rūdolfs Mazurs",
+        "Ryuta Fujii",
+        "Rūdolfs Mazurs",
+        "Sabri Ünal",
+        "Sebastian Rasmussen",
+        "Seong-ho Cho",
+        "Stas Solovey",
+        "Sveinn í Felli",
+        "Tiago Santos",
+        "Tim Sabsch",
+        "Tjipke van der Heide",
+        "Tom Tryfonidis",
+        "Trần Ngọc Quân",
+        "Vasil Pupkin",
+        "Vinzenz Vietzke",
+        "Xavi Ivars",
+        "Yaron Shahrabani",
+        "Yi-Jyun Pan",
+        "Yosef Or Boczko",
+        "Yuras Shumovich",
+        "Yuri Chornoivan",
+        "Yuri Myasoedov",
+        "Zander Brown",
+        "Zmicer Turok",
+        "Zurab Kargareteli"
+    ]
+
+    about = Adw.AboutWindow(
+        application_name=_("Music"),
+        application_icon=app_id,
+        developer_name=_("The GNOME Project"),
+        transient_for=parent,
+        developers=developers,
+        designers=designers,
+        translator_credits=_("translator-credits"),
+        version=version,
+        website="https://wiki.gnome.org/Apps/Music",
+        issue_url="https://gitlab.gnome.org/GNOME/gnome-music/-/issues/new",
+        copyright=_("Copyright The GNOME Music Developers"),
+        license_type=Gtk.License.GPL_2_0)
+
+    about.add_credit_section(_("Translated by"), translators)
+
+    about.present()
diff --git a/gnomemusic/application.py b/gnomemusic/application.py
index 30ba7606..dc6cbe18 100644
--- a/gnomemusic/application.py
+++ b/gnomemusic/application.py
@@ -35,6 +35,7 @@ from gettext import gettext as _
 
 from gi.repository import Adw, Gtk, Gio, GLib, Gdk, GObject
 
+from gnomemusic.about import show_about
 from gnomemusic.coregrilo import CoreGrilo
 from gnomemusic.coremodel import CoreModel
 from gnomemusic.coreselection import CoreSelection
@@ -46,14 +47,13 @@ from gnomemusic.pauseonsuspend import PauseOnSuspend
 from gnomemusic.player import Player
 from gnomemusic.scrobbler import LastFmScrobbler
 from gnomemusic.search import Search
-from gnomemusic.widgets.aboutdialog import AboutDialog
 from gnomemusic.widgets.lastfmdialog import LastfmDialog
 from gnomemusic.window import Window
 
 
 class Application(Adw.Application):
 
-    def __init__(self, application_id):
+    def __init__(self, application_id, version):
         super().__init__(
             application_id=application_id,
             flags=Gio.ApplicationFlags.FLAGS_NONE)
@@ -62,6 +62,7 @@ class Application(Adw.Application):
         GLib.set_prgname(application_id)
         GLib.setenv("PULSE_PROP_media.role", "music", True)
 
+        self._version = version
         self._window = None
 
         self._log = MusicLogger()
@@ -225,9 +226,7 @@ class Application(Adw.Application):
         self._lastfm_dialog.present()
 
     def _about(self, action, param):
-        about = AboutDialog()
-        about.props.transient_for = self._window
-        about.present()
+        show_about(self.props.application_id, self._version, self._window)
 
     def do_startup(self):
         Adw.Application.do_startup(self)
diff --git a/gnomemusic/corealbum.py b/gnomemusic/corealbum.py
index af3a1198..dca42dc8 100644
--- a/gnomemusic/corealbum.py
+++ b/gnomemusic/corealbum.py
@@ -45,7 +45,7 @@ class CoreAlbum(GObject.GObject):
     media = GObject.Property(type=Grl.Media)
     title = GObject.Property(type=str)
     url = GObject.Property(type=str)
-    year = GObject.Property(type=str, default="----")
+    year = GObject.Property(type=str, default=None)
 
     def __init__(self, application, media):
         """Initiate the CoreAlbum object
diff --git a/gnomemusic/grilowrappers/grltrackerwrapper.py b/gnomemusic/grilowrappers/grltrackerwrapper.py
index 680ba409..2831b977 100644
--- a/gnomemusic/grilowrappers/grltrackerwrapper.py
+++ b/gnomemusic/grilowrappers/grltrackerwrapper.py
@@ -414,9 +414,8 @@ class GrlTrackerWrapper(GObject.GObject):
 
         :param list ids: List of Media ids to filter by or None
         """
-        if ids is None:
-            songs_filter = ""
-        else:
+        songs_filter = ""
+        if ids is not None:
             media_ids = ", ".join([f"<{media_id}>" for media_id in ids])
             songs_filter = f"FILTER ( ?song in ( {media_ids} ) )"
 
@@ -710,7 +709,7 @@ class GrlTrackerWrapper(GObject.GObject):
             'location_filter': self._tracker_wrapper.location_filter()
         }
 
-        albums: List[Grl.Media] = []
+        albums: List[str] = []
 
         def query_cb(
                 source: Grl.Source, op_id: int, media: Optional[Grl.Media],
@@ -727,15 +726,10 @@ class GrlTrackerWrapper(GObject.GObject):
                 self._notificationmanager.pop_loading()
                 return
 
-            albums.append(media)
-
-        def albums_filter(
-                corealbum: CoreAlbum, albums: List[Grl.Media]) -> bool:
-            for media in albums:
-                if media.get_id() == corealbum.props.media.get_id():
-                    return True
+            albums.append(media.get_id())
 
-            return False
+        def albums_filter(corealbum: CoreAlbum, albums: List[str]) -> bool:
+            return corealbum.props.media.get_id() in albums
 
         self.props.source.query(
             query, [Grl.METADATA_KEY_TITLE], self._fast_options, query_cb)
@@ -871,7 +865,7 @@ class GrlTrackerWrapper(GObject.GObject):
             Grl.METADATA_KEY_URL
         ]
 
-        disc_song_ids: List[int] = []
+        disc_song_ids: List[str] = []
 
         def _filter_func(coresong: CoreSong) -> bool:
             return coresong.props.grlid in disc_song_ids
diff --git a/gnomemusic/mediaartloader.py b/gnomemusic/mediaartloader.py
index a5aca0f9..3b622e8a 100644
--- a/gnomemusic/mediaartloader.py
+++ b/gnomemusic/mediaartloader.py
@@ -23,9 +23,9 @@
 # delete this exception statement from your version.
 
 from __future__ import annotations
-from typing import Any
+from typing import Optional
 
-from gi.repository import Gdk, GdkPixbuf, Gio, GLib, GObject
+from gi.repository import Gdk, Gio, GLib, GObject
 
 from gnomemusic.musiclogger import MusicLogger
 
@@ -42,6 +42,7 @@ class MediaArtLoader(GObject.GObject):
         "finished": (GObject.SignalFlags.RUN_FIRST, None, (object, ))
     }
 
+    _chunksize = 32768
     _log = MusicLogger()
 
     def __init__(self) -> None:
@@ -49,7 +50,8 @@ class MediaArtLoader(GObject.GObject):
         """
         super().__init__()
 
-        self._texture: Gdk.Texture
+        self._bytearray = bytearray()
+        self._texture: Optional[Gdk.Texture] = None
 
     def start(self, uri: str) -> None:
         """Start the cache query
@@ -57,41 +59,54 @@ class MediaArtLoader(GObject.GObject):
         :param str uri: The MediaArt uri
         """
         thumb_file = Gio.File.new_for_uri(uri)
-
         if thumb_file:
             thumb_file.read_async(
-                GLib.PRIORITY_DEFAULT_IDLE, None, self._open_stream, None)
+                GLib.PRIORITY_DEFAULT_IDLE, None, self._open_stream)
         else:
-            self.emit("finished", None)
+            self.emit("finished", self._texture)
 
     def _open_stream(
-            self, thumb_file: Gio.File, result: Gio.AsyncResult,
-            arguments: Any) -> None:
+            self, thumb_file: Gio.File, result: Gio.AsyncResult) -> None:
         try:
             stream = thumb_file.read_finish(result)
         except GLib.Error as error:
             self._log.warning(
                 "Error: {}, {}".format(error.domain, error.message))
-            self.emit("finished", None)
-            return
-
-        GdkPixbuf.Pixbuf.new_from_stream_async(
-            stream, None, self._pixbuf_loaded)
+            self.emit("finished", self._texture)
+        else:
+            stream.read_bytes_async(
+                self._chunksize, GLib.PRIORITY_DEFAULT_IDLE, None,
+                self._read_bytes_async_cb)
 
-    def _pixbuf_loaded(
-            self, stream: Gio.InputStream, result: Gio.AsyncResult) -> None:
+    def _read_bytes_async_cb(
+            self, stream: Gio.FileInputStream,
+            result: Gio.AsyncResult) -> None:
         try:
-            pixbuf = GdkPixbuf.Pixbuf.new_from_stream_finish(result)
+            gbytes = stream.read_bytes_finish(result)
         except GLib.Error as error:
             self._log.warning(
                 "Error: {}, {}".format(error.domain, error.message))
-            self.emit("finished", None)
+            stream.close_async(
+                GLib.PRIORITY_DEFAULT_IDLE, None, self._close_stream)
             return
 
-        self._texture = Gdk.Texture.new_for_pixbuf(pixbuf)
+        gbytes_size = gbytes.get_size()
+        if gbytes_size > 0:
+            self._bytearray += gbytes.unref_to_data()
+
+            stream.read_bytes_async(
+                self._chunksize, GLib.PRIORITY_DEFAULT_IDLE, None,
+                self._read_bytes_async_cb)
+        else:
+            # FIXME: Use GTask to load textures async.
+            # See pygobject#114 for bytes conversion.
+            self._texture = Gdk.Texture.new_from_bytes(
+                GLib.Bytes(bytes(self._bytearray)))
+
+            self._bytearray = bytearray()
 
-        stream.close_async(
-            GLib.PRIORITY_DEFAULT_IDLE, None, self._close_stream)
+            stream.close_async(
+                GLib.PRIORITY_DEFAULT_IDLE, None, self._close_stream)
 
     def _close_stream(
             self, stream: Gio.InputStream, result: Gio.AsyncResult) -> None:
diff --git a/gnomemusic/player.py b/gnomemusic/player.py
index c0c2fa96..da7d0cff 100644
--- a/gnomemusic/player.py
+++ b/gnomemusic/player.py
@@ -41,10 +41,10 @@ class RepeatMode(Enum):
     """Enum for player repeat mode"""
 
     # Translators: "shuffle" causes tracks to play in random order.
-    SHUFFLE = 0, "media-playlist-shuffle-symbolic", _("Shuffle")
+    NONE = 0, "media-playlist-consecutive-symbolic", _("Shuffle/Repeat Off")
     SONG = 1, "media-playlist-repeat-song-symbolic", _("Repeat Song")
     ALL = 2, "media-playlist-repeat-symbolic", _("Repeat All")
-    NONE = 3, "media-playlist-consecutive-symbolic", _("Shuffle/Repeat Off")
+    SHUFFLE = 3, "media-playlist-shuffle-symbolic", _("Shuffle")
 
     # The type checking is necessary to avoid false positives
     # See: https://github.com/python/mypy/issues/1021
@@ -592,11 +592,6 @@ class Player(GObject.GObject):
             if (percentage > 0.5
                     and self._new_clock):
                 self._new_clock = False
-                # FIXME: we should not need to update smart
-                # playlists here but removing it may introduce
-                # a bug. So, we keep it for the time being.
-                # FIXME: Not using Playlist class anymore.
-                # playlists.update_all_smart_playlists()
                 current_song.bump_play_count()
                 current_song.set_last_played()
 
diff --git a/gnomemusic/scrobbler.py b/gnomemusic/scrobbler.py
index aed95156..8025d590 100644
--- a/gnomemusic/scrobbler.py
+++ b/gnomemusic/scrobbler.py
@@ -22,12 +22,14 @@
 # code, but you are not obligated to do so.  If you do not wish to do so,
 # delete this exception statement from your version.
 
+from __future__ import annotations
+from typing import Dict, Optional, Union, cast
 from enum import IntEnum
 from hashlib import md5
 
 import gi
 gi.require_version('Goa', '1.0')
-gi.require_version('Soup', '2.4')
+gi.require_version("Soup", "3.0")
 from gi.repository import Gio, GLib, Goa, GObject, Soup
 
 from gnomemusic.musiclogger import MusicLogger
@@ -51,12 +53,14 @@ class GoaLastFM(GObject.GObject):
         DISABLED = 2
         ENABLED = 3
 
-    def __init__(self):
+    def __init__(self) -> None:
+        """Initialize GoaLastFM
+        """
         super().__init__()
-
         self._log = MusicLogger()
 
-        self._client = None
+        self._client: Optional[Goa.Client] = None
+        self._connection: Optional[Gio.DBusConnection] = None
         self._state = GoaLastFM.State.NOT_AVAILABLE
         self.notify("state")
         self._reset_attributes()
@@ -180,35 +184,37 @@ class GoaLastFM(GObject.GObject):
                     e.message))
             return None
 
-    def configure(self):
+    def configure(self) -> None:
+        """Open the LastFM GOA Settings panel"""
         if self.props.state == GoaLastFM.State.NOT_AVAILABLE:
             self._log.warning("Error, cannot configure a Last.fm account.")
             return
 
-        Gio.bus_get(Gio.BusType.SESSION, None, self._get_connection_db, None)
+        Gio.bus_get(Gio.BusType.SESSION, None, self._get_dbus_connection)
 
-    def _get_connection_db(self, source, res, user_data=None):
+    def _get_dbus_connection(
+            self, source: None, result: Gio.AsyncResult) -> None:
         try:
-            connection = Gio.bus_get_finish(res)
+            self._connection = Gio.bus_get_finish(result)
         except GLib.Error as e:
             self._log.warning(
                 "Error: Unable to get the DBus connection: {}".format(
                     e.message))
             return
 
-        Gio.DBusProxy.new(
-            connection, Gio.DBusProxyFlags.NONE, None,
-            "org.gnome.ControlCenter", "/org/gnome/ControlCenter",
-            "org.gtk.Actions", None, self._get_control_center_proxy_cb, None)
-
-    def _get_control_center_proxy_cb(self, source, res, user_data=None):
         try:
-            settings_proxy = Gio.DBusProxy.new_finish(res)
+            proxy = Gio.DBusProxy.new_sync(
+                self._connection, Gio.DBusProxyFlags.DO_NOT_CONNECT_SIGNALS
+                | Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES, None,
+                "org.gnome.Settings", "/org/gnome/Settings", "org.gtk.Actions",
+                None)
         except GLib.Error as e:
-            self._log.warning(
-                "Error: Unable to get a proxy: {}".format(e.message))
-            return
+            self._log.warning(f"Unable to create proxy: {e.message}")
+        else:
+            self._activate_settings(proxy, True)
 
+    def _activate_settings(
+            self, settings_proxy: Gio.DBusProxy, try_fallback: bool) -> None:
         if self._state == GoaLastFM.State.NOT_CONFIGURED:
             params = [GLib.Variant("s", "add"), GLib.Variant("s", "lastfm")]
         else:
@@ -218,15 +224,24 @@ class GoaLastFM(GObject.GObject):
         variant = GLib.Variant("(sava{sv})", ("launch-panel", [args], {}))
         settings_proxy.call(
             "Activate", variant, Gio.DBusCallFlags.NONE, -1, None,
-            self._on_control_center_activated)
+            self._on_settings_activated, try_fallback)
 
-    def _on_control_center_activated(self, proxy, res, user_data=None):
+    def _on_settings_activated(
+            self, proxy: Gio.DBusProxy, result: Gio.AsyncResult,
+            try_fallback: bool) -> None:
         try:
-            proxy.call_finish(res)
+            proxy.call_finish(result)
         except GLib.Error as e:
-            self._log.warning(
-                "Error: Failed to activate control-center: {}".format(
-                    e.message))
+            if try_fallback:
+                proxy = Gio.DBusProxy.new_sync(
+                    self._connection, Gio.DBusProxyFlags.DO_NOT_CONNECT_SIGNALS
+                    | Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES, None,
+                    "org.gnome.ControlCenter", "/org/gnome/ControlCenter",
+                    "org.gtk.Actions", None)
+                self._activate_settings(proxy, False)
+            else:
+                self._log.warning(
+                    f"Error: Failed to activate Settings: {e.message}")
 
 
 class LastFmScrobbler(GObject.GObject):
@@ -404,13 +419,24 @@ class LastFmScrobbler(GObject.GObject):
             "api_sig": api_sig
         })
 
-        msg = Soup.form_request_new_from_hash(
-            "POST", "https://ws.audioscrobbler.com/2.0/", request_dict)
-        self._soup_session.queue_message(
-            msg, self._lastfm_api_callback, request_type_key)
+        msg = Soup.Message.new_from_encoded_form(
+            "POST", "https://ws.audioscrobbler.com/2.0/",
+            Soup.form_encode_hash(request_dict))
+        data = {
+            "msg": msg,
+            "request_type_key": request_type_key,
+        }
+        self._soup_session.send_async(
+            msg, GLib.PRIORITY_DEFAULT, None, self._lastfm_api_callback, data)
+
+    def _lastfm_api_callback(
+            self, session: Soup.Session,
+            result: Gio.AsyncResult,
+            data: Dict[str, Union[str, Soup.Message]]) -> None:
+        """Internal callback method called by queue_message"""
+        msg = cast(Soup.Message, data["msg"])
+        request_type_key = cast(str, data["request_type_key"])
 
-    def _lastfm_api_callback(self, session, msg, request_type_key):
-        """Internall callback method called by queue_message"""
         status_code = msg.props.status_code
         if status_code != 200:
             self._log.debug("Failed to {} track {} : {}".format(
diff --git a/gnomemusic/storeart.py b/gnomemusic/storeart.py
index fe292f69..ffee7abd 100644
--- a/gnomemusic/storeart.py
+++ b/gnomemusic/storeart.py
@@ -23,7 +23,7 @@
 # delete this exception statement from your version.
 
 import gi
-gi.require_versions({"MediaArt": "2.0", "Soup": "2.4"})
+gi.require_versions({"MediaArt": "2.0", "Soup": "3.0"})
 from gi.repository import Gio, GLib, GObject, MediaArt, Soup, GdkPixbuf
 
 from gnomemusic.musiclogger import MusicLogger
@@ -99,18 +99,19 @@ class StoreArt(GObject.Object):
                 return
 
         msg = Soup.Message.new("GET", uri)
-        self._soup_session.queue_message(msg, self._read_callback, None)
+        self._soup_session.send_and_read_async(
+            msg, GLib.PRIORITY_DEFAULT, None, self._read_callback)
 
-    def _read_callback(self, src, result, data):
-        if result.props.status_code != 200:
+    def _read_callback(
+            self, session: Soup.Session, result: Gio.AsyncResult) -> None:
+        try:
+            bytes = session.send_and_read_finish(result)
+        except GLib.Error as error:
             self._log.debug(
-                "Failed to get remote art: {}".format(
-                    result.props.reason_phrase))
+                f"Failed to get remote art: {error.domain}, {error.message}")
             self.emit("finished")
-            return
 
-        istream = Gio.MemoryInputStream.new_from_bytes(
-            result.props.response_body_data)
+        istream = Gio.MemoryInputStream.new_from_bytes(bytes)
         GdkPixbuf.Pixbuf.new_from_stream_async(
             istream, None, self._pixbuf_from_stream_finished)
 
diff --git a/gnomemusic/trackerwrapper.py b/gnomemusic/trackerwrapper.py
index 7a4faf86..3ab69c2c 100644
--- a/gnomemusic/trackerwrapper.py
+++ b/gnomemusic/trackerwrapper.py
@@ -21,12 +21,19 @@
 # code, but you are not obligated to do so.  If you do not wish to do so,
 # delete this exception statement from your version.
 
+from __future__ import annotations
 import os
-
+import typing
 from enum import IntEnum
+from typing import Optional
 
 from gi.repository import Gio, GLib, GObject, Tracker
 
+if typing.TYPE_CHECKING:
+    from gi.repository import Grl
+
+    from gnomemusic.application import Application
+
 
 class TrackerState(IntEnum):
     """Tracker Status
@@ -38,7 +45,7 @@ class TrackerState(IntEnum):
 
 class TrackerWrapper(GObject.GObject):
 
-    def __init__(self, application):
+    def __init__(self, application: Application) -> None:
         """Create a connection to an instance of Tracker
 
         :param Application application: The application object
@@ -48,18 +55,18 @@ class TrackerWrapper(GObject.GObject):
         self._log = application.props.log
         self._application_id = application.props.application_id
 
-        self._local_db = None
+        self._local_db: Tracker.SparqlConnection = None
         self._local_db_available = TrackerState.UNAVAILABLE
 
-        self._miner_fs = None
-        self._miner_fs_busname = None
+        self._miner_fs: Tracker.SparqlConnection = None
+        self._miner_fs_busname = ""
         self._miner_fs_available = TrackerState.UNAVAILABLE
 
         self._setup_local_db()
         self._setup_host_miner_fs()
 
     @staticmethod
-    def _in_flatpak():
+    def _in_flatpak() -> bool:
         """Indicates if Music is running as flatpak
 
         :returns: True if running as flatpak.
@@ -67,7 +74,7 @@ class TrackerWrapper(GObject.GObject):
         """
         return os.path.exists("/.flatpak-info")
 
-    def _setup_host_miner_fs(self):
+    def _setup_host_miner_fs(self) -> None:
         self._miner_fs_busname = "org.freedesktop.Tracker3.Miner.Files"
 
         self._log.debug(
@@ -87,10 +94,10 @@ class TrackerWrapper(GObject.GObject):
             if self._in_flatpak():
                 self._setup_local_miner_fs()
             else:
-                self._miner_fs_busname = None
+                self._miner_fs_busname = ""
                 self.notify("tracker-available")
 
-    def _setup_local_miner_fs(self):
+    def _setup_local_miner_fs(self) -> None:
         self._miner_fs_busname = self._application_id + ".Tracker3.Miner.Files"
         self._log.debug(
             "Connecting to bundled Tracker indexer at {}".format(
@@ -114,7 +121,8 @@ class TrackerWrapper(GObject.GObject):
             Gio.DBusCallFlags.NONE, miner_fs_startup_timeout_msec, None,
             self._setup_local_miner_fs_ping_cb)
 
-    def _setup_local_miner_fs_ping_cb(self, klass, result):
+    def _setup_local_miner_fs_ping_cb(
+            self, klass: Gio.DBusProxy, result: Gio.AsyncResult) -> None:
         try:
             klass.call_finish(result)
             self._log.info("Using bundled tracker-miner-fs-3")
@@ -126,10 +134,10 @@ class TrackerWrapper(GObject.GObject):
             self._log.warning(
                 "Could not start local Tracker miner-fs at {}: {}".format(
                     self._miner_fs_busname, error))
-            self._miner_fs_busname = None
+            self._miner_fs_busname = ""
             self.notify("tracker-available")
 
-    def _setup_local_db(self):
+    def _setup_local_db(self) -> None:
         # Open a local Tracker database.
         try:
             self._local_db = Tracker.SparqlConnection.new(
@@ -149,7 +157,7 @@ class TrackerWrapper(GObject.GObject):
         self._local_db_available = TrackerState.AVAILABLE
         self.notify("tracker-available")
 
-    def cache_directory(self):
+    def cache_directory(self) -> str:
         """Get directory which contains Music private data.
 
         :returns: private store path
@@ -160,17 +168,17 @@ class TrackerWrapper(GObject.GObject):
             [GLib.get_user_cache_dir(), "gnome-music", "db"])
 
     @GObject.Property(type=str, flags=GObject.ParamFlags.READABLE)
-    def miner_fs_busname(self):
+    def miner_fs_busname(self) -> str:
         return self._miner_fs_busname
 
     @GObject.Property(type=object, flags=GObject.ParamFlags.READABLE)
-    def local_db(self):
+    def local_db(self) -> Tracker.SparqlConnection:
         return self._local_db
 
     @GObject.Property(
         type=int, default=TrackerState.UNAVAILABLE,
         flags=GObject.ParamFlags.READABLE)
-    def tracker_available(self):
+    def tracker_available(self) -> TrackerState:
         """Get Tracker availability.
 
         :returns: tracker availability
@@ -185,7 +193,7 @@ class TrackerWrapper(GObject.GObject):
         else:
             return TrackerState.UNAVAILABLE
 
-    def location_filter(self):
+    def location_filter(self) -> Optional[str]:
         try:
             music_dir = GLib.get_user_special_dir(
                 GLib.UserDirectory.DIRECTORY_MUSIC)
@@ -202,7 +210,7 @@ class TrackerWrapper(GObject.GObject):
 
         return query
 
-    def _update_favorite(self, media):
+    def _update_favorite(self, media: Grl.Media) -> None:
         """Update favorite state of a song
 
         :param Grl.Media media: media which contains updated favorite state
@@ -234,7 +242,7 @@ class TrackerWrapper(GObject.GObject):
 
         self._local_db.update_async(update, None, _update_favorite_cb)
 
-    def _update_play_count(self, media):
+    def _update_play_count(self, media: Grl.Media) -> None:
         update = """
         DELETE WHERE {
             <%(urn)s> nie:usageCounter ?count .
@@ -257,7 +265,7 @@ class TrackerWrapper(GObject.GObject):
 
         self._local_db.update_async(update, None, _update_play_count_cb)
 
-    def _update_last_played(self, media):
+    def _update_last_played(self, media: Grl.Media) -> None:
         last_played = media.get_last_played().format_iso8601()
         update = """
         DELETE WHERE {
@@ -281,7 +289,7 @@ class TrackerWrapper(GObject.GObject):
 
         self._local_db.update_async(update, None, _update_last_played_cb)
 
-    def update_tag(self, media, tag):
+    def update_tag(self, media: Grl.Media, tag: str) -> None:
         """Update property of a resource.
 
         :param Grl.Media media: media which contains updated tag
diff --git a/gnomemusic/utils.py b/gnomemusic/utils.py
index fd88be29..208f8707 100644
--- a/gnomemusic/utils.py
+++ b/gnomemusic/utils.py
@@ -23,7 +23,7 @@
 # delete this exception statement from your version.
 
 from enum import Enum, IntEnum
-from typing import List
+from typing import List, Union
 import re
 import unicodedata
 
@@ -150,13 +150,13 @@ def get_media_year(item):
     """Returns the year when the media was published.
 
     :param Grl.Media item: A Grilo Media object
-    :return: The publication year or '----' if not defined
-    :rtype: str
+    :return: The publication year or None if not defined
+    :rtype: str or None
     """
     date = item.get_publication_date()
 
     if not date:
-        return "----"
+        return None
 
     return str(date.get_year())
 
@@ -199,7 +199,7 @@ def natural_sort_names(name_a: str, name_b: str) -> int:
     :returns: Gtk Ordering
     :rtype: int
     """
-    def _extract_numbers(text: str) -> List[str]:
+    def _extract_numbers(text: str) -> List[Union[int, str]]:
         return [int(tmp) if tmp.isdigit() else tmp
                 for tmp in re.split(r"(\d+)", normalize_caseless(text))]
 
diff --git a/gnomemusic/views/albumsview.py b/gnomemusic/views/albumsview.py
index f0bbc805..44123267 100644
--- a/gnomemusic/views/albumsview.py
+++ b/gnomemusic/views/albumsview.py
@@ -70,7 +70,7 @@ class AlbumsView(Gtk.Stack):
 
         self._application = application
         self._window = application.props.window
-        self._headerbar = self._window._headerbar
+        self._headerbar = self._window.props.headerbar
 
         self._list_item_bindings: Dict[
             Gtk.ListItem, List[GObject.Binding]] = {}
diff --git a/gnomemusic/views/searchview.py b/gnomemusic/views/searchview.py
index 617e3940..cd7cf3f9 100644
--- a/gnomemusic/views/searchview.py
+++ b/gnomemusic/views/searchview.py
@@ -97,7 +97,7 @@ class SearchView(Gtk.Stack):
         self._model = self._coremodel.props.songs_search
         self._player = self._application.props.player
         self._window = application.props.window
-        self._headerbar = self._window._headerbar
+        self._headerbar = self._window.props.headerbar
 
         self._album_model = self._coremodel.props.albums_search
         self._artist_model = self._coremodel.props.artists_search
diff --git a/gnomemusic/views/songsview.py b/gnomemusic/views/songsview.py
index c6521660..3de6b3d9 100644
--- a/gnomemusic/views/songsview.py
+++ b/gnomemusic/views/songsview.py
@@ -110,7 +110,12 @@ class SongsView(Gtk.Box):
             list_item: Gtk.ListItem) -> None:
         builder = Gtk.Builder.new_from_resource(
             "/org/gnome/Music/ui/SongListItem.ui")
-        list_item.props.child = builder.get_object("_song_box")
+        song_box = builder.get_object("_song_box")
+        list_item.props.child = song_box
+
+        menu_button = builder.get_object("_menu_button")
+        song_menu = SongWidgetMenu(self._application, song_box, None)
+        menu_button.props.popover = song_menu
 
         self.bind_property(
             "selection-mode", list_item, "selectable",
@@ -161,8 +166,8 @@ class SongsView(Gtk.Box):
         star_hover.connect("leave", _on_star_leave)
         star_image.add_controller(star_hover)
 
-        menu_button.props.popover = SongWidgetMenu(
-            self._application, list_row, coresong)
+        song_menu = menu_button.props.popover
+        song_menu.props.coreobject = coresong
 
         b1 = coresong.bind_property(
             "title", title_label, "label", GObject.BindingFlags.SYNC_CREATE)
diff --git a/gnomemusic/widgets/albumwidget.py b/gnomemusic/widgets/albumwidget.py
index 9e34ce8f..0a91ab9a 100644
--- a/gnomemusic/widgets/albumwidget.py
+++ b/gnomemusic/widgets/albumwidget.py
@@ -245,7 +245,7 @@ class AlbumWidget(Adw.Bin):
         mins_text = ngettext("{} minute", "{} minutes", mins).format(mins)
         year = self._corealbum.props.year
 
-        if year == "----":
+        if year is None:
             label = mins_text
         else:
             label = f"{year}, {mins_text}"
diff --git a/gnomemusic/widgets/headerbar.py b/gnomemusic/widgets/headerbar.py
index 68bca9bb..5efb2186 100644
--- a/gnomemusic/widgets/headerbar.py
+++ b/gnomemusic/widgets/headerbar.py
@@ -116,7 +116,7 @@ class HeaderBar(Adw.Bin):
 
         self._selection_menu = SelectionBarMenuButton()
 
-        self._menu_button.set_popover(AppMenu(application))
+        self._menu_button.props.popover = AppMenu(application)
 
         self.bind_property(
             "selection-mode", self._headerbar, "show-end-title-buttons",
diff --git a/gnomemusic/widgets/songwidgetmenu.py b/gnomemusic/widgets/songwidgetmenu.py
index 4f6bad2c..6874ea9d 100644
--- a/gnomemusic/widgets/songwidgetmenu.py
+++ b/gnomemusic/widgets/songwidgetmenu.py
@@ -23,10 +23,10 @@
 # delete this exception statement from your version.
 
 from __future__ import annotations
-from typing import Any, Optional, Union
+from typing import Any, Optional, Union, cast
 import typing
 
-from gi.repository import Gio, Gtk
+from gi.repository import Gio, GObject, Gtk
 
 from gnomemusic.grilowrappers.grltrackerplaylists import Playlist
 from gnomemusic.songtoast import SongToast
@@ -36,6 +36,7 @@ if typing.TYPE_CHECKING:
     from gnomemusic.application import Application
     from gnomemusic.corealbum import CoreAlbum
     from gnomemusic.coresong import CoreSong
+    CoreObject = Union[CoreAlbum, CoreSong, Playlist]
 
 
 @Gtk.Template(resource_path="/org/gnome/Music/ui/SongWidgetMenu.ui")
@@ -46,12 +47,12 @@ class SongWidgetMenu(Gtk.PopoverMenu):
     def __init__(
             self, application: Application,
             song_widget: Union[SongWidget, Gtk.ListItem],
-            coreobject: Union[CoreAlbum, CoreSong, Playlist]) -> None:
+            coreobject: Optional[CoreObject]) -> None:
         """Menu to interact with the song of a SongWidget.
 
         :param Application application: The application object
         :param SongWidget song_widget: The songwidget associated with the menu
-        :param Union[CoreAlbum, CoreSong, Playlist]  coreboject: The
+        :param Union[CoreAlbum, CoreSong, Playlist] coreobject: The
             coreobject associated with the menu
         """
         super().__init__()
@@ -62,12 +63,9 @@ class SongWidgetMenu(Gtk.PopoverMenu):
         self._window = application.props.window
 
         self._coreobject = coreobject
+        self._coresong: CoreSong
         self._song_widget = song_widget
-
-        if isinstance(song_widget, SongWidget):
-            self._coresong = song_widget.props.coresong
-        else:
-            self._coresong = coreobject
+        self.props.coreobject = coreobject
 
         self._playlist_dialog: Optional[PlaylistDialog] = None
 
@@ -125,4 +123,18 @@ class SongWidgetMenu(Gtk.PopoverMenu):
         self.popdown()
         position = self._song_widget.get_index()
         SongToast(
-            self._application, self._coreobject, position, self._coresong)
+            self._application, cast(Playlist, self._coreobject), position,
+            self._coresong)
+
+    @GObject.Property(type=GObject.GObject)
+    def coreobject(self) -> CoreObject:
+        return self._coreobject
+
+    @coreobject.setter  # type: ignore
+    def coreobject(self, coreobject: CoreObject) -> None:
+        self._coreobject = coreobject
+
+        if isinstance(self._song_widget, SongWidget):
+            self._coresong = self._song_widget.props.coresong
+        else:
+            self._coresong = coreobject
diff --git a/gnomemusic/window.py b/gnomemusic/window.py
index 93f1b27d..f0eb4312 100644
--- a/gnomemusic/window.py
+++ b/gnomemusic/window.py
@@ -282,6 +282,16 @@ class Window(Adw.ApplicationWindow):
 
         self.props.active_view.deselect_all()
 
+    @GObject.Property(
+        type=HeaderBar, default=None, flags=GObject.ParamFlags.READABLE)
+    def headerbar(self) -> HeaderBar:
+        """Get headerbar instance.
+
+        :returns: The headerbar
+        :rtype: HeaderBar
+        """
+        return self._headerbar
+
     @Gtk.Template.Callback()
     def _on_key_press(self, controller, keyval, keycode, state):
         modifiers = state & Gtk.accelerator_get_default_mod_mask()
diff --git a/help/ca/ca.po b/help/ca/ca.po
index 60dc747b..7ace15e6 100644
--- a/help/ca/ca.po
+++ b/help/ca/ca.po
@@ -2,9 +2,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-music master\n"
-"POT-Creation-Date: 2019-09-24 00:24+0000\n"
-"PO-Revision-Date: 2021-03-28 19:52+0000\n"
-"Last-Translator: Jaume Jorba <jaume.jorba@gmail.com>\n"
+"POT-Creation-Date: 2022-07-25 15:45+0000\n"
+"PO-Revision-Date: 2022-08-09 19:52+0000\n"
+"Last-Translator: Jordi Mas i Herǹandez <jmas@softcatala.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/softcatala/gnome-"
 "documentation-catalan/language/ca/)\n"
 "Language: ca\n"
@@ -19,7 +19,7 @@ msgid "translator-credits"
 msgstr "Jaume Jorba <jaume.jorba@gmail.com>, 2018"
 
 #. (itstool) path: credit/name
-#: C/introduction.page:11 C/index.page:11 C/play-music.page:11
+#: C/introduction.page:11 C/index.page:12 C/play-music.page:11
 #: C/playlist-create-albums.page:11 C/playlist-create-songs.page:11
 #: C/playlist-create-artists.page:11 C/playlist-delete.page:11
 #: C/playlist-remove-songs.page:11 C/playlist-repeat.page:11
@@ -28,7 +28,7 @@ msgid "Shobha Tyagi"
 msgstr "Shobha Tyagi"
 
 #. (itstool) path: credit/years
-#: C/introduction.page:13 C/index.page:13 C/play-music.page:13
+#: C/introduction.page:13 C/index.page:14 C/play-music.page:13
 #: C/playlist-create-albums.page:13 C/playlist-create-songs.page:13
 #: C/playlist-create-artists.page:13 C/playlist-delete.page:13
 #: C/playlist-remove-songs.page:13 C/playlist-repeat.page:13
@@ -43,7 +43,7 @@ msgid ""
 "A simple and elegant replacement for using <app>Files</app> to show the "
 "music directory."
 msgstr ""
-"Un senzill i elegant reemplaçament per a utilitzar el <app>Fitxers</app> per "
+"Un senzill i elegant reemplaçament del <app>Fitxers</app> com a eina per "
 "a mostrar el directori de música."
 
 #. (itstool) path: page/title
@@ -53,18 +53,24 @@ msgstr "Introducció al Música"
 
 #. (itstool) path: info/title
 #: C/index.page:6
-msgctxt "link"
+msgctxt "link:trail"
 msgid "Music"
 msgstr "Música"
 
 #. (itstool) path: info/title
 #: C/index.page:7
+msgctxt "link"
+msgid "Music"
+msgstr "Música"
+
+#. (itstool) path: info/title
+#: C/index.page:8
 msgctxt "text"
 msgid "Music"
 msgstr "Música"
 
 #. (itstool) path: page/title
-#: C/index.page:18
+#: C/index.page:19
 msgid "<_:media-1/> Music"
 msgstr "<_:media-1/> Música"
 
@@ -99,8 +105,8 @@ msgid ""
 "You can play your favorite music by creating a playlist or by simply "
 "clicking on the song of your choice from any view."
 msgstr ""
-"Podeu reproduir la vostra música preferida creant una llista de reproducció o "
-"simplement fent clic sobre la cançó escollida des de qualsevol vista."
+"Podeu reproduir la vostra música preferida creant una llista de reproducció "
+"o simplement fent clic sobre la cançó escollida des de qualsevol vista."
 
 #. (itstool) path: steps/title
 #: C/play-music.page:28 C/playlist-delete.page:27
@@ -405,7 +411,7 @@ msgstr ""
 #. (itstool) path: info/desc
 #: C/playlist-shuffle.page:18
 msgid "Shuffle songs in the playlist."
-msgstr "Barrejar les cançons a la llista de reproducció."
+msgstr "Mesclar les cançons a la llista de reproducció."
 
 #. (itstool) path: page/title
 #: C/playlist-shuffle.page:22
diff --git a/help/fr/fr.po b/help/fr/fr.po
index 68b0fc24..cdb39d6f 100644
--- a/help/fr/fr.po
+++ b/help/fr/fr.po
@@ -3,31 +3,32 @@
 # This file is distributed under the same license as the gnome-music package.
 # Alain Lojewski <allomervan@gmail.com>, 2014.
 # Julien Hardelin <jhardlin@orange.fr>, 2014.
-# Charles Monzat <superboa@hotmail.fr>, 2017.
+# Charles Monzat <charles.monzat@free.fr>, 2017-2022.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-music master\n"
-"POT-Creation-Date: 2017-03-02 18:53+0000\n"
-"PO-Revision-Date: 2017-03-02 23:11+0100\n"
-"Last-Translator: Charles Monzat <superboa@hotmail.fr>\n"
-"Language-Team: français <gnomefr@traduc.org>\n"
+"POT-Creation-Date: 2021-12-25 18:25+0000\n"
+"PO-Revision-Date: 2022-04-11 22:35+0200\n"
+"Last-Translator: Charles Monzat <charles.monzat@free.fr>\n"
+"Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Gtranslator 2.91.7\n"
+"X-Generator: Gtranslator 40.0\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
 msgid "translator-credits"
 msgstr ""
 "Alain Lojewski <allomervan@gmail.com>, 2014\n"
-"Julien Hardelin <jhardlin@orange.fr>, 2014."
+"Julien Hardelin <jhardlin@orange.fr>, 2014\n"
+"Charles Monzat <charles.monzat@free.fr>, 2017-2022"
 
 #. (itstool) path: credit/name
-#: C/introduction.page:11 C/index.page:11 C/play-music.page:11
+#: C/introduction.page:11 C/index.page:12 C/play-music.page:11
 #: C/playlist-create-albums.page:11 C/playlist-create-songs.page:11
 #: C/playlist-create-artists.page:11 C/playlist-delete.page:11
 #: C/playlist-remove-songs.page:11 C/playlist-repeat.page:11
@@ -36,7 +37,7 @@ msgid "Shobha Tyagi"
 msgstr "Shobha Tyagi"
 
 #. (itstool) path: credit/years
-#: C/introduction.page:13 C/index.page:13 C/play-music.page:13
+#: C/introduction.page:13 C/index.page:14 C/play-music.page:13
 #: C/playlist-create-albums.page:13 C/playlist-create-songs.page:13
 #: C/playlist-create-artists.page:13 C/playlist-delete.page:13
 #: C/playlist-remove-songs.page:13 C/playlist-repeat.page:13
@@ -51,8 +52,8 @@ msgid ""
 "A simple and elegant replacement for using <app>Files</app> to show the "
 "music directory."
 msgstr ""
-"Une alternative simple et élégante à <app>Fichiers</app> pour l'affichage "
-"du répertoire de Musique."
+"Une alternative simple et élégante à <app>Fichiers</app> pour l’affichage du "
+"répertoire de Musique."
 
 #. (itstool) path: page/title
 #: C/introduction.page:22
@@ -61,30 +62,36 @@ msgstr "Introduction à Musique"
 
 #. (itstool) path: info/title
 #: C/index.page:6
-msgctxt "link"
+msgctxt "link:trail"
 msgid "Music"
 msgstr "Musique"
 
 #. (itstool) path: info/title
 #: C/index.page:7
+msgctxt "link"
+msgid "Music"
+msgstr "Musique"
+
+#. (itstool) path: info/title
+#: C/index.page:8
 msgctxt "text"
 msgid "Music"
 msgstr "Musique"
 
 #. (itstool) path: page/title
-#: C/index.page:18
+#: C/index.page:19
 msgid "<_:media-1/> Music"
 msgstr "<_:media-1/> Musique"
 
 #. (itstool) path: section/title
 #: C/index.page:25
 msgid "Create playlist"
-msgstr "Création d'une liste de lecture"
+msgstr "Création d’une liste de lecture"
 
 #. (itstool) path: section/title
 #: C/index.page:28
 msgid "Play a song"
-msgstr "Lecture d'un morceau"
+msgstr "Lecture d’un morceau"
 
 #. (itstool) path: section/title
 #: C/index.page:31
@@ -99,7 +106,7 @@ msgstr "Lire vos morceaux préférés."
 #. (itstool) path: page/title
 #: C/play-music.page:22
 msgid "Play music"
-msgstr "Lecture d'un morceau"
+msgstr "Lecture d’un morceau"
 
 #. (itstool) path: page/p
 #: C/play-music.page:24
@@ -108,7 +115,7 @@ msgid ""
 "clicking on the song of your choice from any view."
 msgstr ""
 "Pour lire votre musique préférée, créez une liste de lecture ou cliquez "
-"seulement sur le morceau de votre choix depuis n'importe quelle vue."
+"seulement sur le morceau de votre choix depuis n’importe quelle vue."
 
 #. (itstool) path: steps/title
 #: C/play-music.page:28 C/playlist-delete.page:27
@@ -129,17 +136,17 @@ msgstr "Cliquez sur le bouton ⚙ situé à droite."
 #. (itstool) path: item/p
 #: C/play-music.page:36
 msgid "Click on <gui>Play</gui>."
-msgstr "Cliquez sur <gui>Lecture</gui>."
+msgstr "Cliquez sur <gui>Lire</gui>."
 
 #. (itstool) path: info/desc
 #: C/playlist-create-albums.page:18
 msgid "Add songs to playlists using albums."
-msgstr "Ajouter des morceaux aux listes de lecture à partir d'albums."
+msgstr "Ajouter des morceaux aux listes de lecture à partir d’albums."
 
 #. (itstool) path: page/title
 #: C/playlist-create-albums.page:21
 msgid "Create a playlist using albums"
-msgstr "Création d'une liste de lecture à partir d'un album"
+msgstr "Création d’une liste de lecture à partir d’un album"
 
 #. (itstool) path: page/p
 #: C/playlist-create-albums.page:23
@@ -153,27 +160,27 @@ msgstr ""
 #. (itstool) path: steps/title
 #: C/playlist-create-albums.page:27
 msgid "To add all the songs in an album:"
-msgstr "Pour ajouter tous les morceaux d'un album :"
+msgstr "Pour ajouter tous les morceaux d’un album :"
 
 #. (itstool) path: item/p
 #: C/playlist-create-albums.page:29 C/playlist-create-songs.page:29
 #: C/playlist-create-artists.page:30
 msgid "Click on the check button in the top-right of the window."
 msgstr ""
-"cliquez sur le bouton de vérification dans le coin supérieur droit de la "
-"fenêtre,"
+"Cliquez sur le bouton de sélection dans le coin supérieur droit de la "
+"fenêtre."
 
 #. (itstool) path: item/p
 #: C/playlist-create-albums.page:32
 msgid "Select albums."
-msgstr "sélectionnez les albums,"
+msgstr "Sélectionnez les albums."
 
 #. (itstool) path: item/p
 #: C/playlist-create-albums.page:35 C/playlist-create-albums.page:60
 #: C/playlist-create-songs.page:35 C/playlist-create-artists.page:37
 msgid "Click on the <gui style=\"button\">Add to Playlist</gui> button."
 msgstr ""
-"cliquez sur le bouton <gui style=\"button\">Ajouter à la liste de lecture</"
+"Cliquez sur le bouton <gui style=\"button\">Ajouter à la liste de lecture</"
 "gui>."
 
 #. (itstool) path: item/p
@@ -202,17 +209,17 @@ msgstr "Pour ajouter des morceaux choisis dans un album :"
 #. (itstool) path: item/p
 #: C/playlist-create-albums.page:51
 msgid "Click on an album."
-msgstr "cliquez sur l'album,"
+msgstr "Cliquez sur l’album."
 
 #. (itstool) path: item/p
 #: C/playlist-create-albums.page:54
 msgid "Click on the check button."
-msgstr "cliquez sur le bouton de vérification,"
+msgstr "Cliquez sur le bouton de sélection."
 
 #. (itstool) path: item/p
 #: C/playlist-create-albums.page:57
 msgid "Select songs."
-msgstr "sélectionnez les morceaux."
+msgstr "Sélectionnez les morceaux."
 
 #. (itstool) path: note/p
 #: C/playlist-create-albums.page:72 C/playlist-create-songs.page:47
@@ -222,9 +229,10 @@ msgid ""
 "gui><gui>Select All</gui></guiseq> in the toolbar or press "
 "<keyseq><key>Ctrl</key><key>A</key></keyseq>."
 msgstr ""
-"Pour sélectionner tous les morceaux, cliquez sur <guiseq><gui>Click on items "
-"to select them</gui><gui>Tout sélectionner</gui></guiseq> dans la barre "
-"d'outils, ou bien appuyez sur <keyseq><key>Ctrl</key><key>A</key></keyseq>."
+"Pour sélectionner tous les morceaux, cliquez sur <guiseq><gui>Cliquez sur "
+"les éléments pour les sélectionner</gui><gui>Tout sélectionner</gui></"
+"guiseq> dans la barre d’outils, ou bien appuyez sur <keyseq><key>Ctrl</"
+"key><key>A</key></keyseq>."
 
 #. (itstool) path: note/p
 #: C/playlist-create-albums.page:76 C/playlist-create-songs.page:51
@@ -233,8 +241,9 @@ msgid ""
 "To clear the selection click <guiseq><gui>Click on items to select them</"
 "gui><gui>Select None</gui></guiseq> in the toolbar."
 msgstr ""
-"Pour annuler la sélection, cliquez sur <guiseq><gui>Click on items to select "
-"them</gui><gui>Tout désélectionner</gui></guiseq> dans la barre d'outils."
+"Pour annuler la sélection, cliquez sur <guiseq><gui>Cliquez sur les éléments "
+"pour les sélectionner</gui><gui>Tout désélectionner</gui></guiseq> dans la "
+"barre d’outils."
 
 #. (itstool) path: info/desc
 #: C/playlist-create-songs.page:18
@@ -260,13 +269,13 @@ msgstr ""
 msgid "To create a new playlist while in <em>Songs</em> view:"
 msgstr ""
 "Pour créer une nouvelle liste de lecture en étant dans la fenêtre "
-"<em>morceaux</em> :"
+"<em>Morceaux</em> :"
 
 #. (itstool) path: item/p
 #: C/playlist-create-songs.page:32
 msgid "Select all the songs you want to add to the playlist."
 msgstr ""
-"sélectionnez tous les morceaux que vous voulez ajouter à la liste de lecture,"
+"Sélectionnez tous les morceaux que vous voulez ajouter à la liste de lecture."
 
 #. (itstool) path: item/p
 #: C/playlist-create-songs.page:38
@@ -274,7 +283,7 @@ msgid ""
 "Click on <gui style=\"button\">New Playlist</gui> and type a name for your "
 "playlist."
 msgstr ""
-"cliquez sur <gui style=\"button\">Nouvelle liste de lecture</gui> et donnez-"
+"Cliquez sur <gui style=\"button\">Nouvelle liste de lecture</gui> et donnez-"
 "lui un nom."
 
 #. (itstool) path: info/desc
@@ -300,14 +309,15 @@ msgstr ""
 #: C/playlist-create-artists.page:28
 msgid "To create a new playlist while in <em>Artists</em> view:"
 msgstr ""
-"Pour créer une nouvelle liste de lecture en fonction de <em>l'artiste</em> :"
+"Pour créer une nouvelle liste de lecture en étant dans la fenêtre "
+"<em>Artistes</em> :"
 
 #. (itstool) path: item/p
 #: C/playlist-create-artists.page:33
 msgid "Select all the artists whose songs you want to add to the playlist."
 msgstr ""
-"sélectionnez tous les artistes dont vous voulez regrouper les morceaux dans "
-"la liste de lecture,"
+"Sélectionnez tous les artistes dont vous voulez regrouper les morceaux dans "
+"la liste de lecture."
 
 #. (itstool) path: item/p
 #: C/playlist-create-artists.page:44
@@ -322,7 +332,7 @@ msgstr "Supprimer une liste de lecture superflue."
 #. (itstool) path: page/title
 #: C/playlist-delete.page:22
 msgid "Delete a playlist"
-msgstr "Suppression d'une liste de lecture"
+msgstr "Suppression d’une liste de lecture"
 
 #. (itstool) path: page/p
 #: C/playlist-delete.page:24
@@ -332,12 +342,12 @@ msgstr "Pour supprimer une ancienne liste de lecture :"
 #. (itstool) path: item/p
 #: C/playlist-delete.page:29
 msgid "Select the playlist which you want to delete."
-msgstr "sélectionnez la liste de lecture à supprimer,"
+msgstr "Sélectionnez la liste de lecture à supprimer."
 
 #. (itstool) path: item/p
 #: C/playlist-delete.page:35
 msgid "Click on <gui>Delete</gui>."
-msgstr "cliquez sur <gui>Supprimer</gui>."
+msgstr "Cliquez sur <gui>Supprimer</gui>."
 
 #. (itstool) path: info/desc
 #: C/playlist-remove-songs.page:18
@@ -352,34 +362,34 @@ msgstr "Suppression de morceaux"
 #. (itstool) path: page/p
 #: C/playlist-remove-songs.page:24
 msgid "You can remove any unwanted songs from a playlist."
-msgstr "Pour supprimer des morceaux obsolètes d'une liste de lecture :"
+msgstr "Pour supprimer des morceaux obsolètes d’une liste de lecture :"
 
 #. (itstool) path: item/p
 #: C/playlist-remove-songs.page:29
 msgid "Select the playlist from which you want to remove songs."
-msgstr "sélectionnez la liste de lecture à nettoyer,"
+msgstr "Sélectionnez la liste de lecture à nettoyer."
 
 #. (itstool) path: item/p
 #: C/playlist-remove-songs.page:32
 msgid "Click on the check button on the toolbar."
-msgstr "cliquez sur le bouton de vérification dans la barre d'outils,"
+msgstr "Cliquez sur le bouton de sélection dans la barre d’outils."
 
 #. (itstool) path: item/p
 #: C/playlist-remove-songs.page:35
 msgid "Select all the songs which you want to remove."
-msgstr "sélectionnez tous les morceaux à supprimer,"
+msgstr "Sélectionnez tous les morceaux à supprimer."
 
 #. (itstool) path: item/p
 #: C/playlist-remove-songs.page:38
 msgid "Click on <gui style=\"button\">Remove from Playlist</gui>."
 msgstr ""
-"cliquez sur <gui style=\"button\">Supprimer de la liste de lecture</gui>."
+"Cliquez sur <gui style=\"button\">Supprimer de la liste de lecture</gui>."
 
 #. (itstool) path: info/desc
 #: C/playlist-repeat.page:18
 msgid "Repeat all songs in the playlist or only the current song."
 msgstr ""
-"Répéter tous les tittres d'une liste de lecture ou seulement la chanson en "
+"Répéter tous les titres d’une liste de lecture ou seulement la chanson en "
 "cours de lecture."
 
 #. (itstool) path: page/title
@@ -390,7 +400,7 @@ msgstr "Répétition de pistes"
 #. (itstool) path: list/title
 #: C/playlist-repeat.page:25
 msgid "In the taskbar, click on the button on the right side:"
-msgstr "Dans la barre de tâches, Cliquez sur le bouton situé à droite."
+msgstr "Dans la barre des tâches, cliquez sur le bouton situé à droite, puis :"
 
 #. (itstool) path: item/p
 #: C/playlist-repeat.page:27
@@ -420,7 +430,7 @@ msgid ""
 "In the taskbar, click on the button on right hand side and select "
 "<gui>Shuffle</gui>."
 msgstr ""
-"Dans la barre des tâches, cliquez sur le bouton sur la droite et "
+"Dans la barre des tâches, cliquez sur le bouton situé à droite et "
 "sélectionnez <gui>Mélanger</gui>."
 
 #. (itstool) path: info/desc
@@ -442,17 +452,19 @@ msgid ""
 msgstr ""
 "Vous pouvez faire une recherche sur un artiste, sur un morceau ou sur une "
 "liste de lecture. Sélectionnez votre choix et appuyez sur <gui>Rechercher</"
-"gui> pour lancer l'opération."
+"gui> pour lancer l’opération."
 
 #. (itstool) path: p/link
 #: C/legal.xml:5
 msgid "Creative Commons Attribution-ShareAlike 3.0 Unported License"
-msgstr "Licence Creative Commons Attribution-ShareAlike 3.0 Unported"
+msgstr ""
+"Licence Creative Commons Attribution - Partage dans les Mêmes Conditions 3.0 "
+"non transposé"
 
 #. (itstool) path: license/p
 #: C/legal.xml:4
 msgid "This work is licensed under a <_:link-1/>."
-msgstr "Cette œuvre est distribuée sous licence <_:link-1/>."
+msgstr "Cette œuvre est distribuée sous <_:link-1/>."
 
 #~ msgid "Click on <gui styl=\"button\">Select</gui>."
 #~ msgstr "Cliquez sur <gui styl=\"button\">Sélectionner</gui>."
diff --git a/help/hr/hr.po b/help/hr/hr.po
index d13e362b..4f8f7204 100644
--- a/help/hr/hr.po
+++ b/help/hr/hr.po
@@ -6,17 +6,17 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-music master\n"
-"POT-Creation-Date: 2017-08-26 17:13+0000\n"
-"PO-Revision-Date: 2018-04-08 20:32+0200\n"
+"POT-Creation-Date: 2022-07-25 15:45+0000\n"
+"PO-Revision-Date: 2022-08-17 23:18+0200\n"
+"Last-Translator: gogo <trebelnik2@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
+"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: hr\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"Last-Translator: \n"
-"X-Generator: Poedit 2.0.6\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 3.1.1\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -26,7 +26,7 @@ msgstr ""
 "  gogo https://launchpad.net/~trebelnik-stefina"
 
 #. (itstool) path: credit/name
-#: C/introduction.page:11 C/index.page:11 C/play-music.page:11
+#: C/introduction.page:11 C/index.page:12 C/play-music.page:11
 #: C/playlist-create-albums.page:11 C/playlist-create-songs.page:11
 #: C/playlist-create-artists.page:11 C/playlist-delete.page:11
 #: C/playlist-remove-songs.page:11 C/playlist-repeat.page:11
@@ -35,7 +35,7 @@ msgid "Shobha Tyagi"
 msgstr "Shobha Tyagi"
 
 #. (itstool) path: credit/years
-#: C/introduction.page:13 C/index.page:13 C/play-music.page:13
+#: C/introduction.page:13 C/index.page:14 C/play-music.page:13
 #: C/playlist-create-albums.page:13 C/playlist-create-songs.page:13
 #: C/playlist-create-artists.page:13 C/playlist-delete.page:13
 #: C/playlist-remove-songs.page:13 C/playlist-repeat.page:13
@@ -50,8 +50,8 @@ msgid ""
 "A simple and elegant replacement for using <app>Files</app> to show the "
 "music directory."
 msgstr ""
-"Jednostavna i elegantna zamjena za korištenje <app>Datoteka</app> za "
-"prikaz glazbene mape."
+"Jednostavna i elegantna zamjena za korištenje <app>Datoteka</app> za prikaz "
+"glazbene mape."
 
 #. (itstool) path: page/title
 #: C/introduction.page:22
@@ -60,18 +60,24 @@ msgstr "Uvod u Glazbu"
 
 #. (itstool) path: info/title
 #: C/index.page:6
-msgctxt "link"
+msgctxt "link:trail"
 msgid "Music"
 msgstr "Glazba"
 
 #. (itstool) path: info/title
 #: C/index.page:7
+msgctxt "link"
+msgid "Music"
+msgstr "Glazba"
+
+#. (itstool) path: info/title
+#: C/index.page:8
 msgctxt "text"
 msgid "Music"
 msgstr "Glazba"
 
 #. (itstool) path: page/title
-#: C/index.page:18
+#: C/index.page:19
 msgid "<_:media-1/> Music"
 msgstr "<_:media-1/> Glazba"
 
@@ -143,11 +149,11 @@ msgstr "Stvaranje popisa izvođenja pomoću albuma"
 #. (itstool) path: page/p
 #: C/playlist-create-albums.page:23
 msgid ""
-"You can view all your albums by clicking on the <gui style=\"button"
-"\">Albums</gui> button."
+"You can view all your albums by clicking on the <gui "
+"style=\"button\">Albums</gui> button."
 msgstr ""
-"Možete vidjeti sve svoje albume klikom na <gui style=\"button\">Albumi</"
-"gui> tipku."
+"Možete vidjeti sve svoje albume klikom na <gui style=\"button\">Albumi</gui> "
+"tipku."
 
 #. (itstool) path: steps/title
 #: C/playlist-create-albums.page:27
@@ -169,8 +175,7 @@ msgstr "Odaberite albume."
 #: C/playlist-create-albums.page:35 C/playlist-create-albums.page:60
 #: C/playlist-create-songs.page:35 C/playlist-create-artists.page:37
 msgid "Click on the <gui style=\"button\">Add to Playlist</gui> button."
-msgstr ""
-"Kliknite na <gui style=\"button\">Dodaj u popis izvođenja</gui> tipku."
+msgstr "Kliknite na <gui style=\"button\">Dodaj u popis izvođenja</gui> tipku."
 
 #. (itstool) path: item/p
 #: C/playlist-create-albums.page:38 C/playlist-create-albums.page:63
@@ -230,8 +235,8 @@ msgid ""
 "To clear the selection click <guiseq><gui>Click on items to select them</"
 "gui><gui>Select None</gui></guiseq> in the toolbar."
 msgstr ""
-"Kako bi uklonili odabir kliknite na <guiseq><gui>Klikni na stavku za "
-"odabir</gui><gui>Ukloni odabir</gui></guiseq> u alatnoj traci."
+"Kako bi uklonili odabir kliknite na <guiseq><gui>Klikni na stavku za odabir</"
+"gui><gui>Ukloni odabir</gui></guiseq> u alatnoj traci."
 
 #. (itstool) path: info/desc
 #: C/playlist-create-songs.page:18
@@ -249,8 +254,7 @@ msgid ""
 "You can view all the songs by clicking on the <gui style=\"button\">Songs</"
 "gui> button."
 msgstr ""
-"Možete vidjeti sve pjesme klikom na <gui style=\"button\">Pjesme</gui> "
-"tipku."
+"Možete vidjeti sve pjesme klikom na <gui style=\"button\">Pjesme</gui> tipku."
 
 #. (itstool) path: steps/title
 #: C/playlist-create-songs.page:27
@@ -269,8 +273,8 @@ msgid ""
 "Click on <gui style=\"button\">New Playlist</gui> and type a name for your "
 "playlist."
 msgstr ""
-"Kliknite na <gui style=\"button\">Novi popis izvođenja</gui> i upišite "
-"naziv vašeg popisa izvođenja."
+"Kliknite na <gui style=\"button\">Novi popis izvođenja</gui> i upišite naziv "
+"vašeg popisa izvođenja."
 
 #. (itstool) path: info/desc
 #: C/playlist-create-artists.page:18
@@ -285,11 +289,11 @@ msgstr "Stvaranje popisa izvođenja pomoću izvođača"
 #. (itstool) path: page/p
 #: C/playlist-create-artists.page:24
 msgid ""
-"You can view all the artists and their songs by clicking on the <gui style="
-"\"button\">Artists</gui> button."
+"You can view all the artists and their songs by clicking on the <gui "
+"style=\"button\">Artists</gui> button."
 msgstr ""
-"Možete vidjeti sve izvođače i njihove pjesme klikom na <gui style=\"button"
-"\">Izvođači</gui> tipku."
+"Možete vidjeti sve izvođače i njihove pjesme klikom na <gui "
+"style=\"button\">Izvođači</gui> tipku."
 
 #. (itstool) path: steps/title
 #: C/playlist-create-artists.page:28
@@ -397,12 +401,12 @@ msgstr ""
 #. (itstool) path: info/desc
 #: C/playlist-shuffle.page:18
 msgid "Shuffle songs in the playlist."
-msgstr "Izmješajte pjesme na popisu izvođenja."
+msgstr "Pokrenite naizmjeničnu reprodukciju pjesama na popisu izvođenja."
 
 #. (itstool) path: page/title
 #: C/playlist-shuffle.page:22
 msgid "How do I shuffle my songs?"
-msgstr "Kako da izmješate svoje pjesme?"
+msgstr "Kako pokrenuti naizmjeničnu reprodukciju pjesama?"
 
 #. (itstool) path: page/p
 #: C/playlist-shuffle.page:24
diff --git a/help/nl/nl.po b/help/nl/nl.po
index 09d27558..50ac2669 100644
--- a/help/nl/nl.po
+++ b/help/nl/nl.po
@@ -1,29 +1,32 @@
 # Dutch translation for gnome-music.
 # Copyright (C) 2016 gnome-music's COPYRIGHT HOLDER
 # This file is distributed under the same license as the gnome-music package.
-# Justin van Steijn <justin50@live.nl>, 2016.
+# Justin van Steijn <jvs@fsfe.org>, 2016.
+# Nathan Follens <nfollens@gnome.org>, 2022.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-music master\n"
-"POT-Creation-Date: 2016-10-05 12:45+0000\n"
-"PO-Revision-Date: 2016-11-20 12:22+0100\n"
-"Last-Translator: Justin van Steijn <justin50@live.nl>\n"
+"POT-Creation-Date: 2022-05-10 09:09+0000\n"
+"PO-Revision-Date: 2022-06-30 21:18+0200\n"
+"Last-Translator: Nathan Follens <nfollens@gnome.org>\n"
 "Language-Team: Dutch <gnome-nl-list@gnome.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.6.10\n"
+"X-Generator: Poedit 3.1\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
 msgid "translator-credits"
-msgstr "Justin van Steijn <justin50@live.nl>, 2016."
+msgstr ""
+"Justin van Steijn <jvs@fsfe.org>, 2016.\n"
+"Nathan Follens <nfollens@gnome.org>, 2022."
 
 #. (itstool) path: credit/name
-#: C/introduction.page:11 C/index.page:11 C/play-music.page:11
+#: C/introduction.page:11 C/index.page:12 C/play-music.page:11
 #: C/playlist-create-albums.page:11 C/playlist-create-songs.page:11
 #: C/playlist-create-artists.page:11 C/playlist-delete.page:11
 #: C/playlist-remove-songs.page:11 C/playlist-repeat.page:11
@@ -32,7 +35,7 @@ msgid "Shobha Tyagi"
 msgstr "Shobha Tyagi"
 
 #. (itstool) path: credit/years
-#: C/introduction.page:13 C/index.page:13 C/play-music.page:13
+#: C/introduction.page:13 C/index.page:14 C/play-music.page:13
 #: C/playlist-create-albums.page:13 C/playlist-create-songs.page:13
 #: C/playlist-create-artists.page:13 C/playlist-delete.page:13
 #: C/playlist-remove-songs.page:13 C/playlist-repeat.page:13
@@ -47,8 +50,8 @@ msgid ""
 "A simple and elegant replacement for using <app>Files</app> to show the "
 "music directory."
 msgstr ""
-"Een eenvoudige en elegante vervanging voor het gebruiken van <app>Bestanden</"
-"app> om door de muziekmap te bladeren."
+"Een eenvoudige en elegante vervanging voor <app>Bestanden</app> om door de "
+"muziekmap te bladeren."
 
 #. (itstool) path: page/title
 #: C/introduction.page:22
@@ -57,18 +60,24 @@ msgstr "Inleiding tot Muziek"
 
 #. (itstool) path: info/title
 #: C/index.page:6
-msgctxt "link"
+msgctxt "link:trail"
 msgid "Music"
 msgstr "Muziek"
 
 #. (itstool) path: info/title
 #: C/index.page:7
+msgctxt "link"
+msgid "Music"
+msgstr "Muziek"
+
+#. (itstool) path: info/title
+#: C/index.page:8
 msgctxt "text"
 msgid "Music"
 msgstr "Muziek"
 
 #. (itstool) path: page/title
-#: C/index.page:18
+#: C/index.page:19
 msgid "<_:media-1/> Music"
 msgstr "<_:media-1/> Muziek"
 
@@ -131,7 +140,7 @@ msgstr "Klik op <gui>Afspelen</gui>."
 #. (itstool) path: info/desc
 #: C/playlist-create-albums.page:18
 msgid "Add songs to playlists using albums."
-msgstr "Nummers aan afspeellijsten toevoegen door gebruik te maken van albums."
+msgstr "Voeg nummers aan afspeellijsten toe door gebruik te maken van albums."
 
 #. (itstool) path: page/title
 #: C/playlist-create-albums.page:21
@@ -144,20 +153,19 @@ msgid ""
 "You can view all your albums by clicking on the <gui style=\"button"
 "\">Albums</gui> button."
 msgstr ""
-"U kunt al uw albums bekijken door op de <gui style=\"button\">Albums</gui>-"
-"knop te klikken."
+"U kunt al uw albums bekijken door op de knop <gui style=\"button\">Albums</"
+"gui> te klikken."
 
 #. (itstool) path: steps/title
 #: C/playlist-create-albums.page:27
 msgid "To add all the songs in an album:"
-msgstr "Om alle nummers in een album toe toe te voegen:"
+msgstr "Om alle nummers in een album toe te voegen:"
 
 #. (itstool) path: item/p
 #: C/playlist-create-albums.page:29 C/playlist-create-songs.page:29
 #: C/playlist-create-artists.page:30
 msgid "Click on the check button in the top-right of the window."
-msgstr ""
-"Druk op de knop met het vinkje in de rechter-bovenhoek van het venster."
+msgstr "Klik op de knop met het vinkje in de rechterbovenhoek van het venster."
 
 #. (itstool) path: item/p
 #: C/playlist-create-albums.page:32
@@ -168,8 +176,7 @@ msgstr "Selecteer albums."
 #: C/playlist-create-albums.page:35 C/playlist-create-albums.page:60
 #: C/playlist-create-songs.page:35 C/playlist-create-artists.page:37
 msgid "Click on the <gui style=\"button\">Add to Playlist</gui> button."
-msgstr ""
-"Klik op de <gui style=\"button\">Aan afspeellijst toevoegen</gui>-knop."
+msgstr "Klik op <gui style=\"button\">Toevoegen aan afspeellijst</gui>."
 
 #. (itstool) path: item/p
 #: C/playlist-create-albums.page:38 C/playlist-create-albums.page:63
@@ -234,12 +241,12 @@ msgstr ""
 #. (itstool) path: info/desc
 #: C/playlist-create-songs.page:18
 msgid "Create playlist by selecting your favorite songs."
-msgstr "Een afspeellijst maken door uw favoriete nummers te selecteren."
+msgstr "Maak een afspeellijst aan door uw favoriete nummers te selecteren."
 
 #. (itstool) path: page/title
 #: C/playlist-create-songs.page:21
 msgid "Create playlists using songs"
-msgstr "Afspeellijsten maken met nummers"
+msgstr "Afspeellijsten aanmaken met nummers"
 
 #. (itstool) path: page/p
 #: C/playlist-create-songs.page:23
@@ -247,14 +254,14 @@ msgid ""
 "You can view all the songs by clicking on the <gui style=\"button\">Songs</"
 "gui> button."
 msgstr ""
-"U kunt alle nummers bekijken door te klikken op de <gui style=\"button"
-"\">Nummers</gui>-knop."
+"U kunt alle nummers bekijken door te klikken op <gui style=\"button"
+"\">Nummers</gui>."
 
 #. (itstool) path: steps/title
 #: C/playlist-create-songs.page:27
 msgid "To create a new playlist while in <em>Songs</em> view:"
 msgstr ""
-"Om een nieuwe afspeellijst te maken terwijl u in de <em>Nummers</em>-"
+"Om een nieuwe afspeellijst aan te maken terwijl u in de <em>Nummers</em>-"
 "weergave bent:"
 
 #. (itstool) path: item/p
@@ -274,12 +281,12 @@ msgstr ""
 #. (itstool) path: info/desc
 #: C/playlist-create-artists.page:18
 msgid "Create playlist by selecting your favorite artists."
-msgstr "Een afspeellijst maken door uw favoriete artiesten te selecteren."
+msgstr "Maak een afspeellijst aan door uw favoriete artiesten te selecteren."
 
 #. (itstool) path: page/title
 #: C/playlist-create-artists.page:22
 msgid "Create playlists using artists"
-msgstr "Afspeellijsten maken met artiesten"
+msgstr "Afspeellijsten aanmaken met artiesten"
 
 #. (itstool) path: page/p
 #: C/playlist-create-artists.page:24
@@ -287,21 +294,21 @@ msgid ""
 "You can view all the artists and their songs by clicking on the <gui style="
 "\"button\">Artists</gui> button."
 msgstr ""
-"U kunt alle artiesten en hun nummers weergeven door te klikken op de <gui "
-"style=\"button\">Artiesten</gui>-knop."
+"U kunt alle artiesten en hun nummers weergeven door te klikken op <gui style="
+"\"button\">Artiesten</gui>."
 
 #. (itstool) path: steps/title
 #: C/playlist-create-artists.page:28
 msgid "To create a new playlist while in <em>Artists</em> view:"
 msgstr ""
-"Om een nieuwe afspeellijst te maken terwijl u in de <em>Artiesten</em>-"
+"Om een nieuwe afspeellijst aan te maken terwijl u in de <em>Artiesten</em>-"
 "weergave bent:"
 
 #. (itstool) path: item/p
 #: C/playlist-create-artists.page:33
 msgid "Select all the artists whose songs you want to add to the playlist."
 msgstr ""
-"Selecteer alle artiesten wiens nummers u aan de afspeellijst wilt toevoegen."
+"Selecteer alle artiesten wier nummers u aan de afspeellijst wilt toevoegen."
 
 #. (itstool) path: item/p
 #: C/playlist-create-artists.page:44
@@ -311,7 +318,7 @@ msgstr "Klik op <gui>Selecteren</gui>."
 #. (itstool) path: info/desc
 #: C/playlist-delete.page:18
 msgid "Remove an unwanted playlist."
-msgstr "Een overbodige afspeellijst verwijderen."
+msgstr "Verwijder een ongewenste afspeellijst."
 
 #. (itstool) path: page/title
 #: C/playlist-delete.page:22
@@ -321,7 +328,7 @@ msgstr "Een afspeellijst verwijderen"
 #. (itstool) path: page/p
 #: C/playlist-delete.page:24
 msgid "You can remove an old and unwanted playlist."
-msgstr "U kunt een oude en overbodige afspeellijst verwijderen."
+msgstr "U kunt een oude en ongewenste afspeellijst verwijderen."
 
 #. (itstool) path: item/p
 #: C/playlist-delete.page:29
@@ -336,7 +343,7 @@ msgstr "Klik op <gui>Verwijderen</gui>."
 #. (itstool) path: info/desc
 #: C/playlist-remove-songs.page:18
 msgid "Delete songs from the playlist."
-msgstr "Nummers uit een afspeellijst verwijderen."
+msgstr "Verwijder nummers uit een afspeellijst."
 
 #. (itstool) path: page/title
 #: C/playlist-remove-songs.page:22
@@ -346,7 +353,7 @@ msgstr "Nummers verwijderen"
 #. (itstool) path: page/p
 #: C/playlist-remove-songs.page:24
 msgid "You can remove any unwanted songs from a playlist."
-msgstr "U kunt overbodige nummers uit een afspeellijst verwijderen."
+msgstr "U kunt ongewenste nummers uit een afspeellijst verwijderen."
 
 #. (itstool) path: item/p
 #: C/playlist-remove-songs.page:29
@@ -366,12 +373,12 @@ msgstr "Selecteer alle nummers die u wilt verwijderen."
 #. (itstool) path: item/p
 #: C/playlist-remove-songs.page:38
 msgid "Click on <gui style=\"button\">Remove from Playlist</gui>."
-msgstr "Klik op <gui style=\"button\">Uit afspeellijst verwijderen</gui>."
+msgstr "Klik op <gui style=\"button\">Verwijderen uit afspeellijst</gui>."
 
 #. (itstool) path: info/desc
 #: C/playlist-repeat.page:18
 msgid "Repeat all songs in the playlist or only the current song."
-msgstr "Alle nummers in de afspeellijst herhalen of alleen het huidige nummer."
+msgstr "Herhaal alle nummers in de afspeellijst of alleen het huidige nummer."
 
 #. (itstool) path: page/title
 #: C/playlist-repeat.page:22
@@ -398,12 +405,12 @@ msgstr ""
 #. (itstool) path: info/desc
 #: C/playlist-shuffle.page:18
 msgid "Shuffle songs in the playlist."
-msgstr "Nummers in de afspeellijst willekeurig afspelen."
+msgstr "Speel nummers in de afspeellijst in willekeurige volgorde af."
 
 #. (itstool) path: page/title
 #: C/playlist-shuffle.page:22
 msgid "How do I shuffle my songs?"
-msgstr "Hoe hussel ik mijn nummers?"
+msgstr "Hoe speel ik mijn nummers af in willekeurige volgorde?"
 
 #. (itstool) path: page/p
 #: C/playlist-shuffle.page:24
@@ -417,7 +424,7 @@ msgstr ""
 #. (itstool) path: info/desc
 #: C/search.page:18
 msgid "Search through your music collection."
-msgstr "Door uw muziekverzameling zoeken."
+msgstr "Zoek in uw muziekverzameling."
 
 #. (itstool) path: page/title
 #: C/search.page:22
@@ -432,13 +439,13 @@ msgid ""
 "searching."
 msgstr ""
 "U kunt door uw albums, artiesten, nummers en afspeellijsten zoeken. "
-"Selecteer waarin u wilt zoeken, selecteer dan de <gui>Zoeken</gui>-knop en "
-"begin met zoeken."
+"Selecteer waarin u wilt zoeken, klik op <gui>Zoeken</gui> en begin met "
+"zoeken."
 
 #. (itstool) path: p/link
 #: C/legal.xml:5
 msgid "Creative Commons Attribution-ShareAlike 3.0 Unported License"
-msgstr "Creative Commons Naamsvermelding-GelijkDelen 3.0 Unported Licentie"
+msgstr "Creative Commons Naamsvermelding-GelijkDelen 3.0 Unported-licentie"
 
 #. (itstool) path: license/p
 #: C/legal.xml:4
diff --git a/meson.build b/meson.build
index b3892a2d..da3e1628 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('gnome-music',
-    version: '42.1',
+    version: '44.0',
     meson_version: '>= 0.59.0'
 )
 
@@ -39,15 +39,28 @@ APPLICATION_ID = 'org.gnome.Music@0@'.format(PROFILE)
 PYTHON_DIR = py_installation.get_path('purelib')
 PKGDATA_DIR = join_paths(get_option('prefix'), get_option('datadir'), APPLICATION_ID)
 PKGLIB_DIR = join_paths(get_option('prefix'), get_option('libdir'), APPLICATION_ID)
+VCS_TAG = ''
+if get_option('profile') != 'default'
+  git = find_program('git', required : false)
+  if git.found()
+    VCS_TAG = run_command('git', 'rev-parse', '--short', 'HEAD').stdout().strip()
+  endif
+  if VCS_TAG == ''
+    VCS_TAG = '-devel'
+  else
+    VCS_TAG = '-@0@'.format(VCS_TAG)
+  endif
+endif
+
 
 # Dependencies
 dependency('glib-2.0', version: '>= 2.67.1')
 dependency('goa-1.0', version: '>= 3.35.90')
 dependency('gobject-introspection-1.0', version: '>= 1.35.0')
 dependency('gtk4', version: '>= 4.5.0')
-dependency('libadwaita-1', version: '>= 1.0')
+dependency('libadwaita-1', version: '>= 1.2.alpha')
 dependency('libmediaart-2.0', version: '>= 1.9.1')
-dependency('libsoup-2.4')
+dependency('libsoup-3.0')
 dependency('tracker-sparql-3.0', version: '>= 2.99.3')
 dependency('pango', version: '>= 1.44.0')
 dependency('pygobject-3.0', version: '>= 3.36.1')
@@ -55,7 +68,6 @@ dependency('py3cairo', version: '>= 1.14.0')
 dependency('grilo-0.3', version: '>= 0.3.13', fallback: ['grilo', 'libgrl_dep'])
 dependency('grilo-plugins-0.3', version: '>= 0.3.12', fallback: ['grilo-plugins', 'grilo_plugins_dep'])
 
-subdir('data/ui')
 subdir('data')
 subdir('help')
 subdir('po')
@@ -73,6 +85,7 @@ bin_config.set('pkgdatadir', PKGDATA_DIR)
 bin_config.set('localedir', join_paths(get_option('prefix'), get_option('datadir'), 'locale'))
 bin_config.set('pythondir', PYTHON_DIR)
 bin_config.set('schemasdir', PKGDATA_DIR)
+bin_config.set('version', meson.project_version() + VCS_TAG)
 
 bin_config.set('local_build', 'False')
 
diff --git a/org.gnome.Music.json b/org.gnome.Music.json
index e4d73070..5d5c6c1c 100644
--- a/org.gnome.Music.json
+++ b/org.gnome.Music.json
@@ -17,6 +17,7 @@
         "--talk-name=org.freedesktop.Tracker3.Writeback",
         "--talk-name=org.gnome.OnlineAccounts",
         "--talk-name=org.gnome.ControlCenter",
+        "--talk-name=org.gnome.Settings",
         "--system-talk-name=org.freedesktop.login1",
         "--add-policy=Tracker3.dbus:org.freedesktop.Tracker3.Miner.Files=tracker:Audio"
     ],
@@ -33,7 +34,7 @@
         "*.a"
     ],
     "modules": [
-        "subprojects/shared-modules/lua5.3/lua-5.3.5.json",
+        "subprojects/shared-modules/lua5.4/lua-5.4.json",
         {
             "name": "libmediaart",
             "buildsystem": "meson",
@@ -47,7 +48,8 @@
         {
             "name": "tracker-miners",
             "buildsystem": "meson",
-            "config-opts": [ "-Ddefault_index_single_dirs=",
+            "config-opts": [ "-Dbattery_detection=none",
+                             "-Ddefault_index_single_dirs=",
                              "-Ddefault_index_recursive_dirs=&MUSIC",
                              "-Ddomain_prefix=org.gnome.Music.Devel",
                              "-Dman=false",
@@ -64,10 +66,15 @@
         },
         {
             "name": "gnome-online-accounts",
-            "config-opts": [ "--enable-introspection",
-                             "--disable-documentation",
-                             "--disable-backend",
-                             "--disable-Werror" ],
+            "buildsystem": "meson",
+            "config-opts": [ "-Dgoabackend=false",
+                             "-Dvapi=false",
+                             "-Dexchange=false",
+                             "-Dgoogle=false",
+                             "-Dimap_smtp=false",
+                             "-Dkerberos=false",
+                             "-Downcloud=false",
+                             "-Dwindows_live=false" ],
             "sources": [
                 {
                     "type": "git",
diff --git a/po/LINGUAS b/po/LINGUAS
index 6108a956..003d7e8f 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,3 +1,4 @@
+ab
 af
 an
 ar
@@ -31,6 +32,7 @@ id
 is
 it
 ja
+ka
 kk
 kn
 ko
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 13b8547b..c881c836 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,13 +3,11 @@
 data/org.gnome.Music.appdata.xml.in.in
 data/org.gnome.Music.desktop.in.in
 data/org.gnome.Music.gschema.xml
-data/ui/AboutDialog.ui.in
 data/ui/AlbumWidget.ui
 data/ui/AppMenu.ui
 data/ui/EmptyView.ui
 data/ui/HeaderBar.ui
 data/ui/help-overlay.ui
-data/ui/InitialState.ui
 data/ui/LastfmDialog.ui
 data/ui/PlayerToolbar.ui
 data/ui/PlaylistControls.ui
@@ -20,6 +18,7 @@ data/ui/SelectionBarMenuButton.ui
 data/ui/SelectionToolbar.ui
 data/ui/SongWidgetMenu.ui
 gnomemusic/__init__.py
+gnomemusic/about.py
 gnomemusic/application.py
 gnomemusic/grilowrappers/grltrackerplaylists.py
 gnomemusic/gstplayer.py
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 006a563b..72df75eb 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -2,4 +2,3 @@
 # Please keep this file sorted alphabetically.
 data/ui/AboutDialog.ui
 data/org.gnome.Music.appdata.xml
-subprojects/gfm
diff --git a/po/ab.po b/po/ab.po
new file mode 100644
index 00000000..9e73aca9
--- /dev/null
+++ b/po/ab.po
@@ -0,0 +1,554 @@
+msgid ""
+msgstr ""
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-music/issues\n"
+"POT-Creation-Date: 2022-10-31 10:57+0000\n"
+"Last-Translator: Нанба Наала <naala-nanba@rambler.ru>\n"
+"Language-Team: Abkhazian <daniel.abzakh@gmail.com>\n"
+"Language: ab\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-DamnedLies-Scope: partial\n"
+
+#: data/org.gnome.Music.appdata.xml.in.in:6
+#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/about.py:236
+#: gnomemusic/application.py:61 gnomemusic/window.py:71
+msgid "Music"
+msgstr "Амузыка"
+
+#: data/org.gnome.Music.appdata.xml.in.in:7
+#: data/org.gnome.Music.desktop.in.in:5
+msgid "Play and organize your music collection"
+msgstr ""
+
+#: data/org.gnome.Music.appdata.xml.in.in:9
+msgid "An easy and pleasant way to play your music."
+msgstr ""
+
+#: data/org.gnome.Music.appdata.xml.in.in:12
+msgid ""
+"Find tracks in your local collection, use automatically generated playlists "
+"or curate a fresh one."
+msgstr ""
+
+#: data/org.gnome.Music.appdata.xml.in.in:167
+msgid "The GNOME Music developers"
+msgstr "Аԥҵаҩы изин © 2018 Аԥшьы Амузыка GNOME аԥҵаҩцәа"
+
+#: data/org.gnome.Music.desktop.in.in:4
+msgid "Music Player"
+msgstr ""
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/org.gnome.Music.desktop.in.in:13
+msgid "Music;Player;"
+msgstr ""
+
+#: data/org.gnome.Music.gschema.xml:12
+msgid "Window size"
+msgstr "Аԥенџьыр ашәагаа"
+
+#: data/org.gnome.Music.gschema.xml:13
+msgid "Window size (width and height)."
+msgstr "Аԥенџьыр ашәагаа (аҭбаареи аҳаракыреи)"
+
+#: data/org.gnome.Music.gschema.xml:17
+msgid "Window maximized"
+msgstr "Аԥенџьыр иамоуп иреиҳау ашәагаа"
+
+#: data/org.gnome.Music.gschema.xml:18
+msgid "Window maximized state."
+msgstr ""
+
+#: data/org.gnome.Music.gschema.xml:22
+msgid "Playback repeat mode"
+msgstr ""
+
+#. Translators: Don't translate allowed values, just the description in the brackets
+#: data/org.gnome.Music.gschema.xml:24
+msgid ""
+"Value identifies whether to repeat or randomize playback through the "
+"collection. Allowed values are: “none” (repeat and shuffle are off), "
+"“song” (repeat current song), “all” (repeat playlist, no shuffle), "
+"“shuffle” (shuffle playlist, presumes repeat all)."
+msgstr ""
+
+#: data/org.gnome.Music.gschema.xml:28
+msgid "Enable ReplayGain"
+msgstr "ReplayGain аҿакра"
+
+#: data/org.gnome.Music.gschema.xml:29
+msgid "Enables or disables ReplayGain for albums"
+msgstr "Иаҿанакуеит мамзар иаҿнахуеит афункциа ReplayGain альбомқәа рзы"
+
+#: data/org.gnome.Music.gschema.xml:33
+msgid "Inhibit system suspend"
+msgstr ""
+
+#: data/org.gnome.Music.gschema.xml:34
+msgid "Enables or disables inhibiting system suspend while playing music"
+msgstr ""
+"Иаҿанакуеит мамзар иаҿнахуеит амузыка аҿакраан асистема азԥшра арежим ахь "
+"аиасразы иҟанаҵо аԥкра"
+
+#: data/org.gnome.Music.gschema.xml:38
+msgid "Report music history to Last.fm"
+msgstr ""
+
+#: data/org.gnome.Music.gschema.xml:39
+msgid ""
+"Enables or disables sending scrobbles and the “currently playing” info to "
+"Last.fm."
+msgstr ""
+"Иаҿанакуеит мамзар иаҿнахуеит аскробблқәеи аинформациақәеи \"уажәтәи "
+"аиҭарҿиара\" иазкны Last.fm. аҟны."
+
+#: data/ui/AlbumWidget.ui:84 data/ui/PlayerToolbar.ui:87
+#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:170
+msgid "Play"
+msgstr "Аҿакра"
+
+#: data/ui/AlbumWidget.ui:130 data/ui/PlaylistControls.ui:5
+#: data/ui/SongWidgetMenu.ui:11
+msgid "_Play"
+msgstr ""
+
+#: data/ui/AlbumWidget.ui:134
+msgid "Add to _Favorite Songs"
+msgstr ""
+
+#: data/ui/AlbumWidget.ui:138 data/ui/SongWidgetMenu.ui:15
+msgid "_Add to Playlist…"
+msgstr ""
+
+#: data/ui/AppMenu.ui:23 data/ui/LastfmDialog.ui:8
+msgid "Last.fm Account"
+msgstr "Аккаунт Last.fm"
+
+#: data/ui/AppMenu.ui:36
+msgid "Report Music Listening"
+msgstr ""
+
+#: data/ui/AppMenu.ui:58
+msgid "_Keyboard Shortcuts"
+msgstr "_Ицоу арыдқәа"
+
+#: data/ui/AppMenu.ui:68
+msgid "_Help"
+msgstr "_Аилыркаа"
+
+#: data/ui/AppMenu.ui:78
+msgid "_About Music"
+msgstr "_Аԥшьы иазкны"
+
+#: data/ui/EmptyView.ui:30
+msgid "Welcome to Music"
+msgstr ""
+
+#: data/ui/HeaderBar.ui:16
+msgid "Menu"
+msgstr "Амениу"
+
+#: data/ui/HeaderBar.ui:24 data/ui/SearchHeaderBar.ui:15
+msgid "Select"
+msgstr "Алхра"
+
+#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:213
+#: data/ui/SearchHeaderBar.ui:20
+msgid "_Cancel"
+msgstr "_Аԥыхра"
+
+#: data/ui/HeaderBar.ui:42 data/ui/SearchHeaderBar.ui:32
+msgid "Search"
+msgstr "Аҧшаара"
+
+#: data/ui/HeaderBar.ui:50
+msgid "Back"
+msgstr "Шьҭахьҟа"
+
+#: data/ui/help-overlay.ui:11
+msgctxt "shortcut window"
+msgid "General"
+msgstr ""
+
+#: data/ui/help-overlay.ui:14
+msgctxt "shortcut window"
+msgid "Close window"
+msgstr ""
+
+#: data/ui/help-overlay.ui:20
+msgctxt "shortcut window"
+msgid "Search"
+msgstr ""
+
+#: data/ui/help-overlay.ui:26
+msgctxt "shortcut window"
+msgid "Help"
+msgstr ""
+
+#: data/ui/help-overlay.ui:32
+msgctxt "shortcut window"
+msgid "Shortcuts"
+msgstr ""
+
+#: data/ui/help-overlay.ui:40
+msgctxt "shortcut window"
+msgid "Playback"
+msgstr ""
+
+#: data/ui/help-overlay.ui:43
+msgctxt "shortcut window"
+msgid "Play/Pause"
+msgstr ""
+
+#: data/ui/help-overlay.ui:49
+msgctxt "shortcut window"
+msgid "Next song"
+msgstr ""
+
+#: data/ui/help-overlay.ui:55
+msgctxt "shortcut window"
+msgid "Previous song"
+msgstr ""
+
+#: data/ui/help-overlay.ui:61
+msgctxt "shortcut window"
+msgid "Toggle repeat"
+msgstr ""
+
+#: data/ui/help-overlay.ui:67
+msgctxt "shortcut window"
+msgid "Toggle shuffle"
+msgstr ""
+
+#: data/ui/help-overlay.ui:75
+msgctxt "shortcut window"
+msgid "Navigation"
+msgstr ""
+
+#: data/ui/help-overlay.ui:78
+msgctxt "shortcut window"
+msgid "Go to Albums"
+msgstr ""
+
+#: data/ui/help-overlay.ui:84
+msgctxt "shortcut window"
+msgid "Go to Artists"
+msgstr ""
+
+#: data/ui/help-overlay.ui:90
+msgctxt "shortcut window"
+msgid "Go to Songs"
+msgstr ""
+
+#: data/ui/help-overlay.ui:96
+msgctxt "shortcut window"
+msgid "Go to Playlists"
+msgstr ""
+
+#: data/ui/help-overlay.ui:102
+msgctxt "shortcut window"
+msgid "Go back"
+msgstr ""
+
+#: data/ui/LastfmDialog.ui:21
+msgid ""
+"Last.fm is a music discovery service that gives you personalised "
+"recommendations based on the music you listen to."
+msgstr ""
+
+#: data/ui/LastfmDialog.ui:31 gnomemusic/widgets/lastfmdialog.py:57
+msgid "Music Reporting Not Setup"
+msgstr ""
+
+#: data/ui/LastfmDialog.ui:44 gnomemusic/widgets/lastfmdialog.py:60
+msgid "Login to your Last.fm account to report your music listening."
+msgstr ""
+
+#: data/ui/LastfmDialog.ui:55 gnomemusic/widgets/lastfmdialog.py:58
+msgid "Login"
+msgstr "Аҭалара"
+
+#: data/ui/PlayerToolbar.ui:74
+msgid "Previous"
+msgstr "Аԥхьатәи"
+
+#: data/ui/PlayerToolbar.ui:106
+msgid "Next"
+msgstr "Ԥхьаҟа"
+
+#: data/ui/PlaylistControls.ui:9
+msgid "_Delete"
+msgstr "_Аныхра"
+
+#: data/ui/PlaylistControls.ui:13
+msgid "_Rename…"
+msgstr ""
+
+#: data/ui/PlaylistControls.ui:28
+msgid "Playlist Name"
+msgstr ""
+
+#: data/ui/PlaylistControls.ui:62
+msgid "_Done"
+msgstr "_Ихиоуп"
+
+#: data/ui/PlaylistDialog.ui:52
+msgid "Enter a name for your first playlist"
+msgstr ""
+
+#: data/ui/PlaylistDialog.ui:77
+msgid "C_reate"
+msgstr ""
+
+#: data/ui/PlaylistDialog.ui:146
+msgid "New Playlist…"
+msgstr ""
+
+#: data/ui/PlaylistDialog.ui:161
+msgid "Add"
+msgstr ""
+
+#: data/ui/PlaylistDialog.ui:202
+msgid "Add to Playlist"
+msgstr ""
+
+#: data/ui/PlaylistDialog.ui:222
+msgid "_Add"
+msgstr "_Ацҵара"
+
+#: data/ui/SearchView.ui:33 gnomemusic/views/artistsview.py:51
+msgid "Artists"
+msgstr "Анагӡаҩцәа"
+
+#: data/ui/SearchView.ui:42 data/ui/SearchView.ui:84
+msgid "View All"
+msgstr ""
+
+#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:56
+msgid "Albums"
+msgstr "Альбомқәа"
+
+#: data/ui/SearchView.ui:117 gnomemusic/views/songsview.py:52
+msgid "Songs"
+msgstr ""
+
+#: data/ui/SelectionBarMenuButton.ui:7
+msgid "Select All"
+msgstr "Зегьы алхра"
+
+#: data/ui/SelectionBarMenuButton.ui:11
+msgid "Select None"
+msgstr ""
+
+#: data/ui/SelectionBarMenuButton.ui:19 gnomemusic/widgets/headerbar.py:69
+msgid "Click on items to select them"
+msgstr ""
+
+#: data/ui/SelectionToolbar.ui:8
+msgid "_Add to Playlist"
+msgstr ""
+
+#: data/ui/SongWidgetMenu.ui:19
+msgid "_Remove from Playlist"
+msgstr "_Аҿакрақәа рыхьӡынҵа аҟнытә аныхра"
+
+#: gnomemusic/about.py:238
+msgid "The GNOME Project"
+msgstr "The GNOME Project"
+
+#: gnomemusic/about.py:242
+msgid "translator-credits"
+msgstr "Нанба Наала <naala-nanba@rambler.ru>, 2022"
+
+#: gnomemusic/about.py:246
+msgid "Copyright The GNOME Music Developers"
+msgstr "Аԥҵаҩы изин © 2018 Аԥшьы Амузыка GNOME аԥҵаҩцәа"
+
+#: gnomemusic/about.py:249
+msgid "Translated by"
+msgstr ""
+
+#. TRANSLATORS: this is a playlist name
+#: gnomemusic/grilowrappers/grltrackerplaylists.py:894
+msgid "Most Played"
+msgstr ""
+
+#. TRANSLATORS: this is a playlist name
+#: gnomemusic/grilowrappers/grltrackerplaylists.py:948
+msgid "Never Played"
+msgstr ""
+
+#. TRANSLATORS: this is a playlist name
+#: gnomemusic/grilowrappers/grltrackerplaylists.py:1001
+msgid "Recently Played"
+msgstr ""
+
+#. TRANSLATORS: this is a playlist name
+#: gnomemusic/grilowrappers/grltrackerplaylists.py:1064
+msgid "Recently Added"
+msgstr ""
+
+#. TRANSLATORS: this is a playlist name
+#: gnomemusic/grilowrappers/grltrackerplaylists.py:1127
+msgid "Favorite Songs"
+msgstr ""
+
+#: gnomemusic/gstplayer.py:408
+msgid "Unable to play the file"
+msgstr ""
+
+#: gnomemusic/gstplayer.py:414
+msgid "_Find in {}"
+msgstr "_Аҧшаара {} аҟны"
+
+#. TRANSLATORS: separator for two codecs
+#: gnomemusic/gstplayer.py:424
+msgid " and "
+msgstr " насгьы "
+
+#. TRANSLATORS: separator for a list of codecs
+#: gnomemusic/gstplayer.py:427
+msgid ", "
+msgstr ", "
+
+#: gnomemusic/gstplayer.py:429
+msgid "{} is required to play the file, but is not installed."
+msgid_plural "{} are required to play the file, but are not installed."
+msgstr[0] ""
+msgstr[1] ""
+
+#: gnomemusic/inhibitsuspend.py:63
+msgid "Playing music"
+msgstr ""
+
+#. Translators: "shuffle" causes tracks to play in random order.
+#: gnomemusic/player.py:44
+msgid "Shuffle"
+msgstr "Имашәыру аишьҭагылашьа"
+
+#: gnomemusic/player.py:45
+msgid "Repeat Song"
+msgstr ""
+
+#: gnomemusic/player.py:46
+msgid "Repeat All"
+msgstr ""
+
+#: gnomemusic/player.py:47
+msgid "Shuffle/Repeat Off"
+msgstr ""
+
+#: gnomemusic/playlisttoast.py:55
+msgid "Playlist {} removed"
+msgstr ""
+
+#: gnomemusic/playlisttoast.py:56 gnomemusic/songtoast.py:65
+msgid "Undo"
+msgstr "Архынҳәра"
+
+#: gnomemusic/songtoast.py:64
+msgid "{} removed from {}"
+msgstr ""
+
+#: gnomemusic/utils.py:92
+msgid "Unknown album"
+msgstr ""
+
+#: gnomemusic/utils.py:113
+msgid "Unknown Artist"
+msgstr ""
+
+#: gnomemusic/views/emptyview.py:65
+msgid "Your XDG Music directory is not set."
+msgstr ""
+
+#: gnomemusic/views/emptyview.py:72
+msgid "Music Folder"
+msgstr ""
+
+#. TRANSLATORS: This is a label to display a link to open user's music
+#. folder. {} will be replaced with the translated text 'Music folder'
+#: gnomemusic/views/emptyview.py:76
+msgid "The contents of your {} will appear here."
+msgstr ""
+
+#: gnomemusic/views/emptyview.py:124
+msgid "No Music Found"
+msgstr ""
+
+#: gnomemusic/views/emptyview.py:125
+msgid "Try a Different Search"
+msgstr ""
+
+#: gnomemusic/views/emptyview.py:129
+msgid "GNOME Music could not connect to Tracker."
+msgstr ""
+
+#: gnomemusic/views/emptyview.py:131
+msgid "Your music files cannot be indexed without Tracker running."
+msgstr ""
+
+#: gnomemusic/views/emptyview.py:137
+msgid "Your system Tracker version seems outdated."
+msgstr ""
+
+#: gnomemusic/views/emptyview.py:139
+msgid "Music needs Tracker version 3.0.0 or higher."
+msgstr ""
+
+#: gnomemusic/views/playlistsview.py:45
+msgid "Playlists"
+msgstr "Аҿакрақәа рыхьӡынҵа"
+
+#: gnomemusic/views/searchview.py:304
+msgid "Artists Results"
+msgstr ""
+
+#: gnomemusic/views/searchview.py:318
+msgid "Albums Results"
+msgstr ""
+
+#: gnomemusic/widgets/albumwidget.py:245
+msgid "{} minute"
+msgid_plural "{} minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: gnomemusic/widgets/discbox.py:75
+msgid "Disc {}"
+msgstr ""
+
+#: gnomemusic/widgets/headerbar.py:66
+msgid "Selected {} song"
+msgid_plural "Selected {} songs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: gnomemusic/widgets/lastfmdialog.py:64
+msgid "Your music listening is reported to Last.fm."
+msgstr ""
+
+#: gnomemusic/widgets/lastfmdialog.py:66
+msgid "Your music listening is not reported to Last.fm."
+msgstr ""
+
+#. TRANSLATORS: displays the username of the Last.fm account
+#: gnomemusic/widgets/lastfmdialog.py:70
+msgid "Logged in as {}"
+msgstr ""
+
+#: gnomemusic/widgets/lastfmdialog.py:71
+msgid "Configure"
+msgstr ""
+
+#: gnomemusic/widgets/playertoolbar.py:167
+msgid "Pause"
+msgstr "Pause"
+
+#: gnomemusic/widgets/playlistcontrols.py:130
+msgid "{} Song"
+msgid_plural "{} Songs"
+msgstr[0] ""
+msgstr[1] ""
diff --git a/po/be.po b/po/be.po
index 60eb2807..28fad1dd 100644
--- a/po/be.po
+++ b/po/be.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-music master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-music/issues\n"
-"POT-Creation-Date: 2021-08-27 21:42+0000\n"
-"PO-Revision-Date: 2021-08-28 21:37+0300\n"
+"POT-Creation-Date: 2022-10-18 13:09+0000\n"
+"PO-Revision-Date: 2022-10-26 23:03+0300\n"
 "Last-Translator: Launchpad translators\n"
 "Language-Team: Belarusian <i18n-bel-gnome@googlegroups.com>\n"
 "Language: be\n"
@@ -18,11 +18,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Poedit 3.0\n"
+"X-Generator: Poedit 3.2\n"
 
 #: data/org.gnome.Music.appdata.xml.in.in:6
-msgid "GNOME Music"
-msgstr "Музыка GNOME"
+#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/about.py:236
+#: gnomemusic/application.py:61 gnomemusic/window.py:71
+msgid "Music"
+msgstr "Музыка"
 
 #: data/org.gnome.Music.appdata.xml.in.in:7
 #: data/org.gnome.Music.desktop.in.in:5
@@ -41,15 +43,10 @@ msgstr ""
 "Шукайце трэкі ў сваёй лакальнай калекцыі, карыстайцеся аўтаматычна "
 "згенерыраванымі спісамі прайгравання або дадайце ўласны."
 
-#: data/org.gnome.Music.appdata.xml.in.in:140
+#: data/org.gnome.Music.appdata.xml.in.in:167
 msgid "The GNOME Music developers"
 msgstr "Распрацоўшчыкі «Музыка GNOME»"
 
-#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/application.py:60
-#: gnomemusic/window.py:71
-msgid "Music"
-msgstr "Музыка"
-
 #: data/org.gnome.Music.desktop.in.in:4
 msgid "Music Player"
 msgstr "Музычны прайгравальнік"
@@ -68,27 +65,19 @@ msgid "Window size (width and height)."
 msgstr "Памер акна (шырыня і вышыня)."
 
 #: data/org.gnome.Music.gschema.xml:17
-msgid "Window position"
-msgstr "Становішча акна"
-
-#: data/org.gnome.Music.gschema.xml:18
-msgid "Window position (x and y)."
-msgstr "Становішча акна (x, y)."
-
-#: data/org.gnome.Music.gschema.xml:22
 msgid "Window maximized"
-msgstr "Акно разгорнута"
+msgstr "Разгортванне акна"
 
-#: data/org.gnome.Music.gschema.xml:23
+#: data/org.gnome.Music.gschema.xml:18
 msgid "Window maximized state."
-msgstr "Стан разгорнутага акна."
+msgstr "Стан акна – разгорнута."
 
-#: data/org.gnome.Music.gschema.xml:27
+#: data/org.gnome.Music.gschema.xml:22
 msgid "Playback repeat mode"
 msgstr "Рэжым паўтору прайгравання"
 
 #. Translators: Don't translate allowed values, just the description in the brackets
-#: data/org.gnome.Music.gschema.xml:29
+#: data/org.gnome.Music.gschema.xml:24
 msgid ""
 "Value identifies whether to repeat or randomize playback through the "
 "collection. Allowed values are: “none” (repeat and shuffle are off), "
@@ -101,29 +90,29 @@ msgstr ""
 "спіса прайгравання без выпадковасці) і \"shuffle\" (выпадковае прайграванне "
 "спіса, магчыма з паўторам)."
 
-#: data/org.gnome.Music.gschema.xml:33
+#: data/org.gnome.Music.gschema.xml:28
 msgid "Enable ReplayGain"
 msgstr "Уключыць ReplayGain"
 
-#: data/org.gnome.Music.gschema.xml:34
+#: data/org.gnome.Music.gschema.xml:29
 msgid "Enables or disables ReplayGain for albums"
 msgstr "Уключыць або адключыць ReplayGain для альбомаў"
 
-#: data/org.gnome.Music.gschema.xml:38
+#: data/org.gnome.Music.gschema.xml:33
 msgid "Inhibit system suspend"
 msgstr "Блакіраваць прыпыненне працы камп'ютара"
 
-#: data/org.gnome.Music.gschema.xml:39
+#: data/org.gnome.Music.gschema.xml:34
 msgid "Enables or disables inhibiting system suspend while playing music"
 msgstr ""
 "Уключыць або адключыць блакіраванне прыпынення працы падчас прайгравання "
 "музыкі"
 
-#: data/org.gnome.Music.gschema.xml:43
+#: data/org.gnome.Music.gschema.xml:38
 msgid "Report music history to Last.fm"
 msgstr "Адпраўляць гісторыю праслуханай музыкі на Last.fm"
 
-#: data/org.gnome.Music.gschema.xml:44
+#: data/org.gnome.Music.gschema.xml:39
 msgid ""
 "Enables or disables sending scrobbles and the “currently playing” info to "
 "Last.fm."
@@ -131,79 +120,21 @@ msgstr ""
 "Уключыць або адключыць адпраўку музыкальнага профілю і звестак, якая песня "
 "\"прайграецца зараз\" на Last.fm."
 
-#: data/ui/AboutDialog.ui.in:9
-msgid "Copyright © 2018 GNOME Music Developers"
-msgstr "Аўтарскае права © 2018 Распрацоўшчыкі «Музыка GNOME»"
-
-#: data/ui/AboutDialog.ui.in:10
-msgid "A music player and management application for GNOME."
-msgstr "Музычны прайгравальнік і праграма кіравання музыкай для GNOME."
-
-#: data/ui/AboutDialog.ui.in:12
-msgid "Visit GNOME Music website"
-msgstr "Наведаць сайт праграмы Музыка GNOME"
-
-#: data/ui/AboutDialog.ui.in:13
-msgid ""
-"GNOME Music is free software; you can redistribute it and/or modify it under "
-"the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"GNOME Music is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
-"\n"
-"The GNOME Music authors hereby grant permission for non-GPL compatible "
-"GStreamer plugins to be used and distributed together with GStreamer and "
-"GNOME Music.  This permission is above and beyond the permissions granted by "
-"the GPL license by which GNOME Music is covered.  If you modify this code, "
-"you may extend this exception to your version of the code, but you are not "
-"obligated to do so.  If you do not wish to do so, delete this exception "
-"statement from your version."
-msgstr ""
-"Музыка GNOME з'яўляецца свабодным праграмным забеспячэннем. Вы можаце "
-"распаўсюджваць гэту праграму згодна з умовамі Агульнай Грамадскай Ліцэнзіі "
-"GNU (GPL), апублікаванай Фондам свабоднага праграмнага забеспячэння, версіі 2 ці любой "
-"пазнейшай.\n"
-"\n"
-"Музыка GNOME распаўсюджваецца з надзеяй, што яна будзе карыснай, але без "
-"ніякіх гарантый, у тым ліку камерцыйнай вартасці праграмы і наогул яе "
-"карысці.  Каб атрымаць больш інфармацыі глядзіце тэкст Агульнай Грамадскай "
-"Ліцэнзіі GNU (GPL).\n"
-"\n"
-"Вы павінны былі атрымаць копію Агульнай Грамадскай Ліцэнзіі GNU (GPL) разам "
-"з гэтай праграмай. Калі вы не атрымалі яе, паведаміце пра гэта Фонду "
-"свабоднага праграмнага забеспячэння на адрас: the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
-"\n"
-"Аўтары Музыкі GNOME даюць дазвол на распаўсюджванне ўбудоў GStreamer, не "
-"сумяшчальных з GPL, разам з GStreamer і Музыкай GNOME.  Гэты дазвол носіць "
-"дадатковы характар і дапаўняе правы, гарантаваныя ліцэнзіяй GPL, якая "
-"ахоўвае Музыку GNOME.  Калі вы змяняеце гэты код, вы можаце распаўсюдзіць "
-"гэты дазвол на вашу версію коду, хаця вы і не абавязаны гэта рабіць.  Калі "
-"вы не хочаце рабіць гэта, проста выдаліце тэкст гэтага дадатковага дазволу."
-
-#: data/ui/AlbumWidget.ui:104 data/ui/PlayerToolbar.ui:122
-#: data/ui/PlaylistControls.ui:121 data/ui/SongWidgetMenu.ui:19
-#: gnomemusic/widgets/playertoolbar.py:177
+#: data/ui/AlbumWidget.ui:84 data/ui/PlayerToolbar.ui:87
+#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:170
 msgid "Play"
 msgstr "Прайграваць"
 
-#: data/ui/AlbumWidget.ui:163 data/ui/PlaylistControls.ui:6
+#: data/ui/AlbumWidget.ui:130 data/ui/PlaylistControls.ui:5
+#: data/ui/SongWidgetMenu.ui:11
 msgid "_Play"
 msgstr "_Прайграваць"
 
-#: data/ui/AlbumWidget.ui:167
+#: data/ui/AlbumWidget.ui:134
 msgid "Add to _Favorite Songs"
 msgstr "Дадаць у _Абраныя песні"
 
-#: data/ui/AlbumWidget.ui:171
+#: data/ui/AlbumWidget.ui:138 data/ui/SongWidgetMenu.ui:15
 msgid "_Add to Playlist…"
 msgstr "_Дадаць у спіс прайгравання…"
 
@@ -211,23 +142,23 @@ msgstr "_Дадаць у спіс прайгравання…"
 msgid "Last.fm Account"
 msgstr "Уліковы запіс Last.fm"
 
-#: data/ui/AppMenu.ui:38
+#: data/ui/AppMenu.ui:36
 msgid "Report Music Listening"
 msgstr "Адпраўляць гісторыю праслуханай музыкі"
 
-#: data/ui/AppMenu.ui:63
+#: data/ui/AppMenu.ui:58
 msgid "_Keyboard Shortcuts"
 msgstr "_Спалучэнні клавіш"
 
-#: data/ui/AppMenu.ui:74
+#: data/ui/AppMenu.ui:68
 msgid "_Help"
 msgstr "_Даведка"
 
-#: data/ui/AppMenu.ui:85
+#: data/ui/AppMenu.ui:78
 msgid "_About Music"
 msgstr "_Аб праграме"
 
-#: data/ui/EmptyView.ui:35
+#: data/ui/EmptyView.ui:30
 msgid "Welcome to Music"
 msgstr "Вітаем у праграме Музыка"
 
@@ -235,109 +166,109 @@ msgstr "Вітаем у праграме Музыка"
 msgid "Menu"
 msgstr "Меню"
 
-#: data/ui/HeaderBar.ui:39 data/ui/SearchHeaderBar.ui:16
+#: data/ui/HeaderBar.ui:24 data/ui/SearchHeaderBar.ui:15
 msgid "Select"
 msgstr "Выбраць"
 
-#: data/ui/HeaderBar.ui:60 data/ui/PlaylistDialog.ui:211
-#: data/ui/SearchHeaderBar.ui:37
+#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:213
+#: data/ui/SearchHeaderBar.ui:20
 msgid "_Cancel"
 msgstr "_Скасаваць"
 
-#: data/ui/HeaderBar.ui:79 data/ui/SearchHeaderBar.ui:56
+#: data/ui/HeaderBar.ui:42 data/ui/SearchHeaderBar.ui:32
 msgid "Search"
 msgstr "Пошук"
 
-#: data/ui/HeaderBar.ui:102
+#: data/ui/HeaderBar.ui:50
 msgid "Back"
 msgstr "Назад"
 
-#: data/ui/help-overlay.ui:13
+#: data/ui/help-overlay.ui:11
 msgctxt "shortcut window"
 msgid "General"
 msgstr "Агульнае"
 
-#: data/ui/help-overlay.ui:17
+#: data/ui/help-overlay.ui:14
 msgctxt "shortcut window"
 msgid "Close window"
 msgstr "Закрыць акно"
 
-#: data/ui/help-overlay.ui:24
+#: data/ui/help-overlay.ui:20
 msgctxt "shortcut window"
 msgid "Search"
 msgstr "Пошук"
 
-#: data/ui/help-overlay.ui:31
+#: data/ui/help-overlay.ui:26
 msgctxt "shortcut window"
 msgid "Help"
 msgstr "Даведка"
 
-#: data/ui/help-overlay.ui:38
+#: data/ui/help-overlay.ui:32
 msgctxt "shortcut window"
 msgid "Shortcuts"
 msgstr "Спалучэнні клавіш"
 
-#: data/ui/help-overlay.ui:47
+#: data/ui/help-overlay.ui:40
 msgctxt "shortcut window"
 msgid "Playback"
 msgstr "Прайграванне"
 
-#: data/ui/help-overlay.ui:51
+#: data/ui/help-overlay.ui:43
 msgctxt "shortcut window"
 msgid "Play/Pause"
 msgstr "Прайграванне/паўза"
 
-#: data/ui/help-overlay.ui:58
+#: data/ui/help-overlay.ui:49
 msgctxt "shortcut window"
 msgid "Next song"
 msgstr "Наступная песня"
 
-#: data/ui/help-overlay.ui:65
+#: data/ui/help-overlay.ui:55
 msgctxt "shortcut window"
 msgid "Previous song"
 msgstr "Папярэдняя песня"
 
-#: data/ui/help-overlay.ui:72
+#: data/ui/help-overlay.ui:61
 msgctxt "shortcut window"
 msgid "Toggle repeat"
 msgstr "Укл/выкл паўтор"
 
-#: data/ui/help-overlay.ui:79
+#: data/ui/help-overlay.ui:67
 msgctxt "shortcut window"
 msgid "Toggle shuffle"
 msgstr "Укл/выкл тасаванне"
 
-#: data/ui/help-overlay.ui:88
+#: data/ui/help-overlay.ui:75
 msgctxt "shortcut window"
 msgid "Navigation"
 msgstr "Навігацыя"
 
-#: data/ui/help-overlay.ui:92
+#: data/ui/help-overlay.ui:78
 msgctxt "shortcut window"
 msgid "Go to Albums"
 msgstr "Перайсці да альбомаў"
 
-#: data/ui/help-overlay.ui:99
+#: data/ui/help-overlay.ui:84
 msgctxt "shortcut window"
 msgid "Go to Artists"
 msgstr "Перайсці да выканаўцаў"
 
-#: data/ui/help-overlay.ui:106
+#: data/ui/help-overlay.ui:90
 msgctxt "shortcut window"
 msgid "Go to Songs"
 msgstr "Перайсці да песень"
 
-#: data/ui/help-overlay.ui:113
+#: data/ui/help-overlay.ui:96
 msgctxt "shortcut window"
 msgid "Go to Playlists"
 msgstr "Перайсці да спісаў прайгравання"
 
-#: data/ui/help-overlay.ui:120
+#: data/ui/help-overlay.ui:102
 msgctxt "shortcut window"
 msgid "Go back"
 msgstr "Назад"
 
-#: data/ui/LastfmDialog.ui:24
+#: data/ui/LastfmDialog.ui:21
 msgid ""
 "Last.fm is a music discovery service that gives you personalised "
 "recommendations based on the music you listen to."
@@ -345,89 +276,81 @@ msgstr ""
 "Last.fm — гэта сэрвіс пошуку музыкі, які дае асабістыя рэкамендацыі, "
 "заснаваныя на праслуханай вамі музыцы."
 
-#: data/ui/LastfmDialog.ui:35 gnomemusic/widgets/lastfmdialog.py:58
+#: data/ui/LastfmDialog.ui:31 gnomemusic/widgets/lastfmdialog.py:57
 msgid "Music Reporting Not Setup"
 msgstr "Адпраўка звестак пра музыку не наладжана"
 
-#: data/ui/LastfmDialog.ui:49 gnomemusic/widgets/lastfmdialog.py:61
+#: data/ui/LastfmDialog.ui:44 gnomemusic/widgets/lastfmdialog.py:60
 msgid "Login to your Last.fm account to report your music listening."
 msgstr ""
 "Увайдзіце ў свой уліковы запіс Last.fm, каб адпраўляць гісторыю праслуханай "
 "музыкі."
 
-#: data/ui/LastfmDialog.ui:60 gnomemusic/widgets/lastfmdialog.py:59
+#: data/ui/LastfmDialog.ui:55 gnomemusic/widgets/lastfmdialog.py:58
 msgid "Login"
 msgstr "Увайсці"
 
-#: data/ui/LoadingNotification.ui:16
-msgid "Loading"
-msgstr "Загрузка"
-
-#: data/ui/PlayerToolbar.ui:105
+#: data/ui/PlayerToolbar.ui:74
 msgid "Previous"
 msgstr "Папярэдні"
 
-#: data/ui/PlayerToolbar.ui:139
+#: data/ui/PlayerToolbar.ui:106
 msgid "Next"
 msgstr "Наступны"
 
-#: data/ui/PlaylistControls.ui:10
+#: data/ui/PlaylistControls.ui:9
 msgid "_Delete"
 msgstr "_Выдаліць"
 
-#: data/ui/PlaylistControls.ui:14
+#: data/ui/PlaylistControls.ui:13
 msgid "_Rename…"
 msgstr "_Перайменаваць…"
 
-#: data/ui/PlaylistControls.ui:44
+#: data/ui/PlaylistControls.ui:28
 msgid "Playlist Name"
 msgstr "Назва спіса прайгравання"
 
-#: data/ui/PlaylistControls.ui:77
+#: data/ui/PlaylistControls.ui:62
 msgid "_Done"
 msgstr "_Гатова"
 
-#: data/ui/PlaylistDialog.ui:66
+#: data/ui/PlaylistDialog.ui:52
 msgid "Enter a name for your first playlist"
 msgstr "Увядзіце назву вашага першага спіса прайгравання"
 
-#: data/ui/PlaylistDialog.ui:88
+#: data/ui/PlaylistDialog.ui:77
 msgid "C_reate"
 msgstr "С_тварыць"
 
-#: data/ui/PlaylistDialog.ui:156
+#: data/ui/PlaylistDialog.ui:146
 msgid "New Playlist…"
 msgstr "Новы спіс прайгравання…"
 
-#: data/ui/PlaylistDialog.ui:167
+#: data/ui/PlaylistDialog.ui:161
 msgid "Add"
 msgstr "Дадаць"
 
-#: data/ui/PlaylistDialog.ui:208
+#: data/ui/PlaylistDialog.ui:202
 msgid "Add to Playlist"
 msgstr "Дадаць у спіс прайгравання"
 
-#: data/ui/PlaylistDialog.ui:224
+#: data/ui/PlaylistDialog.ui:222
 msgid "_Add"
 msgstr "_Дадаць"
 
-#: data/ui/PlaylistNotification.ui:22
-msgid "_Undo"
-msgstr "_Адрабіць"
-
-#: data/ui/SearchView.ui:47 gnomemusic/views/artistsview.py:46
+#: data/ui/SearchView.ui:33 gnomemusic/views/artistsview.py:51
 msgid "Artists"
 msgstr "Выканаўцы"
 
-#: data/ui/SearchView.ui:57 data/ui/SearchView.ui:108
+#: data/ui/SearchView.ui:42 data/ui/SearchView.ui:84
 msgid "View All"
 msgstr "Усе"
 
-#: data/ui/SearchView.ui:98 gnomemusic/views/albumsview.py:50
+#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:56
 msgid "Albums"
 msgstr "Альбомы"
 
-#: data/ui/SearchView.ui:149 gnomemusic/views/songsview.py:47
+#: data/ui/SearchView.ui:117 gnomemusic/views/songsview.py:52
 msgid "Songs"
 msgstr "Песні"
 
@@ -439,44 +362,56 @@ msgstr "Вылучыць усё"
 msgid "Select None"
 msgstr "Скасаваць вылучэнне"
 
-#: data/ui/SelectionBarMenuButton.ui:30 gnomemusic/widgets/headerbar.py:71
+#: data/ui/SelectionBarMenuButton.ui:19 gnomemusic/widgets/headerbar.py:69
 msgid "Click on items to select them"
 msgstr "Каб вылучыць аб'екты, пстрыкайце ў іх"
 
-#: data/ui/SelectionToolbar.ui:9
+#: data/ui/SelectionToolbar.ui:8
 msgid "_Add to Playlist"
 msgstr "_Дадаць у спіс прайгравання"
 
-#: data/ui/SongWidgetMenu.ui:29
-msgid "Add to Playlist…"
-msgstr "Дадаць у спіс прайгравання…"
+#: data/ui/SongWidgetMenu.ui:19
+msgid "_Remove from Playlist"
+msgstr "_Выдаліць са спіса прайгравання"
+
+#: gnomemusic/about.py:238
+msgid "The GNOME Project"
+msgstr "Праект GNOME"
+
+#: gnomemusic/about.py:242
+msgid "translator-credits"
+msgstr "Launchpad translators"
+
+#: gnomemusic/about.py:246
+msgid "Copyright The GNOME Music Developers"
+msgstr "Аўтарскае права Распрацоўшчыкі «Музыка GNOME»"
 
-#: data/ui/SongWidgetMenu.ui:39
-msgid "Remove From Playlist"
-msgstr "Выдаліць са спіса прайгравання"
+#: gnomemusic/about.py:249
+msgid "Translated by"
+msgstr "Пераклад"
 
 #. TRANSLATORS: this is a playlist name
-#: gnomemusic/grilowrappers/grltrackerplaylists.py:898
+#: gnomemusic/grilowrappers/grltrackerplaylists.py:894
 msgid "Most Played"
 msgstr "Найчасцей прайгранае"
 
 #. TRANSLATORS: this is a playlist name
-#: gnomemusic/grilowrappers/grltrackerplaylists.py:952
+#: gnomemusic/grilowrappers/grltrackerplaylists.py:948
 msgid "Never Played"
 msgstr "Ніколі не прайгранае"
 
 #. TRANSLATORS: this is a playlist name
-#: gnomemusic/grilowrappers/grltrackerplaylists.py:1005
+#: gnomemusic/grilowrappers/grltrackerplaylists.py:1001
 msgid "Recently Played"
 msgstr "Нядаўна прайгранае"
 
 #. TRANSLATORS: this is a playlist name
-#: gnomemusic/grilowrappers/grltrackerplaylists.py:1068
+#: gnomemusic/grilowrappers/grltrackerplaylists.py:1064
 msgid "Recently Added"
 msgstr "Нядаўна дададзенае"
 
 #. TRANSLATORS: this is a playlist name
-#: gnomemusic/grilowrappers/grltrackerplaylists.py:1131
+#: gnomemusic/grilowrappers/grltrackerplaylists.py:1127
 msgid "Favorite Songs"
 msgstr "Абраныя песні"
 
@@ -510,27 +445,39 @@ msgid "Playing music"
 msgstr "Прайграванне музыкі"
 
 #. Translators: "shuffle" causes tracks to play in random order.
-#: gnomemusic/player.py:45
+#: gnomemusic/player.py:44
 msgid "Shuffle"
 msgstr "Выпадковы парадак"
 
-#: gnomemusic/player.py:46
+#: gnomemusic/player.py:45
 msgid "Repeat Song"
 msgstr "Паўтараць песню"
 
-#: gnomemusic/player.py:47
+#: gnomemusic/player.py:46
 msgid "Repeat All"
 msgstr "Паўтараць усё"
 
-#: gnomemusic/player.py:48
+#: gnomemusic/player.py:47
 msgid "Shuffle/Repeat Off"
 msgstr "Выпадковы парадак і паўтор выключаны"
 
-#: gnomemusic/utils.py:80
+#: gnomemusic/playlisttoast.py:55
+msgid "Playlist {} removed"
+msgstr "Спіс прайгравання {} выдалены"
+
+#: gnomemusic/playlisttoast.py:56 gnomemusic/songtoast.py:65
+msgid "Undo"
+msgstr "Адрабіць"
+
+#: gnomemusic/songtoast.py:64
+msgid "{} removed from {}"
+msgstr "{} выдалена з {}"
+
+#: gnomemusic/utils.py:92
 msgid "Unknown album"
 msgstr "Невядомы альбом"
 
-#: gnomemusic/utils.py:101
+#: gnomemusic/utils.py:113
 msgid "Unknown Artist"
 msgstr "Невядомы выканаўца"
 
@@ -576,64 +523,133 @@ msgstr "Патрабуецца Tracker версіі 3.0.0 або навейша�
 msgid "Playlists"
 msgstr "Спісы прайгравання"
 
-#: gnomemusic/views/searchview.py:420
+#: gnomemusic/views/searchview.py:304
 msgid "Artists Results"
 msgstr "Знойдзеныя выканаўцы"
 
-#: gnomemusic/views/searchview.py:435
+#: gnomemusic/views/searchview.py:318
 msgid "Albums Results"
 msgstr "Знойдзеныя альбомы"
 
-#: gnomemusic/widgets/albumwidget.py:237
+#: gnomemusic/widgets/albumwidget.py:245
 msgid "{} minute"
 msgid_plural "{} minutes"
 msgstr[0] "{} хвіліна"
 msgstr[1] "{} хвіліны"
 msgstr[2] "{} хвілін"
 
-#: gnomemusic/widgets/disclistboxwidget.py:75
+#: gnomemusic/widgets/discbox.py:75
 msgid "Disc {}"
 msgstr "Дыск {}"
 
-#: gnomemusic/widgets/headerbar.py:68
+#: gnomemusic/widgets/headerbar.py:66
 msgid "Selected {} song"
 msgid_plural "Selected {} songs"
 msgstr[0] "Выбрана {} песня"
 msgstr[1] "Выбрана {} песні"
 msgstr[2] "Выбрана {} песень"
 
-#: gnomemusic/widgets/lastfmdialog.py:65
+#: gnomemusic/widgets/lastfmdialog.py:64
 msgid "Your music listening is reported to Last.fm."
 msgstr "Ваша гісторыя праслухвання адпраўлена на Last.fm."
 
-#: gnomemusic/widgets/lastfmdialog.py:67
+#: gnomemusic/widgets/lastfmdialog.py:66
 msgid "Your music listening is not reported to Last.fm."
 msgstr "Ваша гісторыя праслухвання не адпраўлена на Last.fm."
 
 #. TRANSLATORS: displays the username of the Last.fm account
-#: gnomemusic/widgets/lastfmdialog.py:71
+#: gnomemusic/widgets/lastfmdialog.py:70
 msgid "Logged in as {}"
 msgstr "Вы ўвайшлі як {}"
 
-#: gnomemusic/widgets/lastfmdialog.py:72
+#: gnomemusic/widgets/lastfmdialog.py:71
 msgid "Configure"
 msgstr "Наладзіць"
 
-#: gnomemusic/widgets/notificationspopup.py:216
-msgid "Playlist {} removed"
-msgstr "Спіс прайгравання {} выдалены"
-
-#: gnomemusic/widgets/notificationspopup.py:220
-msgid "{} removed from {}"
-msgstr "{} выдалена з {}"
-
-#: gnomemusic/widgets/playertoolbar.py:174
+#: gnomemusic/widgets/playertoolbar.py:167
 msgid "Pause"
 msgstr "Прыпыніць"
 
-#: gnomemusic/widgets/playlistcontrols.py:132
+#: gnomemusic/widgets/playlistcontrols.py:130
 msgid "{} Song"
 msgid_plural "{} Songs"
 msgstr[0] "{} песня"
 msgstr[1] "{} песні"
 msgstr[2] "{} песень"
+
+#~ msgid "GNOME Music"
+#~ msgstr "Музыка GNOME"
+
+#~ msgid "Window position"
+#~ msgstr "Становішча акна"
+
+#~ msgid "Window position (x and y)."
+#~ msgstr "Становішча акна (x, y)."
+
+#~ msgid "Copyright © 2018 GNOME Music Developers"
+#~ msgstr "Аўтарскае права © 2018 Распрацоўшчыкі «Музыка GNOME»"
+
+#~ msgid "A music player and management application for GNOME."
+#~ msgstr "Музычны прайгравальнік і праграма кіравання музыкай для GNOME."
+
+#~ msgid "Visit GNOME Music website"
+#~ msgstr "Наведаць сайт праграмы Музыка GNOME"
+
+#~ msgid ""
+#~ "GNOME Music is free software; you can redistribute it and/or modify it "
+#~ "under the terms of the GNU General Public License as published by the "
+#~ "Free Software Foundation; either version 2 of the License, or (at your "
+#~ "option) any later version.\n"
+#~ "\n"
+#~ "GNOME Music is distributed in the hope that it will be useful, but "
+#~ "WITHOUT ANY WARRANTY; without even the implied warranty of "
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General "
+#~ "Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License along "
+#~ "with GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
+#~ "Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
+#~ "\n"
+#~ "The GNOME Music authors hereby grant permission for non-GPL compatible "
+#~ "GStreamer plugins to be used and distributed together with GStreamer and "
+#~ "GNOME Music.  This permission is above and beyond the permissions granted "
+#~ "by the GPL license by which GNOME Music is covered.  If you modify this "
+#~ "code, you may extend this exception to your version of the code, but you "
+#~ "are not obligated to do so.  If you do not wish to do so, delete this "
+#~ "exception statement from your version."
+#~ msgstr ""
+#~ "Музыка GNOME з'яўляецца свабодным праграмным забеспячэннем. Вы можаце "
+#~ "распаўсюджваць гэту праграму згодна з умовамі Агульнай Грамадскай "
+#~ "Ліцэнзіі GNU (GPL), апублікаванай Фондам свабоднага праграмнага "
+#~ "забеспячэння, версіі 2 ці любой пазнейшай.\n"
+#~ "\n"
+#~ "Музыка GNOME распаўсюджваецца з надзеяй, што яна будзе карыснай, але без "
+#~ "ніякіх гарантый, у тым ліку камерцыйнай вартасці праграмы і наогул яе "
+#~ "карысці.  Каб атрымаць больш інфармацыі глядзіце тэкст Агульнай "
+#~ "Грамадскай Ліцэнзіі GNU (GPL).\n"
+#~ "\n"
+#~ "Вы павінны былі атрымаць копію Агульнай Грамадскай Ліцэнзіі GNU (GPL) "
+#~ "разам з гэтай праграмай. Калі вы не атрымалі яе, паведаміце пра гэта "
+#~ "Фонду свабоднага праграмнага забеспячэння на адрас: the Free Software "
+#~ "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 "
+#~ "USA.\n"
+#~ "\n"
+#~ "Аўтары Музыкі GNOME даюць дазвол на распаўсюджванне ўбудоў GStreamer, не "
+#~ "сумяшчальных з GPL, разам з GStreamer і Музыкай GNOME.  Гэты дазвол "
+#~ "носіць дадатковы характар і дапаўняе правы, гарантаваныя ліцэнзіяй GPL, "
+#~ "якая ахоўвае Музыку GNOME.  Калі вы змяняеце гэты код, вы можаце "
+#~ "распаўсюдзіць гэты дазвол на вашу версію коду, хаця вы і не абавязаны "
+#~ "гэта рабіць.  Калі вы не хочаце рабіць гэта, проста выдаліце тэкст гэтага "
+#~ "дадатковага дазволу."
+
+#~ msgid "Loading"
+#~ msgstr "Загрузка"
+
+#~ msgid "_Undo"
+#~ msgstr "_Адрабіць"
+
+#~ msgid "Add to Playlist…"
+#~ msgstr "Дадаць у спіс прайгравання…"
+
+#~ msgid "Remove From Playlist"
+#~ msgstr "Выдаліць са спіса прайгравання"
diff --git a/po/bg.po b/po/bg.po
index 661bf5d1..846799f4 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -4,12 +4,13 @@
 # This file is distributed under the same license as the gnome-music package.
 # Hristo Kozhuharov "XTard" <ickomcdevill@gmail.com>, 2016.
 # Alexander Shopov <ash@kambanaria.org>, 2021, 2022.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-music master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-music/issues\n"
-"POT-Creation-Date: 2022-03-10 19:01+0000\n"
-"PO-Revision-Date: 2022-03-10 20:36+0100\n"
+"POT-Creation-Date: 2022-09-11 18:29+0000\n"
+"PO-Revision-Date: 2022-09-12 22:56+0200\n"
 "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
 "Language-Team: Bulgarian <dict-notifications@fsa-bg.org>\n"
 "Language: bg\n"
@@ -19,8 +20,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: data/org.gnome.Music.appdata.xml.in.in:6
-#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/application.py:61
-#: gnomemusic/window.py:71
+#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/about.py:236
+#: gnomemusic/application.py:61 gnomemusic/window.py:71
 msgid "Music"
 msgstr "Музика"
 
@@ -41,7 +42,7 @@ msgstr ""
 "Откриване на песни в локалната ви колекция, ползване на автоматично или "
 "ръчно създадени списъци за изпълнение."
 
-#: data/org.gnome.Music.appdata.xml.in.in:149
+#: data/org.gnome.Music.appdata.xml.in.in:167
 msgid "The GNOME Music developers"
 msgstr "Разработчиците на „Музика на GNOME“"
 
@@ -117,78 +118,21 @@ msgstr ""
 "Позволяване или не на пращане на информацията за слушаната музика към Last."
 "fm."
 
-#: data/ui/AboutDialog.ui.in:9
-msgid "Copyright © 2018 GNOME Music Developers"
-msgstr "Авторски права: © 2018 Разработчиците на „Музика на GNOME“"
-
-#: data/ui/AboutDialog.ui.in:10
-msgid "A music player and management application for GNOME."
-msgstr "Изпълнение и организиране на песни и музика за GNOME."
-
-#: data/ui/AboutDialog.ui.in:12
-msgid "Visit GNOME Music website"
-msgstr "Посетете сайта на Музика на GNOME"
-
-#: data/ui/AboutDialog.ui.in:13
-msgid ""
-"GNOME Music is free software; you can redistribute it and/or modify it under "
-"the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"GNOME Music is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
-"\n"
-"The GNOME Music authors hereby grant permission for non-GPL compatible "
-"GStreamer plugins to be used and distributed together with GStreamer and "
-"GNOME Music.  This permission is above and beyond the permissions granted by "
-"the GPL license by which GNOME Music is covered.  If you modify this code, "
-"you may extend this exception to your version of the code, but you are not "
-"obligated to do so.  If you do not wish to do so, delete this exception "
-"statement from your version."
-msgstr ""
-"Тази програма (GNOME Music) е свободен софтуер. Можете да я разпространявате "
-"и/или променяте под условията на Общия публичен лиценз на GNU (GNU GPL), "
-"както е публикуван от Фондацията за свободен софтуер — версия 2 на лиценза "
-"или (по ваше решение) по-късна версия.\n"
-"\n"
-"Тази програма се разпространява с надеждата, че ще бъде полезна, но БЕЗ "
-"НИКАКВИ ГАРАНЦИИ, дори и косвените за ПРОДАЖБА или СЪОТВЕТСТВИЕ С КАКВАТО И "
-"ДА Е УПОТРЕБА. За подробности погледнете Общия публичен лиценз на GNU.\n"
-"\n"
-"Трябва да сте получили копие от Общия публичен лиценз на GNU (GNU GPL) "
-"заедно с тази програма. Ако не сте, пишете на Free Software Foundation, "
-"Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
-"\n"
-"Авторите на GNOME Music дават изрично разрешение за съвместно използване и "
-"разпространение на GNOME Music с приставките на GStreamer, които не са "
-"съвместими с GNU GPL. Това право е над и извън правата предоставени от GNU "
-"GPL — лицензът, по който GNOME Music се разпространява. Ако промените този "
-"код, може да разрешите това изключение за вашата версия на кода, но това не "
-"е задължително. Ако не желаете да позволите това изключение, изтрийте тази "
-"клауза от от вашата версия."
-
-#: data/ui/AlbumWidget.ui:86 data/ui/PlayerToolbar.ui:88
-#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:168
+#: data/ui/AlbumWidget.ui:84 data/ui/PlayerToolbar.ui:87
+#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:170
 msgid "Play"
 msgstr "Изпълнение"
 
-#: data/ui/AlbumWidget.ui:132 data/ui/PlaylistControls.ui:5
+#: data/ui/AlbumWidget.ui:130 data/ui/PlaylistControls.ui:5
 #: data/ui/SongWidgetMenu.ui:11
 msgid "_Play"
 msgstr "_Изпълнение"
 
-#: data/ui/AlbumWidget.ui:136
+#: data/ui/AlbumWidget.ui:134
 msgid "Add to _Favorite Songs"
 msgstr "Добавяне в любими песни…"
 
-#: data/ui/AlbumWidget.ui:140 data/ui/SongWidgetMenu.ui:15
+#: data/ui/AlbumWidget.ui:138 data/ui/SongWidgetMenu.ui:15
 msgid "_Add to Playlist…"
 msgstr "_Добавяне в списък…"
 
@@ -212,7 +156,7 @@ msgstr "Помо_щ"
 msgid "_About Music"
 msgstr "_Относно „Музика“"
 
-#: data/ui/EmptyView.ui:26 data/ui/InitialState.ui:13
+#: data/ui/EmptyView.ui:30
 msgid "Welcome to Music"
 msgstr "Добре дошли в „Музика“"
 
@@ -224,7 +168,7 @@ msgstr "Меню"
 msgid "Select"
 msgstr "Избор"
 
-#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:211
+#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:213
 #: data/ui/SearchHeaderBar.ui:20
 msgid "_Cancel"
 msgstr "_Отказ"
@@ -322,10 +266,6 @@ msgctxt "shortcut window"
 msgid "Go back"
 msgstr "Назад"
 
-#: data/ui/InitialState.ui:25
-msgid "The contents of your Music Folder will appear here"
-msgstr "Съдържанието на папката с музика ще се появи тук."
-
 #: data/ui/LastfmDialog.ui:21
 msgid ""
 "Last.fm is a music discovery service that gives you personalised "
@@ -348,11 +288,11 @@ msgstr ""
 msgid "Login"
 msgstr "Вписване"
 
-#: data/ui/PlayerToolbar.ui:75
+#: data/ui/PlayerToolbar.ui:74
 msgid "Previous"
 msgstr "Предишна"
 
-#: data/ui/PlayerToolbar.ui:107
+#: data/ui/PlayerToolbar.ui:106
 msgid "Next"
 msgstr "Следваща"
 
@@ -388,11 +328,11 @@ msgstr "Нов списък…"
 msgid "Add"
 msgstr "Добавяне"
 
-#: data/ui/PlaylistDialog.ui:200
+#: data/ui/PlaylistDialog.ui:202
 msgid "Add to Playlist"
 msgstr "Добавяне в списък"
 
-#: data/ui/PlaylistDialog.ui:220
+#: data/ui/PlaylistDialog.ui:222
 msgid "_Add"
 msgstr "_Добавяне"
 
@@ -404,7 +344,7 @@ msgstr "Автори"
 msgid "View All"
 msgstr "Преглед на всички"
 
-#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:54
+#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:56
 msgid "Albums"
 msgstr "Албуми"
 
@@ -432,6 +372,32 @@ msgstr "_Добавяне в списък"
 msgid "_Remove from Playlist"
 msgstr "_Изваждане от списък"
 
+#: gnomemusic/about.py:238
+msgid "The GNOME Project"
+msgstr "Проектът GNOME"
+
+#: gnomemusic/about.py:242
+msgid "translator-credits"
+msgstr ""
+"Александър Шопов &lt;<a href='mailto:ash@kambanaria.org'>ash@kambanaria.org</"
+"a>&gt;\n"
+"Христо Кожухаров &lt;<a href='mailto:ickomcdevill@gmail."
+"com'>ickomcdevill@gmail.com</a>&gt;\n"
+"\n"
+"Проектът за превод на GNOME има нужда от подкрепа.\n"
+"Научете повече за нас на <a href='https://fsa-bg.org/project/gtp'>уеб сайта</"
+"a> ни.\n"
+"Докладвайте за грешки в превода в <a href='https://fsa-bg.org/project/gtp/"
+"newticket'>съответния раздел</a>."
+
+#: gnomemusic/about.py:246
+msgid "Copyright The GNOME Music Developers"
+msgstr "Авторски права: Разработчиците на „Музика на GNOME“"
+
+#: gnomemusic/about.py:249
+msgid "Translated by"
+msgstr "Преведено от"
+
 #. TRANSLATORS: this is a playlist name
 #: gnomemusic/grilowrappers/grltrackerplaylists.py:894
 msgid "Most Played"
@@ -572,7 +538,7 @@ msgstr "Резултати — изпълнителни"
 msgid "Albums Results"
 msgstr "Резултати — албуми"
 
-#: gnomemusic/widgets/albumwidget.py:242
+#: gnomemusic/widgets/albumwidget.py:245
 msgid "{} minute"
 msgid_plural "{} minutes"
 msgstr[0] "{} минута"
@@ -606,7 +572,7 @@ msgstr "Вписани сте като „{}“"
 msgid "Configure"
 msgstr "Настройки"
 
-#: gnomemusic/widgets/playertoolbar.py:165
+#: gnomemusic/widgets/playertoolbar.py:167
 msgid "Pause"
 msgstr "Пауза"
 
diff --git a/po/ca.po b/po/ca.po
index 59d1b2b9..44292b10 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -2,7 +2,7 @@
 # Copyright (C) 2012 gnome-music's COPYRIGHT HOLDER
 # This file is distributed under the same license as the gnome-calendar package.
 #
-# Jordi Mas i Hernandez <jmas@softcatala.org>, 2013, 2015, 2016
+# Jordi Mas i Hernandez <jmas@softcatala.org>, 2013, 2015, 2016, 2022
 # Pau Iranzo <paugnu@gmail.com>, 2013.
 # Gil Forcada <gilforcada@guifi.net>, 2014, 2018.
 # Jordi Serratosa <jordis@softcatala.cat>, 2017.
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-music master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-music/issues\n"
-"POT-Creation-Date: 2022-02-19 12:39+0000\n"
-"PO-Revision-Date: 2020-02-19 06:43+0100\n"
-"Last-Translator: Adolfo Jayme Barrientos <fitojb@ubuntu.com>\n"
+"POT-Creation-Date: 2022-08-27 13:27+0000\n"
+"PO-Revision-Date: 2022-08-31 06:43+0100\n"
+"Last-Translator: Jordi Mas i Hernandez <jmas@softcatala.org>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
 "Language: ca\n"
 "MIME-Version: 1.0\n"
@@ -23,8 +23,8 @@ msgstr ""
 "X-Generator: Poedit 2.2.4\n"
 
 #: data/org.gnome.Music.appdata.xml.in.in:6
-#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/application.py:61
-#: gnomemusic/window.py:71
+#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/about.py:236
+#: gnomemusic/application.py:61 gnomemusic/window.py:71
 msgid "Music"
 msgstr "Música"
 
@@ -42,10 +42,10 @@ msgid ""
 "Find tracks in your local collection, use automatically generated playlists "
 "or curate a fresh one."
 msgstr ""
-"Trobeu cançons a la vostra col·lecció local, utilitzeu llistes de reproducció "
-"generades automàticament o creeu-ne de noves."
+"Trobeu cançons a la vostra col·lecció local, utilitzeu llistes de "
+"reproducció generades automàticament o creeu-ne de noves."
 
-#: data/org.gnome.Music.appdata.xml.in.in:149
+#: data/org.gnome.Music.appdata.xml.in.in:167
 msgid "The GNOME Music developers"
 msgstr "L'equip de desenvolupament del Música del GNOME"
 
@@ -53,7 +53,8 @@ msgstr "L'equip de desenvolupament del Música del GNOME"
 msgid "Music Player"
 msgstr "Reproductor de música"
 
-#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#. Translators: Search terms to find this application. Do NOT translate or
+#. localize the semicolons! The list MUST also end with a semicolon!
 #: data/org.gnome.Music.desktop.in.in:13
 msgid "Music;Player;"
 msgstr "Música;Reproductor;"
@@ -78,13 +79,14 @@ msgstr "Estat de la finestra maximitzada."
 msgid "Playback repeat mode"
 msgstr "Mode de repetició de la reproducció"
 
-#. Translators: Don't translate allowed values, just the description in the brackets
+#. Translators: Don't translate allowed values, just the description in the
+#. brackets
 #: data/org.gnome.Music.gschema.xml:24
 msgid ""
 "Value identifies whether to repeat or randomize playback through the "
-"collection. Allowed values are: “none” (repeat and shuffle are off), "
-"“song” (repeat current song), “all” (repeat playlist, no shuffle), "
-"“shuffle” (shuffle playlist, presumes repeat all)."
+"collection. Allowed values are: “none” (repeat and shuffle are off), “song” "
+"(repeat current song), “all” (repeat playlist, no shuffle), “shuffle” "
+"(shuffle playlist, presumes repeat all)."
 msgstr ""
 "El valor estableix si es reprodueix la col·lecció en mode de repetició o "
 "aleatori. Els valors que s'accepten són: «none» (cap, ni es repeteix ni es "
@@ -123,79 +125,21 @@ msgstr ""
 "Activa o desactiva l'enviament de «scrobbles» i la informació de la "
 "«reproducció actual» a Last.fm."
 
-#: data/ui/AboutDialog.ui.in:9
-msgid "Copyright © 2018 GNOME Music Developers"
-msgstr "Copyright © 2018 l'equip de desenvolupament del Música del GNOME"
-
-#: data/ui/AboutDialog.ui.in:10
-msgid "A music player and management application for GNOME."
-msgstr "Una aplicació de reproducció i gestió de música pel GNOME."
-
-#: data/ui/AboutDialog.ui.in:12
-msgid "Visit GNOME Music website"
-msgstr "Visiteu el lloc web del Música del GNOME"
-
-#: data/ui/AboutDialog.ui.in:13
-msgid ""
-"GNOME Music is free software; you can redistribute it and/or modify it under "
-"the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"GNOME Music is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
-"\n"
-"The GNOME Music authors hereby grant permission for non-GPL compatible "
-"GStreamer plugins to be used and distributed together with GStreamer and "
-"GNOME Music.  This permission is above and beyond the permissions granted by "
-"the GPL license by which GNOME Music is covered.  If you modify this code, "
-"you may extend this exception to your version of the code, but you are not "
-"obligated to do so.  If you do not wish to do so, delete this exception "
-"statement from your version."
-msgstr ""
-"El Música del GNOME és programari lliure; podeu redistribuir-lo i/o "
-"modificar-lo segons els termes de la llicència pública general GNU publicada "
-"per la Free Software Foundation; sigui la versió 2 de la llicència o (segons "
-"la vostra opció) qualsevol versió posterior.\n"
-"\n"
-"El Música del GNOME es distribueix amb l'esperança que sigui útil, però "
-"SENSE CAP GARANTIA; ni tan sols amb la garantia implícita de "
-"COMERCIALITZACIÓ o IDONEÏTAT PER A UN PROPÒSIT PARTICULAR. Vegeu la "
-"Llicència Pública General GNU per més detalls.\n"
-"\n"
-"Heu de rebre una còpia de la Llicència Pública General GNU amb el Música del "
-"GNOME; si no és el cas, escriviu a la Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
-"\n"
-"Els autors del Música del GNOME permeten l'ús i distribució conjunta del "
-"Música del GNOME amb connectors GStreamer no compatibles amb la GPL. Aquest "
-"permís està per sobre dels permisos garantits per la llicència GPL sota la "
-"qual es troba el Música del GNOME. Si modifiqueu aquest codi, podeu estendre "
-"aquesta excepció a la vostra versió del codi, però no esteu obligat a fer-"
-"ho. Si no voleu fer-ho, elimineu aquesta declaració d'excepció de la vostra "
-"versió."
-
-#: data/ui/AlbumWidget.ui:86 data/ui/PlayerToolbar.ui:88
-#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:168
+#: data/ui/AlbumWidget.ui:84 data/ui/PlayerToolbar.ui:87
+#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:170
 msgid "Play"
 msgstr "Reprodueix"
 
-#: data/ui/AlbumWidget.ui:132 data/ui/PlaylistControls.ui:5
+#: data/ui/AlbumWidget.ui:130 data/ui/PlaylistControls.ui:5
 #: data/ui/SongWidgetMenu.ui:11
 msgid "_Play"
 msgstr "_Reprodueix"
 
-#: data/ui/AlbumWidget.ui:136
+#: data/ui/AlbumWidget.ui:134
 msgid "Add to _Favorite Songs"
 msgstr "_Cançons preferides"
 
-#: data/ui/AlbumWidget.ui:140 data/ui/SongWidgetMenu.ui:15
+#: data/ui/AlbumWidget.ui:138 data/ui/SongWidgetMenu.ui:15
 msgid "_Add to Playlist…"
 msgstr "_Afegeix a la llista de reproducció…"
 
@@ -219,7 +163,7 @@ msgstr "_Ajuda"
 msgid "_About Music"
 msgstr "_Quant al Música"
 
-#: data/ui/EmptyView.ui:26 data/ui/InitialState.ui:13
+#: data/ui/EmptyView.ui:30
 msgid "Welcome to Music"
 msgstr "Us donem la benvinguda al Música"
 
@@ -231,7 +175,7 @@ msgstr "Menú"
 msgid "Select"
 msgstr "Selecciona"
 
-#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:211
+#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:213
 #: data/ui/SearchHeaderBar.ui:20
 msgid "_Cancel"
 msgstr "_Cancel·la"
@@ -329,10 +273,6 @@ msgctxt "shortcut window"
 msgid "Go back"
 msgstr "Torna enrere"
 
-#: data/ui/InitialState.ui:25
-msgid "The contents of your Music Folder will appear here"
-msgstr "Els continguts de la carpeta Música apareixeran aquí."
-
 #: data/ui/LastfmDialog.ui:21
 msgid ""
 "Last.fm is a music discovery service that gives you personalised "
@@ -355,11 +295,11 @@ msgstr ""
 msgid "Login"
 msgstr "Inicia la sessió"
 
-#: data/ui/PlayerToolbar.ui:75
+#: data/ui/PlayerToolbar.ui:74
 msgid "Previous"
 msgstr "Anterior"
 
-#: data/ui/PlayerToolbar.ui:107
+#: data/ui/PlayerToolbar.ui:106
 msgid "Next"
 msgstr "Següent"
 
@@ -395,11 +335,11 @@ msgstr "Llista de reproducció nova…"
 msgid "Add"
 msgstr "Afegeix"
 
-#: data/ui/PlaylistDialog.ui:200
+#: data/ui/PlaylistDialog.ui:202
 msgid "Add to Playlist"
 msgstr "Afegeix a la llista de reproducció"
 
-#: data/ui/PlaylistDialog.ui:220
+#: data/ui/PlaylistDialog.ui:222
 msgid "_Add"
 msgstr "_Afegeix"
 
@@ -411,7 +351,7 @@ msgstr "Artistes"
 msgid "View All"
 msgstr "Mostra-ho tot"
 
-#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:54
+#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:56
 msgid "Albums"
 msgstr "Àlbums"
 
@@ -439,6 +379,22 @@ msgstr "_Afegeix a la llista de reproducció"
 msgid "_Remove from Playlist"
 msgstr "_Suprimeix de la llista de reproducció"
 
+#: gnomemusic/about.py:238
+msgid "The GNOME Project"
+msgstr "El projecte GNOME"
+
+#: gnomemusic/about.py:242
+msgid "translator-credits"
+msgstr "Jordi Mas i Hernandez <jmas@softcatala.org>"
+
+#: gnomemusic/about.py:246
+msgid "Copyright The GNOME Music Developers"
+msgstr "Copyright de l'equip de desenvolupament del Música del GNOME"
+
+#: gnomemusic/about.py:249
+msgid "Translated by"
+msgstr "Traduït per"
+
 #. TRANSLATORS: this is a playlist name
 #: gnomemusic/grilowrappers/grltrackerplaylists.py:894
 msgid "Most Played"
@@ -580,7 +536,7 @@ msgstr "Resultats d'artistes"
 msgid "Albums Results"
 msgstr "Resultats d'àlbums"
 
-#: gnomemusic/widgets/albumwidget.py:240
+#: gnomemusic/widgets/albumwidget.py:245
 msgid "{} minute"
 msgid_plural "{} minutes"
 msgstr[0] "{} minut"
@@ -613,7 +569,7 @@ msgstr "Sessió iniciada com a {}"
 msgid "Configure"
 msgstr "Configura"
 
-#: gnomemusic/widgets/playertoolbar.py:165
+#: gnomemusic/widgets/playertoolbar.py:167
 msgid "Pause"
 msgstr "Fes una pausa"
 
@@ -623,6 +579,32 @@ msgid_plural "{} Songs"
 msgstr[0] "{} cançó"
 msgstr[1] "{} cançons"
 
+#~ msgid "A music player and management application for GNOME."
+#~ msgstr "Una aplicació de reproducció i gestió de música pel GNOME."
+
+#~ msgid "Visit GNOME Music website"
+#~ msgstr "Visiteu el lloc web del Música del GNOME"
+
+#~ msgid ""
+#~ "GNOME Music is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
+#~ "\n"
+#~ "GNOME Music is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License along with GNOME Music; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
+#~ "\n"
+#~ "The GNOME Music authors hereby grant permission for non-GPL compatible GStreamer plugins to be used and distributed together with GStreamer and GNOME Music.  This permission is above and beyond the permissions granted by the GPL license by which GNOME Music is covered.  If you modify this code, you may extend this exception to your version of the code, but you are not obligated to do so.  If you do not wish to do so, delete this exception statement from your version."
+#~ msgstr ""
+#~ "El Música del GNOME és programari lliure; podeu redistribuir-lo i/o modificar-lo segons els termes de la llicència pública general GNU publicada per la Free Software Foundation; sigui la versió 2 de la llicència o (segons la vostra opció) qualsevol versió posterior.\n"
+#~ "\n"
+#~ "El Música del GNOME es distribueix amb l'esperança que sigui útil, però SENSE CAP GARANTIA; ni tan sols amb la garantia implícita de COMERCIALITZACIÓ o IDONEÏTAT PER A UN PROPÒSIT PARTICULAR. Vegeu la Llicència Pública General GNU per més detalls.\n"
+#~ "\n"
+#~ "Heu de rebre una còpia de la Llicència Pública General GNU amb el Música del GNOME; si no és el cas, escriviu a la Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
+#~ "\n"
+#~ "Els autors del Música del GNOME permeten l'ús i distribució conjunta del Música del GNOME amb connectors GStreamer no compatibles amb la GPL. Aquest permís està per sobre dels permisos garantits per la llicència GPL sota la qual es troba el Música del GNOME. Si modifiqueu aquest codi, podeu estendre aquesta excepció a la vostra versió del codi, però no esteu obligat a fer-ho. Si no voleu fer-ho, elimineu aquesta declaració d'excepció de la vostra versió."
+
+#~ msgid "The contents of your Music Folder will appear here"
+#~ msgstr "Els continguts de la carpeta Música apareixeran aquí."
+
 #~ msgid "GNOME Music"
 #~ msgstr "Música del GNOME"
 
diff --git a/po/cs.po b/po/cs.po
index 333dc96b..ff887502 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-music\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-music/issues\n"
-"POT-Creation-Date: 2022-02-19 12:39+0000\n"
-"PO-Revision-Date: 2022-02-21 10:11+0100\n"
+"POT-Creation-Date: 2022-08-27 13:27+0000\n"
+"PO-Revision-Date: 2022-09-02 23:30+0200\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: čeština <gnome-cs-list@gnome.org>\n"
 "Language: cs\n"
@@ -22,8 +22,8 @@ msgstr ""
 "X-Generator: Poedit 2.2.3\n"
 
 #: data/org.gnome.Music.appdata.xml.in.in:6
-#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/application.py:61
-#: gnomemusic/window.py:71
+#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/about.py:236
+#: gnomemusic/application.py:61 gnomemusic/window.py:71
 msgid "Music"
 msgstr "Hudba"
 
@@ -44,7 +44,7 @@ msgstr ""
 "Vyhledávejte skladby ve své místní sbírce, používejte automaticky "
 "vygenerované seznamy skladeb nebo si vytvořte své vlastní."
 
-#: data/org.gnome.Music.appdata.xml.in.in:149
+#: data/org.gnome.Music.appdata.xml.in.in:167
 msgid "The GNOME Music developers"
 msgstr "Vývojáři Hudby GNOME"
 
@@ -120,79 +120,21 @@ msgstr ""
 "Povolí nebo zakáže zasílání informací o dříve a právě přehrávaných skladbách "
 "do služby Last.fm."
 
-#: data/ui/AboutDialog.ui.in:9
-msgid "Copyright © 2018 GNOME Music Developers"
-msgstr "Copyright © 2018 Vývojáři Hudby GNOME"
-
-#: data/ui/AboutDialog.ui.in:10
-msgid "A music player and management application for GNOME."
-msgstr "Aplikace pro prostředí GNOME sloužící k přehrávání a správě hudby."
-
-#: data/ui/AboutDialog.ui.in:12
-msgid "Visit GNOME Music website"
-msgstr "Navštívit webové stránky Hudby GNOME"
-
-#: data/ui/AboutDialog.ui.in:13
-msgid ""
-"GNOME Music is free software; you can redistribute it and/or modify it under "
-"the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"GNOME Music is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
-"\n"
-"The GNOME Music authors hereby grant permission for non-GPL compatible "
-"GStreamer plugins to be used and distributed together with GStreamer and "
-"GNOME Music.  This permission is above and beyond the permissions granted by "
-"the GPL license by which GNOME Music is covered.  If you modify this code, "
-"you may extend this exception to your version of the code, but you are not "
-"obligated to do so.  If you do not wish to do so, delete this exception "
-"statement from your version."
-msgstr ""
-"Hudba GNOME (v originálním znění GNOME Music) je svobodný software: Můžete "
-"jej dále šířit a/nebo upravovat za podmínek licence GNU General Public "
-"License v podobě, v jaké ji vydala Free Software Foundation, a to buď ve "
-"verzi 2 této licence nebo (dle vaší volby) v libovolné novější verzi.\n"
-"\n"
-"Aplikace Hudba GNOME je šířena ve víře, že bude užitečná, ale BEZ "
-"JAKÝCHKOLIV ZÁRUK, a to i bez předpokládané záruky na PRODEJNOST nebo "
-"VHODNOST PRO KONKRÉTNÍ ÚČEL. Více podrobností najdete přímo v licenci GNU "
-"General Public License.\n"
-"\n"
-"Spolu s aplikací Hudba byste měli obdržet kopii GNU General Public License. "
-"Pokud se tak nestalo, napište na Free Software Foundation, Inc., 51 Franklin "
-"Street, Fifth Floor, Boston, MA  02110-1301, USA.\n"
-"\n"
-"Autoři Hudby GNOME tímto udělují svolení, aby zásuvné moduly GStreamer, "
-"které nejsou kompatibilní s GPL, byly používány a šířeny spolu s programy "
-"GStreamer a Hudba GNOME. Toto oprávnění je nad rámec oprávnění poskytovaných "
-"licencí GPL, která pokrývá Hudbu GNOME. Pokud provedete změny v jejím "
-"zdrojovém kódu, můžete tuto výjimku vztáhnout i na svoji verzi kódu, ale "
-"nejste povinni tak učinit. Pokud si tak učinit nepřejete, odstraňte tento "
-"odstavec s výjimkou ze svojí verze."
-
-#: data/ui/AlbumWidget.ui:86 data/ui/PlayerToolbar.ui:88
-#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:168
+#: data/ui/AlbumWidget.ui:84 data/ui/PlayerToolbar.ui:87
+#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:170
 msgid "Play"
 msgstr "Přehrát"
 
-#: data/ui/AlbumWidget.ui:132 data/ui/PlaylistControls.ui:5
+#: data/ui/AlbumWidget.ui:130 data/ui/PlaylistControls.ui:5
 #: data/ui/SongWidgetMenu.ui:11
 msgid "_Play"
 msgstr "_Přehrát"
 
-#: data/ui/AlbumWidget.ui:136
+#: data/ui/AlbumWidget.ui:134
 msgid "Add to _Favorite Songs"
 msgstr "Přidat do o_blíbených skladeb"
 
-#: data/ui/AlbumWidget.ui:140 data/ui/SongWidgetMenu.ui:15
+#: data/ui/AlbumWidget.ui:138 data/ui/SongWidgetMenu.ui:15
 msgid "_Add to Playlist…"
 msgstr "Přid_at do seznamu k přehrání…"
 
@@ -216,7 +158,7 @@ msgstr "_Nápověda"
 msgid "_About Music"
 msgstr "O _aplikaci Hudba"
 
-#: data/ui/EmptyView.ui:26 data/ui/InitialState.ui:13
+#: data/ui/EmptyView.ui:30
 msgid "Welcome to Music"
 msgstr "Vítejte v Hudbě"
 
@@ -228,7 +170,7 @@ msgstr "Nabídka"
 msgid "Select"
 msgstr "Vybrat"
 
-#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:211
+#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:213
 #: data/ui/SearchHeaderBar.ui:20
 msgid "_Cancel"
 msgstr "_Zrušit"
@@ -326,10 +268,6 @@ msgctxt "shortcut window"
 msgid "Go back"
 msgstr "Přejít zpět"
 
-#: data/ui/InitialState.ui:25
-msgid "The contents of your Music Folder will appear here"
-msgstr "Zde se objeví obsah vaší složky Hudba."
-
 #: data/ui/LastfmDialog.ui:21
 msgid ""
 "Last.fm is a music discovery service that gives you personalised "
@@ -352,11 +290,11 @@ msgstr ""
 msgid "Login"
 msgstr "Přihlásit"
 
-#: data/ui/PlayerToolbar.ui:75
+#: data/ui/PlayerToolbar.ui:74
 msgid "Previous"
 msgstr "Předchozí"
 
-#: data/ui/PlayerToolbar.ui:107
+#: data/ui/PlayerToolbar.ui:106
 msgid "Next"
 msgstr "Následující"
 
@@ -392,11 +330,11 @@ msgstr "Nový seznam k přehrání…"
 msgid "Add"
 msgstr "Přidat"
 
-#: data/ui/PlaylistDialog.ui:200
+#: data/ui/PlaylistDialog.ui:202
 msgid "Add to Playlist"
 msgstr "Přidání do seznamu k přehrání"
 
-#: data/ui/PlaylistDialog.ui:220
+#: data/ui/PlaylistDialog.ui:222
 msgid "_Add"
 msgstr "Přid_at"
 
@@ -408,7 +346,7 @@ msgstr "Umělci"
 msgid "View All"
 msgstr "Zobrazit vše"
 
-#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:54
+#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:56
 msgid "Albums"
 msgstr "Alba"
 
@@ -436,6 +374,22 @@ msgstr "Přid_at do seznamu k přehrání"
 msgid "_Remove from Playlist"
 msgstr "Odeb_rat ze seznamu k přehrání"
 
+#: gnomemusic/about.py:238
+msgid "The GNOME Project"
+msgstr "Projekt GNOME"
+
+#: gnomemusic/about.py:242
+msgid "translator-credits"
+msgstr "Marek Černocký <marek@manet.cz>"
+
+#: gnomemusic/about.py:246
+msgid "Copyright The GNOME Music Developers"
+msgstr "Copyright vývojáři Hudby GNOME"
+
+#: gnomemusic/about.py:249
+msgid "Translated by"
+msgstr "Přeložili"
+
 #. TRANSLATORS: this is a playlist name
 #: gnomemusic/grilowrappers/grltrackerplaylists.py:894
 msgid "Most Played"
@@ -579,7 +533,7 @@ msgstr "Nalezení umělci"
 msgid "Albums Results"
 msgstr "Nalezená alba"
 
-#: gnomemusic/widgets/albumwidget.py:240
+#: gnomemusic/widgets/albumwidget.py:245
 msgid "{} minute"
 msgid_plural "{} minutes"
 msgstr[0] "{} minuta"
@@ -614,7 +568,7 @@ msgstr "Přihlášeno pod jménem {}"
 msgid "Configure"
 msgstr "Nastavit"
 
-#: gnomemusic/widgets/playertoolbar.py:165
+#: gnomemusic/widgets/playertoolbar.py:167
 msgid "Pause"
 msgstr "Pozastavit"
 
diff --git a/po/da.po b/po/da.po
index dc79bd9d..c6c3f2e3 100644
--- a/po/da.po
+++ b/po/da.po
@@ -5,14 +5,14 @@
 # Ask Hjorth Larsen <asklarsen@gmail.com>, 2015, 2016, 2017, 2018.
 # scootergrisen, 2015, 2020.
 # Joe Hansen <joedalton2@yahoo.dk>, 2017.
-# Alan Mortensen <alanmortensen.am@gmail.com>, 2019-21.
+# Alan Mortensen <alanmortensen.am@gmail.com>, 2019-22.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-music master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-music/issues\n"
-"POT-Creation-Date: 2022-02-19 12:39+0000\n"
-"PO-Revision-Date: 2022-03-06 14:12+0100\n"
+"POT-Creation-Date: 2022-08-27 13:27+0000\n"
+"PO-Revision-Date: 2022-08-29 19:27+0200\n"
 "Last-Translator: Alan Mortensen <alanmortensen.am@gmail.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "Language: da\n"
@@ -23,8 +23,8 @@ msgstr ""
 "X-Generator: Poedit 2.3\n"
 
 #: data/org.gnome.Music.appdata.xml.in.in:6
-#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/application.py:61
-#: gnomemusic/window.py:71
+#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/about.py:236
+#: gnomemusic/application.py:61 gnomemusic/window.py:71
 msgid "Music"
 msgstr "Musik"
 
@@ -45,7 +45,7 @@ msgstr ""
 "Find musiknumre i din lokale samling, brug automatisk genereret "
 "afspilningslister eller kuratér en ny."
 
-#: data/org.gnome.Music.appdata.xml.in.in:149
+#: data/org.gnome.Music.appdata.xml.in.in:167
 msgid "The GNOME Music developers"
 msgstr "GNOME Musik-udviklerne"
 
@@ -122,79 +122,21 @@ msgstr ""
 "Aktiverer eller deaktiverer, at der sendes “scrobbler” og “afspilles nu”-"
 "information til Last.fm."
 
-#: data/ui/AboutDialog.ui.in:9
-msgid "Copyright © 2018 GNOME Music Developers"
-msgstr "Ophavsret © 2018 GNOME Musik-udviklerne"
-
-#: data/ui/AboutDialog.ui.in:10
-msgid "A music player and management application for GNOME."
-msgstr "En musikafspiller og håndteringsprogram til GNOME."
-
-#: data/ui/AboutDialog.ui.in:12
-msgid "Visit GNOME Music website"
-msgstr "Besøg GNOME Musiks websted"
-
-#: data/ui/AboutDialog.ui.in:13
-msgid ""
-"GNOME Music is free software; you can redistribute it and/or modify it under "
-"the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"GNOME Music is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
-"\n"
-"The GNOME Music authors hereby grant permission for non-GPL compatible "
-"GStreamer plugins to be used and distributed together with GStreamer and "
-"GNOME Music.  This permission is above and beyond the permissions granted by "
-"the GPL license by which GNOME Music is covered.  If you modify this code, "
-"you may extend this exception to your version of the code, but you are not "
-"obligated to do so.  If you do not wish to do so, delete this exception "
-"statement from your version."
-msgstr ""
-"GNOME Musik er fri software. Du kan redistribuere og/eller modificere det "
-"under de betingelser, som er angivet i GNU General Public License, som er "
-"udgivet af Free Software Foundation. Enten version 2 af licensen eller "
-"(efter eget valg) enhver senere version.\n"
-"\n"
-"GNOME Musik distribueres i håb om, at det vil vise sig nyttigt, men UDEN "
-"NOGEN FORM FOR GARANTI, uden selv de underforståede garantier omkring "
-"SALGBARHED eller EGNETHED TIL ET BESTEMT FORMÅL. Yderligere detaljer kan "
-"læses i GNU General Public License.\n"
-"\n"
-"Du bør have modtaget en kopi af GNU General Public License sammen med GNOME "
-"Musik. Hvis ikke, så skriv til Free software Foundation, Inc., 51 Franklin "
-"Street, Fifth Floor, Boston, MA 02110-1301, USA.\n"
-"\n"
-"Forfatterne af GNOME Musik giver hermed tilladelse til, at ikke-GPL-"
-"kompatible GStreamer-udvidelsesmoduler kan bruges og distribueres sammen med "
-"GStreamer og GNOME Musik. Denne tilladelse tilsidesætter tilladelserne givet "
-"af GPL-licensen, som GNOME Musik er dækket af. Hvis du ændrer denne kode, "
-"kan du udvide denne undtagelse til din version af koden, men du er ikke "
-"forpligtet til at gøre det. Hvis du ikke ønsker at gøre dette, sletter du "
-"blot denne erklæring om undtagelse fra din version."
-
-#: data/ui/AlbumWidget.ui:86 data/ui/PlayerToolbar.ui:88
-#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:168
+#: data/ui/AlbumWidget.ui:84 data/ui/PlayerToolbar.ui:87
+#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:170
 msgid "Play"
 msgstr "Afspil"
 
-#: data/ui/AlbumWidget.ui:132 data/ui/PlaylistControls.ui:5
+#: data/ui/AlbumWidget.ui:130 data/ui/PlaylistControls.ui:5
 #: data/ui/SongWidgetMenu.ui:11
 msgid "_Play"
 msgstr "_Afspil"
 
-#: data/ui/AlbumWidget.ui:136
+#: data/ui/AlbumWidget.ui:134
 msgid "Add to _Favorite Songs"
 msgstr "Tilføj til _yndlingssange"
 
-#: data/ui/AlbumWidget.ui:140 data/ui/SongWidgetMenu.ui:15
+#: data/ui/AlbumWidget.ui:138 data/ui/SongWidgetMenu.ui:15
 msgid "_Add to Playlist…"
 msgstr "_Tilføj til afspilningsliste …"
 
@@ -218,7 +160,7 @@ msgstr "_Hjælp"
 msgid "_About Music"
 msgstr "_Om Musik"
 
-#: data/ui/EmptyView.ui:26 data/ui/InitialState.ui:13
+#: data/ui/EmptyView.ui:30
 msgid "Welcome to Music"
 msgstr "Velkommen til Musik"
 
@@ -230,7 +172,7 @@ msgstr "Menu"
 msgid "Select"
 msgstr "Vælg"
 
-#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:211
+#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:213
 #: data/ui/SearchHeaderBar.ui:20
 msgid "_Cancel"
 msgstr "_Annullér"
@@ -328,10 +270,6 @@ msgctxt "shortcut window"
 msgid "Go back"
 msgstr "Gå tilbage"
 
-#: data/ui/InitialState.ui:25
-msgid "The contents of your Music Folder will appear here"
-msgstr "Indholdet af din musikmappe vil blive vist her."
-
 #: data/ui/LastfmDialog.ui:21
 msgid ""
 "Last.fm is a music discovery service that gives you personalised "
@@ -353,11 +291,11 @@ msgstr ""
 msgid "Login"
 msgstr "Log ind"
 
-#: data/ui/PlayerToolbar.ui:75
+#: data/ui/PlayerToolbar.ui:74
 msgid "Previous"
 msgstr "Forrige"
 
-#: data/ui/PlayerToolbar.ui:107
+#: data/ui/PlayerToolbar.ui:106
 msgid "Next"
 msgstr "Næste"
 
@@ -393,11 +331,11 @@ msgstr "Ny afspilningsliste …"
 msgid "Add"
 msgstr "Tilføj"
 
-#: data/ui/PlaylistDialog.ui:200
+#: data/ui/PlaylistDialog.ui:202
 msgid "Add to Playlist"
 msgstr "Tilføj til afspilningsliste"
 
-#: data/ui/PlaylistDialog.ui:220
+#: data/ui/PlaylistDialog.ui:222
 msgid "_Add"
 msgstr "_Tilføj"
 
@@ -409,7 +347,7 @@ msgstr "Kunstnere"
 msgid "View All"
 msgstr "Vis alle"
 
-#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:54
+#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:56
 msgid "Albums"
 msgstr "Album"
 
@@ -437,6 +375,31 @@ msgstr "_Tilføj til afspilningsliste"
 msgid "_Remove from Playlist"
 msgstr "_Fjern fra afspilningsliste"
 
+#: gnomemusic/about.py:238
+msgid "The GNOME Project"
+msgstr "GNOME-projektet"
+
+#: gnomemusic/about.py:242
+msgid "translator-credits"
+msgstr ""
+"Ask Hjorth Larsen\n"
+"Kris Thomsen\n"
+"scootergrisen\n"
+"Joe Hansen\n"
+"Alan Mortensen\n"
+"\n"
+"Dansk-gruppen\n"
+"Websted http://dansk-gruppen.dk\n"
+"E-mail <dansk@dansk-gruppen.dk>"
+
+#: gnomemusic/about.py:246
+msgid "Copyright The GNOME Music Developers"
+msgstr "Ophavsret GNOME Musik-udviklerne"
+
+#: gnomemusic/about.py:249
+msgid "Translated by"
+msgstr "Oversat af"
+
 #. TRANSLATORS: this is a playlist name
 #: gnomemusic/grilowrappers/grltrackerplaylists.py:894
 msgid "Most Played"
@@ -577,7 +540,7 @@ msgstr "Resultater — kunstnere"
 msgid "Albums Results"
 msgstr "Resultater — albummer"
 
-#: gnomemusic/widgets/albumwidget.py:240
+#: gnomemusic/widgets/albumwidget.py:245
 msgid "{} minute"
 msgid_plural "{} minutes"
 msgstr[0] "{} minut"
@@ -610,7 +573,7 @@ msgstr "Logget ind som {}"
 msgid "Configure"
 msgstr "Konfigurér"
 
-#: gnomemusic/widgets/playertoolbar.py:165
+#: gnomemusic/widgets/playertoolbar.py:167
 msgid "Pause"
 msgstr "Pause"
 
@@ -620,6 +583,60 @@ msgid_plural "{} Songs"
 msgstr[0] "{} sang"
 msgstr[1] "{} sange"
 
+#~ msgid "A music player and management application for GNOME."
+#~ msgstr "En musikafspiller og håndteringsprogram til GNOME."
+
+#~ msgid "Visit GNOME Music website"
+#~ msgstr "Besøg GNOME Musiks websted"
+
+#~ msgid ""
+#~ "GNOME Music is free software; you can redistribute it and/or modify it "
+#~ "under the terms of the GNU General Public License as published by the "
+#~ "Free Software Foundation; either version 2 of the License, or (at your "
+#~ "option) any later version.\n"
+#~ "\n"
+#~ "GNOME Music is distributed in the hope that it will be useful, but "
+#~ "WITHOUT ANY WARRANTY; without even the implied warranty of "
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General "
+#~ "Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License along "
+#~ "with GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
+#~ "Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
+#~ "\n"
+#~ "The GNOME Music authors hereby grant permission for non-GPL compatible "
+#~ "GStreamer plugins to be used and distributed together with GStreamer and "
+#~ "GNOME Music.  This permission is above and beyond the permissions granted "
+#~ "by the GPL license by which GNOME Music is covered.  If you modify this "
+#~ "code, you may extend this exception to your version of the code, but you "
+#~ "are not obligated to do so.  If you do not wish to do so, delete this "
+#~ "exception statement from your version."
+#~ msgstr ""
+#~ "GNOME Musik er fri software. Du kan redistribuere og/eller modificere det "
+#~ "under de betingelser, som er angivet i GNU General Public License, som er "
+#~ "udgivet af Free Software Foundation. Enten version 2 af licensen eller "
+#~ "(efter eget valg) enhver senere version.\n"
+#~ "\n"
+#~ "GNOME Musik distribueres i håb om, at det vil vise sig nyttigt, men UDEN "
+#~ "NOGEN FORM FOR GARANTI, uden selv de underforståede garantier omkring "
+#~ "SALGBARHED eller EGNETHED TIL ET BESTEMT FORMÅL. Yderligere detaljer kan "
+#~ "læses i GNU General Public License.\n"
+#~ "\n"
+#~ "Du bør have modtaget en kopi af GNU General Public License sammen med "
+#~ "GNOME Musik. Hvis ikke, så skriv til Free software Foundation, Inc., 51 "
+#~ "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n"
+#~ "\n"
+#~ "Forfatterne af GNOME Musik giver hermed tilladelse til, at ikke-GPL-"
+#~ "kompatible GStreamer-udvidelsesmoduler kan bruges og distribueres sammen "
+#~ "med GStreamer og GNOME Musik. Denne tilladelse tilsidesætter "
+#~ "tilladelserne givet af GPL-licensen, som GNOME Musik er dækket af. Hvis "
+#~ "du ændrer denne kode, kan du udvide denne undtagelse til din version af "
+#~ "koden, men du er ikke forpligtet til at gøre det. Hvis du ikke ønsker at "
+#~ "gøre dette, sletter du blot denne erklæring om undtagelse fra din version."
+
+#~ msgid "The contents of your Music Folder will appear here"
+#~ msgstr "Indholdet af din musikmappe vil blive vist her."
+
 #~ msgid "GNOME Music"
 #~ msgstr "GNOME Musik"
 
diff --git a/po/de.po b/po/de.po
index 0b64c81d..d71f69a4 100644
--- a/po/de.po
+++ b/po/de.po
@@ -12,7 +12,7 @@
 # Vinzenz Vietzke <vinz@vinzv.de>, 2018.
 # Mario Blättermann <mario.blaettermann@gmail.com>, 2013, 2016-2018, 2020.
 # Wolfgang Stöggl <c72578@yahoo.de>, 2014-2015, 2020.
-# Tim Sabsch <tim@sabsch.com>, 2019-2020.
+# Tim Sabsch <tim@sabsch.com>, 2019-2020, 2022.
 # Philipp Kiemle <philipp.kiemle@gmail.com>, 2021-2022.
 #
 #
@@ -20,20 +20,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-music master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-music/issues\n"
-"POT-Creation-Date: 2022-02-19 12:39+0000\n"
-"PO-Revision-Date: 2022-03-14 01:39+0100\n"
-"Last-Translator: Philipp Kiemle <philipp.kiemle@gmail.com>\n"
+"POT-Creation-Date: 2022-09-15 19:30+0000\n"
+"PO-Revision-Date: 2022-09-19 22:14+0200\n"
+"Last-Translator: Tim Sabsch <tim@sabsch.com>\n"
 "Language-Team: Deutsch <gnome-de@gnome.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.0\n"
+"X-Generator: Poedit 3.1.1\n"
 
 #: data/org.gnome.Music.appdata.xml.in.in:6
-#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/application.py:61
-#: gnomemusic/window.py:71
+#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/about.py:236
+#: gnomemusic/application.py:61 gnomemusic/window.py:71
 msgid "Music"
 msgstr "Musik"
 
@@ -56,7 +56,7 @@ msgstr ""
 "generierte Wiedergabelisten oder stellen Sie eine neue Wiedergabeliste "
 "zusammen."
 
-#: data/org.gnome.Music.appdata.xml.in.in:149
+#: data/org.gnome.Music.appdata.xml.in.in:167
 msgid "The GNOME Music developers"
 msgstr "Die GNOME-Musik-Entwickler"
 
@@ -105,11 +105,13 @@ msgstr ""
 
 #: data/org.gnome.Music.gschema.xml:28
 msgid "Enable ReplayGain"
-msgstr "ReplayGain aktivieren"
+msgstr "Lautstärken anpassen"
 
 #: data/org.gnome.Music.gschema.xml:29
 msgid "Enables or disables ReplayGain for albums"
-msgstr "Legt fest, ob ReplayGain für Alben aktiviert werden soll"
+msgstr ""
+"Legt fest, ob Lautstärken zwischen Titeln in Alben angepasst werden sollen "
+"(»ReplayGain«)"
 
 #: data/org.gnome.Music.gschema.xml:33
 msgid "Inhibit system suspend"
@@ -134,82 +136,21 @@ msgstr ""
 "Aktiviert/Deaktiviert das Senden von Informationen zu Scrobbeln und »Wird "
 "derzeit abgespielt« an Last.fm."
 
-#: data/ui/AboutDialog.ui.in:9
-msgid "Copyright © 2018 GNOME Music Developers"
-msgstr "Copyright © 2018 GNOME-Musik-Entwickler"
-
-#: data/ui/AboutDialog.ui.in:10
-msgid "A music player and management application for GNOME."
-msgstr "Eine Anwendung für Musikwiedergabe und -verwaltung für GNOME."
-
-#: data/ui/AboutDialog.ui.in:12
-msgid "Visit GNOME Music website"
-msgstr "Besuchen Sie die GNOME-Musik-Webseite"
-
-#: data/ui/AboutDialog.ui.in:13
-msgid ""
-"GNOME Music is free software; you can redistribute it and/or modify it under "
-"the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"GNOME Music is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
-"\n"
-"The GNOME Music authors hereby grant permission for non-GPL compatible "
-"GStreamer plugins to be used and distributed together with GStreamer and "
-"GNOME Music.  This permission is above and beyond the permissions granted by "
-"the GPL license by which GNOME Music is covered.  If you modify this code, "
-"you may extend this exception to your version of the code, but you are not "
-"obligated to do so.  If you do not wish to do so, delete this exception "
-"statement from your version."
-msgstr ""
-"GNOME Musik ist freie Software. Sie können es weitergeben und/oder "
-"verändern, solange Sie sich an die Regeln der »GNU General Public License« "
-"halten, so wie sie von der Free Software Foundation festgelegt wurden; "
-"entweder in Version 2 der Lizenz oder (nach Ihrem Ermessen) in jeder neueren "
-"Version.\n"
-"\n"
-"GNOME Musik wurde mit dem Ziel veröffentlicht, dass Sie es nützlich finden, "
-"jedoch OHNE JEGLICHE GARANTIE, sogar ohne eine implizite Garantie der "
-"VERKAUFBARKEIT oder der VERWENDBARKEIT FÜR EINEN SPEZIELLEN ZWECK.  Schauen "
-"Sie für weitere Informationen bitte in der »GNU General Public License« (GNU "
-"GPL) nach.\n"
-"\n"
-"Zusammen mit GNOME Musik sollten Sie außerdem eine Kopie der »GNU General "
-"Public License« erhalten haben. Wenn dem nicht so ist, so schreiben Sie "
-"bitte an die Free Software Foundation, Inc., 51 Franklin Street, Fifth "
-"Floor, Boston, MA 02110-1301, USA.\n"
-"\n"
-"Die Autoren von GNOME Musik gewähren hiermit das Recht für die Nutzung von "
-"nicht-GPL-kompatiblen GStreamer-Erweiterungen und den Vertrieb zusammen mit "
-"GStreamer und GNOME Musik.  Dies geht über die Berechtigungen hinaus, die "
-"von der GPL-Lizenz gewährt werden, der GNOME Musik unterliegt.  Wenn Sie "
-"diesen Code verändern, dürfen Sie diese Ausnahme auf Ihren Code erweitern, "
-"jedoch sind Sie nicht dazu verpflichtet.  Wenn Sie dies nicht wünschen, "
-"entfernen Sie diese Ausnahmeerklärung aus Ihrer Version."
-
-#: data/ui/AlbumWidget.ui:86 data/ui/PlayerToolbar.ui:88
-#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:168
+#: data/ui/AlbumWidget.ui:84 data/ui/PlayerToolbar.ui:87
+#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:170
 msgid "Play"
 msgstr "Wiedergeben"
 
-#: data/ui/AlbumWidget.ui:132 data/ui/PlaylistControls.ui:5
+#: data/ui/AlbumWidget.ui:130 data/ui/PlaylistControls.ui:5
 #: data/ui/SongWidgetMenu.ui:11
 msgid "_Play"
 msgstr "_Wiedergabe"
 
-#: data/ui/AlbumWidget.ui:136
+#: data/ui/AlbumWidget.ui:134
 msgid "Add to _Favorite Songs"
 msgstr "Zu _Lieblingstiteln hinzufügen"
 
-#: data/ui/AlbumWidget.ui:140 data/ui/SongWidgetMenu.ui:15
+#: data/ui/AlbumWidget.ui:138 data/ui/SongWidgetMenu.ui:15
 msgid "_Add to Playlist…"
 msgstr "Zu _Wiedergabeliste hinzufügen …"
 
@@ -233,7 +174,7 @@ msgstr "_Hilfe"
 msgid "_About Music"
 msgstr "_Info zu Musik"
 
-#: data/ui/EmptyView.ui:26 data/ui/InitialState.ui:13
+#: data/ui/EmptyView.ui:30
 msgid "Welcome to Music"
 msgstr "Willkommen bei Musik"
 
@@ -245,7 +186,7 @@ msgstr "Menü"
 msgid "Select"
 msgstr "Auswählen"
 
-#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:211
+#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:213
 #: data/ui/SearchHeaderBar.ui:20
 msgid "_Cancel"
 msgstr "A_bbrechen"
@@ -343,10 +284,6 @@ msgctxt "shortcut window"
 msgid "Go back"
 msgstr "Zurück gehen"
 
-#: data/ui/InitialState.ui:25
-msgid "The contents of your Music Folder will appear here"
-msgstr "Der Inhalt Ihres »Musik«-Ordners wird hier angezeigt werden."
-
 #: data/ui/LastfmDialog.ui:21
 msgid ""
 "Last.fm is a music discovery service that gives you personalised "
@@ -368,11 +305,11 @@ msgstr ""
 msgid "Login"
 msgstr "Anmelden"
 
-#: data/ui/PlayerToolbar.ui:75
+#: data/ui/PlayerToolbar.ui:74
 msgid "Previous"
 msgstr "Vorheriges"
 
-#: data/ui/PlayerToolbar.ui:107
+#: data/ui/PlayerToolbar.ui:106
 msgid "Next"
 msgstr "Nächstes"
 
@@ -408,11 +345,11 @@ msgstr "Neue Wiedergabeliste …"
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: data/ui/PlaylistDialog.ui:200
+#: data/ui/PlaylistDialog.ui:202
 msgid "Add to Playlist"
 msgstr "Zur Wiedergabeliste hinzufügen"
 
-#: data/ui/PlaylistDialog.ui:220
+#: data/ui/PlaylistDialog.ui:222
 msgid "_Add"
 msgstr "_Hinzufügen"
 
@@ -424,7 +361,7 @@ msgstr "Künstler"
 msgid "View All"
 msgstr "Alle ansehen"
 
-#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:54
+#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:56
 msgid "Albums"
 msgstr "Alben"
 
@@ -452,6 +389,31 @@ msgstr "Zur Wiedergabeliste _hinzufügen"
 msgid "_Remove from Playlist"
 msgstr "Aus der Wiedergabeliste _entfernen"
 
+#: gnomemusic/about.py:238
+msgid "The GNOME Project"
+msgstr "Das GNOME-Projekt"
+
+#: gnomemusic/about.py:242
+msgid "translator-credits"
+msgstr ""
+"Tobias Endrigkeit <tobiasendrigkeit@outlook.com>\n"
+"Christian Kirbach <christian.kirbach@gmail.com>\n"
+"Benjamin Steinwender <b@stbe.at>\n"
+"Bernd Homuth <dev@hmt.im>\n"
+"Vinzenz Vietzke <vinz@vinzv.de>\n"
+"Mario Blättermann <mario.blaettermann@gmail.com>\n"
+"Wolfgang Stöggl <c72578@yahoo.de>\n"
+"Tim Sabsch <tim@sabsch.com>\n"
+"Philipp Kiemle <philipp.kiemle@gmail.com>"
+
+#: gnomemusic/about.py:246
+msgid "Copyright The GNOME Music Developers"
+msgstr "Copyright Die GNOME-Musik-Entwickler"
+
+#: gnomemusic/about.py:249
+msgid "Translated by"
+msgstr "Übersetzung von"
+
 #. TRANSLATORS: this is a playlist name
 #: gnomemusic/grilowrappers/grltrackerplaylists.py:894
 msgid "Most Played"
@@ -595,7 +557,7 @@ msgstr "Künstler-Ergebnisse"
 msgid "Albums Results"
 msgstr "Alben-Ergebnisse"
 
-#: gnomemusic/widgets/albumwidget.py:240
+#: gnomemusic/widgets/albumwidget.py:245
 msgid "{} minute"
 msgid_plural "{} minutes"
 msgstr[0] "{} Minute"
@@ -628,7 +590,7 @@ msgstr "Angemeldet als {}"
 msgid "Configure"
 msgstr "Einrichten"
 
-#: gnomemusic/widgets/playertoolbar.py:165
+#: gnomemusic/widgets/playertoolbar.py:167
 msgid "Pause"
 msgstr "Pause"
 
@@ -638,6 +600,64 @@ msgid_plural "{} Songs"
 msgstr[0] "{} Titel"
 msgstr[1] "{} Titel"
 
+#~ msgid "A music player and management application for GNOME."
+#~ msgstr "Eine Anwendung für Musikwiedergabe und -verwaltung für GNOME."
+
+#~ msgid "Visit GNOME Music website"
+#~ msgstr "Besuchen Sie die GNOME-Musik-Webseite"
+
+#~ msgid ""
+#~ "GNOME Music is free software; you can redistribute it and/or modify it "
+#~ "under the terms of the GNU General Public License as published by the "
+#~ "Free Software Foundation; either version 2 of the License, or (at your "
+#~ "option) any later version.\n"
+#~ "\n"
+#~ "GNOME Music is distributed in the hope that it will be useful, but "
+#~ "WITHOUT ANY WARRANTY; without even the implied warranty of "
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General "
+#~ "Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License along "
+#~ "with GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
+#~ "Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
+#~ "\n"
+#~ "The GNOME Music authors hereby grant permission for non-GPL compatible "
+#~ "GStreamer plugins to be used and distributed together with GStreamer and "
+#~ "GNOME Music.  This permission is above and beyond the permissions granted "
+#~ "by the GPL license by which GNOME Music is covered.  If you modify this "
+#~ "code, you may extend this exception to your version of the code, but you "
+#~ "are not obligated to do so.  If you do not wish to do so, delete this "
+#~ "exception statement from your version."
+#~ msgstr ""
+#~ "GNOME Musik ist freie Software. Sie können es weitergeben und/oder "
+#~ "verändern, solange Sie sich an die Regeln der »GNU General Public "
+#~ "License« halten, so wie sie von der Free Software Foundation festgelegt "
+#~ "wurden; entweder in Version 2 der Lizenz oder (nach Ihrem Ermessen) in "
+#~ "jeder neueren Version.\n"
+#~ "\n"
+#~ "GNOME Musik wurde mit dem Ziel veröffentlicht, dass Sie es nützlich "
+#~ "finden, jedoch OHNE JEGLICHE GARANTIE, sogar ohne eine implizite Garantie "
+#~ "der VERKAUFBARKEIT oder der VERWENDBARKEIT FÜR EINEN SPEZIELLEN ZWECK.  "
+#~ "Schauen Sie für weitere Informationen bitte in der »GNU General Public "
+#~ "License« (GNU GPL) nach.\n"
+#~ "\n"
+#~ "Zusammen mit GNOME Musik sollten Sie außerdem eine Kopie der »GNU General "
+#~ "Public License« erhalten haben. Wenn dem nicht so ist, so schreiben Sie "
+#~ "bitte an die Free Software Foundation, Inc., 51 Franklin Street, Fifth "
+#~ "Floor, Boston, MA 02110-1301, USA.\n"
+#~ "\n"
+#~ "Die Autoren von GNOME Musik gewähren hiermit das Recht für die Nutzung "
+#~ "von nicht-GPL-kompatiblen GStreamer-Erweiterungen und den Vertrieb "
+#~ "zusammen mit GStreamer und GNOME Musik.  Dies geht über die "
+#~ "Berechtigungen hinaus, die von der GPL-Lizenz gewährt werden, der GNOME "
+#~ "Musik unterliegt.  Wenn Sie diesen Code verändern, dürfen Sie diese "
+#~ "Ausnahme auf Ihren Code erweitern, jedoch sind Sie nicht dazu "
+#~ "verpflichtet.  Wenn Sie dies nicht wünschen, entfernen Sie diese "
+#~ "Ausnahmeerklärung aus Ihrer Version."
+
+#~ msgid "The contents of your Music Folder will appear here"
+#~ msgstr "Der Inhalt Ihres »Musik«-Ordners wird hier angezeigt werden."
+
 #~ msgid "GNOME Music"
 #~ msgstr "GNOME Musik"
 
diff --git a/po/el.po b/po/el.po
index c866114d..b54c555b 100644
--- a/po/el.po
+++ b/po/el.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-music master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-music/issues\n"
-"POT-Creation-Date: 2021-08-27 21:42+0000\n"
-"PO-Revision-Date: 2021-09-01 17:37+0300\n"
+"POT-Creation-Date: 2023-01-25 19:11+0000\n"
+"PO-Revision-Date: 2023-01-27 22:59+0200\n"
 "Last-Translator: Efstathios Iosifidis <eiosifidis@gnome.org>\n"
 "Language-Team: Greek, Modern (1453-) <gnome-el-list@gnome.org>\n"
 "Language: el\n"
@@ -19,12 +19,14 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.3\n"
+"X-Generator: Poedit 3.2.2\n"
 "X-Project-Style: gnome\n"
 
 #: data/org.gnome.Music.appdata.xml.in.in:6
-msgid "GNOME Music"
-msgstr "Μουσική GNOME"
+#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/about.py:236
+#: gnomemusic/application.py:61 gnomemusic/window.py:71
+msgid "Music"
+msgstr "Μουσική"
 
 #: data/org.gnome.Music.appdata.xml.in.in:7
 #: data/org.gnome.Music.desktop.in.in:5
@@ -43,15 +45,10 @@ msgstr ""
 "Βρείτε κομμάτια στην τοπική σας συλλογή, χρησιμοποιήστε αυτόματα "
 "δημιουργημένες λίστες αναπαραγωγής ή επιμεληθείτε μια νέα."
 
-#: data/org.gnome.Music.appdata.xml.in.in:140
+#: data/org.gnome.Music.appdata.xml.in.in:167
 msgid "The GNOME Music developers"
 msgstr "Οι προγραμματιστές του GNOME Music"
 
-#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/application.py:60
-#: gnomemusic/window.py:71
-msgid "Music"
-msgstr "Μουσική"
-
 #: data/org.gnome.Music.desktop.in.in:4
 msgid "Music Player"
 msgstr "Αναπαραγωγή μουσικής"
@@ -70,27 +67,19 @@ msgid "Window size (width and height)."
 msgstr "Μέγεθος παραθύρου (πλάτος και ύψος)."
 
 #: data/org.gnome.Music.gschema.xml:17
-msgid "Window position"
-msgstr "Θέση παραθύρου"
-
-#: data/org.gnome.Music.gschema.xml:18
-msgid "Window position (x and y)."
-msgstr "Θέση παραθύρου (x και y)."
-
-#: data/org.gnome.Music.gschema.xml:22
 msgid "Window maximized"
 msgstr "Μεγιστοποιημένο παράθυρο"
 
-#: data/org.gnome.Music.gschema.xml:23
+#: data/org.gnome.Music.gschema.xml:18
 msgid "Window maximized state."
 msgstr "Κατάσταση μεγιστοποιημένου παραθύρου."
 
-#: data/org.gnome.Music.gschema.xml:27
+#: data/org.gnome.Music.gschema.xml:22
 msgid "Playback repeat mode"
 msgstr "Λειτουργία επανάληψης αναπαραγωγής"
 
 #. Translators: Don't translate allowed values, just the description in the brackets
-#: data/org.gnome.Music.gschema.xml:29
+#: data/org.gnome.Music.gschema.xml:24
 msgid ""
 "Value identifies whether to repeat or randomize playback through the "
 "collection. Allowed values are: “none” (repeat and shuffle are off), "
@@ -103,29 +92,29 @@ msgstr ""
 "λίστας αναπαραγωγής, χωρίς τυχαία σειρά), «shuffle» (τυχαία σειρά λίστας "
 "αναπαραγωγής, προϋποθέτει την επανάληψη όλων)."
 
-#: data/org.gnome.Music.gschema.xml:33
+#: data/org.gnome.Music.gschema.xml:28
 msgid "Enable ReplayGain"
 msgstr "Ενεργοποίηση του ReplayGain"
 
-#: data/org.gnome.Music.gschema.xml:34
+#: data/org.gnome.Music.gschema.xml:29
 msgid "Enables or disables ReplayGain for albums"
 msgstr "Ενεργοποιεί ή απενεργοποιεί το ReplayGain για συλλογές"
 
-#: data/org.gnome.Music.gschema.xml:38
+#: data/org.gnome.Music.gschema.xml:33
 msgid "Inhibit system suspend"
 msgstr "Αναστολή συστήματος αναστολής"
 
-#: data/org.gnome.Music.gschema.xml:39
+#: data/org.gnome.Music.gschema.xml:34
 msgid "Enables or disables inhibiting system suspend while playing music"
 msgstr ""
 "Ενεργοποίηση ή απενεργοποίηση την αναστολή συστήματος αναστολής κατά την "
 "αναπαραγωγή μουσικής"
 
-#: data/org.gnome.Music.gschema.xml:43
+#: data/org.gnome.Music.gschema.xml:38
 msgid "Report music history to Last.fm"
 msgstr "Αναφορά ιστορικού μουσικής στην Last.fm"
 
-#: data/org.gnome.Music.gschema.xml:44
+#: data/org.gnome.Music.gschema.xml:39
 msgid ""
 "Enables or disables sending scrobbles and the “currently playing” info to "
 "Last.fm."
@@ -133,81 +122,21 @@ msgstr ""
 "Ενεργοποιεί ή απενεργοποιεί την αποστολή πληροφοριών αρχείων \"που "
 "αναπαράγονται αυτήν τη στιγμή\" στο Last.fm."
 
-#: data/ui/AboutDialog.ui.in:9
-msgid "Copyright © 2018 GNOME Music Developers"
-msgstr "Πνευματικά δικαιώματα © 2018 GNOME Music Developers"
-
-#: data/ui/AboutDialog.ui.in:10
-msgid "A music player and management application for GNOME."
-msgstr "Εφαρμογή αναπαραγωγής και διαχείρισης μουσικής, για το GNOME."
-
-#: data/ui/AboutDialog.ui.in:12
-msgid "Visit GNOME Music website"
-msgstr "Επισκεφθείτε τον ιστότοπο της εφαρμογής Μουσική GNOME"
-
-#: data/ui/AboutDialog.ui.in:13
-msgid ""
-"GNOME Music is free software; you can redistribute it and/or modify it under "
-"the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"GNOME Music is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
-"\n"
-"The GNOME Music authors hereby grant permission for non-GPL compatible "
-"GStreamer plugins to be used and distributed together with GStreamer and "
-"GNOME Music.  This permission is above and beyond the permissions granted by "
-"the GPL license by which GNOME Music is covered.  If you modify this code, "
-"you may extend this exception to your version of the code, but you are not "
-"obligated to do so.  If you do not wish to do so, delete this exception "
-"statement from your version."
-msgstr ""
-"Η Μουσική GNOME είναι ελεύθερο λογισμικό. Μπορείτε να το αναδιανείμετε ή/και "
-"να το τροποποιήσετε, υπό τους όρους της άδειας GNU General Public License, "
-"όπως αυτή εκδίδεται από το Ίδρυμα Ελεύθερου Λογισμικού (Free Software "
-"Foundation), είτε της έκδοσης 2 της άδειας, είτε (κατ' επιλογήν σας) "
-"οποιασδήποτε άλλης μεταγενέστερης έκδοσης.\n"
-"\n"
-"Το GNOME Music διανέμεται με την ελπίδα πως θα είναι χρήσιμο, αλλά ΧΩΡΙΣ "
-"ΚΑΜΙΑ ΕΓΓΥΗΣΗ, χωρίς καν την υπονοούμενη εγγύηση της ΕΜΠΟΡΕΥΣΙΜΟΤΗΤΑΣ ή της "
-"ΚΑΤΑΛΛΗΛΟΤΗΤΑΣ ΓΙΑ ΣΥΓΚΕΚΡΙΜΕΝΟ ΣΚΟΠΟ. Δείτε την άδεια GNU General Public "
-"License για περισσότερες λεπτομέρειες.\n"
-"\n"
-"Πρέπει να έχετε λάβει αντίγραφο της άδειας GNU General Public License μαζί "
-"με το GNOME Music. Αν όχι, γράψτε στο: Free Software Foundation, Inc., 51 "
-"Franklin St, Fifth Floor, Boston, MA 02110-1301 USA\n"
-"\n"
-"Οι προγραμματιστές του GNOME Music επιτρέπουν στα μη-συμβατά με την άδεια "
-"GPL πρόσθετα GStreamer, να χρησιμοποιούνται και να διανέμονται μαζί με το "
-"GStreamer και το GNOME Music.  Η άδεια είναι υπεράνω και πέραν των "
-"απαγορεύσεων της άδειας χρήσης GPL, και στις οποίες υπάγεται η εφαρμογή "
-"GNOME Music.  Εάν τροποποιήσετε τον κώδικα, μπορείτε να επεκτείνετε αυτήν "
-"την εξαίρεση στη δική σας έκδοση του κώδικα, χωρίς όμως να είστε "
-"υποχρεωμένοι να το κάνετε.  Εάν δεν θέλετε να το κάνετε, διαγράψτε αυτή τη "
-"δήλωση εξαίρεσης από τη δική σας έκδοση."
-
-#: data/ui/AlbumWidget.ui:104 data/ui/PlayerToolbar.ui:122
-#: data/ui/PlaylistControls.ui:121 data/ui/SongWidgetMenu.ui:19
-#: gnomemusic/widgets/playertoolbar.py:177
+#: data/ui/AlbumWidget.ui:84 data/ui/PlayerToolbar.ui:87
+#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:170
 msgid "Play"
 msgstr "Αναπαραγωγή"
 
-#: data/ui/AlbumWidget.ui:163 data/ui/PlaylistControls.ui:6
+#: data/ui/AlbumWidget.ui:130 data/ui/PlaylistControls.ui:5
+#: data/ui/SongWidgetMenu.ui:11
 msgid "_Play"
 msgstr "_Αναπαραγωγή"
 
-#: data/ui/AlbumWidget.ui:167
+#: data/ui/AlbumWidget.ui:134
 msgid "Add to _Favorite Songs"
 msgstr "Προσθήκη στο _Αγαπημένα τραγούδια"
 
-#: data/ui/AlbumWidget.ui:171
+#: data/ui/AlbumWidget.ui:138 data/ui/SongWidgetMenu.ui:15
 msgid "_Add to Playlist…"
 msgstr "_Προσθήκη στη λίστα αναπαραγωγής…"
 
@@ -215,23 +144,23 @@ msgstr "_Προσθήκη στη λίστα αναπαραγωγής…"
 msgid "Last.fm Account"
 msgstr "Λογαριασμός Last.fm"
 
-#: data/ui/AppMenu.ui:38
+#: data/ui/AppMenu.ui:36
 msgid "Report Music Listening"
 msgstr "Αναφορά ακρόασης μουσικής"
 
-#: data/ui/AppMenu.ui:63
+#: data/ui/AppMenu.ui:58
 msgid "_Keyboard Shortcuts"
 msgstr "1821"
 
-#: data/ui/AppMenu.ui:74
+#: data/ui/AppMenu.ui:68
 msgid "_Help"
 msgstr "_Βοήθεια"
 
-#: data/ui/AppMenu.ui:85
+#: data/ui/AppMenu.ui:78
 msgid "_About Music"
 msgstr "_Περί του Μουσική"
 
-#: data/ui/EmptyView.ui:35
+#: data/ui/EmptyView.ui:30
 msgid "Welcome to Music"
 msgstr "Καλώς ορίσατε στην Μουσική"
 
@@ -239,109 +168,109 @@ msgstr "Καλώς ορίσατε στην Μουσική"
 msgid "Menu"
 msgstr "Μενού"
 
-#: data/ui/HeaderBar.ui:39 data/ui/SearchHeaderBar.ui:16
+#: data/ui/HeaderBar.ui:24 data/ui/SearchHeaderBar.ui:15
 msgid "Select"
 msgstr "Επιλογή"
 
-#: data/ui/HeaderBar.ui:60 data/ui/PlaylistDialog.ui:211
-#: data/ui/SearchHeaderBar.ui:37
+#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:213
+#: data/ui/SearchHeaderBar.ui:20
 msgid "_Cancel"
 msgstr "Ακύ_ρωση"
 
-#: data/ui/HeaderBar.ui:79 data/ui/SearchHeaderBar.ui:56
+#: data/ui/HeaderBar.ui:42 data/ui/SearchHeaderBar.ui:32
 msgid "Search"
 msgstr "Αναζήτηση"
 
-#: data/ui/HeaderBar.ui:102
+#: data/ui/HeaderBar.ui:50
 msgid "Back"
 msgstr "Πίσω"
 
-#: data/ui/help-overlay.ui:13
+#: data/ui/help-overlay.ui:11
 msgctxt "shortcut window"
 msgid "General"
 msgstr "Γενικά"
 
-#: data/ui/help-overlay.ui:17
+#: data/ui/help-overlay.ui:14
 msgctxt "shortcut window"
 msgid "Close window"
 msgstr "Κλείσιμο παραθύρου"
 
-#: data/ui/help-overlay.ui:24
+#: data/ui/help-overlay.ui:20
 msgctxt "shortcut window"
 msgid "Search"
 msgstr "Αναζήτηση"
 
-#: data/ui/help-overlay.ui:31
+#: data/ui/help-overlay.ui:26
 msgctxt "shortcut window"
 msgid "Help"
 msgstr "Βοήθεια"
 
-#: data/ui/help-overlay.ui:38
+#: data/ui/help-overlay.ui:32
 msgctxt "shortcut window"
 msgid "Shortcuts"
 msgstr "Συντομεύσεις"
 
-#: data/ui/help-overlay.ui:47
+#: data/ui/help-overlay.ui:40
 msgctxt "shortcut window"
 msgid "Playback"
 msgstr "Αναπαραγωγή"
 
-#: data/ui/help-overlay.ui:51
+#: data/ui/help-overlay.ui:43
 msgctxt "shortcut window"
 msgid "Play/Pause"
 msgstr "Αναπαραγωγή/Παύση"
 
-#: data/ui/help-overlay.ui:58
+#: data/ui/help-overlay.ui:49
 msgctxt "shortcut window"
 msgid "Next song"
 msgstr "Επόμενο τραγούδι"
 
-#: data/ui/help-overlay.ui:65
+#: data/ui/help-overlay.ui:55
 msgctxt "shortcut window"
 msgid "Previous song"
 msgstr "Προηγούμενο τραγούδι"
 
-#: data/ui/help-overlay.ui:72
+#: data/ui/help-overlay.ui:61
 msgctxt "shortcut window"
 msgid "Toggle repeat"
 msgstr "Εναλλαγή επανάληψης"
 
-#: data/ui/help-overlay.ui:79
+#: data/ui/help-overlay.ui:67
 msgctxt "shortcut window"
 msgid "Toggle shuffle"
 msgstr "Εναλλαγή τυχαίας σειράς"
 
-#: data/ui/help-overlay.ui:88
+#: data/ui/help-overlay.ui:75
 msgctxt "shortcut window"
 msgid "Navigation"
 msgstr "Περιήγηση"
 
-#: data/ui/help-overlay.ui:92
+#: data/ui/help-overlay.ui:78
 msgctxt "shortcut window"
 msgid "Go to Albums"
 msgstr "Μετάβαση στους δίσκους"
 
-#: data/ui/help-overlay.ui:99
+#: data/ui/help-overlay.ui:84
 msgctxt "shortcut window"
 msgid "Go to Artists"
 msgstr "Μετάβαση στους καλλιτέχνες"
 
-#: data/ui/help-overlay.ui:106
+#: data/ui/help-overlay.ui:90
 msgctxt "shortcut window"
 msgid "Go to Songs"
 msgstr "Μετάβαση στα τραγούδια"
 
-#: data/ui/help-overlay.ui:113
+#: data/ui/help-overlay.ui:96
 msgctxt "shortcut window"
 msgid "Go to Playlists"
 msgstr "Μετάβαση στις λίστες αναπαραγωγής"
 
-#: data/ui/help-overlay.ui:120
+#: data/ui/help-overlay.ui:102
 msgctxt "shortcut window"
 msgid "Go back"
 msgstr "Μετάβαση πίσω"
 
-#: data/ui/LastfmDialog.ui:24
+#: data/ui/LastfmDialog.ui:21
 msgid ""
 "Last.fm is a music discovery service that gives you personalised "
 "recommendations based on the music you listen to."
@@ -349,88 +278,80 @@ msgstr ""
 "Το Last.fm είναι μια υπηρεσία που ανακαλύπτετε μουσική και σας παρέχει "
 "εξατομικευμένες προτάσεις βάσει της μουσικής που ακούτε."
 
-#: data/ui/LastfmDialog.ui:35 gnomemusic/widgets/lastfmdialog.py:58
+#: data/ui/LastfmDialog.ui:31 gnomemusic/widgets/lastfmdialog.py:57
 msgid "Music Reporting Not Setup"
 msgstr "Δεν είναι ρυθμισμένη η αναφορά μουσικής"
 
-#: data/ui/LastfmDialog.ui:49 gnomemusic/widgets/lastfmdialog.py:61
+#: data/ui/LastfmDialog.ui:44 gnomemusic/widgets/lastfmdialog.py:60
 msgid "Login to your Last.fm account to report your music listening."
 msgstr ""
 "Συνδεθείτε στον λογαριασμό σας Last.fm για να αναφέρετε τη μουσική σας."
 
-#: data/ui/LastfmDialog.ui:60 gnomemusic/widgets/lastfmdialog.py:59
+#: data/ui/LastfmDialog.ui:55 gnomemusic/widgets/lastfmdialog.py:58
 msgid "Login"
 msgstr "Σύνδεση"
 
-#: data/ui/LoadingNotification.ui:16
-msgid "Loading"
-msgstr "Γίνεται φόρτωση"
-
-#: data/ui/PlayerToolbar.ui:105
+#: data/ui/PlayerToolbar.ui:74
 msgid "Previous"
 msgstr "Προηγούμενο"
 
-#: data/ui/PlayerToolbar.ui:139
+#: data/ui/PlayerToolbar.ui:106
 msgid "Next"
 msgstr "Επόμενο"
 
-#: data/ui/PlaylistControls.ui:10
+#: data/ui/PlaylistControls.ui:9
 msgid "_Delete"
 msgstr "_Διαγραφή"
 
-#: data/ui/PlaylistControls.ui:14
+#: data/ui/PlaylistControls.ui:13
 msgid "_Rename…"
 msgstr "_Μετονομασία…"
 
-#: data/ui/PlaylistControls.ui:44
+#: data/ui/PlaylistControls.ui:28
 msgid "Playlist Name"
 msgstr "Όνομα λίστας αναπαραγωγής"
 
-#: data/ui/PlaylistControls.ui:77
+#: data/ui/PlaylistControls.ui:62
 msgid "_Done"
 msgstr "_Ολοκληρώθηκε"
 
-#: data/ui/PlaylistDialog.ui:66
+#: data/ui/PlaylistDialog.ui:52
 msgid "Enter a name for your first playlist"
 msgstr "Πληκτρολογήστε ένα όνομα για την πρώτη σας λίστα αναπαραγωγής"
 
-#: data/ui/PlaylistDialog.ui:88
+#: data/ui/PlaylistDialog.ui:77
 msgid "C_reate"
 msgstr "Δ_ημιουργία"
 
-#: data/ui/PlaylistDialog.ui:156
+#: data/ui/PlaylistDialog.ui:146
 msgid "New Playlist…"
 msgstr "Νέα λίστα αναπαραγωγής…"
 
-#: data/ui/PlaylistDialog.ui:167
+#: data/ui/PlaylistDialog.ui:161
 msgid "Add"
 msgstr "Προσθήκη"
 
-#: data/ui/PlaylistDialog.ui:208
+#: data/ui/PlaylistDialog.ui:202
 msgid "Add to Playlist"
 msgstr "Προσθήκη στη λίστα αναπαραγωγής"
 
-#: data/ui/PlaylistDialog.ui:224
+#: data/ui/PlaylistDialog.ui:222
 msgid "_Add"
 msgstr "_Προσθήκη"
 
-#: data/ui/PlaylistNotification.ui:22
-msgid "_Undo"
-msgstr "Α_ναίρεση"
-
-#: data/ui/SearchView.ui:47 gnomemusic/views/artistsview.py:46
+#: data/ui/SearchView.ui:33 gnomemusic/views/artistsview.py:51
 msgid "Artists"
 msgstr "Καλλιτέχνες"
 
-#: data/ui/SearchView.ui:57 data/ui/SearchView.ui:108
+#: data/ui/SearchView.ui:42 data/ui/SearchView.ui:84
 msgid "View All"
 msgstr "Προβολή όλων"
 
-#: data/ui/SearchView.ui:98 gnomemusic/views/albumsview.py:50
+#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:56
 msgid "Albums"
 msgstr "Δίσκοι"
 
-#: data/ui/SearchView.ui:149 gnomemusic/views/songsview.py:47
+#: data/ui/SearchView.ui:117 gnomemusic/views/songsview.py:52
 msgid "Songs"
 msgstr "Τραγούδια"
 
@@ -442,44 +363,61 @@ msgstr "Επιλογή όλων"
 msgid "Select None"
 msgstr "Καμία επιλογή"
 
-#: data/ui/SelectionBarMenuButton.ui:30 gnomemusic/widgets/headerbar.py:71
+#: data/ui/SelectionBarMenuButton.ui:19 gnomemusic/widgets/headerbar.py:69
 msgid "Click on items to select them"
 msgstr "Πατήστε σε αντικείμενα για να τα επιλέξετε"
 
-#: data/ui/SelectionToolbar.ui:9
+#: data/ui/SelectionToolbar.ui:8
 msgid "_Add to Playlist"
 msgstr "Προ_σθήκη στη λίστα αναπαραγωγής"
 
-#: data/ui/SongWidgetMenu.ui:29
-msgid "Add to Playlist…"
-msgstr "Προσθήκη στη λίστα αναπαραγωγής…"
+#: data/ui/SongWidgetMenu.ui:19
+msgid "_Remove from Playlist"
+msgstr "Α_φαίρεση από την λίστα αναπαραγωγής"
 
-#: data/ui/SongWidgetMenu.ui:39
-msgid "Remove From Playlist"
-msgstr "Αφαίρεση από την λίστα αναπαραγωγής"
+#: gnomemusic/about.py:238
+msgid "The GNOME Project"
+msgstr "Το έργο GNOME"
+
+#: gnomemusic/about.py:242
+msgid "translator-credits"
+msgstr ""
+"Ελληνική μεταφραστική ομάδα GNOME\n"
+" Ευστάθιος Ιωσηφίδης <iosifidis@opensuse.org>\n"
+"\n"
+"Για περισσότερες πληροφορίες, επισκεφθείτε τη σελίδα\n"
+"http://gnome.gr/"
+
+#: gnomemusic/about.py:246
+msgid "Copyright The GNOME Music Developers"
+msgstr "Πνευματικά δικαιώματα GNOME Music Developers"
+
+#: gnomemusic/about.py:249
+msgid "Translated by"
+msgstr "Μετάφραση από"
 
 #. TRANSLATORS: this is a playlist name
-#: gnomemusic/grilowrappers/grltrackerplaylists.py:898
+#: gnomemusic/grilowrappers/grltrackerplaylists.py:894
 msgid "Most Played"
 msgstr "Το περισσότερο παιγμένο"
 
 #. TRANSLATORS: this is a playlist name
-#: gnomemusic/grilowrappers/grltrackerplaylists.py:952
+#: gnomemusic/grilowrappers/grltrackerplaylists.py:948
 msgid "Never Played"
 msgstr "Δεν παίχτηκε ποτέ"
 
 #. TRANSLATORS: this is a playlist name
-#: gnomemusic/grilowrappers/grltrackerplaylists.py:1005
+#: gnomemusic/grilowrappers/grltrackerplaylists.py:1001
 msgid "Recently Played"
 msgstr "Παίχτηκε πρόσφατα"
 
 #. TRANSLATORS: this is a playlist name
-#: gnomemusic/grilowrappers/grltrackerplaylists.py:1068
+#: gnomemusic/grilowrappers/grltrackerplaylists.py:1064
 msgid "Recently Added"
 msgstr "Προστέθηκε πρόσφατα"
 
 #. TRANSLATORS: this is a playlist name
-#: gnomemusic/grilowrappers/grltrackerplaylists.py:1131
+#: gnomemusic/grilowrappers/grltrackerplaylists.py:1127
 msgid "Favorite Songs"
 msgstr "Αγαπημένα τραγούδια"
 
@@ -514,27 +452,39 @@ msgid "Playing music"
 msgstr "Αναπαραγωγή μουσικής"
 
 #. Translators: "shuffle" causes tracks to play in random order.
-#: gnomemusic/player.py:45
+#: gnomemusic/player.py:44
 msgid "Shuffle"
 msgstr "Τυχαία σειρά"
 
-#: gnomemusic/player.py:46
+#: gnomemusic/player.py:45
 msgid "Repeat Song"
 msgstr "Επανάληψη τραγουδιού"
 
-#: gnomemusic/player.py:47
+#: gnomemusic/player.py:46
 msgid "Repeat All"
 msgstr "Επανάληψη όλων"
 
-#: gnomemusic/player.py:48
+#: gnomemusic/player.py:47
 msgid "Shuffle/Repeat Off"
 msgstr "Τυχαία σειρά/Ανενεργή επανάληψη"
 
-#: gnomemusic/utils.py:80
+#: gnomemusic/playlisttoast.py:55
+msgid "Playlist {} removed"
+msgstr "Αφαιρέθηκε η λίστα αναπαραγωγής {}"
+
+#: gnomemusic/playlisttoast.py:56 gnomemusic/songtoast.py:65
+msgid "Undo"
+msgstr "Aναίρεση"
+
+#: gnomemusic/songtoast.py:64
+msgid "{} removed from {}"
+msgstr "{} αφαιρέθηκε από {}"
+
+#: gnomemusic/utils.py:92
 msgid "Unknown album"
 msgstr "Άγνωστο άλμπουμ"
 
-#: gnomemusic/utils.py:101
+#: gnomemusic/utils.py:113
 msgid "Unknown Artist"
 msgstr "Άγνωστος καλλιτέχνης"
 
@@ -582,65 +532,128 @@ msgstr "Η Μουσική χρειάζεται έκδοση Tracker 3.0.0 ή μ�
 msgid "Playlists"
 msgstr "Λίστες αναπαραγωγής"
 
-#: gnomemusic/views/searchview.py:420
+#: gnomemusic/views/searchview.py:304
 msgid "Artists Results"
 msgstr "Αποτελέσματα Καλλιτεχνών"
 
-#: gnomemusic/views/searchview.py:435
+#: gnomemusic/views/searchview.py:318
 msgid "Albums Results"
 msgstr "Αποτελέσματα Δίσκων"
 
-#: gnomemusic/widgets/albumwidget.py:237
+#: gnomemusic/widgets/albumwidget.py:245
 msgid "{} minute"
 msgid_plural "{} minutes"
 msgstr[0] "{} λεπτό"
 msgstr[1] "{} λεπτά"
 
-#: gnomemusic/widgets/disclistboxwidget.py:75
+#: gnomemusic/widgets/discbox.py:75
 msgid "Disc {}"
 msgstr "Δίσκος {}"
 
-#: gnomemusic/widgets/headerbar.py:68
+#: gnomemusic/widgets/headerbar.py:66
 msgid "Selected {} song"
 msgid_plural "Selected {} songs"
 msgstr[0] "Επιλέχθηκε {} τραγούδι"
 msgstr[1] "Επιλέχθηκαν {} τραγούδια"
 
-#: gnomemusic/widgets/lastfmdialog.py:65
+#: gnomemusic/widgets/lastfmdialog.py:64
 msgid "Your music listening is reported to Last.fm."
 msgstr "Η μουσική που ακούτε αναφέρεται στο Last.fm."
 
-#: gnomemusic/widgets/lastfmdialog.py:67
+#: gnomemusic/widgets/lastfmdialog.py:66
 msgid "Your music listening is not reported to Last.fm."
 msgstr "Η μουσική που ακούτε δεν αναφέρεται στο Last.fm."
 
 #. TRANSLATORS: displays the username of the Last.fm account
-#: gnomemusic/widgets/lastfmdialog.py:71
+#: gnomemusic/widgets/lastfmdialog.py:70
 msgid "Logged in as {}"
 msgstr "Συνδεδεμένος ως {}"
 
-#: gnomemusic/widgets/lastfmdialog.py:72
+#: gnomemusic/widgets/lastfmdialog.py:71
 msgid "Configure"
 msgstr "Ρύθμιση"
 
-#: gnomemusic/widgets/notificationspopup.py:216
-msgid "Playlist {} removed"
-msgstr "Αφαιρέθηκε η λίστα αναπαραγωγής {}"
-
-#: gnomemusic/widgets/notificationspopup.py:220
-msgid "{} removed from {}"
-msgstr "{} αφαιρέθηκε από {}"
-
-#: gnomemusic/widgets/playertoolbar.py:174
+#: gnomemusic/widgets/playertoolbar.py:167
 msgid "Pause"
 msgstr "Παύση"
 
-#: gnomemusic/widgets/playlistcontrols.py:132
+#: gnomemusic/widgets/playlistcontrols.py:130
 msgid "{} Song"
 msgid_plural "{} Songs"
 msgstr[0] "{} τραγούδι"
 msgstr[1] "{} τραγούδια"
 
+#~ msgid "GNOME Music"
+#~ msgstr "Μουσική GNOME"
+
+#~ msgid "Window position"
+#~ msgstr "Θέση παραθύρου"
+
+#~ msgid "Window position (x and y)."
+#~ msgstr "Θέση παραθύρου (x και y)."
+
+#~ msgid "A music player and management application for GNOME."
+#~ msgstr "Εφαρμογή αναπαραγωγής και διαχείρισης μουσικής, για το GNOME."
+
+#~ msgid "Visit GNOME Music website"
+#~ msgstr "Επισκεφθείτε τον ιστότοπο της εφαρμογής Μουσική GNOME"
+
+#~ msgid ""
+#~ "GNOME Music is free software; you can redistribute it and/or modify it "
+#~ "under the terms of the GNU General Public License as published by the "
+#~ "Free Software Foundation; either version 2 of the License, or (at your "
+#~ "option) any later version.\n"
+#~ "\n"
+#~ "GNOME Music is distributed in the hope that it will be useful, but "
+#~ "WITHOUT ANY WARRANTY; without even the implied warranty of "
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General "
+#~ "Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License along "
+#~ "with GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
+#~ "Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
+#~ "\n"
+#~ "The GNOME Music authors hereby grant permission for non-GPL compatible "
+#~ "GStreamer plugins to be used and distributed together with GStreamer and "
+#~ "GNOME Music.  This permission is above and beyond the permissions granted "
+#~ "by the GPL license by which GNOME Music is covered.  If you modify this "
+#~ "code, you may extend this exception to your version of the code, but you "
+#~ "are not obligated to do so.  If you do not wish to do so, delete this "
+#~ "exception statement from your version."
+#~ msgstr ""
+#~ "Η Μουσική GNOME είναι ελεύθερο λογισμικό. Μπορείτε να το αναδιανείμετε ή/"
+#~ "και να το τροποποιήσετε, υπό τους όρους της άδειας GNU General Public "
+#~ "License, όπως αυτή εκδίδεται από το Ίδρυμα Ελεύθερου Λογισμικού (Free "
+#~ "Software Foundation), είτε της έκδοσης 2 της άδειας, είτε (κατ' επιλογήν "
+#~ "σας) οποιασδήποτε άλλης μεταγενέστερης έκδοσης.\n"
+#~ "\n"
+#~ "Το GNOME Music διανέμεται με την ελπίδα πως θα είναι χρήσιμο, αλλά ΧΩΡΙΣ "
+#~ "ΚΑΜΙΑ ΕΓΓΥΗΣΗ, χωρίς καν την υπονοούμενη εγγύηση της ΕΜΠΟΡΕΥΣΙΜΟΤΗΤΑΣ ή "
+#~ "της ΚΑΤΑΛΛΗΛΟΤΗΤΑΣ ΓΙΑ ΣΥΓΚΕΚΡΙΜΕΝΟ ΣΚΟΠΟ. Δείτε την άδεια GNU General "
+#~ "Public License για περισσότερες λεπτομέρειες.\n"
+#~ "\n"
+#~ "Πρέπει να έχετε λάβει αντίγραφο της άδειας GNU General Public License "
+#~ "μαζί με το GNOME Music. Αν όχι, γράψτε στο: Free Software Foundation, "
+#~ "Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA\n"
+#~ "\n"
+#~ "Οι προγραμματιστές του GNOME Music επιτρέπουν στα μη-συμβατά με την άδεια "
+#~ "GPL πρόσθετα GStreamer, να χρησιμοποιούνται και να διανέμονται μαζί με το "
+#~ "GStreamer και το GNOME Music.  Η άδεια είναι υπεράνω και πέραν των "
+#~ "απαγορεύσεων της άδειας χρήσης GPL, και στις οποίες υπάγεται η εφαρμογή "
+#~ "GNOME Music.  Εάν τροποποιήσετε τον κώδικα, μπορείτε να επεκτείνετε αυτήν "
+#~ "την εξαίρεση στη δική σας έκδοση του κώδικα, χωρίς όμως να είστε "
+#~ "υποχρεωμένοι να το κάνετε.  Εάν δεν θέλετε να το κάνετε, διαγράψτε αυτή "
+#~ "τη δήλωση εξαίρεσης από τη δική σας έκδοση."
+
+#~ msgid "Loading"
+#~ msgstr "Γίνεται φόρτωση"
+
+#~ msgid "Add to Playlist…"
+#~ msgstr "Προσθήκη στη λίστα αναπαραγωγής…"
+
+#~ msgid "Remove From Playlist"
+#~ msgstr "Αφαίρεση από την λίστα αναπαραγωγής"
+
 #~ msgid ""
 #~ "An easy way to play your music. Automatically discover music on your "
 #~ "computer, the local network and internet services."
@@ -741,9 +754,6 @@ msgstr[1] "{} τραγούδια"
 #~ msgid "Enables or disables playback notifications"
 #~ msgstr "Ενεργοποιεί ή απενεργοποιεί τις ειδοποιήσεις αναπαραγωγής"
 
-#~ msgid "_Remove from Playlist"
-#~ msgstr "Α_φαίρεση από την λίστα αναπαραγωγής"
-
 #~ msgid "the|a|an"
 #~ msgstr "the|a|an|ο|η|το|τα|οι"
 
diff --git a/po/es.po b/po/es.po
index 808ca641..f574917a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-music master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-music/issues\n"
-"POT-Creation-Date: 2022-02-19 12:39+0000\n"
-"PO-Revision-Date: 2022-02-24 12:42+0100\n"
+"POT-Creation-Date: 2022-08-27 13:27+0000\n"
+"PO-Revision-Date: 2022-08-29 10:52+0200\n"
 "Last-Translator: Daniel Mustieles García <daniel.mustieles@gmail.com>\n"
 "Language-Team: Spanish - Spain <gnome-es-list@gnome.org>\n"
 "Language: es_ES\n"
@@ -19,11 +19,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"X-Generator: Gtranslator 41.0\n"
+"X-Generator: Gtranslator 42.0\n"
 
 #: data/org.gnome.Music.appdata.xml.in.in:6
-#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/application.py:61
-#: gnomemusic/window.py:71
+#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/about.py:236
+#: gnomemusic/application.py:61 gnomemusic/window.py:71
 msgid "Music"
 msgstr "Música"
 
@@ -44,7 +44,7 @@ msgstr ""
 "Busque pistas en su colección local, use listas de reproducción generadas "
 "automáticamente o cree una nueva."
 
-#: data/org.gnome.Music.appdata.xml.in.in:149
+#: data/org.gnome.Music.appdata.xml.in.in:167
 msgid "The GNOME Music developers"
 msgstr "Los desarrolladores de GNOME Música"
 
@@ -121,81 +121,21 @@ msgstr ""
 "Activa o desactiva el envío de «scrobbles» e información de «reproduciendo "
 "actualmente» a Last.fm"
 
-#: data/ui/AboutDialog.ui.in:9
-msgid "Copyright © 2018 GNOME Music Developers"
-msgstr "Copyright © 2018 Desarrolladores de GNOME Music"
-
-#: data/ui/AboutDialog.ui.in:10
-msgid "A music player and management application for GNOME."
-msgstr "Una aplicación para gestionar y reproducir música en GNOME."
-
-#: data/ui/AboutDialog.ui.in:12
-msgid "Visit GNOME Music website"
-msgstr "Visitar la página web de GNOME Music"
-
-#: data/ui/AboutDialog.ui.in:13
-msgid ""
-"GNOME Music is free software; you can redistribute it and/or modify it under "
-"the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"GNOME Music is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
-"\n"
-"The GNOME Music authors hereby grant permission for non-GPL compatible "
-"GStreamer plugins to be used and distributed together with GStreamer and "
-"GNOME Music.  This permission is above and beyond the permissions granted by "
-"the GPL license by which GNOME Music is covered.  If you modify this code, "
-"you may extend this exception to your version of the code, but you are not "
-"obligated to do so.  If you do not wish to do so, delete this exception "
-"statement from your version."
-msgstr ""
-"GNOME Música es software libre; puede redistribuirlo y/o modificarlo bajo "
-"los términos de la Licencia Pública General GNU tal como la publica la Free "
-"Software Foundation; ya sea en la versión 2 de la Licencia, como (a su "
-"elección) cualquier otra versión posterior.\n"
-"\n"
-"GNOME Música se distribuye con el ánimo de que le será útil, pero SIN "
-"NINGUNA GARANTÍA; sin incluso la garantía implícita de MERCANTILIDAD o "
-"IDONEIDAD PARA UN PROPÓSITO DETERMINADO. Vea la Licencia Pública General de "
-"GNU para más detalles.\n"
-"\n"
-"Debería haber recibido una copia de la Licencia Pública General GNU junto "
-"Música si no, escriba a la Free Software Foundation,Inc., 51 Franklin "
-"Street, Fifth Floor, Boston, MA 02110-1301 EE. UU.\n"
-"\n"
-"Los autores de GNOME Música conceden permiso para usar y distribuir "
-"complementos de GStreamer no compatibles con la GPL. Este permiso está por "
-"encima y más allá de los permisos concedidos por la GPL, por la que GNOME "
-"Música está cubierta. Si modifica este código, puede ampliar esta excepción "
-"a su versión del código, pero no está obligado a hacerlo. Si no quiere "
-"hacerlo, elimine esta sentencia de excepción de su versión.\n"
-"\n"
-"La imagen «Magic of the vinyl» de Sami Pyylampi está licenciada bajo la CC-"
-"BY-SA 2.0 https://www.flickr.com/photos/_spy_/12270839403"
-
-#: data/ui/AlbumWidget.ui:86 data/ui/PlayerToolbar.ui:88
-#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:168
+#: data/ui/AlbumWidget.ui:84 data/ui/PlayerToolbar.ui:87
+#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:170
 msgid "Play"
 msgstr "Reproducir"
 
-#: data/ui/AlbumWidget.ui:132 data/ui/PlaylistControls.ui:5
+#: data/ui/AlbumWidget.ui:130 data/ui/PlaylistControls.ui:5
 #: data/ui/SongWidgetMenu.ui:11
 msgid "_Play"
 msgstr "_Reproducir"
 
-#: data/ui/AlbumWidget.ui:136
+#: data/ui/AlbumWidget.ui:134
 msgid "Add to _Favorite Songs"
 msgstr "Añadir a canciones _favoritas"
 
-#: data/ui/AlbumWidget.ui:140 data/ui/SongWidgetMenu.ui:15
+#: data/ui/AlbumWidget.ui:138 data/ui/SongWidgetMenu.ui:15
 msgid "_Add to Playlist…"
 msgstr "_Añadir a la lista de reproducción…"
 
@@ -219,7 +159,7 @@ msgstr "_Ayuda"
 msgid "_About Music"
 msgstr "_Acerca de Música"
 
-#: data/ui/EmptyView.ui:26 data/ui/InitialState.ui:13
+#: data/ui/EmptyView.ui:30
 msgid "Welcome to Music"
 msgstr "Bienvenido a Música"
 
@@ -231,7 +171,7 @@ msgstr "Menú"
 msgid "Select"
 msgstr "Seleccionar"
 
-#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:211
+#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:213
 #: data/ui/SearchHeaderBar.ui:20
 msgid "_Cancel"
 msgstr "_Cancelar"
@@ -329,11 +269,6 @@ msgctxt "shortcut window"
 msgid "Go back"
 msgstr "Retroceder"
 
-#: data/ui/InitialState.ui:25
-#| msgid "The contents of your {} will appear here."
-msgid "The contents of your Music Folder will appear here"
-msgstr "El contenido de su carpeta Música aparecerá aquí"
-
 #: data/ui/LastfmDialog.ui:21
 msgid ""
 "Last.fm is a music discovery service that gives you personalised "
@@ -355,11 +290,11 @@ msgstr ""
 msgid "Login"
 msgstr "Iniciar sesión"
 
-#: data/ui/PlayerToolbar.ui:75
+#: data/ui/PlayerToolbar.ui:74
 msgid "Previous"
 msgstr "Anterior"
 
-#: data/ui/PlayerToolbar.ui:107
+#: data/ui/PlayerToolbar.ui:106
 msgid "Next"
 msgstr "Siguiente"
 
@@ -395,11 +330,11 @@ msgstr "Lista de reproducción nueva…"
 msgid "Add"
 msgstr "Añadir"
 
-#: data/ui/PlaylistDialog.ui:200
+#: data/ui/PlaylistDialog.ui:202
 msgid "Add to Playlist"
 msgstr "Añadir a la lista de reproducción"
 
-#: data/ui/PlaylistDialog.ui:220
+#: data/ui/PlaylistDialog.ui:222
 msgid "_Add"
 msgstr "_Añadir"
 
@@ -411,7 +346,7 @@ msgstr "Artistas"
 msgid "View All"
 msgstr "Ver todo"
 
-#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:54
+#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:56
 msgid "Albums"
 msgstr "Álbumes"
 
@@ -436,10 +371,25 @@ msgid "_Add to Playlist"
 msgstr "Añadir a la _lista de reproducción"
 
 #: data/ui/SongWidgetMenu.ui:19
-#| msgid "Remove From Playlist"
 msgid "_Remove from Playlist"
 msgstr "_Quitar de la lista de reproducción"
 
+#: gnomemusic/about.py:238
+msgid "The GNOME Project"
+msgstr "El Proyecto GNOME"
+
+#: gnomemusic/about.py:242
+msgid "translator-credits"
+msgstr "Daniel Mustieles <daniel.mustieles@gmail.com>, 2012-2022"
+
+#: gnomemusic/about.py:246
+msgid "Copyright The GNOME Music Developers"
+msgstr "Copyright Desarrolladores de GNOME Música"
+
+#: gnomemusic/about.py:249
+msgid "Translated by"
+msgstr "Traducido por"
+
 #. TRANSLATORS: this is a playlist name
 #: gnomemusic/grilowrappers/grltrackerplaylists.py:894
 msgid "Most Played"
@@ -516,7 +466,6 @@ msgid "Playlist {} removed"
 msgstr "Lista de reproducción {} eliminada"
 
 #: gnomemusic/playlisttoast.py:56 gnomemusic/songtoast.py:65
-#| msgid "_Undo"
 msgid "Undo"
 msgstr "Deshacer"
 
@@ -583,7 +532,7 @@ msgstr "Resultados de artistas"
 msgid "Albums Results"
 msgstr "Resultados de álbumes"
 
-#: gnomemusic/widgets/albumwidget.py:240
+#: gnomemusic/widgets/albumwidget.py:245
 msgid "{} minute"
 msgid_plural "{} minutes"
 msgstr[0] "{} minuto"
@@ -616,7 +565,7 @@ msgstr "Sesión iniciada como {}"
 msgid "Configure"
 msgstr "Configurar"
 
-#: gnomemusic/widgets/playertoolbar.py:165
+#: gnomemusic/widgets/playertoolbar.py:167
 msgid "Pause"
 msgstr "Pausar"
 
@@ -626,6 +575,63 @@ msgid_plural "{} Songs"
 msgstr[0] "{} canción"
 msgstr[1] "{} canciones"
 
+#~ msgid "A music player and management application for GNOME."
+#~ msgstr "Una aplicación para gestionar y reproducir música en GNOME."
+
+#~ msgid "Visit GNOME Music website"
+#~ msgstr "Visitar la página web de GNOME Music"
+
+#~ msgid ""
+#~ "GNOME Music is free software; you can redistribute it and/or modify it "
+#~ "under the terms of the GNU General Public License as published by the "
+#~ "Free Software Foundation; either version 2 of the License, or (at your "
+#~ "option) any later version.\n"
+#~ "\n"
+#~ "GNOME Music is distributed in the hope that it will be useful, but "
+#~ "WITHOUT ANY WARRANTY; without even the implied warranty of "
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General "
+#~ "Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License along "
+#~ "with GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
+#~ "Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
+#~ "\n"
+#~ "The GNOME Music authors hereby grant permission for non-GPL compatible "
+#~ "GStreamer plugins to be used and distributed together with GStreamer and "
+#~ "GNOME Music.  This permission is above and beyond the permissions granted "
+#~ "by the GPL license by which GNOME Music is covered.  If you modify this "
+#~ "code, you may extend this exception to your version of the code, but you "
+#~ "are not obligated to do so.  If you do not wish to do so, delete this "
+#~ "exception statement from your version."
+#~ msgstr ""
+#~ "GNOME Música es software libre; puede redistribuirlo y/o modificarlo bajo "
+#~ "los términos de la Licencia Pública General GNU tal como la publica la "
+#~ "Free Software Foundation; ya sea en la versión 2 de la Licencia, como (a "
+#~ "su elección) cualquier otra versión posterior.\n"
+#~ "\n"
+#~ "GNOME Música se distribuye con el ánimo de que le será útil, pero SIN "
+#~ "NINGUNA GARANTÍA; sin incluso la garantía implícita de MERCANTILIDAD o "
+#~ "IDONEIDAD PARA UN PROPÓSITO DETERMINADO. Vea la Licencia Pública General "
+#~ "de GNU para más detalles.\n"
+#~ "\n"
+#~ "Debería haber recibido una copia de la Licencia Pública General GNU junto "
+#~ "Música si no, escriba a la Free Software Foundation,Inc., 51 Franklin "
+#~ "Street, Fifth Floor, Boston, MA 02110-1301 EE. UU.\n"
+#~ "\n"
+#~ "Los autores de GNOME Música conceden permiso para usar y distribuir "
+#~ "complementos de GStreamer no compatibles con la GPL. Este permiso está "
+#~ "por encima y más allá de los permisos concedidos por la GPL, por la que "
+#~ "GNOME Música está cubierta. Si modifica este código, puede ampliar esta "
+#~ "excepción a su versión del código, pero no está obligado a hacerlo. Si no "
+#~ "quiere hacerlo, elimine esta sentencia de excepción de su versión.\n"
+#~ "\n"
+#~ "La imagen «Magic of the vinyl» de Sami Pyylampi está licenciada bajo la "
+#~ "CC-BY-SA 2.0 https://www.flickr.com/photos/_spy_/12270839403"
+
+#~| msgid "The contents of your {} will appear here."
+#~ msgid "The contents of your Music Folder will appear here"
+#~ msgstr "El contenido de su carpeta Música aparecerá aquí"
+
 #~ msgid "GNOME Music"
 #~ msgstr "GNOME Música"
 
@@ -833,9 +839,6 @@ msgstr[1] "{} canciones"
 #~ msgid "Quit"
 #~ msgstr "Salir"
 
-#~ msgid "translator-credits"
-#~ msgstr "Daniel Mustieles <daniel.mustieles@gmail.com>, 2012"
-
 #~ msgid "A GNOME 3 application to listen and manage music playlists"
 #~ msgstr ""
 #~ "Una aplicación de GNOME 3 para escuchar y gestionar listas de "
diff --git a/po/eu.po b/po/eu.po
index 3d98f0cb..1738e813 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr "Project-Id-Version: gnome-music master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-music/issues\n"
-"POT-Creation-Date: 2022-02-19 12:39+0000\n"
-"PO-Revision-Date: 2022-02-27 10:00+0100\n"
+"POT-Creation-Date: 2022-08-27 13:27+0000\n"
+"PO-Revision-Date: 2022-08-31 10:00+0100\n"
 "Last-Translator: Asier Sarasua Garmendia <asiersarasua@ni.eus>\n"
 "Language-Team: Basque <librezale@librezale.eus>\n"
 "Language: eu\n"
@@ -18,8 +18,8 @@ msgstr "Project-Id-Version: gnome-music master\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #: data/org.gnome.Music.appdata.xml.in.in:6
-#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/application.py:61
-#: gnomemusic/window.py:71
+#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/about.py:236
+#: gnomemusic/application.py:61 gnomemusic/window.py:71
 msgid "Music"
 msgstr "Musika"
 
@@ -38,7 +38,7 @@ msgid ""
 "or curate a fresh one."
 msgstr "Bilatu pistak zure bilduma lokalean, erabili automatikoki sortutako erreprodukzio-zerrendak edo sortu zerrenda berria."
 
-#: data/org.gnome.Music.appdata.xml.in.in:149
+#: data/org.gnome.Music.appdata.xml.in.in:167
 msgid "The GNOME Music developers"
 msgstr "GNOME Musika aplikazioaren garatzaileak"
 
@@ -106,64 +106,21 @@ msgid ""
 "Last.fm."
 msgstr "Abestien izenak eta \"unean erreproduzitzen\" Last-fm guneari igortzea gaitzen edo desgaitzen du."
 
-#: data/ui/AboutDialog.ui.in:9
-msgid "Copyright © 2018 GNOME Music Developers"
-msgstr "Copyright © 2018 GNOME Music garatzaileak"
-
-#: data/ui/AboutDialog.ui.in:10
-msgid "A music player and management application for GNOME."
-msgstr "GNOMEren aplikazio bat musika erreproduzitzeko eta kudeatzeko."
-
-#: data/ui/AboutDialog.ui.in:12
-msgid "Visit GNOME Music website"
-msgstr "Bisitatu GNOME Music-en webgunea"
-
-#: data/ui/AboutDialog.ui.in:13
-msgid ""
-"GNOME Music is free software; you can redistribute it and/or modify it under "
-"the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"GNOME Music is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
-"\n"
-"The GNOME Music authors hereby grant permission for non-GPL compatible "
-"GStreamer plugins to be used and distributed together with GStreamer and "
-"GNOME Music.  This permission is above and beyond the permissions granted by "
-"the GPL license by which GNOME Music is covered.  If you modify this code, "
-"you may extend this exception to your version of the code, but you are not "
-"obligated to do so.  If you do not wish to do so, delete this exception "
-"statement from your version."
-msgstr "GNOME Musika software librea da; birbana eta/edo alda dezakezu Free Software Foundation-ek argitaratutako GNU Lizentzia Publiko Orokorraren 2. bertsioan, edo (nahiago baduzu) bertsio berriago batean, jasotako baldintzak betez gero.\n"
-"\n"
-"GNOME Musika erabilgarria izango delakoan banatzen da, baina INOLAKO BERMERIK GABE; era berean, ez da bermatzen beraren EGOKITASUNA MERKATURATZEKO edo HELBURU PARTIKULARRETARAKO ERABILTZEKO.  Argibide gehiago nahi izanez gero, ikus GNU Lizentzia Publiko Orokorra.\n"
-"\n"
-"Programa honekin batera GNU Lizentzia Publiko Orokorraren kopia bat ere jaso beharko zenuke; horrela ez bada, idatzi helbide honetara: Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA.\n"
-"\n"
-"GNOME Musikaren egileek baimena ematen dute GPL lizentziarekin bateragarriak ez diren GStreamer pluginak erabiltzeko eta banatzeko GStreamerrekin eta GNOME Musikarekin batera. Baimen hori GNOME Musikak darabilen GPL lizentziak ematen dituen baimenen gainetik eta haratago dago. Kode hau aldatzen baduzu, salbuespen hori kodearen zure bertsiora hedatu dezakezu, baina ez zaude hori egitera behartuta. Ez baduzu egin nahi, ezabatu salbuespen-adierazpen hau zure bertsiotik."
-
-#: data/ui/AlbumWidget.ui:86 data/ui/PlayerToolbar.ui:88
-#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:168
+#: data/ui/AlbumWidget.ui:84 data/ui/PlayerToolbar.ui:87
+#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:170
 msgid "Play"
 msgstr "Erreproduzitu"
 
-#: data/ui/AlbumWidget.ui:132 data/ui/PlaylistControls.ui:5
+#: data/ui/AlbumWidget.ui:130 data/ui/PlaylistControls.ui:5
 #: data/ui/SongWidgetMenu.ui:11
 msgid "_Play"
 msgstr "_Erreproduzitu"
 
-#: data/ui/AlbumWidget.ui:136
+#: data/ui/AlbumWidget.ui:134
 msgid "Add to _Favorite Songs"
 msgstr "Gehitu _gogoko abestiei"
 
-#: data/ui/AlbumWidget.ui:140 data/ui/SongWidgetMenu.ui:15
+#: data/ui/AlbumWidget.ui:138 data/ui/SongWidgetMenu.ui:15
 msgid "_Add to Playlist…"
 msgstr "Gehitu e_rreprodukzio-zerrendari…"
 
@@ -187,7 +144,7 @@ msgstr "_Laguntza"
 msgid "_About Music"
 msgstr "_Musikari buruz"
 
-#: data/ui/EmptyView.ui:26 data/ui/InitialState.ui:13
+#: data/ui/EmptyView.ui:30
 msgid "Welcome to Music"
 msgstr "Ongi etorri Musika aplikaziora"
 
@@ -199,7 +156,7 @@ msgstr "Menua"
 msgid "Select"
 msgstr "Hautatu"
 
-#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:211
+#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:213
 #: data/ui/SearchHeaderBar.ui:20
 msgid "_Cancel"
 msgstr "_Utzi"
@@ -297,10 +254,6 @@ msgctxt "shortcut window"
 msgid "Go back"
 msgstr "Joan atzera"
 
-#: data/ui/InitialState.ui:25
-msgid "The contents of your Music Folder will appear here"
-msgstr "Zure 'Musika' karpetaren edukiak hemen agertuko dira"
-
 #: data/ui/LastfmDialog.ui:21
 msgid ""
 "Last.fm is a music discovery service that gives you personalised "
@@ -319,11 +272,11 @@ msgstr "Hasi saioa zure Last.fm kontuan entzuten duzun musikaren berri emateko."
 msgid "Login"
 msgstr "Saio-hasiera"
 
-#: data/ui/PlayerToolbar.ui:75
+#: data/ui/PlayerToolbar.ui:74
 msgid "Previous"
 msgstr "Aurrekoa"
 
-#: data/ui/PlayerToolbar.ui:107
+#: data/ui/PlayerToolbar.ui:106
 msgid "Next"
 msgstr "Hurrengoa"
 
@@ -359,11 +312,11 @@ msgstr "Erreprodukzio-zerrenda berria…"
 msgid "Add"
 msgstr "Gehitu"
 
-#: data/ui/PlaylistDialog.ui:200
+#: data/ui/PlaylistDialog.ui:202
 msgid "Add to Playlist"
 msgstr "Gehitu erreprodukzio-zerrendari…"
 
-#: data/ui/PlaylistDialog.ui:220
+#: data/ui/PlaylistDialog.ui:222
 msgid "_Add"
 msgstr "_Gehitu"
 
@@ -375,7 +328,7 @@ msgstr "Artistak"
 msgid "View All"
 msgstr "Ikusi dena"
 
-#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:54
+#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:56
 msgid "Albums"
 msgstr "Albumak"
 
@@ -403,6 +356,22 @@ msgstr "_Gehitu zerrendari"
 msgid "_Remove from Playlist"
 msgstr "_Kendu erreprodukzio-zerrendatik"
 
+#: gnomemusic/about.py:238
+msgid "The GNOME Project"
+msgstr "GNOME proiektua"
+
+#: gnomemusic/about.py:242
+msgid "translator-credits"
+msgstr "translator-credits"
+
+#: gnomemusic/about.py:246
+msgid "Copyright The GNOME Music Developers"
+msgstr "Copyright GNOME Musika aplikazioaren garatzaileak"
+
+#: gnomemusic/about.py:249
+msgid "Translated by"
+msgstr "Itzultzaileak"
+
 #. TRANSLATORS: this is a playlist name
 #: gnomemusic/grilowrappers/grltrackerplaylists.py:894
 msgid "Most Played"
@@ -543,7 +512,7 @@ msgstr "Artisten emaitzak"
 msgid "Albums Results"
 msgstr "Albumen emaitzak"
 
-#: gnomemusic/widgets/albumwidget.py:240
+#: gnomemusic/widgets/albumwidget.py:245
 msgid "{} minute"
 msgid_plural "{} minutes"
 msgstr[0] "Minutu {}"
@@ -576,7 +545,7 @@ msgstr "Saioa hasita {} erabiltzailearekin"
 msgid "Configure"
 msgstr "Konfiguratu"
 
-#: gnomemusic/widgets/playertoolbar.py:165
+#: gnomemusic/widgets/playertoolbar.py:167
 msgid "Pause"
 msgstr "Pausatu"
 
@@ -586,6 +555,61 @@ msgid_plural "{} Songs"
 msgstr[0] "Abesti {}"
 msgstr[1] "{} abesti"
 
+#~ msgid "A music player and management application for GNOME."
+#~ msgstr "GNOMEren aplikazio bat musika erreproduzitzeko eta kudeatzeko."
+
+#~ msgid "Visit GNOME Music website"
+#~ msgstr "Bisitatu GNOME Music-en webgunea"
+
+#~ msgid ""
+#~ "GNOME Music is free software; you can redistribute it and/or modify it "
+#~ "under the terms of the GNU General Public License as published by the "
+#~ "Free Software Foundation; either version 2 of the License, or (at your "
+#~ "option) any later version.\n"
+#~ "\n"
+#~ "GNOME Music is distributed in the hope that it will be useful, but "
+#~ "WITHOUT ANY WARRANTY; without even the implied warranty of "
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General "
+#~ "Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License along "
+#~ "with GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
+#~ "Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
+#~ "\n"
+#~ "The GNOME Music authors hereby grant permission for non-GPL compatible "
+#~ "GStreamer plugins to be used and distributed together with GStreamer and "
+#~ "GNOME Music.  This permission is above and beyond the permissions granted "
+#~ "by the GPL license by which GNOME Music is covered.  If you modify this "
+#~ "code, you may extend this exception to your version of the code, but you "
+#~ "are not obligated to do so.  If you do not wish to do so, delete this "
+#~ "exception statement from your version."
+#~ msgstr ""
+#~ "GNOME Musika software librea da; birbana eta/edo alda dezakezu Free "
+#~ "Software Foundation-ek argitaratutako GNU Lizentzia Publiko Orokorraren "
+#~ "2. bertsioan, edo (nahiago baduzu) bertsio berriago batean, jasotako "
+#~ "baldintzak betez gero.\n"
+#~ "\n"
+#~ "GNOME Musika erabilgarria izango delakoan banatzen da, baina INOLAKO "
+#~ "BERMERIK GABE; era berean, ez da bermatzen beraren EGOKITASUNA "
+#~ "MERKATURATZEKO edo HELBURU PARTIKULARRETARAKO ERABILTZEKO.  Argibide "
+#~ "gehiago nahi izanez gero, ikus GNU Lizentzia Publiko Orokorra.\n"
+#~ "\n"
+#~ "Programa honekin batera GNU Lizentzia Publiko Orokorraren kopia bat ere "
+#~ "jaso beharko zenuke; horrela ez bada, idatzi helbide honetara: Free "
+#~ "Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
+#~ "02111-1301, USA.\n"
+#~ "\n"
+#~ "GNOME Musikaren egileek baimena ematen dute GPL lizentziarekin "
+#~ "bateragarriak ez diren GStreamer pluginak erabiltzeko eta banatzeko "
+#~ "GStreamerrekin eta GNOME Musikarekin batera. Baimen hori GNOME Musikak "
+#~ "darabilen GPL lizentziak ematen dituen baimenen gainetik eta haratago "
+#~ "dago. Kode hau aldatzen baduzu, salbuespen hori kodearen zure bertsiora "
+#~ "hedatu dezakezu, baina ez zaude hori egitera behartuta. Ez baduzu egin "
+#~ "nahi, ezabatu salbuespen-adierazpen hau zure bertsiotik."
+
+#~ msgid "The contents of your Music Folder will appear here"
+#~ msgstr "Zure 'Musika' karpetaren edukiak hemen agertuko dira"
+
 #~ msgid "GNOME Music"
 #~ msgstr "GNOME Musika"
 
diff --git a/po/fa.po b/po/fa.po
index a591ba06..4284f47d 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-music master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-music/issues\n"
-"POT-Creation-Date: 2022-02-19 12:39+0000\n"
-"PO-Revision-Date: 2022-02-21 17:32+0330\n"
+"POT-Creation-Date: 2022-08-27 13:27+0000\n"
+"PO-Revision-Date: 2022-08-28 17:36+0430\n"
 "Last-Translator: Danial Behzadi <dani.behzi@ubuntu.com>\n"
 "Language-Team: Persian <>\n"
 "Language: fa\n"
@@ -18,10 +18,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 3.0.1\n"
+"X-Generator: Poedit 3.1.1\n"
 
 #: data/org.gnome.Music.appdata.xml.in.in:6 data/org.gnome.Music.desktop.in.in:3
-#: gnomemusic/application.py:61 gnomemusic/window.py:71
+#: gnomemusic/about.py:236 gnomemusic/application.py:61 gnomemusic/window.py:71
 msgid "Music"
 msgstr "آهنگ‌ها"
 
@@ -41,7 +41,7 @@ msgstr ""
 "یافتن قطعه‌ها در مجموعهٔ محلّیتان با استفاده از سیاهه‌های پخش ایجاد شده به صورت "
 "خودکار یا ساختن سیاهه‌ای تازه."
 
-#: data/org.gnome.Music.appdata.xml.in.in:149
+#: data/org.gnome.Music.appdata.xml.in.in:167
 msgid "The GNOME Music developers"
 msgstr "توسعه‌دهندگان آهنگ‌های گنوم"
 
@@ -79,13 +79,13 @@ msgstr "حالت تکرار پخش"
 msgid ""
 "Value identifies whether to repeat or randomize playback through the collection. "
 "Allowed values are: “none” (repeat and shuffle are off), “song” (repeat current "
-"song), “all” (repeat playlist, no shuffle), “shuffle” (shuffle playlist, presumes "
-"repeat all)."
+"song), “all” (repeat playlist, no shuffle), “shuffle” (shuffle playlist, "
+"presumes repeat all)."
 msgstr ""
 "مقدار مشخص می‌کند که آیا پخش در میان مجموعه تکرار شود یا به صورت تصادفی باشد. "
 "مقادیر معتبر عبارتند از: «none» (تکرار و بر زدن خاموش)، «song» (آواز کنونی تکرار "
-"می‌شود)، «all» (سیاههٔ پخش بدون بر زدن تکرار می‌شود)، «shuffle» (بر زدن سیاههٔ پخش با "
-"حفظ تکرار همه)."
+"می‌شود)، «all» (سیاههٔ پخش بدون بر زدن تکرار می‌شود)، «shuffle» (بر زدن سیاههٔ پخش "
+"با حفظ تکرار همه)."
 
 #: data/org.gnome.Music.gschema.xml:28
 msgid "Enable ReplayGain"
@@ -109,77 +109,25 @@ msgstr "گزارش تاریخچهٔ آهنگ‌ها به لست.اف‌ام"
 
 #: data/org.gnome.Music.gschema.xml:39
 msgid ""
-"Enables or disables sending scrobbles and the “currently playing” info to Last.fm."
+"Enables or disables sending scrobbles and the “currently playing” info to Last."
+"fm."
 msgstr "به یا از کار انداختن فرستادن اطلاعات پخش به لست.اف‌‌ام."
 
-#: data/ui/AboutDialog.ui.in:9
-msgid "Copyright © 2018 GNOME Music Developers"
-msgstr "حق‌رونوشت © ۲۰۱۸ توسعه‌دهندگان آهنگ‌های گنوم"
-
-#: data/ui/AboutDialog.ui.in:10
-msgid "A music player and management application for GNOME."
-msgstr "یک برنامه مدیریت و پخش آهنگ‌ها برای گنوم."
-
-#: data/ui/AboutDialog.ui.in:12
-msgid "Visit GNOME Music website"
-msgstr "پایگاه وب آهنگ‌های گنوم را ببینید"
-
-#: data/ui/AboutDialog.ui.in:13
-msgid ""
-"GNOME Music is free software; you can redistribute it and/or modify it under the "
-"terms of the GNU General Public License as published by the Free Software "
-"Foundation; either version 2 of the License, or (at your option) any later "
-"version.\n"
-"\n"
-"GNOME Music is distributed in the hope that it will be useful, but WITHOUT ANY "
-"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A "
-"PARTICULAR PURPOSE.  See the GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"GNOME Music; if not, write to the Free Software Foundation, Inc., 51 Franklin "
-"Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
-"\n"
-"The GNOME Music authors hereby grant permission for non-GPL compatible GStreamer "
-"plugins to be used and distributed together with GStreamer and GNOME Music.  This "
-"permission is above and beyond the permissions granted by the GPL license by "
-"which GNOME Music is covered.  If you modify this code, you may extend this "
-"exception to your version of the code, but you are not obligated to do so.  If "
-"you do not wish to do so, delete this exception statement from your version."
-msgstr ""
-"آهنگ‌های گنوم یک نرم‌افزار آزاد است؛ می‌توانید آن را با شرایط نگارش ۲ یا (بنا به "
-"نظرتان) هر نگارش جدیدتری از پروانهٔ جامع همگانی گنو که بنیاد نرم‌افزارهای آزاد "
-"منتشر کرده است،‌ تغییر داده یا بازتوزیع کنید.\n"
-"\n"
-"آهنگ‌های گنوم با امید کارآیی توزیع شده است، ولی بدون هر گونه ضمانتی؛ حتا ضمانت "
-"ضمنی قابل فروش بودن یا مناسب بودن برای یک هدف مشخّص.  برای جزییات بیش‌تر، پروانهٔ "
-"جامع همگانی گنو را ببینید.\n"
-"\n"
-"همراه آهنگ‌های گنوم باید نگارشی از پروانهٔ جامع همگانی گنو را دریافت کرده باشد؛ در "
-"غیر این صورت با شرکت بنیاد نرم‌افزارهای آزاد به نشانی زیر مکاتبه کنید: Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n"
-"\n"
-"نگارندگان آهنگ‌های گنوم در این‌جا اجازه می‌دهند پلاگین‌های GStreamer ناسازگار با "
-"جی‌پی‌ال به همراه GStreamer در آهنگ‌های گنوم استفاده و توزیع شوند. این اجازه فراتر "
-"از اجازه‌هایی است که توسّط پروانهٔ جی‌پی‌ال که آهنگ‌های گنوم را پوشش می‌دهد داده شده "
-"است.  اگر این کد را دست‌کاری می‌کنید، ممکن است این استثنا را به نگارش خودتان از کد "
-"گسترش دهید، ولی تعهّدی برای این کار ندارید.  اگر نمی‌خواهید چنین کنید، این عبارت "
-"استثنا را از نگارشتان حذف کنید."
-
-#: data/ui/AlbumWidget.ui:86 data/ui/PlayerToolbar.ui:88
-#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:168
+#: data/ui/AlbumWidget.ui:84 data/ui/PlayerToolbar.ui:87
+#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:170
 msgid "Play"
 msgstr "پخش"
 
-#: data/ui/AlbumWidget.ui:132 data/ui/PlaylistControls.ui:5
+#: data/ui/AlbumWidget.ui:130 data/ui/PlaylistControls.ui:5
 #: data/ui/SongWidgetMenu.ui:11
 msgid "_Play"
 msgstr "_پخش"
 
-#: data/ui/AlbumWidget.ui:136
+#: data/ui/AlbumWidget.ui:134
 msgid "Add to _Favorite Songs"
 msgstr "افزودن به آوازهای _محبوب"
 
-#: data/ui/AlbumWidget.ui:140 data/ui/SongWidgetMenu.ui:15
+#: data/ui/AlbumWidget.ui:138 data/ui/SongWidgetMenu.ui:15
 msgid "_Add to Playlist…"
 msgstr "_افزودن به سیاههٔ پخش…"
 
@@ -203,7 +151,7 @@ msgstr "_راهنما"
 msgid "_About Music"
 msgstr "_دربارهٔ آهنگ‌ها"
 
-#: data/ui/EmptyView.ui:26 data/ui/InitialState.ui:13
+#: data/ui/EmptyView.ui:30
 msgid "Welcome to Music"
 msgstr "به آهنگ‌ها خوش آمدید"
 
@@ -215,7 +163,7 @@ msgstr "فهرست"
 msgid "Select"
 msgstr "گزینش"
 
-#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:211
+#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:213
 #: data/ui/SearchHeaderBar.ui:20
 msgid "_Cancel"
 msgstr "_لغو"
@@ -313,10 +261,6 @@ msgctxt "shortcut window"
 msgid "Go back"
 msgstr "بازگشت"
 
-#: data/ui/InitialState.ui:25
-msgid "The contents of your Music Folder will appear here"
-msgstr "محتوای شاخهٔ آهنگ‌هایتان این‌جا ظاهر خواهد شد."
-
 #: data/ui/LastfmDialog.ui:21
 msgid ""
 "Last.fm is a music discovery service that gives you personalised recommendations "
@@ -337,11 +281,11 @@ msgstr "برای گزارش گوش کردنتان به آهنگ‌ها، وار�
 msgid "Login"
 msgstr "ورود"
 
-#: data/ui/PlayerToolbar.ui:75
+#: data/ui/PlayerToolbar.ui:74
 msgid "Previous"
 msgstr "پیشین"
 
-#: data/ui/PlayerToolbar.ui:107
+#: data/ui/PlayerToolbar.ui:106
 msgid "Next"
 msgstr "بعدی"
 
@@ -377,11 +321,11 @@ msgstr "سیاههٔ پخش جدید…"
 msgid "Add"
 msgstr "افزودن"
 
-#: data/ui/PlaylistDialog.ui:200
+#: data/ui/PlaylistDialog.ui:202
 msgid "Add to Playlist"
 msgstr "افزودن به سیاههٔ پخش"
 
-#: data/ui/PlaylistDialog.ui:220
+#: data/ui/PlaylistDialog.ui:222
 msgid "_Add"
 msgstr "ا_فزودن"
 
@@ -393,7 +337,7 @@ msgstr "هنرمندان"
 msgid "View All"
 msgstr "نمایش همه"
 
-#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:54
+#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:56
 msgid "Albums"
 msgstr "آلبوم‌ها"
 
@@ -421,6 +365,22 @@ msgstr "ا_فزودن به سیاههٔ پخش"
 msgid "_Remove from Playlist"
 msgstr "_برداشتن از سیاههٔ پخش"
 
+#: gnomemusic/about.py:238
+msgid "The GNOME Project"
+msgstr "پروژهٔ گنوم"
+
+#: gnomemusic/about.py:242
+msgid "translator-credits"
+msgstr "دانیال بهزادی <dani.behzi@ubuntu.com>"
+
+#: gnomemusic/about.py:246
+msgid "Copyright The GNOME Music Developers"
+msgstr "حق‌رونوشت توسعه‌دهندگان آهنگ‌های گنوم"
+
+#: gnomemusic/about.py:249
+msgid "Translated by"
+msgstr "بازگردانی به دست"
+
 #. TRANSLATORS: this is a playlist name
 #: gnomemusic/grilowrappers/grltrackerplaylists.py:894
 msgid "Most Played"
@@ -560,7 +520,7 @@ msgstr "نتیجه‌های هنرمندان"
 msgid "Albums Results"
 msgstr "نتیجه‌های آلبوم‌ها"
 
-#: gnomemusic/widgets/albumwidget.py:240
+#: gnomemusic/widgets/albumwidget.py:245
 msgid "{} minute"
 msgid_plural "{} minutes"
 msgstr[0] "{} دقیقه"
@@ -591,7 +551,7 @@ msgstr "وارد شده به عنوان {}"
 msgid "Configure"
 msgstr "پیکربندی"
 
-#: gnomemusic/widgets/playertoolbar.py:165
+#: gnomemusic/widgets/playertoolbar.py:167
 msgid "Pause"
 msgstr "مکث"
 
@@ -600,6 +560,57 @@ msgid "{} Song"
 msgid_plural "{} Songs"
 msgstr[0] "{} آهنگ"
 
+#~ msgid "A music player and management application for GNOME."
+#~ msgstr "یک برنامه مدیریت و پخش آهنگ‌ها برای گنوم."
+
+#~ msgid "Visit GNOME Music website"
+#~ msgstr "پایگاه وب آهنگ‌های گنوم را ببینید"
+
+#~ msgid ""
+#~ "GNOME Music is free software; you can redistribute it and/or modify it under "
+#~ "the terms of the GNU General Public License as published by the Free Software "
+#~ "Foundation; either version 2 of the License, or (at your option) any later "
+#~ "version.\n"
+#~ "\n"
+#~ "GNOME Music is distributed in the hope that it will be useful, but WITHOUT "
+#~ "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+#~ "FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
+#~ "details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License along with "
+#~ "GNOME Music; if not, write to the Free Software Foundation, Inc., 51 Franklin "
+#~ "Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
+#~ "\n"
+#~ "The GNOME Music authors hereby grant permission for non-GPL compatible "
+#~ "GStreamer plugins to be used and distributed together with GStreamer and "
+#~ "GNOME Music.  This permission is above and beyond the permissions granted by "
+#~ "the GPL license by which GNOME Music is covered.  If you modify this code, "
+#~ "you may extend this exception to your version of the code, but you are not "
+#~ "obligated to do so.  If you do not wish to do so, delete this exception "
+#~ "statement from your version."
+#~ msgstr ""
+#~ "آهنگ‌های گنوم یک نرم‌افزار آزاد است؛ می‌توانید آن را با شرایط نگارش ۲ یا (بنا به "
+#~ "نظرتان) هر نگارش جدیدتری از پروانهٔ جامع همگانی گنو که بنیاد نرم‌افزارهای آزاد "
+#~ "منتشر کرده است،‌ تغییر داده یا بازتوزیع کنید.\n"
+#~ "\n"
+#~ "آهنگ‌های گنوم با امید کارآیی توزیع شده است، ولی بدون هر گونه ضمانتی؛ حتا ضمانت "
+#~ "ضمنی قابل فروش بودن یا مناسب بودن برای یک هدف مشخّص.  برای جزییات بیش‌تر، "
+#~ "پروانهٔ جامع همگانی گنو را ببینید.\n"
+#~ "\n"
+#~ "همراه آهنگ‌های گنوم باید نگارشی از پروانهٔ جامع همگانی گنو را دریافت کرده باشد؛ "
+#~ "در غیر این صورت با شرکت بنیاد نرم‌افزارهای آزاد به نشانی زیر مکاتبه کنید: "
+#~ "Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n"
+#~ "\n"
+#~ "نگارندگان آهنگ‌های گنوم در این‌جا اجازه می‌دهند پلاگین‌های GStreamer ناسازگار با "
+#~ "جی‌پی‌ال به همراه GStreamer در آهنگ‌های گنوم استفاده و توزیع شوند. این اجازه "
+#~ "فراتر از اجازه‌هایی است که توسّط پروانهٔ جی‌پی‌ال که آهنگ‌های گنوم را پوشش می‌دهد "
+#~ "داده شده است.  اگر این کد را دست‌کاری می‌کنید، ممکن است این استثنا را به نگارش "
+#~ "خودتان از کد گسترش دهید، ولی تعهّدی برای این کار ندارید.  اگر نمی‌خواهید چنین "
+#~ "کنید، این عبارت استثنا را از نگارشتان حذف کنید."
+
+#~ msgid "The contents of your Music Folder will appear here"
+#~ msgstr "محتوای شاخهٔ آهنگ‌هایتان این‌جا ظاهر خواهد شد."
+
 #~ msgid "GNOME Music"
 #~ msgstr "آهنگ‌های گنوم"
 
@@ -616,8 +627,8 @@ msgstr[0] "{} آهنگ"
 #~ msgstr "افزودن به سیاههٔ پخش…"
 
 #~ msgid ""
-#~ "An easy way to play your music. Automatically discover music on your computer, "
-#~ "the local network and internet services."
+#~ "An easy way to play your music. Automatically discover music on your "
+#~ "computer, the local network and internet services."
 #~ msgstr ""
 #~ "راهی آسان برای پخش آهنگ‌هایتان. کشف خودکار آهنگ‌های روی رایانه، شبکهٔ محلّی و "
 #~ "خدمات اینترنتیتان."
@@ -626,8 +637,8 @@ msgstr[0] "{} آهنگ"
 #~ "Find tracks in your local collection, get music from DLNA servers or try "
 #~ "something new with the Jamendo and Magnatune services."
 #~ msgstr ""
-#~ "یافتن قطعه‌ها روی گنجینهٔ محلّیتان، گرفتن آهنگ‌ها از کارسازهای DLNA یا آزمودن چیزی "
-#~ "جدید با خدمت‌های جمندو و ماگناتون."
+#~ "یافتن قطعه‌ها روی گنجینهٔ محلّیتان، گرفتن آهنگ‌ها از کارسازهای DLNA یا آزمودن "
+#~ "چیزی جدید با خدمت‌های جمندو و ماگناتون."
 
 #~ msgid "Inital state has been displayed"
 #~ msgstr "وضعیت نخستین نمایش داده شده"
diff --git a/po/fi.po b/po/fi.po
index 8616048b..3a449bd9 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-music master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-music/issues\n"
-"POT-Creation-Date: 2022-02-19 12:39+0000\n"
-"PO-Revision-Date: 2022-02-23 20:47+0200\n"
+"POT-Creation-Date: 2022-08-27 13:27+0000\n"
+"PO-Revision-Date: 2022-08-30 14:54+0300\n"
 "Last-Translator: Jiri Grönroos <jiri.gronroos+l10n@iki.fi>\n"
 "Language-Team: suomi <lokalisointi-lista@googlegroups.com>\n"
 "Language: fi\n"
@@ -16,11 +16,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.0.1\n"
+"X-Generator: Poedit 3.1.1\n"
 
 #: data/org.gnome.Music.appdata.xml.in.in:6
-#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/application.py:61
-#: gnomemusic/window.py:71
+#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/about.py:236
+#: gnomemusic/application.py:61 gnomemusic/window.py:71
 msgid "Music"
 msgstr "Musiikki"
 
@@ -41,7 +41,7 @@ msgstr ""
 "Löydä kappaleet paikallisesta kokoelmastasi, käytä automaattisesti luotuja "
 "soittolistoja tai valikoi itse parhaat kappaleet soittolistalle."
 
-#: data/org.gnome.Music.appdata.xml.in.in:149
+#: data/org.gnome.Music.appdata.xml.in.in:167
 msgid "The GNOME Music developers"
 msgstr "Gnomen musiikkisoittimen kehittäjät"
 
@@ -117,58 +117,21 @@ msgstr ""
 "Ottaa käyttöön tai poistaa käytöstä kuunteluhistorian ja \"Nyt toistetaan\"-"
 "tietojen lähettämisen Last.fm:ään."
 
-#: data/ui/AboutDialog.ui.in:9
-msgid "Copyright © 2018 GNOME Music Developers"
-msgstr "Tekijänoikeus © 2018 Gnomen musiikkisoittimen kehittäjät"
-
-#: data/ui/AboutDialog.ui.in:10
-msgid "A music player and management application for GNOME."
-msgstr "Gnomen musiikkisoitin."
-
-#: data/ui/AboutDialog.ui.in:12
-msgid "Visit GNOME Music website"
-msgstr "Käy Gnomen musiikkisoittimen verkkosivustolla"
-
-#: data/ui/AboutDialog.ui.in:13
-msgid ""
-"GNOME Music is free software; you can redistribute it and/or modify it under "
-"the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"GNOME Music is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
-"\n"
-"The GNOME Music authors hereby grant permission for non-GPL compatible "
-"GStreamer plugins to be used and distributed together with GStreamer and "
-"GNOME Music.  This permission is above and beyond the permissions granted by "
-"the GPL license by which GNOME Music is covered.  If you modify this code, "
-"you may extend this exception to your version of the code, but you are not "
-"obligated to do so.  If you do not wish to do so, delete this exception "
-"statement from your version."
-msgstr ""
-
-#: data/ui/AlbumWidget.ui:86 data/ui/PlayerToolbar.ui:88
-#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:168
+#: data/ui/AlbumWidget.ui:84 data/ui/PlayerToolbar.ui:87
+#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:170
 msgid "Play"
 msgstr "Toista"
 
-#: data/ui/AlbumWidget.ui:132 data/ui/PlaylistControls.ui:5
+#: data/ui/AlbumWidget.ui:130 data/ui/PlaylistControls.ui:5
 #: data/ui/SongWidgetMenu.ui:11
 msgid "_Play"
 msgstr "_Toista"
 
-#: data/ui/AlbumWidget.ui:136
+#: data/ui/AlbumWidget.ui:134
 msgid "Add to _Favorite Songs"
 msgstr "Lisää _suosikkikappaleisiin"
 
-#: data/ui/AlbumWidget.ui:140 data/ui/SongWidgetMenu.ui:15
+#: data/ui/AlbumWidget.ui:138 data/ui/SongWidgetMenu.ui:15
 msgid "_Add to Playlist…"
 msgstr "Lisää s_oittolistalle…"
 
@@ -192,7 +155,7 @@ msgstr "_Ohje"
 msgid "_About Music"
 msgstr "_Tietoja - Musiikki"
 
-#: data/ui/EmptyView.ui:26 data/ui/InitialState.ui:13
+#: data/ui/EmptyView.ui:30
 msgid "Welcome to Music"
 msgstr "Tervetuloa, tämä on Musiikki"
 
@@ -204,7 +167,7 @@ msgstr "Valikko"
 msgid "Select"
 msgstr "Valitse"
 
-#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:211
+#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:213
 #: data/ui/SearchHeaderBar.ui:20
 msgid "_Cancel"
 msgstr "_Peru"
@@ -302,10 +265,6 @@ msgctxt "shortcut window"
 msgid "Go back"
 msgstr "Siirry takaisin"
 
-#: data/ui/InitialState.ui:25
-msgid "The contents of your Music Folder will appear here"
-msgstr "Musiikki-kansion sisältö ilmestyy tähän"
-
 #: data/ui/LastfmDialog.ui:21
 msgid ""
 "Last.fm is a music discovery service that gives you personalised "
@@ -326,11 +285,11 @@ msgstr "Kirjaudu Last.fm-tilillesi lähettääksesi musiikin kuunteluhistoriasi.
 msgid "Login"
 msgstr "Kirjaudu"
 
-#: data/ui/PlayerToolbar.ui:75
+#: data/ui/PlayerToolbar.ui:74
 msgid "Previous"
 msgstr "Edellinen"
 
-#: data/ui/PlayerToolbar.ui:107
+#: data/ui/PlayerToolbar.ui:106
 msgid "Next"
 msgstr "Seuraava"
 
@@ -366,11 +325,11 @@ msgstr "Uusi soittolista…"
 msgid "Add"
 msgstr "Lisää"
 
-#: data/ui/PlaylistDialog.ui:200
+#: data/ui/PlaylistDialog.ui:202
 msgid "Add to Playlist"
 msgstr "Lisää soittolistaan"
 
-#: data/ui/PlaylistDialog.ui:220
+#: data/ui/PlaylistDialog.ui:222
 msgid "_Add"
 msgstr "_Lisää"
 
@@ -382,7 +341,7 @@ msgstr "Esittäjät"
 msgid "View All"
 msgstr "Näytä kaikki"
 
-#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:54
+#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:56
 msgid "Albums"
 msgstr "Albumit"
 
@@ -410,6 +369,22 @@ msgstr "Lisää _soittolistalle"
 msgid "_Remove from Playlist"
 msgstr "Poista _soittolistalta"
 
+#: gnomemusic/about.py:238
+msgid "The GNOME Project"
+msgstr "Gnome-projekti"
+
+#: gnomemusic/about.py:242
+msgid "translator-credits"
+msgstr "Jiri Grönroos"
+
+#: gnomemusic/about.py:246
+msgid "Copyright The GNOME Music Developers"
+msgstr "Tekijänoikeus Gnomen musiikkisoittimen kehittäjät"
+
+#: gnomemusic/about.py:249
+msgid "Translated by"
+msgstr "Käännös"
+
 #. TRANSLATORS: this is a playlist name
 #: gnomemusic/grilowrappers/grltrackerplaylists.py:894
 msgid "Most Played"
@@ -550,7 +525,7 @@ msgstr "Esittäjätulokset"
 msgid "Albums Results"
 msgstr "Albumitulokset"
 
-#: gnomemusic/widgets/albumwidget.py:240
+#: gnomemusic/widgets/albumwidget.py:245
 msgid "{} minute"
 msgid_plural "{} minutes"
 msgstr[0] "{} minuutti"
@@ -583,7 +558,7 @@ msgstr "Kirjautuneena tilillä {}"
 msgid "Configure"
 msgstr "Määritä"
 
-#: gnomemusic/widgets/playertoolbar.py:165
+#: gnomemusic/widgets/playertoolbar.py:167
 msgid "Pause"
 msgstr "Keskeytä"
 
@@ -593,6 +568,15 @@ msgid_plural "{} Songs"
 msgstr[0] "{} kappale"
 msgstr[1] "{} kappaletta"
 
+#~ msgid "A music player and management application for GNOME."
+#~ msgstr "Gnomen musiikkisoitin."
+
+#~ msgid "Visit GNOME Music website"
+#~ msgstr "Käy Gnomen musiikkisoittimen verkkosivustolla"
+
+#~ msgid "The contents of your Music Folder will appear here"
+#~ msgstr "Musiikki-kansion sisältö ilmestyy tähän"
+
 #~ msgid "GNOME Music"
 #~ msgstr "Gnomen Musiikki"
 
@@ -756,9 +740,6 @@ msgstr[1] "{} kappaletta"
 #~ msgid "Quit"
 #~ msgstr "Lopeta"
 
-#~ msgid "translator-credits"
-#~ msgstr "Jiri Grönroos"
-
 #~ msgid "A GNOME 3 application to listen and manage music playlists"
 #~ msgstr "Gnome 3 -sovellus musiikin kuunteluun ja soittolistojen hallintaan"
 
diff --git a/po/fr.po b/po/fr.po
index 8682ede8..7bcc1b05 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-music master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-music/issues\n"
-"POT-Creation-Date: 2022-02-21 21:11+0000\n"
-"PO-Revision-Date: 2022-04-08 22:49+0200\n"
+"POT-Creation-Date: 2022-08-27 13:27+0000\n"
+"PO-Revision-Date: 2022-09-03 09:01+0200\n"
 "Last-Translator: Charles Monzat <charles.monzat@free.fr>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
 "Language: fr\n"
@@ -26,8 +26,8 @@ msgstr ""
 "X-Generator: Gtranslator 40.0\n"
 
 #: data/org.gnome.Music.appdata.xml.in.in:6
-#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/application.py:61
-#: gnomemusic/window.py:71
+#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/about.py:236
+#: gnomemusic/application.py:61 gnomemusic/window.py:71
 msgid "Music"
 msgstr "Musique"
 
@@ -48,7 +48,7 @@ msgstr ""
 "Trouvez les pistes dans votre collection locale, utilisez des listes de "
 "lecture générées automatiquement ou organisez-en une nouvelle."
 
-#: data/org.gnome.Music.appdata.xml.in.in:149
+#: data/org.gnome.Music.appdata.xml.in.in:167
 msgid "The GNOME Music developers"
 msgstr "Les développeurs de l’application Musique de GNOME"
 
@@ -125,81 +125,21 @@ msgstr ""
 "Active ou désactive l’envoi à Last.fm des morceaux écoutés (scrobbles) et de "
 "l’information « en cours de lecture »."
 
-#: data/ui/AboutDialog.ui.in:9
-msgid "Copyright © 2018 GNOME Music Developers"
-msgstr "Copyright © 2018 Développeurs de l’application Musique de GNOME"
-
-#: data/ui/AboutDialog.ui.in:10
-msgid "A music player and management application for GNOME."
-msgstr "Un lecteur de musique et une application de gestion pour GNOME."
-
-#: data/ui/AboutDialog.ui.in:12
-msgid "Visit GNOME Music website"
-msgstr "Visiter le site web de l’application Musique de GNOME"
-
-#: data/ui/AboutDialog.ui.in:13
-msgid ""
-"GNOME Music is free software; you can redistribute it and/or modify it under "
-"the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"GNOME Music is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
-"\n"
-"The GNOME Music authors hereby grant permission for non-GPL compatible "
-"GStreamer plugins to be used and distributed together with GStreamer and "
-"GNOME Music.  This permission is above and beyond the permissions granted by "
-"the GPL license by which GNOME Music is covered.  If you modify this code, "
-"you may extend this exception to your version of the code, but you are not "
-"obligated to do so.  If you do not wish to do so, delete this exception "
-"statement from your version."
-msgstr ""
-"Musique de GNOME est un logiciel libre ; vous pouvez le redistribuer et/ou "
-"le modifier au titre des clauses de la Licence Publique Générale GNU, telle "
-"que publiée par la Free Software Foundation ; soit la version 2 de la "
-"Licence, ou (à votre discrétion) une version ultérieure quelconque.\n"
-"\n"
-"Musique de GNOME est distribué dans l’espoir qu’il sera utile, mais SANS "
-"AUCUNE GARANTIE ; sans même une garantie implicite de COMMERCIABILITÉ ou DE "
-"CONFORMITÉ À UNE UTILISATION PARTICULIÈRE. Voir la Licence Publique Générale "
-"GNU pour plus de détails.\n"
-"\n"
-"Vous devriez avoir reçu un exemplaire de la Licence Publique Générale GNU "
-"avec l’application Musique de GNOME ; si ce n’est pas le cas, écrivez à la "
-"Free Software Foundation Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
-"02110-1301, USA.\n"
-"\n"
-"Les auteurs de l’application Musique de GNOME accordent par la présente "
-"l’autorisation d’utiliser des greffons GStreamer non compatibles avec la "
-"licence GPL et de les distribuer conjointement à GStreamer et à "
-"l’application Musique de GNOME. Cette permission supplante et va au-delà des "
-"autorisations accordées par la licence GPL couvrant l’application Musique de "
-"GNOME. Si vous modifiez ce code, vous pouvez étendre cette autorisation à "
-"votre version du code, mais vous n’y êtes pas obligés. Si vous ne le "
-"souhaitez pas, veuillez supprimer cette mention d’exception de votre version."
-
-#: data/ui/AlbumWidget.ui:86 data/ui/PlayerToolbar.ui:88
-#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:168
+#: data/ui/AlbumWidget.ui:84 data/ui/PlayerToolbar.ui:87
+#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:170
 msgid "Play"
 msgstr "Lecture"
 
-#: data/ui/AlbumWidget.ui:132 data/ui/PlaylistControls.ui:5
+#: data/ui/AlbumWidget.ui:130 data/ui/PlaylistControls.ui:5
 #: data/ui/SongWidgetMenu.ui:11
 msgid "_Play"
 msgstr "_Lire"
 
-#: data/ui/AlbumWidget.ui:136
+#: data/ui/AlbumWidget.ui:134
 msgid "Add to _Favorite Songs"
 msgstr "Ajouter aux morceaux _favoris"
 
-#: data/ui/AlbumWidget.ui:140 data/ui/SongWidgetMenu.ui:15
+#: data/ui/AlbumWidget.ui:138 data/ui/SongWidgetMenu.ui:15
 msgid "_Add to Playlist…"
 msgstr "_Ajouter à la liste de lecture…"
 
@@ -223,7 +163,7 @@ msgstr "Aid_e"
 msgid "_About Music"
 msgstr "À _propos de Musique"
 
-#: data/ui/EmptyView.ui:26 data/ui/InitialState.ui:13
+#: data/ui/EmptyView.ui:30
 msgid "Welcome to Music"
 msgstr "Bienvenue dans Musique"
 
@@ -235,7 +175,7 @@ msgstr "Menu"
 msgid "Select"
 msgstr "Sélectionner"
 
-#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:211
+#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:213
 #: data/ui/SearchHeaderBar.ui:20
 msgid "_Cancel"
 msgstr "A_nnuler"
@@ -333,10 +273,6 @@ msgctxt "shortcut window"
 msgid "Go back"
 msgstr "Revenir en arrière"
 
-#: data/ui/InitialState.ui:25
-msgid "The contents of your Music Folder will appear here"
-msgstr "Le contenu de votre dossier Musique s’affichera ici"
-
 #: data/ui/LastfmDialog.ui:21
 msgid ""
 "Last.fm is a music discovery service that gives you personalised "
@@ -359,11 +295,11 @@ msgstr ""
 msgid "Login"
 msgstr "Se connecter"
 
-#: data/ui/PlayerToolbar.ui:75
+#: data/ui/PlayerToolbar.ui:74
 msgid "Previous"
 msgstr "Précédent"
 
-#: data/ui/PlayerToolbar.ui:107
+#: data/ui/PlayerToolbar.ui:106
 msgid "Next"
 msgstr "Suivant"
 
@@ -399,11 +335,11 @@ msgstr "Nouvelle liste de lecture…"
 msgid "Add"
 msgstr "Ajouter"
 
-#: data/ui/PlaylistDialog.ui:200
+#: data/ui/PlaylistDialog.ui:202
 msgid "Add to Playlist"
 msgstr "Ajouter à la liste de lecture"
 
-#: data/ui/PlaylistDialog.ui:220
+#: data/ui/PlaylistDialog.ui:222
 msgid "_Add"
 msgstr "_Ajouter"
 
@@ -415,7 +351,7 @@ msgstr "Artistes"
 msgid "View All"
 msgstr "Tout afficher"
 
-#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:54
+#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:56
 msgid "Albums"
 msgstr "Albums"
 
@@ -443,6 +379,29 @@ msgstr "_Ajouter à la liste de lecture"
 msgid "_Remove from Playlist"
 msgstr "_Supprimer de la liste de lecture"
 
+#: gnomemusic/about.py:238
+msgid "The GNOME Project"
+msgstr "Le projet GNOME"
+
+#: gnomemusic/about.py:242
+msgid "translator-credits"
+msgstr ""
+"Alain Lojewski <allomervan@gmail.com>\n"
+"Erwan Georget <dremor@dremor.info>\n"
+"Guillaume Bernard <associations@guillaume-bernard.fr>\n"
+"William Oprandi <william.oprandi@gmail.com>\n"
+"Julien Humbert <julroy67@gmail.com>\n"
+"vanadiae <vanadiae35@gmail.com>\n"
+"Charles Monzat <charles.monzat@free.fr>"
+
+#: gnomemusic/about.py:246
+msgid "Copyright The GNOME Music Developers"
+msgstr "Copyright Développeurs de l’application Musique de GNOME"
+
+#: gnomemusic/about.py:249
+msgid "Translated by"
+msgstr "Traduit par"
+
 #. TRANSLATORS: this is a playlist name
 #: gnomemusic/grilowrappers/grltrackerplaylists.py:894
 msgid "Most Played"
@@ -585,7 +544,7 @@ msgstr "Résultats pour Artistes"
 msgid "Albums Results"
 msgstr "Résultats pour Albums"
 
-#: gnomemusic/widgets/albumwidget.py:242
+#: gnomemusic/widgets/albumwidget.py:245
 msgid "{} minute"
 msgid_plural "{} minutes"
 msgstr[0] "{} minute"
@@ -618,7 +577,7 @@ msgstr "Connecté en tant que {}"
 msgid "Configure"
 msgstr "Configurer"
 
-#: gnomemusic/widgets/playertoolbar.py:165
+#: gnomemusic/widgets/playertoolbar.py:167
 msgid "Pause"
 msgstr "Pause"
 
@@ -628,11 +587,14 @@ msgid_plural "{} Songs"
 msgstr[0] "{} morceau"
 msgstr[1] "{} morceaux"
 
-#~ msgid "Window position"
-#~ msgstr "Position de la fenêtre"
+#~ msgid "A music player and management application for GNOME."
+#~ msgstr "Un lecteur de musique et une application de gestion pour GNOME."
+
+#~ msgid "Visit GNOME Music website"
+#~ msgstr "Visiter le site web de l’application Musique de GNOME"
 
-#~ msgid "Window position (x and y)."
-#~ msgstr "La position de la fenêtre (en x et y)."
+#~ msgid "The contents of your Music Folder will appear here"
+#~ msgstr "Le contenu de votre dossier Musique s’affichera ici"
 
 #~ msgid ""
 #~ "An easy way to play your music. Automatically discover music on your "
@@ -641,14 +603,6 @@ msgstr[1] "{} morceaux"
 #~ "Un moyen simple d’écouter votre musique. Découvrez automatiquement la "
 #~ "musique sur votre ordinateur, le réseau local et les services Internet."
 
-#~ msgid ""
-#~ "Find tracks in your local collection, get music from DLNA servers or try "
-#~ "something new with the Jamendo and Magnatune services."
-#~ msgstr ""
-#~ "Trouvez les pistes dans votre collection locale, obtenez de la musique de "
-#~ "serveurs DLNA ou essayez quelque chose de nouveau avec les services "
-#~ "Jamendo et Magnatune."
-
 #~ msgid "Inital state has been displayed"
 #~ msgstr "L’état initial a été affiché"
 
diff --git a/po/fur.po b/po/fur.po
index 5e75d2d7..89e24c37 100644
--- a/po/fur.po
+++ b/po/fur.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-music master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-music/issues\n"
-"POT-Creation-Date: 2022-02-19 12:39+0000\n"
-"PO-Revision-Date: 2022-04-12 09:43+0000\n"
+"POT-Creation-Date: 2022-08-27 13:27+0000\n"
+"PO-Revision-Date: 2022-10-03 09:29+0200\n"
 "Last-Translator: Fabio Tomat <f.t.public@gmail.com>\n"
 "Language-Team: Friulian <f.t.public@gmail.com>\n"
 "Language: fur\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Editor: HaiPO 1.2 b1\n"
-"X-Generator: Poedit 3.0\n"
+"X-Generator: Poedit 3.1.1\n"
 
 #: data/org.gnome.Music.appdata.xml.in.in:6
-#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/application.py:61
-#: gnomemusic/window.py:71
+#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/about.py:236
+#: gnomemusic/application.py:61 gnomemusic/window.py:71
 msgid "Music"
 msgstr "Musiche"
 
@@ -42,7 +42,7 @@ msgstr ""
 "Cjate i tocs inte tô colezion locâl, dopre lis listis di riproduzion "
 "gjeneradis in automatic o cure une gnove."
 
-#: data/org.gnome.Music.appdata.xml.in.in:149
+#: data/org.gnome.Music.appdata.xml.in.in:167
 msgid "The GNOME Music developers"
 msgstr "I svilupadôrs di GNOME Musiche"
 
@@ -50,8 +50,7 @@ msgstr "I svilupadôrs di GNOME Musiche"
 msgid "Music Player"
 msgstr "Letôr musicâl"
 
-#. Translators: Search terms to find this application. Do NOT translate or
-#. localize the semicolons! The list MUST also end with a semicolon!
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 #: data/org.gnome.Music.desktop.in.in:13
 msgid "Music;Player;"
 msgstr "Musiche;Riprodutôr;"
@@ -76,20 +75,19 @@ msgstr "Stât barcon slargjât."
 msgid "Playback repeat mode"
 msgstr "Modalitât ripetizion"
 
-#. Translators: Don't translate allowed values, just the description in the
-#. brackets
+#. Translators: Don't translate allowed values, just the description in the brackets
 #: data/org.gnome.Music.gschema.xml:24
 msgid ""
 "Value identifies whether to repeat or randomize playback through the "
-"collection. Allowed values are: “none” (repeat and shuffle are off), “song” "
-"(repeat current song), “all” (repeat playlist, no shuffle), “shuffle” "
-"(shuffle playlist, presumes repeat all)."
+"collection. Allowed values are: “none” (repeat and shuffle are off), "
+"“song” (repeat current song), “all” (repeat playlist, no shuffle), "
+"“shuffle” (shuffle playlist, presumes repeat all)."
 msgstr ""
 "Il valôr al specifiche se ripeti o riprodusi a câs le colezion. I valôrs "
-"acetâts a son: “none” (ripetizion e messedât a son studâts), “song” "
-"(ripetizion de cjançon atuâl), “all” (ripetizion de liste des cjançons, "
-"cence messedâ), “shuffle” (messedâ l'ordin de liste des cjançons, si intint "
-"ancje ripeti dutis)."
+"acetâts a son: “none” (ripetizion e messedât a son studâts), "
+"“song” (ripetizion de cjançon atuâl), “all” (ripetizion de liste des "
+"cjançons, cence messedâ), “shuffle” (messedâ l'ordin de liste des cjançons, "
+"si intint ancje ripeti dutis)."
 
 #: data/org.gnome.Music.gschema.xml:28
 msgid "Enable ReplayGain"
@@ -106,8 +104,8 @@ msgstr "Inibìs la sospension dal sisteme"
 #: data/org.gnome.Music.gschema.xml:34
 msgid "Enables or disables inhibiting system suspend while playing music"
 msgstr ""
-"Abilite o disabilite la inibizion a sospindi il sisteme intant che si scolte"
-" la musiche"
+"Abilite o disabilite la inibizion a sospindi il sisteme intant che si scolte "
+"la musiche"
 
 #: data/org.gnome.Music.gschema.xml:38
 msgid "Report music history to Last.fm"
@@ -118,54 +116,24 @@ msgid ""
 "Enables or disables sending scrobbles and the “currently playing” info to "
 "Last.fm."
 msgstr ""
-"Al abilite o al disabilite l'inviâ i tiei gjenars di musiche preferide e lis"
-" informazions ce che tu stâs scoltant a Last.fm."
+"Al abilite o al disabilite l'inviâ i tiei gjenars di musiche preferide e lis "
+"informazions ce che tu stâs scoltant a Last.fm."
 
-#: data/ui/AboutDialog.ui.in:9
-msgid "Copyright © 2018 GNOME Music Developers"
-msgstr "Copyright © 2018 Svilupadôrs di GNOME Musiche"
-
-#: data/ui/AboutDialog.ui.in:10
-msgid "A music player and management application for GNOME."
-msgstr "Une aplicazion GNOME par sunâ e ministrâ le proprie musiche."
-
-#: data/ui/AboutDialog.ui.in:12
-msgid "Visit GNOME Music website"
-msgstr "Visite il sît di GNOME Musiche"
-
-#: data/ui/AboutDialog.ui.in:13
-msgid ""
-"GNOME Music is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
-"\n"
-"GNOME Music is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with GNOME Music; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
-"\n"
-"The GNOME Music authors hereby grant permission for non-GPL compatible GStreamer plugins to be used and distributed together with GStreamer and GNOME Music.  This permission is above and beyond the permissions granted by the GPL license by which GNOME Music is covered.  If you modify this code, you may extend this exception to your version of the code, but you are not obligated to do so.  If you do not wish to do so, delete this exception statement from your version."
-msgstr ""
-"GNOME Musiche al è software libar; al è pussibil tornâ a distribuîlu o modificâlu sot i tiermins de licence GNU General Public License, come publicade de Free Software Foundation, version 2 o (a tô sielte) cualsisei sucessive.\n"
-"\n"
-"GNOME Musiche al è distribuît inte sperance che al sedi util, ma CENCE NISSUNE GARANZIE, cence nancje la implicite garanzie di CUMIERÇABILITÂT o IDONEITÂT A UNE FINALITÂT PARTICOLÂR.  Consultâ la licence GNU General Public License par vê plui detais.\n"
-"\n"
-"Cun GNOME Musiche ti varessin di vê dât ancje une copie de licence GNU General Public License, in câs contrari al è pussibil domandâle scrivint a: Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
-"\n"
-"Cun cheste letare i autôrs di GNOME Musiche a concedin il permès di doprâ e distribuî i plugin GStreamer, che no son compatibii cun la GPL, adun cun GStreamer e GNOME Musiche.  Chest permès al è parsore e di là dal permès concedût de licence GPL che e cuvierç GNOME Musiche. Se tu modifichis chest codiç, tu puedis estindi cheste ecezion ae tô version dal codiç, ma no tu sês obleât a fâlu.  Se no tu desideris fâlu, elimine cheste declarazion di ecezion de tô version."
-
-#: data/ui/AlbumWidget.ui:86 data/ui/PlayerToolbar.ui:88
-#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:168
+#: data/ui/AlbumWidget.ui:84 data/ui/PlayerToolbar.ui:87
+#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:170
 msgid "Play"
 msgstr "Sune"
 
-#: data/ui/AlbumWidget.ui:132 data/ui/PlaylistControls.ui:5
+#: data/ui/AlbumWidget.ui:130 data/ui/PlaylistControls.ui:5
 #: data/ui/SongWidgetMenu.ui:11
 msgid "_Play"
 msgstr "_Sune"
 
-#: data/ui/AlbumWidget.ui:136
+#: data/ui/AlbumWidget.ui:134
 msgid "Add to _Favorite Songs"
 msgstr "Zonte ai _tocs preferîts"
 
-#: data/ui/AlbumWidget.ui:140 data/ui/SongWidgetMenu.ui:15
+#: data/ui/AlbumWidget.ui:138 data/ui/SongWidgetMenu.ui:15
 msgid "_Add to Playlist…"
 msgstr "_Zonte ae liste di riproduzion…"
 
@@ -189,7 +157,7 @@ msgstr "_Jutori"
 msgid "_About Music"
 msgstr "_Informazions su Musiche"
 
-#: data/ui/EmptyView.ui:26 data/ui/InitialState.ui:13
+#: data/ui/EmptyView.ui:30
 msgid "Welcome to Music"
 msgstr "Benvignûts su Musiche"
 
@@ -201,7 +169,7 @@ msgstr "Menù"
 msgid "Select"
 msgstr "Selezione"
 
-#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:211
+#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:213
 #: data/ui/SearchHeaderBar.ui:20
 msgid "_Cancel"
 msgstr "_Anule"
@@ -299,11 +267,6 @@ msgctxt "shortcut window"
 msgid "Go back"
 msgstr "Torne indaûr"
 
-# %s o ai viodût che al ven fûr "cartele di musiche"
-#: data/ui/InitialState.ui:25
-msgid "The contents of your Music Folder will appear here"
-msgstr "Il contignût de tô cartele Musiche al vignarà mostrât achì"
-
 #: data/ui/LastfmDialog.ui:21
 msgid ""
 "Last.fm is a music discovery service that gives you personalised "
@@ -324,11 +287,11 @@ msgstr "Jentre tal to account Last.fm par inviâ la musiche che tu scoltis."
 msgid "Login"
 msgstr "Jentre"
 
-#: data/ui/PlayerToolbar.ui:75
+#: data/ui/PlayerToolbar.ui:74
 msgid "Previous"
 msgstr "Precedent"
 
-#: data/ui/PlayerToolbar.ui:107
+#: data/ui/PlayerToolbar.ui:106
 msgid "Next"
 msgstr "Prossim"
 
@@ -364,11 +327,11 @@ msgstr "Gnove liste di musichis…"
 msgid "Add"
 msgstr "Zonte"
 
-#: data/ui/PlaylistDialog.ui:200
+#: data/ui/PlaylistDialog.ui:202
 msgid "Add to Playlist"
 msgstr "Zonte ae liste des musichis"
 
-#: data/ui/PlaylistDialog.ui:220
+#: data/ui/PlaylistDialog.ui:222
 msgid "_Add"
 msgstr "_Zonte"
 
@@ -380,7 +343,7 @@ msgstr "Artiscj"
 msgid "View All"
 msgstr "Visualize dut"
 
-#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:54
+#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:56
 msgid "Albums"
 msgstr "Album"
 
@@ -408,6 +371,22 @@ msgstr "_Zonte ae liste des musichis"
 msgid "_Remove from Playlist"
 msgstr "_Gjave de liste des musichis"
 
+#: gnomemusic/about.py:238
+msgid "The GNOME Project"
+msgstr "Il progjet GNOME"
+
+#: gnomemusic/about.py:242
+msgid "translator-credits"
+msgstr "Fabio Tomat <f.t.public@gmail.com>, 2022"
+
+#: gnomemusic/about.py:246
+msgid "Copyright The GNOME Music Developers"
+msgstr "Copyright i svilupadôrs di GNOME Musiche"
+
+#: gnomemusic/about.py:249
+msgid "Translated by"
+msgstr "Tradot di"
+
 #. TRANSLATORS: this is a playlist name
 #: gnomemusic/grilowrappers/grltrackerplaylists.py:894
 msgid "Most Played"
@@ -509,9 +488,9 @@ msgstr "La tô cartele XDG di Musiche no je stabilide."
 msgid "Music Folder"
 msgstr "cartele de musiche"
 
+# %s o ai viodût che al ven fûr "cartele di musiche"
 #. TRANSLATORS: This is a label to display a link to open user's music
 #. folder. {} will be replaced with the translated text 'Music folder'
-# %s o ai viodût che al ven fûr "cartele di musiche"
 #: gnomemusic/views/emptyview.py:76
 msgid "The contents of your {} will appear here."
 msgstr "Il contignût de tô {} al vignarà mostrât achì."
@@ -554,7 +533,7 @@ msgstr "Risultâts artiscj"
 msgid "Albums Results"
 msgstr "Risultâts album"
 
-#: gnomemusic/widgets/albumwidget.py:240
+#: gnomemusic/widgets/albumwidget.py:245
 msgid "{} minute"
 msgid_plural "{} minutes"
 msgstr[0] "{} minût"
@@ -587,7 +566,7 @@ msgstr "Jentrât come {}"
 msgid "Configure"
 msgstr "Configure"
 
-#: gnomemusic/widgets/playertoolbar.py:165
+#: gnomemusic/widgets/playertoolbar.py:167
 msgid "Pause"
 msgstr "Pause"
 
@@ -597,6 +576,62 @@ msgid_plural "{} Songs"
 msgstr[0] "{} Cjançon"
 msgstr[1] "{} Cjançons"
 
+#~ msgid "A music player and management application for GNOME."
+#~ msgstr "Une aplicazion GNOME par sunâ e ministrâ le proprie musiche."
+
+#~ msgid "Visit GNOME Music website"
+#~ msgstr "Visite il sît di GNOME Musiche"
+
+#~ msgid ""
+#~ "GNOME Music is free software; you can redistribute it and/or modify it "
+#~ "under the terms of the GNU General Public License as published by the "
+#~ "Free Software Foundation; either version 2 of the License, or (at your "
+#~ "option) any later version.\n"
+#~ "\n"
+#~ "GNOME Music is distributed in the hope that it will be useful, but "
+#~ "WITHOUT ANY WARRANTY; without even the implied warranty of "
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General "
+#~ "Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License along "
+#~ "with GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
+#~ "Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
+#~ "\n"
+#~ "The GNOME Music authors hereby grant permission for non-GPL compatible "
+#~ "GStreamer plugins to be used and distributed together with GStreamer and "
+#~ "GNOME Music.  This permission is above and beyond the permissions granted "
+#~ "by the GPL license by which GNOME Music is covered.  If you modify this "
+#~ "code, you may extend this exception to your version of the code, but you "
+#~ "are not obligated to do so.  If you do not wish to do so, delete this "
+#~ "exception statement from your version."
+#~ msgstr ""
+#~ "GNOME Musiche al è software libar; al è pussibil tornâ a distribuîlu o "
+#~ "modificâlu sot i tiermins de licence GNU General Public License, come "
+#~ "publicade de Free Software Foundation, version 2 o (a tô sielte) "
+#~ "cualsisei sucessive.\n"
+#~ "\n"
+#~ "GNOME Musiche al è distribuît inte sperance che al sedi util, ma CENCE "
+#~ "NISSUNE GARANZIE, cence nancje la implicite garanzie di CUMIERÇABILITÂT o "
+#~ "IDONEITÂT A UNE FINALITÂT PARTICOLÂR.  Consultâ la licence GNU General "
+#~ "Public License par vê plui detais.\n"
+#~ "\n"
+#~ "Cun GNOME Musiche ti varessin di vê dât ancje une copie de licence GNU "
+#~ "General Public License, in câs contrari al è pussibil domandâle scrivint "
+#~ "a: Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, "
+#~ "Boston, MA 02110-1301 USA.\n"
+#~ "\n"
+#~ "Cun cheste letare i autôrs di GNOME Musiche a concedin il permès di doprâ "
+#~ "e distribuî i plugin GStreamer, che no son compatibii cun la GPL, adun "
+#~ "cun GStreamer e GNOME Musiche.  Chest permès al è parsore e di là dal "
+#~ "permès concedût de licence GPL che e cuvierç GNOME Musiche. Se tu "
+#~ "modifichis chest codiç, tu puedis estindi cheste ecezion ae tô version "
+#~ "dal codiç, ma no tu sês obleât a fâlu.  Se no tu desideris fâlu, elimine "
+#~ "cheste declarazion di ecezion de tô version."
+
+# %s o ai viodût che al ven fûr "cartele di musiche"
+#~ msgid "The contents of your Music Folder will appear here"
+#~ msgstr "Il contignût de tô cartele Musiche al vignarà mostrât achì"
+
 #~ msgid "GNOME Music"
 #~ msgstr "GNOME Musiche"
 
@@ -623,8 +658,8 @@ msgstr[1] "{} Cjançons"
 #~ "Find tracks in your local collection, get music from DLNA servers or try "
 #~ "something new with the Jamendo and Magnatune services."
 #~ msgstr ""
-#~ "Cjate i tocs te colezion locâl, oten musiche dai servidôrs DLNA o cîr alc di"
-#~ " gnûf cui servizis Jamendo e Magnatune."
+#~ "Cjate i tocs te colezion locâl, oten musiche dai servidôrs DLNA o cîr alc "
+#~ "di gnûf cui servizis Jamendo e Magnatune."
 
 #~ msgid "Inital state has been displayed"
 #~ msgstr "Il stât iniziâl al è stât mostrât"
diff --git a/po/gl.po b/po/gl.po
index da311dbe..efa548ce 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -2,23 +2,23 @@
 # Copyright (C) 2012 THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
-# Fran Dieguez <frandieguez@gnome.org>, 2012-2021.
 # Fran Diéguez <frandieguez@gnome.org>, 2012-2022.
+# Fran Dieguez <frandieguez@gnome.org>, 2012-2022.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-music master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-music/issues\n"
-"POT-Creation-Date: 2022-02-19 12:39+0000\n"
-"PO-Revision-Date: 2022-02-24 13:51+0100\n"
-"Last-Translator: Fran Diéguez <frandieguez@gnome.org>\n"
+"POT-Creation-Date: 2022-08-27 13:27+0000\n"
+"PO-Revision-Date: 2022-09-05 00:24+0200\n"
+"Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
 "Language-Team: Galician <proxecto@trasno.gal>\n"
 "Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"X-Generator: Gtranslator 41.0\n"
+"X-Generator: Gtranslator 40.0\n"
 "X-Project-Style: gnome\n"
 "X-DL-Team: gl\n"
 "X-DL-Module: gnome-music\n"
@@ -27,8 +27,8 @@ msgstr ""
 "X-DL-State: Translating\n"
 
 #: data/org.gnome.Music.appdata.xml.in.in:6
-#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/application.py:61
-#: gnomemusic/window.py:71
+#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/about.py:236
+#: gnomemusic/application.py:61 gnomemusic/window.py:71
 msgid "Music"
 msgstr "Música"
 
@@ -49,7 +49,7 @@ msgstr ""
 "Atope pistas na súa colección local, use as listas de reprodución xeradas "
 "automaticamente ou cree unha nova."
 
-#: data/org.gnome.Music.appdata.xml.in.in:149
+#: data/org.gnome.Music.appdata.xml.in.in:167
 msgid "The GNOME Music developers"
 msgstr "Os desenvolvedores de GNOME Music"
 
@@ -126,81 +126,21 @@ msgstr ""
 "Activar ou desactivar o envío de «scrobbles» e o «reproducindo actualmente» "
 "a Last.fm."
 
-#: data/ui/AboutDialog.ui.in:9
-msgid "Copyright © 2018 GNOME Music Developers"
-msgstr "Copyright © 2018 Os desenvolvedores de GNOME Music"
-
-#: data/ui/AboutDialog.ui.in:10
-msgid "A music player and management application for GNOME."
-msgstr "Unha aplicación de reprodución e xestión de música para GNOME."
-
-#: data/ui/AboutDialog.ui.in:12
-msgid "Visit GNOME Music website"
-msgstr "Visite o sitio web de GNOME Music"
-
-#: data/ui/AboutDialog.ui.in:13
-msgid ""
-"GNOME Music is free software; you can redistribute it and/or modify it under "
-"the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"GNOME Music is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
-"\n"
-"The GNOME Music authors hereby grant permission for non-GPL compatible "
-"GStreamer plugins to be used and distributed together with GStreamer and "
-"GNOME Music.  This permission is above and beyond the permissions granted by "
-"the GPL license by which GNOME Music is covered.  If you modify this code, "
-"you may extend this exception to your version of the code, but you are not "
-"obligated to do so.  If you do not wish to do so, delete this exception "
-"statement from your version."
-msgstr ""
-"Música de GNOME é software libre; pode redistribuílo e/ou modificalo baixo "
-"os termos da Licenza Pública Xeral de GNU como se foi publicada pola Free "
-"Software Foundation; tanto na versión 2 da licenza, ou (baixo a súa "
-"elección) unha versión posterior.\n"
-"\n"
-"Música de GNOME distribúese coa esperanza de que lle sexa útil, pero SEN "
-"NINGUNHA GARANTÍA; incluso a garantía implicada de MERCANTIBILIDADE ou "
-"AXEITAMENTE PARA UN PROPÓSITO PARTICULAR.  Vexa a Licenza Pública Xeral para "
-"obter máis detalles.\n"
-"\n"
-"Debería ter recibido unha copia da Licenza Pública Xeral de GNU xunto a "
-"Música de GNOME; se non, escriba á Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
-"\n"
-"Os autores de Música de GNOME concédenlle permiso para que os complementos "
-"de GStreamer non compatíbeis con GPL sexan utilizados e distribuídos xunto "
-"con GStreamer e Música de GNOME. Este permiso está por enriba do permiso "
-"outorgado pola Licenza GPL pola que está cuberto Música de GNOME. Se "
-"modifica este código, pode estender esta excepción á súa versión do código, "
-"pero non está obrigado a facelo. Se non o desexa, elimine esta declaración "
-"de excepción da súa versión.\n"
-"A imaxe de “Magic of the vinyl” por Sami Pyylampi ten licenza CC-BY-SA 2.0 "
-"https://www.flickr.com/photos/_spy_/12270839403"
-
-#: data/ui/AlbumWidget.ui:86 data/ui/PlayerToolbar.ui:88
-#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:168
+#: data/ui/AlbumWidget.ui:84 data/ui/PlayerToolbar.ui:87
+#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:170
 msgid "Play"
 msgstr "Reproducir"
 
-#: data/ui/AlbumWidget.ui:132 data/ui/PlaylistControls.ui:5
+#: data/ui/AlbumWidget.ui:130 data/ui/PlaylistControls.ui:5
 #: data/ui/SongWidgetMenu.ui:11
 msgid "_Play"
 msgstr "_Reproducir"
 
-#: data/ui/AlbumWidget.ui:136
+#: data/ui/AlbumWidget.ui:134
 msgid "Add to _Favorite Songs"
 msgstr "Engadir ás cancións _favoritas"
 
-#: data/ui/AlbumWidget.ui:140 data/ui/SongWidgetMenu.ui:15
+#: data/ui/AlbumWidget.ui:138 data/ui/SongWidgetMenu.ui:15
 msgid "_Add to Playlist…"
 msgstr "_Engadir á lista de reprodución"
 
@@ -224,7 +164,7 @@ msgstr "_Axuda"
 msgid "_About Music"
 msgstr "_Sobre Música"
 
-#: data/ui/EmptyView.ui:26 data/ui/InitialState.ui:13
+#: data/ui/EmptyView.ui:30
 msgid "Welcome to Music"
 msgstr "Benvida a Música"
 
@@ -236,7 +176,7 @@ msgstr "Menú"
 msgid "Select"
 msgstr "Seleccionar"
 
-#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:211
+#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:213
 #: data/ui/SearchHeaderBar.ui:20
 msgid "_Cancel"
 msgstr "_Cancelar"
@@ -334,11 +274,6 @@ msgctxt "shortcut window"
 msgid "Go back"
 msgstr "Ir atrás"
 
-#: data/ui/InitialState.ui:25
-#| msgid "The contents of your {} will appear here."
-msgid "The contents of your Music Folder will appear here"
-msgstr "Os contidos do seu cartafol de Música aparecerán aquí"
-
 #: data/ui/LastfmDialog.ui:21
 msgid ""
 "Last.fm is a music discovery service that gives you personalised "
@@ -360,11 +295,11 @@ msgstr ""
 msgid "Login"
 msgstr "Iniciar sesión"
 
-#: data/ui/PlayerToolbar.ui:75
+#: data/ui/PlayerToolbar.ui:74
 msgid "Previous"
 msgstr "Anterior"
 
-#: data/ui/PlayerToolbar.ui:107
+#: data/ui/PlayerToolbar.ui:106
 msgid "Next"
 msgstr "Seguinte"
 
@@ -400,11 +335,11 @@ msgstr "Nova lista de reprodución…"
 msgid "Add"
 msgstr "Engadir"
 
-#: data/ui/PlaylistDialog.ui:200
+#: data/ui/PlaylistDialog.ui:202
 msgid "Add to Playlist"
 msgstr "Engadir á lista de reprodución"
 
-#: data/ui/PlaylistDialog.ui:220
+#: data/ui/PlaylistDialog.ui:222
 msgid "_Add"
 msgstr "_Engadir"
 
@@ -416,7 +351,7 @@ msgstr "Artistas"
 msgid "View All"
 msgstr "Ver todo"
 
-#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:54
+#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:56
 msgid "Albums"
 msgstr "Álbums"
 
@@ -441,10 +376,26 @@ msgid "_Add to Playlist"
 msgstr "_Engadir á lista de reprodución"
 
 #: data/ui/SongWidgetMenu.ui:19
-#| msgid "Remove From Playlist"
 msgid "_Remove from Playlist"
 msgstr "_Quitar da lista de reprodución"
 
+#: gnomemusic/about.py:238
+msgid "The GNOME Project"
+msgstr "O Proxecto GNOME"
+
+#: gnomemusic/about.py:242
+msgid "translator-credits"
+msgstr "Fran Diéguez <frandieguez@gnome.org>, 2022"
+
+#: gnomemusic/about.py:246
+#| msgid "Copyright © 2018 GNOME Music Developers"
+msgid "Copyright The GNOME Music Developers"
+msgstr "Copyright Os desenvolvedores de GNOME Music"
+
+#: gnomemusic/about.py:249
+msgid "Translated by"
+msgstr "Traducido por"
+
 #. TRANSLATORS: this is a playlist name
 #: gnomemusic/grilowrappers/grltrackerplaylists.py:894
 msgid "Most Played"
@@ -521,7 +472,6 @@ msgid "Playlist {} removed"
 msgstr "Eliminouse a lista de reprodución {}"
 
 #: gnomemusic/playlisttoast.py:56 gnomemusic/songtoast.py:65
-#| msgid "_Undo"
 msgid "Undo"
 msgstr "Desfacer"
 
@@ -588,7 +538,7 @@ msgstr "Resultados de artistas"
 msgid "Albums Results"
 msgstr "Resultados de álbums"
 
-#: gnomemusic/widgets/albumwidget.py:240
+#: gnomemusic/widgets/albumwidget.py:245
 msgid "{} minute"
 msgid_plural "{} minutes"
 msgstr[0] "{}, {} minuto"
@@ -621,7 +571,7 @@ msgstr "Sesión iniciada como {}"
 msgid "Configure"
 msgstr "Configurar"
 
-#: gnomemusic/widgets/playertoolbar.py:165
+#: gnomemusic/widgets/playertoolbar.py:167
 msgid "Pause"
 msgstr "Pausar"
 
@@ -631,6 +581,63 @@ msgid_plural "{} Songs"
 msgstr[0] "{} canción"
 msgstr[1] "{} cancións"
 
+#~ msgid "A music player and management application for GNOME."
+#~ msgstr "Unha aplicación de reprodución e xestión de música para GNOME."
+
+#~ msgid "Visit GNOME Music website"
+#~ msgstr "Visite o sitio web de GNOME Music"
+
+#~ msgid ""
+#~ "GNOME Music is free software; you can redistribute it and/or modify it "
+#~ "under the terms of the GNU General Public License as published by the "
+#~ "Free Software Foundation; either version 2 of the License, or (at your "
+#~ "option) any later version.\n"
+#~ "\n"
+#~ "GNOME Music is distributed in the hope that it will be useful, but "
+#~ "WITHOUT ANY WARRANTY; without even the implied warranty of "
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General "
+#~ "Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License along "
+#~ "with GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
+#~ "Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
+#~ "\n"
+#~ "The GNOME Music authors hereby grant permission for non-GPL compatible "
+#~ "GStreamer plugins to be used and distributed together with GStreamer and "
+#~ "GNOME Music.  This permission is above and beyond the permissions granted "
+#~ "by the GPL license by which GNOME Music is covered.  If you modify this "
+#~ "code, you may extend this exception to your version of the code, but you "
+#~ "are not obligated to do so.  If you do not wish to do so, delete this "
+#~ "exception statement from your version."
+#~ msgstr ""
+#~ "Música de GNOME é software libre; pode redistribuílo e/ou modificalo "
+#~ "baixo os termos da Licenza Pública Xeral de GNU como se foi publicada "
+#~ "pola Free Software Foundation; tanto na versión 2 da licenza, ou (baixo a "
+#~ "súa elección) unha versión posterior.\n"
+#~ "\n"
+#~ "Música de GNOME distribúese coa esperanza de que lle sexa útil, pero SEN "
+#~ "NINGUNHA GARANTÍA; incluso a garantía implicada de MERCANTIBILIDADE ou "
+#~ "AXEITAMENTE PARA UN PROPÓSITO PARTICULAR.  Vexa a Licenza Pública Xeral "
+#~ "para obter máis detalles.\n"
+#~ "\n"
+#~ "Debería ter recibido unha copia da Licenza Pública Xeral de GNU xunto a "
+#~ "Música de GNOME; se non, escriba á Free Software Foundation, Inc., 51 "
+#~ "Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
+#~ "\n"
+#~ "Os autores de Música de GNOME concédenlle permiso para que os "
+#~ "complementos de GStreamer non compatíbeis con GPL sexan utilizados e "
+#~ "distribuídos xunto con GStreamer e Música de GNOME. Este permiso está por "
+#~ "enriba do permiso outorgado pola Licenza GPL pola que está cuberto Música "
+#~ "de GNOME. Se modifica este código, pode estender esta excepción á súa "
+#~ "versión do código, pero non está obrigado a facelo. Se non o desexa, "
+#~ "elimine esta declaración de excepción da súa versión.\n"
+#~ "A imaxe de “Magic of the vinyl” por Sami Pyylampi ten licenza CC-BY-SA "
+#~ "2.0 https://www.flickr.com/photos/_spy_/12270839403"
+
+#~| msgid "The contents of your {} will appear here."
+#~ msgid "The contents of your Music Folder will appear here"
+#~ msgstr "Os contidos do seu cartafol de Música aparecerán aquí"
+
 #~ msgid "GNOME Music"
 #~ msgstr "Música de GNOME"
 
diff --git a/po/he.po b/po/he.po
index 29950a78..614cace1 100644
--- a/po/he.po
+++ b/po/he.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNOME Music\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-music/issues\n"
-"POT-Creation-Date: 2022-02-19 12:39+0000\n"
-"PO-Revision-Date: 2022-02-20 18:45+0200\n"
+"POT-Creation-Date: 2022-08-27 13:27+0000\n"
+"PO-Revision-Date: 2022-09-11 07:13+0300\n"
 "Last-Translator: Yosef Or Boczko <yoseforb@gmail.com>\n"
-"Language-Team: Hebrew <GNOME Hebrew Translation Project>\n"
+"Language-Team: Hebrew <>\n"
 "Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,8 +22,8 @@ msgstr ""
 "X-Generator: Gtranslator 40.0\n"
 
 #: data/org.gnome.Music.appdata.xml.in.in:6
-#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/application.py:61
-#: gnomemusic/window.py:71
+#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/about.py:236
+#: gnomemusic/application.py:61 gnomemusic/window.py:71
 msgid "Music"
 msgstr "מוזיקה"
 
@@ -44,7 +44,7 @@ msgstr ""
 "איתור רצועות באוסף המקומי שלך, נעשה שימוש ברשימות נגינה שנוצרות אוטומטית או "
 "שאפשר להכין אחת חדשה."
 
-#: data/org.gnome.Music.appdata.xml.in.in:149
+#: data/org.gnome.Music.appdata.xml.in.in:167
 msgid "The GNOME Music developers"
 msgstr "מפתח GNOME Music"
 
@@ -118,82 +118,21 @@ msgstr ""
 "Enables or disables sending scrobbles and the “currently playing” info to "
 "Last.fm."
 
-#: data/ui/AboutDialog.ui.in:9
-msgid "Copyright © 2018 GNOME Music Developers"
-msgstr "כל הזכויות שמורות © 2018 מפתחי GNOME Music"
-
-#: data/ui/AboutDialog.ui.in:10
-msgid "A music player and management application for GNOME."
-msgstr "נגן ויישום לניהול מוזיקה עבור GNOME."
-
-#: data/ui/AboutDialog.ui.in:12
-msgid "Visit GNOME Music website"
-msgstr "ביקור באתר GNOME מוזיקה"
-
-#: data/ui/AboutDialog.ui.in:13
-msgid ""
-"GNOME Music is free software; you can redistribute it and/or modify it under "
-"the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"GNOME Music is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
-"\n"
-"The GNOME Music authors hereby grant permission for non-GPL compatible "
-"GStreamer plugins to be used and distributed together with GStreamer and "
-"GNOME Music.  This permission is above and beyond the permissions granted by "
-"the GPL license by which GNOME Music is covered.  If you modify this code, "
-"you may extend this exception to your version of the code, but you are not "
-"obligated to do so.  If you do not wish to do so, delete this exception "
-"statement from your version."
-msgstr ""
-"‏GNOME Music היא תכנה חופשית; ניתן להפיצה מחדש ו/או לשנות אותה לפי תנאי "
-"הרישיון הציבורי הכללי של GNU כפי שפורסם על ידי קרן התכנה החופשית; בין אם "
-"גרסה 2 של הרישיון ובין אם (לבחירתך) כל גרסה מאוחרת יותר.\n"
-"‬\n"
-"‏‫\n"
-"‬\n"
-"‫תכנית זו מופצת בתקווה שתביא תועלת אך ללא אחריות כלשהי; אפילו לא האחריות "
-"המשתמעת בדבר מסחריותה או התאמתה למטרה מסוימת. לפרטים נוספים ניתן לעיין "
-"ברישיון הציבורי הכללי של GNU.\n"
-"‬\n"
-"‏‫\n"
-"‬\n"
-"‫עם GNOME Music אמור היה להיות מצורף עותק של הרישיון הציבורי הכללי של GNU; "
-"במידה שלא, ניתן לכתוב ל־Free Software Foundation, Inc., 51 Franklin Street, "
-"Fifth Floor, Boston, MA 02110-1301 USA.\n"
-"‬\n"
-"‏‫\n"
-"‬\n"
-"‫היוצרים של GNOME Music מצהירים בזאת כי הם מעניקים הרשאה להפצה של תוספי "
-"GStreamer שאינם מעוגנים תחת ה־GPL יחד עם GStreamer ו־GNOME Music. הרשאה זו "
-"תקפה על פני ההרשאה הניתנת על־ידי רישיון ה־GPL תחתיו מוגנת התכנית GNOME "
-"Music. כל שינוי בקוד זה עשוי לאלץ אותך להרחיב את החריגה לקוד בגרסה שהכנת, אך "
-"אין כל התחייבות לעשות זאת. אם אין לך עניין לעשות דבר שכזה, יש למחוק את הצהרת "
-"החריגה הזאת מהגרסה שלך."
-
-#: data/ui/AlbumWidget.ui:86 data/ui/PlayerToolbar.ui:88
-#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:168
+#: data/ui/AlbumWidget.ui:84 data/ui/PlayerToolbar.ui:87
+#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:170
 msgid "Play"
 msgstr "ניגון"
 
-#: data/ui/AlbumWidget.ui:132 data/ui/PlaylistControls.ui:5
+#: data/ui/AlbumWidget.ui:130 data/ui/PlaylistControls.ui:5
 #: data/ui/SongWidgetMenu.ui:11
 msgid "_Play"
 msgstr "_ניגון"
 
-#: data/ui/AlbumWidget.ui:136
+#: data/ui/AlbumWidget.ui:134
 msgid "Add to _Favorite Songs"
 msgstr "הוספה לשירים מו_עדפים"
 
-#: data/ui/AlbumWidget.ui:140 data/ui/SongWidgetMenu.ui:15
+#: data/ui/AlbumWidget.ui:138 data/ui/SongWidgetMenu.ui:15
 msgid "_Add to Playlist…"
 msgstr "הוספה לרשימת _נגינה…"
 
@@ -217,7 +156,7 @@ msgstr "ע_זרה"
 msgid "_About Music"
 msgstr "על _אודות מוזיקה"
 
-#: data/ui/EmptyView.ui:26 data/ui/InitialState.ui:13
+#: data/ui/EmptyView.ui:30
 msgid "Welcome to Music"
 msgstr "ברוך בואך למוזיקה"
 
@@ -229,7 +168,7 @@ msgstr "תפריט"
 msgid "Select"
 msgstr "בחירה"
 
-#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:211
+#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:213
 #: data/ui/SearchHeaderBar.ui:20
 msgid "_Cancel"
 msgstr "_ביטול"
@@ -327,11 +266,6 @@ msgctxt "shortcut window"
 msgid "Go back"
 msgstr "חזרה"
 
-#: data/ui/InitialState.ui:25
-#| msgid "The contents of your {} will appear here."
-msgid "The contents of your Music Folder will appear here"
-msgstr "התוכן של תיקיית המוזיקה שלך שלך יופיע כאן"
-
 #: data/ui/LastfmDialog.ui:21
 msgid ""
 "Last.fm is a music discovery service that gives you personalised "
@@ -352,11 +286,11 @@ msgstr "יש להיכנס לחשבון Last.fm שלך על מנת לדווח ע�
 msgid "Login"
 msgstr "כניסה"
 
-#: data/ui/PlayerToolbar.ui:75
+#: data/ui/PlayerToolbar.ui:74
 msgid "Previous"
 msgstr "הקודם"
 
-#: data/ui/PlayerToolbar.ui:107
+#: data/ui/PlayerToolbar.ui:106
 msgid "Next"
 msgstr "הבא"
 
@@ -392,11 +326,11 @@ msgstr "רשימת נגינה חדשה…"
 msgid "Add"
 msgstr "הוספה"
 
-#: data/ui/PlaylistDialog.ui:200
+#: data/ui/PlaylistDialog.ui:202
 msgid "Add to Playlist"
 msgstr "הוספה לרשימת נגינה"
 
-#: data/ui/PlaylistDialog.ui:220
+#: data/ui/PlaylistDialog.ui:222
 msgid "_Add"
 msgstr "הו_ספה"
 
@@ -408,7 +342,7 @@ msgstr "אומנים"
 msgid "View All"
 msgstr "להציג הכול"
 
-#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:54
+#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:56
 msgid "Albums"
 msgstr "אלבומים"
 
@@ -433,10 +367,26 @@ msgid "_Add to Playlist"
 msgstr "_הוספה לרשימת נגינה"
 
 #: data/ui/SongWidgetMenu.ui:19
-#| msgid "Remove From Playlist"
 msgid "_Remove from Playlist"
 msgstr "ה_סרה מרשימת נגינה"
 
+#: gnomemusic/about.py:238
+msgid "The GNOME Project"
+msgstr "מיזם GNOME"
+
+#: gnomemusic/about.py:242
+msgid "translator-credits"
+msgstr "יוסף אור בוצ׳קו <yoseforb@gmail.com>"
+
+#: gnomemusic/about.py:246
+#| msgid "Copyright © 2018 GNOME Music Developers"
+msgid "Copyright The GNOME Music Developers"
+msgstr "כל הזכויות שמורות למפתחי GNOME Music"
+
+#: gnomemusic/about.py:249
+msgid "Translated by"
+msgstr "תורגם על ידי"
+
 #. TRANSLATORS: this is a playlist name
 #: gnomemusic/grilowrappers/grltrackerplaylists.py:894
 msgid "Most Played"
@@ -514,7 +464,6 @@ msgid "Playlist {} removed"
 msgstr "רשימת הנגינה {} הוסרה"
 
 #: gnomemusic/playlisttoast.py:56 gnomemusic/songtoast.py:65
-#| msgid "_Undo"
 msgid "Undo"
 msgstr "ביטול"
 
@@ -580,7 +529,7 @@ msgstr "תוצאות אומנים"
 msgid "Albums Results"
 msgstr "תוצאות אלבומים"
 
-#: gnomemusic/widgets/albumwidget.py:240
+#: gnomemusic/widgets/albumwidget.py:245
 msgid "{} minute"
 msgid_plural "{} minutes"
 msgstr[0] "דקה"
@@ -617,7 +566,7 @@ msgstr "נכנסת בשם {}"
 msgid "Configure"
 msgstr "הגדרה"
 
-#: gnomemusic/widgets/playertoolbar.py:165
+#: gnomemusic/widgets/playertoolbar.py:167
 msgid "Pause"
 msgstr "השהיה"
 
@@ -629,6 +578,64 @@ msgstr[1] "שני שירים"
 msgstr[2] "{} שירים"
 msgstr[3] "{} שירים"
 
+#~ msgid "A music player and management application for GNOME."
+#~ msgstr "נגן ויישום לניהול מוזיקה עבור GNOME."
+
+#~ msgid "Visit GNOME Music website"
+#~ msgstr "ביקור באתר GNOME מוזיקה"
+
+#~ msgid ""
+#~ "GNOME Music is free software; you can redistribute it and/or modify it "
+#~ "under the terms of the GNU General Public License as published by the "
+#~ "Free Software Foundation; either version 2 of the License, or (at your "
+#~ "option) any later version.\n"
+#~ "\n"
+#~ "GNOME Music is distributed in the hope that it will be useful, but "
+#~ "WITHOUT ANY WARRANTY; without even the implied warranty of "
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General "
+#~ "Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License along "
+#~ "with GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
+#~ "Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
+#~ "\n"
+#~ "The GNOME Music authors hereby grant permission for non-GPL compatible "
+#~ "GStreamer plugins to be used and distributed together with GStreamer and "
+#~ "GNOME Music.  This permission is above and beyond the permissions granted "
+#~ "by the GPL license by which GNOME Music is covered.  If you modify this "
+#~ "code, you may extend this exception to your version of the code, but you "
+#~ "are not obligated to do so.  If you do not wish to do so, delete this "
+#~ "exception statement from your version."
+#~ msgstr ""
+#~ "‏GNOME Music היא תכנה חופשית; ניתן להפיצה מחדש ו/או לשנות אותה לפי תנאי "
+#~ "הרישיון הציבורי הכללי של GNU כפי שפורסם על ידי קרן התכנה החופשית; בין אם "
+#~ "גרסה 2 של הרישיון ובין אם (לבחירתך) כל גרסה מאוחרת יותר.\n"
+#~ "‬\n"
+#~ "‏‫\n"
+#~ "‬\n"
+#~ "‫תכנית זו מופצת בתקווה שתביא תועלת אך ללא אחריות כלשהי; אפילו לא האחריות "
+#~ "המשתמעת בדבר מסחריותה או התאמתה למטרה מסוימת. לפרטים נוספים ניתן לעיין "
+#~ "ברישיון הציבורי הכללי של GNU.\n"
+#~ "‬\n"
+#~ "‏‫\n"
+#~ "‬\n"
+#~ "‫עם GNOME Music אמור היה להיות מצורף עותק של הרישיון הציבורי הכללי של GNU; "
+#~ "במידה שלא, ניתן לכתוב ל־Free Software Foundation, Inc., 51 Franklin "
+#~ "Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
+#~ "‬\n"
+#~ "‏‫\n"
+#~ "‬\n"
+#~ "‫היוצרים של GNOME Music מצהירים בזאת כי הם מעניקים הרשאה להפצה של תוספי "
+#~ "GStreamer שאינם מעוגנים תחת ה־GPL יחד עם GStreamer ו־GNOME Music. הרשאה "
+#~ "זו תקפה על פני ההרשאה הניתנת על־ידי רישיון ה־GPL תחתיו מוגנת התכנית GNOME "
+#~ "Music. כל שינוי בקוד זה עשוי לאלץ אותך להרחיב את החריגה לקוד בגרסה שהכנת, "
+#~ "אך אין כל התחייבות לעשות זאת. אם אין לך עניין לעשות דבר שכזה, יש למחוק את "
+#~ "הצהרת החריגה הזאת מהגרסה שלך."
+
+#~| msgid "The contents of your {} will appear here."
+#~ msgid "The contents of your Music Folder will appear here"
+#~ msgstr "התוכן של תיקיית המוזיקה שלך שלך יופיע כאן"
+
 #~ msgid "GNOME Music"
 #~ msgstr "‏GNOME מוזיקה"
 
diff --git a/po/hr.po b/po/hr.po
index 2eb942cb..54b975b4 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-music master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-music/issues\n"
-"POT-Creation-Date: 2022-02-19 12:39+0000\n"
-"PO-Revision-Date: 2022-03-02 15:39+0100\n"
+"POT-Creation-Date: 2022-08-27 13:27+0000\n"
+"PO-Revision-Date: 2022-08-27 22:37+0200\n"
 "Last-Translator: gogo <trebelnik2@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "Language: hr\n"
@@ -17,18 +17,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Poedit 3.0.1\n"
+"X-Generator: Poedit 3.1.1\n"
 
 #: data/org.gnome.Music.appdata.xml.in.in:6
-#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/application.py:61
-#: gnomemusic/window.py:71
+#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/about.py:236
+#: gnomemusic/application.py:61 gnomemusic/window.py:71
 msgid "Music"
 msgstr "Glazba"
 
 #: data/org.gnome.Music.appdata.xml.in.in:7
 #: data/org.gnome.Music.desktop.in.in:5
 msgid "Play and organize your music collection"
-msgstr "Slušajte i organizirajte vašu glazbenu kolekciju"
+msgstr "Slušajte i organizirajte svoju glazbenu kolekciju"
 
 #: data/org.gnome.Music.appdata.xml.in.in:9
 msgid "An easy and pleasant way to play your music."
@@ -42,7 +42,7 @@ msgstr ""
 "Potražite pjesme u svojoj lokalnoj fonoteci, koristite automatski stvorene "
 "popise izvođenja ili stvorite nove."
 
-#: data/org.gnome.Music.appdata.xml.in.in:149
+#: data/org.gnome.Music.appdata.xml.in.in:167
 msgid "The GNOME Music developers"
 msgstr "GNOME Glazbeni razvijatelji"
 
@@ -118,79 +118,21 @@ msgstr ""
 "Omogući ili onemogući slanje skroblanja i \"trenutne reprodukcije\" na Last."
 "fm."
 
-#: data/ui/AboutDialog.ui.in:9
-msgid "Copyright © 2018 GNOME Music Developers"
-msgstr "Autorsko pravo © 2018 GNOME Glazbeni razvijatelji"
-
-#: data/ui/AboutDialog.ui.in:10
-msgid "A music player and management application for GNOME."
-msgstr ""
-"Glazbeni svirač i aplikacija upravljanja glazbenom kolekcijom za GNOME."
-
-#: data/ui/AboutDialog.ui.in:12
-msgid "Visit GNOME Music website"
-msgstr "Posjeti GNOME Glazba web stranicu"
-
-#: data/ui/AboutDialog.ui.in:13
-msgid ""
-"GNOME Music is free software; you can redistribute it and/or modify it under "
-"the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"GNOME Music is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
-"\n"
-"The GNOME Music authors hereby grant permission for non-GPL compatible "
-"GStreamer plugins to be used and distributed together with GStreamer and "
-"GNOME Music.  This permission is above and beyond the permissions granted by "
-"the GPL license by which GNOME Music is covered.  If you modify this code, "
-"you may extend this exception to your version of the code, but you are not "
-"obligated to do so.  If you do not wish to do so, delete this exception "
-"statement from your version."
-msgstr ""
-"GNOME Glazba je slobodan softver; možete ga redistribuirati i/ili mijenjati "
-"pod uvjetima GNU Opće javne licence objavljene od Fundacije slobodnog "
-"softvera; ili inačice 2 Licence ili (po vašemu mišljenju) svake kasnije "
-"inačice.\n"
-"\n"
-"GNOME Glazba je distribuiran u nadi da će biti koristan ali BEZ IKAKVOG "
-"JAMSTVA; čak i bez podrazumjevanog jamstva ili POGODNOSTI ZA ODREĐENU "
-"NAMJENU. Pogledajte GNU Opću javnu licencu za više informacija.\n"
-"\n"
-"Trebali ste dobiti primjerak GNU Opće javne licence uz ovaj program; ako "
-"niste, pišite na adresu Free Software Foundation, Inc., 51 Franklin Street, "
-"Fifth Floor, Boston, MA 02110-1301 USA.\n"
-"\n"
-"Autori GNOME Glazbe ovime odobravaju dozvolu za ne-OJL kompatibilne "
-"GStreamer priključke da se mogu koristiti i distribuirati zajedno s "
-"GStreamerom i GNOME Glazbom.  Ova dozvola je iznad i izvan dozvole odobrene "
-"OJL licencom kojom je GNOME Glazba pokrivena.  Ako mijenjate ovaj kôd, "
-"morate istaknuti tu iznimku u vašoj inačici kôda, ali Vi niste dužni to "
-"učiniti.  Ako to ne želite učiniti, obrišite ovu izjavu iznimke iz vaše "
-"inačice."
-
-#: data/ui/AlbumWidget.ui:86 data/ui/PlayerToolbar.ui:88
-#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:168
+#: data/ui/AlbumWidget.ui:84 data/ui/PlayerToolbar.ui:87
+#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:170
 msgid "Play"
 msgstr "Reproduciraj"
 
-#: data/ui/AlbumWidget.ui:132 data/ui/PlaylistControls.ui:5
+#: data/ui/AlbumWidget.ui:130 data/ui/PlaylistControls.ui:5
 #: data/ui/SongWidgetMenu.ui:11
 msgid "_Play"
 msgstr "_Sviraj"
 
-#: data/ui/AlbumWidget.ui:136
+#: data/ui/AlbumWidget.ui:134
 msgid "Add to _Favorite Songs"
 msgstr "Dodaj u _omiljene pjesme"
 
-#: data/ui/AlbumWidget.ui:140 data/ui/SongWidgetMenu.ui:15
+#: data/ui/AlbumWidget.ui:138 data/ui/SongWidgetMenu.ui:15
 msgid "_Add to Playlist…"
 msgstr "_Dodaj na popis izvođenja…"
 
@@ -214,7 +156,7 @@ msgstr "_Priručnik"
 msgid "_About Music"
 msgstr "_O Glazbi"
 
-#: data/ui/EmptyView.ui:26 data/ui/InitialState.ui:13
+#: data/ui/EmptyView.ui:30
 msgid "Welcome to Music"
 msgstr "Dobrodošli u Glazbu"
 
@@ -226,7 +168,7 @@ msgstr "Izbornik"
 msgid "Select"
 msgstr "Odaberi"
 
-#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:211
+#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:213
 #: data/ui/SearchHeaderBar.ui:20
 msgid "_Cancel"
 msgstr "_Odustani"
@@ -324,10 +266,6 @@ msgctxt "shortcut window"
 msgid "Go back"
 msgstr "Idi natrag"
 
-#: data/ui/InitialState.ui:25
-msgid "The contents of your Music Folder will appear here"
-msgstr "Sadržaj vaše Glazbene mape će se pojaviti ovdje."
-
 #: data/ui/LastfmDialog.ui:21
 msgid ""
 "Last.fm is a music discovery service that gives you personalised "
@@ -350,11 +288,11 @@ msgstr ""
 msgid "Login"
 msgstr "Prijava"
 
-#: data/ui/PlayerToolbar.ui:75
+#: data/ui/PlayerToolbar.ui:74
 msgid "Previous"
 msgstr "Prijašnja"
 
-#: data/ui/PlayerToolbar.ui:107
+#: data/ui/PlayerToolbar.ui:106
 msgid "Next"
 msgstr "Sljedeća"
 
@@ -390,11 +328,11 @@ msgstr "Novi popis izvođenja…"
 msgid "Add"
 msgstr "Dodaj"
 
-#: data/ui/PlaylistDialog.ui:200
+#: data/ui/PlaylistDialog.ui:202
 msgid "Add to Playlist"
 msgstr "Dodaj na popis izvođenja"
 
-#: data/ui/PlaylistDialog.ui:220
+#: data/ui/PlaylistDialog.ui:222
 msgid "_Add"
 msgstr "_Dodaj"
 
@@ -406,7 +344,7 @@ msgstr "Izvođači"
 msgid "View All"
 msgstr "Prikaži sve"
 
-#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:54
+#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:56
 msgid "Albums"
 msgstr "Albumi"
 
@@ -434,6 +372,24 @@ msgstr "_Dodaj na popis izvođenja"
 msgid "_Remove from Playlist"
 msgstr "_Ukloni s popisa izvođenja"
 
+#: gnomemusic/about.py:238
+msgid "The GNOME Project"
+msgstr "GNOME projekt"
+
+#: gnomemusic/about.py:242
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  gogo https://launchpad.net/~trebelnik-stefina"
+
+#: gnomemusic/about.py:246
+msgid "Copyright The GNOME Music Developers"
+msgstr "Autorsko pravo GNOME Glazbeni razvijatelji"
+
+#: gnomemusic/about.py:249
+msgid "Translated by"
+msgstr "Preveli"
+
 #. TRANSLATORS: this is a playlist name
 #: gnomemusic/grilowrappers/grltrackerplaylists.py:894
 msgid "Most Played"
@@ -577,7 +533,7 @@ msgstr "Rezultati izvođača"
 msgid "Albums Results"
 msgstr "Rezultati albuma"
 
-#: gnomemusic/widgets/albumwidget.py:240
+#: gnomemusic/widgets/albumwidget.py:245
 msgid "{} minute"
 msgid_plural "{} minutes"
 msgstr[0] "{} minuta"
@@ -612,7 +568,7 @@ msgstr "Prijavljeni kao {}"
 msgid "Configure"
 msgstr "Podesi"
 
-#: gnomemusic/widgets/playertoolbar.py:165
+#: gnomemusic/widgets/playertoolbar.py:167
 msgid "Pause"
 msgstr "Pauziraj"
 
@@ -623,6 +579,60 @@ msgstr[0] "{} pjesma"
 msgstr[1] "{} pjesme"
 msgstr[2] "{} pjesama"
 
+#~ msgid "A music player and management application for GNOME."
+#~ msgstr ""
+#~ "Glazbeni svirač i aplikacija upravljanja glazbenom kolekcijom za GNOME."
+
+#~ msgid "Visit GNOME Music website"
+#~ msgstr "Posjeti GNOME Glazba web stranicu"
+
+#~ msgid ""
+#~ "GNOME Music is free software; you can redistribute it and/or modify it "
+#~ "under the terms of the GNU General Public License as published by the "
+#~ "Free Software Foundation; either version 2 of the License, or (at your "
+#~ "option) any later version.\n"
+#~ "\n"
+#~ "GNOME Music is distributed in the hope that it will be useful, but "
+#~ "WITHOUT ANY WARRANTY; without even the implied warranty of "
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General "
+#~ "Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License along "
+#~ "with GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
+#~ "Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
+#~ "\n"
+#~ "The GNOME Music authors hereby grant permission for non-GPL compatible "
+#~ "GStreamer plugins to be used and distributed together with GStreamer and "
+#~ "GNOME Music.  This permission is above and beyond the permissions granted "
+#~ "by the GPL license by which GNOME Music is covered.  If you modify this "
+#~ "code, you may extend this exception to your version of the code, but you "
+#~ "are not obligated to do so.  If you do not wish to do so, delete this "
+#~ "exception statement from your version."
+#~ msgstr ""
+#~ "GNOME Glazba je slobodan softver; možete ga redistribuirati i/ili "
+#~ "mijenjati pod uvjetima GNU Opće javne licence objavljene od Fundacije "
+#~ "slobodnog softvera; ili inačice 2 Licence ili (po vašemu mišljenju) svake "
+#~ "kasnije inačice.\n"
+#~ "\n"
+#~ "GNOME Glazba je distribuiran u nadi da će biti koristan ali BEZ IKAKVOG "
+#~ "JAMSTVA; čak i bez podrazumjevanog jamstva ili POGODNOSTI ZA ODREĐENU "
+#~ "NAMJENU. Pogledajte GNU Opću javnu licencu za više informacija.\n"
+#~ "\n"
+#~ "Trebali ste dobiti primjerak GNU Opće javne licence uz ovaj program; ako "
+#~ "niste, pišite na adresu Free Software Foundation, Inc., 51 Franklin "
+#~ "Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
+#~ "\n"
+#~ "Autori GNOME Glazbe ovime odobravaju dozvolu za ne-OJL kompatibilne "
+#~ "GStreamer priključke da se mogu koristiti i distribuirati zajedno s "
+#~ "GStreamerom i GNOME Glazbom.  Ova dozvola je iznad i izvan dozvole "
+#~ "odobrene OJL licencom kojom je GNOME Glazba pokrivena.  Ako mijenjate "
+#~ "ovaj kôd, morate istaknuti tu iznimku u vašoj inačici kôda, ali Vi niste "
+#~ "dužni to učiniti.  Ako to ne želite učiniti, obrišite ovu izjavu iznimke "
+#~ "iz vaše inačice."
+
+#~ msgid "The contents of your Music Folder will appear here"
+#~ msgstr "Sadržaj vaše Glazbene mape će se pojaviti ovdje."
+
 #~ msgid "GNOME Music"
 #~ msgstr "GNOME Glazba"
 
diff --git a/po/hu.po b/po/hu.po
index 893aecfd..1193aa15 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-music master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-music/issues\n"
-"POT-Creation-Date: 2022-02-19 12:39+0000\n"
-"PO-Revision-Date: 2022-03-11 01:26+0100\n"
+"POT-Creation-Date: 2022-08-27 13:27+0000\n"
+"PO-Revision-Date: 2022-08-30 01:32+0200\n"
 "Last-Translator: Balázs Úr <ur.balazs at fsf dot hu>\n"
 "Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n"
 "Language: hu\n"
@@ -21,8 +21,8 @@ msgstr ""
 "X-Generator: Lokalize 19.12.3\n"
 
 #: data/org.gnome.Music.appdata.xml.in.in:6
-#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/application.py:61
-#: gnomemusic/window.py:71
+#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/about.py:236
+#: gnomemusic/application.py:61 gnomemusic/window.py:71
 msgid "Music"
 msgstr "Zene"
 
@@ -43,7 +43,7 @@ msgstr ""
 "Keressen számokat a helyi gyűjteményében, használjon automatikusan "
 "előállított lejátszólistákat vagy állítson össze egyet."
 
-#: data/org.gnome.Music.appdata.xml.in.in:149
+#: data/org.gnome.Music.appdata.xml.in.in:167
 msgid "The GNOME Music developers"
 msgstr "A GNOME Zene fejlesztői"
 
@@ -120,77 +120,21 @@ msgstr ""
 "Engedélyezi vagy letiltja az előzmények és a „most játszott” információk "
 "elküldését a Last.fm-nek."
 
-#: data/ui/AboutDialog.ui.in:9
-msgid "Copyright © 2018 GNOME Music Developers"
-msgstr "Copyright © 2018 GNOME Zene fejlesztők"
-
-#: data/ui/AboutDialog.ui.in:10
-msgid "A music player and management application for GNOME."
-msgstr "Zenelejátszó és -kezelő alkalmazás a GNOME-hoz."
-
-#: data/ui/AboutDialog.ui.in:12
-msgid "Visit GNOME Music website"
-msgstr "A GNOME Zene honlapjának felkeresése"
-
-#: data/ui/AboutDialog.ui.in:13
-msgid ""
-"GNOME Music is free software; you can redistribute it and/or modify it under "
-"the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"GNOME Music is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
-"\n"
-"The GNOME Music authors hereby grant permission for non-GPL compatible "
-"GStreamer plugins to be used and distributed together with GStreamer and "
-"GNOME Music.  This permission is above and beyond the permissions granted by "
-"the GPL license by which GNOME Music is covered.  If you modify this code, "
-"you may extend this exception to your version of the code, but you are not "
-"obligated to do so.  If you do not wish to do so, delete this exception "
-"statement from your version."
-msgstr ""
-"A GNOME Zene szabad szoftver, terjesztheti és/vagy módosíthatja a Free "
-"Software Foundation által kiadott GNU General Public License második (vagy "
-"bármely későbbi) változatában foglaltak alapján.\n"
-"\n"
-"A GNOME Zene programot abban a reményben terjesztjük, hogy hasznos lesz, de "
-"nem vállalunk SEMMIFÉLE GARANCIÁT, még olyan értelemben sem, hogy a program "
-"alkalmas-e a KÖZREADÁSRA vagy EGY BIZONYOS FELADAT ELVÉGZÉSÉRE. További "
-"részletekért tanulmányozza a GNU GPL licencet.\n"
-"\n"
-"A GNOME Zene programhoz a GNU General Public License egy példánya is jár, ha "
-"nem kapta meg, írjon a Free Software Foundation Inc.-nek. Levélcímük: 51 "
-"Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.\n"
-"\n"
-"A GNOME Zene szerzői itt engedélyt adnak a nem GPL kompatibilis GStreamer "
-"bővítmények használatára és terjesztésére a GStreamerrel és a GNOME Zenével. "
-"Ez az engedély túlmegy a GNOME Zenét lefedő GPL licenc engedélyein. Ha "
-"módosítja a kódot, kiterjesztheti ezt a kivételt a saját verziójára, de ez "
-"nem kötelező. Ha nem szeretné ezt tenni, akkor törölje ezen kivételengedély "
-"angol eredetijét a saját verziójából."
-
-#: data/ui/AlbumWidget.ui:86 data/ui/PlayerToolbar.ui:88
-#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:168
+#: data/ui/AlbumWidget.ui:84 data/ui/PlayerToolbar.ui:87
+#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:170
 msgid "Play"
 msgstr "Lejátszás"
 
-#: data/ui/AlbumWidget.ui:132 data/ui/PlaylistControls.ui:5
+#: data/ui/AlbumWidget.ui:130 data/ui/PlaylistControls.ui:5
 #: data/ui/SongWidgetMenu.ui:11
 msgid "_Play"
 msgstr "_Lejátszás"
 
-#: data/ui/AlbumWidget.ui:136
+#: data/ui/AlbumWidget.ui:134
 msgid "Add to _Favorite Songs"
 msgstr "Hozzáadás a _kedvenc számokhoz"
 
-#: data/ui/AlbumWidget.ui:140 data/ui/SongWidgetMenu.ui:15
+#: data/ui/AlbumWidget.ui:138 data/ui/SongWidgetMenu.ui:15
 msgid "_Add to Playlist…"
 msgstr "Hozzá_adás a lejátszólistához…"
 
@@ -214,7 +158,7 @@ msgstr "_Súgó"
 msgid "_About Music"
 msgstr "A Zene _névjegye"
 
-#: data/ui/EmptyView.ui:26 data/ui/InitialState.ui:13
+#: data/ui/EmptyView.ui:30
 msgid "Welcome to Music"
 msgstr "Üdvözli a Zene"
 
@@ -226,7 +170,7 @@ msgstr "Menü"
 msgid "Select"
 msgstr "Kiválasztás"
 
-#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:211
+#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:213
 #: data/ui/SearchHeaderBar.ui:20
 msgid "_Cancel"
 msgstr "_Mégse"
@@ -324,12 +268,6 @@ msgctxt "shortcut window"
 msgid "Go back"
 msgstr "Vissza"
 
-# %s = "Zenék mappa"
-#: data/ui/InitialState.ui:25
-#| msgid "The contents of your {} will appear here."
-msgid "The contents of your Music Folder will appear here"
-msgstr "A Zenék mappa tartalma itt fog megjelenni"
-
 #: data/ui/LastfmDialog.ui:21
 msgid ""
 "Last.fm is a music discovery service that gives you personalised "
@@ -350,11 +288,11 @@ msgstr "Jelentkezzen be a Last.fm-fiókjába, hogy jelentse, mit hallgat."
 msgid "Login"
 msgstr "Bejelentkezés"
 
-#: data/ui/PlayerToolbar.ui:75
+#: data/ui/PlayerToolbar.ui:74
 msgid "Previous"
 msgstr "Előző"
 
-#: data/ui/PlayerToolbar.ui:107
+#: data/ui/PlayerToolbar.ui:106
 msgid "Next"
 msgstr "Következő"
 
@@ -390,11 +328,11 @@ msgstr "Új lejátszólista…"
 msgid "Add"
 msgstr "Hozzáadás"
 
-#: data/ui/PlaylistDialog.ui:200
+#: data/ui/PlaylistDialog.ui:202
 msgid "Add to Playlist"
 msgstr "Hozzáadás a lejátszólistához"
 
-#: data/ui/PlaylistDialog.ui:220
+#: data/ui/PlaylistDialog.ui:222
 msgid "_Add"
 msgstr "_Hozzáadás"
 
@@ -406,7 +344,7 @@ msgstr "Előadók"
 msgid "View All"
 msgstr "Összes megtekintése"
 
-#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:54
+#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:56
 msgid "Albums"
 msgstr "Albumok"
 
@@ -431,10 +369,26 @@ msgid "_Add to Playlist"
 msgstr "Hozzá_adás a lejátszólistához"
 
 #: data/ui/SongWidgetMenu.ui:19
-#| msgid "Remove From Playlist"
 msgid "_Remove from Playlist"
 msgstr "_Eltávolítás a lejátszólistáról"
 
+#: gnomemusic/about.py:238
+msgid "The GNOME Project"
+msgstr "A GNOME projekt"
+
+#: gnomemusic/about.py:242
+msgid "translator-credits"
+msgstr "Úr Balázs <ur dot balazs at fsf dot hu>, 2022."
+
+#: gnomemusic/about.py:246
+#| msgid "Copyright © 2018 GNOME Music Developers"
+msgid "Copyright The GNOME Music Developers"
+msgstr "Copyright – A GNOME Zene fejlesztői"
+
+#: gnomemusic/about.py:249
+msgid "Translated by"
+msgstr "Fordította"
+
 #. TRANSLATORS: this is a playlist name
 #: gnomemusic/grilowrappers/grltrackerplaylists.py:894
 msgid "Most Played"
@@ -510,7 +464,6 @@ msgid "Playlist {} removed"
 msgstr "A(z) {} lejátszólista eltávolítva"
 
 #: gnomemusic/playlisttoast.py:56 gnomemusic/songtoast.py:65
-#| msgid "_Undo"
 msgid "Undo"
 msgstr "Visszavonás"
 
@@ -578,7 +531,7 @@ msgstr "Előadók találatai"
 msgid "Albums Results"
 msgstr "Albumok találatai"
 
-#: gnomemusic/widgets/albumwidget.py:240
+#: gnomemusic/widgets/albumwidget.py:245
 msgid "{} minute"
 msgid_plural "{} minutes"
 msgstr[0] "{} perc"
@@ -612,7 +565,7 @@ msgstr "Bejelentkezve mint {}"
 msgid "Configure"
 msgstr "Beállítás"
 
-#: gnomemusic/widgets/playertoolbar.py:165
+#: gnomemusic/widgets/playertoolbar.py:167
 msgid "Pause"
 msgstr "Szünet"
 
diff --git a/po/id.po b/po/id.po
index a75813dc..931dae79 100644
--- a/po/id.po
+++ b/po/id.po
@@ -9,20 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-music master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-music/issues\n"
-"POT-Creation-Date: 2022-02-19 12:39+0000\n"
-"PO-Revision-Date: 2022-02-21 13:40+0700\n"
+"POT-Creation-Date: 2022-08-27 13:27+0000\n"
+"PO-Revision-Date: 2022-08-31 15:50+0700\n"
 "Last-Translator: Kukuh Syafaat <kukuhsyafaat@gnome.org>\n"
 "Language-Team: Indonesian <gnome@i15n.org>\n"
 "Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 3.0\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 3.1.1\n"
 
 #: data/org.gnome.Music.appdata.xml.in.in:6
-#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/application.py:61
-#: gnomemusic/window.py:71
+#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/about.py:236
+#: gnomemusic/application.py:61 gnomemusic/window.py:71
 msgid "Music"
 msgstr "Musik"
 
@@ -43,7 +43,7 @@ msgstr ""
 "Temukan trek di koleksi lokal Anda, gunakan daftar putar yang dibuat secara "
 "otomatis atau kurasi yang baru."
 
-#: data/org.gnome.Music.appdata.xml.in.in:149
+#: data/org.gnome.Music.appdata.xml.in.in:167
 msgid "The GNOME Music developers"
 msgstr "Para Pengembang GNOME Musik"
 
@@ -119,78 +119,21 @@ msgstr ""
 "Aktifkan atau nonaktifkan pengiriman scrobbles dan info \"sedang diputar\" "
 "ke Last.fm."
 
-#: data/ui/AboutDialog.ui.in:9
-msgid "Copyright © 2018 GNOME Music Developers"
-msgstr "Hak Cipta © 2018 Para Pengembang Musik GNOME"
-
-#: data/ui/AboutDialog.ui.in:10
-msgid "A music player and management application for GNOME."
-msgstr "Aplikasi manajemen dan pemutar musik bagi GNOME."
-
-#: data/ui/AboutDialog.ui.in:12
-msgid "Visit GNOME Music website"
-msgstr "Kunjungi situs web Musik GNOME"
-
-#: data/ui/AboutDialog.ui.in:13
-msgid ""
-"GNOME Music is free software; you can redistribute it and/or modify it under "
-"the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"GNOME Music is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
-"\n"
-"The GNOME Music authors hereby grant permission for non-GPL compatible "
-"GStreamer plugins to be used and distributed together with GStreamer and "
-"GNOME Music.  This permission is above and beyond the permissions granted by "
-"the GPL license by which GNOME Music is covered.  If you modify this code, "
-"you may extend this exception to your version of the code, but you are not "
-"obligated to do so.  If you do not wish to do so, delete this exception "
-"statement from your version."
-msgstr ""
-"GNOME Musik adalah perangkat lunak bebas; Anda dapat mendistribusikannya dan/"
-"atau mengubahnya di bawah persyaratan GNU General Public License sebagaimana "
-"dipublikasikan oleh Free Software Foundation; dengan Lisensi versi 2, atau "
-"(sesuai pilihan Anda) sebarang versi lebih baru.\n"
-"\n"
-"GNOME Musik didistribusikan dengan harapan dapat berguna, tetapi TANPA "
-"ADANYA JAMINAN; termasuk tanpa jaminan DAYA JUAL atau KELAIKAN UNTUK TUJUAN "
-"TERTENTU.  Lihat GNU General Public License untuk rincian lebih lanjut.\n"
-"\n"
-"Anda seharusnya menerima salinan dari GNU General Public License bersama "
-"GNOME Musik; jika tidak, kirimkan surat Anda ke Free Software Foundation, "
-"Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n"
-"\n"
-"Para penulis GNOME Musik dengan ini memberikan ijin untuk plugin GStreamer "
-"yang tak kompatibel dengan GPL untuk dipakai dan didistribusikan bersama "
-"dengan GStreamer dan GNOME Musik.  Ijin ini di atas dan di luar hak yang "
-"diberikan oleh lisensi GPL yang mencakup GNOME Musik.  Bila Anda mengubah "
-"kode ini, Anda boleh memperluas pengecualian ini ke versi kode Anda, tapi "
-"Anda tidak wajib melakukannya.  Bila Anda tak ingin seperti itu, hapuslah "
-"pernyataan pengecualian ini dari versi Anda."
-
-#: data/ui/AlbumWidget.ui:86 data/ui/PlayerToolbar.ui:88
-#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:168
+#: data/ui/AlbumWidget.ui:84 data/ui/PlayerToolbar.ui:87
+#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:170
 msgid "Play"
 msgstr "Putar"
 
-#: data/ui/AlbumWidget.ui:132 data/ui/PlaylistControls.ui:5
+#: data/ui/AlbumWidget.ui:130 data/ui/PlaylistControls.ui:5
 #: data/ui/SongWidgetMenu.ui:11
 msgid "_Play"
 msgstr "_Putar"
 
-#: data/ui/AlbumWidget.ui:136
+#: data/ui/AlbumWidget.ui:134
 msgid "Add to _Favorite Songs"
 msgstr "Tambah ke Lagu _Favorit"
 
-#: data/ui/AlbumWidget.ui:140 data/ui/SongWidgetMenu.ui:15
+#: data/ui/AlbumWidget.ui:138 data/ui/SongWidgetMenu.ui:15
 msgid "_Add to Playlist…"
 msgstr "T_ambah ke Daftar Putar…"
 
@@ -214,7 +157,7 @@ msgstr "_Bantuan"
 msgid "_About Music"
 msgstr "Tent_ang Musik"
 
-#: data/ui/EmptyView.ui:26 data/ui/InitialState.ui:13
+#: data/ui/EmptyView.ui:30
 msgid "Welcome to Music"
 msgstr "Selamat Datang di Musik"
 
@@ -226,7 +169,7 @@ msgstr "Menu"
 msgid "Select"
 msgstr "Pilih"
 
-#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:211
+#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:213
 #: data/ui/SearchHeaderBar.ui:20
 msgid "_Cancel"
 msgstr "_Batal"
@@ -324,10 +267,6 @@ msgctxt "shortcut window"
 msgid "Go back"
 msgstr "Mundur"
 
-#: data/ui/InitialState.ui:25
-msgid "The contents of your Music Folder will appear here"
-msgstr "Isi Folder Musik Anda akan muncul di sini"
-
 #: data/ui/LastfmDialog.ui:21
 msgid ""
 "Last.fm is a music discovery service that gives you personalised "
@@ -348,11 +287,11 @@ msgstr "Masuk ke akun Last.fm Anda untuk melaporkan musik yang Anda dengar."
 msgid "Login"
 msgstr "Masuk"
 
-#: data/ui/PlayerToolbar.ui:75
+#: data/ui/PlayerToolbar.ui:74
 msgid "Previous"
 msgstr "Sebelumnya"
 
-#: data/ui/PlayerToolbar.ui:107
+#: data/ui/PlayerToolbar.ui:106
 msgid "Next"
 msgstr "Selanjutnya"
 
@@ -388,11 +327,11 @@ msgstr "Daftar Putar Baru…"
 msgid "Add"
 msgstr "Tambah"
 
-#: data/ui/PlaylistDialog.ui:200
+#: data/ui/PlaylistDialog.ui:202
 msgid "Add to Playlist"
 msgstr "Tambah ke Daftar Putar"
 
-#: data/ui/PlaylistDialog.ui:220
+#: data/ui/PlaylistDialog.ui:222
 msgid "_Add"
 msgstr "T_ambah"
 
@@ -404,7 +343,7 @@ msgstr "Artis"
 msgid "View All"
 msgstr "Tampilkan Semua"
 
-#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:54
+#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:56
 msgid "Albums"
 msgstr "Album"
 
@@ -432,6 +371,25 @@ msgstr "T_ambah ke Daftar Putar"
 msgid "_Remove from Playlist"
 msgstr "Hapus dari Daftar Puta_r"
 
+#: gnomemusic/about.py:238
+msgid "The GNOME Project"
+msgstr "Proyek GNOME"
+
+#: gnomemusic/about.py:242
+msgid "translator-credits"
+msgstr ""
+"Andika Triwidada <andika@gmail.com>, 2013, 2014, 2015.\n"
+"Dirgita <dirgitadevina@yahoo.co.id>, 2013.\n"
+"Kukuh Syafaat <kukuhsyafaat@gnome.org>, 2017-2022."
+
+#: gnomemusic/about.py:246
+msgid "Copyright The GNOME Music Developers"
+msgstr "Hak Cipta Para Pengembang GNOME Musik"
+
+#: gnomemusic/about.py:249
+msgid "Translated by"
+msgstr "Diterjemahkan oleh"
+
 #. TRANSLATORS: this is a playlist name
 #: gnomemusic/grilowrappers/grltrackerplaylists.py:894
 msgid "Most Played"
@@ -571,7 +529,7 @@ msgstr "Hasil Artis"
 msgid "Albums Results"
 msgstr "Hasil Album"
 
-#: gnomemusic/widgets/albumwidget.py:240
+#: gnomemusic/widgets/albumwidget.py:245
 msgid "{} minute"
 msgid_plural "{} minutes"
 msgstr[0] "{} menit"
@@ -602,7 +560,7 @@ msgstr "Masuk sebagai {}"
 msgid "Configure"
 msgstr "Konfigurasikan"
 
-#: gnomemusic/widgets/playertoolbar.py:165
+#: gnomemusic/widgets/playertoolbar.py:167
 msgid "Pause"
 msgstr "Tahan"
 
@@ -611,6 +569,61 @@ msgid "{} Song"
 msgid_plural "{} Songs"
 msgstr[0] "{} Lagu"
 
+#~ msgid "A music player and management application for GNOME."
+#~ msgstr "Aplikasi manajemen dan pemutar musik bagi GNOME."
+
+#~ msgid "Visit GNOME Music website"
+#~ msgstr "Kunjungi situs web Musik GNOME"
+
+#~ msgid ""
+#~ "GNOME Music is free software; you can redistribute it and/or modify it "
+#~ "under the terms of the GNU General Public License as published by the "
+#~ "Free Software Foundation; either version 2 of the License, or (at your "
+#~ "option) any later version.\n"
+#~ "\n"
+#~ "GNOME Music is distributed in the hope that it will be useful, but "
+#~ "WITHOUT ANY WARRANTY; without even the implied warranty of "
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General "
+#~ "Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License along "
+#~ "with GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
+#~ "Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
+#~ "\n"
+#~ "The GNOME Music authors hereby grant permission for non-GPL compatible "
+#~ "GStreamer plugins to be used and distributed together with GStreamer and "
+#~ "GNOME Music.  This permission is above and beyond the permissions granted "
+#~ "by the GPL license by which GNOME Music is covered.  If you modify this "
+#~ "code, you may extend this exception to your version of the code, but you "
+#~ "are not obligated to do so.  If you do not wish to do so, delete this "
+#~ "exception statement from your version."
+#~ msgstr ""
+#~ "GNOME Musik adalah perangkat lunak bebas; Anda dapat mendistribusikannya "
+#~ "dan/atau mengubahnya di bawah persyaratan GNU General Public License "
+#~ "sebagaimana dipublikasikan oleh Free Software Foundation; dengan Lisensi "
+#~ "versi 2, atau (sesuai pilihan Anda) sebarang versi lebih baru.\n"
+#~ "\n"
+#~ "GNOME Musik didistribusikan dengan harapan dapat berguna, tetapi TANPA "
+#~ "ADANYA JAMINAN; termasuk tanpa jaminan DAYA JUAL atau KELAIKAN UNTUK "
+#~ "TUJUAN TERTENTU.  Lihat GNU General Public License untuk rincian lebih "
+#~ "lanjut.\n"
+#~ "\n"
+#~ "Anda seharusnya menerima salinan dari GNU General Public License bersama "
+#~ "GNOME Musik; jika tidak, kirimkan surat Anda ke Free Software Foundation, "
+#~ "Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n"
+#~ "\n"
+#~ "Para penulis GNOME Musik dengan ini memberikan ijin untuk plugin "
+#~ "GStreamer yang tak kompatibel dengan GPL untuk dipakai dan "
+#~ "didistribusikan bersama dengan GStreamer dan GNOME Musik.  Ijin ini di "
+#~ "atas dan di luar hak yang diberikan oleh lisensi GPL yang mencakup GNOME "
+#~ "Musik.  Bila Anda mengubah kode ini, Anda boleh memperluas pengecualian "
+#~ "ini ke versi kode Anda, tapi Anda tidak wajib melakukannya.  Bila Anda "
+#~ "tak ingin seperti itu, hapuslah pernyataan pengecualian ini dari versi "
+#~ "Anda."
+
+#~ msgid "The contents of your Music Folder will appear here"
+#~ msgstr "Isi Folder Musik Anda akan muncul di sini"
+
 #~ msgid "GNOME Music"
 #~ msgstr "GNOME Musik"
 
diff --git a/po/is.po b/po/is.po
index 6f56ded0..68e11bd7 100644
--- a/po/is.po
+++ b/po/is.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-music/issues\n"
-"POT-Creation-Date: 2022-02-19 12:39+0000\n"
-"PO-Revision-Date: 2022-04-06 10:23+0000\n"
+"POT-Creation-Date: 2022-08-27 13:27+0000\n"
+"PO-Revision-Date: 2022-10-17 14:03+0000\n"
 "Last-Translator: Sveinn í Felli <sv1@fellsnet.is>\n"
 "Language-Team: Icelandic\n"
 "Language: is\n"
@@ -15,11 +15,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 19.12.3\n"
+"X-Generator: Lokalize 21.12.3\n"
 
 #: data/org.gnome.Music.appdata.xml.in.in:6
-#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/application.py:61
-#: gnomemusic/window.py:71
+#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/about.py:236
+#: gnomemusic/application.py:61 gnomemusic/window.py:71
 msgid "Music"
 msgstr "Tónlist"
 
@@ -40,7 +40,7 @@ msgstr ""
 "Finnur lög í safninu þínu á tölvunni, notar sjálfvirkt útbúna spilunarlista "
 "eða útbýr nýja."
 
-#: data/org.gnome.Music.appdata.xml.in.in:149
+#: data/org.gnome.Music.appdata.xml.in.in:167
 msgid "The GNOME Music developers"
 msgstr "GNOME Music forritararnir"
 
@@ -116,80 +116,21 @@ msgstr ""
 "Virkjar eða gerir óvirkt að senda til Last.fm upplýsingar um tónlistarspilun "
 "(scrobbling) og upplýsingar um \"í spilun núna\"."
 
-#: data/ui/AboutDialog.ui.in:9
-msgid "Copyright © 2018 GNOME Music Developers"
-msgstr "Höfundarréttur © 2018 GNOME Music forritararnir"
-
-#: data/ui/AboutDialog.ui.in:10
-msgid "A music player and management application for GNOME."
-msgstr "Tónlistarspilari og forrit fyrir umsýslu tónlistar fyrir GNOME."
-
-#: data/ui/AboutDialog.ui.in:12
-msgid "Visit GNOME Music website"
-msgstr "Fara á heimasíðu GNOME tónlistarspilarans"
-
-#: data/ui/AboutDialog.ui.in:13
-msgid ""
-"GNOME Music is free software; you can redistribute it and/or modify it under "
-"the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"GNOME Music is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
-"\n"
-"The GNOME Music authors hereby grant permission for non-GPL compatible "
-"GStreamer plugins to be used and distributed together with GStreamer and "
-"GNOME Music.  This permission is above and beyond the permissions granted by "
-"the GPL license by which GNOME Music is covered.  If you modify this code, "
-"you may extend this exception to your version of the code, but you are not "
-"obligated to do so.  If you do not wish to do so, delete this exception "
-"statement from your version."
-msgstr ""
-"Þetta er frjáls hugbúnaður; þú mátt dreifa honum og/eða breyta samkvæmt "
-"skilmálum í almenna GNU GPL notkunarleyfinu eins og það er gefið út af "
-"Frjálsu hugbúnaðarstofnuninni; annaðhvort útgáfu 2 af GPL-leyfinu, eða (ef "
-"þér sýnist svo) einhverja nýrri útgáfu leyfisins.\n"
-"\n"
-"Hugbúnaðnum er dreift í þeirri von að hann geti verið gagnlegur, en ÁN "
-"ALLRAR ÁBYRGÐAR; einnig án þeirrar ábyrgðar sem gefin er í skyn með "
-"SELJANLEIKA eða EIGINLEIKUM TIL TILTEKINNA NOTA. Sjá almenna GNU GPL "
-"notkunarleyfið fyrir nánari upplýsingar.\n"
-"\n"
-"Það ætti að hafa fylgt afrit af almenna GNU GPL notkunarleyfinu með "
-"forritinu; ef ekki skrifið þá Fjálsu hugbúnarstofnuninni: Free Software "
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, "
-"USA.\n"
-"\n"
-"Höfundar GNOME Music gefa hér með leyfi sitt fyrir því að nota megi "
-"GStreamer viðbætur sem ekki falla undir GPL-notkunarleyfi eða sé ekki dreift "
-"með GStreamer og GNOME Music.  Þessi heimild er rétthærri en kvaðir GPL-"
-"skilmálanna sem GNOME Music fellur undir.  Ef þú breytir þessum kóða, "
-"geturðu víkkað þessa undanþágu til að ná yfir þína útgáfu kóðans, en slíkt "
-"er ekki skylda.  Ef þú ákveður að gera það ekki, eyddu þá þessari undanþágu "
-"út úr þinni útgáfu."
-
-#: data/ui/AlbumWidget.ui:86 data/ui/PlayerToolbar.ui:88
-#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:168
+#: data/ui/AlbumWidget.ui:84 data/ui/PlayerToolbar.ui:87
+#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:170
 msgid "Play"
 msgstr "Spila"
 
-#: data/ui/AlbumWidget.ui:132 data/ui/PlaylistControls.ui:5
+#: data/ui/AlbumWidget.ui:130 data/ui/PlaylistControls.ui:5
 #: data/ui/SongWidgetMenu.ui:11
 msgid "_Play"
 msgstr "S_pila"
 
-#: data/ui/AlbumWidget.ui:136
+#: data/ui/AlbumWidget.ui:134
 msgid "Add to _Favorite Songs"
 msgstr "Bæta við í U_ppáhaldslög"
 
-#: data/ui/AlbumWidget.ui:140 data/ui/SongWidgetMenu.ui:15
+#: data/ui/AlbumWidget.ui:138 data/ui/SongWidgetMenu.ui:15
 msgid "_Add to Playlist…"
 msgstr "Bæt_a við spilunarlista…"
 
@@ -213,7 +154,7 @@ msgstr "_Hjálp"
 msgid "_About Music"
 msgstr "_Um Music tónlistarhugbúnaðinn"
 
-#: data/ui/EmptyView.ui:26 data/ui/InitialState.ui:13
+#: data/ui/EmptyView.ui:30
 msgid "Welcome to Music"
 msgstr "Velkomin í Music-tónlistarspilarann"
 
@@ -225,7 +166,7 @@ msgstr "Valmynd"
 msgid "Select"
 msgstr "Velja"
 
-#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:211
+#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:213
 #: data/ui/SearchHeaderBar.ui:20
 msgid "_Cancel"
 msgstr "_Hætta við"
@@ -323,11 +264,6 @@ msgctxt "shortcut window"
 msgid "Go back"
 msgstr "Fara til baka"
 
-#: data/ui/InitialState.ui:25
-#| msgid "The contents of your {} will appear here."
-msgid "The contents of your Music Folder will appear here"
-msgstr "Innihald Tónlist-möppunnar þinnar birtist hér"
-
 #: data/ui/LastfmDialog.ui:21
 msgid ""
 "Last.fm is a music discovery service that gives you personalised "
@@ -350,11 +286,11 @@ msgstr ""
 msgid "Login"
 msgstr "Innskráning"
 
-#: data/ui/PlayerToolbar.ui:75
+#: data/ui/PlayerToolbar.ui:74
 msgid "Previous"
 msgstr "Fyrra"
 
-#: data/ui/PlayerToolbar.ui:107
+#: data/ui/PlayerToolbar.ui:106
 msgid "Next"
 msgstr "Næsta"
 
@@ -390,11 +326,11 @@ msgstr "Nýr spilunarlisti…"
 msgid "Add"
 msgstr "Bæta við"
 
-#: data/ui/PlaylistDialog.ui:200
+#: data/ui/PlaylistDialog.ui:202
 msgid "Add to Playlist"
 msgstr "Bæta við spilunarlista"
 
-#: data/ui/PlaylistDialog.ui:220
+#: data/ui/PlaylistDialog.ui:222
 msgid "_Add"
 msgstr "Bæt_a við"
 
@@ -406,7 +342,7 @@ msgstr "Flytjendur"
 msgid "View All"
 msgstr "Skoða allt"
 
-#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:54
+#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:56
 msgid "Albums"
 msgstr "Hljómplötur"
 
@@ -431,10 +367,26 @@ msgid "_Add to Playlist"
 msgstr "Bæt_a við spilunarlista"
 
 #: data/ui/SongWidgetMenu.ui:19
-#| msgid "Remove From Playlist"
 msgid "_Remove from Playlist"
 msgstr "Fja_rlægja af spilunarlista"
 
+#: gnomemusic/about.py:238
+msgid "The GNOME Project"
+msgstr "GNOME-verkefnið"
+
+#: gnomemusic/about.py:242
+msgid "translator-credits"
+msgstr "Sveinn í Felli, sv1@fellsnet.is"
+
+#: gnomemusic/about.py:246
+#| msgid "Copyright © 2018 GNOME Music Developers"
+msgid "Copyright The GNOME Music Developers"
+msgstr "Höfundarréttur © GNOME Music forritararnir"
+
+#: gnomemusic/about.py:249
+msgid "Translated by"
+msgstr "Þýtt af"
+
 #. TRANSLATORS: this is a playlist name
 #: gnomemusic/grilowrappers/grltrackerplaylists.py:894
 msgid "Most Played"
@@ -510,7 +462,6 @@ msgid "Playlist {} removed"
 msgstr "Spilunarlisti {} fjarlægður"
 
 #: gnomemusic/playlisttoast.py:56 gnomemusic/songtoast.py:65
-#| msgid "_Undo"
 msgid "Undo"
 msgstr "Afturkalla"
 
@@ -578,7 +529,7 @@ msgstr "Niðurstöður um flytjendur"
 msgid "Albums Results"
 msgstr "Niðurstöður um hljómplötur"
 
-#: gnomemusic/widgets/albumwidget.py:240
+#: gnomemusic/widgets/albumwidget.py:245
 msgid "{} minute"
 msgid_plural "{} minutes"
 msgstr[0] "{} mínúta"
@@ -611,7 +562,7 @@ msgstr "Skráð inn sem {}"
 msgid "Configure"
 msgstr "Stilla"
 
-#: gnomemusic/widgets/playertoolbar.py:165
+#: gnomemusic/widgets/playertoolbar.py:167
 msgid "Pause"
 msgstr "Hlé"
 
@@ -621,6 +572,62 @@ msgid_plural "{} Songs"
 msgstr[0] "{} lag"
 msgstr[1] "{} lög"
 
+#~ msgid "A music player and management application for GNOME."
+#~ msgstr "Tónlistarspilari og forrit fyrir umsýslu tónlistar fyrir GNOME."
+
+#~ msgid "Visit GNOME Music website"
+#~ msgstr "Fara á heimasíðu GNOME tónlistarspilarans"
+
+#~ msgid ""
+#~ "GNOME Music is free software; you can redistribute it and/or modify it "
+#~ "under the terms of the GNU General Public License as published by the "
+#~ "Free Software Foundation; either version 2 of the License, or (at your "
+#~ "option) any later version.\n"
+#~ "\n"
+#~ "GNOME Music is distributed in the hope that it will be useful, but "
+#~ "WITHOUT ANY WARRANTY; without even the implied warranty of "
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General "
+#~ "Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License along "
+#~ "with GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
+#~ "Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
+#~ "\n"
+#~ "The GNOME Music authors hereby grant permission for non-GPL compatible "
+#~ "GStreamer plugins to be used and distributed together with GStreamer and "
+#~ "GNOME Music.  This permission is above and beyond the permissions granted "
+#~ "by the GPL license by which GNOME Music is covered.  If you modify this "
+#~ "code, you may extend this exception to your version of the code, but you "
+#~ "are not obligated to do so.  If you do not wish to do so, delete this "
+#~ "exception statement from your version."
+#~ msgstr ""
+#~ "Þetta er frjáls hugbúnaður; þú mátt dreifa honum og/eða breyta samkvæmt "
+#~ "skilmálum í almenna GNU GPL notkunarleyfinu eins og það er gefið út af "
+#~ "Frjálsu hugbúnaðarstofnuninni; annaðhvort útgáfu 2 af GPL-leyfinu, eða "
+#~ "(ef þér sýnist svo) einhverja nýrri útgáfu leyfisins.\n"
+#~ "\n"
+#~ "Hugbúnaðnum er dreift í þeirri von að hann geti verið gagnlegur, en ÁN "
+#~ "ALLRAR ÁBYRGÐAR; einnig án þeirrar ábyrgðar sem gefin er í skyn með "
+#~ "SELJANLEIKA eða EIGINLEIKUM TIL TILTEKINNA NOTA. Sjá almenna GNU GPL "
+#~ "notkunarleyfið fyrir nánari upplýsingar.\n"
+#~ "\n"
+#~ "Það ætti að hafa fylgt afrit af almenna GNU GPL notkunarleyfinu með "
+#~ "forritinu; ef ekki skrifið þá Fjálsu hugbúnarstofnuninni: Free Software "
+#~ "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, "
+#~ "USA.\n"
+#~ "\n"
+#~ "Höfundar GNOME Music gefa hér með leyfi sitt fyrir því að nota megi "
+#~ "GStreamer viðbætur sem ekki falla undir GPL-notkunarleyfi eða sé ekki "
+#~ "dreift með GStreamer og GNOME Music.  Þessi heimild er rétthærri en "
+#~ "kvaðir GPL-skilmálanna sem GNOME Music fellur undir.  Ef þú breytir "
+#~ "þessum kóða, geturðu víkkað þessa undanþágu til að ná yfir þína útgáfu "
+#~ "kóðans, en slíkt er ekki skylda.  Ef þú ákveður að gera það ekki, eyddu "
+#~ "þá þessari undanþágu út úr þinni útgáfu."
+
+#~| msgid "The contents of your {} will appear here."
+#~ msgid "The contents of your Music Folder will appear here"
+#~ msgstr "Innihald Tónlist-möppunnar þinnar birtist hér"
+
 #~ msgid "GNOME Music"
 #~ msgstr "GNOME tónlistarspilari"
 
diff --git a/po/ka.po b/po/ka.po
new file mode 100644
index 00000000..2f33e0cb
--- /dev/null
+++ b/po/ka.po
@@ -0,0 +1,572 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gnome-music\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-music/issues\n"
+"POT-Creation-Date: 2022-09-06 08:04+0000\n"
+"PO-Revision-Date: 2022-09-14 18:46+0200\n"
+"Last-Translator: Temuri Doghonadze <temuri.doghonadze@gmail.com>\n"
+"Language-Team: Georgian <(nothing)>\n"
+"Language: ka\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 3.1.1\n"
+
+#: data/org.gnome.Music.appdata.xml.in.in:6
+#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/about.py:236
+#: gnomemusic/application.py:61 gnomemusic/window.py:71
+msgid "Music"
+msgstr "მუსიკა"
+
+#: data/org.gnome.Music.appdata.xml.in.in:7
+#: data/org.gnome.Music.desktop.in.in:5
+msgid "Play and organize your music collection"
+msgstr "მუსიკის თქვენი კოლექციის დაკვრა და დალაგება"
+
+#: data/org.gnome.Music.appdata.xml.in.in:9
+msgid "An easy and pleasant way to play your music."
+msgstr "ადვილი და სასიამოვნო გზა მუსიკის დასაკრავად."
+
+#: data/org.gnome.Music.appdata.xml.in.in:12
+msgid ""
+"Find tracks in your local collection, use automatically generated playlists "
+"or curate a fresh one."
+msgstr ""
+"იპოვეთ მუსიკა თქვენს ლოკალურ კოლექციაში და გამოიყენეთ ავტომატურად შექმნილი "
+"დასაკრავი სიები. ან შექმენით საკუთარი."
+
+#: data/org.gnome.Music.appdata.xml.in.in:167
+msgid "The GNOME Music developers"
+msgstr "GNOME Music-ის პროგრამისტები"
+
+#: data/org.gnome.Music.desktop.in.in:4
+msgid "Music Player"
+msgstr "მედია დამკვრელი"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/org.gnome.Music.desktop.in.in:13
+msgid "Music;Player;"
+msgstr "Music;Player;"
+
+#: data/org.gnome.Music.gschema.xml:12
+msgid "Window size"
+msgstr "ფანჯრის ზომა"
+
+#: data/org.gnome.Music.gschema.xml:13
+msgid "Window size (width and height)."
+msgstr "ფანჯრის ზომა (სიგანე, სიმაღლე)"
+
+#: data/org.gnome.Music.gschema.xml:17
+msgid "Window maximized"
+msgstr "გადიდებული ფანჯარა"
+
+#: data/org.gnome.Music.gschema.xml:18
+msgid "Window maximized state."
+msgstr "ფანჯრის სრულად გაშლილი მდგომარეობა."
+
+#: data/org.gnome.Music.gschema.xml:22
+msgid "Playback repeat mode"
+msgstr "დაკვრის გამეორების რეჟიმი"
+
+#. Translators: Don't translate allowed values, just the description in the brackets
+#: data/org.gnome.Music.gschema.xml:24
+msgid ""
+"Value identifies whether to repeat or randomize playback through the "
+"collection. Allowed values are: “none” (repeat and shuffle are off), "
+"“song” (repeat current song), “all” (repeat playlist, no shuffle), "
+"“shuffle” (shuffle playlist, presumes repeat all)."
+msgstr ""
+"მნიშვნელობა განსაზღვრავს, კოლექციაში დაკვრა შემთხვევითი წესით მოხდება, თუ "
+"განმეორებითი. დასაშვები მნიშვნელობებია: \"none\" (შემთხვევითობა და "
+"განმეორებადობა გამორთულია), \"song\" (მიმდინარე სიმღერის გამეორება), \"all"
+"\" (კოლექციის გამეორება, შემთხვევითობის გარეშე), \"shuffle\" (სიმღერის "
+"შემთხვევით არჩევა. ყველას დაკვრა ისედაც იგულისხმება)."
+
+#: data/org.gnome.Music.gschema.xml:28
+msgid "Enable ReplayGain"
+msgstr "ReplayGain-ის ჩართვა"
+
+#: data/org.gnome.Music.gschema.xml:29
+msgid "Enables or disables ReplayGain for albums"
+msgstr "ალბომებისთვის ReplayGain-ის ჩართვა/გამორთვა"
+
+#: data/org.gnome.Music.gschema.xml:33
+msgid "Inhibit system suspend"
+msgstr "სისტემის დაძინების გათიშვა"
+
+#: data/org.gnome.Music.gschema.xml:34
+msgid "Enables or disables inhibiting system suspend while playing music"
+msgstr "მუსიკის დაკვრის მიმდინარეობისას სისტემის დაძინების აკრძალვა"
+
+#: data/org.gnome.Music.gschema.xml:38
+msgid "Report music history to Last.fm"
+msgstr "გადაეცით მოსმენილი მუსიკა Last.fm-ზე"
+
+#: data/org.gnome.Music.gschema.xml:39
+msgid ""
+"Enables or disables sending scrobbles and the “currently playing” info to "
+"Last.fm."
+msgstr ""
+"მიმდინარე სიმღერის შესახებ ინფორმაციის Last.fm-ზე გაგზავნის ჩართვა/გამორთვა."
+
+#: data/ui/AlbumWidget.ui:84 data/ui/PlayerToolbar.ui:87
+#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:170
+msgid "Play"
+msgstr "დაკვრა"
+
+#: data/ui/AlbumWidget.ui:130 data/ui/PlaylistControls.ui:5
+#: data/ui/SongWidgetMenu.ui:11
+msgid "_Play"
+msgstr "_დაკვრა"
+
+#: data/ui/AlbumWidget.ui:134
+msgid "Add to _Favorite Songs"
+msgstr "საყვარელი _სიმღერებში ჩამატება"
+
+#: data/ui/AlbumWidget.ui:138 data/ui/SongWidgetMenu.ui:15
+msgid "_Add to Playlist…"
+msgstr "_დასაკრავი სიაში დამატება…"
+
+#: data/ui/AppMenu.ui:23 data/ui/LastfmDialog.ui:8
+msgid "Last.fm Account"
+msgstr "Last.fm-ის ანგარიში"
+
+#: data/ui/AppMenu.ui:36
+msgid "Report Music Listening"
+msgstr "გადაეცით მოსმენილი მუსიკა"
+
+#: data/ui/AppMenu.ui:58
+msgid "_Keyboard Shortcuts"
+msgstr "კლავიატურის მალსახმობები"
+
+#: data/ui/AppMenu.ui:68
+msgid "_Help"
+msgstr "_დახმარება"
+
+#: data/ui/AppMenu.ui:78
+msgid "_About Music"
+msgstr "Music-ის შესახებ"
+
+#: data/ui/EmptyView.ui:30
+msgid "Welcome to Music"
+msgstr "მოგესალმებით Music-ში"
+
+#: data/ui/HeaderBar.ui:16
+msgid "Menu"
+msgstr "მენიუ"
+
+#: data/ui/HeaderBar.ui:24 data/ui/SearchHeaderBar.ui:15
+msgid "Select"
+msgstr "მონიშნეთ"
+
+#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:213
+#: data/ui/SearchHeaderBar.ui:20
+msgid "_Cancel"
+msgstr "_გაუქმება"
+
+#: data/ui/HeaderBar.ui:42 data/ui/SearchHeaderBar.ui:32
+msgid "Search"
+msgstr "ძებნა"
+
+#: data/ui/HeaderBar.ui:50
+msgid "Back"
+msgstr "უკან"
+
+#: data/ui/help-overlay.ui:11
+msgctxt "shortcut window"
+msgid "General"
+msgstr "მთავარი"
+
+#: data/ui/help-overlay.ui:14
+msgctxt "shortcut window"
+msgid "Close window"
+msgstr "ფანჯრის დახურვა"
+
+#: data/ui/help-overlay.ui:20
+msgctxt "shortcut window"
+msgid "Search"
+msgstr "ძებნა"
+
+#: data/ui/help-overlay.ui:26
+msgctxt "shortcut window"
+msgid "Help"
+msgstr "დახმარება"
+
+#: data/ui/help-overlay.ui:32
+msgctxt "shortcut window"
+msgid "Shortcuts"
+msgstr "მალსახმობები"
+
+#: data/ui/help-overlay.ui:40
+msgctxt "shortcut window"
+msgid "Playback"
+msgstr "დაკვრა"
+
+#: data/ui/help-overlay.ui:43
+msgctxt "shortcut window"
+msgid "Play/Pause"
+msgstr "დაკვრა/პაუზა"
+
+#: data/ui/help-overlay.ui:49
+msgctxt "shortcut window"
+msgid "Next song"
+msgstr "შემდეგი სიმღერა"
+
+#: data/ui/help-overlay.ui:55
+msgctxt "shortcut window"
+msgid "Previous song"
+msgstr "წინა სიმღერა"
+
+#: data/ui/help-overlay.ui:61
+msgctxt "shortcut window"
+msgid "Toggle repeat"
+msgstr "გამეორების გადართვა"
+
+#: data/ui/help-overlay.ui:67
+msgctxt "shortcut window"
+msgid "Toggle shuffle"
+msgstr "შემთხვევითობის გადართვა"
+
+#: data/ui/help-overlay.ui:75
+msgctxt "shortcut window"
+msgid "Navigation"
+msgstr "ნავიგაცია"
+
+#: data/ui/help-overlay.ui:78
+msgctxt "shortcut window"
+msgid "Go to Albums"
+msgstr "ალბომებზე გადასვლა"
+
+#: data/ui/help-overlay.ui:84
+msgctxt "shortcut window"
+msgid "Go to Artists"
+msgstr "შემსრულებლებზე გადასვლა"
+
+#: data/ui/help-overlay.ui:90
+msgctxt "shortcut window"
+msgid "Go to Songs"
+msgstr "სიმღერებზე გადართვა"
+
+#: data/ui/help-overlay.ui:96
+msgctxt "shortcut window"
+msgid "Go to Playlists"
+msgstr "დასაკრავ სიებზე გადართვა"
+
+#: data/ui/help-overlay.ui:102
+msgctxt "shortcut window"
+msgid "Go back"
+msgstr "უკან გადასვლა"
+
+#: data/ui/LastfmDialog.ui:21
+msgid ""
+"Last.fm is a music discovery service that gives you personalised "
+"recommendations based on the music you listen to."
+msgstr ""
+"Last.fm არის მუსიკალური სერვისი, რომელიც გაძლევთ პერსონალურ რეკომენდაციებს "
+"თქვენს მიერ მოსმენილი მუსიკის საფუძველზე."
+
+#: data/ui/LastfmDialog.ui:31 gnomemusic/widgets/lastfmdialog.py:57
+msgid "Music Reporting Not Setup"
+msgstr "დაკრული მუსიკის გადაცემა მორგებული არაა"
+
+#: data/ui/LastfmDialog.ui:44 gnomemusic/widgets/lastfmdialog.py:60
+msgid "Login to your Last.fm account to report your music listening."
+msgstr "შედით Last.fm-ის თქვენს ანგარიშში დაკრული სიმღერების სიის გადასაცემად."
+
+#: data/ui/LastfmDialog.ui:55 gnomemusic/widgets/lastfmdialog.py:58
+msgid "Login"
+msgstr "შესვლა"
+
+#: data/ui/PlayerToolbar.ui:74
+msgid "Previous"
+msgstr "წინა"
+
+#: data/ui/PlayerToolbar.ui:106
+msgid "Next"
+msgstr "შემდეგი"
+
+#: data/ui/PlaylistControls.ui:9
+msgid "_Delete"
+msgstr "_წაშლა"
+
+#: data/ui/PlaylistControls.ui:13
+msgid "_Rename…"
+msgstr "_გადარქმევა…"
+
+#: data/ui/PlaylistControls.ui:28
+msgid "Playlist Name"
+msgstr "დასაკრავი სიის სახელი"
+
+#: data/ui/PlaylistControls.ui:62
+msgid "_Done"
+msgstr "_დასრულებულია"
+
+#: data/ui/PlaylistDialog.ui:52
+msgid "Enter a name for your first playlist"
+msgstr "შეიყვანეთ თქვენი პირველი დასაკრავი სიის სახელი"
+
+#: data/ui/PlaylistDialog.ui:77
+msgid "C_reate"
+msgstr "_შექმნა"
+
+#: data/ui/PlaylistDialog.ui:146
+msgid "New Playlist…"
+msgstr "ახალი დასაკრავი სია…"
+
+#: data/ui/PlaylistDialog.ui:161
+msgid "Add"
+msgstr "დამატება"
+
+#: data/ui/PlaylistDialog.ui:202
+msgid "Add to Playlist"
+msgstr "დასაკრავი სიაში დამატება"
+
+#: data/ui/PlaylistDialog.ui:222
+msgid "_Add"
+msgstr "_დამატება"
+
+#: data/ui/SearchView.ui:33 gnomemusic/views/artistsview.py:51
+msgid "Artists"
+msgstr "შემსრულებლები"
+
+#: data/ui/SearchView.ui:42 data/ui/SearchView.ui:84
+msgid "View All"
+msgstr "ყველას ნახვა"
+
+#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:56
+msgid "Albums"
+msgstr "ალბომები"
+
+#: data/ui/SearchView.ui:117 gnomemusic/views/songsview.py:52
+msgid "Songs"
+msgstr "სიმღერები"
+
+#: data/ui/SelectionBarMenuButton.ui:7
+msgid "Select All"
+msgstr "ყველას მონიშვნა"
+
+#: data/ui/SelectionBarMenuButton.ui:11
+msgid "Select None"
+msgstr "მონიშვნის მოხსნა"
+
+#: data/ui/SelectionBarMenuButton.ui:19 gnomemusic/widgets/headerbar.py:69
+msgid "Click on items to select them"
+msgstr "მოსანიშნად დააწკაპუნეთ ელემენტებზე"
+
+#: data/ui/SelectionToolbar.ui:8
+msgid "_Add to Playlist"
+msgstr "_დასაკრავი სიაში დამატება"
+
+#: data/ui/SongWidgetMenu.ui:19
+msgid "_Remove from Playlist"
+msgstr "_დასაკრავი სიიდან წაშლა"
+
+#: gnomemusic/about.py:238
+msgid "The GNOME Project"
+msgstr "პროექტი \"GNOME\""
+
+#: gnomemusic/about.py:242
+msgid "translator-credits"
+msgstr "თემური დოღონაძე"
+
+#: gnomemusic/about.py:246
+msgid "Copyright The GNOME Music Developers"
+msgstr "GNOME Music-ის პროგრამისტები, ყველა უფლება დაცულია"
+
+#: gnomemusic/about.py:249
+msgid "Translated by"
+msgstr "თარგმნა"
+
+#. TRANSLATORS: this is a playlist name
+#: gnomemusic/grilowrappers/grltrackerplaylists.py:894
+msgid "Most Played"
+msgstr "ხშირად დაკრული"
+
+#. TRANSLATORS: this is a playlist name
+#: gnomemusic/grilowrappers/grltrackerplaylists.py:948
+msgid "Never Played"
+msgstr "არასდროს-დაკრული"
+
+#. TRANSLATORS: this is a playlist name
+#: gnomemusic/grilowrappers/grltrackerplaylists.py:1001
+msgid "Recently Played"
+msgstr "ახლახანს დაკრული"
+
+#. TRANSLATORS: this is a playlist name
+#: gnomemusic/grilowrappers/grltrackerplaylists.py:1064
+msgid "Recently Added"
+msgstr "ახლახანს დამატებული"
+
+#. TRANSLATORS: this is a playlist name
+#: gnomemusic/grilowrappers/grltrackerplaylists.py:1127
+msgid "Favorite Songs"
+msgstr "საყვარელი სიმღერები"
+
+#: gnomemusic/gstplayer.py:408
+msgid "Unable to play the file"
+msgstr "ფაილის დაკვრის შეცდომა"
+
+#: gnomemusic/gstplayer.py:414
+msgid "_Find in {}"
+msgstr "{}-ში _მოძებნა"
+
+#. TRANSLATORS: separator for two codecs
+#: gnomemusic/gstplayer.py:424
+msgid " and "
+msgstr " და "
+
+#. TRANSLATORS: separator for a list of codecs
+#: gnomemusic/gstplayer.py:427
+msgid ", "
+msgstr ", "
+
+#: gnomemusic/gstplayer.py:429
+msgid "{} is required to play the file, but is not installed."
+msgid_plural "{} are required to play the file, but are not installed."
+msgstr[0] "ფაილის დასაკრავად საჭიროა {}, მაგრამ დაყენებული არაა."
+
+#: gnomemusic/inhibitsuspend.py:63
+msgid "Playing music"
+msgstr "მიმდინარეობს დაკვრა"
+
+#. Translators: "shuffle" causes tracks to play in random order.
+#: gnomemusic/player.py:44
+msgid "Shuffle"
+msgstr "შემთხვევით"
+
+#: gnomemusic/player.py:45
+msgid "Repeat Song"
+msgstr "სიმღერის გამეორება"
+
+#: gnomemusic/player.py:46
+msgid "Repeat All"
+msgstr "ყველას გამეორება"
+
+#: gnomemusic/player.py:47
+msgid "Shuffle/Repeat Off"
+msgstr "შემთხვევითი/გამეორება გამორთულია"
+
+#: gnomemusic/playlisttoast.py:55
+msgid "Playlist {} removed"
+msgstr "დასაკრავი სია წაიშალა: {}"
+
+#: gnomemusic/playlisttoast.py:56 gnomemusic/songtoast.py:65
+msgid "Undo"
+msgstr "დაბრუნება"
+
+#: gnomemusic/songtoast.py:64
+msgid "{} removed from {}"
+msgstr "{} წაიშალა {}-დან"
+
+#: gnomemusic/utils.py:92
+msgid "Unknown album"
+msgstr "უცნობი ალბომი"
+
+#: gnomemusic/utils.py:113
+msgid "Unknown Artist"
+msgstr "უცნობი შემსრულებელი"
+
+#: gnomemusic/views/emptyview.py:65
+msgid "Your XDG Music directory is not set."
+msgstr "XDG Music-ის საქაღალდე მითითებული არაა."
+
+#: gnomemusic/views/emptyview.py:72
+msgid "Music Folder"
+msgstr "მუსიკის საქაღალდე"
+
+#. TRANSLATORS: This is a label to display a link to open user's music
+#. folder. {} will be replaced with the translated text 'Music folder'
+#: gnomemusic/views/emptyview.py:76
+msgid "The contents of your {} will appear here."
+msgstr "თქვენი {}-ის შემცველობა აქ გამოჩნდება."
+
+#: gnomemusic/views/emptyview.py:124
+msgid "No Music Found"
+msgstr "მუსიკა ნაპოვნი არაა"
+
+#: gnomemusic/views/emptyview.py:125
+msgid "Try a Different Search"
+msgstr "სცადეთ სხვა ძებნა"
+
+#: gnomemusic/views/emptyview.py:129
+msgid "GNOME Music could not connect to Tracker."
+msgstr "GNOME Music-ი ტრეკერს ვერ მიუერთდა."
+
+#: gnomemusic/views/emptyview.py:131
+msgid "Your music files cannot be indexed without Tracker running."
+msgstr "მუსიკის ფაილების ინდექსაცია გაშვებული ტრეკერის გარეშე შეუძლებელია."
+
+#: gnomemusic/views/emptyview.py:137
+msgid "Your system Tracker version seems outdated."
+msgstr "როგორც ჩანს თქვენი სისტემური ტრეკერი მოძველებულია."
+
+#: gnomemusic/views/emptyview.py:139
+msgid "Music needs Tracker version 3.0.0 or higher."
+msgstr "Music-ს ტრეკერის 3.0.0 ან უფრო ახალი ვერსია სჭირდება."
+
+#: gnomemusic/views/playlistsview.py:45
+msgid "Playlists"
+msgstr "დასაკრავი სიები"
+
+#: gnomemusic/views/searchview.py:304
+msgid "Artists Results"
+msgstr "ნაპოვნი შემსრულებლები"
+
+#: gnomemusic/views/searchview.py:318
+msgid "Albums Results"
+msgstr "ნაპოვნი ალბომები"
+
+#: gnomemusic/widgets/albumwidget.py:245
+msgid "{} minute"
+msgid_plural "{} minutes"
+msgstr[0] "{} წუთი"
+
+#: gnomemusic/widgets/discbox.py:75
+msgid "Disc {}"
+msgstr "დისკი {}"
+
+#: gnomemusic/widgets/headerbar.py:66
+msgid "Selected {} song"
+msgid_plural "Selected {} songs"
+msgstr[0] "არჩეულია {} სიმღერა"
+
+#: gnomemusic/widgets/lastfmdialog.py:64
+msgid "Your music listening is reported to Last.fm."
+msgstr "თქვენი მოსმენილი სიმღერების სახელები იგზავნება Last.fm-ზე."
+
+#: gnomemusic/widgets/lastfmdialog.py:66
+msgid "Your music listening is not reported to Last.fm."
+msgstr "თქვენი მოსმენილი სიმღერების სახელები არ იგზავნება Last.fm-ზე."
+
+#. TRANSLATORS: displays the username of the Last.fm account
+#: gnomemusic/widgets/lastfmdialog.py:70
+msgid "Logged in as {}"
+msgstr "შესული ბრძანდებით, როგორც {}"
+
+#: gnomemusic/widgets/lastfmdialog.py:71
+msgid "Configure"
+msgstr "მორგება"
+
+#: gnomemusic/widgets/playertoolbar.py:167
+msgid "Pause"
+msgstr "შეჩერება"
+
+#: gnomemusic/widgets/playlistcontrols.py:130
+msgid "{} Song"
+msgid_plural "{} Songs"
+msgstr[0] "{} სიმღერა"
+
+#~ msgid "A music player and management application for GNOME."
+#~ msgstr "მუსიკის დაკვრისა და მართვის აპლიკაცია GNOME-სთვის."
+
+#~ msgid "Visit GNOME Music website"
+#~ msgstr "GNOME Music-ის ვებ-გვერდზე გადასვლა"
+
+#~ msgid "The contents of your Music Folder will appear here"
+#~ msgstr "მუსიკის თქვენი საქაღალდის შემცველობა აქ გამოჩნდება"
diff --git a/po/kk.po b/po/kk.po
index 75321fc5..be0d6e0b 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-music master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-music/issues\n"
-"POT-Creation-Date: 2022-02-19 12:39+0000\n"
-"PO-Revision-Date: 2022-03-12 22:45+0500\n"
+"POT-Creation-Date: 2022-08-27 13:27+0000\n"
+"PO-Revision-Date: 2022-09-18 12:57+0600\n"
 "Last-Translator: Baurzhan Muftakhidinov <baurthefirst@gmail.com>\n"
 "Language-Team: Kazakh <kk_KZ@googlegroups.com>\n"
 "Language: kk\n"
@@ -16,11 +16,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 3.0.1\n"
+"X-Generator: Poedit 3.1.1\n"
 
 #: data/org.gnome.Music.appdata.xml.in.in:6
-#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/application.py:61
-#: gnomemusic/window.py:71
+#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/about.py:236
+#: gnomemusic/application.py:61 gnomemusic/window.py:71
 msgid "Music"
 msgstr "Музыка"
 
@@ -41,7 +41,7 @@ msgstr ""
 "Жергілікті жинақтағы тректерді тауып, автоматты түрде жасалған ойнату "
 "тізімдерін пайдаланыңыз немесе жаңасын жасаңыз."
 
-#: data/org.gnome.Music.appdata.xml.in.in:149
+#: data/org.gnome.Music.appdata.xml.in.in:167
 msgid "The GNOME Music developers"
 msgstr "GNOME музыкасы әзірлеушілері"
 
@@ -118,79 +118,21 @@ msgstr ""
 "Тыңдау тарихын және \"ағымдағы ойналуда\" ақпаратын Last.fm қызметіне "
 "жіберуді іске қосады немесе сөндіреді."
 
-#: data/ui/AboutDialog.ui.in:9
-msgid "Copyright © 2018 GNOME Music Developers"
-msgstr "Copyright © 2018 GNOME музыкасы әзірлеушілері"
-
-#: data/ui/AboutDialog.ui.in:10
-msgid "A music player and management application for GNOME."
-msgstr "Музыканы ойнау және басқаруға арналған GNOME қолданбасы."
-
-#: data/ui/AboutDialog.ui.in:12
-msgid "Visit GNOME Music website"
-msgstr "GNOME музыкасы веб сайтын шолу"
-
-#: data/ui/AboutDialog.ui.in:13
-msgid ""
-"GNOME Music is free software; you can redistribute it and/or modify it under "
-"the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"GNOME Music is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
-"\n"
-"The GNOME Music authors hereby grant permission for non-GPL compatible "
-"GStreamer plugins to be used and distributed together with GStreamer and "
-"GNOME Music.  This permission is above and beyond the permissions granted by "
-"the GPL license by which GNOME Music is covered.  If you modify this code, "
-"you may extend this exception to your version of the code, but you are not "
-"obligated to do so.  If you do not wish to do so, delete this exception "
-"statement from your version."
-msgstr ""
-"GNOME музыкасы еркін бағдарлама; сіз оны Free Software Foundation шығарған "
-"GNU General Public License аясында еркін тарата не/және өзгерте аласыз; "
-"лицензия нұсқасы 2 не (тандауыңызша) кез-келген кейін шыққан.\n"
-"\n"
-"GNOME музыкасы пайдалы болады деген сеніммен таратылады, бірақ ЕШҚАНДАЙ "
-"КЕПІЛДЕМЕ берілмейді; КОММЕРЦИЯЛЫҚ ҚҰНДЫЛЫҚ немесе белгілі бір МАҚСАТТАРҒА "
-"СӘЙКЕС КЕЛЕТІНІ үшін де.  Көбірек білу үшін GNU General Public License "
-"қараңыз.\n"
-"\n"
-"Сіз осы GNOME музыкасы бағдарламасымен бірге GNU General Public License "
-"көшірмесін алуыңыз керек еді; олай болмаса, Free Software Foundation, Inc. "
-"ұйымына, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA адресі "
-"бойынша хабарласыңыз.\n"
-"\n"
-"GNOME музыкасы авторлары GPL үйлесімсіз GStreamer плагиндерін GStreamer және "
-"GNOME музыкасы қолданбасымен бірге қолданылып, таратылу құқығын рұқсат "
-"етеді. Бұл рұқсат GNOME музыкасы өзінің GPL лицензиясынан басымды болады. "
-"Егер сіз бұл кодты түрлендіретін болсаңыз, осы рұқсатты кодтың өз "
-"бөлігіңізге де іске асыра аласыз, бірақ бұл міндетті емес. Егер сіз оны "
-"жасамауды таңдасаңыз, лицензияның бұл ерекше бөлігін өз нұсқаңыздан алып "
-"тастаңыз."
-
-#: data/ui/AlbumWidget.ui:86 data/ui/PlayerToolbar.ui:88
-#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:168
+#: data/ui/AlbumWidget.ui:84 data/ui/PlayerToolbar.ui:87
+#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:170
 msgid "Play"
 msgstr "Ойнату"
 
-#: data/ui/AlbumWidget.ui:132 data/ui/PlaylistControls.ui:5
+#: data/ui/AlbumWidget.ui:130 data/ui/PlaylistControls.ui:5
 #: data/ui/SongWidgetMenu.ui:11
 msgid "_Play"
 msgstr "Ой_нату"
 
-#: data/ui/AlbumWidget.ui:136
+#: data/ui/AlbumWidget.ui:134
 msgid "Add to _Favorite Songs"
 msgstr "_Таңдамалы өлеңдерге қосу"
 
-#: data/ui/AlbumWidget.ui:140 data/ui/SongWidgetMenu.ui:15
+#: data/ui/AlbumWidget.ui:138 data/ui/SongWidgetMenu.ui:15
 msgid "_Add to Playlist…"
 msgstr "Ойнату тізіміне қ_осу…"
 
@@ -214,7 +156,7 @@ msgstr "_Көмек"
 msgid "_About Music"
 msgstr "Музыка қолданбасы тур_алы"
 
-#: data/ui/EmptyView.ui:26 data/ui/InitialState.ui:13
+#: data/ui/EmptyView.ui:30
 msgid "Welcome to Music"
 msgstr "Музыкаға қош келдіңіз"
 
@@ -226,7 +168,7 @@ msgstr "Мәзір"
 msgid "Select"
 msgstr "Таңдау"
 
-#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:211
+#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:213
 #: data/ui/SearchHeaderBar.ui:20
 msgid "_Cancel"
 msgstr "Ба_с тарту"
@@ -324,10 +266,6 @@ msgctxt "shortcut window"
 msgid "Go back"
 msgstr "Артқа өту"
 
-#: data/ui/InitialState.ui:25
-msgid "The contents of your Music Folder will appear here"
-msgstr "Музыка бумаңыздың құрамасы осында көрсетіледі"
-
 #: data/ui/LastfmDialog.ui:21
 msgid ""
 "Last.fm is a music discovery service that gives you personalised "
@@ -348,11 +286,11 @@ msgstr "Музыка тыңдау туралы хабарлау үшін Last.fm
 msgid "Login"
 msgstr "Кіру"
 
-#: data/ui/PlayerToolbar.ui:75
+#: data/ui/PlayerToolbar.ui:74
 msgid "Previous"
 msgstr "Алдыңғы"
 
-#: data/ui/PlayerToolbar.ui:107
+#: data/ui/PlayerToolbar.ui:106
 msgid "Next"
 msgstr "Келесі"
 
@@ -388,11 +326,11 @@ msgstr "Жаңа ойнату тізімі…"
 msgid "Add"
 msgstr "Қосу"
 
-#: data/ui/PlaylistDialog.ui:200
+#: data/ui/PlaylistDialog.ui:202
 msgid "Add to Playlist"
 msgstr "Ойнату тізіміне қосу"
 
-#: data/ui/PlaylistDialog.ui:220
+#: data/ui/PlaylistDialog.ui:222
 msgid "_Add"
 msgstr "Қо_су"
 
@@ -404,7 +342,7 @@ msgstr "Әртістер"
 msgid "View All"
 msgstr "Барлығын қарау"
 
-#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:54
+#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:56
 msgid "Albums"
 msgstr "Альбомдар"
 
@@ -432,6 +370,22 @@ msgstr "Ойнату тізіміне қ_осу"
 msgid "_Remove from Playlist"
 msgstr "Ойнату тізімінен өші_ру"
 
+#: gnomemusic/about.py:238
+msgid "The GNOME Project"
+msgstr "GNOME жобасы"
+
+#: gnomemusic/about.py:242
+msgid "translator-credits"
+msgstr "Baurzhan Muftakhidinov <baurthefirst@gmail.com>"
+
+#: gnomemusic/about.py:246
+msgid "Copyright The GNOME Music Developers"
+msgstr "Copyright © GNOME музыкасы әзірлеушілері"
+
+#: gnomemusic/about.py:249
+msgid "Translated by"
+msgstr "Аударған"
+
 #. TRANSLATORS: this is a playlist name
 #: gnomemusic/grilowrappers/grltrackerplaylists.py:894
 msgid "Most Played"
@@ -572,7 +526,7 @@ msgstr "Әртістер нәтижелері"
 msgid "Albums Results"
 msgstr "Альбомдар нәтижелері"
 
-#: gnomemusic/widgets/albumwidget.py:240
+#: gnomemusic/widgets/albumwidget.py:245
 msgid "{} minute"
 msgid_plural "{} minutes"
 msgstr[0] "{} минут"
@@ -603,7 +557,7 @@ msgstr "{} ретінде кірген"
 msgid "Configure"
 msgstr "Баптау"
 
-#: gnomemusic/widgets/playertoolbar.py:165
+#: gnomemusic/widgets/playertoolbar.py:167
 msgid "Pause"
 msgstr "Аялдату"
 
@@ -612,6 +566,60 @@ msgid "{} Song"
 msgid_plural "{} Songs"
 msgstr[0] "{} өлең"
 
+#~ msgid "A music player and management application for GNOME."
+#~ msgstr "Музыканы ойнау және басқаруға арналған GNOME қолданбасы."
+
+#~ msgid "Visit GNOME Music website"
+#~ msgstr "GNOME музыкасы веб сайтын шолу"
+
+#~ msgid ""
+#~ "GNOME Music is free software; you can redistribute it and/or modify it "
+#~ "under the terms of the GNU General Public License as published by the "
+#~ "Free Software Foundation; either version 2 of the License, or (at your "
+#~ "option) any later version.\n"
+#~ "\n"
+#~ "GNOME Music is distributed in the hope that it will be useful, but "
+#~ "WITHOUT ANY WARRANTY; without even the implied warranty of "
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General "
+#~ "Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License along "
+#~ "with GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
+#~ "Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
+#~ "\n"
+#~ "The GNOME Music authors hereby grant permission for non-GPL compatible "
+#~ "GStreamer plugins to be used and distributed together with GStreamer and "
+#~ "GNOME Music.  This permission is above and beyond the permissions granted "
+#~ "by the GPL license by which GNOME Music is covered.  If you modify this "
+#~ "code, you may extend this exception to your version of the code, but you "
+#~ "are not obligated to do so.  If you do not wish to do so, delete this "
+#~ "exception statement from your version."
+#~ msgstr ""
+#~ "GNOME музыкасы еркін бағдарлама; сіз оны Free Software Foundation "
+#~ "шығарған GNU General Public License аясында еркін тарата не/және өзгерте "
+#~ "аласыз; лицензия нұсқасы 2 не (тандауыңызша) кез-келген кейін шыққан.\n"
+#~ "\n"
+#~ "GNOME музыкасы пайдалы болады деген сеніммен таратылады, бірақ ЕШҚАНДАЙ "
+#~ "КЕПІЛДЕМЕ берілмейді; КОММЕРЦИЯЛЫҚ ҚҰНДЫЛЫҚ немесе белгілі бір "
+#~ "МАҚСАТТАРҒА СӘЙКЕС КЕЛЕТІНІ үшін де.  Көбірек білу үшін GNU General "
+#~ "Public License қараңыз.\n"
+#~ "\n"
+#~ "Сіз осы GNOME музыкасы бағдарламасымен бірге GNU General Public License "
+#~ "көшірмесін алуыңыз керек еді; олай болмаса, Free Software Foundation, "
+#~ "Inc. ұйымына, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA "
+#~ "адресі бойынша хабарласыңыз.\n"
+#~ "\n"
+#~ "GNOME музыкасы авторлары GPL үйлесімсіз GStreamer плагиндерін GStreamer "
+#~ "және GNOME музыкасы қолданбасымен бірге қолданылып, таратылу құқығын "
+#~ "рұқсат етеді. Бұл рұқсат GNOME музыкасы өзінің GPL лицензиясынан басымды "
+#~ "болады. Егер сіз бұл кодты түрлендіретін болсаңыз, осы рұқсатты кодтың өз "
+#~ "бөлігіңізге де іске асыра аласыз, бірақ бұл міндетті емес. Егер сіз оны "
+#~ "жасамауды таңдасаңыз, лицензияның бұл ерекше бөлігін өз нұсқаңыздан алып "
+#~ "тастаңыз."
+
+#~ msgid "The contents of your Music Folder will appear here"
+#~ msgstr "Музыка бумаңыздың құрамасы осында көрсетіледі"
+
 #~ msgid "GNOME Music"
 #~ msgstr "GNOME музыкасы"
 
diff --git a/po/ko.po b/po/ko.po
index 88b26f44..c88726ee 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-music master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-music/issues\n"
-"POT-Creation-Date: 2022-02-19 12:39+0000\n"
-"PO-Revision-Date: 2022-03-01 18:13+0900\n"
+"POT-Creation-Date: 2022-08-27 13:27+0000\n"
+"PO-Revision-Date: 2022-08-28 23:00+0900\n"
 "Last-Translator: Seong-ho Cho <shcho@gnome.org>\n"
 "Language-Team: Korean <gnome-kr@googlegroups.com>\n"
 "Language: ko\n"
@@ -19,8 +19,8 @@ msgstr ""
 "X-Generator: Poedit 2.3.1\n"
 
 #: data/org.gnome.Music.appdata.xml.in.in:6
-#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/application.py:61
-#: gnomemusic/window.py:71
+#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/about.py:236
+#: gnomemusic/application.py:61 gnomemusic/window.py:71
 msgid "Music"
 msgstr "음악"
 
@@ -41,7 +41,7 @@ msgstr ""
 "로컬 모음집에서 트랙을 찾거나 자동으로 미리 만든 재생 목록을 활용하거나 새 목"
 "록을 구성합니다."
 
-#: data/org.gnome.Music.appdata.xml.in.in:149
+#: data/org.gnome.Music.appdata.xml.in.in:167
 msgid "The GNOME Music developers"
 msgstr "The GNOME Music developers"
 
@@ -115,75 +115,21 @@ msgid ""
 "Last.fm."
 msgstr "last.fm에 음악 취향과 “현재 재생 중” 정보 보내기를 켜거나 끕니다."
 
-#: data/ui/AboutDialog.ui.in:9
-msgid "Copyright © 2018 GNOME Music Developers"
-msgstr "Copyright © 2018 GNOME Music Developers"
-
-#: data/ui/AboutDialog.ui.in:10
-msgid "A music player and management application for GNOME."
-msgstr "그놈용 음악 재생기 및 관리 프로그램."
-
-#: data/ui/AboutDialog.ui.in:12
-msgid "Visit GNOME Music website"
-msgstr "그놈 음악 웹사이트를 방문하세요"
-
-#: data/ui/AboutDialog.ui.in:13
-msgid ""
-"GNOME Music is free software; you can redistribute it and/or modify it under "
-"the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"GNOME Music is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
-"\n"
-"The GNOME Music authors hereby grant permission for non-GPL compatible "
-"GStreamer plugins to be used and distributed together with GStreamer and "
-"GNOME Music.  This permission is above and beyond the permissions granted by "
-"the GPL license by which GNOME Music is covered.  If you modify this code, "
-"you may extend this exception to your version of the code, but you are not "
-"obligated to do so.  If you do not wish to do so, delete this exception "
-"statement from your version."
-msgstr ""
-"그놈 음악은 자유 소프트웨어 입니다. 자유 소프트웨어 재단이 발표한 GNU 일반 공"
-"중 사용허가서 라이선스 버전 2 또는(여러분의 취향에 따라) 그 이상의 조항에 따"
-"라 재배포 또는 수정할 수 있습니다.\n"
-"\n"
-"그놈 음악을 여러분께서 쓸모 있게 사용하길 바라며 배포하지만, 그 어떤 보증을 "
-"하지 않으며 심지어 상업성 또는 일부 목적의 적합성에 대한 암시적 보증도 하지 "
-"않습니다. 자세한 내용은 GNU 일반 공중 사용허가서를 참조하십시오.\n"
-"\n"
-"그놈 음악과 함께 GNU 일반 공중 사용허가서의 사본을 받아야 합니다. 만약 받지 "
-"못했다면 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, "
-"Boston, MA 02110-1301 USA로 요청하십시오.\n"
-"\n"
-"그놈 음악 제작자는 비 GPL 호환 지스트리머 플러그인에 대한 사용을 허가 받았으"
-"며, 지스트리머와 그놈 음악을 함께 배포합니다. 이 권한은 그놈 음악에 대해 효력"
-"을 미치는 GNU 일반 공중 사용허가서에 따라 허가받습니다. 이 코드를 수정하면, "
-"여러분 버전의 코드에 이 예외를 확장할 수 있겠지만, 의무적인 것은 아닙니다. 원"
-"치 않는다면 여러분의 코드 버전에서 예외 조항을 삭제하십시오."
-
-#: data/ui/AlbumWidget.ui:86 data/ui/PlayerToolbar.ui:88
-#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:168
+#: data/ui/AlbumWidget.ui:84 data/ui/PlayerToolbar.ui:87
+#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:170
 msgid "Play"
 msgstr "재생"
 
-#: data/ui/AlbumWidget.ui:132 data/ui/PlaylistControls.ui:5
+#: data/ui/AlbumWidget.ui:130 data/ui/PlaylistControls.ui:5
 #: data/ui/SongWidgetMenu.ui:11
 msgid "_Play"
 msgstr "재생(_P)"
 
-#: data/ui/AlbumWidget.ui:136
+#: data/ui/AlbumWidget.ui:134
 msgid "Add to _Favorite Songs"
 msgstr "즐겨찾는 곡 추가(_F)"
 
-#: data/ui/AlbumWidget.ui:140 data/ui/SongWidgetMenu.ui:15
+#: data/ui/AlbumWidget.ui:138 data/ui/SongWidgetMenu.ui:15
 msgid "_Add to Playlist…"
 msgstr "재생 목록에 추가(_A)…"
 
@@ -207,7 +153,7 @@ msgstr "도움말(_H)"
 msgid "_About Music"
 msgstr "음악 정보(_A)"
 
-#: data/ui/EmptyView.ui:26 data/ui/InitialState.ui:13
+#: data/ui/EmptyView.ui:30
 msgid "Welcome to Music"
 msgstr "그놈 음악 사용을 환영합니다"
 
@@ -219,7 +165,7 @@ msgstr "메뉴"
 msgid "Select"
 msgstr "선택"
 
-#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:211
+#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:213
 #: data/ui/SearchHeaderBar.ui:20
 msgid "_Cancel"
 msgstr "취소(_C)"
@@ -317,10 +263,6 @@ msgctxt "shortcut window"
 msgid "Go back"
 msgstr "뒤로"
 
-#: data/ui/InitialState.ui:25
-msgid "The contents of your Music Folder will appear here"
-msgstr "음악 폴더의 내용은 여기에 나타납니다"
-
 #: data/ui/LastfmDialog.ui:21
 msgid ""
 "Last.fm is a music discovery service that gives you personalised "
@@ -340,11 +282,11 @@ msgstr "감상 음악을 보고하려면 last.fm 계정으로 로그인하십시
 msgid "Login"
 msgstr "로그인"
 
-#: data/ui/PlayerToolbar.ui:75
+#: data/ui/PlayerToolbar.ui:74
 msgid "Previous"
 msgstr "이전"
 
-#: data/ui/PlayerToolbar.ui:107
+#: data/ui/PlayerToolbar.ui:106
 msgid "Next"
 msgstr "다음"
 
@@ -380,11 +322,11 @@ msgstr "새 재생 목록…"
 msgid "Add"
 msgstr "추가"
 
-#: data/ui/PlaylistDialog.ui:200
+#: data/ui/PlaylistDialog.ui:202
 msgid "Add to Playlist"
 msgstr "재생 목록에 추가"
 
-#: data/ui/PlaylistDialog.ui:220
+#: data/ui/PlaylistDialog.ui:222
 msgid "_Add"
 msgstr "추가(_A)"
 
@@ -396,7 +338,7 @@ msgstr "음악가"
 msgid "View All"
 msgstr "모두 보기"
 
-#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:54
+#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:56
 msgid "Albums"
 msgstr "앨범"
 
@@ -424,6 +366,23 @@ msgstr "재생 목록에 추가(_A)"
 msgid "_Remove from Playlist"
 msgstr "재생 목록에서 제거(_R)"
 
+#: gnomemusic/about.py:238
+msgid "The GNOME Project"
+msgstr "그놈 프로젝트"
+
+#: gnomemusic/about.py:242
+msgid "translator-credits"
+msgstr "조성호 <shcho@gnome.org>"
+
+#: gnomemusic/about.py:246
+#| msgid "Copyright © 2018 GNOME Music Developers"
+msgid "Copyright The GNOME Music Developers"
+msgstr "Copyright The GNOME Music Developers"
+
+#: gnomemusic/about.py:249
+msgid "Translated by"
+msgstr "번역자"
+
 #. TRANSLATORS: this is a playlist name
 #: gnomemusic/grilowrappers/grltrackerplaylists.py:894
 msgid "Most Played"
@@ -563,7 +522,7 @@ msgstr "음악가 결과"
 msgid "Albums Results"
 msgstr "앨범 결과"
 
-#: gnomemusic/widgets/albumwidget.py:240
+#: gnomemusic/widgets/albumwidget.py:245
 msgid "{} minute"
 msgid_plural "{} minutes"
 msgstr[0] "{}분"
@@ -594,7 +553,7 @@ msgstr "{} 사용자로 로그인했습니다"
 msgid "Configure"
 msgstr "설정"
 
-#: gnomemusic/widgets/playertoolbar.py:165
+#: gnomemusic/widgets/playertoolbar.py:167
 msgid "Pause"
 msgstr "일시 정지"
 
@@ -603,6 +562,57 @@ msgid "{} Song"
 msgid_plural "{} Songs"
 msgstr[0] "노래 {}곡"
 
+#~ msgid "A music player and management application for GNOME."
+#~ msgstr "그놈용 음악 재생기 및 관리 프로그램."
+
+#~ msgid "Visit GNOME Music website"
+#~ msgstr "그놈 음악 웹사이트를 방문하세요"
+
+#~ msgid ""
+#~ "GNOME Music is free software; you can redistribute it and/or modify it "
+#~ "under the terms of the GNU General Public License as published by the "
+#~ "Free Software Foundation; either version 2 of the License, or (at your "
+#~ "option) any later version.\n"
+#~ "\n"
+#~ "GNOME Music is distributed in the hope that it will be useful, but "
+#~ "WITHOUT ANY WARRANTY; without even the implied warranty of "
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General "
+#~ "Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License along "
+#~ "with GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
+#~ "Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
+#~ "\n"
+#~ "The GNOME Music authors hereby grant permission for non-GPL compatible "
+#~ "GStreamer plugins to be used and distributed together with GStreamer and "
+#~ "GNOME Music.  This permission is above and beyond the permissions granted "
+#~ "by the GPL license by which GNOME Music is covered.  If you modify this "
+#~ "code, you may extend this exception to your version of the code, but you "
+#~ "are not obligated to do so.  If you do not wish to do so, delete this "
+#~ "exception statement from your version."
+#~ msgstr ""
+#~ "그놈 음악은 자유 소프트웨어 입니다. 자유 소프트웨어 재단이 발표한 GNU 일"
+#~ "반 공중 사용허가서 라이선스 버전 2 또는(여러분의 취향에 따라) 그 이상의 조"
+#~ "항에 따라 재배포 또는 수정할 수 있습니다.\n"
+#~ "\n"
+#~ "그놈 음악을 여러분께서 쓸모 있게 사용하길 바라며 배포하지만, 그 어떤 보증"
+#~ "을 하지 않으며 심지어 상업성 또는 일부 목적의 적합성에 대한 암시적 보증도 "
+#~ "하지 않습니다. 자세한 내용은 GNU 일반 공중 사용허가서를 참조하십시오.\n"
+#~ "\n"
+#~ "그놈 음악과 함께 GNU 일반 공중 사용허가서의 사본을 받아야 합니다. 만약 받"
+#~ "지 못했다면 Free Software Foundation, Inc., 51 Franklin Street, Fifth "
+#~ "Floor, Boston, MA 02110-1301 USA로 요청하십시오.\n"
+#~ "\n"
+#~ "그놈 음악 제작자는 비 GPL 호환 지스트리머 플러그인에 대한 사용을 허가 받았"
+#~ "으며, 지스트리머와 그놈 음악을 함께 배포합니다. 이 권한은 그놈 음악에 대"
+#~ "해 효력을 미치는 GNU 일반 공중 사용허가서에 따라 허가받습니다. 이 코드를 "
+#~ "수정하면, 여러분 버전의 코드에 이 예외를 확장할 수 있겠지만, 의무적인 것"
+#~ "은 아닙니다. 원치 않는다면 여러분의 코드 버전에서 예외 조항을 삭제하십시"
+#~ "오."
+
+#~ msgid "The contents of your Music Folder will appear here"
+#~ msgstr "음악 폴더의 내용은 여기에 나타납니다"
+
 #~ msgid "GNOME Music"
 #~ msgstr "그놈 음악"
 
diff --git a/po/lt.po b/po/lt.po
index 06c55568..c1e41faf 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,21 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-music master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-music/issues\n"
-"POT-Creation-Date: 2022-02-19 12:39+0000\n"
-"PO-Revision-Date: 2022-02-20 15:00+0200\n"
+"POT-Creation-Date: 2022-08-27 13:27+0000\n"
+"PO-Revision-Date: 2022-09-11 15:53+0300\n"
 "Last-Translator: Aurimas Černius <aurisc4@gmail.com>\n"
 "Language-Team: Lietuvių <gnome-lt@lists.akl.lt>\n"
 "Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
-"%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"(n%100<10 || n%100>=20) ? 1 : 2)\n"
 "X-Generator: Gtranslator 40.0\n"
 
 #: data/org.gnome.Music.appdata.xml.in.in:6
-#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/application.py:61
-#: gnomemusic/window.py:71
+#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/about.py:236
+#: gnomemusic/application.py:61 gnomemusic/window.py:71
 msgid "Music"
 msgstr "Muzika"
 
@@ -42,7 +42,7 @@ msgstr ""
 "Raskite takelius savo vietinėje kolekcijoje, naudokite automatiškai sukurtus "
 "grojaraščius arba kurkite naujus."
 
-#: data/org.gnome.Music.appdata.xml.in.in:149
+#: data/org.gnome.Music.appdata.xml.in.in:167
 msgid "The GNOME Music developers"
 msgstr "GNOME Muzikos kūrėjai"
 
@@ -115,78 +115,21 @@ msgid ""
 msgstr ""
 "Įjungia arba išjungia santraukų „šiuo metu grojama“ siuntimą į Last.fm."
 
-#: data/ui/AboutDialog.ui.in:9
-msgid "Copyright © 2018 GNOME Music Developers"
-msgstr "Autorių teisės © 2018 GNOME Muzikos kūrėjai"
-
-#: data/ui/AboutDialog.ui.in:10
-msgid "A music player and management application for GNOME."
-msgstr "Muzikos grotuvas ir tvarkymo programa GNOME aplinkai."
-
-#: data/ui/AboutDialog.ui.in:12
-msgid "Visit GNOME Music website"
-msgstr "Apsilankykite GNOME Muzikos tinklalapyje"
-
-#: data/ui/AboutDialog.ui.in:13
-msgid ""
-"GNOME Music is free software; you can redistribute it and/or modify it under "
-"the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"GNOME Music is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
-"\n"
-"The GNOME Music authors hereby grant permission for non-GPL compatible "
-"GStreamer plugins to be used and distributed together with GStreamer and "
-"GNOME Music.  This permission is above and beyond the permissions granted by "
-"the GPL license by which GNOME Music is covered.  If you modify this code, "
-"you may extend this exception to your version of the code, but you are not "
-"obligated to do so.  If you do not wish to do so, delete this exception "
-"statement from your version."
-msgstr ""
-"GNOME Muzika yra laisva programinė įranga; galite ją platinti ir(arba) "
-"keisti pagal GNU bendrosios viešosios licencijos (GPL) sąlygas, kaip jas "
-"pateikia Free Software Foundation; licencijos versija 2 arba (jūsų "
-"pasirinkta) bet kuri vėlesnė versija.\n"
-"\n"
-"GNOME Muzika yra platinama tikintis kad ji bus naudinga, bet BE JOKIŲ "
-"GARANTIJŲ; netgi be numanomų PREKYBINIŲ ar TINKAMUMO KONKREČIAM TIKSLUI "
-"garantijų.  Daugiau informacijos rasite GNU bendrojoje viešojoje "
-"licencijoje.\n"
-"\n"
-"Jūs turėjote gauti GNU bendrosios viešosios licencijos kopiją kartu su GNOME "
-"Muzika; jei negavote, parašykite Free Software Foundation, Inc., 51 Franklin "
-"Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
-"\n"
-"GNOME Muzikos autoriai taip pat leidžia kartu su GNOME Muzika ir GStreamer "
-"platinti ir naudoti su GStreamer suderinamus ne-GPL įskiepius.  Šis leidimas "
-"yra aukščiau ir plačiau GPL licencijos teikiamų leidimų, kurie galioja GNOME "
-"Muzikai.  Jei pakeisite šį kodą, galite šią išimtį pritaikyti savo kodo "
-"versijai, bet neprivalote to daryti.  Jei nepageidaujate, ištrinkite šį "
-"punktą iš savo versijos."
-
-#: data/ui/AlbumWidget.ui:86 data/ui/PlayerToolbar.ui:88
-#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:168
+#: data/ui/AlbumWidget.ui:84 data/ui/PlayerToolbar.ui:87
+#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:170
 msgid "Play"
 msgstr "Groti"
 
-#: data/ui/AlbumWidget.ui:132 data/ui/PlaylistControls.ui:5
+#: data/ui/AlbumWidget.ui:130 data/ui/PlaylistControls.ui:5
 #: data/ui/SongWidgetMenu.ui:11
 msgid "_Play"
 msgstr "_Groti"
 
-#: data/ui/AlbumWidget.ui:136
+#: data/ui/AlbumWidget.ui:134
 msgid "Add to _Favorite Songs"
 msgstr "Pridėti prie _mėgiamų dainų"
 
-#: data/ui/AlbumWidget.ui:140 data/ui/SongWidgetMenu.ui:15
+#: data/ui/AlbumWidget.ui:138 data/ui/SongWidgetMenu.ui:15
 msgid "_Add to Playlist…"
 msgstr "_Pridėti į grojaraštį…"
 
@@ -210,7 +153,7 @@ msgstr "_Žinynas"
 msgid "_About Music"
 msgstr "_Apie muziką"
 
-#: data/ui/EmptyView.ui:26 data/ui/InitialState.ui:13
+#: data/ui/EmptyView.ui:30
 msgid "Welcome to Music"
 msgstr "Sveiki pradėję naudoti Muziką"
 
@@ -222,7 +165,7 @@ msgstr "Meniu"
 msgid "Select"
 msgstr "Žymėti"
 
-#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:211
+#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:213
 #: data/ui/SearchHeaderBar.ui:20
 msgid "_Cancel"
 msgstr "_Atsisakyti"
@@ -320,11 +263,6 @@ msgctxt "shortcut window"
 msgid "Go back"
 msgstr "Grįžti"
 
-#: data/ui/InitialState.ui:25
-#| msgid "The contents of your {} will appear here."
-msgid "The contents of your Music Folder will appear here"
-msgstr "Čia matysite savo muzikos aplanko turinį"
-
 #: data/ui/LastfmDialog.ui:21
 msgid ""
 "Last.fm is a music discovery service that gives you personalised "
@@ -347,11 +285,11 @@ msgstr ""
 msgid "Login"
 msgstr "Prisijungti"
 
-#: data/ui/PlayerToolbar.ui:75
+#: data/ui/PlayerToolbar.ui:74
 msgid "Previous"
 msgstr "Ankstesnė"
 
-#: data/ui/PlayerToolbar.ui:107
+#: data/ui/PlayerToolbar.ui:106
 msgid "Next"
 msgstr "Kita"
 
@@ -387,11 +325,11 @@ msgstr "Naujas grojaraštis…"
 msgid "Add"
 msgstr "Pridėti"
 
-#: data/ui/PlaylistDialog.ui:200
+#: data/ui/PlaylistDialog.ui:202
 msgid "Add to Playlist"
 msgstr "Pridėti į grojaraštį"
 
-#: data/ui/PlaylistDialog.ui:220
+#: data/ui/PlaylistDialog.ui:222
 msgid "_Add"
 msgstr "_Pridėti"
 
@@ -403,7 +341,7 @@ msgstr "Atlikėjai"
 msgid "View All"
 msgstr "Rodyti viską"
 
-#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:54
+#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:56
 msgid "Albums"
 msgstr "Albumai"
 
@@ -428,10 +366,30 @@ msgid "_Add to Playlist"
 msgstr "_Pridėti į grojaraštį"
 
 #: data/ui/SongWidgetMenu.ui:19
-#| msgid "Remove From Playlist"
 msgid "_Remove from Playlist"
 msgstr "_Pašalinti iš grojaraščio"
 
+#: gnomemusic/about.py:238
+msgid "The GNOME Project"
+msgstr "GNOME projektas"
+
+#: gnomemusic/about.py:242
+msgid "translator-credits"
+msgstr ""
+"Išvertė:\n"
+"Aurimas Černius <aurisc4@gmail.com>"
+
+#: gnomemusic/about.py:246
+#| msgid "Copyright © 2018 GNOME Music Developers"
+msgid "Copyright The GNOME Music Developers"
+msgstr "Autorių teisės priklauso GNOME Muzikos kūrėjams"
+
+#: gnomemusic/about.py:249
+msgid "Translated by"
+msgstr ""
+"Išvertė:\n"
+"Aurimas Černius"
+
 #. TRANSLATORS: this is a playlist name
 #: gnomemusic/grilowrappers/grltrackerplaylists.py:894
 msgid "Most Played"
@@ -508,7 +466,6 @@ msgid "Playlist {} removed"
 msgstr "Grojaraštis {} pašalintas"
 
 #: gnomemusic/playlisttoast.py:56 gnomemusic/songtoast.py:65
-#| msgid "_Undo"
 msgid "Undo"
 msgstr "Atšaukti"
 
@@ -575,7 +532,7 @@ msgstr "Atlikėjų rezultatai"
 msgid "Albums Results"
 msgstr "Albumų rezultatai"
 
-#: gnomemusic/widgets/albumwidget.py:240
+#: gnomemusic/widgets/albumwidget.py:245
 msgid "{} minute"
 msgid_plural "{} minutes"
 msgstr[0] "{} minutė"
@@ -610,7 +567,7 @@ msgstr "Prisijungta kaip {}"
 msgid "Configure"
 msgstr "Nustatyti"
 
-#: gnomemusic/widgets/playertoolbar.py:165
+#: gnomemusic/widgets/playertoolbar.py:167
 msgid "Pause"
 msgstr "Pristabdyti"
 
@@ -621,6 +578,60 @@ msgstr[0] "{} daina"
 msgstr[1] "{} dainos"
 msgstr[2] "{} dainų"
 
+#~ msgid "A music player and management application for GNOME."
+#~ msgstr "Muzikos grotuvas ir tvarkymo programa GNOME aplinkai."
+
+#~ msgid "Visit GNOME Music website"
+#~ msgstr "Apsilankykite GNOME Muzikos tinklalapyje"
+
+#~ msgid ""
+#~ "GNOME Music is free software; you can redistribute it and/or modify it "
+#~ "under the terms of the GNU General Public License as published by the "
+#~ "Free Software Foundation; either version 2 of the License, or (at your "
+#~ "option) any later version.\n"
+#~ "\n"
+#~ "GNOME Music is distributed in the hope that it will be useful, but "
+#~ "WITHOUT ANY WARRANTY; without even the implied warranty of "
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General "
+#~ "Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License along "
+#~ "with GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
+#~ "Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
+#~ "\n"
+#~ "The GNOME Music authors hereby grant permission for non-GPL compatible "
+#~ "GStreamer plugins to be used and distributed together with GStreamer and "
+#~ "GNOME Music.  This permission is above and beyond the permissions granted "
+#~ "by the GPL license by which GNOME Music is covered.  If you modify this "
+#~ "code, you may extend this exception to your version of the code, but you "
+#~ "are not obligated to do so.  If you do not wish to do so, delete this "
+#~ "exception statement from your version."
+#~ msgstr ""
+#~ "GNOME Muzika yra laisva programinė įranga; galite ją platinti ir(arba) "
+#~ "keisti pagal GNU bendrosios viešosios licencijos (GPL) sąlygas, kaip jas "
+#~ "pateikia Free Software Foundation; licencijos versija 2 arba (jūsų "
+#~ "pasirinkta) bet kuri vėlesnė versija.\n"
+#~ "\n"
+#~ "GNOME Muzika yra platinama tikintis kad ji bus naudinga, bet BE JOKIŲ "
+#~ "GARANTIJŲ; netgi be numanomų PREKYBINIŲ ar TINKAMUMO KONKREČIAM TIKSLUI "
+#~ "garantijų.  Daugiau informacijos rasite GNU bendrojoje viešojoje "
+#~ "licencijoje.\n"
+#~ "\n"
+#~ "Jūs turėjote gauti GNU bendrosios viešosios licencijos kopiją kartu su "
+#~ "GNOME Muzika; jei negavote, parašykite Free Software Foundation, Inc., 51 "
+#~ "Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
+#~ "\n"
+#~ "GNOME Muzikos autoriai taip pat leidžia kartu su GNOME Muzika ir "
+#~ "GStreamer platinti ir naudoti su GStreamer suderinamus ne-GPL įskiepius.  "
+#~ "Šis leidimas yra aukščiau ir plačiau GPL licencijos teikiamų leidimų, "
+#~ "kurie galioja GNOME Muzikai.  Jei pakeisite šį kodą, galite šią išimtį "
+#~ "pritaikyti savo kodo versijai, bet neprivalote to daryti.  Jei "
+#~ "nepageidaujate, ištrinkite šį punktą iš savo versijos."
+
+#~| msgid "The contents of your {} will appear here."
+#~ msgid "The contents of your Music Folder will appear here"
+#~ msgstr "Čia matysite savo muzikos aplanko turinį"
+
 #~ msgid "GNOME Music"
 #~ msgstr "GNOME muzika"
 
diff --git a/po/lv.po b/po/lv.po
index b0be0381..c89ef1c1 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-music/issues\n"
-"POT-Creation-Date: 2022-02-19 12:39+0000\n"
-"PO-Revision-Date: 2022-03-24 22:31+0200\n"
+"POT-Creation-Date: 2022-08-27 13:27+0000\n"
+"PO-Revision-Date: 2022-09-06 06:04+0300\n"
 "Last-Translator: Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>\n"
 "Language-Team: Latvian <lata-l10n@googlegroups.com>\n"
 "Language: lv\n"
@@ -16,11 +16,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 :"
 " 2);\n"
-"X-Generator: Lokalize 21.08.1\n"
+"X-Generator: Lokalize 21.12.3\n"
 
 #: data/org.gnome.Music.appdata.xml.in.in:6
-#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/application.py:61
-#: gnomemusic/window.py:71
+#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/about.py:236
+#: gnomemusic/application.py:61 gnomemusic/window.py:71
 msgid "Music"
 msgstr "Mūzika"
 
@@ -41,7 +41,7 @@ msgstr ""
 "Atrodi celiņus savā lokālajā kolekcijā, automātiski veido repertuārus vai "
 "izveido jaunus."
 
-#: data/org.gnome.Music.appdata.xml.in.in:149
+#: data/org.gnome.Music.appdata.xml.in.in:167
 msgid "The GNOME Music developers"
 msgstr "GNOME Mūzikas izstrādātāji"
 
@@ -115,77 +115,21 @@ msgstr ""
 "Ieslēdz vai izslēdz scrobbles un “palšaik atskaņo” informācijas sūtīšanu uz "
 "Last.fm."
 
-#: data/ui/AboutDialog.ui.in:9
-msgid "Copyright © 2018 GNOME Music Developers"
-msgstr "Autortiesības © 2018 GNOME Mūzikas izstrādātāji"
-
-#: data/ui/AboutDialog.ui.in:10
-msgid "A music player and management application for GNOME."
-msgstr "Mūzikas atskaņošanas un pārvaldības lietotne GNOME vidē."
-
-#: data/ui/AboutDialog.ui.in:12
-msgid "Visit GNOME Music website"
-msgstr "Apmeklēt GNOME Mūzikas tīmekļa vietni"
-
-#: data/ui/AboutDialog.ui.in:13
-msgid ""
-"GNOME Music is free software; you can redistribute it and/or modify it under "
-"the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"GNOME Music is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
-"\n"
-"The GNOME Music authors hereby grant permission for non-GPL compatible "
-"GStreamer plugins to be used and distributed together with GStreamer and "
-"GNOME Music.  This permission is above and beyond the permissions granted by "
-"the GPL license by which GNOME Music is covered.  If you modify this code, "
-"you may extend this exception to your version of the code, but you are not "
-"obligated to do so.  If you do not wish to do so, delete this exception "
-"statement from your version."
-msgstr ""
-"GNOME Mūzika ir brīvā programmatūra; jūs varat izplatīt un/vai modificēt to "
-"saskaņā ar GNU Vispārējās Publiskās Licences 2. vai kādas vēlākas versijas "
-"noteikumiem.\n"
-"\n"
-"GNOME Mūzika tiek izplatīts ar cerību, ka tas būs noderīgs. Tas tiek "
-"izplatīts BEZ jebkādas garantijas vai iekļautas ražotāja atbildības par šo "
-"produktu. Sīkāku informāciju meklējiet GNU Vispārējās Publiskās Licences "
-"tekstā.\n"
-"GNU Vispārējās Publiskās Licence ir pieejama kopā ar GNOME Mūzika "
-"instalāciju. Ja tā jums nav pieejama, jūs to varat iegūt no Free Software "
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 "
-"USA.\n"
-"\n"
-"GNOME Mūzika autori dod tiesības ar GPL nesavietojamiem GStreamer spraudņiem "
-"tik izplatītiem kopā ar GStreamer un GNOME Mūziku. Šīs tiesības ir plašākas "
-"kā tās, ko sniedz GPL licence, ko izmanto GNOME Mūzika. Ja vēlaties mainīt "
-"šo kodu, jūs varat šo izņēmumu attiecināt arī uz savas programmas pirmkodu, "
-"bet jums nav pienākuma to darīt. Ja nevēlaties iekļaut izņēmumu, izdzēsiet "
-"šo izņēmuma teikumu no savas versijas."
-
-#: data/ui/AlbumWidget.ui:86 data/ui/PlayerToolbar.ui:88
-#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:168
+#: data/ui/AlbumWidget.ui:84 data/ui/PlayerToolbar.ui:87
+#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:170
 msgid "Play"
 msgstr "Atskaņot"
 
-#: data/ui/AlbumWidget.ui:132 data/ui/PlaylistControls.ui:5
+#: data/ui/AlbumWidget.ui:130 data/ui/PlaylistControls.ui:5
 #: data/ui/SongWidgetMenu.ui:11
 msgid "_Play"
 msgstr "_Atskaņot"
 
-#: data/ui/AlbumWidget.ui:136
+#: data/ui/AlbumWidget.ui:134
 msgid "Add to _Favorite Songs"
 msgstr "Pievienot _iecienītajām dziesmām"
 
-#: data/ui/AlbumWidget.ui:140 data/ui/SongWidgetMenu.ui:15
+#: data/ui/AlbumWidget.ui:138 data/ui/SongWidgetMenu.ui:15
 msgid "_Add to Playlist…"
 msgstr "_Pievienot repertuāram…"
 
@@ -209,7 +153,7 @@ msgstr "_Palīdzība"
 msgid "_About Music"
 msgstr "P_ar mūziku"
 
-#: data/ui/EmptyView.ui:26 data/ui/InitialState.ui:13
+#: data/ui/EmptyView.ui:30
 msgid "Welcome to Music"
 msgstr "Laipni lūdzam Mūzikā"
 
@@ -221,7 +165,7 @@ msgstr "Izvēlne"
 msgid "Select"
 msgstr "Izvēlēties"
 
-#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:211
+#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:213
 #: data/ui/SearchHeaderBar.ui:20
 msgid "_Cancel"
 msgstr "At_celt"
@@ -319,11 +263,6 @@ msgctxt "shortcut window"
 msgid "Go back"
 msgstr "Iet atpakaļ"
 
-#: data/ui/InitialState.ui:25
-#| msgid "The contents of your {} will appear here."
-msgid "The contents of your Music Folder will appear here"
-msgstr "Jūsu mūzikas mapes saturs parādīsies šeit"
-
 #: data/ui/LastfmDialog.ui:21
 msgid ""
 "Last.fm is a music discovery service that gives you personalised "
@@ -345,11 +284,11 @@ msgstr ""
 msgid "Login"
 msgstr "Ierakstīties"
 
-#: data/ui/PlayerToolbar.ui:75
+#: data/ui/PlayerToolbar.ui:74
 msgid "Previous"
 msgstr "Iepriekšējais"
 
-#: data/ui/PlayerToolbar.ui:107
+#: data/ui/PlayerToolbar.ui:106
 msgid "Next"
 msgstr "Nākamais"
 
@@ -385,11 +324,11 @@ msgstr "Jauns repertuārs…"
 msgid "Add"
 msgstr "Pievienot"
 
-#: data/ui/PlaylistDialog.ui:200
+#: data/ui/PlaylistDialog.ui:202
 msgid "Add to Playlist"
 msgstr "Pievienot repertuāram"
 
-#: data/ui/PlaylistDialog.ui:220
+#: data/ui/PlaylistDialog.ui:222
 msgid "_Add"
 msgstr "_Pievienot"
 
@@ -401,7 +340,7 @@ msgstr "Izpildītāji"
 msgid "View All"
 msgstr "Rādīt visu"
 
-#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:54
+#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:56
 msgid "Albums"
 msgstr "Albumi"
 
@@ -426,10 +365,26 @@ msgid "_Add to Playlist"
 msgstr "_Pievienot repertuāram"
 
 #: data/ui/SongWidgetMenu.ui:19
-#| msgid "Remove From Playlist"
 msgid "_Remove from Playlist"
 msgstr "Izņemt no _repertuāra"
 
+#: gnomemusic/about.py:238
+msgid "The GNOME Project"
+msgstr "GNOME projekts"
+
+#: gnomemusic/about.py:242
+msgid "translator-credits"
+msgstr "Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>"
+
+#: gnomemusic/about.py:246
+#| msgid "Copyright © 2018 GNOME Music Developers"
+msgid "Copyright The GNOME Music Developers"
+msgstr "Autortiesības pieder GNOME Mūzikas izstrādātājiem"
+
+#: gnomemusic/about.py:249
+msgid "Translated by"
+msgstr "Tulkojuši"
+
 #. TRANSLATORS: this is a playlist name
 #: gnomemusic/grilowrappers/grltrackerplaylists.py:894
 msgid "Most Played"
@@ -506,7 +461,6 @@ msgid "Playlist {} removed"
 msgstr "Repertuāra {} ir izņemts"
 
 #: gnomemusic/playlisttoast.py:56 gnomemusic/songtoast.py:65
-#| msgid "_Undo"
 msgid "Undo"
 msgstr "Atsaukt"
 
@@ -572,7 +526,7 @@ msgstr "Izpildītāju rezultāti"
 msgid "Albums Results"
 msgstr "Albumu rezultāti"
 
-#: gnomemusic/widgets/albumwidget.py:240
+#: gnomemusic/widgets/albumwidget.py:245
 msgid "{} minute"
 msgid_plural "{} minutes"
 msgstr[0] "{} minūte"
@@ -607,7 +561,7 @@ msgstr "Ierakstījies kā {}"
 msgid "Configure"
 msgstr "Konfigurēt"
 
-#: gnomemusic/widgets/playertoolbar.py:165
+#: gnomemusic/widgets/playertoolbar.py:167
 msgid "Pause"
 msgstr "Pauzēt"
 
@@ -618,6 +572,60 @@ msgstr[0] "{} dziesma"
 msgstr[1] "{} dziesmas"
 msgstr[2] "{} dziesmu"
 
+#~ msgid "A music player and management application for GNOME."
+#~ msgstr "Mūzikas atskaņošanas un pārvaldības lietotne GNOME vidē."
+
+#~ msgid "Visit GNOME Music website"
+#~ msgstr "Apmeklēt GNOME Mūzikas tīmekļa vietni"
+
+#~ msgid ""
+#~ "GNOME Music is free software; you can redistribute it and/or modify it "
+#~ "under the terms of the GNU General Public License as published by the "
+#~ "Free Software Foundation; either version 2 of the License, or (at your "
+#~ "option) any later version.\n"
+#~ "\n"
+#~ "GNOME Music is distributed in the hope that it will be useful, but "
+#~ "WITHOUT ANY WARRANTY; without even the implied warranty of "
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General "
+#~ "Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License along "
+#~ "with GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
+#~ "Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
+#~ "\n"
+#~ "The GNOME Music authors hereby grant permission for non-GPL compatible "
+#~ "GStreamer plugins to be used and distributed together with GStreamer and "
+#~ "GNOME Music.  This permission is above and beyond the permissions granted "
+#~ "by the GPL license by which GNOME Music is covered.  If you modify this "
+#~ "code, you may extend this exception to your version of the code, but you "
+#~ "are not obligated to do so.  If you do not wish to do so, delete this "
+#~ "exception statement from your version."
+#~ msgstr ""
+#~ "GNOME Mūzika ir brīvā programmatūra; jūs varat izplatīt un/vai modificēt "
+#~ "to saskaņā ar GNU Vispārējās Publiskās Licences 2. vai kādas vēlākas "
+#~ "versijas noteikumiem.\n"
+#~ "\n"
+#~ "GNOME Mūzika tiek izplatīts ar cerību, ka tas būs noderīgs. Tas tiek "
+#~ "izplatīts BEZ jebkādas garantijas vai iekļautas ražotāja atbildības par "
+#~ "šo produktu. Sīkāku informāciju meklējiet GNU Vispārējās Publiskās "
+#~ "Licences tekstā.\n"
+#~ "GNU Vispārējās Publiskās Licence ir pieejama kopā ar GNOME Mūzika "
+#~ "instalāciju. Ja tā jums nav pieejama, jūs to varat iegūt no Free Software "
+#~ "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 "
+#~ "USA.\n"
+#~ "\n"
+#~ "GNOME Mūzika autori dod tiesības ar GPL nesavietojamiem GStreamer "
+#~ "spraudņiem tik izplatītiem kopā ar GStreamer un GNOME Mūziku. Šīs "
+#~ "tiesības ir plašākas kā tās, ko sniedz GPL licence, ko izmanto GNOME "
+#~ "Mūzika. Ja vēlaties mainīt šo kodu, jūs varat šo izņēmumu attiecināt arī "
+#~ "uz savas programmas pirmkodu, bet jums nav pienākuma to darīt. Ja "
+#~ "nevēlaties iekļaut izņēmumu, izdzēsiet šo izņēmuma teikumu no savas "
+#~ "versijas."
+
+#~| msgid "The contents of your {} will appear here."
+#~ msgid "The contents of your Music Folder will appear here"
+#~ msgstr "Jūsu mūzikas mapes saturs parādīsies šeit"
+
 #~ msgid "GNOME Music"
 #~ msgstr "GNOME Mūzika"
 
diff --git a/po/ne.po b/po/ne.po
index 4c40aefd..8230c8b4 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -6,346 +6,638 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-music gnome 3.14\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"music&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-09-18 07:05+0000\n"
-"PO-Revision-Date: 2014-09-18 13:32+0400\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-music/issues\n"
+"POT-Creation-Date: 2022-08-27 13:27+0000\n"
+"PO-Revision-Date: 2022-09-08 02:34+0545\n"
 "Last-Translator: Pawan Chitrakar <chautari@gmail.com>\n"
 "Language-Team: Nepali Translation Team <chautari@gmail.com>\n"
+"Language: ne\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.6.9\n"
-"Language: ne\n"
+"X-Generator: Poedit 3.0.1\n"
+
+#: data/org.gnome.Music.appdata.xml.in.in:6 data/org.gnome.Music.desktop.in.in:3
+#: gnomemusic/about.py:236 gnomemusic/application.py:61 gnomemusic/window.py:71
+msgid "Music"
+msgstr "सङ्गीत"
+
+#: data/org.gnome.Music.appdata.xml.in.in:7 data/org.gnome.Music.desktop.in.in:5
+msgid "Play and organize your music collection"
+msgstr "तपाईँको सङ्गीत सङ्ग्रह बजाउनुहोस् र सङ्गठित गर्नुहोस्"
+
+#: data/org.gnome.Music.appdata.xml.in.in:9
+msgid "An easy and pleasant way to play your music."
+msgstr "तपाईंको संगीत बजाउने सजिलो र रमाइलो तरिका।"
+
+#: data/org.gnome.Music.appdata.xml.in.in:12
+msgid ""
+"Find tracks in your local collection, use automatically generated playlists or curate a "
+"fresh one."
+msgstr ""
+"तपाईँको स्थानीय सङ्कलनमा ट्रयाकहरू फेला पार्नुहोस्, स्वचालित रूपमा सिर्जना गरिएको बजाउने सूची प्रयोग "
+"गर्नुहोस् वा नया सिर्जना गर्नुहोस् ।"
 
-#: ../data/org.gnome.Music.gschema.xml.h:1
+#: data/org.gnome.Music.appdata.xml.in.in:167
+msgid "The GNOME Music developers"
+msgstr "जिनोम सङ्गीत विकासकर्ता"
+
+#: data/org.gnome.Music.desktop.in.in:4
+msgid "Music Player"
+msgstr "सङ्गीत बजाउने"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/org.gnome.Music.desktop.in.in:13
+msgid "Music;Player;"
+msgstr "सङ्गीत प्लेयर."
+
+#: data/org.gnome.Music.gschema.xml:12
 msgid "Window size"
 msgstr "सञ्झ्याल साइज"
 
-#: ../data/org.gnome.Music.gschema.xml.h:2
+#: data/org.gnome.Music.gschema.xml:13
 msgid "Window size (width and height)."
-msgstr "सञ्झ्यालको उचाइ र चौडाई"
-
-#: ../data/org.gnome.Music.gschema.xml.h:3
-msgid "Window position"
-msgstr "सञ्झ्यालको स्थिति"
+msgstr "सञ्झ्यालको उचाइ र चौडाई."
 
-#: ../data/org.gnome.Music.gschema.xml.h:4
-msgid "Window position (x and y)."
-msgstr "सञ्झ्यालको  स्थान(X र Y)."
-
-#: ../data/org.gnome.Music.gschema.xml.h:5
+#: data/org.gnome.Music.gschema.xml:17
 msgid "Window maximized"
 msgstr "सञ्झ्यालको अधिकतम स्थिति"
 
-#: ../data/org.gnome.Music.gschema.xml.h:6
+#: data/org.gnome.Music.gschema.xml:18
 msgid "Window maximized state."
-msgstr "सञ्झ्यालको अधिकतम स्थिति"
+msgstr "सञ्झ्यालको अधिकतम स्थिति."
 
-#: ../data/org.gnome.Music.gschema.xml.h:7
+#: data/org.gnome.Music.gschema.xml:22
 msgid "Playback repeat mode"
 msgstr "मोड दोहोर्याउनुहोस्"
 
 #. Translators: Don't translate allowed values, just the description in the brackets
-#: ../data/org.gnome.Music.gschema.xml.h:9
+#: data/org.gnome.Music.gschema.xml:24
 msgid ""
-"Value identifies whether to repeat or randomize playback through the "
-"collection. Allowed values are: \"none\" (repeat and shuffle are off), \"song"
-"\" (repeat current song), \"all\" (repeat playlist, no shuffle), \"shuffle"
-"\" (shuffle playlist, presumes repeat all)."
+"Value identifies whether to repeat or randomize playback through the collection. Allowed "
+"values are: “none” (repeat and shuffle are off), “song” (repeat current song), "
+"“all” (repeat playlist, no shuffle), “shuffle” (shuffle playlist, presumes repeat all)."
 msgstr ""
+"मानले संग्रहको माध्यमबाट प्लेब्याक दोहोर्याउने वा अनियमित गर्ने कि नगर्ने पहिचान गर्दछ। अनुमति प्राप्त "
+"मानहरू हुन्: \"कुनै पनि छैन\" (पुनरावृत्ति र शफल बन्द छन्), \"गीत\" (पुनरावृत्ति हालको गीत), \"सबै"
+"\" (प्लेलिस्ट दोहोर्याउनुहोस्, कुनै शफल छैन), \"शफल\" (शफल प्लेलिस्ट, सबै दोहोर्याउनुहोस् अनुमान गर्नुहोस्)।"
 
-#: ../data/org.gnome.Music.gschema.xml.h:10
-#, fuzzy
-msgid "Search mode"
-msgstr "मोड:"
+#: data/org.gnome.Music.gschema.xml:28
+msgid "Enable ReplayGain"
+msgstr "पुन: प्लेगेन सक्षम पार्नुहोस्"
 
-#: ../data/org.gnome.Music.gschema.xml.h:11
-#, fuzzy
-msgid "If true, the search bar is shown."
-msgstr "विण्डो टास्कबारमा छैनभने ठीक "
+#: data/org.gnome.Music.gschema.xml:29
+msgid "Enables or disables ReplayGain for albums"
+msgstr "एल्बमका लागि पुन: प्लेगेन सक्षम वा अक्षम पार्दछ"
 
-#: ../data/gnome-music.desktop.in.h:1 ../gnomemusic/application.py:50
-#: ../gnomemusic/application.py:112 ../gnomemusic/window.py:62
-#: ../data/AboutDialog.ui.in.h:1
-msgid "Music"
-msgstr "सङ्गित"
+#: data/org.gnome.Music.gschema.xml:33
+msgid "Inhibit system suspend"
+msgstr "प्रणाली निलम्बन रोक्नुहोस्"
 
-#: ../data/gnome-music.desktop.in.h:2
-msgid "Music Player"
-msgstr "सङ्गित बजाउने"
+#: data/org.gnome.Music.gschema.xml:34
+msgid "Enables or disables inhibiting system suspend while playing music"
+msgstr "सङ्गीत बजाउँदा अवरोध प्रणाली निलम्बन सक्षम वा अक्षम पार्दछ"
 
-#: ../data/gnome-music.desktop.in.h:3 ../data/gnome-music.appdata.xml.in.h:2
-msgid "Play and organize your music collection"
-msgstr ""
+#: data/org.gnome.Music.gschema.xml:38
+msgid "Report music history to Last.fm"
+msgstr "Last.fm सङ्गीत इतिहास प्रतिवेदन गर्नुहोस्"
+
+#: data/org.gnome.Music.gschema.xml:39
+msgid "Enables or disables sending scrobbles and the “currently playing” info to Last.fm."
+msgstr "Last.fm पठाउन स्क्रोब्ल्स र \"हालै बजिरहेको\" सूचना सक्षम वा असक्षम पार्दछ ।"
+
+#: data/ui/AlbumWidget.ui:84 data/ui/PlayerToolbar.ui:87 data/ui/PlaylistControls.ui:101
+#: gnomemusic/widgets/playertoolbar.py:170
+msgid "Play"
+msgstr "प्ले गर्नुहोस्"
+
+#: data/ui/AlbumWidget.ui:130 data/ui/PlaylistControls.ui:5 data/ui/SongWidgetMenu.ui:11
+msgid "_Play"
+msgstr "प्ले गर्नुहोस्"
+
+#: data/ui/AlbumWidget.ui:134
+msgid "Add to _Favorite Songs"
+msgstr "मनपर्ने गीतहरू थप्नुहोस्"
+
+#: data/ui/AlbumWidget.ui:138 data/ui/SongWidgetMenu.ui:15
+msgid "_Add to Playlist…"
+msgstr "बजाइने सुचिमा थप्नुहोस्…"
+
+#: data/ui/AppMenu.ui:23 data/ui/LastfmDialog.ui:8
+msgid "Last.fm Account"
+msgstr "Last.fm खाता"
+
+#: data/ui/AppMenu.ui:36
+msgid "Report Music Listening"
+msgstr "सङ्गीत सुन्ने प्रतिवेदन गर्नुहोस्"
+
+#: data/ui/AppMenu.ui:58
+msgid "_Keyboard Shortcuts"
+msgstr "कुञ्जीपाटी सर्टकट"
+
+#: data/ui/AppMenu.ui:68
+msgid "_Help"
+msgstr "सहयोग"
+
+#: data/ui/AppMenu.ui:78
+msgid "_About Music"
+msgstr "सङ्गीत बारेमा"
+
+#: data/ui/EmptyView.ui:30
+msgid "Welcome to Music"
+msgstr "सङ्गीतमा स्वागत छ"
 
-#: ../data/gnome-music.appdata.xml.in.h:1
-msgid "GNOME Music"
-msgstr "जिनोम सङ्गित"
+#: data/ui/HeaderBar.ui:16
+msgid "Menu"
+msgstr "सूची"
 
-#: ../data/gnome-music.appdata.xml.in.h:3
-msgid "Music is the new GNOME music playing application."
+#: data/ui/HeaderBar.ui:24 data/ui/SearchHeaderBar.ui:15
+msgid "Select"
+msgstr "चयन गर्नुहोस्"
+
+#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:213 data/ui/SearchHeaderBar.ui:20
+msgid "_Cancel"
+msgstr "_रद्द"
+
+#: data/ui/HeaderBar.ui:42 data/ui/SearchHeaderBar.ui:32
+msgid "Search"
+msgstr "खोजी"
+
+#: data/ui/HeaderBar.ui:50
+msgid "Back"
+msgstr "पछाडि"
+
+#: data/ui/help-overlay.ui:11
+msgctxt "shortcut window"
+msgid "General"
+msgstr "सामान्य"
+
+#: data/ui/help-overlay.ui:14
+msgctxt "shortcut window"
+msgid "Close window"
+msgstr "सञ्झ्याल बन्द गर्नुहोस्"
+
+#: data/ui/help-overlay.ui:20
+msgctxt "shortcut window"
+msgid "Search"
+msgstr "खोज"
+
+#: data/ui/help-overlay.ui:26
+msgctxt "shortcut window"
+msgid "Help"
+msgstr "मद्दत"
+
+#: data/ui/help-overlay.ui:32
+msgctxt "shortcut window"
+msgid "Shortcuts"
+msgstr "सर्टकटहरू"
+
+#: data/ui/help-overlay.ui:40
+msgctxt "shortcut window"
+msgid "Playback"
+msgstr "प्लेब्याक"
+
+#: data/ui/help-overlay.ui:43
+msgctxt "shortcut window"
+msgid "Play/Pause"
+msgstr "प्ले/पज गर्नुहोस्"
+
+#: data/ui/help-overlay.ui:49
+msgctxt "shortcut window"
+msgid "Next song"
+msgstr "अर्को गीत"
+
+#: data/ui/help-overlay.ui:55
+msgctxt "shortcut window"
+msgid "Previous song"
+msgstr "_अघिल्लो गीत"
+
+#: data/ui/help-overlay.ui:61
+msgctxt "shortcut window"
+msgid "Toggle repeat"
+msgstr "दोहोर्याउने टगल गर्नुहोस्"
+
+#: data/ui/help-overlay.ui:67
+msgctxt "shortcut window"
+msgid "Toggle shuffle"
+msgstr "फेरबदल टगल गर्नुहोस्"
+
+#: data/ui/help-overlay.ui:75
+msgctxt "shortcut window"
+msgid "Navigation"
+msgstr "नेभिगेशन"
+
+#: data/ui/help-overlay.ui:78
+msgctxt "shortcut window"
+msgid "Go to Albums"
+msgstr "एल्बममा जानुहोस्"
+
+#: data/ui/help-overlay.ui:84
+msgctxt "shortcut window"
+msgid "Go to Artists"
+msgstr "कलाकारहरू मा जानुहोस्"
+
+#: data/ui/help-overlay.ui:90
+msgctxt "shortcut window"
+msgid "Go to Songs"
+msgstr "गीतहरूमा जानुहोस्"
+
+#: data/ui/help-overlay.ui:96
+msgctxt "shortcut window"
+msgid "Go to Playlists"
+msgstr "बजाइने सुचिमा जानुहोस्"
+
+#: data/ui/help-overlay.ui:102
+msgctxt "shortcut window"
+msgid "Go back"
+msgstr "पछाडी जानुहोस्"
+
+#: data/ui/LastfmDialog.ui:21
+msgid ""
+"Last.fm is a music discovery service that gives you personalised recommendations based "
+"on the music you listen to."
 msgstr ""
+"Last.fm एउटा सङ्गीत आविष्कार सेवा हो जसले तपाईँले सुन्नुभएको सङ्गीतको आधारमा व्यक्तिगत सिफारिस दिन्छ।"
 
-#: ../gnomemusic/albumArtCache.py:100 ../gnomemusic/albumArtCache.py:108
-msgid "Untitled"
-msgstr "शीर्षक नदिएको"
-
-#: ../gnomemusic/mpris.py:133 ../gnomemusic/notification.py:100
-#: ../gnomemusic/player.py:400 ../gnomemusic/view.py:574
-#: ../gnomemusic/view.py:961 ../gnomemusic/view.py:1290
-msgid "Unknown Album"
-msgstr "अज्ञात एल्बम:"
-
-#: ../gnomemusic/mpris.py:149 ../gnomemusic/notification.py:98
-#: ../gnomemusic/player.py:391 ../gnomemusic/view.py:283
-#: ../gnomemusic/view.py:483 ../gnomemusic/view.py:717
-#: ../gnomemusic/view.py:1065 ../gnomemusic/view.py:1288
-#: ../gnomemusic/view.py:1319 ../gnomemusic/widgets.py:181
-#: ../gnomemusic/widgets.py:560
-msgid "Unknown Artist"
-msgstr "अज्ञात कलाकार:"
+#: data/ui/LastfmDialog.ui:31 gnomemusic/widgets/lastfmdialog.py:57
+msgid "Music Reporting Not Setup"
+msgstr "सङ्गीत रिपोर्टिङ सेटअप छैन"
 
-#: ../gnomemusic/notification.py:89
-msgid "Not playing"
-msgstr "बजेन"
+#: data/ui/LastfmDialog.ui:44 gnomemusic/widgets/lastfmdialog.py:60
+msgid "Login to your Last.fm account to report your music listening."
+msgstr "तपाईँको सङ्गीत सुन्न प्रतिवेदन गर्न तपाईँको Last.fm खातामा लगइन गर्नुहोस् ।"
 
-#. TRANSLATORS: by refers to the artist, from to the album
-#: ../gnomemusic/notification.py:104
-#, python-format
-msgid "by %s, from %s"
-msgstr "%s बाट %s देखि"
+#: data/ui/LastfmDialog.ui:55 gnomemusic/widgets/lastfmdialog.py:58
+msgid "Login"
+msgstr "लगइन"
 
-#: ../gnomemusic/notification.py:125 ../data/PlayerToolbar.ui.h:5
+#: data/ui/PlayerToolbar.ui:74
 msgid "Previous"
 msgstr "अघिल्लो"
 
-#: ../gnomemusic/notification.py:128 ../gnomemusic/player.py:348
-msgid "Pause"
-msgstr "पज गर्नुहोस्"
+#: data/ui/PlayerToolbar.ui:106
+msgid "Next"
+msgstr "पछिल्लो"
 
-#: ../gnomemusic/notification.py:131 ../gnomemusic/player.py:351
-#: ../data/PlayerToolbar.ui.h:6
-msgid "Play"
-msgstr "प्ले गर्नुहोस्"
+#: data/ui/PlaylistControls.ui:9
+msgid "_Delete"
+msgstr "मेट्नुहोस्"
 
-#: ../gnomemusic/notification.py:133 ../data/PlayerToolbar.ui.h:7
-msgid "Next"
-msgstr "पछिल्लो:"
-
-#: ../gnomemusic/searchbar.py:30 ../gnomemusic/searchbar.py:73
-msgid "All"
-msgstr "सबै"
-
-#: ../gnomemusic/searchbar.py:31
-msgid "Artist"
-msgstr "कलाकार:"
-
-#: ../gnomemusic/searchbar.py:32
-msgid "Album"
-msgstr "एल्बम:"
-
-#: ../gnomemusic/searchbar.py:33
-msgid "Track Title"
-msgstr "गाना शीर्षक"
-
-#: ../gnomemusic/searchbar.py:74
-msgid "Local"
-msgstr "स्थानीय"
-
-#: ../gnomemusic/searchbar.py:176
-msgid "Sources"
-msgstr "स्रोत"
-
-#: ../gnomemusic/searchbar.py:183
-msgid "Match"
-msgstr "सबै मिलाउनुहोस्"
-
-#: ../gnomemusic/view.py:198 ../gnomemusic/widgets.py:222
-#: ../gnomemusic/widgets.py:439 ../gnomemusic/window.py:278
-#, python-format
-msgid "Selected %d item"
-msgid_plural "Selected %d items"
-msgstr[0] "%d बस्तु चयन भयो"
-msgstr[1] "%d बस्तु चयन भयो"
-
-#: ../gnomemusic/view.py:200 ../gnomemusic/widgets.py:224
-#: ../gnomemusic/widgets.py:441 ../gnomemusic/window.py:282
-#: ../gnomemusic/window.py:294 ../data/headerbar.ui.h:3
-msgid "Click on items to select them"
-msgstr "वस्तुहरू चयनका लागि क्लिक गर्नुहोस्"
+#: data/ui/PlaylistControls.ui:13
+msgid "_Rename…"
+msgstr "पुन: नामाकरण गर्नुहोस्…"
 
-#: ../gnomemusic/view.py:337
-#, python-format
-msgid ""
-"No Music found!\n"
-" Put some files into the folder %s"
-msgstr ""
+#: data/ui/PlaylistControls.ui:28
+msgid "Playlist Name"
+msgstr "बजाउने सूची नाम"
+
+#: data/ui/PlaylistControls.ui:62
+msgid "_Done"
+msgstr "गरियो"
+
+#: data/ui/PlaylistDialog.ui:52
+msgid "Enter a name for your first playlist"
+msgstr "तपाईँको पहिलो बजाउने सूचीका लागि नाम प्रविष्ट गर्नुहोस्"
+
+#: data/ui/PlaylistDialog.ui:77
+msgid "C_reate"
+msgstr "सिर्जना गर्नुहोस्"
+
+#: data/ui/PlaylistDialog.ui:146
+msgid "New Playlist…"
+msgstr "नया बजाउने सूची…"
 
-#: ../gnomemusic/view.py:345 ../gnomemusic/view.py:1534
+#: data/ui/PlaylistDialog.ui:161
+msgid "Add"
+msgstr "थप्नुहोस्"
+
+#: data/ui/PlaylistDialog.ui:202
+msgid "Add to Playlist"
+msgstr "बजाइने सुचिमा थप्नुहोस्"
+
+#: data/ui/PlaylistDialog.ui:222
+msgid "_Add"
+msgstr "थप्नुहोस्"
+
+#: data/ui/SearchView.ui:33 gnomemusic/views/artistsview.py:51
+msgid "Artists"
+msgstr "कलाकारहरू"
+
+#: data/ui/SearchView.ui:42 data/ui/SearchView.ui:84
+msgid "View All"
+msgstr "सबै हेर्नुहोस्"
+
+#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:56
 msgid "Albums"
 msgstr "एल्बमहरू"
 
-#: ../gnomemusic/view.py:427 ../gnomemusic/view.py:1536
+#: data/ui/SearchView.ui:117 gnomemusic/views/songsview.py:52
 msgid "Songs"
-msgstr "गीतहरू "
+msgstr "गीतहरू"
 
-#: ../gnomemusic/view.py:591 ../gnomemusic/view.py:1535
-msgid "Artists"
-msgstr "कलाकारहरू"
+#: data/ui/SelectionBarMenuButton.ui:7
+msgid "Select All"
+msgstr "सबै छान्नुहोस्"
 
-#: ../gnomemusic/view.py:636 ../gnomemusic/view.py:638
-#: ../gnomemusic/widgets.py:448
-msgid "All Artists"
-msgstr "कलाकारहरू"
+#: data/ui/SelectionBarMenuButton.ui:11
+msgid "Select None"
+msgstr "कुनै पनि चयन नगर्नुहोस्"
+
+#: data/ui/SelectionBarMenuButton.ui:19 gnomemusic/widgets/headerbar.py:69
+msgid "Click on items to select them"
+msgstr "वस्तुहरू चयनका लागि क्लिक गर्नुहोस्"
+
+#: data/ui/SelectionToolbar.ui:8
+msgid "_Add to Playlist"
+msgstr "बजाइने सुचिमा थप्नुहोस्"
+
+#: data/ui/SongWidgetMenu.ui:19
+msgid "_Remove from Playlist"
+msgstr "बजाउने सूची हटाउनुहोस्"
+
+#: gnomemusic/about.py:238
+msgid "The GNOME Project"
+msgstr "जिनोम परियोजना"
+
+#: gnomemusic/about.py:242
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Michael Terry https://launchpad.net/~mterry\n"
+"  Yogesh Ojha https://launchpad.net/~yogeshojha\n"
+"  sarojdhakal https://launchpad.net/~lotusnagarkot"
+
+#: gnomemusic/about.py:246
+msgid "Copyright The GNOME Music Developers"
+msgstr "प्रतिलिपि अधिकार जिनोम सङ्गीत विकासकर्ताहरू"
+
+#: gnomemusic/about.py:249
+msgid "Translated by"
+msgstr "अनुवाद"
+
+#. TRANSLATORS: this is a playlist name
+#: gnomemusic/grilowrappers/grltrackerplaylists.py:894
+msgid "Most Played"
+msgstr "धेरै जसो बजाईने"
+
+#. TRANSLATORS: this is a playlist name
+#: gnomemusic/grilowrappers/grltrackerplaylists.py:948
+msgid "Never Played"
+msgstr "कहिल्यै नबजेको"
+
+#. TRANSLATORS: this is a playlist name
+#: gnomemusic/grilowrappers/grltrackerplaylists.py:1001
+msgid "Recently Played"
+msgstr "हालै बजेको"
+
+#. TRANSLATORS: this is a playlist name
+#: gnomemusic/grilowrappers/grltrackerplaylists.py:1064
+msgid "Recently Added"
+msgstr "हालै थपेको"
+
+#. TRANSLATORS: this is a playlist name
+#: gnomemusic/grilowrappers/grltrackerplaylists.py:1127
+msgid "Favorite Songs"
+msgstr "मनपर्ने गीतहरू"
+
+#: gnomemusic/gstplayer.py:408
+msgid "Unable to play the file"
+msgstr "फाइल बजाउन असक्षम"
+
+#: gnomemusic/gstplayer.py:414
+msgid "_Find in {}"
+msgstr "{} फेला पार्नुहोस्"
+
+#. TRANSLATORS: separator for two codecs
+#: gnomemusic/gstplayer.py:424
+msgid " and "
+msgstr " र "
+
+#. TRANSLATORS: separator for a list of codecs
+#: gnomemusic/gstplayer.py:427
+msgid ", "
+msgstr ", "
+
+#: gnomemusic/gstplayer.py:429
+msgid "{} is required to play the file, but is not installed."
+msgid_plural "{} are required to play the file, but are not installed."
+msgstr[0] "फाइल बजाउम {} आवश्यक छ, तर स्थापना गरिएको छैन ।"
+msgstr[1] "फाइल बजाउम {} आवश्यक छ, तर स्थापना गरिएको छैन ।"
+
+#: gnomemusic/inhibitsuspend.py:63
+msgid "Playing music"
+msgstr "सङ्गीत बजाइने"
+
+#. Translators: "shuffle" causes tracks to play in random order.
+#: gnomemusic/player.py:44
+msgid "Shuffle"
+msgstr "फिट्नुहोस्"
+
+#: gnomemusic/player.py:45
+msgid "Repeat Song"
+msgstr "गाना दोहोर्याउनुस्"
+
+#: gnomemusic/player.py:46
+msgid "Repeat All"
+msgstr "सबै दोहोर्याउनुस्"
+
+#: gnomemusic/player.py:47
+msgid "Shuffle/Repeat Off"
+msgstr "फिट्नुहोस्/दोहोर्याउनुस् बन्द"
+
+#: gnomemusic/playlisttoast.py:55
+msgid "Playlist {} removed"
+msgstr "बजाउने सूची  {} हटाइयो"
+
+#: gnomemusic/playlisttoast.py:56 gnomemusic/songtoast.py:65
+msgid "Undo"
+msgstr "पुर्वस्थितिमा फर्काउनुहोस्"
+
+#: gnomemusic/songtoast.py:64
+msgid "{} removed from {}"
+msgstr "{} बाट {} हटाइयो"
+
+#: gnomemusic/utils.py:92
+msgid "Unknown album"
+msgstr "अज्ञात एल्बम"
+
+#: gnomemusic/utils.py:113
+msgid "Unknown Artist"
+msgstr "अज्ञात कलाकार"
+
+#: gnomemusic/views/emptyview.py:65
+msgid "Your XDG Music directory is not set."
+msgstr "तपाईँको XDG सङ्गीत डाइरेक्टरी सेट गरिएको छैन ।"
+
+#: gnomemusic/views/emptyview.py:72
+msgid "Music Folder"
+msgstr "सङ्गीत फोल्डर"
+
+#. TRANSLATORS: This is a label to display a link to open user's music
+#. folder. {} will be replaced with the translated text 'Music folder'
+#: gnomemusic/views/emptyview.py:76
+msgid "The contents of your {} will appear here."
+msgstr "तपाईँको {} का सामग्रीहरू यहाँ देखा पर्नेछन् ।"
+
+#: gnomemusic/views/emptyview.py:124
+msgid "No Music Found"
+msgstr "सङ्गीत भेटिएन"
+
+#: gnomemusic/views/emptyview.py:125
+msgid "Try a Different Search"
+msgstr "फरक खोज कोशिश गर्नुहोस्"
+
+#: gnomemusic/views/emptyview.py:129
+msgid "GNOME Music could not connect to Tracker."
+msgstr "जिनोम सङ्गीत ट्र्याकरमा जडान गर्न सकेन ।"
+
+#: gnomemusic/views/emptyview.py:131
+msgid "Your music files cannot be indexed without Tracker running."
+msgstr "ट्र्याकर नचलाईकन तपाईँको सङ्गीत फाइलहरू अनुक्रमण गर्न सकिँदैन ।"
+
+#: gnomemusic/views/emptyview.py:137
+msgid "Your system Tracker version seems outdated."
+msgstr "तपाईँको प्रणाली ट्र्याकर संस्करण पुरानो जस्तो देखिन्छ ।"
+
+#: gnomemusic/views/emptyview.py:139
+msgid "Music needs Tracker version 3.0.0 or higher."
+msgstr "सङ्गीतलाई ट्रयाकर संस्करण 3.0.0 वा उच्चको आवश्यकता पर्दछ।"
 
-#: ../gnomemusic/view.py:797 ../gnomemusic/view.py:1537
+#: gnomemusic/views/playlistsview.py:45
 msgid "Playlists"
 msgstr "सुचिहरू"
 
-#: ../gnomemusic/view.py:1077
-#, python-format
-msgid "%d Song"
-msgid_plural "%d Songs"
-msgstr[0] "%d गाना"
-msgstr[1] "%d गानाहरू"
+#: gnomemusic/views/searchview.py:304
+msgid "Artists Results"
+msgstr "कलाकारहरू नतिजा"
 
-#: ../gnomemusic/widgets.py:270 ../gnomemusic/widgets.py:308
-#, python-format
-msgid "%d min"
-msgstr "%d min"
+#: gnomemusic/views/searchview.py:318
+msgid "Albums Results"
+msgstr "एल्बमहरूको नतिजा"
 
-#: ../gnomemusic/widgets.py:674
-msgid "New Playlist"
-msgstr "नयाँ सूची"
+#: gnomemusic/widgets/albumwidget.py:245
+msgid "{} minute"
+msgid_plural "{} minutes"
+msgstr[0] "{} मिनेट"
+msgstr[1] "{} मिनेट"
 
-#: ../gnomemusic/window.py:226
-msgid "Empty"
-msgstr "खाली"
+#: gnomemusic/widgets/discbox.py:75
+msgid "Disc {}"
+msgstr "डिस्क {}"
 
-#: ../data/AboutDialog.ui.in.h:2
-msgid "Copyright © 2013 GNOME Music Developers"
-msgstr "प्रतिलिपीअधिकार  © २०१३ जिनोम सङ्गीत शीर्षकर्ता"
+#: gnomemusic/widgets/headerbar.py:66
+msgid "Selected {} song"
+msgid_plural "Selected {} songs"
+msgstr[0] "{} गीत छानियो"
+msgstr[1] "{} गीतहरू छानियो"
 
-#: ../data/AboutDialog.ui.in.h:3
-msgid "A music player and management application for GNOME."
-msgstr "जिनोम सङ्गित बजाउने र  व्यवस्थापन अनुप्रयोग"
+#: gnomemusic/widgets/lastfmdialog.py:64
+msgid "Your music listening is reported to Last.fm."
+msgstr "तपाईंको संगीत सुन्ने Last.fm मा रिपोर्ट गरिएको छ।"
 
-#: ../data/AboutDialog.ui.in.h:4
-msgid "Visit GNOME Music website"
-msgstr ""
+#: gnomemusic/widgets/lastfmdialog.py:66
+msgid "Your music listening is not reported to Last.fm."
+msgstr "तपाईँको सङ्गीत सुन्ने Last.fm मा रिपोर्ट गरिएको छैन ।"
 
-#: ../data/AboutDialog.ui.in.h:5
-msgid ""
-"GNOME Music is free software; you can redistribute it and/or modify it under "
-"the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"GNOME Music is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
-"\n"
-"The GNOME Music authors hereby grant permission for non-GPL compatible "
-"GStreamer plugins to be used and distributed together with GStreamer and "
-"GNOME Music.  This permission is above and beyond the permissions granted by "
-"the GPL license by which GNOME Music is covered.  If you modify this code, "
-"you may extend this exception to your version of the code, but you are not "
-"obligated to do so.  If you do not wish to do so, delete this exception "
-"statement from your version."
-msgstr ""
+#. TRANSLATORS: displays the username of the Last.fm account
+#: gnomemusic/widgets/lastfmdialog.py:70
+msgid "Logged in as {}"
+msgstr "{} लगईन गरियो"
 
-#: ../data/AlbumWidget.ui.h:1
-msgid "Released"
-msgstr ""
+#: gnomemusic/widgets/lastfmdialog.py:71
+msgid "Configure"
+msgstr "कन्फिगर"
+
+#: gnomemusic/widgets/playertoolbar.py:167
+msgid "Pause"
+msgstr "पज गर्नुहोस्"
+
+#: gnomemusic/widgets/playlistcontrols.py:130
+msgid "{} Song"
+msgid_plural "{} Songs"
+msgstr[0] "{} गीत"
+msgstr[1] "{} गीतहरू"
+
+#~ msgid "A music player and management application for GNOME."
+#~ msgstr "जिनोम सङ्गीत बजाउने र व्यवस्थापन अनुप्रयोग."
+
+#~ msgid "Visit GNOME Music website"
+#~ msgstr "जिनोम सङ्गीत वेबसाइट हेर्नुहोस्"
+
+#~ msgid "The contents of your Music Folder will appear here"
+#~ msgstr "तपाईँको सङ्गीत फोल्डरको सामाग्री यहाँ देखा पर्नेछ ।"
+
+#~ msgid "Window position"
+#~ msgstr "सञ्झ्यालको स्थिति"
+
+#~ msgid "Window position (x and y)."
+#~ msgstr "सञ्झ्यालको  स्थान(X र Y)."
 
-#: ../data/AlbumWidget.ui.h:2
 #, fuzzy
-msgid "Running Length"
-msgstr "चलिरहेको"
+#~ msgid "Search mode"
+#~ msgstr "मोड:"
 
-#: ../data/app-menu.ui.h:1
-msgid "_New Playlist"
-msgstr "नयाँ सूची"
+#, fuzzy
+#~ msgid "If true, the search bar is shown."
+#~ msgstr "विण्डो टास्कबारमा छैनभने ठीक "
 
-#: ../data/app-menu.ui.h:2
-msgid "_Help"
-msgstr "सहयोग"
+#~ msgid "GNOME Music"
+#~ msgstr "जिनोम सङ्गित"
 
-#: ../data/app-menu.ui.h:3
-msgid "_About"
-msgstr "बारेमा"
+#~ msgid "Untitled"
+#~ msgstr "शीर्षक नदिएको"
 
-#: ../data/app-menu.ui.h:4
-msgid "_Quit"
-msgstr "अन्त्य गर्नुहोस्"
+#~ msgid "Not playing"
+#~ msgstr "बजेन"
 
-#: ../data/PlayerToolbar.ui.h:1
-msgid "Shuffle"
-msgstr "फिट्नुहोस्"
+#~ msgid "by %s, from %s"
+#~ msgstr "%s बाट %s देखि"
 
-#: ../data/PlayerToolbar.ui.h:2
-msgid "Repeat All"
-msgstr "सबै दोहोर्याउनुस्"
+#~ msgid "All"
+#~ msgstr "सबै"
 
-#: ../data/PlayerToolbar.ui.h:3
-msgid "Repeat Song"
-msgstr "गाना दोहोर्याउनुस्"
+#~ msgid "Artist"
+#~ msgstr "कलाकार:"
 
-#: ../data/PlayerToolbar.ui.h:4
-msgid "Shuffle/Repeat Off"
-msgstr "फिट्नुहोस्/दोहोर्याउनुस् बन्द"
+#~ msgid "Album"
+#~ msgstr "एल्बम:"
 
-#: ../data/NoMusic.ui.h:1
-msgid "No Music Found"
-msgstr "सङ्गित भेटिएन"
+#~ msgid "Track Title"
+#~ msgstr "गाना शीर्षक"
 
-#: ../data/headerbar.ui.h:1
-msgid "Select All"
-msgstr "सबै छान्नुहोस्"
+#~ msgid "Local"
+#~ msgstr "स्थानीय"
 
-#: ../data/headerbar.ui.h:2
-msgid "Select None"
-msgstr "कुनै पनि चयन नगर्नुहोस्"
+#~ msgid "Sources"
+#~ msgstr "स्रोत"
 
-#: ../data/headerbar.ui.h:4
-msgid "Search"
-msgstr "खोजी"
+#~ msgid "Match"
+#~ msgstr "सबै मिलाउनुहोस्"
 
-#: ../data/headerbar.ui.h:5 ../data/PlaylistDialog.ui.h:3
-msgid "Select"
-msgstr "चयन गर्नुहोस्..."
+#~ msgid "Selected %d item"
+#~ msgid_plural "Selected %d items"
+#~ msgstr[0] "%d बस्तु चयन भयो"
+#~ msgstr[1] "%d बस्तु चयन भयो"
 
-#: ../data/headerbar.ui.h:6 ../data/PlaylistDialog.ui.h:2
-msgid "Cancel"
-msgstr "रद्द गर्नुहोस्"
+#~ msgid "All Artists"
+#~ msgstr "कलाकारहरू"
 
-#: ../data/headerbar.ui.h:7
-msgid "Back"
-msgstr "पछाडि"
+#~ msgid "%d min"
+#~ msgstr "%d min"
 
-#: ../data/SelectionToolbar.ui.h:1
-msgid "Add to Playlist"
-msgstr "सुचिमा थप्नुहोस्..."
+#~ msgid "Empty"
+#~ msgstr "खाली"
 
-#: ../data/SelectionToolbar.ui.h:2
-msgid "Remove from Playlist"
-msgstr "सूचीबाट हटाउनुहोस्"
+#, fuzzy
+#~ msgid "Running Length"
+#~ msgstr "चलिरहेको"
 
-#: ../data/PlaylistControls.ui.h:1
-msgid "_Play"
-msgstr "प्ले गर्नुहोस्"
+#~ msgid "_New Playlist"
+#~ msgstr "नयाँ सूची"
 
-#: ../data/PlaylistControls.ui.h:2
-msgid "_Delete"
-msgstr "मेट्नुहोस्"
+#~ msgid "_Quit"
+#~ msgstr "अन्त्य गर्नुहोस्"
 
-#: ../data/PlaylistDialog.ui.h:1
-msgid "Select Playlist"
-msgstr "सूचिचयन गर्नुहोस्..."
+#~ msgid "Select Playlist"
+#~ msgstr "सूचिचयन गर्नुहोस्..."
diff --git a/po/nl.po b/po/nl.po
index 6437a292..e6363686 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,12 +8,13 @@
 # Hannie Dumoleyn <hannie@ubuntu-nl.org>, 2015.
 # Justin van Steijn <jvs@fsfe.org>, 2016.
 # Nathan Follens <nfollens@gnome.org>, 2018-2022.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-music\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-music/issues\n"
-"POT-Creation-Date: 2022-02-19 12:39+0000\n"
-"PO-Revision-Date: 2022-03-25 13:49+0100\n"
+"POT-Creation-Date: 2022-08-27 13:27+0000\n"
+"PO-Revision-Date: 2022-11-01 22:57+0100\n"
 "Last-Translator: Nathan Follens <nfollens@gnome.org>\n"
 "Language-Team: Dutch <gnome-nl-list@gnome.org>\n"
 "Language: nl\n"
@@ -21,12 +22,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.0.1\n"
+"X-Generator: Poedit 3.1.1\n"
 "X-Project-Style: gnome\n"
 
 #: data/org.gnome.Music.appdata.xml.in.in:6
-#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/application.py:61
-#: gnomemusic/window.py:71
+#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/about.py:236
+#: gnomemusic/application.py:61 gnomemusic/window.py:71
 msgid "Music"
 msgstr "Muziek"
 
@@ -47,7 +48,7 @@ msgstr ""
 "Vind nummers in uw lokale bibliotheek, maak gebruik van automatisch "
 "gegenereerde afspeellijsten of stel er zelf eentje samen."
 
-#: data/org.gnome.Music.appdata.xml.in.in:149
+#: data/org.gnome.Music.appdata.xml.in.in:167
 msgid "The GNOME Music developers"
 msgstr "De Gnome Muziek-ontwikkelaars"
 
@@ -122,81 +123,21 @@ msgstr ""
 "Schakelt het verzenden van scrobbles en de ‘Luistert nu naar’-informatie "
 "naar Last.fm in of uit."
 
-#: data/ui/AboutDialog.ui.in:9
-msgid "Copyright © 2018 GNOME Music Developers"
-msgstr "Copyright © 2018 Gnome Muziek-ontwikkelaars"
-
-#: data/ui/AboutDialog.ui.in:10
-msgid "A music player and management application for GNOME."
-msgstr "Een muziekspeler en beheertoepassing voor Gnome."
-
-#: data/ui/AboutDialog.ui.in:12
-msgid "Visit GNOME Music website"
-msgstr "Bezoek de Gnome Muziek-website"
-
-#: data/ui/AboutDialog.ui.in:13
-msgid ""
-"GNOME Music is free software; you can redistribute it and/or modify it under "
-"the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"GNOME Music is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
-"\n"
-"The GNOME Music authors hereby grant permission for non-GPL compatible "
-"GStreamer plugins to be used and distributed together with GStreamer and "
-"GNOME Music.  This permission is above and beyond the permissions granted by "
-"the GPL license by which GNOME Music is covered.  If you modify this code, "
-"you may extend this exception to your version of the code, but you are not "
-"obligated to do so.  If you do not wish to do so, delete this exception "
-"statement from your version."
-msgstr ""
-"Gnome Muziek is vrije software; u mag het verder verspreiden en/of wijzigen "
-"onder de voorwaarden van de GNU General Public License zoals gepubliceerd "
-"door de Free Software Foundation, naar keuze ofwel onder versie 2 ofwel "
-"onder een nieuwere versie van die licentie.\n"
-"\n"
-"Gnome Muziek wordt uitgegeven in de hoop dat het nuttig is, maar ZONDER "
-"ENIGE GARANTIE; zelfs zonder de impliciete garantie van VERKOOPBAARHEID of "
-"GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU General Public License voor "
-"meer details.\n"
-"\n"
-"U zou een kopie van de GNU General Public Licence ontvangen moeten hebben "
-"samen met Gnome Muziek; indien dit niet zo is, schrijf dan naar de Free "
-"Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
-"02110-1301 USA.\n"
-"\n"
-"De makers van Gnome Muziek verlenen hierbij toestemming om niet-GPL-"
-"verenigbare GStreamer-plugins te gebruiken en te distribueren samen met "
-"GStreamer en Gnome Muziek. Deze toestemming overstijgt en gaat verder dan de "
-"toestemming verleend door de GPL-licentie waaronder Gnome Muziek "
-"ressorteert. Als u deze code bewerkt kunt u deze uitzondering van toepassing "
-"verklaren op uw versie van de code, maar u bent hiertoe niet verplicht. Als "
-"u besluit de uitzondering niet van toepassing te verklaring, verwijder dan "
-"deze verklaring uit uw versie."
-
-#: data/ui/AlbumWidget.ui:86 data/ui/PlayerToolbar.ui:88
-#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:168
+#: data/ui/AlbumWidget.ui:84 data/ui/PlayerToolbar.ui:87
+#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:170
 msgid "Play"
 msgstr "Afspelen"
 
-#: data/ui/AlbumWidget.ui:132 data/ui/PlaylistControls.ui:5
+#: data/ui/AlbumWidget.ui:130 data/ui/PlaylistControls.ui:5
 #: data/ui/SongWidgetMenu.ui:11
 msgid "_Play"
 msgstr "Afs_pelen"
 
-#: data/ui/AlbumWidget.ui:136
+#: data/ui/AlbumWidget.ui:134
 msgid "Add to _Favorite Songs"
 msgstr "Toevoegen aan _favoriete nummers"
 
-#: data/ui/AlbumWidget.ui:140 data/ui/SongWidgetMenu.ui:15
+#: data/ui/AlbumWidget.ui:138 data/ui/SongWidgetMenu.ui:15
 msgid "_Add to Playlist…"
 msgstr "Toevoegen aan _afspeellijst…"
 
@@ -220,7 +161,7 @@ msgstr "_Hulp"
 msgid "_About Music"
 msgstr "_Over Muziek"
 
-#: data/ui/EmptyView.ui:26 data/ui/InitialState.ui:13
+#: data/ui/EmptyView.ui:30
 msgid "Welcome to Music"
 msgstr "Welkom bij Muziek"
 
@@ -232,7 +173,7 @@ msgstr "Menu"
 msgid "Select"
 msgstr "Selecteren"
 
-#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:211
+#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:213
 #: data/ui/SearchHeaderBar.ui:20
 msgid "_Cancel"
 msgstr "_Annuleren"
@@ -330,10 +271,6 @@ msgctxt "shortcut window"
 msgid "Go back"
 msgstr "Teruggaan"
 
-#: data/ui/InitialState.ui:25
-msgid "The contents of your Music Folder will appear here"
-msgstr "De inhoud van uw muziekmap zal hier verschijnen"
-
 #: data/ui/LastfmDialog.ui:21
 msgid ""
 "Last.fm is a music discovery service that gives you personalised "
@@ -355,11 +292,11 @@ msgstr ""
 msgid "Login"
 msgstr "Aanmelden"
 
-#: data/ui/PlayerToolbar.ui:75
+#: data/ui/PlayerToolbar.ui:74
 msgid "Previous"
 msgstr "Vorige"
 
-#: data/ui/PlayerToolbar.ui:107
+#: data/ui/PlayerToolbar.ui:106
 msgid "Next"
 msgstr "Volgende"
 
@@ -395,11 +332,11 @@ msgstr "Nieuwe afspeellijst…"
 msgid "Add"
 msgstr "Toevoegen"
 
-#: data/ui/PlaylistDialog.ui:200
+#: data/ui/PlaylistDialog.ui:202
 msgid "Add to Playlist"
 msgstr "Toevoegen aan afspeellijst"
 
-#: data/ui/PlaylistDialog.ui:220
+#: data/ui/PlaylistDialog.ui:222
 msgid "_Add"
 msgstr "_Toevoegen"
 
@@ -411,7 +348,7 @@ msgstr "Artiesten"
 msgid "View All"
 msgstr "Alles tonen"
 
-#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:54
+#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:56
 msgid "Albums"
 msgstr "Muziekalbum"
 
@@ -439,6 +376,29 @@ msgstr "Toevoegen aan _afspeellijst"
 msgid "_Remove from Playlist"
 msgstr "Ve_rwijderen uit afspeellijst"
 
+#: gnomemusic/about.py:238
+msgid "The GNOME Project"
+msgstr "Het Gnome-project"
+
+#: gnomemusic/about.py:242
+msgid "translator-credits"
+msgstr ""
+"Erwin Poeze <donnut@outlook.com>\n"
+"Reinout van Schouwen <reinouts@gnome.org>\n"
+"Wouter Bolsterlee <wbolster@gnome.org>\n"
+"Hannie Dumoleyn <hannie@ubuntu-nl.org>\n"
+"Justin van Steijn <jvs@fsfe.org>\n"
+"Nathan Follens <nfollens@gnome.org>\n"
+"Meer info over Gnome-NL http://nl.gnome.org"
+
+#: gnomemusic/about.py:246
+msgid "Copyright The GNOME Music Developers"
+msgstr "Copyright de Gnome Muziek-ontwikkelaars"
+
+#: gnomemusic/about.py:249
+msgid "Translated by"
+msgstr "Vertaald door"
+
 #. TRANSLATORS: this is a playlist name
 #: gnomemusic/grilowrappers/grltrackerplaylists.py:894
 msgid "Most Played"
@@ -509,7 +469,7 @@ msgstr "Alles herhalen"
 
 #: gnomemusic/player.py:47
 msgid "Shuffle/Repeat Off"
-msgstr "Willekeurig/Herhalen uit"
+msgstr "Willekeurig/herhalen uit"
 
 #: gnomemusic/playlisttoast.py:55
 msgid "Playlist {} removed"
@@ -583,7 +543,7 @@ msgstr "Artiestresultaten"
 msgid "Albums Results"
 msgstr "Albumresultaten"
 
-#: gnomemusic/widgets/albumwidget.py:240
+#: gnomemusic/widgets/albumwidget.py:245
 msgid "{} minute"
 msgid_plural "{} minutes"
 msgstr[0] "{} minuut"
@@ -616,7 +576,7 @@ msgstr "Aangemeld als {}"
 msgid "Configure"
 msgstr "Configureren"
 
-#: gnomemusic/widgets/playertoolbar.py:165
+#: gnomemusic/widgets/playertoolbar.py:167
 msgid "Pause"
 msgstr "Pauzeren"
 
@@ -626,6 +586,62 @@ msgid_plural "{} Songs"
 msgstr[0] "{} nummer"
 msgstr[1] "{} nummers"
 
+#~ msgid "A music player and management application for GNOME."
+#~ msgstr "Een muziekspeler en beheertoepassing voor Gnome."
+
+#~ msgid "Visit GNOME Music website"
+#~ msgstr "Bezoek de Gnome Muziek-website"
+
+#~ msgid ""
+#~ "GNOME Music is free software; you can redistribute it and/or modify it "
+#~ "under the terms of the GNU General Public License as published by the "
+#~ "Free Software Foundation; either version 2 of the License, or (at your "
+#~ "option) any later version.\n"
+#~ "\n"
+#~ "GNOME Music is distributed in the hope that it will be useful, but "
+#~ "WITHOUT ANY WARRANTY; without even the implied warranty of "
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General "
+#~ "Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License along "
+#~ "with GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
+#~ "Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
+#~ "\n"
+#~ "The GNOME Music authors hereby grant permission for non-GPL compatible "
+#~ "GStreamer plugins to be used and distributed together with GStreamer and "
+#~ "GNOME Music.  This permission is above and beyond the permissions granted "
+#~ "by the GPL license by which GNOME Music is covered.  If you modify this "
+#~ "code, you may extend this exception to your version of the code, but you "
+#~ "are not obligated to do so.  If you do not wish to do so, delete this "
+#~ "exception statement from your version."
+#~ msgstr ""
+#~ "Gnome Muziek is vrije software; u mag het verder verspreiden en/of "
+#~ "wijzigen onder de voorwaarden van de GNU General Public License zoals "
+#~ "gepubliceerd door de Free Software Foundation, naar keuze ofwel onder "
+#~ "versie 2 ofwel onder een nieuwere versie van die licentie.\n"
+#~ "\n"
+#~ "Gnome Muziek wordt uitgegeven in de hoop dat het nuttig is, maar ZONDER "
+#~ "ENIGE GARANTIE; zelfs zonder de impliciete garantie van VERKOOPBAARHEID "
+#~ "of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU General Public License "
+#~ "voor meer details.\n"
+#~ "\n"
+#~ "U zou een kopie van de GNU General Public Licence ontvangen moeten hebben "
+#~ "samen met Gnome Muziek; indien dit niet zo is, schrijf dan naar de Free "
+#~ "Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
+#~ "02110-1301 USA.\n"
+#~ "\n"
+#~ "De makers van Gnome Muziek verlenen hierbij toestemming om niet-GPL-"
+#~ "verenigbare GStreamer-plugins te gebruiken en te distribueren samen met "
+#~ "GStreamer en Gnome Muziek. Deze toestemming overstijgt en gaat verder dan "
+#~ "de toestemming verleend door de GPL-licentie waaronder Gnome Muziek "
+#~ "ressorteert. Als u deze code bewerkt kunt u deze uitzondering van "
+#~ "toepassing verklaren op uw versie van de code, maar u bent hiertoe niet "
+#~ "verplicht. Als u besluit de uitzondering niet van toepassing te "
+#~ "verklaring, verwijder dan deze verklaring uit uw versie."
+
+#~ msgid "The contents of your Music Folder will appear here"
+#~ msgstr "De inhoud van uw muziekmap zal hier verschijnen"
+
 #~ msgid "GNOME Music"
 #~ msgstr "Gnome Muziek"
 
diff --git a/po/oc.po b/po/oc.po
index 6f123299..556e1371 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-music master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-music/issues\n"
-"POT-Creation-Date: 2022-02-19 12:39+0000\n"
-"PO-Revision-Date: 2022-03-15 10:52+0100\n"
+"POT-Creation-Date: 2022-08-27 13:27+0000\n"
+"PO-Revision-Date: 2022-09-09 18:32+0200\n"
 "Last-Translator: Quentin PAGÈS\n"
 "Language-Team: Tot En Òc\n"
 "Language: oc\n"
@@ -15,12 +15,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 3.0.1\n"
+"X-Generator: Poedit 3.1.1\n"
 "X-Project-Style: gnome\n"
 
 #: data/org.gnome.Music.appdata.xml.in.in:6
-#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/application.py:61
-#: gnomemusic/window.py:71
+#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/about.py:236
+#: gnomemusic/application.py:61 gnomemusic/window.py:71
 msgid "Music"
 msgstr "Musica"
 
@@ -41,7 +41,7 @@ msgstr ""
 "Trobatz las pistas de vòstra colleccion locala, utilizatz las listas "
 "d’escota generadas automaticament o creatz-ne una novèla."
 
-#: data/org.gnome.Music.appdata.xml.in.in:149
+#: data/org.gnome.Music.appdata.xml.in.in:167
 msgid "The GNOME Music developers"
 msgstr "Los desvolopaires de l'aplicacion Musica de GNOME"
 
@@ -118,80 +118,21 @@ msgstr ""
 "Activa o desactiva lo mandadís de scrobbles e d’informacion « en lectura » a "
 "Last.fm."
 
-#: data/ui/AboutDialog.ui.in:9
-msgid "Copyright © 2018 GNOME Music Developers"
-msgstr "Copyright © 2018 Desvolopaires de l'aplicacion Musica de GNOME"
-
-#: data/ui/AboutDialog.ui.in:10
-msgid "A music player and management application for GNOME."
-msgstr "Un lector de musica e una aplicacion de gestion per GNOME."
-
-#: data/ui/AboutDialog.ui.in:12
-msgid "Visit GNOME Music website"
-msgstr "Visitar lo site Web de GNOME Musica"
-
-#: data/ui/AboutDialog.ui.in:13
-msgid ""
-"GNOME Music is free software; you can redistribute it and/or modify it under "
-"the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"GNOME Music is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
-"\n"
-"The GNOME Music authors hereby grant permission for non-GPL compatible "
-"GStreamer plugins to be used and distributed together with GStreamer and "
-"GNOME Music.  This permission is above and beyond the permissions granted by "
-"the GPL license by which GNOME Music is covered.  If you modify this code, "
-"you may extend this exception to your version of the code, but you are not "
-"obligated to do so.  If you do not wish to do so, delete this exception "
-"statement from your version."
-msgstr ""
-"GNOME Musica es un logicial liure ; podètz lo redistribuir e/o lo modificar "
-"al títol de las clausas de la Licéncia Publica Generala GNU, tala coma "
-"publicada per la Free Software Foundation ; siá la version 2 de la Licéncia, "
-"o (coma voldretz) una version ulteriora quina que foguèsse.\n"
-"\n"
-"Aqueste programa es distribuit dins l'esper que serà utile, mas SENS CAP DE "
-"GARANTIDA ; sens la quita garantida implicita de COMERCIABILITAT o DE "
-"CONFORMITAT A UNA UTILIZACION PARTICULARA. Vejatz la Licéncia Publica "
-"Generala GNU per mai de detalhs.\n"
-"\n"
-"Deuriatz aver recebut un exemplar de la Licéncia Publica Generala GNU amb "
-"aqueste programa ; se es pas lo cas, escrivètz a la Free Software Foundation "
-"Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n"
-"\n"
-"Los autors de l'aplicacion Musica de GNOME acòrdan per la presenta "
-"l'autorizacion d'utilizar d'empeutons GStreamer non compatibles amb la "
-"licéncia GPL e de los distribuir conjuntament a GStreamer e a l'aplicacion "
-"Musica de GNOME. Aquesta permission suplanta e va de delà de las "
-"autorizacions acordadas per la licéncia GPL que cobrís l'aplicacion Musica "
-"de GNOME. Se modificatz aqueste còdi, podètz espandir aquesta autorizacion a "
-"vòstra version del còdi, mas i sètz pas obligats. Se o desiratz pas, "
-"suprimissètz aquesta mencion d'excepcion de vòstra version."
-
-#: data/ui/AlbumWidget.ui:86 data/ui/PlayerToolbar.ui:88
-#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:168
+#: data/ui/AlbumWidget.ui:84 data/ui/PlayerToolbar.ui:87
+#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:170
 msgid "Play"
 msgstr "Lectura"
 
-#: data/ui/AlbumWidget.ui:132 data/ui/PlaylistControls.ui:5
+#: data/ui/AlbumWidget.ui:130 data/ui/PlaylistControls.ui:5
 #: data/ui/SongWidgetMenu.ui:11
 msgid "_Play"
 msgstr "_Legir"
 
-#: data/ui/AlbumWidget.ui:136
+#: data/ui/AlbumWidget.ui:134
 msgid "Add to _Favorite Songs"
 msgstr "Apondre als _favorits"
 
-#: data/ui/AlbumWidget.ui:140 data/ui/SongWidgetMenu.ui:15
+#: data/ui/AlbumWidget.ui:138 data/ui/SongWidgetMenu.ui:15
 msgid "_Add to Playlist…"
 msgstr "_Apondre a la lista de lectura…"
 
@@ -215,7 +156,7 @@ msgstr "A_juda"
 msgid "_About Music"
 msgstr "_A prepaus de Musica"
 
-#: data/ui/EmptyView.ui:26 data/ui/InitialState.ui:13
+#: data/ui/EmptyView.ui:30
 msgid "Welcome to Music"
 msgstr "La benvenguda a Musica"
 
@@ -227,7 +168,7 @@ msgstr "Menú"
 msgid "Select"
 msgstr "Seleccionar"
 
-#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:211
+#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:213
 #: data/ui/SearchHeaderBar.ui:20
 msgid "_Cancel"
 msgstr "A_nullar"
@@ -325,10 +266,6 @@ msgctxt "shortcut window"
 msgid "Go back"
 msgstr "Tornar en arrièr"
 
-#: data/ui/InitialState.ui:25
-msgid "The contents of your Music Folder will appear here"
-msgstr "Lo contengut de vòstre dossièr Musica s'aficharà aicí"
-
 #: data/ui/LastfmDialog.ui:21
 msgid ""
 "Last.fm is a music discovery service that gives you personalised "
@@ -350,11 +287,11 @@ msgstr ""
 msgid "Login"
 msgstr "Identificant"
 
-#: data/ui/PlayerToolbar.ui:75
+#: data/ui/PlayerToolbar.ui:74
 msgid "Previous"
 msgstr "Precedent"
 
-#: data/ui/PlayerToolbar.ui:107
+#: data/ui/PlayerToolbar.ui:106
 msgid "Next"
 msgstr "Seguent"
 
@@ -390,11 +327,11 @@ msgstr "Lista de lectura novèla…"
 msgid "Add"
 msgstr "Apondre"
 
-#: data/ui/PlaylistDialog.ui:200
+#: data/ui/PlaylistDialog.ui:202
 msgid "Add to Playlist"
 msgstr "Apondre a la lista de lectura"
 
-#: data/ui/PlaylistDialog.ui:220
+#: data/ui/PlaylistDialog.ui:222
 msgid "_Add"
 msgstr "_Apondre"
 
@@ -406,7 +343,7 @@ msgstr "Artistas"
 msgid "View All"
 msgstr "Afichar tot"
 
-#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:54
+#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:56
 msgid "Albums"
 msgstr "Albums"
 
@@ -434,6 +371,22 @@ msgstr "_Apondre a la lista de lectura"
 msgid "_Remove from Playlist"
 msgstr "_Suprimir de la lista de lectura"
 
+#: gnomemusic/about.py:238
+msgid "The GNOME Project"
+msgstr "Lo projècte GNOME"
+
+#: gnomemusic/about.py:242
+msgid "translator-credits"
+msgstr "Quentin PAGÈS"
+
+#: gnomemusic/about.py:246
+msgid "Copyright The GNOME Music Developers"
+msgstr "Copyright Los desvolopaires de l'aplicacion Musica de GNOME"
+
+#: gnomemusic/about.py:249
+msgid "Translated by"
+msgstr "Traduch per"
+
 #. TRANSLATORS: this is a playlist name
 #: gnomemusic/grilowrappers/grltrackerplaylists.py:894
 msgid "Most Played"
@@ -575,7 +528,7 @@ msgstr "Resultats artistas"
 msgid "Albums Results"
 msgstr "Resultats albums"
 
-#: gnomemusic/widgets/albumwidget.py:240
+#: gnomemusic/widgets/albumwidget.py:245
 msgid "{} minute"
 msgid_plural "{} minutes"
 msgstr[0] "{} minuta"
@@ -608,7 +561,7 @@ msgstr "Connectat coma {}"
 msgid "Configure"
 msgstr "Configurar"
 
-#: gnomemusic/widgets/playertoolbar.py:165
+#: gnomemusic/widgets/playertoolbar.py:167
 msgid "Pause"
 msgstr "Pausa"
 
@@ -618,6 +571,62 @@ msgid_plural "{} Songs"
 msgstr[0] "{} cançon"
 msgstr[1] "{} cançons"
 
+#~ msgid "A music player and management application for GNOME."
+#~ msgstr "Un lector de musica e una aplicacion de gestion per GNOME."
+
+#~ msgid "Visit GNOME Music website"
+#~ msgstr "Visitar lo site Web de GNOME Musica"
+
+#~ msgid ""
+#~ "GNOME Music is free software; you can redistribute it and/or modify it "
+#~ "under the terms of the GNU General Public License as published by the "
+#~ "Free Software Foundation; either version 2 of the License, or (at your "
+#~ "option) any later version.\n"
+#~ "\n"
+#~ "GNOME Music is distributed in the hope that it will be useful, but "
+#~ "WITHOUT ANY WARRANTY; without even the implied warranty of "
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General "
+#~ "Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License along "
+#~ "with GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
+#~ "Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
+#~ "\n"
+#~ "The GNOME Music authors hereby grant permission for non-GPL compatible "
+#~ "GStreamer plugins to be used and distributed together with GStreamer and "
+#~ "GNOME Music.  This permission is above and beyond the permissions granted "
+#~ "by the GPL license by which GNOME Music is covered.  If you modify this "
+#~ "code, you may extend this exception to your version of the code, but you "
+#~ "are not obligated to do so.  If you do not wish to do so, delete this "
+#~ "exception statement from your version."
+#~ msgstr ""
+#~ "GNOME Musica es un logicial liure ; podètz lo redistribuir e/o lo "
+#~ "modificar al títol de las clausas de la Licéncia Publica Generala GNU, "
+#~ "tala coma publicada per la Free Software Foundation ; siá la version 2 de "
+#~ "la Licéncia, o (coma voldretz) una version ulteriora quina que foguèsse.\n"
+#~ "\n"
+#~ "Aqueste programa es distribuit dins l'esper que serà utile, mas SENS CAP "
+#~ "DE GARANTIDA ; sens la quita garantida implicita de COMERCIABILITAT o DE "
+#~ "CONFORMITAT A UNA UTILIZACION PARTICULARA. Vejatz la Licéncia Publica "
+#~ "Generala GNU per mai de detalhs.\n"
+#~ "\n"
+#~ "Deuriatz aver recebut un exemplar de la Licéncia Publica Generala GNU amb "
+#~ "aqueste programa ; se es pas lo cas, escrivètz a la Free Software "
+#~ "Foundation Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, "
+#~ "USA.\n"
+#~ "\n"
+#~ "Los autors de l'aplicacion Musica de GNOME acòrdan per la presenta "
+#~ "l'autorizacion d'utilizar d'empeutons GStreamer non compatibles amb la "
+#~ "licéncia GPL e de los distribuir conjuntament a GStreamer e a "
+#~ "l'aplicacion Musica de GNOME. Aquesta permission suplanta e va de delà de "
+#~ "las autorizacions acordadas per la licéncia GPL que cobrís l'aplicacion "
+#~ "Musica de GNOME. Se modificatz aqueste còdi, podètz espandir aquesta "
+#~ "autorizacion a vòstra version del còdi, mas i sètz pas obligats. Se o "
+#~ "desiratz pas, suprimissètz aquesta mencion d'excepcion de vòstra version."
+
+#~ msgid "The contents of your Music Folder will appear here"
+#~ msgstr "Lo contengut de vòstre dossièr Musica s'aficharà aicí"
+
 #~ msgid "GNOME Music"
 #~ msgstr "GNOME Musica"
 
diff --git a/po/pl.po b/po/pl.po
index ef357544..d1dc833f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-music\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-music/issues\n"
-"POT-Creation-Date: 2022-02-19 12:39+0000\n"
-"PO-Revision-Date: 2022-02-26 14:40+0100\n"
+"POT-Creation-Date: 2022-08-27 13:27+0000\n"
+"PO-Revision-Date: 2022-08-27 16:25+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <community-poland@mozilla.org>\n"
 "Language: pl\n"
@@ -21,8 +21,8 @@ msgstr ""
 "|| n%100>=20) ? 1 : 2);\n"
 
 #: data/org.gnome.Music.appdata.xml.in.in:6
-#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/application.py:61
-#: gnomemusic/window.py:71
+#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/about.py:236
+#: gnomemusic/application.py:61 gnomemusic/window.py:71
 msgid "Music"
 msgstr "Muzyka"
 
@@ -43,7 +43,7 @@ msgstr ""
 "Znajduj utwory w swojej lokalnej kolekcji, korzystaj z automatycznie "
 "tworzonych list odtwarzania lub utwórz własne."
 
-#: data/org.gnome.Music.appdata.xml.in.in:149
+#: data/org.gnome.Music.appdata.xml.in.in:167
 msgid "The GNOME Music developers"
 msgstr "Programiści odtwarzacza muzyki GNOME"
 
@@ -121,81 +121,21 @@ msgstr ""
 "Wysyła odsłuchane utwory i informacje o obecnie odtwarzanym do serwisu Last."
 "fm."
 
-#: data/ui/AboutDialog.ui.in:9
-msgid "Copyright © 2018 GNOME Music Developers"
-msgstr "Copyright © 2018 programiści odtwarzacza muzyki GNOME"
-
-#: data/ui/AboutDialog.ui.in:10
-msgid "A music player and management application for GNOME."
-msgstr "Odtwarzanie i zarządzanie muzyką dla środowiska GNOME."
-
-#: data/ui/AboutDialog.ui.in:12
-msgid "Visit GNOME Music website"
-msgstr "Witryna odtwarzacza muzyki GNOME"
-
-#: data/ui/AboutDialog.ui.in:13
-msgid ""
-"GNOME Music is free software; you can redistribute it and/or modify it under "
-"the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"GNOME Music is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
-"\n"
-"The GNOME Music authors hereby grant permission for non-GPL compatible "
-"GStreamer plugins to be used and distributed together with GStreamer and "
-"GNOME Music.  This permission is above and beyond the permissions granted by "
-"the GPL license by which GNOME Music is covered.  If you modify this code, "
-"you may extend this exception to your version of the code, but you are not "
-"obligated to do so.  If you do not wish to do so, delete this exception "
-"statement from your version."
-msgstr ""
-"Odtwarzacz muzyki GNOME jest wolnym oprogramowaniem; można go rozprowadzać "
-"dalej i/lub modyfikować na warunkach Powszechnej Licencji Publicznej GNU, "
-"wydanej przez Fundację Wolnego Oprogramowania (Free Software Foundation) — "
-"według wersji drugiej tej Licencji lub którejś z późniejszych wersji.\n"
-"\n"
-"Odtwarzacz muzyki GNOME rozpowszechniany jest z nadzieją, iż będzie on "
-"użyteczny — jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet domyślnej gwarancji "
-"PRZYDATNOŚCI HANDLOWEJ albo PRZYDATNOŚCI DO OKREŚLONYCH ZASTOSOWAŃ. W celu "
-"uzyskania bliższych informacji należy zapoznać się z Powszechną Licencją "
-"Publiczną GNU.\n"
-"\n"
-"Z pewnością wraz z odtwarzaczem muzyki GNOME dostarczono także egzemplarz "
-"Powszechnej Licencji Publicznej GNU (GNU General Public License); jeśli nie "
-"— proszę napisać do Free Software Foundation, Inc., 51 Franklin Street, "
-"Fifth Floor, Boston, MA 02110-1301, USA.\n"
-"\n"
-"Autorzy odtwarzacza muzyki GNOME udzielają pozwolenia na używanie "
-"i rozprowadzanie wtyczek biblioteki GStreamer niezgodnych z licencją GPL "
-"razem z biblioteką GStreamer i odtwarzaczem muzyki GNOME. To pozwolenie "
-"wychodzi poza uprawnienia udzielane przez licencję GPL, która obejmuje "
-"odtwarzacz muzyki GNOME. Jeśli ten kod jest modyfikowany, to można objąć go "
-"tym wyjątkiem, ale nie jest to wymagane. Jeśli nie ma zostać nim objęty, to "
-"należy usunąć ten fragment z tej wersji."
-
-#: data/ui/AlbumWidget.ui:86 data/ui/PlayerToolbar.ui:88
-#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:168
+#: data/ui/AlbumWidget.ui:84 data/ui/PlayerToolbar.ui:87
+#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:170
 msgid "Play"
 msgstr "Odtwarza"
 
-#: data/ui/AlbumWidget.ui:132 data/ui/PlaylistControls.ui:5
+#: data/ui/AlbumWidget.ui:130 data/ui/PlaylistControls.ui:5
 #: data/ui/SongWidgetMenu.ui:11
 msgid "_Play"
 msgstr "O_dtwórz"
 
-#: data/ui/AlbumWidget.ui:136
+#: data/ui/AlbumWidget.ui:134
 msgid "Add to _Favorite Songs"
 msgstr "Dodaj do _ulubionych utworów"
 
-#: data/ui/AlbumWidget.ui:140 data/ui/SongWidgetMenu.ui:15
+#: data/ui/AlbumWidget.ui:138 data/ui/SongWidgetMenu.ui:15
 msgid "_Add to Playlist…"
 msgstr "_Dodaj do listy odtwarzania…"
 
@@ -219,7 +159,7 @@ msgstr "Pomo_c"
 msgid "_About Music"
 msgstr "_O programie"
 
-#: data/ui/EmptyView.ui:26 data/ui/InitialState.ui:13
+#: data/ui/EmptyView.ui:30
 msgid "Welcome to Music"
 msgstr "Witamy w odtwarzaczu muzyki"
 
@@ -231,7 +171,7 @@ msgstr "Menu"
 msgid "Select"
 msgstr "Zaznacza"
 
-#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:211
+#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:213
 #: data/ui/SearchHeaderBar.ui:20
 msgid "_Cancel"
 msgstr "_Anuluj"
@@ -329,10 +269,6 @@ msgctxt "shortcut window"
 msgid "Go back"
 msgstr "Wstecz"
 
-#: data/ui/InitialState.ui:25
-msgid "The contents of your Music Folder will appear here"
-msgstr "W tym miejscu będzie znajdować się zawartość katalogu Muzyka"
-
 #: data/ui/LastfmDialog.ui:21
 msgid ""
 "Last.fm is a music discovery service that gives you personalised "
@@ -353,11 +289,11 @@ msgstr "Zgłaszanie odsłuchanych utworów wymaga zalogowania na konto Last.fm."
 msgid "Login"
 msgstr "Zaloguj się"
 
-#: data/ui/PlayerToolbar.ui:75
+#: data/ui/PlayerToolbar.ui:74
 msgid "Previous"
 msgstr "Poprzedni"
 
-#: data/ui/PlayerToolbar.ui:107
+#: data/ui/PlayerToolbar.ui:106
 msgid "Next"
 msgstr "Następny"
 
@@ -393,11 +329,11 @@ msgstr "Nowa lista odtwarzania…"
 msgid "Add"
 msgstr "Dodaj"
 
-#: data/ui/PlaylistDialog.ui:200
+#: data/ui/PlaylistDialog.ui:202
 msgid "Add to Playlist"
 msgstr "Dodanie do listy odtwarzania"
 
-#: data/ui/PlaylistDialog.ui:220
+#: data/ui/PlaylistDialog.ui:222
 msgid "_Add"
 msgstr "_Dodaj"
 
@@ -409,7 +345,7 @@ msgstr "Wykonawcy"
 msgid "View All"
 msgstr "Wyświetl wszystko"
 
-#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:54
+#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:56
 msgid "Albums"
 msgstr "Albumy"
 
@@ -437,6 +373,25 @@ msgstr "_Dodaj do listy odtwarzania"
 msgid "_Remove from Playlist"
 msgstr "_Usuń z listy odtwarzania"
 
+#: gnomemusic/about.py:238
+msgid "The GNOME Project"
+msgstr "Projekt GNOME"
+
+#: gnomemusic/about.py:242
+msgid "translator-credits"
+msgstr ""
+"Piotr Drąg <piotrdrag@gmail.com>, 2012-2022\n"
+"Paweł Żołnowski <pawel@zolnowski.name>, 2014-2015\n"
+"Aviary.pl <community-poland@mozilla.org>, 2012-2022"
+
+#: gnomemusic/about.py:246
+msgid "Copyright The GNOME Music Developers"
+msgstr "Copyright © programiści odtwarzacza muzyki GNOME"
+
+#: gnomemusic/about.py:249
+msgid "Translated by"
+msgstr "Tłumaczenie"
+
 #. TRANSLATORS: this is a playlist name
 #: gnomemusic/grilowrappers/grltrackerplaylists.py:894
 msgid "Most Played"
@@ -578,7 +533,7 @@ msgstr "Wyniki wyszukiwania wśród wykonawców"
 msgid "Albums Results"
 msgstr "Wyniki wyszukiwania wśród albumów"
 
-#: gnomemusic/widgets/albumwidget.py:240
+#: gnomemusic/widgets/albumwidget.py:245
 msgid "{} minute"
 msgid_plural "{} minutes"
 msgstr[0] "{} minuta"
@@ -613,7 +568,7 @@ msgstr "Zalogowano jako {}"
 msgid "Configure"
 msgstr "Skonfiguruj"
 
-#: gnomemusic/widgets/playertoolbar.py:165
+#: gnomemusic/widgets/playertoolbar.py:167
 msgid "Pause"
 msgstr "Wstrzymuje"
 
diff --git a/po/pt.po b/po/pt.po
index 108afa33..67c75713 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-music master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-music/issues\n"
-"POT-Creation-Date: 2022-02-19 12:39+0000\n"
-"PO-Revision-Date: 2022-02-19 17:45+0000\n"
+"POT-Creation-Date: 2022-08-27 13:27+0000\n"
+"PO-Revision-Date: 2022-08-28 14:21+0100\n"
 "Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n"
 "Language-Team: Portuguese <>\n"
 "Language: pt\n"
@@ -20,11 +20,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.0.1\n"
+"X-Generator: Poedit 3.1.1\n"
 
 #: data/org.gnome.Music.appdata.xml.in.in:6
-#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/application.py:61
-#: gnomemusic/window.py:71
+#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/about.py:236
+#: gnomemusic/application.py:61 gnomemusic/window.py:71
 msgid "Music"
 msgstr "Música"
 
@@ -45,9 +45,9 @@ msgstr ""
 "Encontre faixas na sua coleção local, use listas de reprodução geradas "
 "automaticamente ou categorize uma nova."
 
-#: data/org.gnome.Music.appdata.xml.in.in:149
+#: data/org.gnome.Music.appdata.xml.in.in:167
 msgid "The GNOME Music developers"
-msgstr "Programadores do Música"
+msgstr "Os Programadores do Música GNOME"
 
 #: data/org.gnome.Music.desktop.in.in:4
 msgid "Music Player"
@@ -119,78 +119,21 @@ msgstr ""
 "Ativa ou desativa envio de \"scrobbles\" e informações de “a tocar” ao Last."
 "fm."
 
-#: data/ui/AboutDialog.ui.in:9
-msgid "Copyright © 2018 GNOME Music Developers"
-msgstr "Copyright © 2018 Programadores do Música"
-
-#: data/ui/AboutDialog.ui.in:10
-msgid "A music player and management application for GNOME."
-msgstr "Uma aplicação para reprodução e gestão de música para o GNOME."
-
-#: data/ui/AboutDialog.ui.in:12
-msgid "Visit GNOME Music website"
-msgstr "Visite a página web do Música"
-
-#: data/ui/AboutDialog.ui.in:13
-msgid ""
-"GNOME Music is free software; you can redistribute it and/or modify it under "
-"the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"GNOME Music is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
-"\n"
-"The GNOME Music authors hereby grant permission for non-GPL compatible "
-"GStreamer plugins to be used and distributed together with GStreamer and "
-"GNOME Music.  This permission is above and beyond the permissions granted by "
-"the GPL license by which GNOME Music is covered.  If you modify this code, "
-"you may extend this exception to your version of the code, but you are not "
-"obligated to do so.  If you do not wish to do so, delete this exception "
-"statement from your version."
-msgstr ""
-"O GNOME Música é uma aplicação livre; pode redistribuí-la e/ou alterá-la sob "
-"os termos da Licença Pública Genérica GNU tal como publicada pela Free "
-"Software Foundation; ou a versão 2 da Licença, ou (à sua discrição) qualquer "
-"versão posterior.\n"
-"\n"
-"O GNOME Música é distribuído na esperança de ser útil, mas SEM QUALQUER "
-"GARANTIA; nem mesmo a garantia implícita de COMERCIALIZAÇÃO ou ADEQUAÇÃO A "
-"QUALQUER PROPÓSITO. Veja a Licença Pública Genérica GNU para mais detalhes.\n"
-"\n"
-"Deverá ter recebido uma cópia da Licença Pública Genérica GNU juntamente com "
-"o GNOME Música; se não, escreva (em Inglês) para a Free Software Foundation, "
-"Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
-"\n"
-"Os autores do GNOME Música concedem aqui permissão para que extensões "
-"compatíveis com o GStreamer não GPL sejam usadas e distribuídas com o "
-"GStreamer e o GNOME Música. Esta permissão está acima das permissões "
-"concedidas pela licença GPL pela qual o GNOME Música é coberto. Se modificar "
-"este código, pode estender a exceção à sua versão do código, mas não é "
-"obrigado a fazê-lo. Se não o quiser fazer, apague esta declaração de exceção "
-"da sua versão."
-
-#: data/ui/AlbumWidget.ui:86 data/ui/PlayerToolbar.ui:88
-#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:168
+#: data/ui/AlbumWidget.ui:84 data/ui/PlayerToolbar.ui:87
+#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:170
 msgid "Play"
 msgstr "Reproduzir"
 
-#: data/ui/AlbumWidget.ui:132 data/ui/PlaylistControls.ui:5
+#: data/ui/AlbumWidget.ui:130 data/ui/PlaylistControls.ui:5
 #: data/ui/SongWidgetMenu.ui:11
 msgid "_Play"
 msgstr "Re_Produzir"
 
-#: data/ui/AlbumWidget.ui:136
+#: data/ui/AlbumWidget.ui:134
 msgid "Add to _Favorite Songs"
 msgstr "Adicionar às músicas _favoritas"
 
-#: data/ui/AlbumWidget.ui:140 data/ui/SongWidgetMenu.ui:15
+#: data/ui/AlbumWidget.ui:138 data/ui/SongWidgetMenu.ui:15
 msgid "_Add to Playlist…"
 msgstr "_Adicionar à lista de reprodução…"
 
@@ -214,7 +157,7 @@ msgstr "A_Juda"
 msgid "_About Music"
 msgstr "_Sobre Música"
 
-#: data/ui/EmptyView.ui:26 data/ui/InitialState.ui:13
+#: data/ui/EmptyView.ui:30
 msgid "Welcome to Music"
 msgstr "Bem-vindo ao Música"
 
@@ -226,7 +169,7 @@ msgstr "Menu"
 msgid "Select"
 msgstr "Selecionar"
 
-#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:211
+#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:213
 #: data/ui/SearchHeaderBar.ui:20
 msgid "_Cancel"
 msgstr "_Cancelar"
@@ -324,10 +267,6 @@ msgctxt "shortcut window"
 msgid "Go back"
 msgstr "Voltar atrás"
 
-#: data/ui/InitialState.ui:25
-msgid "The contents of your Music Folder will appear here"
-msgstr "O conteúdo da pasta Música aparecerá aqui"
-
 #: data/ui/LastfmDialog.ui:21
 msgid ""
 "Last.fm is a music discovery service that gives you personalised "
@@ -348,11 +287,11 @@ msgstr "Inicie sessão na sua conta Last.fm para relatar as músicas que ouve."
 msgid "Login"
 msgstr "Início de sessão"
 
-#: data/ui/PlayerToolbar.ui:75
+#: data/ui/PlayerToolbar.ui:74
 msgid "Previous"
 msgstr "Anterior"
 
-#: data/ui/PlayerToolbar.ui:107
+#: data/ui/PlayerToolbar.ui:106
 msgid "Next"
 msgstr "Seguinte"
 
@@ -388,11 +327,11 @@ msgstr "Nova lista de reprodução…"
 msgid "Add"
 msgstr "Adicionar"
 
-#: data/ui/PlaylistDialog.ui:200
+#: data/ui/PlaylistDialog.ui:202
 msgid "Add to Playlist"
 msgstr "Adicionar à lista de reprodução"
 
-#: data/ui/PlaylistDialog.ui:220
+#: data/ui/PlaylistDialog.ui:222
 msgid "_Add"
 msgstr "_Adicionar"
 
@@ -404,7 +343,7 @@ msgstr "Artistas"
 msgid "View All"
 msgstr "Ver tudo"
 
-#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:54
+#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:56
 msgid "Albums"
 msgstr "Álbuns"
 
@@ -432,6 +371,22 @@ msgstr "_Adicionar à lista de reprodução"
 msgid "_Remove from Playlist"
 msgstr "_Remover da lista de reprodução"
 
+#: gnomemusic/about.py:238
+msgid "The GNOME Project"
+msgstr "O Projeto GNOME"
+
+#: gnomemusic/about.py:242
+msgid "translator-credits"
+msgstr "Hugo Carvalho <hugokarvalho@hotmail.com>"
+
+#: gnomemusic/about.py:246
+msgid "Copyright The GNOME Music Developers"
+msgstr "Direitos de autor Os Programadores do Música GNOME"
+
+#: gnomemusic/about.py:249
+msgid "Translated by"
+msgstr "Traduzido por"
+
 #. TRANSLATORS: this is a playlist name
 #: gnomemusic/grilowrappers/grltrackerplaylists.py:894
 msgid "Most Played"
@@ -547,7 +502,7 @@ msgstr "Tente uma pesquisa diferente"
 
 #: gnomemusic/views/emptyview.py:129
 msgid "GNOME Music could not connect to Tracker."
-msgstr "O Música não pôde ligar ao rastreador."
+msgstr "Não foi possível ao Música GNOME estabelecer ligação com o rastreador."
 
 #: gnomemusic/views/emptyview.py:131
 msgid "Your music files cannot be indexed without Tracker running."
@@ -575,7 +530,7 @@ msgstr "Artistas encontrados"
 msgid "Albums Results"
 msgstr "Álbuns encontrados"
 
-#: gnomemusic/widgets/albumwidget.py:240
+#: gnomemusic/widgets/albumwidget.py:245
 msgid "{} minute"
 msgid_plural "{} minutes"
 msgstr[0] "{} minuto"
@@ -608,7 +563,7 @@ msgstr "Sessão iniciada como {}"
 msgid "Configure"
 msgstr "Configurar"
 
-#: gnomemusic/widgets/playertoolbar.py:165
+#: gnomemusic/widgets/playertoolbar.py:167
 msgid "Pause"
 msgstr "Pausa"
 
@@ -618,6 +573,61 @@ msgid_plural "{} Songs"
 msgstr[0] "{} música"
 msgstr[1] "{} músicas"
 
+#~ msgid "A music player and management application for GNOME."
+#~ msgstr "Uma aplicação para reprodução e gestão de música para o GNOME."
+
+#~ msgid "Visit GNOME Music website"
+#~ msgstr "Visite a página web do Música"
+
+#~ msgid ""
+#~ "GNOME Music is free software; you can redistribute it and/or modify it "
+#~ "under the terms of the GNU General Public License as published by the "
+#~ "Free Software Foundation; either version 2 of the License, or (at your "
+#~ "option) any later version.\n"
+#~ "\n"
+#~ "GNOME Music is distributed in the hope that it will be useful, but "
+#~ "WITHOUT ANY WARRANTY; without even the implied warranty of "
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General "
+#~ "Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License along "
+#~ "with GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
+#~ "Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
+#~ "\n"
+#~ "The GNOME Music authors hereby grant permission for non-GPL compatible "
+#~ "GStreamer plugins to be used and distributed together with GStreamer and "
+#~ "GNOME Music.  This permission is above and beyond the permissions granted "
+#~ "by the GPL license by which GNOME Music is covered.  If you modify this "
+#~ "code, you may extend this exception to your version of the code, but you "
+#~ "are not obligated to do so.  If you do not wish to do so, delete this "
+#~ "exception statement from your version."
+#~ msgstr ""
+#~ "O GNOME Música é uma aplicação livre; pode redistribuí-la e/ou alterá-la "
+#~ "sob os termos da Licença Pública Genérica GNU tal como publicada pela "
+#~ "Free Software Foundation; ou a versão 2 da Licença, ou (à sua discrição) "
+#~ "qualquer versão posterior.\n"
+#~ "\n"
+#~ "O GNOME Música é distribuído na esperança de ser útil, mas SEM QUALQUER "
+#~ "GARANTIA; nem mesmo a garantia implícita de COMERCIALIZAÇÃO ou ADEQUAÇÃO "
+#~ "A QUALQUER PROPÓSITO. Veja a Licença Pública Genérica GNU para mais "
+#~ "detalhes.\n"
+#~ "\n"
+#~ "Deverá ter recebido uma cópia da Licença Pública Genérica GNU juntamente "
+#~ "com o GNOME Música; se não, escreva (em Inglês) para a Free Software "
+#~ "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 "
+#~ "USA.\n"
+#~ "\n"
+#~ "Os autores do GNOME Música concedem aqui permissão para que extensões "
+#~ "compatíveis com o GStreamer não GPL sejam usadas e distribuídas com o "
+#~ "GStreamer e o GNOME Música. Esta permissão está acima das permissões "
+#~ "concedidas pela licença GPL pela qual o GNOME Música é coberto. Se "
+#~ "modificar este código, pode estender a exceção à sua versão do código, "
+#~ "mas não é obrigado a fazê-lo. Se não o quiser fazer, apague esta "
+#~ "declaração de exceção da sua versão."
+
+#~ msgid "The contents of your Music Folder will appear here"
+#~ msgstr "O conteúdo da pasta Música aparecerá aqui"
+
 #~ msgid "GNOME Music"
 #~ msgstr "Música"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index a2af5bab..754d4c30 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,5 +1,5 @@
 # Brazilian Portuguese translation for gnome-music.
-# Copyright (C) 2021 gnome-music's COPYRIGHT HOLDER
+# Copyright (C) 2022 gnome-music's COPYRIGHT HOLDER
 # This file is distributed under the same license as the gnome-music package.
 # Georges Basile Stavracas Neto <georges.stavracas@gmail.com>, 2013.
 # Antonio Fernandes C. Neto <fernandesn@gnome.org>, 2013.
@@ -9,16 +9,17 @@
 # Fábio Nogueira <fnogueira@gnome.org> 2018.
 # Henrique Machado Campos <henriquecamposrj@gmail.com>, 2020.
 # Rafael Fontenelle <rafaelff@gnome.org>, 2012-2021.
-# Enrico Nicoletto <liverig@gmail.com>, 2013-2016, 2021.
+# Enrico Nicoletto <hiko@duck.com>, 2013-2016, 2021-2022.
 # Matheus Barbosa <mdpb.matheus@gmail.com>, 2022.
+# Leônidas Araújo <leorusvellt@hotmail.com>, 2022.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-music master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-music/issues\n"
-"POT-Creation-Date: 2022-02-19 12:39+0000\n"
-"PO-Revision-Date: 2022-02-19 16:27-0300\n"
-"Last-Translator: Matheus Barbosa <mdpb.matheus@gmail.com>\n"
+"POT-Creation-Date: 2022-08-31 10:45+0000\n"
+"PO-Revision-Date: 2022-08-31 08:46-0300\n"
+"Last-Translator: Leônidas Araújo <leorusvellt@hotmail.com>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +28,15 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 "X-Generator: Gtranslator 40.0\n"
 "X-Project-Style: gnome\n"
+"X-DL-Team: pt_BR\n"
+"X-DL-Module: gnome-music\n"
+"X-DL-Branch: master\n"
+"X-DL-Domain: po\n"
+"X-DL-State: Translating\n"
 
 #: data/org.gnome.Music.appdata.xml.in.in:6
-#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/application.py:61
-#: gnomemusic/window.py:71
+#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/about.py:236
+#: gnomemusic/application.py:61 gnomemusic/window.py:71
 msgid "Music"
 msgstr "Música"
 
@@ -51,7 +57,7 @@ msgstr ""
 "Localize faixas na sua coleção local, use listas de reprodução geradas "
 "automaticamente ou faça a curadoria de uma nova."
 
-#: data/org.gnome.Music.appdata.xml.in.in:149
+#: data/org.gnome.Music.appdata.xml.in.in:167
 msgid "The GNOME Music developers"
 msgstr "Os Desenvolvedores do GNOME Música"
 
@@ -127,80 +133,21 @@ msgstr ""
 "Habilita ou desabilita enviar scrobbles e a informação “currently playing” "
 "para o Last.fm."
 
-#: data/ui/AboutDialog.ui.in:9
-msgid "Copyright © 2018 GNOME Music Developers"
-msgstr "Copyright © 2018 Desenvolvedores do GNOME Música"
-
-#: data/ui/AboutDialog.ui.in:10
-msgid "A music player and management application for GNOME."
-msgstr "Um reprodutor de músicas e aplicativo de gerenciamento para o GNOME."
-
-#: data/ui/AboutDialog.ui.in:12
-msgid "Visit GNOME Music website"
-msgstr "Visite o web site do aplicativo GNOME Música"
-
-#: data/ui/AboutDialog.ui.in:13
-msgid ""
-"GNOME Music is free software; you can redistribute it and/or modify it under "
-"the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"GNOME Music is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
-"\n"
-"The GNOME Music authors hereby grant permission for non-GPL compatible "
-"GStreamer plugins to be used and distributed together with GStreamer and "
-"GNOME Music.  This permission is above and beyond the permissions granted by "
-"the GPL license by which GNOME Music is covered.  If you modify this code, "
-"you may extend this exception to your version of the code, but you are not "
-"obligated to do so.  If you do not wish to do so, delete this exception "
-"statement from your version."
-msgstr ""
-"O GNOME Música é um software livre; você pode redistribuí-lo e/ou modificá-"
-"lo sob os termos da Licença Pública Geral GNU publicada pela Free Software "
-"Foundation; qualquer versão 2 da Licença, ou (a seu critério) outra versão "
-"posterior.\n"
-"\n"
-"O GNOME Música é distribuído na expectativa de que seja útil, mas SEM "
-"NENHUMA GARANTIA; sem mesmo implicar garantias de COMERCIALIZAÇÃO ou "
-"ADEQUAÇÃO A UM FIM ESPECÍFICO. Veja a Licença Pública Geral GNU (GPL) para "
-"mais detalhes.\n"
-"\n"
-"Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com o "
-"aplicativo GNOME Música; caso contrário, escreva para a Free Software "
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, "
-"EUA.\n"
-"\n"
-"Os autores do GNOME Música concedem por este meio permissão para uso de plug-"
-"ins compatíveis com GStreamer não consoantes com a GPL e distribuição junto "
-"com o GStreamer e aplicativo GNOME Música. Esta permissão está acima e além "
-"das permissões concedidas pela licença GPL a qual cobre o aplicativo GNOME "
-"Música. Se você modificar esse código, você pode estender essa exceção para "
-"a sua versão do código, mas você não é obrigado a fazê-lo. Se você não "
-"desejar fazer isto, exclua esta declaração de exceção da sua versão."
-
-#: data/ui/AlbumWidget.ui:86 data/ui/PlayerToolbar.ui:88
-#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:168
+#: data/ui/AlbumWidget.ui:84 data/ui/PlayerToolbar.ui:87
+#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:170
 msgid "Play"
 msgstr "Reproduzir"
 
-#: data/ui/AlbumWidget.ui:132 data/ui/PlaylistControls.ui:5
+#: data/ui/AlbumWidget.ui:130 data/ui/PlaylistControls.ui:5
 #: data/ui/SongWidgetMenu.ui:11
 msgid "_Play"
 msgstr "_Reproduzir"
 
-#: data/ui/AlbumWidget.ui:136
+#: data/ui/AlbumWidget.ui:134
 msgid "Add to _Favorite Songs"
 msgstr "Adicionar para músicas _favoritas"
 
-#: data/ui/AlbumWidget.ui:140 data/ui/SongWidgetMenu.ui:15
+#: data/ui/AlbumWidget.ui:138 data/ui/SongWidgetMenu.ui:15
 msgid "_Add to Playlist…"
 msgstr "_Adicionar para lista de reprodução…"
 
@@ -224,7 +171,7 @@ msgstr "A_juda"
 msgid "_About Music"
 msgstr "_Sobre o Música"
 
-#: data/ui/EmptyView.ui:26 data/ui/InitialState.ui:13
+#: data/ui/EmptyView.ui:30
 msgid "Welcome to Music"
 msgstr "Boas vindas ao Música"
 
@@ -236,7 +183,7 @@ msgstr "Menu"
 msgid "Select"
 msgstr "Selecionar"
 
-#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:211
+#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:213
 #: data/ui/SearchHeaderBar.ui:20
 msgid "_Cancel"
 msgstr "_Cancelar"
@@ -334,11 +281,6 @@ msgctxt "shortcut window"
 msgid "Go back"
 msgstr "Volta"
 
-#: data/ui/InitialState.ui:25
-#| msgid "The contents of your {} will appear here."
-msgid "The contents of your Music Folder will appear here"
-msgstr "Os conteúdos da sua pasta de músicas aparecerão aqui."
-
 #: data/ui/LastfmDialog.ui:21
 msgid ""
 "Last.fm is a music discovery service that gives you personalised "
@@ -359,11 +301,11 @@ msgstr "Faça login sua conta do Last.fm para relatar suas músicas."
 msgid "Login"
 msgstr "Entrar"
 
-#: data/ui/PlayerToolbar.ui:75
+#: data/ui/PlayerToolbar.ui:74
 msgid "Previous"
 msgstr "Anterior"
 
-#: data/ui/PlayerToolbar.ui:107
+#: data/ui/PlayerToolbar.ui:106
 msgid "Next"
 msgstr "Próxima"
 
@@ -399,11 +341,11 @@ msgstr "Nova lista de reprodução…"
 msgid "Add"
 msgstr "Adicionar"
 
-#: data/ui/PlaylistDialog.ui:200
+#: data/ui/PlaylistDialog.ui:202
 msgid "Add to Playlist"
 msgstr "Adicionar para lista de reprodução"
 
-#: data/ui/PlaylistDialog.ui:220
+#: data/ui/PlaylistDialog.ui:222
 msgid "_Add"
 msgstr "_Adicionar"
 
@@ -415,7 +357,7 @@ msgstr "Artistas"
 msgid "View All"
 msgstr "Ver tudo"
 
-#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:54
+#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:56
 msgid "Albums"
 msgstr "Álbuns"
 
@@ -443,6 +385,22 @@ msgstr "_Adicionar para lista de reprodução"
 msgid "_Remove from Playlist"
 msgstr "_Remover da lista de reprodução"
 
+#: gnomemusic/about.py:238
+msgid "The GNOME Project"
+msgstr "O Projeto GNOME"
+
+#: gnomemusic/about.py:242
+msgid "translator-credits"
+msgstr "créditos-do-tradutor"
+
+#: gnomemusic/about.py:246
+msgid "Copyright The GNOME Music Developers"
+msgstr "Direitos autorais dos desenvolvedores do GNOME Música"
+
+#: gnomemusic/about.py:249
+msgid "Translated by"
+msgstr "Traduzido por"
+
 #. TRANSLATORS: this is a playlist name
 #: gnomemusic/grilowrappers/grltrackerplaylists.py:894
 msgid "Most Played"
@@ -585,7 +543,7 @@ msgstr "Resultados de artistas"
 msgid "Albums Results"
 msgstr "Resultados de álbuns"
 
-#: gnomemusic/widgets/albumwidget.py:240
+#: gnomemusic/widgets/albumwidget.py:245
 msgid "{} minute"
 msgid_plural "{} minutes"
 msgstr[0] "{} minuto"
@@ -618,7 +576,7 @@ msgstr "Autenticado como {}"
 msgid "Configure"
 msgstr "Configurar"
 
-#: gnomemusic/widgets/playertoolbar.py:165
+#: gnomemusic/widgets/playertoolbar.py:167
 msgid "Pause"
 msgstr "Pausar"
 
@@ -627,18 +585,3 @@ msgid "{} Song"
 msgid_plural "{} Songs"
 msgstr[0] "{} música"
 msgstr[1] "{} músicas"
-
-#~ msgid "GNOME Music"
-#~ msgstr "GNOME Música"
-
-#~ msgid "Window position"
-#~ msgstr "Posição da janela"
-
-#~ msgid "Window position (x and y)."
-#~ msgstr "Posição da janela (x e y)."
-
-#~ msgid "Loading"
-#~ msgstr "Carregando"
-
-#~ msgid "Add to Playlist…"
-#~ msgstr "Adicionar para lista de reprodução…"
diff --git a/po/ru.po b/po/ru.po
index af314036..923954c9 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,21 +12,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-music master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-music/issues\n"
-"POT-Creation-Date: 2022-02-19 12:39+0000\n"
-"PO-Revision-Date: 2022-02-20 12:35+0300\n"
+"POT-Creation-Date: 2022-08-27 13:27+0000\n"
+"PO-Revision-Date: 2022-08-27 16:40+0300\n"
 "Last-Translator: Aleksandr Melman <Alexmelman88@gmail.com>\n"
 "Language-Team: Русский <gnome-cyr@gnome.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Poedit 3.0.1\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 3.1\n"
 
 #: data/org.gnome.Music.appdata.xml.in.in:6
-#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/application.py:61
-#: gnomemusic/window.py:71
+#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/about.py:236
+#: gnomemusic/application.py:61 gnomemusic/window.py:71
 msgid "Music"
 msgstr "Музыка"
 
@@ -47,9 +47,9 @@ msgstr ""
 "Ищите треки в вашей коллекции, пользуйтесь автоматическими списками "
 "воспроизведения или соберите свой свежий."
 
-#: data/org.gnome.Music.appdata.xml.in.in:149
+#: data/org.gnome.Music.appdata.xml.in.in:167
 msgid "The GNOME Music developers"
-msgstr "Авторское право © 2018 Разработчики приложения Музыка GNOME"
+msgstr "Разработчики приложения Музыка GNOME"
 
 #: data/org.gnome.Music.desktop.in.in:4
 msgid "Music Player"
@@ -124,80 +124,21 @@ msgstr ""
 "Включает или отключает отправку скробблов и информации о «текущем "
 "воспроизведении» на Last.fm."
 
-#: data/ui/AboutDialog.ui.in:9
-msgid "Copyright © 2018 GNOME Music Developers"
-msgstr "Авторское право © 2018 Разработчики приложения Музыка GNOME"
-
-#: data/ui/AboutDialog.ui.in:10
-msgid "A music player and management application for GNOME."
-msgstr "Воспроизведение и управление музыкальной коллекцией в GNOME."
-
-#: data/ui/AboutDialog.ui.in:12
-msgid "Visit GNOME Music website"
-msgstr "Посетить веб-сайт приложения"
-
-#: data/ui/AboutDialog.ui.in:13
-msgid ""
-"GNOME Music is free software; you can redistribute it and/or modify it under "
-"the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"GNOME Music is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
-"\n"
-"The GNOME Music authors hereby grant permission for non-GPL compatible "
-"GStreamer plugins to be used and distributed together with GStreamer and "
-"GNOME Music.  This permission is above and beyond the permissions granted by "
-"the GPL license by which GNOME Music is covered.  If you modify this code, "
-"you may extend this exception to your version of the code, but you are not "
-"obligated to do so.  If you do not wish to do so, delete this exception "
-"statement from your version."
-msgstr ""
-"Приложение «Музыка GNOME» является свободным программным обеспечением, вы "
-"можете распространять и/или изменять его в соответствии с условиями GNU "
-"General Public License, опубликованной Free Software Foundation, либо GNU "
-"General Public License v2, либо (на ваш выбор) любой более поздней версии.\n"
-"\n"
-"Приложение «Музыка GNOME» распространяется в надежде, что оно будет "
-"полезным, но БЕЗ КАКИХ-ЛИБО ГАРАНТИЙ, даже без подразумеваемых гарантий "
-"КОММЕРЧЕСКОЙ ЦЕННОСТИ или ПРИГОДНОСТИ ДЛЯ КОНКРЕТНЫХ ЦЕЛЕЙ. См. GNU General "
-"Public License для более подробной информации.\n"
-"\n"
-"Вы должны были получить копию GNU General Public License вместе с "
-"приложением «Музыка GNOME»; а если нет, напишите в Free Software Foundation, "
-"Inc, 51 Franklin Street, пятый этаж, Boston, MA 02110-1301 США.\n"
-"\n"
-"Авторы приложения «Музыка GNOME» предоставляют разрешение на использование "
-"не-GPL совместимых модулей GStreamer, которые будут поставлены с GStreamer и "
-"«Музыка GNOME». Это разрешение выше и вне разрешений, предоставленных "
-"лицензией GPL, которой защищено приложение «Музыка GNOME». При изменении "
-"этого кода, вы можете распространить данное исключение на вашу версию кода, "
-"но вы не обязаны это делать. Если вы не хотите распространить данное "
-"исключение на вашу версию кода, просто удалите данное заявление об "
-"исключении из вашей версии кода."
-
-#: data/ui/AlbumWidget.ui:86 data/ui/PlayerToolbar.ui:88
-#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:168
+#: data/ui/AlbumWidget.ui:84 data/ui/PlayerToolbar.ui:87
+#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:170
 msgid "Play"
 msgstr "Воспроизвести"
 
-#: data/ui/AlbumWidget.ui:132 data/ui/PlaylistControls.ui:5
+#: data/ui/AlbumWidget.ui:130 data/ui/PlaylistControls.ui:5
 #: data/ui/SongWidgetMenu.ui:11
 msgid "_Play"
 msgstr "_Воспроизвести"
 
-#: data/ui/AlbumWidget.ui:136
+#: data/ui/AlbumWidget.ui:134
 msgid "Add to _Favorite Songs"
 msgstr "Добавить в _избранные песни"
 
-#: data/ui/AlbumWidget.ui:140 data/ui/SongWidgetMenu.ui:15
+#: data/ui/AlbumWidget.ui:138 data/ui/SongWidgetMenu.ui:15
 msgid "_Add to Playlist…"
 msgstr "_Добавить в список воспроизведения…"
 
@@ -221,7 +162,7 @@ msgstr "_Справка"
 msgid "_About Music"
 msgstr "_О приложении"
 
-#: data/ui/EmptyView.ui:26 data/ui/InitialState.ui:13
+#: data/ui/EmptyView.ui:30
 msgid "Welcome to Music"
 msgstr "Добро пожаловать в Музыку"
 
@@ -233,7 +174,7 @@ msgstr "Меню"
 msgid "Select"
 msgstr "Выбрать"
 
-#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:211
+#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:213
 #: data/ui/SearchHeaderBar.ui:20
 msgid "_Cancel"
 msgstr "_Отмена"
@@ -331,10 +272,6 @@ msgctxt "shortcut window"
 msgid "Go back"
 msgstr "Перейти назад"
 
-#: data/ui/InitialState.ui:25
-msgid "The contents of your Music Folder will appear here"
-msgstr "Содержимое папки Музыка появится здесь"
-
 #: data/ui/LastfmDialog.ui:21
 msgid ""
 "Last.fm is a music discovery service that gives you personalised "
@@ -358,12 +295,12 @@ msgid "Login"
 msgstr "Войти"
 
 # Предыдущая композиция
-#: data/ui/PlayerToolbar.ui:75
+#: data/ui/PlayerToolbar.ui:74
 msgid "Previous"
 msgstr "Предыдущая"
 
 # Следующая композиция
-#: data/ui/PlayerToolbar.ui:107
+#: data/ui/PlayerToolbar.ui:106
 msgid "Next"
 msgstr "Следующая"
 
@@ -399,11 +336,11 @@ msgstr "Создать список воспроизведения…"
 msgid "Add"
 msgstr "Добавить"
 
-#: data/ui/PlaylistDialog.ui:200
+#: data/ui/PlaylistDialog.ui:202
 msgid "Add to Playlist"
 msgstr "Добавить в список воспроизведения"
 
-#: data/ui/PlaylistDialog.ui:220
+#: data/ui/PlaylistDialog.ui:222
 msgid "_Add"
 msgstr "_Добавить"
 
@@ -415,7 +352,7 @@ msgstr "Исполнители"
 msgid "View All"
 msgstr "Посмотреть все"
 
-#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:54
+#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:56
 msgid "Albums"
 msgstr "Альбомы"
 
@@ -443,10 +380,33 @@ msgstr "_Добавить в список воспроизведения"
 msgid "_Remove from Playlist"
 msgstr "_Удалить из списка воспроизведения"
 
+#: gnomemusic/about.py:238
+msgid "The GNOME Project"
+msgstr "The GNOME Project"
+
+#: gnomemusic/about.py:242
+msgid "translator-credits"
+msgstr ""
+"Andrew Archer <razandale@gmail.com>, 2014\n"
+"Mihail Gurin <mikegurin@yandex.ru>, 2014\n"
+"Ivan Komaritsyn <vantu5z@mail.ru>, 2015\n"
+"Yuri Myasoedov <ymyasoedov@yandex.ru>, 2012, 2014, 2015\n"
+"Stas Solovey <whats_up@tut.by>, 2012-2018, 2019\n"
+"Артемий Судаков <finziyr@yandex.ru>, 2020\n"
+"Aleksandr Melman <alexmelman88@gmail.com>, 2022"
+
+#: gnomemusic/about.py:246
+msgid "Copyright The GNOME Music Developers"
+msgstr "Авторское право © Разработчики приложения Музыка GNOME"
+
+#: gnomemusic/about.py:249
+msgid "Translated by"
+msgstr "Перевод"
+
 #. TRANSLATORS: this is a playlist name
 #: gnomemusic/grilowrappers/grltrackerplaylists.py:894
 msgid "Most Played"
-msgstr "Самый популярный"
+msgstr "Часто воспроизводимое"
 
 #. TRANSLATORS: this is a playlist name
 #: gnomemusic/grilowrappers/grltrackerplaylists.py:948
@@ -586,7 +546,7 @@ msgstr "Результаты по исполнителям"
 msgid "Albums Results"
 msgstr "Результаты по альбомам"
 
-#: gnomemusic/widgets/albumwidget.py:240
+#: gnomemusic/widgets/albumwidget.py:245
 msgid "{} minute"
 msgid_plural "{} minutes"
 msgstr[0] "{} минута"
@@ -621,7 +581,7 @@ msgstr "Вы вошли как {}"
 msgid "Configure"
 msgstr "Настроить"
 
-#: gnomemusic/widgets/playertoolbar.py:165
+#: gnomemusic/widgets/playertoolbar.py:167
 msgid "Pause"
 msgstr "Приостановить"
 
@@ -631,3 +591,60 @@ msgid_plural "{} Songs"
 msgstr[0] "{} композиция"
 msgstr[1] "{} композиции"
 msgstr[2] "{} композиций"
+
+#~ msgid "A music player and management application for GNOME."
+#~ msgstr "Воспроизведение и управление музыкальной коллекцией в GNOME."
+
+#~ msgid "Visit GNOME Music website"
+#~ msgstr "Посетить веб-сайт приложения"
+
+#~ msgid ""
+#~ "GNOME Music is free software; you can redistribute it and/or modify it "
+#~ "under the terms of the GNU General Public License as published by the "
+#~ "Free Software Foundation; either version 2 of the License, or (at your "
+#~ "option) any later version.\n"
+#~ "\n"
+#~ "GNOME Music is distributed in the hope that it will be useful, but "
+#~ "WITHOUT ANY WARRANTY; without even the implied warranty of "
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General "
+#~ "Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License along "
+#~ "with GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
+#~ "Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
+#~ "\n"
+#~ "The GNOME Music authors hereby grant permission for non-GPL compatible "
+#~ "GStreamer plugins to be used and distributed together with GStreamer and "
+#~ "GNOME Music.  This permission is above and beyond the permissions granted "
+#~ "by the GPL license by which GNOME Music is covered.  If you modify this "
+#~ "code, you may extend this exception to your version of the code, but you "
+#~ "are not obligated to do so.  If you do not wish to do so, delete this "
+#~ "exception statement from your version."
+#~ msgstr ""
+#~ "Приложение «Музыка GNOME» является свободным программным обеспечением, вы "
+#~ "можете распространять и/или изменять его в соответствии с условиями GNU "
+#~ "General Public License, опубликованной Free Software Foundation, либо GNU "
+#~ "General Public License v2, либо (на ваш выбор) любой более поздней "
+#~ "версии.\n"
+#~ "\n"
+#~ "Приложение «Музыка GNOME» распространяется в надежде, что оно будет "
+#~ "полезным, но БЕЗ КАКИХ-ЛИБО ГАРАНТИЙ, даже без подразумеваемых гарантий "
+#~ "КОММЕРЧЕСКОЙ ЦЕННОСТИ или ПРИГОДНОСТИ ДЛЯ КОНКРЕТНЫХ ЦЕЛЕЙ. См. GNU "
+#~ "General Public License для более подробной информации.\n"
+#~ "\n"
+#~ "Вы должны были получить копию GNU General Public License вместе с "
+#~ "приложением «Музыка GNOME»; а если нет, напишите в Free Software "
+#~ "Foundation, Inc, 51 Franklin Street, пятый этаж, Boston, MA 02110-1301 "
+#~ "США.\n"
+#~ "\n"
+#~ "Авторы приложения «Музыка GNOME» предоставляют разрешение на "
+#~ "использование не-GPL совместимых модулей GStreamer, которые будут "
+#~ "поставлены с GStreamer и «Музыка GNOME». Это разрешение выше и вне "
+#~ "разрешений, предоставленных лицензией GPL, которой защищено приложение "
+#~ "«Музыка GNOME». При изменении этого кода, вы можете распространить данное "
+#~ "исключение на вашу версию кода, но вы не обязаны это делать. Если вы не "
+#~ "хотите распространить данное исключение на вашу версию кода, просто "
+#~ "удалите данное заявление об исключении из вашей версии кода."
+
+#~ msgid "The contents of your Music Folder will appear here"
+#~ msgstr "Содержимое папки Музыка появится здесь"
diff --git a/po/sk.po b/po/sk.po
index f03bdf99..ebd3b984 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-music master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-music/issues\n"
-"POT-Creation-Date: 2022-02-19 12:39+0000\n"
-"PO-Revision-Date: 2022-02-25 08:53+0100\n"
+"POT-Creation-Date: 2022-08-27 13:27+0000\n"
+"PO-Revision-Date: 2022-10-07 14:36+0200\n"
 "Last-Translator: Dušan Kazik <prescott66@gmail.com>\n"
 "Language-Team: Slovak <gnome-sk-list@gnome.org>\n"
 "Language: sk\n"
@@ -16,11 +16,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Generator: Poedit 3.0.1\n"
+"X-Generator: Poedit 3.1.1\n"
 
 #: data/org.gnome.Music.appdata.xml.in.in:6
-#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/application.py:61
-#: gnomemusic/window.py:71
+#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/about.py:236
+#: gnomemusic/application.py:61 gnomemusic/window.py:71
 msgid "Music"
 msgstr "Hudba"
 
@@ -41,7 +41,7 @@ msgstr ""
 "Nájdite stopy vo vašej miestnej zbierke, použite automaticky vygenerované "
 "zoznamy skladieb alebo vytvorte svoj vlastný."
 
-#: data/org.gnome.Music.appdata.xml.in.in:149
+#: data/org.gnome.Music.appdata.xml.in.in:167
 msgid "The GNOME Music developers"
 msgstr "Vývojári aplikácie Hudba prostredia GNOME"
 
@@ -116,82 +116,23 @@ msgstr ""
 "Povolí alebo zakáže odosielanie názvov skladieb (scrobbling) a informáciu "
 "„aktuálne prehrávané“ službe Last.fm."
 
-#: data/ui/AboutDialog.ui.in:9
-msgid "Copyright © 2018 GNOME Music Developers"
-msgstr "Autorské práva © 2018 Vývojári aplikácie Hudba prostredia GNOME"
-
-#: data/ui/AboutDialog.ui.in:10
-msgid "A music player and management application for GNOME."
-msgstr "Aplikácia na prehrávanie a správu hudby prostredia GNOME."
-
-#: data/ui/AboutDialog.ui.in:12
-msgid "Visit GNOME Music website"
-msgstr "Navštíviť domovskú stránku aplikácie Hudba prostredia GNOME"
-
-#: data/ui/AboutDialog.ui.in:13
-msgid ""
-"GNOME Music is free software; you can redistribute it and/or modify it under "
-"the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"GNOME Music is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
-"\n"
-"The GNOME Music authors hereby grant permission for non-GPL compatible "
-"GStreamer plugins to be used and distributed together with GStreamer and "
-"GNOME Music.  This permission is above and beyond the permissions granted by "
-"the GPL license by which GNOME Music is covered.  If you modify this code, "
-"you may extend this exception to your version of the code, but you are not "
-"obligated to do so.  If you do not wish to do so, delete this exception "
-"statement from your version."
-msgstr ""
-"Aplikácia Hudba prostredia GNOME je slobodný softvér; môžete ho ďalej šíriť "
-"a upravovať podľa ustanovení licencie GNU General Public Licence (Všeobecná "
-"zverejňovacia licencia GNU), vydávanej nadáciou Free Software Foundation a "
-"to buď podľa 2. verzie tejto licencie, alebo (podľa vášho uváženia) "
-"ktorejkoľvek neskoršej verzie.\n"
-"\n"
-"Tento program je rozširovaný v nádeji, že bude užitočný, avšak BEZ "
-"AKEJKOĽVEK ZÁRUKY. Neposkytujú sa ani odvodené záruky PREDAJNOSTI alebo "
-"VHODNOSTI NA URČITÝ ÚČEL. Ďalšie podrobnosti hľadajte v licencii GNU General "
-"Public License.\n"
-"\n"
-"Kópiu licencie GNU General Public License by ste mali dostať spolu s týmto "
-"programom. Ak sa tak nestalo, napíšte na adresu Free Software Foundation, "
-"Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n"
-"\n"
-"Autori programu Hudba prostredia GNOME týmto vyhlasujú, že udeľujú právo "
-"použiť a distribuovať zásuvné moduly knižnice GStreamer, ktoré nie sú "
-"kompatibilné s GPL, spolu s týmto programom. Toto právo je nadrámec práv "
-"zaručených licenciou GPL, pod ktorú tento program spadá.  Ak upravíte "
-"zdrojový kód tohto programu, môžete túto výnimku použiť aj na vašu verziu "
-"kódu, no nie ste povinný tak urobiť. Ak to nechcete urobiť, vymažte z túto "
-"výnimku z vyhlásenia vo vašej verzii kódu."
-
 # tooltip
-#: data/ui/AlbumWidget.ui:86 data/ui/PlayerToolbar.ui:88
-#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:168
+#: data/ui/AlbumWidget.ui:84 data/ui/PlayerToolbar.ui:87
+#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:170
 msgid "Play"
 msgstr "Prehrá"
 
-#: data/ui/AlbumWidget.ui:132 data/ui/PlaylistControls.ui:5
+#: data/ui/AlbumWidget.ui:130 data/ui/PlaylistControls.ui:5
 #: data/ui/SongWidgetMenu.ui:11
 msgid "_Play"
 msgstr "_Prehrať"
 
-#: data/ui/AlbumWidget.ui:136
+#: data/ui/AlbumWidget.ui:134
 msgid "Add to _Favorite Songs"
 msgstr "Pridať _medzi obľúbené skladby"
 
 # gtk button
-#: data/ui/AlbumWidget.ui:140 data/ui/SongWidgetMenu.ui:15
+#: data/ui/AlbumWidget.ui:138 data/ui/SongWidgetMenu.ui:15
 msgid "_Add to Playlist…"
 msgstr "_Pridať do zoznamu skladieb…"
 
@@ -215,7 +156,7 @@ msgstr "_Pomocník"
 msgid "_About Music"
 msgstr "_O aplikácii Hudba"
 
-#: data/ui/EmptyView.ui:26 data/ui/InitialState.ui:13
+#: data/ui/EmptyView.ui:30
 msgid "Welcome to Music"
 msgstr "Vitajte v aplikácii Hudba"
 
@@ -228,7 +169,7 @@ msgstr "Ponuka"
 msgid "Select"
 msgstr "Vyberie"
 
-#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:211
+#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:213
 #: data/ui/SearchHeaderBar.ui:20
 msgid "_Cancel"
 msgstr "_Zrušiť"
@@ -329,10 +270,6 @@ msgctxt "shortcut window"
 msgid "Go back"
 msgstr "Prejdenie späť"
 
-#: data/ui/InitialState.ui:25
-msgid "The contents of your Music Folder will appear here"
-msgstr "Tu sa zobrazí obsah vášho priečinku s hudbou"
-
 #: data/ui/LastfmDialog.ui:21
 msgid ""
 "Last.fm is a music discovery service that gives you personalised "
@@ -353,12 +290,12 @@ msgstr "Pre nahlásenie vami počúvanej hudby, sa prihláste do služby Last.fm
 msgid "Login"
 msgstr "Prihlásiť"
 
-#: data/ui/PlayerToolbar.ui:75
+#: data/ui/PlayerToolbar.ui:74
 msgid "Previous"
 msgstr "Predchádzajúca"
 
 # DK: skladba
-#: data/ui/PlayerToolbar.ui:107
+#: data/ui/PlayerToolbar.ui:106
 msgid "Next"
 msgstr "Nasledujúca"
 
@@ -395,11 +332,11 @@ msgid "Add"
 msgstr "Pridať"
 
 # gtk button
-#: data/ui/PlaylistDialog.ui:200
+#: data/ui/PlaylistDialog.ui:202
 msgid "Add to Playlist"
 msgstr "Pridanie do zoznamu skladieb"
 
-#: data/ui/PlaylistDialog.ui:220
+#: data/ui/PlaylistDialog.ui:222
 msgid "_Add"
 msgstr "_Pridať"
 
@@ -411,7 +348,7 @@ msgstr "Interpreti"
 msgid "View All"
 msgstr "Zobraziť všetko"
 
-#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:54
+#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:56
 msgid "Albums"
 msgstr "Albumy"
 
@@ -441,6 +378,22 @@ msgstr "_Pridať do zoznamu skladieb"
 msgid "_Remove from Playlist"
 msgstr "O_dstrániť zo zoznamu skladieb"
 
+#: gnomemusic/about.py:238
+msgid "The GNOME Project"
+msgstr "Projekt GNOME"
+
+#: gnomemusic/about.py:242
+msgid "translator-credits"
+msgstr "Dušan Kazik <prescott66@gmail.com>"
+
+#: gnomemusic/about.py:246
+msgid "Copyright The GNOME Music Developers"
+msgstr "Autorské práva: vývojári aplikácie Hudba prostredia GNOME"
+
+#: gnomemusic/about.py:249
+msgid "Translated by"
+msgstr "Preložili"
+
 #. TRANSLATORS: this is a playlist name
 #: gnomemusic/grilowrappers/grltrackerplaylists.py:894
 msgid "Most Played"
@@ -587,7 +540,7 @@ msgstr "Výsledky s interpretami"
 msgid "Albums Results"
 msgstr "Výsledky s albumami"
 
-#: gnomemusic/widgets/albumwidget.py:240
+#: gnomemusic/widgets/albumwidget.py:245
 msgid "{} minute"
 msgid_plural "{} minutes"
 msgstr[0] "{} minút"
@@ -623,7 +576,7 @@ msgid "Configure"
 msgstr "Nastaviť"
 
 # tooltip
-#: gnomemusic/widgets/playertoolbar.py:165
+#: gnomemusic/widgets/playertoolbar.py:167
 msgid "Pause"
 msgstr "Pozastaví"
 
@@ -634,6 +587,62 @@ msgstr[0] "{} skladieb"
 msgstr[1] "{} skladba"
 msgstr[2] "{} skladby"
 
+#~ msgid "A music player and management application for GNOME."
+#~ msgstr "Aplikácia na prehrávanie a správu hudby prostredia GNOME."
+
+#~ msgid "Visit GNOME Music website"
+#~ msgstr "Navštíviť domovskú stránku aplikácie Hudba prostredia GNOME"
+
+#~ msgid ""
+#~ "GNOME Music is free software; you can redistribute it and/or modify it "
+#~ "under the terms of the GNU General Public License as published by the "
+#~ "Free Software Foundation; either version 2 of the License, or (at your "
+#~ "option) any later version.\n"
+#~ "\n"
+#~ "GNOME Music is distributed in the hope that it will be useful, but "
+#~ "WITHOUT ANY WARRANTY; without even the implied warranty of "
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General "
+#~ "Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License along "
+#~ "with GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
+#~ "Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
+#~ "\n"
+#~ "The GNOME Music authors hereby grant permission for non-GPL compatible "
+#~ "GStreamer plugins to be used and distributed together with GStreamer and "
+#~ "GNOME Music.  This permission is above and beyond the permissions granted "
+#~ "by the GPL license by which GNOME Music is covered.  If you modify this "
+#~ "code, you may extend this exception to your version of the code, but you "
+#~ "are not obligated to do so.  If you do not wish to do so, delete this "
+#~ "exception statement from your version."
+#~ msgstr ""
+#~ "Aplikácia Hudba prostredia GNOME je slobodný softvér; môžete ho ďalej "
+#~ "šíriť a upravovať podľa ustanovení licencie GNU General Public Licence "
+#~ "(Všeobecná zverejňovacia licencia GNU), vydávanej nadáciou Free Software "
+#~ "Foundation a to buď podľa 2. verzie tejto licencie, alebo (podľa vášho "
+#~ "uváženia) ktorejkoľvek neskoršej verzie.\n"
+#~ "\n"
+#~ "Tento program je rozširovaný v nádeji, že bude užitočný, avšak BEZ "
+#~ "AKEJKOĽVEK ZÁRUKY. Neposkytujú sa ani odvodené záruky PREDAJNOSTI alebo "
+#~ "VHODNOSTI NA URČITÝ ÚČEL. Ďalšie podrobnosti hľadajte v licencii GNU "
+#~ "General Public License.\n"
+#~ "\n"
+#~ "Kópiu licencie GNU General Public License by ste mali dostať spolu s "
+#~ "týmto programom. Ak sa tak nestalo, napíšte na adresu Free Software "
+#~ "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, "
+#~ "USA.\n"
+#~ "\n"
+#~ "Autori programu Hudba prostredia GNOME týmto vyhlasujú, že udeľujú právo "
+#~ "použiť a distribuovať zásuvné moduly knižnice GStreamer, ktoré nie sú "
+#~ "kompatibilné s GPL, spolu s týmto programom. Toto právo je nadrámec práv "
+#~ "zaručených licenciou GPL, pod ktorú tento program spadá.  Ak upravíte "
+#~ "zdrojový kód tohto programu, môžete túto výnimku použiť aj na vašu verziu "
+#~ "kódu, no nie ste povinný tak urobiť. Ak to nechcete urobiť, vymažte z "
+#~ "túto výnimku z vyhlásenia vo vašej verzii kódu."
+
+#~ msgid "The contents of your Music Folder will appear here"
+#~ msgstr "Tu sa zobrazí obsah vášho priečinku s hudbou"
+
 #~ msgid "GNOME Music"
 #~ msgstr "Hudba prostredia GNOME"
 
diff --git a/po/sl.po b/po/sl.po
index 2950c263..6e5319fc 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -8,22 +8,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-music master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-music/issues\n"
-"POT-Creation-Date: 2022-02-25 07:54+0000\n"
-"PO-Revision-Date: 2022-02-25 22:11+0100\n"
+"POT-Creation-Date: 2022-08-31 10:45+0000\n"
+"PO-Revision-Date: 2022-08-31 21:14+0200\n"
 "Last-Translator: Matej Urbančič <mateju@src.gnome.org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
 "Language: sl_SI\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
-"%100==4 ? 3 : 0);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || "
+"n%100==4 ? 3 : 0);\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: Poedit 3.0\n"
+"X-Generator: Poedit 3.0.1\n"
 
 #: data/org.gnome.Music.appdata.xml.in.in:6
-#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/application.py:61
-#: gnomemusic/window.py:71
+#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/about.py:236
+#: gnomemusic/application.py:61 gnomemusic/window.py:71
 msgid "Music"
 msgstr "Glasba"
 
@@ -44,7 +44,7 @@ msgstr ""
 "Iskanje posnetkov v krajevnih zbirkah in uporaba samodejnega ali "
 "načrtovanega pripravljanja seznamov predvajanja."
 
-#: data/org.gnome.Music.appdata.xml.in.in:149
+#: data/org.gnome.Music.appdata.xml.in.in:167
 msgid "The GNOME Music developers"
 msgstr "Razvijalci programa GNOME Glasba"
 
@@ -121,78 +121,21 @@ msgstr ""
 "Omogoči oziroma onemogoči pošiljanje podatkov »trenutno predvajanih skladb« "
 "na Last.fm"
 
-#: data/ui/AboutDialog.ui.in:9
-msgid "Copyright © 2018 GNOME Music Developers"
-msgstr "Avtorske pravice © 2018 Razvijalci programa GNOME Glasba"
-
-#: data/ui/AboutDialog.ui.in:10
-msgid "A music player and management application for GNOME."
-msgstr "Program GNOME za upravljanje in predvajanje glasbe."
-
-#: data/ui/AboutDialog.ui.in:12
-msgid "Visit GNOME Music website"
-msgstr "Spletna stran programa GNOME Glasba"
-
-#: data/ui/AboutDialog.ui.in:13
-msgid ""
-"GNOME Music is free software; you can redistribute it and/or modify it under "
-"the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"GNOME Music is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
-"\n"
-"The GNOME Music authors hereby grant permission for non-GPL compatible "
-"GStreamer plugins to be used and distributed together with GStreamer and "
-"GNOME Music.  This permission is above and beyond the permissions granted by "
-"the GPL license by which GNOME Music is covered.  If you modify this code, "
-"you may extend this exception to your version of the code, but you are not "
-"obligated to do so.  If you do not wish to do so, delete this exception "
-"statement from your version."
-msgstr ""
-"Program GNOME Music je prosta programska oprema; dovoljeno je razširjanje in "
-"spreminjanje pod pogoji Splošnega Javnega Dovoljenja (GNU), kot je "
-"objavljena pri Free Software Foundation; različice 2 ali katerekoli "
-"kasnejše.\n"
-"\n"
-"Program se razširja v upanju, da bo koristen, vendar pa brez VSAKRŠNEGA "
-"JAMSTVA; tudi brez posredne zagotovitve CENOVNE VREDNOSTI ali PRIMERNOSTI ZA "
-"DOLOČEN NAMEN. Za več podrobnosti si oglejte dovoljenje.\n"
-"\n"
-"\n"
-"Skupaj s programom bi morali prejeti tudi kopijo Splošnega Javnega "
-"dovoljenja GNU /GNU GPL). V primeru, da je niste, si oglejte <http://www.gnu."
-"org/licenses/>.\n"
-"\n"
-"Avtorji programa GNOME Music dovolijo uporabo in razširjanje z dovoljenjem "
-"neskladnih vstavkov programa GStreamer. Dovoljenje presega Splošno Javno "
-"dovoljenje, s katerim je avtorsko zaščiten program GNOME Music. V kolikor "
-"boste spreminjali to kodo, lahko razširite izjemo na različico kode, vendar "
-"tega niste dolžni narediti. Če tega ne želite, izbrišite izjavo izjeme iz "
-"vaše različice."
-
-#: data/ui/AlbumWidget.ui:86 data/ui/PlayerToolbar.ui:88
-#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:168
+#: data/ui/AlbumWidget.ui:84 data/ui/PlayerToolbar.ui:87
+#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:170
 msgid "Play"
 msgstr "Predvajaj"
 
-#: data/ui/AlbumWidget.ui:132 data/ui/PlaylistControls.ui:5
+#: data/ui/AlbumWidget.ui:130 data/ui/PlaylistControls.ui:5
 #: data/ui/SongWidgetMenu.ui:11
 msgid "_Play"
 msgstr "_Predvajaj"
 
-#: data/ui/AlbumWidget.ui:136
+#: data/ui/AlbumWidget.ui:134
 msgid "Add to _Favorite Songs"
 msgstr "_Dodaj med priljubljene"
 
-#: data/ui/AlbumWidget.ui:140 data/ui/SongWidgetMenu.ui:15
+#: data/ui/AlbumWidget.ui:138 data/ui/SongWidgetMenu.ui:15
 msgid "_Add to Playlist…"
 msgstr "_Dodaj na seznam predvajanja …"
 
@@ -216,7 +159,7 @@ msgstr "Pomo_č"
 msgid "_About Music"
 msgstr "_O programu"
 
-#: data/ui/EmptyView.ui:26 data/ui/InitialState.ui:13
+#: data/ui/EmptyView.ui:30
 msgid "Welcome to Music"
 msgstr "Dobrodošli"
 
@@ -228,7 +171,7 @@ msgstr "Meni"
 msgid "Select"
 msgstr "Izberi"
 
-#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:211
+#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:213
 #: data/ui/SearchHeaderBar.ui:20
 msgid "_Cancel"
 msgstr "_Prekliči"
@@ -326,10 +269,6 @@ msgctxt "shortcut window"
 msgid "Go back"
 msgstr "Skoči na predhodni pogled"
 
-#: data/ui/InitialState.ui:25
-msgid "The contents of your Music Folder will appear here"
-msgstr "Vsebina glasbene mape bo prikazana na tem mestu."
-
 #: data/ui/LastfmDialog.ui:21
 msgid ""
 "Last.fm is a music discovery service that gives you personalised "
@@ -350,11 +289,11 @@ msgstr "Prijavite se v račun Last.fm za poročanje o poslušanju glasbe"
 msgid "Login"
 msgstr "Prijava"
 
-#: data/ui/PlayerToolbar.ui:75
+#: data/ui/PlayerToolbar.ui:74
 msgid "Previous"
 msgstr "Predhodna"
 
-#: data/ui/PlayerToolbar.ui:107
+#: data/ui/PlayerToolbar.ui:106
 msgid "Next"
 msgstr "Naslednja"
 
@@ -390,11 +329,11 @@ msgstr "Nov seznam predvajanja …"
 msgid "Add"
 msgstr "Dodaj"
 
-#: data/ui/PlaylistDialog.ui:200
+#: data/ui/PlaylistDialog.ui:202
 msgid "Add to Playlist"
 msgstr "Dodaj na seznam predvajanja"
 
-#: data/ui/PlaylistDialog.ui:220
+#: data/ui/PlaylistDialog.ui:222
 msgid "_Add"
 msgstr "_Dodaj"
 
@@ -406,7 +345,7 @@ msgstr "Izvajalci"
 msgid "View All"
 msgstr "Pokaži vse"
 
-#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:54
+#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:56
 msgid "Albums"
 msgstr "Albumi"
 
@@ -434,6 +373,22 @@ msgstr "Dodaj na _seznam predvajanja"
 msgid "_Remove from Playlist"
 msgstr "_Odstrani s seznama predvajanja"
 
+#: gnomemusic/about.py:238
+msgid "The GNOME Project"
+msgstr "Projekt GNOME"
+
+#: gnomemusic/about.py:242
+msgid "translator-credits"
+msgstr "Matej Urbančič <mateju@src.gnome.org>"
+
+#: gnomemusic/about.py:246
+msgid "Copyright The GNOME Music Developers"
+msgstr "Avtorske pravice razvijalcev programa GNOME Glasba"
+
+#: gnomemusic/about.py:249
+msgid "Translated by"
+msgstr "Prevod:"
+
 #. TRANSLATORS: this is a playlist name
 #: gnomemusic/grilowrappers/grltrackerplaylists.py:894
 msgid "Most Played"
@@ -578,7 +533,7 @@ msgstr "Izvajalci"
 msgid "Albums Results"
 msgstr "Albumi"
 
-#: gnomemusic/widgets/albumwidget.py:242
+#: gnomemusic/widgets/albumwidget.py:245
 msgid "{} minute"
 msgid_plural "{} minutes"
 msgstr[0] "{} minut"
@@ -615,7 +570,7 @@ msgstr "Trenutno je dejavna prijava {}"
 msgid "Configure"
 msgstr "Nastavi"
 
-#: gnomemusic/widgets/playertoolbar.py:165
+#: gnomemusic/widgets/playertoolbar.py:167
 msgid "Pause"
 msgstr "Premor"
 
@@ -627,6 +582,59 @@ msgstr[1] "{} skladba"
 msgstr[2] "{} skladbi"
 msgstr[3] "{} skladbe"
 
+#~ msgid "A music player and management application for GNOME."
+#~ msgstr "Program GNOME za upravljanje in predvajanje glasbe."
+
+#~ msgid "Visit GNOME Music website"
+#~ msgstr "Spletna stran programa GNOME Glasba"
+
+#~ msgid ""
+#~ "GNOME Music is free software; you can redistribute it and/or modify it "
+#~ "under the terms of the GNU General Public License as published by the "
+#~ "Free Software Foundation; either version 2 of the License, or (at your "
+#~ "option) any later version.\n"
+#~ "\n"
+#~ "GNOME Music is distributed in the hope that it will be useful, but "
+#~ "WITHOUT ANY WARRANTY; without even the implied warranty of "
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General "
+#~ "Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License along "
+#~ "with GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
+#~ "Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
+#~ "\n"
+#~ "The GNOME Music authors hereby grant permission for non-GPL compatible "
+#~ "GStreamer plugins to be used and distributed together with GStreamer and "
+#~ "GNOME Music.  This permission is above and beyond the permissions granted "
+#~ "by the GPL license by which GNOME Music is covered.  If you modify this "
+#~ "code, you may extend this exception to your version of the code, but you "
+#~ "are not obligated to do so.  If you do not wish to do so, delete this "
+#~ "exception statement from your version."
+#~ msgstr ""
+#~ "Program GNOME Music je prosta programska oprema; dovoljeno je razširjanje "
+#~ "in spreminjanje pod pogoji Splošnega Javnega Dovoljenja (GNU), kot je "
+#~ "objavljena pri Free Software Foundation; različice 2 ali katerekoli "
+#~ "kasnejše.\n"
+#~ "\n"
+#~ "Program se razširja v upanju, da bo koristen, vendar pa brez VSAKRŠNEGA "
+#~ "JAMSTVA; tudi brez posredne zagotovitve CENOVNE VREDNOSTI ali PRIMERNOSTI "
+#~ "ZA DOLOČEN NAMEN. Za več podrobnosti si oglejte dovoljenje.\n"
+#~ "\n"
+#~ "\n"
+#~ "Skupaj s programom bi morali prejeti tudi kopijo Splošnega Javnega "
+#~ "dovoljenja GNU /GNU GPL). V primeru, da je niste, si oglejte <http://www."
+#~ "gnu.org/licenses/>.\n"
+#~ "\n"
+#~ "Avtorji programa GNOME Music dovolijo uporabo in razširjanje z "
+#~ "dovoljenjem neskladnih vstavkov programa GStreamer. Dovoljenje presega "
+#~ "Splošno Javno dovoljenje, s katerim je avtorsko zaščiten program GNOME "
+#~ "Music. V kolikor boste spreminjali to kodo, lahko razširite izjemo na "
+#~ "različico kode, vendar tega niste dolžni narediti. Če tega ne želite, "
+#~ "izbrišite izjavo izjeme iz vaše različice."
+
+#~ msgid "The contents of your Music Folder will appear here"
+#~ msgstr "Vsebina glasbene mape bo prikazana na tem mestu."
+
 #~ msgid "GNOME Music"
 #~ msgstr "GNOME Glasba"
 
@@ -807,9 +815,9 @@ msgstr[3] "{} skladbe"
 #~ msgstr ""
 #~ "Vrednost določa, ali naj se predvajanje posnetkov izvaja naključno ali "
 #~ "ponavljajoče. Dovoljene možnosti so: \"brez\" (ponavljanje in mešanje "
-#~ "skladb je onemogočeno, \"posnetek\" (ponavljaj trenutni posnetek) , \"vse"
-#~ "\" (ponavljaj seznam predvajanja brez mešanja) in \"premešano\" (vrstni "
-#~ "red je premešan, ponovljene pa bodo vse skladbe)."
+#~ "skladb je onemogočeno, \"posnetek\" (ponavljaj trenutni posnetek) , "
+#~ "\"vse\" (ponavljaj seznam predvajanja brez mešanja) in "
+#~ "\"premešano\" (vrstni red je premešan, ponovljene pa bodo vse skladbe)."
 
 #~ msgid "Max chars to display in track name on Artist view"
 #~ msgstr "Največje število znakov naslova sledi v pogledu izvajalca"
diff --git a/po/sr.po b/po/sr.po
index 6aea1e5d..e2c289d4 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-music master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-music/issues\n"
-"POT-Creation-Date: 2022-02-19 12:39+0000\n"
-"PO-Revision-Date: 2022-03-14 16:36+0100\n"
+"POT-Creation-Date: 2022-09-06 03:05+0000\n"
+"PO-Revision-Date: 2022-09-06 10:03+0200\n"
 "Last-Translator: Марко М. Костић <marko.m.kostic@gmail.com>\n"
 "Language-Team: српски <gnome-sr@googlegroups.org>\n"
 "Language: sr\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n"
 "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
-"X-Generator: Poedit 3.0.1\n"
+"X-Generator: Poedit 3.1.1\n"
 
 #: data/org.gnome.Music.appdata.xml.in.in:6
-#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/application.py:61
-#: gnomemusic/window.py:71
+#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/about.py:236
+#: gnomemusic/application.py:61 gnomemusic/window.py:71
 msgid "Music"
 msgstr "Музика"
 
@@ -42,7 +42,7 @@ msgstr ""
 "Нађите нумере у вашој локалној збирци, користите самостворене спискове "
 "нумера или направите нови."
 
-#: data/org.gnome.Music.appdata.xml.in.in:149
+#: data/org.gnome.Music.appdata.xml.in.in:167
 msgid "The GNOME Music developers"
 msgstr "Програмери Гномове музике"
 
@@ -117,80 +117,21 @@ msgstr ""
 "Омогућава или онемогућава слање скроблова и податке о тренутном слушању на "
 "Last.fm."
 
-#: data/ui/AboutDialog.ui.in:9
-msgid "Copyright © 2018 GNOME Music Developers"
-msgstr "Ауторска права © 2018 Програмери Гномове музике"
-
-#: data/ui/AboutDialog.ui.in:10
-msgid "A music player and management application for GNOME."
-msgstr "Гномов програм за пуштање и управљање музиком."
-
-#: data/ui/AboutDialog.ui.in:12
-msgid "Visit GNOME Music website"
-msgstr "Посетите веб страницу Гномове музике"
-
-#: data/ui/AboutDialog.ui.in:13
-msgid ""
-"GNOME Music is free software; you can redistribute it and/or modify it under "
-"the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"GNOME Music is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
-"\n"
-"The GNOME Music authors hereby grant permission for non-GPL compatible "
-"GStreamer plugins to be used and distributed together with GStreamer and "
-"GNOME Music.  This permission is above and beyond the permissions granted by "
-"the GPL license by which GNOME Music is covered.  If you modify this code, "
-"you may extend this exception to your version of the code, but you are not "
-"obligated to do so.  If you do not wish to do so, delete this exception "
-"statement from your version."
-msgstr ""
-"Овај програм је слободан софтвер; можете га прослеђивати\n"
-"и/или мењати под условима Гнуове опште јавне лиценце коју је\n"
-"објавила Задужбина слободног софтвера; верзије 2 лиценце,\n"
-"или (по вашем избору) било које новије верзије.\n"
-"\n"
-"Овај програм се расподељује у нади да ће бити користан,\n"
-"али БЕЗ ИКАКВЕ ГАРАНЦИЈЕ; чак и без примењене гаранције\n"
-"ТРЖИШНЕ ВРЕДНОСТИ или ПРИЛАГОЂЕНОСТИ ОДРЕЂЕНОЈ НАМЕНИ.\n"
-"Погледајте Гнуову општу јавну лиценцу за више детаља.\n"
-"\n"
-"Требали сте да примите примерак ГНУ Опште јавне лиценце\n"
-"уз овај програм; ако нисте, пишите Задужбини слободног\n"
-"софтвера на адресу: „Free Software Foundation, Inc.,\n"
-"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.“\n"
-"\n"
-"Аутори Гномове музике безусловно гарантују овлашћења за коришћење и "
-"расподелу прикључака Гстримера који нису сагласни са ОЈЛ-ом уз Гстример и "
-"Гномову музику.  Ово овлашћење је изнад и испод овлашћења које обезбеђује "
-"ОЈЛ дозвола којом је покривена Гномова музика.  Ако измените овај код, "
-"можете да проширите овај изузетак на ваше издање кода, али нисте обавезни да "
-"то и урадите.  Ако не желите да урадите ово, обришите стање овог изузетка из "
-"вашег издања."
-
-#: data/ui/AlbumWidget.ui:86 data/ui/PlayerToolbar.ui:88
-#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:168
+#: data/ui/AlbumWidget.ui:84 data/ui/PlayerToolbar.ui:87
+#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:170
 msgid "Play"
 msgstr "Пусти"
 
-#: data/ui/AlbumWidget.ui:132 data/ui/PlaylistControls.ui:5
+#: data/ui/AlbumWidget.ui:130 data/ui/PlaylistControls.ui:5
 #: data/ui/SongWidgetMenu.ui:11
 msgid "_Play"
 msgstr "_Пусти"
 
-#: data/ui/AlbumWidget.ui:136
+#: data/ui/AlbumWidget.ui:134
 msgid "Add to _Favorite Songs"
 msgstr "Додај у _омиљене песме"
 
-#: data/ui/AlbumWidget.ui:140 data/ui/SongWidgetMenu.ui:15
+#: data/ui/AlbumWidget.ui:138 data/ui/SongWidgetMenu.ui:15
 msgid "_Add to Playlist…"
 msgstr "_Додај на списак нумера…"
 
@@ -214,7 +155,7 @@ msgstr "По_моћ"
 msgid "_About Music"
 msgstr "_О Музици"
 
-#: data/ui/EmptyView.ui:26 data/ui/InitialState.ui:13
+#: data/ui/EmptyView.ui:30
 msgid "Welcome to Music"
 msgstr "Добро дошли у Музику"
 
@@ -226,7 +167,7 @@ msgstr "Изборник"
 msgid "Select"
 msgstr "Изабери"
 
-#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:211
+#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:213
 #: data/ui/SearchHeaderBar.ui:20
 msgid "_Cancel"
 msgstr "_Откажи"
@@ -324,10 +265,6 @@ msgctxt "shortcut window"
 msgid "Go back"
 msgstr "Иде назад"
 
-#: data/ui/InitialState.ui:25
-msgid "The contents of your Music Folder will appear here"
-msgstr "Садржај фасцикле „Музика“ појавиће се овде"
-
 #: data/ui/LastfmDialog.ui:21
 msgid ""
 "Last.fm is a music discovery service that gives you personalised "
@@ -350,11 +287,11 @@ msgstr ""
 msgid "Login"
 msgstr "Пријава"
 
-#: data/ui/PlayerToolbar.ui:75
+#: data/ui/PlayerToolbar.ui:74
 msgid "Previous"
 msgstr "Претходно"
 
-#: data/ui/PlayerToolbar.ui:107
+#: data/ui/PlayerToolbar.ui:106
 msgid "Next"
 msgstr "Наредно"
 
@@ -390,11 +327,11 @@ msgstr "Нови списак нумера…"
 msgid "Add"
 msgstr "Додај"
 
-#: data/ui/PlaylistDialog.ui:200
+#: data/ui/PlaylistDialog.ui:202
 msgid "Add to Playlist"
 msgstr "Додај на списак нумера"
 
-#: data/ui/PlaylistDialog.ui:220
+#: data/ui/PlaylistDialog.ui:222
 msgid "_Add"
 msgstr "_Додај"
 
@@ -406,7 +343,7 @@ msgstr "Извођачи"
 msgid "View All"
 msgstr "Прикажи све"
 
-#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:54
+#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:56
 msgid "Albums"
 msgstr "Албуми"
 
@@ -434,6 +371,25 @@ msgstr "_Додај на списак нумера"
 msgid "_Remove from Playlist"
 msgstr "Уклони са списка нуме_ра"
 
+#: gnomemusic/about.py:238
+msgid "The GNOME Project"
+msgstr "Гномов пројекат"
+
+#: gnomemusic/about.py:242
+msgid "translator-credits"
+msgstr ""
+"Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
+"Марко М. Костић <marko.m.kostic@gmail.com>\n"
+"https://гном.срб — превод Гнома на српски језик."
+
+#: gnomemusic/about.py:246
+msgid "Copyright The GNOME Music Developers"
+msgstr "Ауторска права програмери Гномове музике"
+
+#: gnomemusic/about.py:249
+msgid "Translated by"
+msgstr "Превод"
+
 #. TRANSLATORS: this is a playlist name
 #: gnomemusic/grilowrappers/grltrackerplaylists.py:894
 msgid "Most Played"
@@ -577,7 +533,7 @@ msgstr "Резултати извођача"
 msgid "Albums Results"
 msgstr "Резултати албума"
 
-#: gnomemusic/widgets/albumwidget.py:240
+#: gnomemusic/widgets/albumwidget.py:245
 msgid "{} minute"
 msgid_plural "{} minutes"
 msgstr[0] "{} минут"
@@ -614,7 +570,7 @@ msgstr "Пријављен као {}"
 msgid "Configure"
 msgstr "Подеси"
 
-#: gnomemusic/widgets/playertoolbar.py:165
+#: gnomemusic/widgets/playertoolbar.py:167
 msgid "Pause"
 msgstr "Застани"
 
@@ -626,6 +582,61 @@ msgstr[1] "{} песме"
 msgstr[2] "{} песама"
 msgstr[3] "{} песма"
 
+#~ msgid "A music player and management application for GNOME."
+#~ msgstr "Гномов програм за пуштање и управљање музиком."
+
+#~ msgid "Visit GNOME Music website"
+#~ msgstr "Посетите веб страницу Гномове музике"
+
+#~ msgid ""
+#~ "GNOME Music is free software; you can redistribute it and/or modify it "
+#~ "under the terms of the GNU General Public License as published by the "
+#~ "Free Software Foundation; either version 2 of the License, or (at your "
+#~ "option) any later version.\n"
+#~ "\n"
+#~ "GNOME Music is distributed in the hope that it will be useful, but "
+#~ "WITHOUT ANY WARRANTY; without even the implied warranty of "
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General "
+#~ "Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License along "
+#~ "with GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
+#~ "Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
+#~ "\n"
+#~ "The GNOME Music authors hereby grant permission for non-GPL compatible "
+#~ "GStreamer plugins to be used and distributed together with GStreamer and "
+#~ "GNOME Music.  This permission is above and beyond the permissions granted "
+#~ "by the GPL license by which GNOME Music is covered.  If you modify this "
+#~ "code, you may extend this exception to your version of the code, but you "
+#~ "are not obligated to do so.  If you do not wish to do so, delete this "
+#~ "exception statement from your version."
+#~ msgstr ""
+#~ "Овај програм је слободан софтвер; можете га прослеђивати\n"
+#~ "и/или мењати под условима Гнуове опште јавне лиценце коју је\n"
+#~ "објавила Задужбина слободног софтвера; верзије 2 лиценце,\n"
+#~ "или (по вашем избору) било које новије верзије.\n"
+#~ "\n"
+#~ "Овај програм се расподељује у нади да ће бити користан,\n"
+#~ "али БЕЗ ИКАКВЕ ГАРАНЦИЈЕ; чак и без примењене гаранције\n"
+#~ "ТРЖИШНЕ ВРЕДНОСТИ или ПРИЛАГОЂЕНОСТИ ОДРЕЂЕНОЈ НАМЕНИ.\n"
+#~ "Погледајте Гнуову општу јавну лиценцу за више детаља.\n"
+#~ "\n"
+#~ "Требали сте да примите примерак ГНУ Опште јавне лиценце\n"
+#~ "уз овај програм; ако нисте, пишите Задужбини слободног\n"
+#~ "софтвера на адресу: „Free Software Foundation, Inc.,\n"
+#~ "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.“\n"
+#~ "\n"
+#~ "Аутори Гномове музике безусловно гарантују овлашћења за коришћење и "
+#~ "расподелу прикључака Гстримера који нису сагласни са ОЈЛ-ом уз Гстример и "
+#~ "Гномову музику.  Ово овлашћење је изнад и испод овлашћења које обезбеђује "
+#~ "ОЈЛ дозвола којом је покривена Гномова музика.  Ако измените овај код, "
+#~ "можете да проширите овај изузетак на ваше издање кода, али нисте обавезни "
+#~ "да то и урадите.  Ако не желите да урадите ово, обришите стање овог "
+#~ "изузетка из вашег издања."
+
+#~ msgid "The contents of your Music Folder will appear here"
+#~ msgstr "Садржај фасцикле „Музика“ појавиће се овде"
+
 #~ msgid "GNOME Music"
 #~ msgstr "Гномова музика"
 
diff --git a/po/sv.po b/po/sv.po
index f4b32586..34933ad8 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 # Swedish translation for gnome-music.
 # Copyright © 2014-2022 gnome-music's COPYRIGHT HOLDER
 # This file is distributed under the same license as the gnome-music package.
-# Anders Jonsson <anders.jonsson@norsjovallen.se>, 2014, 2016, 2017, 2018, 2019, 2020, 2021.
+# Anders Jonsson <anders.jonsson@norsjovallen.se>, 2014, 2016, 2017, 2018, 2019, 2020, 2021, 2022.
 # Sebastian Rasmussen <sebras@gmail.com>, 2015.
 # Marcus Gisslén <marcus.gisslen@gmail.com>, 2015.
 # Luna Jernberg <droidbittin@gmail.com>, 2021, 2022.
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-music master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-music/issues\n"
-"POT-Creation-Date: 2022-02-21 21:11+0000\n"
-"PO-Revision-Date: 2022-02-28 18:15+0100\n"
+"POT-Creation-Date: 2022-08-27 13:27+0000\n"
+"PO-Revision-Date: 2022-08-27 20:51+0200\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -19,11 +19,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.0.1\n"
+"X-Generator: Poedit 3.1.1\n"
 
 #: data/org.gnome.Music.appdata.xml.in.in:6
-#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/application.py:61
-#: gnomemusic/window.py:71
+#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/about.py:236
+#: gnomemusic/application.py:61 gnomemusic/window.py:71
 msgid "Music"
 msgstr "Musik"
 
@@ -44,7 +44,7 @@ msgstr ""
 "Hitta spår i din lokala samling, använd automatiskt genererade spellistor "
 "eller sammanställ en ny."
 
-#: data/org.gnome.Music.appdata.xml.in.in:149
+#: data/org.gnome.Music.appdata.xml.in.in:167
 msgid "The GNOME Music developers"
 msgstr "GNOME Musik-utvecklarna"
 
@@ -121,79 +121,21 @@ msgstr ""
 "Aktiverar eller inaktiverar sändning av skrobblingar och ”spelar nu”-info "
 "till Last.fm."
 
-#: data/ui/AboutDialog.ui.in:9
-msgid "Copyright © 2018 GNOME Music Developers"
-msgstr "Copyright © 2018 GNOME Musik-utvecklarna"
-
-#: data/ui/AboutDialog.ui.in:10
-msgid "A music player and management application for GNOME."
-msgstr "Ett program för uppspelning och hantering av musik för GNOME."
-
-#: data/ui/AboutDialog.ui.in:12
-msgid "Visit GNOME Music website"
-msgstr "Besök webbplatsen för GNOME Musik"
-
-#: data/ui/AboutDialog.ui.in:13
-msgid ""
-"GNOME Music is free software; you can redistribute it and/or modify it under "
-"the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"GNOME Music is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
-"\n"
-"The GNOME Music authors hereby grant permission for non-GPL compatible "
-"GStreamer plugins to be used and distributed together with GStreamer and "
-"GNOME Music.  This permission is above and beyond the permissions granted by "
-"the GPL license by which GNOME Music is covered.  If you modify this code, "
-"you may extend this exception to your version of the code, but you are not "
-"obligated to do so.  If you do not wish to do so, delete this exception "
-"statement from your version."
-msgstr ""
-"GNOME Musik är fri programvara. Du kan distribuera det och/eller modifiera "
-"det under villkoren i GNU General Public License, publicerad av Free "
-"Software Foundation, antingen version 2 eller (om du så vill) någon senare "
-"version.\n"
-"\n"
-"GNOME Musik distribueras i hopp om att det ska vara användbart, men UTAN "
-"NÅGON SOM HELST GARANTI, även utan underförstådd garanti om SÄLJBARHET eller "
-"LÄMPLIGHET FÖR NÅGOT SPECIELLT ÄNDAMÅL. Se GNU General Public License för "
-"ytterligare information.\n"
-"\n"
-"Du bör ha fått en kopia av GNU General Public License tillsammans med GNOME "
-"Musik. Om inte, skriv till Free Software Foundation, Inc., 51 Franklin "
-"Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
-"\n"
-"Upphovsmännen för GNOME Musik ger härmed tillåtelse för användning och "
-"distribution av ej GPL-kompatibla GStreamer-insticksmoduler tillsammans med "
-"GStreamer och GNOME Musik. Denna tillåtelse är bortom tillåtelserna som ges "
-"av GPL-licensen, vilken täcker GNOME Musik. Om du ändrar denna kod kan du om "
-"du vill överföra detta undantag till din version av koden, men du är inte "
-"tvungen att göra det. Ta bort detta undantag från din version om du inte "
-"vill använda det."
-
-#: data/ui/AlbumWidget.ui:86 data/ui/PlayerToolbar.ui:88
-#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:168
+#: data/ui/AlbumWidget.ui:84 data/ui/PlayerToolbar.ui:87
+#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:170
 msgid "Play"
 msgstr "Spela"
 
-#: data/ui/AlbumWidget.ui:132 data/ui/PlaylistControls.ui:5
+#: data/ui/AlbumWidget.ui:130 data/ui/PlaylistControls.ui:5
 #: data/ui/SongWidgetMenu.ui:11
 msgid "_Play"
 msgstr "_Spela"
 
-#: data/ui/AlbumWidget.ui:136
+#: data/ui/AlbumWidget.ui:134
 msgid "Add to _Favorite Songs"
 msgstr "Lägg till i _favoritlåtar"
 
-#: data/ui/AlbumWidget.ui:140 data/ui/SongWidgetMenu.ui:15
+#: data/ui/AlbumWidget.ui:138 data/ui/SongWidgetMenu.ui:15
 msgid "_Add to Playlist…"
 msgstr "_Lägg till i spellista…"
 
@@ -217,7 +159,7 @@ msgstr "_Hjälp"
 msgid "_About Music"
 msgstr "_Om Musik"
 
-#: data/ui/EmptyView.ui:26 data/ui/InitialState.ui:13
+#: data/ui/EmptyView.ui:30
 msgid "Welcome to Music"
 msgstr "Välkommen till Musik"
 
@@ -229,7 +171,7 @@ msgstr "Meny"
 msgid "Select"
 msgstr "Välj"
 
-#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:211
+#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:213
 #: data/ui/SearchHeaderBar.ui:20
 msgid "_Cancel"
 msgstr "_Avbryt"
@@ -327,10 +269,6 @@ msgctxt "shortcut window"
 msgid "Go back"
 msgstr "Gå bakåt"
 
-#: data/ui/InitialState.ui:25
-msgid "The contents of your Music Folder will appear here"
-msgstr "Innehållet i din Musikmapp kommer att visas här"
-
 #: data/ui/LastfmDialog.ui:21
 msgid ""
 "Last.fm is a music discovery service that gives you personalised "
@@ -351,11 +289,11 @@ msgstr "Logga in på ditt Last.fm-konto för att rapportera ditt musiklyssnande.
 msgid "Login"
 msgstr "Logga in"
 
-#: data/ui/PlayerToolbar.ui:75
+#: data/ui/PlayerToolbar.ui:74
 msgid "Previous"
 msgstr "Föregående"
 
-#: data/ui/PlayerToolbar.ui:107
+#: data/ui/PlayerToolbar.ui:106
 msgid "Next"
 msgstr "Nästa"
 
@@ -391,11 +329,11 @@ msgstr "Ny spellista…"
 msgid "Add"
 msgstr "Lägg till"
 
-#: data/ui/PlaylistDialog.ui:200
+#: data/ui/PlaylistDialog.ui:202
 msgid "Add to Playlist"
 msgstr "Lägg till i spellista"
 
-#: data/ui/PlaylistDialog.ui:220
+#: data/ui/PlaylistDialog.ui:222
 msgid "_Add"
 msgstr "_Lägg till"
 
@@ -407,7 +345,7 @@ msgstr "Artister"
 msgid "View All"
 msgstr "Visa alla"
 
-#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:54
+#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:56
 msgid "Albums"
 msgstr "Album"
 
@@ -435,6 +373,29 @@ msgstr "_Lägg till i spellista"
 msgid "_Remove from Playlist"
 msgstr "_Ta bort från spellista"
 
+#: gnomemusic/about.py:238
+msgid "The GNOME Project"
+msgstr "GNOME-projektet"
+
+#: gnomemusic/about.py:242
+msgid "translator-credits"
+msgstr ""
+"Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
+"Sebastian Rasmussen <sebras@gmail.com>\n"
+"Marcus Gisslén <marcus.gisslen@gmail.com>\n"
+"Luna Jernberg <droidbittin@gmail.com>\n"
+"\n"
+"Skicka synpunkter på översättningen till\n"
+"<tp-sv@listor.tp-sv.se>."
+
+#: gnomemusic/about.py:246
+msgid "Copyright The GNOME Music Developers"
+msgstr "Copyright GNOME Musik-utvecklarna"
+
+#: gnomemusic/about.py:249
+msgid "Translated by"
+msgstr "Översatt av"
+
 #. TRANSLATORS: this is a playlist name
 #: gnomemusic/grilowrappers/grltrackerplaylists.py:894
 msgid "Most Played"
@@ -575,7 +536,7 @@ msgstr "Artistresultat"
 msgid "Albums Results"
 msgstr "Albumresultat"
 
-#: gnomemusic/widgets/albumwidget.py:242
+#: gnomemusic/widgets/albumwidget.py:245
 msgid "{} minute"
 msgid_plural "{} minutes"
 msgstr[0] "{} minut"
@@ -608,7 +569,7 @@ msgstr "Inloggad som {}"
 msgid "Configure"
 msgstr "Konfigurera"
 
-#: gnomemusic/widgets/playertoolbar.py:165
+#: gnomemusic/widgets/playertoolbar.py:167
 msgid "Pause"
 msgstr "Gör paus"
 
@@ -618,6 +579,60 @@ msgid_plural "{} Songs"
 msgstr[0] "{} låt"
 msgstr[1] "{} låtar"
 
+#~ msgid "A music player and management application for GNOME."
+#~ msgstr "Ett program för uppspelning och hantering av musik för GNOME."
+
+#~ msgid "Visit GNOME Music website"
+#~ msgstr "Besök webbplatsen för GNOME Musik"
+
+#~ msgid ""
+#~ "GNOME Music is free software; you can redistribute it and/or modify it "
+#~ "under the terms of the GNU General Public License as published by the "
+#~ "Free Software Foundation; either version 2 of the License, or (at your "
+#~ "option) any later version.\n"
+#~ "\n"
+#~ "GNOME Music is distributed in the hope that it will be useful, but "
+#~ "WITHOUT ANY WARRANTY; without even the implied warranty of "
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General "
+#~ "Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License along "
+#~ "with GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
+#~ "Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
+#~ "\n"
+#~ "The GNOME Music authors hereby grant permission for non-GPL compatible "
+#~ "GStreamer plugins to be used and distributed together with GStreamer and "
+#~ "GNOME Music.  This permission is above and beyond the permissions granted "
+#~ "by the GPL license by which GNOME Music is covered.  If you modify this "
+#~ "code, you may extend this exception to your version of the code, but you "
+#~ "are not obligated to do so.  If you do not wish to do so, delete this "
+#~ "exception statement from your version."
+#~ msgstr ""
+#~ "GNOME Musik är fri programvara. Du kan distribuera det och/eller "
+#~ "modifiera det under villkoren i GNU General Public License, publicerad av "
+#~ "Free Software Foundation, antingen version 2 eller (om du så vill) någon "
+#~ "senare version.\n"
+#~ "\n"
+#~ "GNOME Musik distribueras i hopp om att det ska vara användbart, men UTAN "
+#~ "NÅGON SOM HELST GARANTI, även utan underförstådd garanti om SÄLJBARHET "
+#~ "eller LÄMPLIGHET FÖR NÅGOT SPECIELLT ÄNDAMÅL. Se GNU General Public "
+#~ "License för ytterligare information.\n"
+#~ "\n"
+#~ "Du bör ha fått en kopia av GNU General Public License tillsammans med "
+#~ "GNOME Musik. Om inte, skriv till Free Software Foundation, Inc., 51 "
+#~ "Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
+#~ "\n"
+#~ "Upphovsmännen för GNOME Musik ger härmed tillåtelse för användning och "
+#~ "distribution av ej GPL-kompatibla GStreamer-insticksmoduler tillsammans "
+#~ "med GStreamer och GNOME Musik. Denna tillåtelse är bortom tillåtelserna "
+#~ "som ges av GPL-licensen, vilken täcker GNOME Musik. Om du ändrar denna "
+#~ "kod kan du om du vill överföra detta undantag till din version av koden, "
+#~ "men du är inte tvungen att göra det. Ta bort detta undantag från din "
+#~ "version om du inte vill använda det."
+
+#~ msgid "The contents of your Music Folder will appear here"
+#~ msgstr "Innehållet i din Musikmapp kommer att visas här"
+
 #~ msgid "GNOME Music"
 #~ msgstr "GNOME Musik"
 
diff --git a/po/tr.po b/po/tr.po
index 7e69b5a0..afd3c621 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,5 +1,5 @@
 # Turkish translation for gnome-music.
-# Copyright (C) 2013-2019 gnome-music's COPYRIGHT HOLDER
+# Copyright (C) 2013-2023 gnome-music's COPYRIGHT HOLDER
 # This file is distributed under the same license as the gnome-music package.
 #
 # Gökhan Gurbetoğlu <ggurbet@gmail.com>, 2014, 2015.
@@ -8,15 +8,15 @@
 # Osman Karagöz <osmank3@gmail.com>, 2017.
 # Furkan Tokaç <developmentft@gmail.com>, 2017.
 # Doğa Deniz Arıcı <bluegreenbrain@gmail.com>, 2018.
-# Sabri Ünal <libreajans@gmail.com>, 2019-2020.
+# Sabri Ünal <libreajans@gmail.com>, 2019-2020, 2023.
 # Emin Tufan Çetin <etcetin@gmail.com>, 2013-2022.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-music master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-music/issues\n"
-"POT-Creation-Date: 2022-02-19 12:39+0000\n"
-"PO-Revision-Date: 2022-02-23 13:33+0300\n"
+"POT-Creation-Date: 2022-09-18 07:45+0000\n"
+"PO-Revision-Date: 2022-09-01 01:41+0300\n"
 "Last-Translator: Emin Tufan Çetin <etcetin@gmail.com>\n"
 "Language-Team: Turkish <gnome-turk@gnome.org>\n"
 "Language: tr\n"
@@ -27,12 +27,14 @@ msgstr ""
 "X-Generator: Poedit 2.4.3\n"
 "X-POOTLE-MTIME: 1433363480.000000\n"
 
-#: data/org.gnome.Music.appdata.xml.in.in:6 data/org.gnome.Music.desktop.in.in:3
+#: data/org.gnome.Music.appdata.xml.in.in:6
+#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/about.py:236
 #: gnomemusic/application.py:61 gnomemusic/window.py:71
 msgid "Music"
 msgstr "Müzik"
 
-#: data/org.gnome.Music.appdata.xml.in.in:7 data/org.gnome.Music.desktop.in.in:5
+#: data/org.gnome.Music.appdata.xml.in.in:7
+#: data/org.gnome.Music.desktop.in.in:5
 msgid "Play and organize your music collection"
 msgstr "Müzik derleminizi çalın ve yönetin"
 
@@ -42,13 +44,13 @@ msgstr "Müziğinizi dinlemenin kolay ve hoş yolu."
 
 #: data/org.gnome.Music.appdata.xml.in.in:12
 msgid ""
-"Find tracks in your local collection, use automatically generated playlists or "
-"curate a fresh one."
+"Find tracks in your local collection, use automatically generated playlists "
+"or curate a fresh one."
 msgstr ""
 "Yerel derleminizdeki parçaları bulun,  kendiliğinden oluşturulan çalma "
-"listelerini kullanın veya yenisini yaratın."
+"listelerini kullanın veya yenisini oluşturun."
 
-#: data/org.gnome.Music.appdata.xml.in.in:149
+#: data/org.gnome.Music.appdata.xml.in.in:167
 msgid "The GNOME Music developers"
 msgstr "GNOME Müzik Geliştiricileri"
 
@@ -84,10 +86,10 @@ msgstr "Çalma yineleme kipi"
 #. Translators: Don't translate allowed values, just the description in the brackets
 #: data/org.gnome.Music.gschema.xml:24
 msgid ""
-"Value identifies whether to repeat or randomize playback through the collection. "
-"Allowed values are: “none” (repeat and shuffle are off), “song” (repeat current "
-"song), “all” (repeat playlist, no shuffle), “shuffle” (shuffle playlist, "
-"presumes repeat all)."
+"Value identifies whether to repeat or randomize playback through the "
+"collection. Allowed values are: “none” (repeat and shuffle are off), "
+"“song” (repeat current song), “all” (repeat playlist, no shuffle), "
+"“shuffle” (shuffle playlist, presumes repeat all)."
 msgstr ""
 "Bu değer, derlemdeki parçaların yinelemeli mi yoksa karışık mı çalınacağını "
 "belirtir. İzin verilen değerler şunlardır: “none” (yineleme ve karıştırma "
@@ -109,8 +111,8 @@ msgstr "Sistemin askıya alınmasını önle"
 #: data/org.gnome.Music.gschema.xml:34
 msgid "Enables or disables inhibiting system suspend while playing music"
 msgstr ""
-"Müzik çalarken sistemin askıya alınmasını önlemeyi etkinleştir veya devre dışı "
-"bırak"
+"Müzik çalarken sistemin askıya alınmasını önlemeyi etkinleştir veya devre "
+"dışı bırak"
 
 #: data/org.gnome.Music.gschema.xml:38
 msgid "Report music history to Last.fm"
@@ -118,80 +120,27 @@ msgstr "Müzik geçmişini Last.fm’e bildir"
 
 #: data/org.gnome.Music.gschema.xml:39
 msgid ""
-"Enables or disables sending scrobbles and the “currently playing” info to Last."
-"fm."
+"Enables or disables sending scrobbles and the “currently playing” info to "
+"Last.fm."
 msgstr ""
-"Last.fm’e skroplamaları ve “şu anda çalan” bilgilerini göndermeyi etkinleştirir "
-"veya devre dışı bırakır."
+"Last.fm’e skroplamaları ve “şu anda çalan” bilgilerini göndermeyi "
+"etkinleştirir veya devre dışı bırakır."
 
-#: data/ui/AboutDialog.ui.in:9
-msgid "Copyright © 2018 GNOME Music Developers"
-msgstr "Copyright © 2018 GNOME Müzik Geliştiricileri"
-
-#: data/ui/AboutDialog.ui.in:10
-msgid "A music player and management application for GNOME."
-msgstr "GNOME için müzik çalar ve yönetim uygulaması."
-
-#: data/ui/AboutDialog.ui.in:12
-msgid "Visit GNOME Music website"
-msgstr "GNOME Müzik web sitesini ziyaret et"
-
-#: data/ui/AboutDialog.ui.in:13
-msgid ""
-"GNOME Music is free software; you can redistribute it and/or modify it under the "
-"terms of the GNU General Public License as published by the Free Software "
-"Foundation; either version 2 of the License, or (at your option) any later "
-"version.\n"
-"\n"
-"GNOME Music is distributed in the hope that it will be useful, but WITHOUT ANY "
-"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A "
-"PARTICULAR PURPOSE.  See the GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"GNOME Music; if not, write to the Free Software Foundation, Inc., 51 Franklin "
-"Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
-"\n"
-"The GNOME Music authors hereby grant permission for non-GPL compatible GStreamer "
-"plugins to be used and distributed together with GStreamer and GNOME Music.  "
-"This permission is above and beyond the permissions granted by the GPL license "
-"by which GNOME Music is covered.  If you modify this code, you may extend this "
-"exception to your version of the code, but you are not obligated to do so.  If "
-"you do not wish to do so, delete this exception statement from your version."
-msgstr ""
-"GNOME Müzik, özgür yazılımdır; Özgür Yazılım Vakfı tarafından yayımlanan GNU "
-"Genel Kamu Lisansının 2. sürümü ya da (isteğe bağlı olarak) sonraki sürümleri "
-"koşulları altında yeniden dağıtabilir ve/veya değiştirebilirsiniz.\n"
-"\n"
-"GNOME Müzik kullanışlı olması maksadıyla dağıtılmaktadır, ancak HİÇBİR GARANTİSİ "
-"YOKTUR; aynı zamanda BİR AMACA UYGUNLUĞU ya da SATILABİLİRLİĞİ garanti etmez.  "
-"Daha çok ayrıntı için GNU Genel Kamu Lisansına bakınız.\n"
-"\n"
-"GNU Genel Kamu Lisansı’nın bir kopyasını GNOME Müzik ile almış olmalısınız; eğer "
-"almadıysanız Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, "
-"Boston, MA 02110-1301 USA adresine yazın.\n"
-"\n"
-"GNOME Müzik yazarları GPL uyumlu olmayan GStreamer eklentilerinin GStreamer ve "
-"GNOME Müzik ile birlikte kullanılmasına ve dağıtılmasına izin vermektedirler.  "
-"Bu izin GNOME Müzik’in lisansı olan GPL lisansının üzerinde ve onu kapsayıcı "
-"olarak verilmektedir.  Eğer bu kodu değiştirirseniz zorunlu olmamakla birlikte "
-"bu genişletmeyi kendi kodunuza uygulayabilirsiniz.  Bunu yapmak istemezseniz "
-"kendi sürümünüzden bu istisna ifadesini kaldırabilirsiniz."
-
-#: data/ui/AlbumWidget.ui:86 data/ui/PlayerToolbar.ui:88
-#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:168
+#: data/ui/AlbumWidget.ui:84 data/ui/PlayerToolbar.ui:87
+#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:170
 msgid "Play"
 msgstr "Çal"
 
-#: data/ui/AlbumWidget.ui:132 data/ui/PlaylistControls.ui:5
+#: data/ui/AlbumWidget.ui:130 data/ui/PlaylistControls.ui:5
 #: data/ui/SongWidgetMenu.ui:11
 msgid "_Play"
 msgstr "_Çal"
 
-#: data/ui/AlbumWidget.ui:136
+#: data/ui/AlbumWidget.ui:134
 msgid "Add to _Favorite Songs"
 msgstr "_Gözde Şarkılara Ekle"
 
-#: data/ui/AlbumWidget.ui:140 data/ui/SongWidgetMenu.ui:15
+#: data/ui/AlbumWidget.ui:138 data/ui/SongWidgetMenu.ui:15
 msgid "_Add to Playlist…"
 msgstr "Çalma Listesine _Ekle…"
 
@@ -215,7 +164,7 @@ msgstr "_Yardım"
 msgid "_About Music"
 msgstr "Müzik _Hakkında"
 
-#: data/ui/EmptyView.ui:26 data/ui/InitialState.ui:13
+#: data/ui/EmptyView.ui:30
 msgid "Welcome to Music"
 msgstr "Müzikʼe Hoş Geldiniz"
 
@@ -227,7 +176,7 @@ msgstr "Menü"
 msgid "Select"
 msgstr "Seç"
 
-#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:211
+#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:213
 #: data/ui/SearchHeaderBar.ui:20
 msgid "_Cancel"
 msgstr "_Vazgeç"
@@ -325,17 +274,13 @@ msgctxt "shortcut window"
 msgid "Go back"
 msgstr "Geri git"
 
-#: data/ui/InitialState.ui:25
-msgid "The contents of your Music Folder will appear here"
-msgstr "Müzik Klasörü içeriğiniz burada görünecek."
-
 #: data/ui/LastfmDialog.ui:21
 msgid ""
-"Last.fm is a music discovery service that gives you personalised recommendations "
-"based on the music you listen to."
+"Last.fm is a music discovery service that gives you personalised "
+"recommendations based on the music you listen to."
 msgstr ""
-"Last.fm, dinlediğiniz müziğe göre kişiselleştirilmiş öneriler sunan müzik keşif "
-"hizmetidir."
+"Last.fm, dinlediğiniz müziğe göre kişiselleştirilmiş öneriler sunan müzik "
+"keşif hizmetidir."
 
 #: data/ui/LastfmDialog.ui:31 gnomemusic/widgets/lastfmdialog.py:57
 msgid "Music Reporting Not Setup"
@@ -349,11 +294,11 @@ msgstr "Müzik dinlemenizi bildirmek için Last.fm hesabınıza giriş yapın."
 msgid "Login"
 msgstr "Giriş"
 
-#: data/ui/PlayerToolbar.ui:75
+#: data/ui/PlayerToolbar.ui:74
 msgid "Previous"
 msgstr "Önceki"
 
-#: data/ui/PlayerToolbar.ui:107
+#: data/ui/PlayerToolbar.ui:106
 msgid "Next"
 msgstr "Sonraki"
 
@@ -389,11 +334,11 @@ msgstr "Yeni Çalma Listesi…"
 msgid "Add"
 msgstr "Ekle"
 
-#: data/ui/PlaylistDialog.ui:200
+#: data/ui/PlaylistDialog.ui:202
 msgid "Add to Playlist"
 msgstr "Çalma Listesine Ekle"
 
-#: data/ui/PlaylistDialog.ui:220
+#: data/ui/PlaylistDialog.ui:222
 msgid "_Add"
 msgstr "_Ekle"
 
@@ -405,7 +350,7 @@ msgstr "Sanatçılar"
 msgid "View All"
 msgstr "Tümünü Görüntüle"
 
-#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:54
+#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:56
 msgid "Albums"
 msgstr "Albümler"
 
@@ -433,6 +378,22 @@ msgstr "Çalma Listesine _Ekle"
 msgid "_Remove from Playlist"
 msgstr "Çalma Listesinden _Kaldır"
 
+#: gnomemusic/about.py:238
+msgid "The GNOME Project"
+msgstr "GNOME Projesi"
+
+#: gnomemusic/about.py:242
+msgid "translator-credits"
+msgstr "Emin Tufan Çetin <etcetin@gmail.com>"
+
+#: gnomemusic/about.py:246
+msgid "Copyright The GNOME Music Developers"
+msgstr "Telif Hakkı GNOME Müzik Geliştiricileri"
+
+#: gnomemusic/about.py:249
+msgid "Translated by"
+msgstr "Çeviren"
+
 #. TRANSLATORS: this is a playlist name
 #: gnomemusic/grilowrappers/grltrackerplaylists.py:894
 msgid "Most Played"
@@ -572,7 +533,7 @@ msgstr "Sanatçı Sonuçları"
 msgid "Albums Results"
 msgstr "Albüm Sonuçları"
 
-#: gnomemusic/widgets/albumwidget.py:240
+#: gnomemusic/widgets/albumwidget.py:245
 msgid "{} minute"
 msgid_plural "{} minutes"
 msgstr[0] "{} dakika"
@@ -603,7 +564,7 @@ msgstr "{} olarak giriş yapıldı"
 msgid "Configure"
 msgstr "Yapılandır"
 
-#: gnomemusic/widgets/playertoolbar.py:165
+#: gnomemusic/widgets/playertoolbar.py:167
 msgid "Pause"
 msgstr "Duraklat"
 
@@ -611,142 +572,3 @@ msgstr "Duraklat"
 msgid "{} Song"
 msgid_plural "{} Songs"
 msgstr[0] "{} Şarkı"
-
-#~ msgid "GNOME Music"
-#~ msgstr "GNOME Müzik"
-
-#~ msgid "Window position"
-#~ msgstr "Pencere konumu"
-
-#~ msgid "Window position (x and y)."
-#~ msgstr "Pencere konumu (x ve y)."
-
-#~ msgid "Loading"
-#~ msgstr "Yükleniyor"
-
-#~ msgid "Add to Playlist…"
-#~ msgstr "Çalma Listesine Ekle…"
-
-#~ msgid ""
-#~ "An easy way to play your music. Automatically discover music on your "
-#~ "computer, the local network and internet services."
-#~ msgstr ""
-#~ "Müziğinizi çalmanın kolay yolu. Bilgisayarınızdaki, yerel ağınızdaki ve "
-#~ "internet hizmetlerinizdeki müziği kendiliğinden keşfeder."
-
-#~ msgid ""
-#~ "Find tracks in your local collection, get music from DLNA servers or try "
-#~ "something new with the Jamendo and Magnatune services."
-#~ msgstr ""
-#~ "Yerel derleminizdeki parçaları bulun, DLNA sunucularından müzik alın veya "
-#~ "Jamendo ve Magnatune hizmetleriyle yeni şeyler deneyin."
-
-#~ msgid "Inital state has been displayed"
-#~ msgstr "İlk durum görüntülendi"
-
-#~ msgid "Set to true when initial state has been displayed"
-#~ msgstr "İlk durum görüntülendiğinde doğru olarak ayarla"
-
-#~ msgid "Released"
-#~ msgstr "Yayım"
-
-#~ msgid "Running Length"
-#~ msgstr "Uzunluk"
-
-#~ msgid "Composer"
-#~ msgstr "Besteci"
-
-#~ msgctxt "context menu item"
-#~ msgid "Play"
-#~ msgstr "Çal"
-
-#~ msgid "Hey DJ"
-#~ msgstr "Hey DJ"
-
-#~ msgid "All"
-#~ msgstr "Tümü"
-
-#~ msgid "Artist"
-#~ msgstr "Sanatçı"
-
-#~ msgid "Album"
-#~ msgstr "Albüm"
-
-#~ msgid "Track Title"
-#~ msgstr "Parça Adı"
-
-#~ msgid "Local"
-#~ msgstr "Yerel"
-
-#~ msgid "Sources"
-#~ msgstr "Kaynaklar"
-
-#~ msgid "Match"
-#~ msgstr "Eşleştir"
-
-#~ msgid "@icon@"
-#~ msgstr "@icon@"
-
-#~ msgid "Untitled"
-#~ msgstr "Başlıksız"
-
-#~ msgid "_Quit"
-#~ msgstr "_Çıkış"
-
-#~ msgid "Music is the new GNOME music playing application."
-#~ msgstr "Müzik, GNOME’un yeni müzik çalma uygulamasıdır."
-
-#~| msgid "gnome-music"
-#~ msgid "org.gnome.Music"
-#~ msgstr "org.gnome.Music"
-
-#~ msgid "Selected %d item"
-#~ msgid_plural "Selected %d items"
-#~ msgstr[0] "%d öge seçildi"
-
-#~ msgid "%d min"
-#~ msgstr "%d dk"
-
-#~ msgid "Empty"
-#~ msgstr "Boş"
-
-#~ msgid "Select Playlist"
-#~ msgstr "Çalma Listesi Seç"
-
-#~ msgid "Search mode"
-#~ msgstr "Arama kipi"
-
-#~ msgid "If true, the search bar is shown."
-#~ msgstr "Etkinse, arama çubuğu gösterilir."
-
-#~ msgid "Notifications mode"
-#~ msgstr "Bildirim kipi"
-
-#~ msgid "Enables or disables playback notifications"
-#~ msgstr "Çalma bildirimlerini etkinleştirir veya devre dışı bırakır"
-
-#~ msgid "the|a|an"
-#~ msgstr "the|a|an"
-
-#~ msgid "Max chars to display in track name on Artist view"
-#~ msgstr "Sanatçı görünümünde gösterilen parça adı için en fazla karakter sayısı"
-
-#~ msgid ""
-#~ "This setting modifies the amount of chars for track title on Artist view "
-#~ "before its been ellipsized. Set this to -1 to disable"
-#~ msgstr ""
-#~ "Bu ayar sanatçı görünümünde gösterilen parça adının üç nokta koyulmadan önce "
-#~ "görünecek karakter sayısını değiştirir. Devre dışı bırakmak için -1 olarak "
-#~ "ayarlayın."
-
-#~ msgid "Not playing"
-#~ msgstr "Yürütülmüyor"
-
-#~ msgid "by %s, from %s"
-#~ msgstr "%s tarafından, %s albümünde"
-
-#~ msgid "the a an"
-#~ msgstr "the"
-
-#~ msgid "All Artists"
-#~ msgstr "Tüm Sanatçılar"
diff --git a/po/uk.po b/po/uk.po
index 3eaf41f7..59ed70e1 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -9,21 +9,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-music/issues\n"
-"POT-Creation-Date: 2022-02-19 12:39+0000\n"
-"PO-Revision-Date: 2022-02-19 18:36+0200\n"
+"POT-Creation-Date: 2022-08-27 13:27+0000\n"
+"PO-Revision-Date: 2022-08-27 17:31+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n"
+"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
 "X-Generator: Lokalize 20.12.0\n"
 "X-Project-Style: gnome\n"
 
 #: data/org.gnome.Music.appdata.xml.in.in:6
-#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/application.py:61
-#: gnomemusic/window.py:71
+#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/about.py:236
+#: gnomemusic/application.py:61 gnomemusic/window.py:71
 msgid "Music"
 msgstr "Музика"
 
@@ -44,7 +45,7 @@ msgstr ""
 "Шукайте композиції у вашій локальній збірці, користуйтеся автоматично "
 "створеними списками відтворення або створюйте вручну нові списки відтворення."
 
-#: data/org.gnome.Music.appdata.xml.in.in:149
+#: data/org.gnome.Music.appdata.xml.in.in:167
 msgid "The GNOME Music developers"
 msgstr "Розробники Музики GNOME"
 
@@ -120,78 +121,21 @@ msgstr ""
 "Вмикає або вимикає надсилання журналу відтворення та даних щодо поточного "
 "відтворення музики на Last.fm."
 
-#: data/ui/AboutDialog.ui.in:9
-msgid "Copyright © 2018 GNOME Music Developers"
-msgstr "© 2018 Розробники Музики GNOME"
-
-#: data/ui/AboutDialog.ui.in:10
-msgid "A music player and management application for GNOME."
-msgstr "Програма для програвання і впорядкування музики в GNOME."
-
-#: data/ui/AboutDialog.ui.in:12
-msgid "Visit GNOME Music website"
-msgstr "Відвідати сайт Музики GNOME"
-
-#: data/ui/AboutDialog.ui.in:13
-msgid ""
-"GNOME Music is free software; you can redistribute it and/or modify it under "
-"the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"GNOME Music is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
-"\n"
-"The GNOME Music authors hereby grant permission for non-GPL compatible "
-"GStreamer plugins to be used and distributed together with GStreamer and "
-"GNOME Music.  This permission is above and beyond the permissions granted by "
-"the GPL license by which GNOME Music is covered.  If you modify this code, "
-"you may extend this exception to your version of the code, but you are not "
-"obligated to do so.  If you do not wish to do so, delete this exception "
-"statement from your version."
-msgstr ""
-"«Музика GNOME» є вільним програмним забезпеченням (ПЗ); ви можете "
-"розповсюджувати її та/чи модифікувати її згідно з умовами ЗАГАЛЬНОЇ "
-"ГРОМАДСЬКОЇ ЛІЦЕНЗІЇ (GPL) GNU як опубліковано Free Software Foundation; "
-"версії 2 цієї Ліцензії, або (на ваш розсуд) будь якої наступної версії.\n"
-"\n"
-"Музика GNOME розповсюджується з надією, що вона стане у пригоді, але БЕЗ "
-"ЖОДНИХ ГАРАНТІЙ; навіть не маючи на увазі гарантії ПРИДАТНОСТІ ДЛЯ ПРОДАЖУ "
-"або ПРИДАТНОСТІ ДО КОНКРЕТНОЇ МЕТИ. Див. ЗАГАЛЬНУ ГРОМАДСЬКУ ЛІЦЕНЗІЮ (GPL) "
-"GNU для отримання детальної інформації.\n"
-"\n"
-"Ви маєте отримати копію ЗАГАЛЬНОЇ ГРОМАДСЬКОЇ ЛІЦЕНЗІЇ (GPL) GNU з цим "
-"примірником Музика GNOME; якщо ні, напишіть в Free Software Foundation, "
-"Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
-"\n"
-"Розробники Музики GNOME дають дозвіл на використання та розповсюдження "
-"додатків GStreamer не сумісних з GPL, разом із GStreamer та Музикою GNOME. "
-"Цей дозвіл вище і за межами дозволів, наданих ліцензією GPL, якою "
-"охоплюється Музика GNOME.Якщо ви змінюєте цей код, ви можете розширити цей "
-"виняток на свою версію коду, але не зобов'язані цього робити. У цьому разі, "
-"вилучіть заяву про цей виняток зі своєї версії."
-
-#: data/ui/AlbumWidget.ui:86 data/ui/PlayerToolbar.ui:88
-#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:168
+#: data/ui/AlbumWidget.ui:84 data/ui/PlayerToolbar.ui:87
+#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:170
 msgid "Play"
 msgstr "Програти"
 
-#: data/ui/AlbumWidget.ui:132 data/ui/PlaylistControls.ui:5
+#: data/ui/AlbumWidget.ui:130 data/ui/PlaylistControls.ui:5
 #: data/ui/SongWidgetMenu.ui:11
 msgid "_Play"
 msgstr "Про_грати"
 
-#: data/ui/AlbumWidget.ui:136
+#: data/ui/AlbumWidget.ui:134
 msgid "Add to _Favorite Songs"
 msgstr "Додати до _улюблених пісень"
 
-#: data/ui/AlbumWidget.ui:140 data/ui/SongWidgetMenu.ui:15
+#: data/ui/AlbumWidget.ui:138 data/ui/SongWidgetMenu.ui:15
 msgid "_Add to Playlist…"
 msgstr "_Додати до списку композицій…"
 
@@ -215,7 +159,7 @@ msgstr "_Довідка"
 msgid "_About Music"
 msgstr "_Про «Музику»"
 
-#: data/ui/EmptyView.ui:26 data/ui/InitialState.ui:13
+#: data/ui/EmptyView.ui:30
 msgid "Welcome to Music"
 msgstr "Вітаємо у «Музиці»"
 
@@ -227,7 +171,7 @@ msgstr "Меню"
 msgid "Select"
 msgstr "Вибрати"
 
-#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:211
+#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:213
 #: data/ui/SearchHeaderBar.ui:20
 msgid "_Cancel"
 msgstr "_Скасувати"
@@ -325,11 +269,6 @@ msgctxt "shortcut window"
 msgid "Go back"
 msgstr "Повернутися"
 
-#: data/ui/InitialState.ui:25
-#| msgid "The contents of your {} will appear here."
-msgid "The contents of your Music Folder will appear here"
-msgstr "Тут з'явиться вміст вашої теки «Музика»."
-
 #: data/ui/LastfmDialog.ui:21
 msgid ""
 "Last.fm is a music discovery service that gives you personalised "
@@ -352,11 +291,11 @@ msgstr ""
 msgid "Login"
 msgstr "Увійти"
 
-#: data/ui/PlayerToolbar.ui:75
+#: data/ui/PlayerToolbar.ui:74
 msgid "Previous"
 msgstr "Попередня"
 
-#: data/ui/PlayerToolbar.ui:107
+#: data/ui/PlayerToolbar.ui:106
 msgid "Next"
 msgstr "Наступна"
 
@@ -392,11 +331,11 @@ msgstr "Створити список композицій…"
 msgid "Add"
 msgstr "Додати"
 
-#: data/ui/PlaylistDialog.ui:200
+#: data/ui/PlaylistDialog.ui:202
 msgid "Add to Playlist"
 msgstr "Додати до списку композицій"
 
-#: data/ui/PlaylistDialog.ui:220
+#: data/ui/PlaylistDialog.ui:222
 msgid "_Add"
 msgstr "_Додати"
 
@@ -408,7 +347,7 @@ msgstr "Виконавці"
 msgid "View All"
 msgstr "Переглянути все"
 
-#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:54
+#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:56
 msgid "Albums"
 msgstr "Альбоми"
 
@@ -436,6 +375,26 @@ msgstr "_Додати до списку композицій"
 msgid "_Remove from Playlist"
 msgstr "Ви_лучити зі списку"
 
+#: gnomemusic/about.py:238
+msgid "The GNOME Project"
+msgstr "Проєкт GNOME"
+
+#: gnomemusic/about.py:242
+msgid "translator-credits"
+msgstr ""
+"Данило Коростіль <ted.korostiled@gmail.com>, 2013–2019\n"
+"Євген Стрежньов <strezhnev.ua@gmail.com>, 2019\n"
+"Юрій Чорноіван <yurchor@ukr.net>, 2020–2022"
+
+#: gnomemusic/about.py:246
+#| msgid "Copyright © 2018 GNOME Music Developers"
+msgid "Copyright The GNOME Music Developers"
+msgstr "© Розробники Музики GNOME"
+
+#: gnomemusic/about.py:249
+msgid "Translated by"
+msgstr "Переклад"
+
 #. TRANSLATORS: this is a playlist name
 #: gnomemusic/grilowrappers/grltrackerplaylists.py:894
 msgid "Most Played"
@@ -578,7 +537,7 @@ msgstr "Виконавці"
 msgid "Albums Results"
 msgstr "Альбоми"
 
-#: gnomemusic/widgets/albumwidget.py:240
+#: gnomemusic/widgets/albumwidget.py:245
 msgid "{} minute"
 msgid_plural "{} minutes"
 msgstr[0] "{} хвилина"
@@ -615,7 +574,7 @@ msgstr "Вхід до системи від імені {}"
 msgid "Configure"
 msgstr "Налаштувати"
 
-#: gnomemusic/widgets/playertoolbar.py:165
+#: gnomemusic/widgets/playertoolbar.py:167
 msgid "Pause"
 msgstr "Призупинити"
 
@@ -627,6 +586,60 @@ msgstr[1] "{} пісні"
 msgstr[2] "{} пісень"
 msgstr[3] "{} пісня"
 
+#~ msgid "A music player and management application for GNOME."
+#~ msgstr "Програма для програвання і впорядкування музики в GNOME."
+
+#~ msgid "Visit GNOME Music website"
+#~ msgstr "Відвідати сайт Музики GNOME"
+
+#~ msgid ""
+#~ "GNOME Music is free software; you can redistribute it and/or modify it "
+#~ "under the terms of the GNU General Public License as published by the "
+#~ "Free Software Foundation; either version 2 of the License, or (at your "
+#~ "option) any later version.\n"
+#~ "\n"
+#~ "GNOME Music is distributed in the hope that it will be useful, but "
+#~ "WITHOUT ANY WARRANTY; without even the implied warranty of "
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General "
+#~ "Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License along "
+#~ "with GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
+#~ "Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
+#~ "\n"
+#~ "The GNOME Music authors hereby grant permission for non-GPL compatible "
+#~ "GStreamer plugins to be used and distributed together with GStreamer and "
+#~ "GNOME Music.  This permission is above and beyond the permissions granted "
+#~ "by the GPL license by which GNOME Music is covered.  If you modify this "
+#~ "code, you may extend this exception to your version of the code, but you "
+#~ "are not obligated to do so.  If you do not wish to do so, delete this "
+#~ "exception statement from your version."
+#~ msgstr ""
+#~ "«Музика GNOME» є вільним програмним забезпеченням (ПЗ); ви можете "
+#~ "розповсюджувати її та/чи модифікувати її згідно з умовами ЗАГАЛЬНОЇ "
+#~ "ГРОМАДСЬКОЇ ЛІЦЕНЗІЇ (GPL) GNU як опубліковано Free Software Foundation; "
+#~ "версії 2 цієї Ліцензії, або (на ваш розсуд) будь якої наступної версії.\n"
+#~ "\n"
+#~ "Музика GNOME розповсюджується з надією, що вона стане у пригоді, але БЕЗ "
+#~ "ЖОДНИХ ГАРАНТІЙ; навіть не маючи на увазі гарантії ПРИДАТНОСТІ ДЛЯ "
+#~ "ПРОДАЖУ або ПРИДАТНОСТІ ДО КОНКРЕТНОЇ МЕТИ. Див. ЗАГАЛЬНУ ГРОМАДСЬКУ "
+#~ "ЛІЦЕНЗІЮ (GPL) GNU для отримання детальної інформації.\n"
+#~ "\n"
+#~ "Ви маєте отримати копію ЗАГАЛЬНОЇ ГРОМАДСЬКОЇ ЛІЦЕНЗІЇ (GPL) GNU з цим "
+#~ "примірником Музика GNOME; якщо ні, напишіть в Free Software Foundation, "
+#~ "Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
+#~ "\n"
+#~ "Розробники Музики GNOME дають дозвіл на використання та розповсюдження "
+#~ "додатків GStreamer не сумісних з GPL, разом із GStreamer та Музикою "
+#~ "GNOME. Цей дозвіл вище і за межами дозволів, наданих ліцензією GPL, якою "
+#~ "охоплюється Музика GNOME.Якщо ви змінюєте цей код, ви можете розширити "
+#~ "цей виняток на свою версію коду, але не зобов'язані цього робити. У цьому "
+#~ "разі, вилучіть заяву про цей виняток зі своєї версії."
+
+#~| msgid "The contents of your {} will appear here."
+#~ msgid "The contents of your Music Folder will appear here"
+#~ msgstr "Тут з'явиться вміст вашої теки «Музика»."
+
 #~ msgid "GNOME Music"
 #~ msgstr "Музика GNOME"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index b93b271a..598f2a0b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -13,21 +13,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-music master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-music/issues\n"
-"POT-Creation-Date: 2022-02-19 12:39+0000\n"
-"PO-Revision-Date: 2022-02-19 12:24-0500\n"
-"Last-Translator: lumingzh <lumingzh@qq.com>\n"
+"POT-Creation-Date: 2022-08-27 13:27+0000\n"
+"PO-Revision-Date: 2022-09-03 16:56-0400\n"
+"Last-Translator: Boyuan Yang <073plan@gmail.com>\n"
 "Language-Team: Chinese - China <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 2.4.3\n"
+"X-Generator: Poedit 3.1.1\n"
 "X-DamnedLies-Scope: partial\n"
 
 #: data/org.gnome.Music.appdata.xml.in.in:6
-#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/application.py:61
-#: gnomemusic/window.py:71
+#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/about.py:236
+#: gnomemusic/application.py:61 gnomemusic/window.py:71
 msgid "Music"
 msgstr "音乐"
 
@@ -47,7 +47,7 @@ msgid ""
 msgstr ""
 "在您的本地收藏中寻找音轨，使用自动生成的播放列表或者自行编辑生成播放列表。"
 
-#: data/org.gnome.Music.appdata.xml.in.in:149
+#: data/org.gnome.Music.appdata.xml.in.in:167
 msgid "The GNOME Music developers"
 msgstr "GNOME“音乐”开发者"
 
@@ -118,74 +118,21 @@ msgid ""
 "Last.fm."
 msgstr "启用或禁用向 Last.fm 发送当前播放的曲目以及“正在播放”信息的功能。"
 
-#: data/ui/AboutDialog.ui.in:9
-msgid "Copyright © 2018 GNOME Music Developers"
-msgstr "版权所有 © 2018 GNOME“音乐”开发者"
-
-#: data/ui/AboutDialog.ui.in:10
-msgid "A music player and management application for GNOME."
-msgstr "GNOME 音乐播放及管理程序。"
-
-#: data/ui/AboutDialog.ui.in:12
-msgid "Visit GNOME Music website"
-msgstr "访问“GNOME 音乐”网站"
-
-#: data/ui/AboutDialog.ui.in:13
-msgid ""
-"GNOME Music is free software; you can redistribute it and/or modify it under "
-"the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"GNOME Music is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
-"\n"
-"The GNOME Music authors hereby grant permission for non-GPL compatible "
-"GStreamer plugins to be used and distributed together with GStreamer and "
-"GNOME Music.  This permission is above and beyond the permissions granted by "
-"the GPL license by which GNOME Music is covered.  If you modify this code, "
-"you may extend this exception to your version of the code, but you are not "
-"obligated to do so.  If you do not wish to do so, delete this exception "
-"statement from your version."
-msgstr ""
-"GNOME 音乐是自由软件；您可以在自由软件基金会发布的 GNU 通用公共许可证的条款下"
-"重新分发和（或）修改它；您可以选择使用 GPL 第二版，或（按照您的意愿）任何更新"
-"的版本。\n"
-"\n"
-"GNOME 音乐分发的目的是希望它物有所用，但是没有任何担保；没有对其适销性和某一"
-"特定目的下的适用性的任何即便是暗示的担保。请查阅 GNU 通用公共许可证以获得更多"
-"信息。\n"
-"\n"
-"您应当已经跟 GNOME 音乐一起收到一份 GNU 通用公众许可证的副本；如果没有，请写"
-"信至：Free Software Foundation, Inc.，\n"
-"51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA\n"
-"\n"
-"GNOME 音乐的作者在此对非 GPL 兼容的 GStreamer 插件同 GNOME 音乐及 GStreamer "
-"一道使用及分发给予许可。该许可优于并覆盖在 GNOME 音乐的 GPL 授权许可之上。如"
-"果您修改该代码，您可以将该例外扩展到您的代码，但非强制。如果您不愿意如此，从"
-"您的版本中删除该例外声明。"
-
-#: data/ui/AlbumWidget.ui:86 data/ui/PlayerToolbar.ui:88
-#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:168
+#: data/ui/AlbumWidget.ui:84 data/ui/PlayerToolbar.ui:87
+#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:170
 msgid "Play"
 msgstr "播放"
 
-#: data/ui/AlbumWidget.ui:132 data/ui/PlaylistControls.ui:5
+#: data/ui/AlbumWidget.ui:130 data/ui/PlaylistControls.ui:5
 #: data/ui/SongWidgetMenu.ui:11
 msgid "_Play"
 msgstr "播放(_P)"
 
-#: data/ui/AlbumWidget.ui:136
+#: data/ui/AlbumWidget.ui:134
 msgid "Add to _Favorite Songs"
 msgstr "添加至收藏歌曲(_F)"
 
-#: data/ui/AlbumWidget.ui:140 data/ui/SongWidgetMenu.ui:15
+#: data/ui/AlbumWidget.ui:138 data/ui/SongWidgetMenu.ui:15
 msgid "_Add to Playlist…"
 msgstr "添加到播放列表(_A)…"
 
@@ -209,7 +156,7 @@ msgstr "帮助(_H)"
 msgid "_About Music"
 msgstr "关于“音乐”(_A)"
 
-#: data/ui/EmptyView.ui:26 data/ui/InitialState.ui:13
+#: data/ui/EmptyView.ui:30
 msgid "Welcome to Music"
 msgstr "欢迎使用音乐应用"
 
@@ -221,7 +168,7 @@ msgstr "菜单"
 msgid "Select"
 msgstr "选择"
 
-#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:211
+#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:213
 #: data/ui/SearchHeaderBar.ui:20
 msgid "_Cancel"
 msgstr "取消(_C)"
@@ -319,10 +266,6 @@ msgctxt "shortcut window"
 msgid "Go back"
 msgstr "返回"
 
-#: data/ui/InitialState.ui:25
-msgid "The contents of your Music Folder will appear here"
-msgstr "您的音乐文件夹的内容将会显示在此处"
-
 #: data/ui/LastfmDialog.ui:21
 msgid ""
 "Last.fm is a music discovery service that gives you personalised "
@@ -341,11 +284,11 @@ msgstr "登录您的 Last.fm 帐号以便报告您的音乐收听情况。"
 msgid "Login"
 msgstr "登录"
 
-#: data/ui/PlayerToolbar.ui:75
+#: data/ui/PlayerToolbar.ui:74
 msgid "Previous"
 msgstr "上一首"
 
-#: data/ui/PlayerToolbar.ui:107
+#: data/ui/PlayerToolbar.ui:106
 msgid "Next"
 msgstr "下一首"
 
@@ -381,11 +324,11 @@ msgstr "新建播放列表…"
 msgid "Add"
 msgstr "添加"
 
-#: data/ui/PlaylistDialog.ui:200
+#: data/ui/PlaylistDialog.ui:202
 msgid "Add to Playlist"
 msgstr "添加到播放列表"
 
-#: data/ui/PlaylistDialog.ui:220
+#: data/ui/PlaylistDialog.ui:222
 msgid "_Add"
 msgstr "添加(_A)"
 
@@ -397,7 +340,7 @@ msgstr "艺术家"
 msgid "View All"
 msgstr "查看所有"
 
-#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:54
+#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:56
 msgid "Albums"
 msgstr "专辑"
 
@@ -425,6 +368,30 @@ msgstr "添加到播放列表(_A)"
 msgid "_Remove from Playlist"
 msgstr "从播放列表移除(_R)"
 
+#: gnomemusic/about.py:238
+msgid "The GNOME Project"
+msgstr "GNOME 项目"
+
+#: gnomemusic/about.py:242
+msgid "translator-credits"
+msgstr ""
+"tuhaihe <1132321739qq@gmail.com>, 2013\n"
+"Tong Hui <tonghuix@gmail.com>, 2013\n"
+"sphinx <yishanj@gmail.com>, 2014\n"
+"Mingcong Bai <jeffbai@aosc.xyz>, 2018\n"
+"Dingzhong Chen <wsxy162@gmail.com>, 2018, 2019\n"
+"Cheng Lu <chenglu1990@gmail.com>, 2016, 2020\n"
+"lumingzh <lumingzh@qq.com>, 2022\n"
+"Boyuan Yang <byang@debian.org>, 2022"
+
+#: gnomemusic/about.py:246
+msgid "Copyright The GNOME Music Developers"
+msgstr "版权所有 GNOME“音乐”开发者"
+
+#: gnomemusic/about.py:249
+msgid "Translated by"
+msgstr "翻译贡献者"
+
 #. TRANSLATORS: this is a playlist name
 #: gnomemusic/grilowrappers/grltrackerplaylists.py:894
 msgid "Most Played"
@@ -564,7 +531,7 @@ msgstr "艺术家结果"
 msgid "Albums Results"
 msgstr "专辑结果"
 
-#: gnomemusic/widgets/albumwidget.py:240
+#: gnomemusic/widgets/albumwidget.py:245
 msgid "{} minute"
 msgid_plural "{} minutes"
 msgstr[0] "{} 分钟"
@@ -595,7 +562,7 @@ msgstr "以 {} 登录"
 msgid "Configure"
 msgstr "设置"
 
-#: gnomemusic/widgets/playertoolbar.py:165
+#: gnomemusic/widgets/playertoolbar.py:167
 msgid "Pause"
 msgstr "暂停"
 
@@ -604,6 +571,55 @@ msgid "{} Song"
 msgid_plural "{} Songs"
 msgstr[0] "{} 首歌曲"
 
+#~ msgid "A music player and management application for GNOME."
+#~ msgstr "GNOME 音乐播放及管理程序。"
+
+#~ msgid "Visit GNOME Music website"
+#~ msgstr "访问“GNOME 音乐”网站"
+
+#~ msgid ""
+#~ "GNOME Music is free software; you can redistribute it and/or modify it "
+#~ "under the terms of the GNU General Public License as published by the "
+#~ "Free Software Foundation; either version 2 of the License, or (at your "
+#~ "option) any later version.\n"
+#~ "\n"
+#~ "GNOME Music is distributed in the hope that it will be useful, but "
+#~ "WITHOUT ANY WARRANTY; without even the implied warranty of "
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General "
+#~ "Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License along "
+#~ "with GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
+#~ "Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
+#~ "\n"
+#~ "The GNOME Music authors hereby grant permission for non-GPL compatible "
+#~ "GStreamer plugins to be used and distributed together with GStreamer and "
+#~ "GNOME Music.  This permission is above and beyond the permissions granted "
+#~ "by the GPL license by which GNOME Music is covered.  If you modify this "
+#~ "code, you may extend this exception to your version of the code, but you "
+#~ "are not obligated to do so.  If you do not wish to do so, delete this "
+#~ "exception statement from your version."
+#~ msgstr ""
+#~ "GNOME 音乐是自由软件；您可以在自由软件基金会发布的 GNU 通用公共许可证的条"
+#~ "款下重新分发和（或）修改它；您可以选择使用 GPL 第二版，或（按照您的意愿）"
+#~ "任何更新的版本。\n"
+#~ "\n"
+#~ "GNOME 音乐分发的目的是希望它物有所用，但是没有任何担保；没有对其适销性和某"
+#~ "一特定目的下的适用性的任何即便是暗示的担保。请查阅 GNU 通用公共许可证以获"
+#~ "得更多信息。\n"
+#~ "\n"
+#~ "您应当已经跟 GNOME 音乐一起收到一份 GNU 通用公众许可证的副本；如果没有，请"
+#~ "写信至：Free Software Foundation, Inc.，\n"
+#~ "51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA\n"
+#~ "\n"
+#~ "GNOME 音乐的作者在此对非 GPL 兼容的 GStreamer 插件同 GNOME 音乐及 "
+#~ "GStreamer 一道使用及分发给予许可。该许可优于并覆盖在 GNOME 音乐的 GPL 授权"
+#~ "许可之上。如果您修改该代码，您可以将该例外扩展到您的代码，但非强制。如果您"
+#~ "不愿意如此，从您的版本中删除该例外声明。"
+
+#~ msgid "The contents of your Music Folder will appear here"
+#~ msgstr "您的音乐文件夹的内容将会显示在此处"
+
 #~ msgid "GNOME Music"
 #~ msgstr "GNOME 音乐"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index a2b26425..aad1e8cc 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -3,52 +3,47 @@
 # This file is distributed under the same license as the gnome-music package.
 #
 # pan93412 <pan93412@gmail.com>, 2019.
+# Freddy Cheng <freddy4212@gmail.com>, 2022.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-music master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-music/issues\n"
-"POT-Creation-Date: 2020-10-05 15:17+0000\n"
-"PO-Revision-Date: 2020-10-12 22:06+0800\n"
+"POT-Creation-Date: 2022-08-31 19:15+0000\n"
+"PO-Revision-Date: 2022-10-18 21:08+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
-"Language-Team: Chinese <zh-l10n@linux.org.tw>\n"
+"Language-Team: Chinese - Taiwan <chinese-l10n@googlegroups.com>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.4.1\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 3.1.1\n"
 
 #: data/org.gnome.Music.appdata.xml.in.in:6
-msgid "GNOME Music"
-msgstr "GNOME 音樂"
+#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/about.py:236
+#: gnomemusic/application.py:61 gnomemusic/window.py:71
+msgid "Music"
+msgstr "音樂"
 
 #: data/org.gnome.Music.appdata.xml.in.in:7
 #: data/org.gnome.Music.desktop.in.in:5
 msgid "Play and organize your music collection"
-msgstr "播放與組織您的音樂收藏集"
+msgstr "播放與管理您所收藏的音樂"
 
 #: data/org.gnome.Music.appdata.xml.in.in:9
-msgid ""
-"An easy way to play your music. Automatically discover music on your "
-"computer, the local network and internet services."
-msgstr "用簡單的方式播放音樂，自動探索您電腦、區域網路和網際網路服務中的音樂。"
+msgid "An easy and pleasant way to play your music."
+msgstr "一種輕鬆且愉悅的音樂播放方式。"
 
 #: data/org.gnome.Music.appdata.xml.in.in:12
 msgid ""
-"Find tracks in your local collection, get music from DLNA servers or try "
-"something new with the Jamendo and Magnatune services."
-msgstr ""
-"在您的本地集合中找尋曲目，從 DLNA 伺服器取得音樂或透過 Jamendo 和 Magnatune "
-"服務找尋些新音樂。"
+"Find tracks in your local collection, use automatically generated playlists "
+"or curate a fresh one."
+msgstr "尋找您電腦中的音樂，並能自動產生或是自行編排播放列表。"
 
-#: data/org.gnome.Music.appdata.xml.in.in:133
+#: data/org.gnome.Music.appdata.xml.in.in:167
 msgid "The GNOME Music developers"
-msgstr "GNOME 音樂開發團隊"
-
-#: data/org.gnome.Music.desktop.in.in:3 gnomemusic/application.py:60
-#: gnomemusic/window.py:70
-msgid "Music"
-msgstr "音樂"
+msgstr "GNOME 音樂開發群"
 
 #: data/org.gnome.Music.desktop.in.in:4
 msgid "Music Player"
@@ -57,7 +52,7 @@ msgstr "音樂播放器"
 #. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 #: data/org.gnome.Music.desktop.in.in:13
 msgid "Music;Player;"
-msgstr "Music;Player;音樂;播放器;"
+msgstr "Music;Player;音樂;播放器;mp3;聽音樂;歌;lastfm;"
 
 #: data/org.gnome.Music.gschema.xml:12
 msgid "Window size"
@@ -65,267 +60,204 @@ msgstr "視窗尺寸"
 
 #: data/org.gnome.Music.gschema.xml:13
 msgid "Window size (width and height)."
-msgstr "視窗大小 (寬度與高度)。"
+msgstr "視窗大小 (寬度,高度)。"
 
 #: data/org.gnome.Music.gschema.xml:17
-msgid "Window position"
-msgstr "視窗位置"
-
-#: data/org.gnome.Music.gschema.xml:18
-msgid "Window position (x and y)."
-msgstr "視窗位置 (x 與 y)。"
-
-#: data/org.gnome.Music.gschema.xml:22
 msgid "Window maximized"
-msgstr "視窗已最大化"
+msgstr "視窗最大化"
 
-#: data/org.gnome.Music.gschema.xml:23
+#: data/org.gnome.Music.gschema.xml:18
 msgid "Window maximized state."
-msgstr "視窗為最大化狀態。"
+msgstr "是否要最大化視窗。"
 
-#: data/org.gnome.Music.gschema.xml:27
+#: data/org.gnome.Music.gschema.xml:22
 msgid "Playback repeat mode"
 msgstr "重複播放模式"
 
 #. Translators: Don't translate allowed values, just the description in the brackets
-#: data/org.gnome.Music.gschema.xml:29
+#: data/org.gnome.Music.gschema.xml:24
 msgid ""
 "Value identifies whether to repeat or randomize playback through the "
 "collection. Allowed values are: “none” (repeat and shuffle are off), "
 "“song” (repeat current song), “all” (repeat playlist, no shuffle), "
 "“shuffle” (shuffle playlist, presumes repeat all)."
 msgstr ""
-"用來辨別是要重複播放收藏集或是亂數播放的值。允許的值有：「none」(不重複也不隨"
-"機)、「song」(重複目前曲目)、「all」(重複播放清單曲目，不隨機) 和「shuffle」"
-"(隨機播放清單曲目，假定全部重複)。"
+"用來辨別是要重複播放蒐藏或隨機播放的值。允許的值有：\n"
+"「none」（不重複也不隨機）\n"
+"「song」（重複目前曲目）\n"
+"「all」（重複播放清單曲目，不隨機）\n"
+"「shuffle」（隨機播放清單曲目，假定全部重複）"
 
-#: data/org.gnome.Music.gschema.xml:33
+#: data/org.gnome.Music.gschema.xml:28
 msgid "Enable ReplayGain"
 msgstr "啟用播放增益"
 
-#: data/org.gnome.Music.gschema.xml:34
+#: data/org.gnome.Music.gschema.xml:29
 msgid "Enables or disables ReplayGain for albums"
 msgstr "啟用或停用專輯的播放增益"
 
-#: data/org.gnome.Music.gschema.xml:38
-msgid "Inital state has been displayed"
-msgstr "已顯示初始狀態"
-
-#: data/org.gnome.Music.gschema.xml:39
-msgid "Set to true when initial state has been displayed"
-msgstr "當顯示初始狀態設定為 true"
-
-#: data/org.gnome.Music.gschema.xml:43
+#: data/org.gnome.Music.gschema.xml:33
 msgid "Inhibit system suspend"
 msgstr "防止系統暫停"
 
-#: data/org.gnome.Music.gschema.xml:44
+#: data/org.gnome.Music.gschema.xml:34
 msgid "Enables or disables inhibiting system suspend while playing music"
-msgstr "啟用或停用音樂播放時的防止系統暫停功能"
+msgstr "啟用或停用音樂播放時的防止系統進入暫停"
 
-#: data/org.gnome.Music.gschema.xml:48
+#: data/org.gnome.Music.gschema.xml:38
 msgid "Report music history to Last.fm"
-msgstr "回報音樂歷史記錄至 Last.fm"
+msgstr "將音樂記錄上傳至《Last.fm》"
 
-#: data/org.gnome.Music.gschema.xml:49
+#: data/org.gnome.Music.gschema.xml:39
 msgid ""
 "Enables or disables sending scrobbles and the “currently playing” info to "
 "Last.fm."
-msgstr "啟用／停用傳送音樂記錄及「目前播放」資訊給 Last.fm。"
+msgstr "啟用/停用上傳音樂記錄及「目前播放」資訊至《Last.fm》。"
 
-#: data/ui/AboutDialog.ui.in:9
-msgid "Copyright © 2018 GNOME Music Developers"
-msgstr "著作權所有 © 2018 GNOME Music 開發團隊"
+#: data/ui/AlbumWidget.ui:84 data/ui/PlayerToolbar.ui:87
+#: data/ui/PlaylistControls.ui:101 gnomemusic/widgets/playertoolbar.py:170
+msgid "Play"
+msgstr "播放"
 
-#: data/ui/AboutDialog.ui.in:10
-msgid "A music player and management application for GNOME."
-msgstr "GNOME 的音樂播放器與管理員。"
+#: data/ui/AlbumWidget.ui:130 data/ui/PlaylistControls.ui:5
+#: data/ui/SongWidgetMenu.ui:11
+msgid "_Play"
+msgstr "播放(_P)"
 
-#: data/ui/AboutDialog.ui.in:12
-msgid "Visit GNOME Music website"
-msgstr "參訪 GNOME Music 網站"
+#: data/ui/AlbumWidget.ui:134
+msgid "Add to _Favorite Songs"
+msgstr "加入喜愛的歌曲(_F)"
 
-#: data/ui/AboutDialog.ui.in:13
-msgid ""
-"GNOME Music is free software; you can redistribute it and/or modify it under "
-"the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"GNOME Music is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
-"\n"
-"The GNOME Music authors hereby grant permission for non-GPL compatible "
-"GStreamer plugins to be used and distributed together with GStreamer and "
-"GNOME Music.  This permission is above and beyond the permissions granted by "
-"the GPL license by which GNOME Music is covered.  If you modify this code, "
-"you may extend this exception to your version of the code, but you are not "
-"obligated to do so.  If you do not wish to do so, delete this exception "
-"statement from your version.\n"
-"\n"
-"“Magic of the vinyl” by Sami Pyylampi image is licensed by CC-BY-SA 2.0 "
-"https://www.flickr.com/photos/_spy_/12270839403"
-msgstr ""
-"GNOME Music 是自由軟體，您可以遵照自由軟體基金會 (Free Software Foundation) "
-"出版的 GNU 通用公共授權條款 (GNU General Public License) 第二版來修改和重新發"
-"佈這一程式，或者自由選擇使用之後的任何版本。\n"
-"\n"
-"發佈 GNOME Music 程式的目的是希望它有用，但「沒有任何擔保」；甚至也沒有「可以"
-"銷售」或「適合特定目的」等隱示性擔保。詳細內容請參閱 GNU 通用公共授權。\n"
-"\n"
-"您應該已經隨程式一起收到一份 GNU 通用公共授權的副本。如果還沒有，請寫信給："
-"Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
-"02110-1301 USA.\n"
-"\n"
-"GNOME Music 作者群特此授予不相容於 GPL 授權的 GStreamer 外掛程式能隨 "
-"GStreamer 及 GNOME Music 一同使用、散佈之許可。這項許可高於且超出 GNOME "
-"Music 遵照之 GPL 授權所授予之許可範圍。如果您修改此份程式碼，您可以將此例外條"
-"款擴及至您自身的版本上，但您沒有義務必須也這麼作。如果您不希望有此例外條款，"
-"請將例外聲明從您的版本中移除。\n"
-"\n"
-"\"Magic of the vinyl\" 作者 Sami Pyylampi 影像是以 CC-BY-SA 2.0 授權 https://"
-"www.flickr.com/photos/_spy_/12270839403"
-
-#: data/ui/AlbumWidget.ui:107
-msgid "Released"
-msgstr "發行"
-
-#: data/ui/AlbumWidget.ui:123
-msgid "Running Length"
-msgstr "播放長度"
-
-#: data/ui/AlbumWidget.ui:167
-msgid "Composer"
-msgstr "作曲家"
-
-#: data/ui/AppMenu.ui:20 data/ui/LastfmDialog.ui:8
+#: data/ui/AlbumWidget.ui:138 data/ui/SongWidgetMenu.ui:15
+msgid "_Add to Playlist…"
+msgstr "加入播放清單(_A)…"
+
+#: data/ui/AppMenu.ui:23 data/ui/LastfmDialog.ui:8
 msgid "Last.fm Account"
-msgstr "Last.fm 帳戶"
+msgstr "Last.fm 帳號"
 
-#: data/ui/AppMenu.ui:38
+#: data/ui/AppMenu.ui:36
 msgid "Report Music Listening"
-msgstr "回報聆聽中的音樂"
+msgstr "上傳音樂聆聽紀錄"
 
-#: data/ui/AppMenu.ui:69
+#: data/ui/AppMenu.ui:58
 msgid "_Keyboard Shortcuts"
 msgstr "鍵盤捷徑鍵(_K)"
 
-#: data/ui/AppMenu.ui:83
+#: data/ui/AppMenu.ui:68
 msgid "_Help"
 msgstr "求助(_H)"
 
-#: data/ui/AppMenu.ui:97
+#: data/ui/AppMenu.ui:78
 msgid "_About Music"
-msgstr "關於《音樂》(_A)"
+msgstr "關於音樂(_A)"
+
+#: data/ui/EmptyView.ui:30
+msgid "Welcome to Music"
+msgstr "歡迎使用《音樂》"
 
 #: data/ui/HeaderBar.ui:16
 msgid "Menu"
 msgstr "選單"
 
-#: data/ui/HeaderBar.ui:39 data/ui/SearchHeaderBar.ui:16
+#: data/ui/HeaderBar.ui:24 data/ui/SearchHeaderBar.ui:15
 msgid "Select"
-msgstr "選擇"
+msgstr "選取音樂"
 
-#: data/ui/HeaderBar.ui:60 data/ui/PlaylistDialog.ui:244
-#: data/ui/SearchHeaderBar.ui:37
+#: data/ui/HeaderBar.ui:30 data/ui/PlaylistDialog.ui:213
+#: data/ui/SearchHeaderBar.ui:20
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: data/ui/HeaderBar.ui:79 data/ui/SearchHeaderBar.ui:56
+#: data/ui/HeaderBar.ui:42 data/ui/SearchHeaderBar.ui:32
 msgid "Search"
 msgstr "搜尋"
 
-#: data/ui/HeaderBar.ui:102
+#: data/ui/HeaderBar.ui:50
 msgid "Back"
 msgstr "返回"
 
-#: data/ui/help-overlay.ui:13
+#: data/ui/help-overlay.ui:11
 msgctxt "shortcut window"
 msgid "General"
 msgstr "一般"
 
-#: data/ui/help-overlay.ui:17
+#: data/ui/help-overlay.ui:14
 msgctxt "shortcut window"
 msgid "Close window"
 msgstr "關閉視窗"
 
-#: data/ui/help-overlay.ui:24
+#: data/ui/help-overlay.ui:20
 msgctxt "shortcut window"
 msgid "Search"
 msgstr "搜尋"
 
-#: data/ui/help-overlay.ui:31
+#: data/ui/help-overlay.ui:26
 msgctxt "shortcut window"
 msgid "Help"
 msgstr "求助"
 
-#: data/ui/help-overlay.ui:38
+#: data/ui/help-overlay.ui:32
 msgctxt "shortcut window"
 msgid "Shortcuts"
 msgstr "捷徑鍵"
 
-#: data/ui/help-overlay.ui:47
+#: data/ui/help-overlay.ui:40
 msgctxt "shortcut window"
 msgid "Playback"
 msgstr "播放控制"
 
-#: data/ui/help-overlay.ui:51
+#: data/ui/help-overlay.ui:43
 msgctxt "shortcut window"
 msgid "Play/Pause"
 msgstr "播放/暫停"
 
-#: data/ui/help-overlay.ui:58
+#: data/ui/help-overlay.ui:49
 msgctxt "shortcut window"
 msgid "Next song"
 msgstr "下一首"
 
-#: data/ui/help-overlay.ui:65
+#: data/ui/help-overlay.ui:55
 msgctxt "shortcut window"
 msgid "Previous song"
 msgstr "上一首"
 
-#: data/ui/help-overlay.ui:72
+#: data/ui/help-overlay.ui:61
 msgctxt "shortcut window"
 msgid "Toggle repeat"
-msgstr "切換重複與否"
+msgstr "切換重複播放模式"
 
-#: data/ui/help-overlay.ui:79
+#: data/ui/help-overlay.ui:67
 msgctxt "shortcut window"
 msgid "Toggle shuffle"
-msgstr "切換隨機與否"
+msgstr "切換隨機播放模式"
 
-#: data/ui/help-overlay.ui:88
+#: data/ui/help-overlay.ui:75
 msgctxt "shortcut window"
 msgid "Navigation"
 msgstr "導覽"
 
-#: data/ui/help-overlay.ui:92
+#: data/ui/help-overlay.ui:78
 msgctxt "shortcut window"
 msgid "Go to Albums"
-msgstr "前往「專輯」"
+msgstr "前往專輯分頁"
 
-#: data/ui/help-overlay.ui:99
+#: data/ui/help-overlay.ui:84
 msgctxt "shortcut window"
 msgid "Go to Artists"
-msgstr "前往「演出者」"
+msgstr "前往演出者分頁"
 
-#: data/ui/help-overlay.ui:106
+#: data/ui/help-overlay.ui:90
 msgctxt "shortcut window"
 msgid "Go to Songs"
-msgstr "前往「歌曲」"
+msgstr "前往歌曲分頁"
 
-#: data/ui/help-overlay.ui:113
+#: data/ui/help-overlay.ui:96
 msgctxt "shortcut window"
 msgid "Go to Playlists"
-msgstr "前往「播放清單」"
+msgstr "前往播放清單分頁"
 
-#: data/ui/help-overlay.ui:120
+#: data/ui/help-overlay.ui:102
 msgctxt "shortcut window"
 msgid "Go back"
 msgstr "返回"
@@ -334,127 +266,82 @@ msgstr "返回"
 msgid ""
 "Last.fm is a music discovery service that gives you personalised "
 "recommendations based on the music you listen to."
-msgstr "Last.fm是一種音樂發現服務，可以根據您收聽的音樂為您提供個人化建議。"
+msgstr ""
+"《Last.fm》是一種音樂探索服務，能根據您的聆聽習慣提供個人化的音樂建議。"
 
-#: data/ui/LastfmDialog.ui:32 gnomemusic/widgets/lastfmdialog.py:58
+#: data/ui/LastfmDialog.ui:31 gnomemusic/widgets/lastfmdialog.py:57
 msgid "Music Reporting Not Setup"
-msgstr "音樂報告未設定"
+msgstr "音樂聆聽紀錄上傳功能尚未初始化"
 
-#: data/ui/LastfmDialog.ui:46 gnomemusic/widgets/lastfmdialog.py:61
+#: data/ui/LastfmDialog.ui:44 gnomemusic/widgets/lastfmdialog.py:60
 msgid "Login to your Last.fm account to report your music listening."
-msgstr "登入您的 Last.fm 帳號以報告您的音樂收聽。"
+msgstr "登入您的《Last.fm》帳號後便能上傳音樂聆聽紀錄。"
 
-#: data/ui/LastfmDialog.ui:57 gnomemusic/widgets/lastfmdialog.py:59
+#: data/ui/LastfmDialog.ui:55 gnomemusic/widgets/lastfmdialog.py:58
 msgid "Login"
 msgstr "登入"
 
-#: data/ui/LoadingNotification.ui:16
-msgid "Loading"
-msgstr "正在載入"
-
-#: data/ui/PlayerToolbar.ui:6
-msgid "Shuffle"
-msgstr "亂數"
-
-#: data/ui/PlayerToolbar.ui:11
-msgid "Repeat All"
-msgstr "全部重複播放"
-
-#: data/ui/PlayerToolbar.ui:16
-msgid "Repeat Song"
-msgstr "重複播放歌曲"
-
-#. Causes tracks to play in random order
-#: data/ui/PlayerToolbar.ui:21
-msgid "Shuffle/Repeat Off"
-msgstr "亂數/重複播放關閉"
-
-#: data/ui/PlayerToolbar.ui:69
+#: data/ui/PlayerToolbar.ui:74
 msgid "Previous"
-msgstr "前一首"
+msgstr "上一曲"
 
-#: data/ui/PlayerToolbar.ui:85 gnomemusic/widgets/playertoolbar.py:146
-msgid "Play"
-msgstr "播放"
-
-#: data/ui/PlayerToolbar.ui:101
+#: data/ui/PlayerToolbar.ui:106
 msgid "Next"
-msgstr "下一首"
-
-#: data/ui/PlaylistContextMenu.ui:5
-msgctxt "context menu item"
-msgid "Play"
-msgstr "播放"
+msgstr "下一曲"
 
-#: data/ui/PlaylistContextMenu.ui:9
-msgid "Add to Playlist…"
-msgstr "加入至播放清單…"
-
-#: data/ui/PlaylistContextMenu.ui:13
-msgid "Remove From Playlist"
-msgstr "從播放清單移除"
-
-#: data/ui/PlaylistControls.ui:6
-msgid "_Play"
-msgstr "播放(_P)"
-
-#: data/ui/PlaylistControls.ui:10
+#: data/ui/PlaylistControls.ui:9
 msgid "_Delete"
 msgstr "刪除(_D)"
 
-#: data/ui/PlaylistControls.ui:14
+#: data/ui/PlaylistControls.ui:13
 msgid "_Rename…"
 msgstr "重新命名(_R)…"
 
-#: data/ui/PlaylistControls.ui:41
+#: data/ui/PlaylistControls.ui:28
 msgid "Playlist Name"
 msgstr "播放清單名稱"
 
-#: data/ui/PlaylistControls.ui:74
+#: data/ui/PlaylistControls.ui:62
 msgid "_Done"
 msgstr "完成(_D)"
 
-#: data/ui/PlaylistDialog.ui:66
+#: data/ui/PlaylistDialog.ui:52
 msgid "Enter a name for your first playlist"
-msgstr "輸入您第一個播放清單的名稱"
+msgstr "為您的第一個播放清單命名"
 
-#: data/ui/PlaylistDialog.ui:92
+#: data/ui/PlaylistDialog.ui:77
 msgid "C_reate"
 msgstr "建立(_R)"
 
-#: data/ui/PlaylistDialog.ui:155
+#: data/ui/PlaylistDialog.ui:146
 msgid "New Playlist…"
-msgstr "新增播放清單…"
+msgstr "新播放清單…"
 
-#: data/ui/PlaylistDialog.ui:169
+#: data/ui/PlaylistDialog.ui:161
 msgid "Add"
 msgstr "加入"
 
-#: data/ui/PlaylistDialog.ui:241
+#: data/ui/PlaylistDialog.ui:202
 msgid "Add to Playlist"
-msgstr "加入至播放清單"
+msgstr "加入播放清單"
 
-#: data/ui/PlaylistDialog.ui:257
+#: data/ui/PlaylistDialog.ui:222
 msgid "_Add"
 msgstr "加入(_A)"
 
-#: data/ui/PlaylistNotification.ui:22
-msgid "_Undo"
-msgstr "復原(_U)"
-
-#: data/ui/SearchView.ui:43 gnomemusic/views/artistsview.py:43
+#: data/ui/SearchView.ui:33 gnomemusic/views/artistsview.py:51
 msgid "Artists"
 msgstr "演出者"
 
-#: data/ui/SearchView.ui:53 data/ui/SearchView.ui:106
+#: data/ui/SearchView.ui:42 data/ui/SearchView.ui:84
 msgid "View All"
 msgstr "檢視全部"
 
-#: data/ui/SearchView.ui:96 gnomemusic/views/albumsview.py:47
+#: data/ui/SearchView.ui:75 gnomemusic/views/albumsview.py:56
 msgid "Albums"
 msgstr "專輯"
 
-#: data/ui/SearchView.ui:149 gnomemusic/views/songsview.py:44
+#: data/ui/SearchView.ui:117 gnomemusic/views/songsview.py:52
 msgid "Songs"
 msgstr "歌曲"
 
@@ -466,176 +353,338 @@ msgstr "全選"
 msgid "Select None"
 msgstr "取消全選"
 
-#: data/ui/SelectionBarMenuButton.ui:31 gnomemusic/widgets/headerbar.py:71
+#: data/ui/SelectionBarMenuButton.ui:19 gnomemusic/widgets/headerbar.py:69
 msgid "Click on items to select them"
-msgstr "點按項目來選取它們"
+msgstr "點一下即可選取項目"
 
-#: data/ui/SelectionToolbar.ui:9
+#: data/ui/SelectionToolbar.ui:8
 msgid "_Add to Playlist"
-msgstr "加入至播放清單(_A)"
+msgstr "加入播放清單(_A)"
+
+#: data/ui/SongWidgetMenu.ui:19
+msgid "_Remove from Playlist"
+msgstr "自播放清單中移除(_R)"
+
+#: gnomemusic/about.py:238
+msgid "The GNOME Project"
+msgstr "GNOME 專案"
+
+#: gnomemusic/about.py:242
+msgid "translator-credits"
+msgstr ""
+"Yi-Jyun Pan <pan93412@gmail.com>, 2019.\n"
+"Freddy Cheng <freddy4212@gmail.com>, 2922."
+
+#: gnomemusic/about.py:246
+msgid "Copyright The GNOME Music Developers"
+msgstr "著作權所有 ©《音樂》開發者群"
+
+#: gnomemusic/about.py:249
+msgid "Translated by"
+msgstr "翻譯者"
 
 #. TRANSLATORS: this is a playlist name
-#: gnomemusic/grilowrappers/grltrackerplaylists.py:827
+#: gnomemusic/grilowrappers/grltrackerplaylists.py:894
 msgid "Most Played"
 msgstr "最常播放"
 
 #. TRANSLATORS: this is a playlist name
-#: gnomemusic/grilowrappers/grltrackerplaylists.py:880
+#: gnomemusic/grilowrappers/grltrackerplaylists.py:948
 msgid "Never Played"
 msgstr "從未播放"
 
 #. TRANSLATORS: this is a playlist name
-#: gnomemusic/grilowrappers/grltrackerplaylists.py:932
+#: gnomemusic/grilowrappers/grltrackerplaylists.py:1001
 msgid "Recently Played"
-msgstr "最近播放"
+msgstr "近期播放"
 
 #. TRANSLATORS: this is a playlist name
-#: gnomemusic/grilowrappers/grltrackerplaylists.py:994
+#: gnomemusic/grilowrappers/grltrackerplaylists.py:1064
 msgid "Recently Added"
-msgstr "最近加入"
+msgstr "近期加入"
 
 #. TRANSLATORS: this is a playlist name
-#: gnomemusic/grilowrappers/grltrackerplaylists.py:1056
+#: gnomemusic/grilowrappers/grltrackerplaylists.py:1127
 msgid "Favorite Songs"
 msgstr "喜愛的歌曲"
 
-#: gnomemusic/gstplayer.py:378
+#: gnomemusic/gstplayer.py:408
 msgid "Unable to play the file"
-msgstr "無法播放這個檔案"
+msgstr "無法播放該檔案"
 
-#: gnomemusic/gstplayer.py:384
+#: gnomemusic/gstplayer.py:414
 msgid "_Find in {}"
-msgstr "於 {} 尋找(_F)"
+msgstr "於「{}」中尋找(_F)"
 
 #. TRANSLATORS: separator for two codecs
-#: gnomemusic/gstplayer.py:394
+#: gnomemusic/gstplayer.py:424
 msgid " and "
-msgstr " 和 "
+msgstr " 與 "
 
 #. TRANSLATORS: separator for a list of codecs
-#: gnomemusic/gstplayer.py:397
+#: gnomemusic/gstplayer.py:427
 msgid ", "
 msgstr "、"
 
-#: gnomemusic/gstplayer.py:399
+#: gnomemusic/gstplayer.py:429
 msgid "{} is required to play the file, but is not installed."
 msgid_plural "{} are required to play the file, but are not installed."
-msgstr[0] "需要 {} 才能播放這個檔案，但尚未安裝。"
+msgstr[0] "需安裝「{}」後才能播放該檔案。"
 
 #: gnomemusic/inhibitsuspend.py:63
 msgid "Playing music"
-msgstr "正在播放音樂"
+msgstr "播放中的音樂"
+
+#. Translators: "shuffle" causes tracks to play in random order.
+#: gnomemusic/player.py:44
+msgid "Shuffle"
+msgstr "隨機播放"
+
+#: gnomemusic/player.py:45
+msgid "Repeat Song"
+msgstr "單曲重複播放"
+
+#: gnomemusic/player.py:46
+msgid "Repeat All"
+msgstr "全部重複播放"
+
+#: gnomemusic/player.py:47
+msgid "Shuffle/Repeat Off"
+msgstr "隨機/重複播放關閉"
+
+#: gnomemusic/playlisttoast.py:55
+msgid "Playlist {} removed"
+msgstr "已移除「{}」"
+
+#: gnomemusic/playlisttoast.py:56 gnomemusic/songtoast.py:65
+msgid "Undo"
+msgstr "還原"
+
+#: gnomemusic/songtoast.py:64
+msgid "{} removed from {}"
+msgstr "「{}」已從「{}」中移除"
 
-#: gnomemusic/utils.py:81
+#: gnomemusic/utils.py:92
 msgid "Unknown album"
-msgstr "未知專輯"
+msgstr "不明專輯"
 
-#: gnomemusic/utils.py:102
+#: gnomemusic/utils.py:113
 msgid "Unknown Artist"
-msgstr "不明的演出者"
+msgstr "不明演出者"
 
-#: gnomemusic/views/emptyview.py:67
+#: gnomemusic/views/emptyview.py:65
 msgid "Your XDG Music directory is not set."
-msgstr "您未設定 XDG 音樂目錄。"
+msgstr "尚未設定 XDG 音樂目錄。"
 
-#: gnomemusic/views/emptyview.py:74
-msgid "Music folder"
+#: gnomemusic/views/emptyview.py:72
+msgid "Music Folder"
 msgstr "音樂資料夾"
 
 #. TRANSLATORS: This is a label to display a link to open user's music
 #. folder. {} will be replaced with the translated text 'Music folder'
-#: gnomemusic/views/emptyview.py:78
+#: gnomemusic/views/emptyview.py:76
 msgid "The contents of your {} will appear here."
-msgstr "您的 {} 的內容會出現在這裡。"
+msgstr "您位於{}中的內容會顯示於此。"
 
-#: gnomemusic/views/emptyview.py:112
-msgid "Hey DJ"
-msgstr "嘿 DJ"
-
-#: gnomemusic/views/emptyview.py:121 gnomemusic/views/emptyview.py:126
-msgid "No music found"
+#: gnomemusic/views/emptyview.py:124
+msgid "No Music Found"
 msgstr "找不到音樂"
 
-#: gnomemusic/views/emptyview.py:128
-msgid "Try a different search"
-msgstr "請嘗試不同的搜尋"
+#: gnomemusic/views/emptyview.py:125
+msgid "Try a Different Search"
+msgstr "請嘗試不同的搜尋內容"
 
-#: gnomemusic/views/emptyview.py:133
-msgid "GNOME Music could not connect to Tracker"
-msgstr "GNOME 音樂無法連線到 Tracker"
+#: gnomemusic/views/emptyview.py:129
+msgid "GNOME Music could not connect to Tracker."
+msgstr "《音樂》無法連接《Tracker》。"
 
-#: gnomemusic/views/emptyview.py:136
-msgid "Your music files cannot be indexed without Tracker running"
-msgstr "若 Tracker 未執行，將無法索引您的音樂檔案"
+#: gnomemusic/views/emptyview.py:131
+msgid "Your music files cannot be indexed without Tracker running."
+msgstr "倘若《Tracker》未執行便無法檢索音樂檔案。"
 
-#: gnomemusic/views/emptyview.py:143
-msgid "Your system Tracker version seems outdated"
-msgstr "系統 Tracker 版本似乎過舊"
+#: gnomemusic/views/emptyview.py:137
+msgid "Your system Tracker version seems outdated."
+msgstr "系統所安裝的《Tracker》版本似乎過舊。"
 
-#: gnomemusic/views/emptyview.py:146
-msgid "Music needs Tracker version 3.0.0 or higher"
-msgstr "《音樂》需要 Tracker 3.0.0 版或更高版本"
+#: gnomemusic/views/emptyview.py:139
+msgid "Music needs Tracker version 3.0.0 or higher."
+msgstr "《音樂》需要《Tracker》3.0.0 以上的版本。"
 
-#: gnomemusic/views/playlistsview.py:41
+#: gnomemusic/views/playlistsview.py:45
 msgid "Playlists"
 msgstr "播放清單"
 
-#: gnomemusic/views/searchview.py:386
+#: gnomemusic/views/searchview.py:304
 msgid "Artists Results"
-msgstr "演出者結果"
+msgstr "演出者搜尋結果"
 
-#: gnomemusic/views/searchview.py:401
+#: gnomemusic/views/searchview.py:318
 msgid "Albums Results"
-msgstr "專輯結果"
+msgstr "專輯搜尋結果"
 
-#: gnomemusic/widgets/albumwidget.py:154
+#: gnomemusic/widgets/albumwidget.py:245
 msgid "{} minute"
 msgid_plural "{} minutes"
 msgstr[0] "{} 分鐘"
 
-#: gnomemusic/widgets/disclistboxwidget.py:60
+#: gnomemusic/widgets/discbox.py:75
 msgid "Disc {}"
-msgstr "碟片 {}"
+msgstr "光碟 {}"
 
-#: gnomemusic/widgets/headerbar.py:68
+#: gnomemusic/widgets/headerbar.py:66
 msgid "Selected {} song"
 msgid_plural "Selected {} songs"
 msgstr[0] "己選取 {} 首歌"
 
-#: gnomemusic/widgets/lastfmdialog.py:65
+#: gnomemusic/widgets/lastfmdialog.py:64
 msgid "Your music listening is reported to Last.fm."
-msgstr "您的音樂收聽已回報至 Last.fm。"
+msgstr "您的音樂聆聽紀錄將會上傳至《Last.fm》。"
 
-#: gnomemusic/widgets/lastfmdialog.py:67
+#: gnomemusic/widgets/lastfmdialog.py:66
 msgid "Your music listening is not reported to Last.fm."
-msgstr "您的音樂收聽不會回報至 Last.fm。"
+msgstr "您的音樂聆聽紀錄不會上傳至《Last.fm》。"
 
 #. TRANSLATORS: displays the username of the Last.fm account
-#: gnomemusic/widgets/lastfmdialog.py:71
+#: gnomemusic/widgets/lastfmdialog.py:70
 msgid "Logged in as {}"
-msgstr "登入為 {}"
+msgstr "以「{}」登入"
 
-#: gnomemusic/widgets/lastfmdialog.py:72
+#: gnomemusic/widgets/lastfmdialog.py:71
 msgid "Configure"
 msgstr "設定"
 
-#: gnomemusic/widgets/notificationspopup.py:216
-msgid "Playlist {} removed"
-msgstr "播放清單 {} 已移除"
-
-#: gnomemusic/widgets/notificationspopup.py:220
-msgid "{} removed from {}"
-msgstr "{} 已從 {} 移除"
-
-#: gnomemusic/widgets/playertoolbar.py:143
+#: gnomemusic/widgets/playertoolbar.py:167
 msgid "Pause"
 msgstr "暫停"
 
-#: gnomemusic/widgets/playlistcontrols.py:127
+#: gnomemusic/widgets/playlistcontrols.py:130
 msgid "{} Song"
 msgid_plural "{} Songs"
 msgstr[0] "{} 首歌曲"
 
+#~ msgid "A music player and management application for GNOME."
+#~ msgstr "GNOME 的音樂播放與管理應用程式。"
+
+#~ msgid "Visit GNOME Music website"
+#~ msgstr "造訪《音樂》網站"
+
+#~| msgid ""
+#~| "GNOME Music is free software; you can redistribute it and/or modify it "
+#~| "under the terms of the GNU General Public License as published by the "
+#~| "Free Software Foundation; either version 2 of the License, or (at your "
+#~| "option) any later version.\n"
+#~| "\n"
+#~| "GNOME Music is distributed in the hope that it will be useful, but "
+#~| "WITHOUT ANY WARRANTY; without even the implied warranty of "
+#~| "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU "
+#~| "General Public License for more details.\n"
+#~| "\n"
+#~| "You should have received a copy of the GNU General Public License along "
+#~| "with GNOME Music; if not, write to the Free Software Foundation, Inc., "
+#~| "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
+#~| "\n"
+#~| "The GNOME Music authors hereby grant permission for non-GPL compatible "
+#~| "GStreamer plugins to be used and distributed together with GStreamer and "
+#~| "GNOME Music.  This permission is above and beyond the permissions "
+#~| "granted by the GPL license by which GNOME Music is covered.  If you "
+#~| "modify this code, you may extend this exception to your version of the "
+#~| "code, but you are not obligated to do so.  If you do not wish to do so, "
+#~| "delete this exception statement from your version.\n"
+#~| "\n"
+#~| "“Magic of the vinyl” by Sami Pyylampi image is licensed by CC-BY-SA 2.0 "
+#~| "https://www.flickr.com/photos/_spy_/12270839403"
+#~ msgid ""
+#~ "GNOME Music is free software; you can redistribute it and/or modify it "
+#~ "under the terms of the GNU General Public License as published by the "
+#~ "Free Software Foundation; either version 2 of the License, or (at your "
+#~ "option) any later version.\n"
+#~ "\n"
+#~ "GNOME Music is distributed in the hope that it will be useful, but "
+#~ "WITHOUT ANY WARRANTY; without even the implied warranty of "
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General "
+#~ "Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License along "
+#~ "with GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
+#~ "Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
+#~ "\n"
+#~ "The GNOME Music authors hereby grant permission for non-GPL compatible "
+#~ "GStreamer plugins to be used and distributed together with GStreamer and "
+#~ "GNOME Music.  This permission is above and beyond the permissions granted "
+#~ "by the GPL license by which GNOME Music is covered.  If you modify this "
+#~ "code, you may extend this exception to your version of the code, but you "
+#~ "are not obligated to do so.  If you do not wish to do so, delete this "
+#~ "exception statement from your version."
+#~ msgstr ""
+#~ "《音樂》為自由軟體，您可以遵照自由軟體基金會 (Free Software Foundation) 所"
+#~ "出版的 《GNU 通用公共授權條款》 (GNU General Public License) 第二版來修改"
+#~ "和重新發布這一程式；您也能自由選擇之後的任何版本做使用。\n"
+#~ "\n"
+#~ "我們將《音樂》無償提供給所有人使用，但「沒有任何擔保責任」；甚至也沒有「可"
+#~ "以銷售」或「適合特定目的」等隱示性擔保。詳情請參閱《GNU 通用公共授權條"
+#~ "款》。\n"
+#~ "\n"
+#~ "您應該已隨本程式一起收到一份《GNU 通用公共授權條款》的副本。倘若您尚未收"
+#~ "到，請寫封信至：Free Software Foundation, Inc., 51 Franklin Street, Fifth "
+#~ "Floor, Boston, MA 02110-1301 USA.\n"
+#~ "\n"
+#~ "《GNOME 音樂》作者群特此授予不相容於 GPL 授權的 GStreamer 外掛程式能隨 "
+#~ "GStreamer 及《GNOME 音樂》一同使用、散佈之許可。這項許可高於且超出《GNOME "
+#~ "音樂》遵照之 GPL 授權所授予之許可範圍。如果您修改此份程式碼，您可以將此例"
+#~ "外條款擴及至您自身的版本上，但您沒有義務必須跟著這麼作。如果您不希望有此例"
+#~ "外條款，請將例外聲明從您的版本中移除。"
+
+#~| msgid "The contents of your {} will appear here."
+#~ msgid "The contents of your Music Folder will appear here"
+#~ msgstr "您位於音樂資料夾中的內容會顯示於此"
+
+#~ msgid "GNOME Music"
+#~ msgstr "GNOME 音樂"
+
+#~ msgid ""
+#~ "An easy way to play your music. Automatically discover music on your "
+#~ "computer, the local network and internet services."
+#~ msgstr ""
+#~ "用簡單的方式播放音樂，自動探索您電腦、區域網路和網際網路服務中的音樂。"
+
+#~ msgid ""
+#~ "Find tracks in your local collection, get music from DLNA servers or try "
+#~ "something new with the Jamendo and Magnatune services."
+#~ msgstr ""
+#~ "在您的本地集合中找尋曲目，從 DLNA 伺服器取得音樂或透過 Jamendo 和 "
+#~ "Magnatune 服務找尋些新音樂。"
+
+#~ msgid "Window position"
+#~ msgstr "視窗位置"
+
+#~ msgid "Window position (x and y)."
+#~ msgstr "視窗位置 (x 與 y)。"
+
+#~ msgid "Inital state has been displayed"
+#~ msgstr "已顯示初始狀態"
+
+#~ msgid "Set to true when initial state has been displayed"
+#~ msgstr "當顯示初始狀態設定為 true"
+
+#~ msgid "Released"
+#~ msgstr "發行"
+
+#~ msgid "Running Length"
+#~ msgstr "播放長度"
+
+#~ msgid "Composer"
+#~ msgstr "作曲家"
+
+#~ msgid "Loading"
+#~ msgstr "正在載入"
+
+#~ msgctxt "context menu item"
+#~ msgid "Play"
+#~ msgstr "播放"
+
+#~ msgid "Hey DJ"
+#~ msgstr "嘿 DJ"
+
 #~ msgid "Untitled"
 #~ msgstr "無標題"
 
diff --git a/subprojects/gfm/gtkfilterlistmodel.c b/subprojects/gfm/gtkfilterlistmodel.c
deleted file mode 100644
index 5cfd4542..00000000
--- a/subprojects/gfm/gtkfilterlistmodel.c
+++ /dev/null
@@ -1,711 +0,0 @@
-/*
- * Copyright © 2018 Benjamin Otte
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Benjamin Otte <otte@gnome.org>
- */
-
-// #include "config.h"
-
-#include "gtkfilterlistmodel.h"
-
-#include "gtkrbtreeprivate.h"
-#include "gtkintl.h"
-// #include "gtkprivate.h"
-
-/**
- * SECTION:gtkfilterlistmodel
- * @title: GtkFilterListModel
- * @short_description: A list model that filters its items
- * @see_also: #GListModel
- *
- * #GtkFilterListModel is a list model that filters a given other
- * listmodel.
- * It hides some elements from the other model according to
- * criteria given by a #GtkFilterListModelFilterFunc.
- */
-
-enum {
-  PROP_0,
-  PROP_HAS_FILTER,
-  PROP_ITEM_TYPE,
-  PROP_MODEL,
-  NUM_PROPERTIES
-};
-
-typedef struct _FilterNode FilterNode;
-typedef struct _FilterAugment FilterAugment;
-
-struct _FilterNode
-{
-  guint visible : 1;
-};
-
-struct _FilterAugment
-{
-  guint n_items;
-  guint n_visible;
-};
-
-struct _GtkFilterListModel
-{
-  GObject parent_instance;
-
-  GType item_type;
-  GListModel *model;
-  GtkFilterListModelFilterFunc filter_func;
-  gpointer user_data;
-  GDestroyNotify user_destroy;
-
-  GtkRbTree *items; /* NULL if filter_func == NULL */
-};
-
-struct _GtkFilterListModelClass
-{
-  GObjectClass parent_class;
-};
-
-static GParamSpec *properties[NUM_PROPERTIES] = { NULL, };
-
-static FilterNode *
-gtk_filter_list_model_get_nth_filtered (GtkRbTree *tree,
-                                        guint      position,
-                                        guint     *out_unfiltered)
-{
-  FilterNode *node, *tmp;
-  guint unfiltered;
-
-  node = gtk_rb_tree_get_root (tree);
-  unfiltered = 0;
-
-  while (node)
-    {
-      tmp = gtk_rb_tree_node_get_left (node);
-      if (tmp)
-        {
-          FilterAugment *aug = gtk_rb_tree_get_augment (tree, tmp);
-          if (position < aug->n_visible)
-            {
-              node = tmp;
-              continue;
-            }
-          position -= aug->n_visible;
-          unfiltered += aug->n_items;
-        }
-
-      if (node->visible)
-        {
-          if (position == 0)
-            break;
-          position--;
-        }
-
-      unfiltered++;
-
-      node = gtk_rb_tree_node_get_right (node);
-    }
-
-  if (out_unfiltered)
-    *out_unfiltered = unfiltered;
-
-  return node;
-}
-
-static FilterNode *
-gtk_filter_list_model_get_nth (GtkRbTree *tree,
-                               guint      position,
-                               guint     *out_filtered)
-{
-  FilterNode *node, *tmp;
-  guint filtered;
-
-  node = gtk_rb_tree_get_root (tree);
-  filtered = 0;
-
-  while (node)
-    {
-      tmp = gtk_rb_tree_node_get_left (node);
-      if (tmp)
-        {
-          FilterAugment *aug = gtk_rb_tree_get_augment (tree, tmp);
-          if (position < aug->n_items)
-            {
-              node = tmp;
-              continue;
-            }
-          position -= aug->n_items;
-          filtered += aug->n_visible;
-        }
-
-      if (position == 0)
-        break;
-
-      position--;
-      if (node->visible)
-        filtered++;
-
-      node = gtk_rb_tree_node_get_right (node);
-    }
-
-  if (out_filtered)
-    *out_filtered = filtered;
-
-  return node;
-}
-
-static GType
-gtk_filter_list_model_get_item_type (GListModel *list)
-{
-  GtkFilterListModel *self = GTK_FILTER_LIST_MODEL (list);
-
-  return self->item_type;
-}
-
-static guint
-gtk_filter_list_model_get_n_items (GListModel *list)
-{
-  GtkFilterListModel *self = GTK_FILTER_LIST_MODEL (list);
-  FilterAugment *aug;
-  FilterNode *node;
-
-  if (self->model == NULL)
-    return 0;
-
-  if (!self->items)
-    return g_list_model_get_n_items (self->model);
-
-  node = gtk_rb_tree_get_root (self->items);
-  if (node == NULL)
-    return 0;
-
-  aug = gtk_rb_tree_get_augment (self->items, node);
-  return aug->n_visible;
-}
-
-static gpointer
-gtk_filter_list_model_get_item (GListModel *list,
-                                guint       position)
-{
-  GtkFilterListModel *self = GTK_FILTER_LIST_MODEL (list);
-  guint unfiltered;
-
-  if (self->model == NULL)
-    return NULL;
-
-  if (self->items)
-    gtk_filter_list_model_get_nth_filtered (self->items, position, &unfiltered);
-  else
-    unfiltered = position;
-
-  return g_list_model_get_item (self->model, unfiltered);
-}
-
-static void
-gtk_filter_list_model_model_init (GListModelInterface *iface)
-{
-  iface->get_item_type = gtk_filter_list_model_get_item_type;
-  iface->get_n_items = gtk_filter_list_model_get_n_items;
-  iface->get_item = gtk_filter_list_model_get_item;
-}
-
-G_DEFINE_TYPE_WITH_CODE (GtkFilterListModel, gtk_filter_list_model, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL, gtk_filter_list_model_model_init))
-
-static gboolean
-gtk_filter_list_model_run_filter (GtkFilterListModel *self,
-                                  guint               position)
-{
-  gpointer item;
-  gboolean visible;
-
-  item = g_list_model_get_item (self->model, position);
-  visible = self->filter_func (item, self->user_data);
-  g_object_unref (item);
-
-  return visible;
-}
-
-static guint
-gtk_filter_list_model_add_items (GtkFilterListModel *self,
-                                 FilterNode         *after,
-                                 guint               position,
-                                 guint               n_items)
-{
-  FilterNode *node;
-  guint i, n_visible;
-
-  n_visible = 0;
-  
-  for (i = 0; i < n_items; i++)
-    {
-      node = gtk_rb_tree_insert_before (self->items, after);
-      node->visible = gtk_filter_list_model_run_filter (self, position + i);
-      if (node->visible)
-        n_visible++;
-    }
-
-  return n_visible;
-}
-
-static void
-gtk_filter_list_model_items_changed_cb (GListModel         *model,
-                                        guint               position,
-                                        guint               removed,
-                                        guint               added,
-                                        GtkFilterListModel *self)
-{
-  FilterNode *node;
-  guint i, filter_position, filter_removed, filter_added;
-
-  if (self->items == NULL)
-    {
-      g_list_model_items_changed (G_LIST_MODEL (self), position, removed, added);
-      return;
-    }
-
-  node = gtk_filter_list_model_get_nth (self->items, position, &filter_position);
-
-  filter_removed = 0;
-  for (i = 0; i < removed; i++)
-    {
-      FilterNode *next = gtk_rb_tree_node_get_next (node);
-      if (node->visible)
-        filter_removed++;
-      gtk_rb_tree_remove (self->items, node);
-      node = next;
-    }
-
-  filter_added = gtk_filter_list_model_add_items (self, node, position, added);
-
-  if (filter_removed > 0 || filter_added > 0)
-    g_list_model_items_changed (G_LIST_MODEL (self), filter_position, filter_removed, filter_added);
-}
-
-static void
-gtk_filter_list_model_set_property (GObject      *object,
-                                    guint         prop_id,
-                                    const GValue *value,
-                                    GParamSpec   *pspec)
-{
-  GtkFilterListModel *self = GTK_FILTER_LIST_MODEL (object);
-
-  switch (prop_id)
-    {
-    case PROP_ITEM_TYPE:
-      self->item_type = g_value_get_gtype (value);
-      break;
-
-    case PROP_MODEL:
-      gtk_filter_list_model_set_model (self, g_value_get_object (value));
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void 
-gtk_filter_list_model_get_property (GObject     *object,
-                                    guint        prop_id,
-                                    GValue      *value,
-                                    GParamSpec  *pspec)
-{
-  GtkFilterListModel *self = GTK_FILTER_LIST_MODEL (object);
-
-  switch (prop_id)
-    {
-    case PROP_HAS_FILTER:
-      g_value_set_boolean (value, self->items != NULL);
-      break;
-
-    case PROP_ITEM_TYPE:
-      g_value_set_gtype (value, self->item_type);
-      break;
-
-    case PROP_MODEL:
-      g_value_set_object (value, self->model);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-gtk_filter_list_model_clear_model (GtkFilterListModel *self)
-{
-  if (self->model == NULL)
-    return;
-
-  g_signal_handlers_disconnect_by_func (self->model, gtk_filter_list_model_items_changed_cb, self);
-  g_clear_object (&self->model);
-  if (self->items)
-    gtk_rb_tree_remove_all (self->items);
-}
-
-static void
-gtk_filter_list_model_dispose (GObject *object)
-{
-  GtkFilterListModel *self = GTK_FILTER_LIST_MODEL (object);
-
-  gtk_filter_list_model_clear_model (self);
-  if (self->user_destroy)
-    self->user_destroy (self->user_data);
-  self->filter_func = NULL;
-  self->user_data = NULL;
-  self->user_destroy = NULL;
-  g_clear_pointer (&self->items, gtk_rb_tree_unref);
-
-  G_OBJECT_CLASS (gtk_filter_list_model_parent_class)->dispose (object);
-}
-
-static void
-gtk_filter_list_model_class_init (GtkFilterListModelClass *class)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (class);
-
-  gobject_class->set_property = gtk_filter_list_model_set_property;
-  gobject_class->get_property = gtk_filter_list_model_get_property;
-  gobject_class->dispose = gtk_filter_list_model_dispose;
-
-  /**
-   * GtkFilterListModel:has-filter:
-   *
-   * If a filter is set for this model
-   */
-  properties[PROP_HAS_FILTER] =
-      g_param_spec_boolean ("has-filter",
-                            P_("has filter"),
-                            P_("If a filter is set for this model"),
-                            FALSE,
-                            GTK_PARAM_READABLE | G_PARAM_EXPLICIT_NOTIFY);
-
-  /**
-   * GtkFilterListModel:item-type:
-   *
-   * The #GType for elements of this object
-   */
-  properties[PROP_ITEM_TYPE] =
-      g_param_spec_gtype ("item-type",
-                          P_("Item type"),
-                          P_("The type of elements of this object"),
-                          G_TYPE_OBJECT,
-                          GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_EXPLICIT_NOTIFY);
-
-  /**
-   * GtkFilterListModel:model:
-   *
-   * The model being filtered
-   */
-  properties[PROP_MODEL] =
-      g_param_spec_object ("model",
-                           P_("Model"),
-                           P_("The model being filtered"),
-                           G_TYPE_LIST_MODEL,
-                           GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_EXPLICIT_NOTIFY);
-
-  g_object_class_install_properties (gobject_class, NUM_PROPERTIES, properties);
-}
-
-static void
-gtk_filter_list_model_init (GtkFilterListModel *self)
-{
-}
-
-
-static void
-gtk_filter_list_model_augment (GtkRbTree *filter,
-                               gpointer   _aug,
-                               gpointer   _node,
-                               gpointer   left,
-                               gpointer   right)
-{
-  FilterNode *node = _node;
-  FilterAugment *aug = _aug;
-
-  aug->n_items = 1;
-  aug->n_visible = node->visible ? 1 : 0;
-
-  if (left)
-    {
-      FilterAugment *left_aug = gtk_rb_tree_get_augment (filter, left);
-      aug->n_items += left_aug->n_items;
-      aug->n_visible += left_aug->n_visible;
-    }
-  if (right)
-    {
-      FilterAugment *right_aug = gtk_rb_tree_get_augment (filter, right);
-      aug->n_items += right_aug->n_items;
-      aug->n_visible += right_aug->n_visible;
-    }
-}
-
-/**
- * gtk_filter_list_model_new:
- * @model: the model to sort
- * @filter_func: (allow-none): filter function or %NULL to not filter items
- * @user_data: (closure): user data passed to @filter_func
- * @user_destroy: destroy notifier for @user_data
- *
- * Creates a new #GtkFilterListModel that will filter @model using the given
- * @filter_func.
- *
- * Returns: a new #GtkFilterListModel
- **/
-GtkFilterListModel *
-gtk_filter_list_model_new (GListModel                   *model,
-                           GtkFilterListModelFilterFunc  filter_func,
-                           gpointer                      user_data,
-                           GDestroyNotify                user_destroy)
-{
-  GtkFilterListModel *result;
-
-  g_return_val_if_fail (G_IS_LIST_MODEL (model), NULL);
-
-  result = g_object_new (GTK_TYPE_FILTER_LIST_MODEL,
-                         "item-type", g_list_model_get_item_type (model),
-                         "model", model,
-                         NULL);
-
-  if (filter_func)
-    gtk_filter_list_model_set_filter_func (result, filter_func, user_data, user_destroy);
-
-  return result;
-}
-
-/**
- * gtk_filter_list_model_new_for_type:
- * @item_type: the type of the items that will be returned
- *
- * Creates a new empty filter list model set up to return items of type @item_type.
- * It is up to the application to set a proper filter function and model to ensure
- * the item type is matched.
- *
- * Returns: a new #GtkFilterListModel
- **/
-GtkFilterListModel *
-gtk_filter_list_model_new_for_type (GType item_type)
-{
-  g_return_val_if_fail (g_type_is_a (item_type, G_TYPE_OBJECT), NULL);
-
-  return g_object_new (GTK_TYPE_FILTER_LIST_MODEL,
-                       "item-type", item_type,
-                       NULL);
-}
-
-/**
- * gtk_filter_list_model_set_filter_func:
- * @self: a #GtkFilterListModel
- * @filter_func: (allow-none): filter function or %NULL to not filter items
- * @user_data: (closure): user data passed to @filter_func
- * @user_destroy: destroy notifier for @user_data
- *
- * Sets the function used to filter items. The function will be called for every
- * item and if it returns %TRUE the item is considered visible.
- **/
-void
-gtk_filter_list_model_set_filter_func (GtkFilterListModel           *self,
-                                       GtkFilterListModelFilterFunc  filter_func,
-                                       gpointer                      user_data,
-                                       GDestroyNotify                user_destroy)
-{
-  gboolean was_filtered, will_be_filtered;
-
-  g_return_if_fail (GTK_IS_FILTER_LIST_MODEL (self));
-  g_return_if_fail (filter_func != NULL || (user_data == NULL && !user_destroy));
-
-  was_filtered = self->filter_func != NULL;
-  will_be_filtered = filter_func != NULL;
-
-  if (!was_filtered && !will_be_filtered)
-    return;
-
-  if (self->user_destroy)
-    self->user_destroy (self->user_data);
-
-  self->filter_func = filter_func;
-  self->user_data = user_data;
-  self->user_destroy = user_destroy;
-  
-  if (!will_be_filtered)
-    {
-      g_clear_pointer (&self->items, gtk_rb_tree_unref);
-    }
-  else if (!was_filtered)
-    {
-      guint i, n_items;
-
-      self->items = gtk_rb_tree_new (FilterNode,
-                                     FilterAugment,
-                                     gtk_filter_list_model_augment,
-                                     NULL, NULL);
-      if (self->model)
-        {
-          n_items = g_list_model_get_n_items (self->model);
-          for (i = 0; i < n_items; i++)
-            {
-              FilterNode *node = gtk_rb_tree_insert_before (self->items, NULL);
-              node->visible = TRUE;
-            }
-        }
-    }
-
-  gtk_filter_list_model_refilter (self);
-
-  if (was_filtered != will_be_filtered)
-    g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_HAS_FILTER]);
-}
-
-/**
- * gtk_filter_list_model_set_model:
- * @self: a #GtkFilterListModel
- * @model: (allow-none): The model to be filtered
- *
- * Sets the model to be filtered.
- *
- * Note that GTK makes no effort to ensure that @model conforms to
- * the item type of @self. It assumes that the caller knows what they
- * are doing and have set up an appropriate filter function to ensure
- * that item types match.
- **/
-void
-gtk_filter_list_model_set_model (GtkFilterListModel *self,
-                                 GListModel         *model)
-{
-  guint removed, added;
-
-  g_return_if_fail (GTK_IS_FILTER_LIST_MODEL (self));
-  g_return_if_fail (model == NULL || G_IS_LIST_MODEL (model));
-  /* Note: We don't check for matching item type here, we just assume the
-   * filter func takes care of filtering wrong items. */
-
-  if (self->model == model)
-    return;
-
-  removed = g_list_model_get_n_items (G_LIST_MODEL (self));
-  gtk_filter_list_model_clear_model (self);
-
-  if (model)
-    {
-      self->model = g_object_ref (model);
-      g_signal_connect (model, "items-changed", G_CALLBACK (gtk_filter_list_model_items_changed_cb), self);
-      if (self->items)
-        added = gtk_filter_list_model_add_items (self, NULL, 0, g_list_model_get_n_items (model));
-      else
-        added = g_list_model_get_n_items (model);
-    }
-  else
-    added = 0;
-  
-  if (removed > 0 || added > 0)
-    g_list_model_items_changed (G_LIST_MODEL (self), 0, removed, added);
-
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_MODEL]);
-}
-
-/**
- * gtk_filter_list_model_get_model:
- * @self: a #GtkFilterListModel
- *
- * Gets the model currently filtered or %NULL if none.
- *
- * Returns: (nullable) (transfer none): The model that gets filtered
- **/
-GListModel *
-gtk_filter_list_model_get_model (GtkFilterListModel *self)
-{
-  g_return_val_if_fail (GTK_IS_FILTER_LIST_MODEL (self), NULL);
-
-  return self->model;
-}
-
-/**
- * gtk_filter_list_model_has_filter:
- * @self: a #GtkFilterListModel
- *
- * Checks if a filter function is currently set on @self
- *
- * Returns: %TRUE if a filter function is set
- **/
-gboolean
-gtk_filter_list_model_has_filter (GtkFilterListModel *self)
-{
-  g_return_val_if_fail (GTK_IS_FILTER_LIST_MODEL (self), FALSE);
-
-  return self->filter_func != NULL;
-}
-
-/**
- * gtk_filter_list_model_refilter:
- * @self: a #GtkFilterListModel
- *
- * Causes @self to refilter all items in the model.
- *
- * Calling this function is necessary when data used by the filter
- * function has changed.
- **/
-void
-gtk_filter_list_model_refilter (GtkFilterListModel *self)
-{
-  FilterNode *node;
-  guint i, first_change, last_change;
-  guint n_is_visible, n_was_visible;
-  gboolean visible;
-
-  g_return_if_fail (GTK_IS_FILTER_LIST_MODEL (self));
-  
-  if (self->items == NULL || self->model == NULL)
-    return;
-
-  first_change = G_MAXUINT;
-  last_change = 0;
-  n_is_visible = 0;
-  n_was_visible = 0;
-  for (i = 0, node = gtk_rb_tree_get_first (self->items);
-       node != NULL;
-       i++, node = gtk_rb_tree_node_get_next (node))
-    {
-      visible = gtk_filter_list_model_run_filter (self, i);
-      if (visible == node->visible)
-        {
-          if (visible)
-            {
-              n_is_visible++;
-              n_was_visible++;
-            }
-          continue;
-        }
-
-      node->visible = visible;
-      gtk_rb_tree_node_mark_dirty (node);
-      first_change = MIN (n_is_visible, first_change);
-      if (visible)
-        n_is_visible++;
-      else
-        n_was_visible++;
-      last_change = MAX (n_is_visible, last_change);
-    }
-
-  if (first_change <= last_change)
-    {
-      g_list_model_items_changed (G_LIST_MODEL (self),
-                                  first_change,
-                                  last_change - first_change + n_was_visible - n_is_visible,
-                                  last_change - first_change);
-    }
-}
-
diff --git a/subprojects/gfm/gtkfilterlistmodel.h b/subprojects/gfm/gtkfilterlistmodel.h
deleted file mode 100644
index d16bd2fc..00000000
--- a/subprojects/gfm/gtkfilterlistmodel.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright © 2018 Benjamin Otte
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Benjamin Otte <otte@gnome.org>
- */
-
-#ifndef __GTK_FILTER_LIST_MODEL_H__
-#define __GTK_FILTER_LIST_MODEL_H__
-
-
-/* #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
- * #error "Only <gtk/gtk.h> can be included directly."
- * #endif
- */
-
-#include <gio/gio.h>
-#include <gtk/gtkwidget.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_FILTER_LIST_MODEL (gtk_filter_list_model_get_type ())
-#define GTK_PARAM_READABLE G_PARAM_READABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
-#define GTK_PARAM_READWRITE G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
-
-GDK_AVAILABLE_IN_ALL
-G_DECLARE_FINAL_TYPE (GtkFilterListModel, gtk_filter_list_model, GTK, FILTER_LIST_MODEL, GObject)
-
-/**
- * GtkFilterListModelFilterFunc:
- * @item: (type GObject): The item that may be filtered
- * @user_data: user data
- *
- * User function that is called to determine if the @item of the original model should be visible.
- * If it should be visible, this function must return %TRUE. If the model should filter out the
- * @item, %FALSE must be returned.
- *
- * Returns: %TRUE to keep the item around
- */
-typedef gboolean (* GtkFilterListModelFilterFunc) (gpointer item, gpointer user_data);
-
-GDK_AVAILABLE_IN_ALL
-GtkFilterListModel *    gtk_filter_list_model_new               (GListModel             *model,
-                                                                 GtkFilterListModelFilterFunc filter_func,
-                                                                 gpointer                user_data,
-                                                                 GDestroyNotify          user_destroy);
-GDK_AVAILABLE_IN_ALL
-GtkFilterListModel *    gtk_filter_list_model_new_for_type      (GType                   item_type);
-
-GDK_AVAILABLE_IN_ALL
-void                    gtk_filter_list_model_set_filter_func   (GtkFilterListModel     *self,
-                                                                 GtkFilterListModelFilterFunc filter_func,
-                                                                 gpointer                user_data,
-                                                                 GDestroyNotify          user_destroy);
-GDK_AVAILABLE_IN_ALL
-void                    gtk_filter_list_model_set_model         (GtkFilterListModel     *self,
-                                                                 GListModel             *model);
-GDK_AVAILABLE_IN_ALL
-GListModel *            gtk_filter_list_model_get_model         (GtkFilterListModel     *self);
-GDK_AVAILABLE_IN_ALL
-gboolean                gtk_filter_list_model_has_filter        (GtkFilterListModel     *self);
-
-GDK_AVAILABLE_IN_ALL
-void                    gtk_filter_list_model_refilter          (GtkFilterListModel     *self);
-
-G_END_DECLS
-
-#endif /* __GTK_FILTER_LIST_MODEL_H__ */
diff --git a/subprojects/gfm/gtkflattenlistmodel.c b/subprojects/gfm/gtkflattenlistmodel.c
deleted file mode 100644
index 0027f023..00000000
--- a/subprojects/gfm/gtkflattenlistmodel.c
+++ /dev/null
@@ -1,541 +0,0 @@
-/*
- * Copyright © 2018 Benjamin Otte
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Benjamin Otte <otte@gnome.org>
- */
-
-// #include "config.h"
-
-#include "gtkflattenlistmodel.h"
-
-#include "gtkrbtreeprivate.h"
-#include "gtkintl.h"
-// #include "gtkprivate.h"
-
-/**
- * SECTION:gtkflattenlistmodel
- * @title: GtkFlattenListModel
- * @short_description: A list model that flattens a list of lists
- * @see_also: #GListModel
- *
- * #GtkFlattenListModel is a list model that takes a list model containing
- * list models and flattens it into a single model.
- *
- * Another term for this is concatenation: #GtkFlattenListModel takes a
- * list of lists and concatenates them into a single list.
- */
-
-enum {
-  PROP_0,
-  PROP_ITEM_TYPE,
-  PROP_MODEL,
-  NUM_PROPERTIES
-};
-
-typedef struct _FlattenNode FlattenNode;
-typedef struct _FlattenAugment FlattenAugment;
-
-struct _FlattenNode
-{
-  GListModel *model;
-  GtkFlattenListModel *list;
-};
-
-struct _FlattenAugment
-{
-  guint n_items;
-  guint n_models;
-};
-
-struct _GtkFlattenListModel
-{
-  GObject parent_instance;
-
-  GType item_type;
-  GListModel *model;
-  GtkRbTree *items; /* NULL if model == NULL */
-};
-
-struct _GtkFlattenListModelClass
-{
-  GObjectClass parent_class;
-};
-
-static GParamSpec *properties[NUM_PROPERTIES] = { NULL, };
-
-static FlattenNode *
-gtk_flatten_list_model_get_nth (GtkRbTree *tree,
-                                guint         position,
-                                guint        *model_position)
-{
-  FlattenNode *node, *tmp;
-  guint model_n_items;
-
-  node = gtk_rb_tree_get_root (tree);
-
-  while (node)
-    {
-      tmp = gtk_rb_tree_node_get_left (node);
-      if (tmp)
-        {
-          FlattenAugment *aug = gtk_rb_tree_get_augment (tree, tmp);
-          if (position < aug->n_items)
-            {
-              node = tmp;
-              continue;
-            }
-          position -= aug->n_items;
-        }
-
-      model_n_items = g_list_model_get_n_items (node->model);
-      if (position < model_n_items)
-        break;
-      position -= model_n_items;
-
-      node = gtk_rb_tree_node_get_right (node);
-    }
-
-  if (model_position)
-    *model_position = node ? position : 0;
-
-  return node;
-}
-
-static FlattenNode *
-gtk_flatten_list_model_get_nth_model (GtkRbTree *tree,
-                                      guint         position,
-                                      guint        *items_before)
-{
-  FlattenNode *node, *tmp;
-  guint before;
-
-  node = gtk_rb_tree_get_root (tree);
-  before = 0;
-
-  while (node)
-    {
-      tmp = gtk_rb_tree_node_get_left (node);
-      if (tmp)
-        {
-          FlattenAugment *aug = gtk_rb_tree_get_augment (tree, tmp);
-          if (position < aug->n_models)
-            {
-              node = tmp;
-              continue;
-            }
-          position -= aug->n_models;
-          before += aug->n_items;
-        }
-
-      if (position == 0)
-        break;
-      position--;
-      before += g_list_model_get_n_items (node->model);
-
-      node = gtk_rb_tree_node_get_right (node);
-    }
-
-  if (items_before)
-    *items_before = before;
-
-  return node;
-}
-
-static GType
-gtk_flatten_list_model_get_item_type (GListModel *list)
-{
-  GtkFlattenListModel *self = GTK_FLATTEN_LIST_MODEL (list);
-
-  return self->item_type;
-}
-
-static guint
-gtk_flatten_list_model_get_n_items (GListModel *list)
-{
-  GtkFlattenListModel *self = GTK_FLATTEN_LIST_MODEL (list);
-  FlattenAugment *aug;
-  FlattenNode *node;
-
-  if (!self->items)
-    return 0;
-
-  node = gtk_rb_tree_get_root (self->items);
-  if (node == NULL)
-    return 0;
-
-  aug = gtk_rb_tree_get_augment (self->items, node);
-  return aug->n_items;
-}
-
-static gpointer
-gtk_flatten_list_model_get_item (GListModel *list,
-                                 guint       position)
-{
-  GtkFlattenListModel *self = GTK_FLATTEN_LIST_MODEL (list);
-  FlattenNode *node;
-  guint model_pos;
-
-  if (!self->items)
-    return NULL;
-
-  node = gtk_flatten_list_model_get_nth (self->items, position, &model_pos);
-  if (node == NULL)
-    return NULL;
-
-  return g_list_model_get_item (node->model, model_pos);
-}
-
-static void
-gtk_flatten_list_model_model_init (GListModelInterface *iface)
-{
-  iface->get_item_type = gtk_flatten_list_model_get_item_type;
-  iface->get_n_items = gtk_flatten_list_model_get_n_items;
-  iface->get_item = gtk_flatten_list_model_get_item;
-}
-
-G_DEFINE_TYPE_WITH_CODE (GtkFlattenListModel, gtk_flatten_list_model, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL, gtk_flatten_list_model_model_init))
-
-static void
-gtk_flatten_list_model_items_changed_cb (GListModel          *model,
-                                         guint                position,
-                                         guint                removed,
-                                         guint                added,
-                                         gpointer             _node)
-{
-  FlattenNode *node = _node, *parent, *left;
-  GtkFlattenListModel *self = node->list;
-  guint real_position;
-
-  gtk_rb_tree_node_mark_dirty (node);
-  real_position = position;
-
-  left = gtk_rb_tree_node_get_left (node);
-  if (left)
-    {
-      FlattenAugment *aug = gtk_rb_tree_get_augment (self->items, left);
-      real_position += aug->n_items;
-    }
-
-  for (;
-       (parent = gtk_rb_tree_node_get_parent (node)) != NULL;
-       node = parent)
-    {
-      left = gtk_rb_tree_node_get_left (parent);
-      if (left != node)
-        {
-          if (left)
-            {
-              FlattenAugment *aug = gtk_rb_tree_get_augment (self->items, left);
-              real_position += aug->n_items;
-            }
-          real_position += g_list_model_get_n_items (parent->model);
-        }
-    }
-
-  g_list_model_items_changed (G_LIST_MODEL (self), real_position, removed, added);
-}
-
-static void
-gtk_flatten_list_model_clear_node (gpointer _node)
-{
-  FlattenNode *node= _node;
-
-  g_signal_handlers_disconnect_by_func (node->model, gtk_flatten_list_model_items_changed_cb, node);
-  g_object_unref (node->model);
-}
-
-static void
-gtk_flatten_list_model_augment (GtkRbTree *flatten,
-                                gpointer   _aug,
-                                gpointer   _node,
-                                gpointer   left,
-                                gpointer   right)
-{
-  FlattenNode *node = _node;
-  FlattenAugment *aug = _aug;
-
-  aug->n_items = g_list_model_get_n_items (node->model);
-  aug->n_models = 1;
-
-  if (left)
-    {
-      FlattenAugment *left_aug = gtk_rb_tree_get_augment (flatten, left);
-      aug->n_items += left_aug->n_items;
-      aug->n_models += left_aug->n_models;
-    }
-  if (right)
-    {
-      FlattenAugment *right_aug = gtk_rb_tree_get_augment (flatten, right);
-      aug->n_items += right_aug->n_items;
-      aug->n_models += right_aug->n_models;
-    }
-}
-
-static guint
-gtk_flatten_list_model_add_items (GtkFlattenListModel *self,
-                                  FlattenNode         *after,
-                                  guint                position,
-                                  guint                n)
-{
-  FlattenNode *node;
-  guint added, i;
-
-  added = 0;
-  for (i = 0; i < n; i++)
-    {
-      node = gtk_rb_tree_insert_before (self->items, after);
-      node->model = g_list_model_get_item (self->model, position + i);
-      g_warn_if_fail (g_type_is_a (g_list_model_get_item_type (node->model), self->item_type));
-      g_signal_connect (node->model,
-                        "items-changed",
-                        G_CALLBACK (gtk_flatten_list_model_items_changed_cb),
-                        node);
-      node->list = self;
-      added +=g_list_model_get_n_items (node->model);
-    }
-
-  return added;
-}
-
-static void
-gtk_flatten_list_model_set_property (GObject      *object,
-                                     guint         prop_id,
-                                     const GValue *value,
-                                     GParamSpec   *pspec)
-{
-  GtkFlattenListModel *self = GTK_FLATTEN_LIST_MODEL (object);
-
-  switch (prop_id)
-    {
-    case PROP_ITEM_TYPE:
-      self->item_type = g_value_get_gtype (value);
-      break;
-
-    case PROP_MODEL:
-      gtk_flatten_list_model_set_model (self, g_value_get_object (value));
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void 
-gtk_flatten_list_model_get_property (GObject     *object,
-                                     guint        prop_id,
-                                     GValue      *value,
-                                     GParamSpec  *pspec)
-{
-  GtkFlattenListModel *self = GTK_FLATTEN_LIST_MODEL (object);
-
-  switch (prop_id)
-    {
-    case PROP_ITEM_TYPE:
-      g_value_set_gtype (value, self->item_type);
-      break;
-
-    case PROP_MODEL:
-      g_value_set_object (value, self->model);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-gtk_flatten_list_model_model_items_changed_cb (GListModel          *model,
-                                               guint                position,
-                                               guint                removed,
-                                               guint                added,
-                                               GtkFlattenListModel *self)
-{
-  FlattenNode *node;
-  guint i, real_position, real_removed, real_added;
-
-  node = gtk_flatten_list_model_get_nth_model (self->items, position, &real_position);
-
-  real_removed = 0;
-  for (i = 0; i < removed; i++)
-    {
-      FlattenNode *next = gtk_rb_tree_node_get_next (node);
-      real_removed += g_list_model_get_n_items (node->model);
-      gtk_rb_tree_remove (self->items, node);
-      node = next;
-    }
-
-  real_added = gtk_flatten_list_model_add_items (self, node, position, added);
-
-  if (real_removed > 0 || real_added > 0)
-    g_list_model_items_changed (G_LIST_MODEL (self), real_position, real_removed, real_added);
-}
-
-static void
-gtk_flatten_list_clear_model (GtkFlattenListModel *self)
-{
-  if (self->model)
-    {
-      g_signal_handlers_disconnect_by_func (self->model, gtk_flatten_list_model_model_items_changed_cb, self);
-      g_clear_object (&self->model);
-      g_clear_pointer (&self->items, gtk_rb_tree_unref);
-    }
-}
-
-static void
-gtk_flatten_list_model_dispose (GObject *object)
-{
-  GtkFlattenListModel *self = GTK_FLATTEN_LIST_MODEL (object);
-
-  gtk_flatten_list_clear_model (self);
-
-  G_OBJECT_CLASS (gtk_flatten_list_model_parent_class)->dispose (object);
-}
-
-static void
-gtk_flatten_list_model_class_init (GtkFlattenListModelClass *class)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (class);
-
-  gobject_class->set_property = gtk_flatten_list_model_set_property;
-  gobject_class->get_property = gtk_flatten_list_model_get_property;
-  gobject_class->dispose = gtk_flatten_list_model_dispose;
-
-  /**
-   * GtkFlattenListModel:item-type:
-   *
-   * The #GTpe for elements of this object
-   */
-  properties[PROP_ITEM_TYPE] =
-      g_param_spec_gtype ("item-type",
-                          P_("Item type"),
-                          P_("The type of elements of this object"),
-                          G_TYPE_OBJECT,
-                          GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_EXPLICIT_NOTIFY);
-
-  /**
-   * GtkFlattenListModel:model:
-   *
-   * The model being flattened
-   */
-  properties[PROP_MODEL] =
-      g_param_spec_object ("model",
-                           P_("Model"),
-                           P_("The model being flattened"),
-                           G_TYPE_LIST_MODEL,
-                           GTK_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
-
-  g_object_class_install_properties (gobject_class, NUM_PROPERTIES, properties);
-}
-
-static void
-gtk_flatten_list_model_init (GtkFlattenListModel *self)
-{
-}
-
-/**
- * gtk_flatten_list_model_new:
- * @item_type: The type of items in the to-be-flattened models
- * @model: (nullable) (transfer none): the item to be flattened
- *
- * Creates a new #GtkFlattenListModel that flattens @list. The
- * models returned by @model must conform to the given @item_type,
- * either by having an identical type or a subtype.
- *
- * Returns: a new #GtkFlattenListModel
- **/
-GtkFlattenListModel *
-gtk_flatten_list_model_new (GType       item_type,
-                            GListModel *model)
-{
-  GtkFlattenListModel *result;
-
-  g_return_val_if_fail (g_type_is_a (item_type, G_TYPE_OBJECT), NULL);
-  g_return_val_if_fail (model == NULL || G_IS_LIST_MODEL (model), NULL);
-
-  result = g_object_new (GTK_TYPE_FLATTEN_LIST_MODEL,
-                         "item-type", item_type,
-                         "model", model,
-                         NULL);
-
-  return result;
-}
-
-/**
- * gtk_flatten_list_model_set_model:
- * @self: a #GtkFlattenListModel
- * @model: (nullable) (transfer none): the new model or %NULL
- *
- * Sets a new model to be flattened. The model must contain items of
- * #GtkListModel that conform to the item type of @self.
- **/
-void
-gtk_flatten_list_model_set_model (GtkFlattenListModel *self,
-                                  GListModel          *model)
-{
-  guint removed, added = 0;
-
-  g_return_if_fail (GTK_IS_FLATTEN_LIST_MODEL (self));
-  g_return_if_fail (model == NULL || G_IS_LIST_MODEL (model));
-  if (model)
-    {
-      g_return_if_fail (g_type_is_a (g_list_model_get_item_type (model), G_TYPE_LIST_MODEL));
-    }
-
-  if (self->model == model)
-    return;
-
-  removed = g_list_model_get_n_items (G_LIST_MODEL (self)); 
-  gtk_flatten_list_clear_model (self);
-
-  self->model = model;
-
-  if (model)
-    {
-      g_object_ref (model);
-      g_signal_connect (model, "items-changed", G_CALLBACK (gtk_flatten_list_model_model_items_changed_cb), self);
-      self->items = gtk_rb_tree_new (FlattenNode,
-                                     FlattenAugment,
-                                     gtk_flatten_list_model_augment,
-                                     gtk_flatten_list_model_clear_node,
-                                     NULL);
-
-      added = gtk_flatten_list_model_add_items (self, NULL, 0, g_list_model_get_n_items (model));
-    }
-
-  if (removed > 0 || added > 0)
-    g_list_model_items_changed (G_LIST_MODEL (self), 0, removed, added);
-
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_MODEL]);
-}
-
-/**
- * gtk_flatten_list_model_get_model:
- * @self: a #GtkFlattenListModel
- *
- * Gets the model set via gtk_flatten_list_model_set_model().
- *
- * Returns: (nullable) (transfer none): The model flattened by @self
- **/
-GListModel *
-gtk_flatten_list_model_get_model (GtkFlattenListModel *self)
-{
-  g_return_val_if_fail (GTK_IS_FLATTEN_LIST_MODEL (self), NULL);
-
-  return self->model;
-}
diff --git a/subprojects/gfm/gtkflattenlistmodel.h b/subprojects/gfm/gtkflattenlistmodel.h
deleted file mode 100644
index dec783f4..00000000
--- a/subprojects/gfm/gtkflattenlistmodel.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright © 2018 Benjamin Otte
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Benjamin Otte <otte@gnome.org>
- */
-
-#ifndef __GTK_FLATTEN_LIST_MODEL_H__
-#define __GTK_FLATTEN_LIST_MODEL_H__
-
-
-/* #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
- * #error "Only <gtk/gtk.h> can be included directly."
- * #endif
- */
-
-#include <gdk/gdk.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_FLATTEN_LIST_MODEL (gtk_flatten_list_model_get_type ())
-#define GTK_PARAM_READWRITE G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
-
-GDK_AVAILABLE_IN_ALL
-G_DECLARE_FINAL_TYPE (GtkFlattenListModel, gtk_flatten_list_model, GTK, FLATTEN_LIST_MODEL, GObject)
-
-GDK_AVAILABLE_IN_ALL
-GtkFlattenListModel *    gtk_flatten_list_model_new             (GType                   item_type,
-                                                                 GListModel             *model);
-
-GDK_AVAILABLE_IN_ALL
-void                    gtk_flatten_list_model_set_model        (GtkFlattenListModel    *self,
-                                                                 GListModel             *model);
-GDK_AVAILABLE_IN_ALL
-GListModel *            gtk_flatten_list_model_get_model        (GtkFlattenListModel    *self);
-
-G_END_DECLS
-
-#endif /* __GTK_FLATTEN_LIST_MODEL_H__ */
diff --git a/subprojects/gfm/gtkintl.h b/subprojects/gfm/gtkintl.h
deleted file mode 100644
index caeb68eb..00000000
--- a/subprojects/gfm/gtkintl.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef __GTKINTL_H__
-#define __GTKINTL_H__
-
-#include <glib/gi18n-lib.h>
-
-#ifdef ENABLE_NLS
-#define P_(String) g_dgettext(GETTEXT_PACKAGE "-properties",String)
-#else 
-#define P_(String) (String)
-#endif
-
-/* not really I18N-related, but also a string marker macro */
-#define I_(string) g_intern_static_string (string)
-
-#endif
diff --git a/subprojects/gfm/gtkrbtree.c b/subprojects/gfm/gtkrbtree.c
deleted file mode 100644
index 8d706467..00000000
--- a/subprojects/gfm/gtkrbtree.c
+++ /dev/null
@@ -1,800 +0,0 @@
-/* gtkrbtree.c
- * Copyright (C) 2000  Red Hat, Inc.,  Jonathan Blandford <jrb@redhat.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// #include "config.h"
-
-#include "gtkrbtreeprivate.h"
-
-// #include "gtkdebug.h"
-
-/* Define the following to print adds and removals to stdout.
- * The format of the printout will be suitable for addition as a new test to
- * testsuite/gtk/rbtree-crash.c
- * by just grepping the printouts from the relevant rbtree.
- *
- * This is meant to be a trivial way to add rbtree tests to the testsuite.
- */
-#undef DUMP_MODIFICATION
-
-typedef struct _GtkRbNode GtkRbNode;
-
-struct _GtkRbTree
-{
-  guint ref_count;
-
-  gsize element_size;
-  gsize augment_size;
-  GtkRbTreeAugmentFunc augment_func;
-  GDestroyNotify clear_func;
-  GDestroyNotify clear_augment_func;
-
-  GtkRbNode *root;
-};
-
-struct _GtkRbNode
-{
-  guint red :1;
-  guint dirty :1;
-
-  GtkRbNode *left;
-  GtkRbNode *right;
-  /* The difference between tree and parent here is that we OR the tree with 1 and because
-   * pointers are always multiples of 4, we can know if we've stored a parent or the tree here */
-  union {
-    gpointer parent_or_tree;
-    GtkRbNode *parent;
-    GtkRbTree *tree;
-  };
-};
-
-#define NODE_FROM_POINTER(ptr) ((GtkRbNode *) ((ptr) ? (((guchar *) (ptr)) - sizeof (GtkRbNode)) : NULL))
-#define NODE_TO_POINTER(node) ((gpointer) ((node) ? (((guchar *) (node)) + sizeof (GtkRbNode)) : NULL))
-#define NODE_TO_AUG_POINTER(tree, node) ((gpointer) ((node) ? (((guchar *) (node)) + sizeof (GtkRbNode) + (tree)->element_size) : NULL))
-
-static inline gboolean
-is_root (GtkRbNode *node)
-{
-  return GPOINTER_TO_SIZE (node->parent_or_tree) & 1 ? TRUE : FALSE;
-}
-
-static inline GtkRbNode *
-parent (GtkRbNode *node)
-{
-  if (is_root (node))
-    return NULL;
-  else
-    return node->parent;
-}
-
-static GtkRbTree *
-tree (GtkRbNode *node)
-{
-  while (!is_root (node))
-    node = parent (node);
-
-  return GSIZE_TO_POINTER (GPOINTER_TO_SIZE (node->tree) & ~1);
-}
-
-static void
-set_parent (GtkRbTree *tree,
-            GtkRbNode *node,
-            GtkRbNode *new_parent)
-{
-
-  if (new_parent != NULL)
-    {
-      node->parent = new_parent;
-    }
-  else
-    {
-      node->tree = GSIZE_TO_POINTER (GPOINTER_TO_SIZE (tree) | 1);
-      tree->root = node;
-    }
-}
-
-static inline gsize
-gtk_rb_node_get_size (GtkRbTree *tree)
-{
-  return sizeof (GtkRbNode) + tree->element_size + tree->augment_size;
-}
-
-static GtkRbNode *
-gtk_rb_node_new (GtkRbTree *tree)
-{
-  GtkRbNode *result;
-
-  result = g_slice_alloc0 (gtk_rb_node_get_size (tree));
-
-  result->red = TRUE;
-  result->dirty = TRUE;
-
-  return result;
-}
-
-static void
-gtk_rb_node_free (GtkRbTree *tree,
-                  GtkRbNode *node)
-{
-  if (tree->clear_func)
-    tree->clear_func (NODE_TO_POINTER (node));
-  if (tree->clear_augment_func)
-    tree->clear_augment_func (NODE_TO_AUG_POINTER (tree, node));
-
-  g_slice_free1 (gtk_rb_node_get_size (tree), node);
-}
-
-static void
-gtk_rb_node_free_deep (GtkRbTree *tree,
-                       GtkRbNode *node)
-{
-  GtkRbNode *right = node->right;
-
-  if (node->left)
-    gtk_rb_node_free_deep (tree, node->left);
-
-  gtk_rb_node_free (tree, node);
-
-  if (right)
-    gtk_rb_node_free_deep (tree, right);
-}
-
-static void
-gtk_rb_node_mark_dirty (GtkRbNode *node,
-                        gboolean   mark_parent)
-{
-  if (node->dirty)
-    return;
-  
-  node->dirty = TRUE;
-
-  if (mark_parent && parent (node))
-    gtk_rb_node_mark_dirty (parent (node), TRUE);
-}
-
-static void
-gtk_rb_node_clean (GtkRbTree *tree,
-                   GtkRbNode *node)
-{
-  if (!node->dirty)
-    return;
-
-  node->dirty = FALSE;
-  if (tree->augment_func)
-    tree->augment_func (tree,
-                        NODE_TO_AUG_POINTER (tree, node),
-                        NODE_TO_POINTER (node),
-                        NODE_TO_POINTER (node->left),
-                        NODE_TO_POINTER (node->right));
-}
-
-static GtkRbNode *
-gtk_rb_node_get_first (GtkRbNode *node)
-{
-  while (node->left)
-    node = node->left;
-
-  return node;
-}
-
-static GtkRbNode *
-gtk_rb_node_get_last (GtkRbNode *node)
-{
-  while (node->right)
-    node = node->right;
-
-  return node;
-}
-
-static GtkRbNode *
-gtk_rb_node_get_previous (GtkRbNode *node)
-{
-  GtkRbNode *p;
-
-  if (node->left)
-    return gtk_rb_node_get_last (node->left);
-
-  for (p = parent (node); p != NULL; p = parent (node))
-    {
-      if (p->right == node)
-        return p;
-
-      node = p;
-    }
-
-  return NULL;
-}
-
-static GtkRbNode *
-gtk_rb_node_get_next (GtkRbNode *node)
-{
-  GtkRbNode *p;
-
-  if (node->right)
-    return gtk_rb_node_get_first (node->right);
-
-  for (p = parent (node); p != NULL; p = parent (node))
-    {
-      if (p->left == node)
-        return p;
-
-      node = p;
-    }
-
-  return NULL;
-}
-
-#ifdef DUMP_MODIFICATION
-static guint
-position (GtkRbTree *tree,
-          GtkRbNode *node)
-{
-  GtkRbNode *n;
-  guint i;
-
-  i = 0;
-  for (n = gtk_rb_node_get_first (tree->root);
-       n != node;
-       n = gtk_rb_node_get_next (n))
-    i++;
-
-  return i;
-}
-#endif
-
-static void
-gtk_rb_node_rotate_left (GtkRbTree *tree,
-                         GtkRbNode *node)
-{
-  GtkRbNode *right, *p;
-
-  right = node->right;
-  p = parent (node);
-
-  node->right = right->left;
-  if (right->left)
-    set_parent (tree, right->left, node);
-
-  set_parent (tree, right, p);
-  if (p)
-    {
-      if (node == p->left)
-	p->left = right;
-      else
-	p->right = right;
-    }
-
-  right->left = node;
-  set_parent (tree, node, right);
-
-  gtk_rb_node_mark_dirty (node, FALSE);
-  gtk_rb_node_mark_dirty (right, FALSE);
-}
-
-static void
-gtk_rb_node_rotate_right (GtkRbTree *tree,
-                          GtkRbNode *node)
-{
-  GtkRbNode *left, *p;
-
-  left = node->left;
-  p = parent (node);
-
-  node->left = left->right;
-  if (left->right)
-    set_parent (tree, left->right, node);
-
-  set_parent (tree, left, p);
-  if (p)
-    {
-      if (node == p->right)
-	p->right = left;
-      else
-	p->left = left;
-    }
-
-  /* link node and left */
-  left->right = node;
-  set_parent (tree, node, left);
-
-  gtk_rb_node_mark_dirty (node, FALSE);
-  gtk_rb_node_mark_dirty (left, FALSE);
-}
-
-static gboolean
-is_red (GtkRbNode *node_or_null)
-{
-  if (node_or_null == NULL)
-    return FALSE;
-  else
-    return node_or_null->red;
-}
-
-static inline gboolean
-is_black (GtkRbNode *node_or_null)
-{
-  return !is_red (node_or_null);
-}
-
-static void
-set_black (GtkRbNode *node_or_null)
-{
-  if (node_or_null == NULL)
-    return;
-
-  node_or_null->red = FALSE;
-}
-
-static void
-set_red (GtkRbNode *node_or_null)
-{
-  if (node_or_null == NULL)
-    return;
-
-  node_or_null->red = TRUE;
-}
-
-static void
-gtk_rb_tree_insert_fixup (GtkRbTree *tree,
-                          GtkRbNode *node)
-{
-  GtkRbNode *p;
-
-  /* check Red-Black properties */
-  for (p = parent (node);
-       p && is_red (p);
-       p = parent (node))
-    {
-      GtkRbNode *pp = parent (p);
-
-      /* we have a violation */
-      g_assert (pp);
-
-      if (p == pp->left)
-	{
-	  GtkRbNode *uncle = pp->right;
-
-	  if (is_red (uncle))
-	    {
-	      /* uncle is red */
-	      set_black (p);
-              set_black (uncle);
-              set_red (pp);
-	      node = pp;
-	    }
-	  else
-	    {
-	      /* uncle is black */
-	      if (node == p->right)
-		{
-		  /* make node a left child */
-		  node = p;
-		  gtk_rb_node_rotate_left (tree, node);
-                  p = parent (node);
-                  pp = parent (p);
-		}
-	      /* recolor and rotate */
-              set_black (p);
-              set_red (pp);
-	      gtk_rb_node_rotate_right (tree, pp);
-	    }
-	}
-      else
-	{
-	  /* mirror image of above code */
-	  GtkRbNode *uncle = pp->left;
-
-	  if (is_red (uncle))
-	    {
-	      /* uncle is red */
-              set_black (p);
-              set_black (uncle);
-              set_red (pp);
-	      node = pp;
-	    }
-	  else
-	    {
-              /* uncle is black */
-	      if (node == p->left)
-		{
-		  node = p;
-		  gtk_rb_node_rotate_right (tree, node);
-                  p = parent (node);
-                  pp = parent (p);
-		}
-	      set_black (p);
-	      set_red (pp);
-	      gtk_rb_node_rotate_left (tree, pp);
-	    }
-	}
-    }
-
-  set_black (tree->root);
-}
-
-static void
-gtk_rb_tree_remove_node_fixup (GtkRbTree *tree,
-                               GtkRbNode *node,
-                               GtkRbNode *p)
-{
-  while (node != tree->root && is_black (node))
-    {
-      if (node == p->left)
-	{
-	  GtkRbNode *w = p->right;
-
-	  if (is_red (w))
-	    {
-	      set_black (w);
-              set_red (p);
-	      gtk_rb_node_rotate_left (tree, p);
-	      w = p->right;
-	    }
-	  if (is_black (w->left) && is_black (w->right))
-	    {
-	      set_red (w);
-	      node = p;
-	    }
-	  else
-	    {
-	      if (is_black (w->right))
-		{
-		  set_black (w->left);
-		  set_red (w);
-		  gtk_rb_node_rotate_right (tree, w);
-		  w = p->right;
-		}
-	      w->red = p->red;
-	      set_black (p);
-              set_black (w->right);
-	      gtk_rb_node_rotate_left (tree, p);
-	      node = tree->root;
-	    }
-	}
-      else
-	{
-	  GtkRbNode *w = p->left;
-	  if (is_red (w))
-	    {
-	      set_black (w);
-	      set_red (p);
-	      gtk_rb_node_rotate_right (tree, p);
-	      w = p->left;
-	    }
-	  if (is_black (w->right) && is_black (w->left))
-	    {
-	      set_red (w);
-	      node = p;
-	    }
-	  else
-	    {
-	      if (is_black (w->left))
-		{
-		  set_black (w->right);
-		  set_red (w);
-		  gtk_rb_node_rotate_left (tree, w);
-		  w = p->left;
-		}
-	      w->red = p->red;
-	      set_black (p);
-	      set_black (w->left);
-	      gtk_rb_node_rotate_right (tree, p);
-	      node = tree->root;
-	    }
-	}
-
-      p = parent (node);
-    }
-
-  set_black (node);
-}
-
-GtkRbTree *
-gtk_rb_tree_new_for_size (gsize                element_size,
-                          gsize                augment_size,
-                          GtkRbTreeAugmentFunc augment_func,
-                          GDestroyNotify       clear_func,
-                          GDestroyNotify       clear_augment_func)
-{
-  GtkRbTree *tree;
-
-  tree = g_slice_new0 (GtkRbTree);
-  tree->ref_count = 1;
-
-  tree->element_size = element_size;
-  tree->augment_size = augment_size;
-  tree->augment_func = augment_func;
-  tree->clear_func = clear_func;
-  tree->clear_augment_func = clear_augment_func;
-
-  return tree;
-}
-
-GtkRbTree *
-gtk_rb_tree_ref (GtkRbTree *tree)
-{
-  tree->ref_count++;
-
-  return tree;
-}
-
-void
-gtk_rb_tree_unref (GtkRbTree *tree)
-{
-  tree->ref_count--;
-  if (tree->ref_count > 0)
-    return;
-
-  if (tree->root)
-    gtk_rb_node_free_deep (tree, tree->root);
-    
-  g_slice_free (GtkRbTree, tree);
-}
-
-gpointer
-gtk_rb_tree_get_first (GtkRbTree *tree)
-{
-  if (tree->root == NULL)
-    return NULL;
-
-  return NODE_TO_POINTER (gtk_rb_node_get_first (tree->root));
-}
-
-gpointer
-gtk_rb_tree_get_last (GtkRbTree *tree)
-{
-  if (tree->root == NULL)
-    return NULL;
-
-  return NODE_TO_POINTER (gtk_rb_node_get_last (tree->root));
-}
-
-gpointer
-gtk_rb_tree_node_get_previous (gpointer node)
-{
-  return NODE_TO_POINTER (gtk_rb_node_get_previous (NODE_FROM_POINTER (node)));
-}
-
-gpointer
-gtk_rb_tree_node_get_next (gpointer node)
-{
-  return NODE_TO_POINTER (gtk_rb_node_get_next (NODE_FROM_POINTER (node)));
-}
-
-gpointer
-gtk_rb_tree_get_root (GtkRbTree *tree)
-{
-  return NODE_TO_POINTER (tree->root);
-}
-
-gpointer
-gtk_rb_tree_node_get_parent (gpointer node)
-{
-  return NODE_TO_POINTER (parent (NODE_FROM_POINTER (node)));
-}
-
-gpointer
-gtk_rb_tree_node_get_left (gpointer node)
-{
-  return NODE_TO_POINTER (NODE_FROM_POINTER (node)->left);
-}
-
-gpointer
-gtk_rb_tree_node_get_right (gpointer node)
-{
-  return NODE_TO_POINTER (NODE_FROM_POINTER (node)->right);
-}
-
-gpointer
-gtk_rb_tree_get_augment (GtkRbTree *tree,
-                         gpointer   node)
-{
-  GtkRbNode *rbnode = NODE_FROM_POINTER (node);
-
-  gtk_rb_node_clean (tree, rbnode);
-
-  return NODE_TO_AUG_POINTER (tree, rbnode);
-}
-
-GtkRbTree *
-gtk_rb_tree_node_get_tree (gpointer node)
-{
-  return tree (NODE_FROM_POINTER (node));
-}
-
-void
-gtk_rb_tree_node_mark_dirty (gpointer node)
-{
-  gtk_rb_node_mark_dirty (NODE_FROM_POINTER (node), TRUE);
-}
-
-gpointer
-gtk_rb_tree_insert_before (GtkRbTree *tree,
-                           gpointer   node)
-{
-  GtkRbNode *result;
-
-
-  if (tree->root == NULL)
-    {
-#ifdef DUMP_MODIFICATION
-      g_print ("add (tree, 0); /* 0x%p */\n", tree);
-#endif /* DUMP_MODIFICATION */
-
-      g_assert (node == NULL);
-
-      result = gtk_rb_node_new (tree);
-      tree->root = result;
-    }
-  else if (node == NULL)
-    {
-      return gtk_rb_tree_insert_after (tree, gtk_rb_tree_get_last (tree));
-    }
-  else
-    {
-      GtkRbNode *current = NODE_FROM_POINTER (node);
-
-#ifdef DUMP_MODIFICATION
-      g_print ("add (tree, %u); /* 0x%p */\n", position (tree, current), tree);
-#endif /* DUMP_MODIFICATION */
-
-      /* setup new node */
-      result = gtk_rb_node_new (tree);
-
-      if (current->left)
-        {
-          current = gtk_rb_node_get_last (current->left);
-          current->right = result;
-        }
-      else
-        {
-          current->left = result;
-        }
-      set_parent (tree, result, current);
-      gtk_rb_node_mark_dirty (current, TRUE);
-    }
-
-  gtk_rb_tree_insert_fixup (tree, result);
-
-  return NODE_TO_POINTER (result);
-}
-
-gpointer
-gtk_rb_tree_insert_after (GtkRbTree *tree,
-                          gpointer   node)
-{
-  GtkRbNode *current, *result;
-
-  if (node == NULL)
-    return gtk_rb_tree_insert_before (tree, gtk_rb_tree_get_first (tree));
-
-  current = NODE_FROM_POINTER (node);
-
-#ifdef DUMP_MODIFICATION
-  g_print ("add (tree, %u); /* 0x%p */\n", position (tree, current) + 1, tree);
-#endif /* DUMP_MODIFICATION */
-
-  /* setup new node */
-  result = gtk_rb_node_new (tree);
-
-  if (current->right)
-    {
-      current = gtk_rb_node_get_first (current->right);
-      current->left = result;
-    }
-  else
-    {
-      current->right = result;
-    }
-  set_parent (tree, result, current);
-  gtk_rb_node_mark_dirty (current, TRUE);
-
-  gtk_rb_tree_insert_fixup (tree, result);
-
-  return NODE_TO_POINTER (result);
-}
-
-void
-gtk_rb_tree_remove (GtkRbTree *tree,
-                    gpointer   node)
-{
-  GtkRbNode *x, *y, *p, *real_node;
-  
-  real_node = NODE_FROM_POINTER (node);
-
-#ifdef DUMP_MODIFICATION
-  g_print ("delete (tree, %u); /* 0x%p */\n", position (tree, real_node), tree);
-#endif /* DUMP_MODIFICATION */
-
-  y = real_node;
-  if (y->left && y->right)
-    {
-      y = y->right;
-
-      while (y->left)
-	y = y->left;
-    }
-
-  /* x is y's only child, or nil */
-  if (y->left)
-    x = y->left;
-  else
-    x = y->right;
-
-  /* remove y from the parent chain */
-  p = parent (y);
-  if (x != NULL)
-    set_parent (tree, x, p);
-  if (p)
-    {
-      if (y == p->left)
-	p->left = x;
-      else
-	p->right = x;
-      gtk_rb_node_mark_dirty (p, TRUE);
-    }
-  else
-    {
-      if (x == NULL)
-        tree->root = NULL;
-    }
-
-  /* We need to clean up the validity of the tree.
-   */
-  if (is_black (y))
-    gtk_rb_tree_remove_node_fixup (tree, x, p);
-
-  if (y != real_node)
-    {
-      /* Move the node over */
-      if (is_red (real_node) != is_red (y))
-	y->red = !y->red;
-
-      y->left = real_node->left;
-      if (y->left)
-        set_parent (tree, y->left, y);
-      y->right = real_node->right;
-      if (y->right)
-        set_parent (tree, y->right, y);
-      p = parent (real_node);
-      set_parent (tree, y, p);
-      if (p)
-        {
-          if (p->left == real_node)
-            p->left = y;
-          else
-            p->right = y;
-          gtk_rb_node_mark_dirty (p, TRUE);
-        }
-      gtk_rb_node_mark_dirty (y, TRUE);
-    }
-
-  gtk_rb_node_free (tree, real_node);
-}
-
-void
-gtk_rb_tree_remove_all (GtkRbTree *tree)
-{
-#ifdef DUMP_MODIFICATION
-      g_print ("delete_all (tree); /* 0x%p */\n", tree);
-#endif /* DUMP_MODIFICATION */
-
-  if (tree->root)
-    gtk_rb_node_free_deep (tree, tree->root);
-
-  tree->root = NULL;
-}
-
diff --git a/subprojects/gfm/gtkrbtreeprivate.h b/subprojects/gfm/gtkrbtreeprivate.h
deleted file mode 100644
index 45aba5cc..00000000
--- a/subprojects/gfm/gtkrbtreeprivate.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* gtkrbtree.h
- * Copyright (C) 2000  Red Hat, Inc.,  Jonathan Blandford <jrb@redhat.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* A Red-Black Tree implementation used specifically by GtkTreeView.
- */
-#ifndef __GTK_RB_TREE_H__
-#define __GTK_RB_TREE_H__
-
-#include <glib.h>
-
-
-G_BEGIN_DECLS
-
-
-typedef struct _GtkRbTree GtkRbTree;
-
-typedef void            (* GtkRbTreeAugmentFunc)        (GtkRbTree               *tree,
-                                                         gpointer                 node_augment,
-                                                         gpointer                 node,
-                                                         gpointer                 left,
-                                                         gpointer                 right);
-
-GtkRbTree *          gtk_rb_tree_new_for_size           (gsize                    element_size,
-                                                         gsize                    augment_size,
-                                                         GtkRbTreeAugmentFunc     augment_func,
-                                                         GDestroyNotify           clear_func,
-                                                         GDestroyNotify           clear_augment_func);
-#define gtk_rb_tree_new(type, augment_type, augment_func, clear_func, clear_augment_func) \
-  gtk_rb_tree_new_for_size (sizeof (type), sizeof (augment_type), (augment_func), (clear_func), (clear_augment_func))
-
-GtkRbTree *          gtk_rb_tree_ref                    (GtkRbTree               *tree);
-void                 gtk_rb_tree_unref                  (GtkRbTree               *tree);
-
-gpointer             gtk_rb_tree_get_root               (GtkRbTree               *tree);
-gpointer             gtk_rb_tree_get_first              (GtkRbTree               *tree);
-gpointer             gtk_rb_tree_get_last               (GtkRbTree               *tree);
-
-gpointer             gtk_rb_tree_node_get_previous      (gpointer                 node);
-gpointer             gtk_rb_tree_node_get_next          (gpointer                 node);
-gpointer             gtk_rb_tree_node_get_parent        (gpointer                 node);
-gpointer             gtk_rb_tree_node_get_left          (gpointer                 node);
-gpointer             gtk_rb_tree_node_get_right         (gpointer                 node);
-GtkRbTree *          gtk_rb_tree_node_get_tree          (gpointer                 node);
-void                 gtk_rb_tree_node_mark_dirty        (gpointer                 node);
-
-gpointer             gtk_rb_tree_get_augment            (GtkRbTree               *tree,
-                                                         gpointer                 node);
-
-gpointer             gtk_rb_tree_insert_before          (GtkRbTree               *tree,
-                                                         gpointer                 node);
-gpointer             gtk_rb_tree_insert_after           (GtkRbTree               *tree,
-                                                         gpointer                 node);
-void                 gtk_rb_tree_remove                 (GtkRbTree               *tree,
-                                                         gpointer                 node);
-void                 gtk_rb_tree_remove_all             (GtkRbTree               *tree);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_RB_TREE_H__ */
diff --git a/subprojects/gfm/gtkslicelistmodel.c b/subprojects/gfm/gtkslicelistmodel.c
deleted file mode 100644
index 55ea970b..00000000
--- a/subprojects/gfm/gtkslicelistmodel.c
+++ /dev/null
@@ -1,527 +0,0 @@
-/*
- * Copyright © 2018 Benjamin Otte
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Benjamin Otte <otte@gnome.org>
- */
-
-// #include "config.h"
-
-#include "gtkslicelistmodel.h"
-
-#include "gtkintl.h"
-// #include "gtkprivate.h"
-
-/**
- * SECTION:gtkslicelistmodel
- * @title: GtkSliceListModel
- * @short_description: A list model that presents a slice out of a larger list
- * @see_also: #GListModel
- *
- * #GtkSliceListModel is a list model that takes a list model and presents a slice of
- * that model.
- *
- * This is useful when implementing paging by setting the size to the number of elements
- * per page and updating the offset whenever a different page is opened.
- */
-
-#define DEFAULT_SIZE 10
-
-enum {
-  PROP_0,
-  PROP_ITEM_TYPE,
-  PROP_MODEL,
-  PROP_OFFSET,
-  PROP_SIZE,
-  NUM_PROPERTIES
-};
-
-struct _GtkSliceListModel
-{
-  GObject parent_instance;
-
-  GType item_type;
-  GListModel *model;
-  guint offset;
-  guint size;
-
-  guint n_items;
-};
-
-struct _GtkSliceListModelClass
-{
-  GObjectClass parent_class;
-};
-
-static GParamSpec *properties[NUM_PROPERTIES] = { NULL, };
-
-static GType
-gtk_slice_list_model_get_item_type (GListModel *list)
-{
-  GtkSliceListModel *self = GTK_SLICE_LIST_MODEL (list);
-
-  return self->item_type;
-}
-
-static guint
-gtk_slice_list_model_get_n_items (GListModel *list)
-{
-  GtkSliceListModel *self = GTK_SLICE_LIST_MODEL (list);
-  guint n_items;
-
-  if (self->model == NULL)
-    return 0;
-
-  /* XXX: This can be done without calling g_list_model_get_n_items() on the parent model
-   * by checking if model.get_item(offset + size) != NULL */
-  n_items = g_list_model_get_n_items (self->model);
-  if (n_items <= self->offset)
-    return 0;
-
-  n_items -= self->offset;
-  return MIN (n_items, self->size);
-}
-
-static gpointer
-gtk_slice_list_model_get_item (GListModel *list,
-                               guint       position)
-{
-  GtkSliceListModel *self = GTK_SLICE_LIST_MODEL (list);
-
-  if (self->model == NULL)
-    return NULL;
-
-  if (position >= self->size)
-    return NULL;
-
-  return g_list_model_get_item (self->model, position + self->offset);
-}
-
-static void
-gtk_slice_list_model_model_init (GListModelInterface *iface)
-{
-  iface->get_item_type = gtk_slice_list_model_get_item_type;
-  iface->get_n_items = gtk_slice_list_model_get_n_items;
-  iface->get_item = gtk_slice_list_model_get_item;
-}
-
-G_DEFINE_TYPE_WITH_CODE (GtkSliceListModel, gtk_slice_list_model, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL, gtk_slice_list_model_model_init))
-
-static void
-gtk_slice_list_model_items_changed_cb (GListModel        *model,
-                                       guint              position,
-                                       guint              removed,
-                                       guint              added,
-                                       GtkSliceListModel *self)
-{
-  if (position >= self->offset + self->size)
-    return;
-
-  if (position < self->offset)
-    {
-      guint skip = MIN (removed, added);
-      skip = MIN (skip, position - self->offset);
-
-      position += skip;
-      removed -= skip;
-      added -= skip;
-    }
-
-  if (removed == added)
-    {
-      guint changed = removed;
-
-      if (changed == 0)
-        return;
-
-      g_assert (position >= self->offset);
-      position -= self->offset;
-      changed = MIN (changed, self->size) - position;
-
-      g_list_model_items_changed (G_LIST_MODEL (self), position, changed, changed);
-    }
-  else
-    {
-      guint n_after, n_before;
-      guint skip;
-
-      if (position > self->offset)
-        skip = position - self->offset;
-      else
-        skip = 0;
-
-      n_after = g_list_model_get_n_items (self->model);
-      n_before = n_after - added + removed;
-      n_after = CLAMP (n_after, self->offset, self->offset + self->size) - self->offset;
-      n_before = CLAMP (n_before, self->offset, self->offset + self->size) - self->offset;
-
-      g_list_model_items_changed (G_LIST_MODEL (self), skip, n_before - skip, n_after - skip);
-    }
-}
-
-static void
-gtk_slice_list_model_set_property (GObject      *object,
-                                   guint         prop_id,
-                                   const GValue *value,
-                                   GParamSpec   *pspec)
-{
-  GtkSliceListModel *self = GTK_SLICE_LIST_MODEL (object);
-
-  switch (prop_id)
-    {
-    case PROP_ITEM_TYPE:
-      self->item_type = g_value_get_gtype (value);
-      break;
-
-    case PROP_MODEL:
-      gtk_slice_list_model_set_model (self, g_value_get_object (value));
-      break;
-
-    case PROP_OFFSET:
-      gtk_slice_list_model_set_offset (self, g_value_get_uint (value));
-      break;
-
-    case PROP_SIZE:
-      gtk_slice_list_model_set_size (self, g_value_get_uint (value));
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-gtk_slice_list_model_get_property (GObject     *object,
-                                   guint        prop_id,
-                                   GValue      *value,
-                                   GParamSpec  *pspec)
-{
-  GtkSliceListModel *self = GTK_SLICE_LIST_MODEL (object);
-
-  switch (prop_id)
-    {
-    case PROP_ITEM_TYPE:
-      g_value_set_gtype (value, self->item_type);
-      break;
-
-    case PROP_MODEL:
-      g_value_set_object (value, self->model);
-      break;
-
-    case PROP_OFFSET:
-      g_value_set_uint (value, self->offset);
-      break;
-
-    case PROP_SIZE:
-      g_value_set_uint (value, self->size);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-gtk_slice_list_model_clear_model (GtkSliceListModel *self)
-{
-  if (self->model == NULL)
-    return;
-
-  g_signal_handlers_disconnect_by_func (self->model, gtk_slice_list_model_items_changed_cb, self);
-  g_clear_object (&self->model);
-}
-
-static void
-gtk_slice_list_model_dispose (GObject *object)
-{
-  GtkSliceListModel *self = GTK_SLICE_LIST_MODEL (object);
-
-  gtk_slice_list_model_clear_model (self);
-
-  G_OBJECT_CLASS (gtk_slice_list_model_parent_class)->dispose (object);
-};
-
-static void
-gtk_slice_list_model_class_init (GtkSliceListModelClass *class)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (class);
-
-  gobject_class->set_property = gtk_slice_list_model_set_property;
-  gobject_class->get_property = gtk_slice_list_model_get_property;
-  gobject_class->dispose = gtk_slice_list_model_dispose;
-
-  /**
-   * GtkSliceListModel:item-type:
-   *
-   * The #GType for elements of this object
-   */
-  properties[PROP_ITEM_TYPE] =
-      g_param_spec_gtype ("item-type",
-                          P_("Item type"),
-                          P_("The type of elements of this object"),
-                          G_TYPE_OBJECT,
-                          GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_EXPLICIT_NOTIFY);
-
-  /**
-   * GtkSliceListModel:model:
-   *
-   * Child model to take slice from
-   */
-  properties[PROP_MODEL] =
-      g_param_spec_object ("model",
-                           P_("Model"),
-                           P_("Child model to take slice from"),
-                           G_TYPE_LIST_MODEL,
-                           GTK_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
-
-  /**
-   * GtkSliceListModel:offset:
-   *
-   * Offset of slice
-   */
-  properties[PROP_OFFSET] =
-      g_param_spec_uint ("offset",
-                         P_("Offset"),
-                         P_("Offset of slice"),
-                         0, G_MAXUINT, 0,
-                         GTK_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
-
-  /**
-   * GtkSliceListModel:size:
-   *
-   * Maximum size of slice
-   */
-  properties[PROP_SIZE] =
-      g_param_spec_uint ("size",
-                         P_("Size"),
-                         P_("Maximum size of slice"),
-                         0, G_MAXUINT, DEFAULT_SIZE,
-                         GTK_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
-
-  g_object_class_install_properties (gobject_class, NUM_PROPERTIES, properties);
-}
-
-static void
-gtk_slice_list_model_init (GtkSliceListModel *self)
-{
-  self->size = DEFAULT_SIZE;
-}
-
-/**
- * gtk_slice_list_model_new:
- * @model: (transfer none): The model to use
- * @offset: the offset of the slice
- * @size: maximum size of the slice
- *
- * Creates a new slice model that presents the slice from @offset to
- * @offset + @size our of the given @model.
- *
- * Returns: A new #GtkSliceListModel
- **/
-GtkSliceListModel *
-gtk_slice_list_model_new (GListModel *model,
-                          guint       offset,
-                          guint       size)
-{
-  g_return_val_if_fail (G_IS_LIST_MODEL (model), NULL);
-
-  return g_object_new (GTK_TYPE_SLICE_LIST_MODEL,
-                       "item-type", g_list_model_get_item_type (model),
-                       "model", model,
-                       "offset", offset,
-                       "size", size,
-                       NULL);
-}
-
-/**
- * gtk_slice_list_model_new_for_type:
- * @item_type: the type of items
- *
- * Creates a new empty #GtkSliceListModel for the given @item_type that
- * can be set up later.
- *
- * Returns: a new empty #GtkSliceListModel
- **/
-GtkSliceListModel *
-gtk_slice_list_model_new_for_type (GType item_type)
-{
-  g_return_val_if_fail (g_type_is_a (item_type, G_TYPE_OBJECT), NULL);
-
-  return g_object_new (GTK_TYPE_SLICE_LIST_MODEL,
-                       "item-type", item_type,
-                       NULL);
-}
-
-/**
- * gtk_slice_list_model_set_model:
- * @self: a #GtkSliceListModel
- * @model: (allow-none): The model to be sliced
- *
- * Sets the model to show a slice of. The model's item type must conform
- * to @self's item type.
- *
- **/
-void
-gtk_slice_list_model_set_model (GtkSliceListModel *self,
-                                GListModel      *model)
-{
-  guint removed, added;
-
-  g_return_if_fail (GTK_IS_SLICE_LIST_MODEL (self));
-  g_return_if_fail (model == NULL || G_IS_LIST_MODEL (model));
-
-  if (self->model == model)
-    return;
-
-  removed = g_list_model_get_n_items (G_LIST_MODEL (self));
-  gtk_slice_list_model_clear_model (self);
-
-  if (model)
-    {
-      self->model = g_object_ref (model);
-      g_signal_connect (model, "items-changed", G_CALLBACK (gtk_slice_list_model_items_changed_cb), self);
-      added = g_list_model_get_n_items (G_LIST_MODEL (self));
-    }
-  else
-    {
-      added = 0;
-    }
-
-  if (removed > 0 || added > 0)
-    g_list_model_items_changed (G_LIST_MODEL (self), 0, removed, added);
-
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_MODEL]);
-}
-
-/**
- * gtk_slice_list_model_get_model:
- * @self: a #GtkSliceListModel
- *
- * Gets the model that is curently being used or %NULL if none.
- *
- * Returns: (nullable) (transfer none): The model in use
- **/
-GListModel *
-gtk_slice_list_model_get_model (GtkSliceListModel *self)
-{
-  g_return_val_if_fail (GTK_IS_SLICE_LIST_MODEL (self), NULL);
-
-  return self->model;
-}
-
-/**
- * gtk_slice_list_model_set_offset:
- * @self: a #GtkSliceListModel
- * @offset: the new offset to use
- *
- * Sets the offset into the original model for this slice.
- *
- * If the offset is too large for the sliced model,
- * @self will end up empty.
- **/
-void
-gtk_slice_list_model_set_offset (GtkSliceListModel *self,
-                                 guint              offset)
-{
-  guint before, after;
-
-  g_return_if_fail (GTK_IS_SLICE_LIST_MODEL (self));
-
-  if (self->offset == offset)
-    return;
-
-  before = g_list_model_get_n_items (G_LIST_MODEL (self));
-
-  self->offset = offset;
-
-  after = g_list_model_get_n_items (G_LIST_MODEL (self));
-
-  if (before > 0 || after > 0)
-    g_list_model_items_changed (G_LIST_MODEL (self), 0, before, after);
-
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_OFFSET]);
-}
-
-/**
- * gtk_slice_list_model_get_offset:
- * @self: a #GtkSliceListModel
- *
- * Gets the offset set via gtk_slice_list_model_set_offset()
- *
- * Returns: The offset
- **/
-guint
-gtk_slice_list_model_get_offset (GtkSliceListModel *self)
-{
-  g_return_val_if_fail (GTK_IS_SLICE_LIST_MODEL (self), 0);
-
-  return self->offset;
-}
-
-/**
- * gtk_slice_list_model_set_size:
- * @self: a #GtkSliceListModel
- * @size: the maximum size
- *
- * Sets the maximum size. @self will never have more items
- * than @size.
- *
- * It can however have fewer items if the offset is too large or
- * the model sliced from doesn't have enough items.
- */
-void
-gtk_slice_list_model_set_size (GtkSliceListModel *self,
-                               guint              size)
-{
-  guint before, after;
-
-  g_return_if_fail (GTK_IS_SLICE_LIST_MODEL (self));
-
-  if (self->size == size)
-    return;
-
-  before = g_list_model_get_n_items (G_LIST_MODEL (self));
-
-  self->size = size;
-
-  after = g_list_model_get_n_items (G_LIST_MODEL (self));
-
-  if (before > after)
-    g_list_model_items_changed (G_LIST_MODEL (self), after, before - after, 0);
-  else if (before < after)
-    g_list_model_items_changed (G_LIST_MODEL (self), before, 0, after - before);
-  /* else nothing */
-
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_SIZE]);
-}
-
-/**
- * gtk_slice_list_model_get_size:
- * @self: a #GtkSliceListModel
- *
- * Gets the size set via gtk_slice_list_model_set_size().
- *
- * Returns: The size
- **/
-guint
-gtk_slice_list_model_get_size (GtkSliceListModel *self)
-{
-  g_return_val_if_fail (GTK_IS_SLICE_LIST_MODEL (self), DEFAULT_SIZE);
-
-  return self->size;
-}
diff --git a/subprojects/gfm/gtkslicelistmodel.h b/subprojects/gfm/gtkslicelistmodel.h
deleted file mode 100644
index 25543f18..00000000
--- a/subprojects/gfm/gtkslicelistmodel.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright © 2018 Benjamin Otte
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Benjamin Otte <otte@gnome.org>
- */
-
-#ifndef __GTK_SLICE_LIST_MODEL_H__
-#define __GTK_SLICE_LIST_MODEL_H__
-
-
-/* #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
- * #error "Only <gtk/gtk.h> can be included directly."
- * #endif
- */
-
-#include <gio/gio.h>
-#include <gtk/gtkwidget.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_SLICE_LIST_MODEL (gtk_slice_list_model_get_type ())
-#define GTK_PARAM_READWRITE G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
-
-GDK_AVAILABLE_IN_ALL
-G_DECLARE_FINAL_TYPE (GtkSliceListModel, gtk_slice_list_model, GTK, SLICE_LIST_MODEL, GObject)
-
-GDK_AVAILABLE_IN_ALL
-GtkSliceListModel *     gtk_slice_list_model_new                (GListModel             *model,
-                                                                 guint                   offset,
-                                                                 guint                   size);
-GDK_AVAILABLE_IN_ALL
-GtkSliceListModel *     gtk_slice_list_model_new_for_type       (GType                   item_type);
-
-GDK_AVAILABLE_IN_ALL
-void                    gtk_slice_list_model_set_model          (GtkSliceListModel      *self,
-                                                                 GListModel             *model);
-GDK_AVAILABLE_IN_ALL
-GListModel *            gtk_slice_list_model_get_model          (GtkSliceListModel      *self);
-GDK_AVAILABLE_IN_ALL
-void                    gtk_slice_list_model_set_offset         (GtkSliceListModel      *self,
-                                                                 guint                   offset);
-GDK_AVAILABLE_IN_ALL
-guint                   gtk_slice_list_model_get_offset         (GtkSliceListModel      *self);
-GDK_AVAILABLE_IN_ALL
-void                    gtk_slice_list_model_set_size           (GtkSliceListModel      *self,
-                                                                 guint                   size);
-GDK_AVAILABLE_IN_ALL
-guint                   gtk_slice_list_model_get_size           (GtkSliceListModel      *self);
-
-G_END_DECLS
-
-#endif /* __GTK_SLICE_LIST_MODEL_H__ */
diff --git a/subprojects/gfm/gtksortlistmodel.c b/subprojects/gfm/gtksortlistmodel.c
deleted file mode 100644
index a702feb6..00000000
--- a/subprojects/gfm/gtksortlistmodel.c
+++ /dev/null
@@ -1,563 +0,0 @@
-/*
- * Copyright © 2018 Benjamin Otte
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Benjamin Otte <otte@gnome.org>
- */
-
-// #include "config.h"
-
-#include "gtksortlistmodel.h"
-
-#include "gtkintl.h"
-// #include "gtkprivate.h"
-
-/**
- * SECTION:gtksortlistmodel
- * @title: GtkSortListModel
- * @short_description: A list model that sorts its items
- * @see_also: #GListModel
- *
- * #GtkSortListModel is a list model that takes a list model and
- * sorts its elements according to a compare function.
- *
- * #GtkSortListModel is a generic model and because of that it
- * cannot take advantage of any external knowledge when sorting.
- * If you run into performance issues with #GtkSortListModel, it
- * is strongly recommended that you write your own sorting list
- * model.
- */
-
-enum {
-  PROP_0,
-  PROP_HAS_SORT,
-  PROP_ITEM_TYPE,
-  PROP_MODEL,
-  NUM_PROPERTIES
-};
-
-struct _GtkSortListModel
-{
-  GObject parent_instance;
-
-  GType item_type;
-  GListModel *model;
-  GCompareDataFunc sort_func;
-  gpointer user_data;
-  GDestroyNotify user_destroy;
-
-  GSequence *sorted; /* NULL if sort_func == NULL */
-  GSequence *unsorted; /* NULL if sort_func == NULL */
-};
-
-struct _GtkSortListModelClass
-{
-  GObjectClass parent_class;
-};
-
-static GParamSpec *properties[NUM_PROPERTIES] = { NULL, };
-
-static GType
-gtk_sort_list_model_get_item_type (GListModel *list)
-{
-  GtkSortListModel *self = GTK_SORT_LIST_MODEL (list);
-
-  return self->item_type;
-}
-
-static guint
-gtk_sort_list_model_get_n_items (GListModel *list)
-{
-  GtkSortListModel *self = GTK_SORT_LIST_MODEL (list);
-
-  if (self->model == NULL)
-    return 0;
-
-  if (self->sorted)
-    return g_sequence_get_length (self->sorted);
-
-  return g_list_model_get_n_items (self->model);
-}
-
-static gpointer
-gtk_sort_list_model_get_item (GListModel *list,
-                              guint       position)
-{
-  GtkSortListModel *self = GTK_SORT_LIST_MODEL (list);
-  GSequenceIter *iter;
-
-  if (self->model == NULL)
-    return NULL;
-
-  if (self->unsorted == NULL)
-    return g_list_model_get_item (self->model, position);
-
-  iter = g_sequence_get_iter_at_pos (self->sorted, position);
-  if (g_sequence_iter_is_end (iter))
-      return NULL;
-
-  return g_object_ref (g_sequence_get (iter));
-}
-
-static void
-gtk_sort_list_model_model_init (GListModelInterface *iface)
-{
-  iface->get_item_type = gtk_sort_list_model_get_item_type;
-  iface->get_n_items = gtk_sort_list_model_get_n_items;
-  iface->get_item = gtk_sort_list_model_get_item;
-}
-
-G_DEFINE_TYPE_WITH_CODE (GtkSortListModel, gtk_sort_list_model, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL, gtk_sort_list_model_model_init))
-
-static void
-gtk_sort_list_model_remove_items (GtkSortListModel *self,
-                                  guint             position,
-                                  guint             n_items,
-                                  guint            *unmodified_start,
-                                  guint            *unmodified_end)
-{
-  GSequenceIter *unsorted_iter;
-  guint i, pos, start, end, length_before;
-
-  start = end = length_before = g_sequence_get_length (self->sorted);
-  unsorted_iter = g_sequence_get_iter_at_pos (self->unsorted, position);
-
-  for (i = 0; i < n_items ; i++)
-    {
-      GSequenceIter *sorted_iter;
-      GSequenceIter *next;
-
-      next = g_sequence_iter_next (unsorted_iter);
-
-      sorted_iter = g_sequence_get (unsorted_iter);
-      pos = g_sequence_iter_get_position (sorted_iter);
-      start = MIN (start, pos);
-      end = MIN (end, length_before - i - 1 - pos);
-
-      g_sequence_remove (sorted_iter);
-      g_sequence_remove (unsorted_iter);
-
-      unsorted_iter = next;
-    }
-
-  *unmodified_start = start;
-  *unmodified_end = end;
-}
-
-static void
-gtk_sort_list_model_add_items (GtkSortListModel *self,
-                               guint             position,
-                               guint             n_items,
-                               guint            *unmodified_start,
-                               guint            *unmodified_end)
-{
-  GSequenceIter *unsorted_iter, *sorted_iter;
-  guint i, pos, start, end, length_before;
-
-  unsorted_iter = g_sequence_get_iter_at_pos (self->unsorted, position);
-  start = end = length_before = g_sequence_get_length (self->sorted);
-
-  for (i = 0; i < n_items; i++)
-    {
-      gpointer item = g_list_model_get_item (self->model, position + i);
-      sorted_iter = g_sequence_insert_sorted (self->sorted, item, self->sort_func, self->user_data);
-      g_sequence_insert_before (unsorted_iter, sorted_iter);
-      if (unmodified_start != NULL || unmodified_end != NULL)
-        {
-          pos = g_sequence_iter_get_position (sorted_iter);
-          start = MIN (start, pos);
-          end = MIN (end, length_before + i - pos);
-        }
-    }
-
-  if (unmodified_start)
-    *unmodified_start = start;
-  if (unmodified_end)
-    *unmodified_end = end;
-}
-
-static void
-gtk_sort_list_model_items_changed_cb (GListModel       *model,
-                                      guint             position,
-                                      guint             removed,
-                                      guint             added,
-                                      GtkSortListModel *self)
-{
-  guint n_items, start, end, start2, end2;
-
-  if (removed == 0 && added == 0)
-    return;
-
-  if (self->sorted == NULL)
-    {
-      g_list_model_items_changed (G_LIST_MODEL (self), position, removed, added);
-      return;
-    }
-
-  gtk_sort_list_model_remove_items (self, position, removed, &start, &end);
-  gtk_sort_list_model_add_items (self, position, added, &start2, &end2);
-  start = MIN (start, start2);
-  end = MIN (end, end2);
-
-  n_items = g_sequence_get_length (self->sorted) - start - end;
-  g_list_model_items_changed (G_LIST_MODEL (self), start, n_items - added + removed, n_items);
-}
-
-static void
-gtk_sort_list_model_set_property (GObject      *object,
-                                  guint         prop_id,
-                                  const GValue *value,
-                                  GParamSpec   *pspec)
-{
-  GtkSortListModel *self = GTK_SORT_LIST_MODEL (object);
-
-  switch (prop_id)
-    {
-    case PROP_ITEM_TYPE:
-      self->item_type = g_value_get_gtype (value);
-      break;
-
-    case PROP_MODEL:
-      gtk_sort_list_model_set_model (self, g_value_get_object (value));
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void 
-gtk_sort_list_model_get_property (GObject     *object,
-                                  guint        prop_id,
-                                  GValue      *value,
-                                  GParamSpec  *pspec)
-{
-  GtkSortListModel *self = GTK_SORT_LIST_MODEL (object);
-
-  switch (prop_id)
-    {
-    case PROP_HAS_SORT:
-      g_value_set_boolean (value, self->sort_func != NULL);
-      break;
-
-    case PROP_ITEM_TYPE:
-      g_value_set_gtype (value, self->item_type);
-      break;
-
-    case PROP_MODEL:
-      g_value_set_object (value, self->model);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-gtk_sort_list_model_clear_model (GtkSortListModel *self)
-{
-  if (self->model == NULL)
-    return;
-
-  g_signal_handlers_disconnect_by_func (self->model, gtk_sort_list_model_items_changed_cb, self);
-  g_clear_object (&self->model);
-  g_clear_pointer (&self->sorted, g_sequence_free);
-  g_clear_pointer (&self->unsorted, g_sequence_free);
-}
-
-static void
-gtk_sort_list_model_dispose (GObject *object)
-{
-  GtkSortListModel *self = GTK_SORT_LIST_MODEL (object);
-
-  gtk_sort_list_model_clear_model (self);
-  if (self->user_destroy)
-    self->user_destroy (self->user_data);
-  self->sort_func = NULL;
-  self->user_data = NULL;
-  self->user_destroy = NULL;
-
-  G_OBJECT_CLASS (gtk_sort_list_model_parent_class)->dispose (object);
-};
-
-static void
-gtk_sort_list_model_class_init (GtkSortListModelClass *class)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (class);
-
-  gobject_class->set_property = gtk_sort_list_model_set_property;
-  gobject_class->get_property = gtk_sort_list_model_get_property;
-  gobject_class->dispose = gtk_sort_list_model_dispose;
-
-  /**
-   * GtkSortListModel:has-sort:
-   *
-   * If a sort function is set for this model
-   */
-  properties[PROP_HAS_SORT] =
-      g_param_spec_boolean ("has-sort",
-                            P_("has sort"),
-                            P_("If a sort function is set for this model"),
-                            FALSE,
-                            GTK_PARAM_READABLE | G_PARAM_EXPLICIT_NOTIFY);
-
-  /**
-   * GtkSortListModel:item-type:
-   *
-   * The #GType for items of this model
-   */
-  properties[PROP_ITEM_TYPE] =
-      g_param_spec_gtype ("item-type",
-                          P_("Item type"),
-                          P_("The type of items of this list"),
-                          G_TYPE_OBJECT,
-                          GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_EXPLICIT_NOTIFY);
-
-  /**
-   * GtkSortListModel:model:
-   *
-   * The model being sorted
-   */
-  properties[PROP_MODEL] =
-      g_param_spec_object ("model",
-                           P_("Model"),
-                           P_("The model being sorted"),
-                           G_TYPE_LIST_MODEL,
-                           GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_EXPLICIT_NOTIFY);
-
-  g_object_class_install_properties (gobject_class, NUM_PROPERTIES, properties);
-}
-
-static void
-gtk_sort_list_model_init (GtkSortListModel *self)
-{
-}
-
-
-/**
- * gtk_sort_list_model_new:
- * @model: the model to sort
- * @sort_func: (allow-none): sort function or %NULL to not sort items
- * @user_data: user data passed to @sort_func
- * @user_destroy: destroy notifier for @user_data
- *
- * Creates a new sort list model that uses the @sort_func to sort @model.
- *
- * Returns: a new #GtkSortListModel
- **/
-GtkSortListModel *
-gtk_sort_list_model_new (GListModel       *model,
-                         GCompareDataFunc  sort_func,
-                         gpointer          user_data,
-                         GDestroyNotify    user_destroy)
-{
-  GtkSortListModel *result;
-
-  g_return_val_if_fail (G_IS_LIST_MODEL (model), NULL);
-
-  result = g_object_new (GTK_TYPE_SORT_LIST_MODEL,
-                         "item-type", g_list_model_get_item_type (model),
-                         "model", model,
-                         NULL);
-
-  if (sort_func)
-    gtk_sort_list_model_set_sort_func (result, sort_func, user_data, user_destroy);
-
-  return result;
-}
-
-/**
- * gtk_sort_list_model_new_for_type:
- * @item_type: the type of the items that will be returned
- *
- * Creates a new empty sort list model set up to return items of type @item_type.
- * It is up to the application to set a proper sort function and model to ensure
- * the item type is matched.
- *
- * Returns: a new #GtkSortListModel
- **/
-GtkSortListModel *
-gtk_sort_list_model_new_for_type (GType item_type)
-{
-  g_return_val_if_fail (g_type_is_a (item_type, G_TYPE_OBJECT), NULL);
-
-  return g_object_new (GTK_TYPE_SORT_LIST_MODEL,
-                       "item-type", item_type,
-                       NULL);
-}
-
-static void
-gtk_sort_list_model_create_sequences (GtkSortListModel *self)
-{
-  if (!self->sort_func || self->model == NULL)
-    return;
-
-  self->sorted = g_sequence_new (g_object_unref);
-  self->unsorted = g_sequence_new (NULL);
-
-  gtk_sort_list_model_add_items (self, 0, g_list_model_get_n_items (self->model), NULL, NULL);
-}
-
-/**
- * gtk_sort_list_model_set_sort_func:
- * @self: a #GtkSortListModel
- * @sort_func: (allow-none): sort function or %NULL to not sort items
- * @user_data: user data passed to @sort_func
- * @user_destroy: destroy notifier for @user_data
- *
- * Sets the function used to sort items. The function will be called for every
- * item and must return an integer less than, equal to, or greater than zero if
- * for two items from the model if the first item is considered to be respectively
- * less than, equal to, or greater than the second.
- **/
-void
-gtk_sort_list_model_set_sort_func (GtkSortListModel *self,
-                                   GCompareDataFunc  sort_func,
-                                   gpointer          user_data,
-                                   GDestroyNotify    user_destroy)
-{
-  guint n_items;
-
-  g_return_if_fail (GTK_IS_SORT_LIST_MODEL (self));
-  g_return_if_fail (sort_func != NULL || (user_data == NULL && !user_destroy));
-
-  if (!sort_func && !self->sort_func)
-    return;
-
-  if (self->user_destroy)
-    self->user_destroy (self->user_data);
-
-  g_clear_pointer (&self->unsorted, g_sequence_free);
-  g_clear_pointer (&self->sorted, g_sequence_free);
-  self->sort_func = sort_func;
-  self->user_data = user_data;
-  self->user_destroy = user_destroy;
-  
-    gtk_sort_list_model_create_sequences (self);
-    
-  n_items = g_list_model_get_n_items (G_LIST_MODEL (self));
-  if (n_items > 1)
-    g_list_model_items_changed (G_LIST_MODEL (self), 0, n_items, n_items);
-
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_HAS_SORT]);
-}
-
-/**
- * gtk_sort_list_model_set_model:
- * @self: a #GtkSortListModel
- * @model: (allow-none): The model to be sorted
- *
- * Sets the model to be sorted. The @model's item type must conform to
- * the item type of @self.
- **/
-void
-gtk_sort_list_model_set_model (GtkSortListModel *self,
-                               GListModel       *model)
-{
-  guint removed, added;
-
-  g_return_if_fail (GTK_IS_SORT_LIST_MODEL (self));
-  g_return_if_fail (model == NULL || G_IS_LIST_MODEL (model));
-  if (model)
-    {
-      g_return_if_fail (g_type_is_a (self->item_type, g_list_model_get_item_type (model)));
-    }
-
-  if (self->model == model)
-    return;
-
-  removed = g_list_model_get_n_items (G_LIST_MODEL (self));
-  gtk_sort_list_model_clear_model (self);
-
-  if (model)
-    {
-      self->model = g_object_ref (model);
-      g_signal_connect (model, "items-changed", G_CALLBACK (gtk_sort_list_model_items_changed_cb), self);
-      added = g_list_model_get_n_items (model);
-
-      gtk_sort_list_model_create_sequences (self);
-    }
-  else
-    added = 0;
-  
-  if (removed > 0 || added > 0)
-    g_list_model_items_changed (G_LIST_MODEL (self), 0, removed, added);
-
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_MODEL]);
-}
-
-/**
- * gtk_sort_list_model_get_model:
- * @self: a #GtkSortListModel
- *
- * Gets the model currently sorted or %NULL if none.
- *
- * Returns: (nullable) (transfer none): The model that gets sorted
- **/
-GListModel *
-gtk_sort_list_model_get_model (GtkSortListModel *self)
-{
-  g_return_val_if_fail (GTK_IS_SORT_LIST_MODEL (self), NULL);
-
-  return self->model;
-}
-
-/**
- * gtk_sort_list_model_has_sort:
- * @self: a #GtkSortListModel
- *
- * Checks if a sort function is currently set on @self
- *
- * Returns: %TRUE if a sort function is set
- **/
-gboolean
-gtk_sort_list_model_has_sort (GtkSortListModel *self)
-{
-  g_return_val_if_fail (GTK_IS_SORT_LIST_MODEL (self), FALSE);
-
-  return self->sort_func != NULL;
-}
-
-/**
- * gtk_sort_list_model_resort:
- * @self: a #GtkSortListModel
- *
- * Causes @self to resort all items in the model.
- *
- * Calling this function is necessary when data used by the sort
- * function has changed.
- **/
-void
-gtk_sort_list_model_resort (GtkSortListModel *self)
-{
-  guint n_items;
-
-  g_return_if_fail (GTK_IS_SORT_LIST_MODEL (self));
-  
-  if (self->sorted == NULL)
-    return;
-
-  n_items = g_list_model_get_n_items (self->model);
-  if (n_items <= 1)
-    return;
-
-  g_sequence_sort (self->sorted, self->sort_func, self->user_data);
-
-  g_list_model_items_changed (G_LIST_MODEL (self), 0, n_items, n_items);
-}
-
diff --git a/subprojects/gfm/gtksortlistmodel.h b/subprojects/gfm/gtksortlistmodel.h
deleted file mode 100644
index 460491b2..00000000
--- a/subprojects/gfm/gtksortlistmodel.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright © 2018 Benjamin Otte
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Benjamin Otte <otte@gnome.org>
- */
-
-#ifndef __GTK_SORT_LIST_MODEL_H__
-#define __GTK_SORT_LIST_MODEL_H__
-
-
-/*#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)*/
-/*#error "Only <gtk/gtk.h> can be included directly."*/
-/*#endif*/
-
-#include <gio/gio.h>
-#include <gtk/gtkwidget.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_SORT_LIST_MODEL (gtk_sort_list_model_get_type ())
-#define GTK_PARAM_READABLE G_PARAM_READABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
-#define GTK_PARAM_WRITABLE G_PARAM_WRITABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
-#define GTK_PARAM_READWRITE G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
-
-GDK_AVAILABLE_IN_ALL
-G_DECLARE_FINAL_TYPE (GtkSortListModel, gtk_sort_list_model, GTK, SORT_LIST_MODEL, GObject)
-
-GDK_AVAILABLE_IN_ALL
-GtkSortListModel *      gtk_sort_list_model_new                 (GListModel             *model,
-                                                                 GCompareDataFunc        sort_func,
-                                                                 gpointer                user_data,
-                                                                 GDestroyNotify          user_destroy);
-GDK_AVAILABLE_IN_ALL
-GtkSortListModel *      gtk_sort_list_model_new_for_type        (GType                   item_type);
-
-GDK_AVAILABLE_IN_ALL
-void                    gtk_sort_list_model_set_sort_func       (GtkSortListModel       *self,
-                                                                 GCompareDataFunc        sort_func,
-                                                                 gpointer                user_data,
-                                                                 GDestroyNotify          user_destroy);
-GDK_AVAILABLE_IN_ALL
-gboolean                gtk_sort_list_model_has_sort            (GtkSortListModel       *self);
-GDK_AVAILABLE_IN_ALL
-void                    gtk_sort_list_model_set_model           (GtkSortListModel       *self,
-                                                                 GListModel             *model);
-GDK_AVAILABLE_IN_ALL
-GListModel *            gtk_sort_list_model_get_model           (GtkSortListModel       *self);
-
-GDK_AVAILABLE_IN_ALL
-void                    gtk_sort_list_model_resort              (GtkSortListModel       *self);
-
-G_END_DECLS
-
-#endif /* __GTK_SORT_LIST_MODEL_H__ */
diff --git a/subprojects/gfm/meson.build b/subprojects/gfm/meson.build
deleted file mode 100644
index ab93f9cf..00000000
--- a/subprojects/gfm/meson.build
+++ /dev/null
@@ -1,85 +0,0 @@
-project('gfm', 'c',
-  meson_version: '>= 0.38.0',
-)
-
-c_args = []
-gnome = import('gnome')
-
-if not meson.is_subproject()
- message('WARNING: This project is only intended to be used as a subproject!')
-endif
-
-api_version = '0.1'
-
-gfm_sources = [
-  'gtkfilterlistmodel.c',
-  'gtkflattenlistmodel.c',
-  'gtkslicelistmodel.c',
-  'gtksortlistmodel.c',
-  'gtkrbtree.c',
-]
-
-gfm_headers = [
-  'gtkfilterlistmodel.h',
-  'gtkflattenlistmodel.h',
-  'gtkslicelistmodel.h',
-  'gtksortlistmodel.h',
-  'gtkrbtreeprivate.h',
-  'gtkintl.h',
-]
-
-gfm_introspection_headers = [
-  'gtkfilterlistmodel.h',
-  'gtkflattenlistmodel.h',
-  'gtkslicelistmodel.h',
-  'gtksortlistmodel.h',
-]
-
-pkglibdir = get_option('pkglibdir')
-pkgdatadir = get_option('pkgdatadir')
-pkggirdir = join_paths(pkgdatadir, 'gir-1.0')
-pkgtypelibdir = join_paths(pkglibdir, 'girepository-1.0')
-
-gfm_header_subdir = '.'
-gfm_header_dir = join_paths(get_option('includedir'), gfm_header_subdir)
-
-cc = meson.get_compiler('c')
-
-gfm_deps = [
-  dependency('gio-2.0', version: '>= 2.50'),
-  dependency('gtk+-3.0'),
-]
-
-gfm_lib = shared_library('gfm-' + api_version,
-  gfm_sources,
-  dependencies: gfm_deps,
-  c_args: ['-DGETTEXT_PACKAGE', '-DGTK_COMPILATION '],
-  install: true,
-  install_dir: pkglibdir
-)
-
-gfm_gir = gnome.generate_gir(gfm_lib,
-  sources: gfm_sources + gfm_introspection_headers,
-  nsversion: api_version,
-  namespace: 'Gfm',
-  symbol_prefix: 'gtk',
-  extra_args: ['-DGETTEXT_PACKAGE', '-DGTK_COMPILATION '],
-  identifier_prefix: 'Gtk',
-  link_with: gfm_lib,
-  includes: ['Gio-2.0', 'Gtk-3.0'],
-  install: true,
-  install_dir_gir: pkggirdir,
-  install_dir_typelib: pkgtypelibdir,
-)
-
-pkg = import('pkgconfig')
-
-pkg.generate(
-  description: 'A shared library backporting a few GTK4 listmodels to GTK3',
-    libraries: gfm_lib,
-         name: 'gfm',
-     filebase: 'gfm-' + api_version,
-      version: meson.project_version(),
-     requires: 'glib-2.0',
-  install_dir: join_paths(pkglibdir, 'pkgconfig')
-)
diff --git a/subprojects/gfm/meson_options.txt b/subprojects/gfm/meson_options.txt
deleted file mode 100644
index 7abaf8b9..00000000
--- a/subprojects/gfm/meson_options.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-option('pkglibdir', type: 'string', value: '',
-  description: 'The private directory the shared library/typelib will be installed into.'
-)
-option('pkgdatadir', type: 'string', value: '',
-  description: 'The private directory the gir file will be installed into.'
-)
diff --git a/subprojects/shared-modules/CODEOWNERS b/subprojects/shared-modules/CODEOWNERS
index d8841d17..864e266c 100644
--- a/subprojects/shared-modules/CODEOWNERS
+++ b/subprojects/shared-modules/CODEOWNERS
@@ -2,10 +2,20 @@
 *                  @flathub/reviewers
 
 /dbus-glib/        @TingPing
+/clutter/          @A6GibKm
 /gtk2/             @TingPing
 /gudev/            @Erick555
 /intltool/         @TingPing
 /libappindicator/  @TingPing
+/libcanberra/      @hadess
 /libsecret/        @Lctrs
-/openjpeg/         @bochecha
+/libusb/           @A6GibKm
+/openjpeg/         @mbridon
+/physfs/           @Mailaender
 /python2.7/        @bilelmoussaoui
+/linux-audio/      @hfiguiere
+/lua5.1/           @Unrud
+/mac/              @enzo1982 @Eonfge
+/pygtk/            @Eonfge
+/gzdoom/           @Eonfge
+/vorbisgain/       @Eonfge
diff --git a/subprojects/shared-modules/README.md b/subprojects/shared-modules/README.md
index 5a0ec035..cde47075 100644
--- a/subprojects/shared-modules/README.md
+++ b/subprojects/shared-modules/README.md
@@ -23,6 +23,15 @@ To update the submodule:
 git submodule update --remote --merge
 ```
 
+To remove the submodule:
+
+```
+git submodule deinit -f -- shared-modules
+rm -rf .git/modules/shared-modules
+git rm -f shared-modules
+rm .gitmodules
+```
+
 
 [See the description in the Flathub wiki](https://github.com/flathub/flathub/wiki/App-Requirements#shared-modules) for more information.
 
diff --git a/subprojects/shared-modules/SDL/SDL_ttf-2.0.11.json b/subprojects/shared-modules/SDL/SDL_ttf-2.0.11.json
index 5e928e46..c5a04d51 100644
--- a/subprojects/shared-modules/SDL/SDL_ttf-2.0.11.json
+++ b/subprojects/shared-modules/SDL/SDL_ttf-2.0.11.json
@@ -2,6 +2,9 @@
     "name": "SDL_ttf",
     "config-opts": ["--disable-static"],
     "rm-configure": true,
+    "config-opts": [
+        "ac_cv_path_FREETYPE_CONFIG=pkg-config freetype2"
+    ],
     "sources": [
         {
             "type": "archive",
diff --git a/subprojects/shared-modules/SDL/sdl12-compat.json b/subprojects/shared-modules/SDL/sdl12-compat.json
new file mode 100644
index 00000000..c0227763
--- /dev/null
+++ b/subprojects/shared-modules/SDL/sdl12-compat.json
@@ -0,0 +1,14 @@
+{
+    "name": "sdl12-compat",
+    "buildsystem": "cmake-ninja",
+    "cleanup": [
+      "bin/sdl-config"
+    ],
+    "sources": [
+        {
+            "type": "archive",
+            "url": "https://github.com/libsdl-org/sdl12-compat/archive/refs/tags/release-1.2.52.tar.gz",
+            "sha256": "5bd7942703575554670a8767ae030f7921a0ac3c5e2fd173a537b7c7a8599014"
+        }
+    ]
+}
diff --git a/subprojects/shared-modules/clutter/clutter.json b/subprojects/shared-modules/clutter/clutter.json
new file mode 100644
index 00000000..a47b207d
--- /dev/null
+++ b/subprojects/shared-modules/clutter/clutter.json
@@ -0,0 +1,69 @@
+{
+    "name": "clutter-gtk",
+    "cleanup": [
+        "/share/gtk-doc"
+    ],
+    "sources": [
+        {
+            "type": "archive",
+            "url": "https://download.gnome.org/sources/clutter-gtk/1.8/clutter-gtk-1.8.4.tar.xz",
+            "sha256": "521493ec038973c77edcb8bc5eac23eed41645117894aaee7300b2487cb42b06"
+        }
+    ],
+    "modules": [
+        {
+            "name": "cogl",
+            "config-opts": [
+                "--disable-cogl-gst",
+                "--disable-gtk-doc",
+                "--enable-xlib-egl-platform",
+                "--enable-wayland-egl-platform"
+            ],
+            "cleanup": [
+                "/share/gtk-doc",
+                "/share/cogl/examples-data"
+            ],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://download.gnome.org/sources/cogl/1.22/cogl-1.22.8.tar.xz",
+                    "sha256": "a805b2b019184710ff53d0496f9f0ce6dcca420c141a0f4f6fcc02131581d759"
+                }
+            ]
+        },
+        {
+            "name": "clutter",
+            "config-opts": [
+                "--disable-gtk-doc",
+                "--enable-egl-backend",
+                "--enable-wayland-backend"
+            ],
+            "cleanup": [
+                "/share/gtk-doc"
+            ],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://download.gnome.org/sources/clutter/1.26/clutter-1.26.4.tar.xz",
+                    "sha256": "8b48fac159843f556d0a6be3dbfc6b083fc6d9c58a20a49a6b4919ab4263c4e6"
+                }
+            ]
+        },
+        {
+            "name": "clutter-gst",
+            "config-opts": [
+                "--disable-gtk-doc"
+            ],
+            "cleanup": [
+                "/share/gtk-doc"
+            ],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://download.gnome.org/sources/clutter-gst/3.0/clutter-gst-3.0.27.tar.xz",
+                    "sha256": "fe69bd6c659d24ab30da3f091eb91cd1970026d431179b0724f13791e8ad9f9d"
+                }
+            ]
+        }
+    ]
+}
diff --git a/subprojects/shared-modules/dbus-glib/dbus-glib-0.110.json b/subprojects/shared-modules/dbus-glib/dbus-glib.json
index 73ffd084..f8b90905 100644
--- a/subprojects/shared-modules/dbus-glib/dbus-glib-0.110.json
+++ b/subprojects/shared-modules/dbus-glib/dbus-glib.json
@@ -16,8 +16,8 @@
     "sources": [
         {
             "type": "archive",
-            "url": "https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.110.tar.gz",
-            "sha256": "7ce4760cf66c69148f6bd6c92feaabb8812dee30846b24cd0f7395c436d7e825"
+            "url": "https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.112.tar.gz",
+            "sha256": "7d550dccdfcd286e33895501829ed971eeb65c614e73aadb4a08aeef719b143a"
         }
     ]
 }
diff --git a/subprojects/shared-modules/glew/glew.json b/subprojects/shared-modules/glew/glew.json
index 6ec15bf7..ae326a23 100644
--- a/subprojects/shared-modules/glew/glew.json
+++ b/subprojects/shared-modules/glew/glew.json
@@ -2,20 +2,24 @@
         "name": "glew",
         "no-autogen": true,
         "make-args": [
-                "GLEW_PREFIX=/app",
-                "GLEW_DEST=/app",
-                "LIBDIR=/app/lib"
+                "GLEW_PREFIX=${FLATPAK_DEST}",
+                "GLEW_DEST=${FLATPAK_DEST}",
+                "LIBDIR=${FLATPAK_DEST}/lib",
+                "CFLAGS.EXTRA:=${CFLAGS} -fPIC",
+                "LDFLAGS.EXTRA=${LDFLAGS}"
         ],
         "make-install-args": [
-                "GLEW_PREFIX=/app",
-                "GLEW_DEST=/app",
-                "LIBDIR=/app/lib"
+                "GLEW_PREFIX=${FLATPAK_DEST}",
+                "GLEW_DEST=${FLATPAK_DEST}",
+                "LIBDIR=${FLATPAK_DEST}/lib",
+                "CFLAGS.EXTRA:=${CFLAGS} -fPIC",
+                "LDFLAGS.EXTRA=${LDFLAGS}"
         ],
         "sources": [
                 {
                         "type": "archive",
-                        "url": "https://downloads.sourceforge.net/project/glew/glew/2.1.0/glew-2.1.0.tgz",
-                        "sha256": "04de91e7e6763039bc11940095cd9c7f880baba82196a7765f727ac05a993c95"
+                        "url": "https://downloads.sourceforge.net/project/glew/glew/2.2.0/glew-2.2.0.tgz",
+                        "sha256": "d4fc82893cfb00109578d0a1a2337fb8ca335b3ceccf97b97e5cc7f08e4353e1"
                 }
         ],
         "cleanup": [
diff --git a/subprojects/shared-modules/glu/glu-9.json b/subprojects/shared-modules/glu/glu-9.json
index d14e2219..2dfb70b4 100644
--- a/subprojects/shared-modules/glu/glu-9.json
+++ b/subprojects/shared-modules/glu/glu-9.json
@@ -4,8 +4,8 @@
   "sources": [
     {
       "type": "archive",
-      "url": "https://mesa.freedesktop.org/archive/glu/glu-9.0.1.tar.xz",
-      "sha256": "fb5a4c2dd6ba6d1c21ab7c05129b0769544e1d68e1e3b0ffecb18e73c93055bc"
+      "url": "https://mesa.freedesktop.org/archive/glu/glu-9.0.2.tar.xz",
+      "sha256": "6e7280ff585c6a1d9dfcdf2fca489251634b3377bfc33c29e4002466a38d02d4"
     }
   ],
   "cleanup": [ "/include", "/lib/*.a", "/lib/*.la", "/lib/pkgconfig" ]
diff --git a/subprojects/shared-modules/gtk2/arc-gtk2-theme-Replace-Inkscape-dependency-with-rsvg-convert.patch b/subprojects/shared-modules/gtk2/arc-gtk2-theme-Replace-Inkscape-dependency-with-rsvg-convert.patch
new file mode 100644
index 00000000..90e09509
--- /dev/null
+++ b/subprojects/shared-modules/gtk2/arc-gtk2-theme-Replace-Inkscape-dependency-with-rsvg-convert.patch
@@ -0,0 +1,180 @@
+From d5e0034183564df5fec8e4dde1705116c7b38021 Mon Sep 17 00:00:00 2001
+From: Patrick Griffis <tingping@tingping.se>
+Date: Sat, 16 May 2020 18:00:36 -0700
+Subject: [PATCH] Replace Inkscape dependency with rsvg-convert
+
+rsvg-convert is a *much* smaller dependency that all systems with
+a functioning GTK installation should have easy access to.
+---
+ common/gtk-2.0/Makefile.am     |  6 +-----
+ common/gtk-2.0/render-asset.sh | 16 ++++++++--------
+ common/gtk-3.0/common.am       | 12 ++----------
+ common/xfwm4/Makefile.am       |  6 +-----
+ common/xfwm4/render-asset.sh   | 16 ++++++++--------
+ configure.ac                   |  8 ++------
+ 6 files changed, 22 insertions(+), 42 deletions(-)
+
+diff --git a/common/gtk-2.0/Makefile.am b/common/gtk-2.0/Makefile.am
+index 010823a..873013a 100644
+--- a/common/gtk-2.0/Makefile.am
++++ b/common/gtk-2.0/Makefile.am
+@@ -35,11 +35,7 @@ $(light): $(srcdir)/light/assets.svg | light/assets
+ $(dark): $(srcdir)/dark/assets.svg | dark/assets
+ 
+ $(light) $(dark):
+-if INKSCAPE_1_0_OR_NEWER
+-	$(INKSCAPE) --export-id-only --export-filename="$@" --export-id="$(basename $(notdir $@))" --export-dpi=$(if $(filter $(OPTION_GTK2_HIDPI),true),192,96) "$<" >/dev/null
+-else !INKSCAPE_1_0_OR_NEWER
+-	$(INKSCAPE) --export-id-only --export-png="$@" --export-id="$(basename $(notdir $@))" --export-dpi=$(if $(filter $(OPTION_GTK2_HIDPI),true),192,96) "$<" >/dev/null
+-endif
++	$(RSVG_CONVERT) --format=png --output="$@" --export-id="$(basename $(notdir $@))" --dpi-x=$(if $(filter $(OPTION_GTK2_HIDPI),true),192,96) --dpi-y=$(if $(filter $(OPTION_GTK2_HIDPI),true),192,96) "$<" >/dev/null
+ 	$(OPTIPNG) -o7 --quiet "$@"
+ 
+ menubar-toolbar/%-dark.png: dark/assets/%.png | menubar-toolbar
+diff --git a/common/gtk-2.0/render-asset.sh b/common/gtk-2.0/render-asset.sh
+index 6685414..f6198af 100755
+--- a/common/gtk-2.0/render-asset.sh
++++ b/common/gtk-2.0/render-asset.sh
+@@ -1,7 +1,7 @@
+ #!/bin/bash
+ set -ueo pipefail
+ 
+-INKSCAPE="$(which inkscape)"
++RSVG_CONVERT="$(which rsvg-convert)"
+ OPTIPNG="$(which optipng)"
+ 
+ ASSETS_DIR="$1"
+@@ -14,9 +14,9 @@ if [[ -f "${result_file}" ]] ; then
+ 	echo "${result_file} already exists."
+ else
+ 	echo "Rendering '${result_file}'"
+-	"$INKSCAPE" --export-id="$i" \
+-				--export-id-only \
+-				--export-png="${result_file}" "$SRC_FILE" >/dev/null \
++	"$RSVG_CONVERT" --export-id="$i" \
++                        --format=png
++                        --output="${result_file}" "$SRC_FILE" >/dev/null \
+ 	&& "$OPTIPNG" -o7 --quiet "${result_file}"
+ fi
+ 
+@@ -26,10 +26,10 @@ if [[ "$OPTION_GTK2_HIDPI" == "true" ]]; then
+ 		echo "${result_file_hidpi} already exists."
+ 	else
+ 		echo "Rendering '${result_file_hidpi}'"
+-		"$INKSCAPE" --export-id="$i" \
+-					--export-id-only \
+-					--export-dpi=192 \
+-					--export-png="${result_file_hidpi}" "$SRC_FILE" >/dev/null \
++		"$RSVG_CONVERT" --export-id="$i" \
++				--dpi-x=192 --dpi-y=192 \
++				--format=png
++			        --output="${result_file_hidpi}" "$SRC_FILE" >/dev/null \
+ 		&& "$OPTIPNG" -o7 --quiet "${result_file_hidpi}"
+ 	fi
+ fi
+diff --git a/common/gtk-3.0/common.am b/common/gtk-3.0/common.am
+index a93d01d..9e4b102 100644
+--- a/common/gtk-3.0/common.am
++++ b/common/gtk-3.0/common.am
+@@ -14,19 +14,11 @@ clean:
+ 	rm -rf assets/ light/ dark/ darker/ lighter/
+ 
+ $(normal): $(srcdir)/assets.svg | assets
+-if INKSCAPE_1_0_OR_NEWER
+-	$(INKSCAPE) --export-id-only --export-filename="$@" --export-id="$(basename $(notdir $@))" --export-dpi=96 "$<" >/dev/null
+-else !INKSCAPE_1_0_OR_NEWER
+-	$(INKSCAPE) --export-id-only --export-png="$@" --export-id="$(basename $(notdir $@))" --export-dpi=96 "$<" >/dev/null
+-endif
++	$(RSVG_CONVERT) --format=png --output="$@" --export-id="$(basename $(notdir $@))" --dpi-y=96 --dpi-x=96 "$<" >/dev/null
+ 	$(OPTIPNG) -o7 --quiet "$@"
+ 
+ $(hidpi): $(srcdir)/assets.svg | assets
+-if INKSCAPE_1_0_OR_NEWER
+-	$(INKSCAPE) --export-id-only --export-filename="$@" --export-id="$(patsubst %@2,%,$(basename $(notdir $@)))" --export-dpi=192 "$<" >/dev/null
+-else !INKSCAPE_1_0_OR_NEWER
+-	$(INKSCAPE) --export-id-only --export-png="$@" --export-id="$(patsubst %@2,%,$(basename $(notdir $@)))" --export-dpi=192 "$<" >/dev/null
+-endif
++	$(RSVG_CONVERT) --format=png --output="$@" --export-id="$(patsubst %@2,%,$(basename $(notdir $@)))" --dpi-y=192 --dpi-x=192 "$<" >/dev/null
+ 	$(OPTIPNG) -o7 --quiet "$@"
+ 
+ .PHONY: normal hidpi clean
+diff --git a/common/xfwm4/Makefile.am b/common/xfwm4/Makefile.am
+index e5fbdc5..1f21183 100644
+--- a/common/xfwm4/Makefile.am
++++ b/common/xfwm4/Makefile.am
+@@ -17,11 +17,7 @@ $(light): $(srcdir)/light/assets.svg | light/assets
+ $(dark): $(srcdir)/dark/assets.svg | dark/assets
+ 
+ $(light) $(dark):
+-if INKSCAPE_1_0_OR_NEWER
+-	$(INKSCAPE) --export-id-only --export-filename="$@" --export-id="$(basename $(notdir $@))" --export-dpi=$(if $(filter $(OPTION_GTK2_HIDPI),true),192,96) "$<" >/dev/null
+-else !INKSCAPE_1_0_OR_NEWER
+-	$(INKSCAPE) --export-id-only --export-png="$@" --export-id="$(basename $(notdir $@))" --export-dpi=$(if $(filter $(OPTION_GTK2_HIDPI),true),192,96) "$<" >/dev/null
+-endif
++	$(RSVG_CONVERT) --format=png --output="$@" --export-id="$(basename $(notdir $@))" --dpi-y=$(if $(filter $(OPTION_GTK2_HIDPI),true),192,96) --dpi-x=$(if $(filter $(OPTION_GTK2_HIDPI),true),192,96) "$<" >/dev/null
+ 	$(OPTIPNG) -o7 --quiet "$@"
+ 
+ .PHONY: light dark clean
+diff --git a/common/xfwm4/render-asset.sh b/common/xfwm4/render-asset.sh
+index 6685414..f6198af 100755
+--- a/common/xfwm4/render-asset.sh
++++ b/common/xfwm4/render-asset.sh
+@@ -1,7 +1,7 @@
+ #!/bin/bash
+ set -ueo pipefail
+ 
+-INKSCAPE="$(which inkscape)"
++RSVG_CONVERT="$(which rsvg-convert)"
+ OPTIPNG="$(which optipng)"
+ 
+ ASSETS_DIR="$1"
+@@ -14,9 +14,9 @@ if [[ -f "${result_file}" ]] ; then
+ 	echo "${result_file} already exists."
+ else
+ 	echo "Rendering '${result_file}'"
+-	"$INKSCAPE" --export-id="$i" \
+-				--export-id-only \
+-				--export-png="${result_file}" "$SRC_FILE" >/dev/null \
++	"$RSVG_CONVERT" --export-id="$i" \
++                        --format=png
++                        --output="${result_file}" "$SRC_FILE" >/dev/null \
+ 	&& "$OPTIPNG" -o7 --quiet "${result_file}"
+ fi
+ 
+@@ -26,10 +26,10 @@ if [[ "$OPTION_GTK2_HIDPI" == "true" ]]; then
+ 		echo "${result_file_hidpi} already exists."
+ 	else
+ 		echo "Rendering '${result_file_hidpi}'"
+-		"$INKSCAPE" --export-id="$i" \
+-					--export-id-only \
+-					--export-dpi=192 \
+-					--export-png="${result_file_hidpi}" "$SRC_FILE" >/dev/null \
++		"$RSVG_CONVERT" --export-id="$i" \
++				--dpi-x=192 --dpi-y=192 \
++				--format=png
++			        --output="${result_file_hidpi}" "$SRC_FILE" >/dev/null \
+ 		&& "$OPTIPNG" -o7 --quiet "${result_file_hidpi}"
+ 	fi
+ fi
+diff --git a/configure.ac b/configure.ac
+index f0725f1..1a52cc7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -48,12 +48,8 @@ AM_CONDITIONAL([GNOME_SHELL_3_32_OR_NEWER], [test "0$GNOME_SHELL_VERSMNR" -ge 31
+ AS_IF([test "x$ENABLE_CINNAMON" != xno], [ARC_CINNAMON])
+ 
+ AS_IF([test "x$ENABLE_GTK2" != xno -o "x$ENABLE_GTK3" != xno -o "x$ENABLE_XFWM" != xno], [
+-    AC_PATH_PROG([INKSCAPE], [inkscape])
+-    AS_IF([test "x$ac_cv_path_INKSCAPE" = x], [AC_MSG_ERROR([inkscape not found])])
+-    AS_IF([test "x$ac_cv_path_INKSCAPE" != x],
+-        [INKSCAPE_VERSMJR=`inkscape --version 2> /dev/null | cut -d' ' -f2 | cut -d'.' -f1`]
+-        AM_CONDITIONAL([INKSCAPE_1_0_OR_NEWER], [test "x$INKSCAPE_VERSMJR" = x1])
+-    )
++    AC_PATH_PROG([RSVG_CONVERT], [rsvg-convert])
++    AS_IF([test "x$ac_cv_path_RSVG_CONVERT" = x], [AC_MSG_ERROR([rsvg-convert not found])])
+     AC_PATH_PROG([OPTIPNG], [optipng])
+     AS_IF([test "x$ac_cv_path_OPTIPNG" = x], [AC_MSG_ERROR([optipng not found])])
+ ])
+-- 
+2.26.0
+
diff --git a/subprojects/shared-modules/gtk2/gtk2-common-themes.json b/subprojects/shared-modules/gtk2/gtk2-common-themes.json
new file mode 100644
index 00000000..5f4f791d
--- /dev/null
+++ b/subprojects/shared-modules/gtk2/gtk2-common-themes.json
@@ -0,0 +1,250 @@
+{
+  "name": "gtk2-common-themes",
+  "buildsystem": "simple",
+  "build-commands": [],
+  "modules": [
+    {
+      "name": "sassc",
+      "// NOTE": "This is used by Yaru, Greybird, and Materia",
+      "cleanup": ["*"],
+      "sources": [
+        {
+          "type": "archive",
+          "url": "https://github.com/sass/sassc/archive/3.5.0.tar.gz",
+          "sha256": "26f54e31924b83dd706bc77df5f8f5553a84d51365f0e3c566df8de027918042"
+        },
+        {
+          "type": "script",
+          "commands": ["autoreconf -si"]
+        }
+      ],
+      "modules": [
+        {
+          "name": "libsass",
+          "cleanup": ["*"],
+          "sources": [
+            {
+              "type": "archive",
+              "url": "https://github.com/sass/libsass/archive/3.5.4.tar.gz",
+              "sha256": "5f61cbcddaf8e6ef7a725fcfa5d05297becd7843960f245197ebb655ff868770"
+            },
+            {
+              "type": "script",
+              "commands": ["autoreconf -si"]
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name": "gtk2-murrine-engine",
+      "rm-configure": true,
+      "// NOTE": "Used by Arc and CrosAdapta",
+      "cleanup": [
+        "*.la"
+      ],
+      "sources": [
+        {
+          "type": "archive",
+          "url": "https://download.gnome.org/sources/murrine/0.98/murrine-0.98.2.tar.xz",
+          "sha256": "e9c68ae001b9130d0f9d1b311e8121a94e5c134b82553ba03971088e57d12c89"
+        },
+        {
+          "type": "patch",
+          "path": "murrine-engine-fix-crash.patch"
+        },
+        {
+          "type": "script",
+          "commands": [
+            "rm config.guess",
+            "autoreconf -si"
+          ]
+        }
+      ]
+    },
+    {
+      "name": "cros-adapta-gtk2-theme",
+      "// NOTE": "This is used by Chrome OS",
+      "buildsystem": "simple",
+      "build-commands": [
+        "install -Dm644 index.theme ${FLATPAK_DEST}/share/themes/CrosAdapta/index.theme",
+        "cp -r gtk-2.0 ${FLATPAK_DEST}/share/themes/CrosAdapta"
+      ],
+      "sources": [
+        {
+          "type": "git",
+          "url": "https://chromium.googlesource.com/chromiumos/third_party/cros-adapta",
+          "commit": "eb6d8c1832b9181926df107faf41a80887fd982c"
+        }
+      ]
+    },
+    {
+      "name": "arc-gtk2-theme",
+      "// NOTE": "This is used by Solus and is popular",
+      "// FIXME": "This has a dependency on inkscape and my patch isn't quite good enough sadly",
+      "disabled": true,
+      "config-opts": [
+        "--disable-gnome-shell",
+        "--disable-cinnamon",
+        "--disable-gtk3",
+        "--disable-metacity",
+        "--disable-xfwm",
+        "--disable-plank",
+        "--disable-openbox",
+        "--disable-unity"
+      ],
+      "sources": [
+        {
+          "type": "archive",
+          "url": "https://github.com/jnsh/arc-theme/releases/download/20200513/arc-theme-20200513.tar.xz",
+          "sha256": "cd268b878d6ad7c81b7acc0f89b66e26ee9a9a92eafb03b792318d51707f1962"
+        },
+        {
+          "type": "patch",
+          "path": "arc-gtk2-theme-Replace-Inkscape-dependency-with-rsvg-convert.patch"
+        },
+        {
+          "type": "shell",
+          "commands": ["sed -i 's|\"$srcdir/configure\" $@||' autogen.sh"]
+        }
+      ],
+      "modules": [
+        {
+          "name": "optipng",
+          "cleanup": ["*"],
+          "sources": [
+            {
+              "type": "archive",
+              "url": "https://prdownloads.sourceforge.net/optipng/optipng-0.7.7.tar.gz",
+              "sha256": "4f32f233cef870b3f95d3ad6428bfe4224ef34908f1b42b0badf858216654452"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name": "breeze-gtk2-theme",
+      "// NOTE": "This is used by some KDE distros",
+      "// FIXME": "This is disabled because breeze depends on KDecoration/Qt5...",
+      "disabled": true,
+      "buildsystem": "cmake-ninja",
+      "sources": [
+        {
+          "type": "archive",
+          "url": "https://github.com/KDE/breeze-gtk/archive/v5.18.90.tar.gz",
+          "sha256": "73ff1fee8afb2fc498075d1693a664f6a749b763606d4548f74e225983107730"
+        }
+      ],
+      "modules": [
+        {
+          "name": "extra-cmake-modules",
+          "buildsystem": "cmake-ninja",
+          "cleanup": ["*"],
+          "sources": [
+            {
+              "type": "archive",
+              "url": "https://github.com/KDE/extra-cmake-modules/archive/v5.70.0.tar.gz",
+              "sha256": "0e6d0694b2372cbdbc9e64abcaaac21196a15355b360e02e2e833885ae0c62f2"
+            }
+          ]
+        },
+        {
+          "name": "breeze",
+          "buildsystem": "cmake-ninja",
+          "cleanup": ["*"],
+          "sources": [
+            {
+              "type": "archive",
+              "url": "https://github.com/KDE/breeze/archive/v5.18.90.tar.gz",
+              "sha256": "55e42656601dd79db1bc40589764606ec203c7f99c84340deed6e3847a4fdaf6"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name": "elementary-gtk2-theme",
+      "// NOTE": "This is used by Elementary OS",
+      "buildsystem": "meson",
+      "cleanup": [
+        "/share/themes/elementary/gtk-3.0",
+        "/share/themes/elementary/plank",
+        "/share/plank"
+      ],
+      "sources": [
+        {
+          "type": "archive",
+          "url": "https://github.com/elementary/stylesheet/archive/5.4.2.tar.gz",
+          "sha256": "3bc37723daf4ce0b7c9ce4c125ef0055affe8d6654981388ec87d4a23a1ae0ec"
+        }
+      ]
+    },
+    {
+      "name": "yaru-gtk2-theme",
+      "// NOTE": "This is used by Ubuntu",
+      "buildsystem": "meson",
+      "config-opts": [
+        "-Dicons=false",
+        "-Dsounds=false",
+        "-Dgnome-shell=false",
+        "-Dsessions=false"
+      ],
+      "cleanup": [
+        "/share/themes/Yaru*/gtk-3.0",
+        "/share/themes/Yaru*/gtk-3.20",
+        "/share/themes/Yaru*/unity"
+      ],
+      "sources": [
+        {
+          "type": "archive",
+          "url": "https://github.com/ubuntu/yaru/archive/20.10.1.tar.gz",
+          "sha256": "9da2605088674edf2694a8215b7344fb5209b308dd8220ea21667a914dc8c55d"
+        }
+      ]
+    },
+    {
+      "name": "greybird-gtk2-theme",
+      "// NOTE": "This is used by many XFCE distros",
+      "buildsystem": "meson",
+      "cleanup": [
+        "/share/themes/Greybird*/xfwm4",
+        "/share/themes/Greybird*/gnome-shell",
+        "/share/themes/Greybird*/gtk-3.0",
+        "/share/themes/Greybird*/metacity-1",
+        "/share/themes/Greybird*/xfce-notify-4.0",
+        "/share/themes/Greybird*/plank",
+        "/share/themes/Greybird*/unity",
+        "/share/themes/Greybird*/*.emerald"
+      ],
+      "sources": [
+        {
+          "type": "archive",
+          "url": "https://github.com/shimmerproject/Greybird/archive/v3.22.12.tar.gz",
+          "sha256": "410804cd5daca33cbc5c7c4a179f3a334ced87f408e515fc5d9c083a04bec4bc"
+        }
+      ]
+    },
+    {
+      "name": "materia-gtk2-theme",
+      "// NOTE": "This is used by Ubuntu Studio",
+      "buildsystem": "meson",
+      "cleanup": [
+        "/share/themes/Materia*/xfwm4",
+        "/share/themes/Materia*/gnome-shell",
+        "/share/themes/Materia*/gtk-3.0",
+        "/share/themes/Materia*/metacity-1",
+        "/share/themes/Materia*/cinnamon",
+        "/share/themes/Materia*/chrome",
+        "/share/themes/Materia*/plank",
+        "/share/themes/Materia*/unity"
+      ],
+      "sources": [
+        {
+          "type": "git",
+          "url": "https://github.com/nana-4/materia-theme.git",
+          "commit": "b36b379c9256b67e5f63a60c6faf6912f1845b66"
+        }
+      ]
+    }
+  ]
+}
diff --git a/subprojects/shared-modules/gtk2/gtk2-fix-crash-in-show-uri.patch b/subprojects/shared-modules/gtk2/gtk2-fix-crash-in-show-uri.patch
new file mode 100644
index 00000000..27b27300
--- /dev/null
+++ b/subprojects/shared-modules/gtk2/gtk2-fix-crash-in-show-uri.patch
@@ -0,0 +1,30 @@
+From 536da7a15c1737bc63c8ecba5ccac40cc2170860 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Mon, 19 Apr 2021 16:39:53 -0400
+Subject: [PATCH] Fix a possible crash in gtk_show_uri
+
+g_file_get_basename can return NULL.
+Deal with it somehow.
+
+Fixes: #3883
+---
+ gdk/x11/gdkapplaunchcontext-x11.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/gdk/x11/gdkapplaunchcontext-x11.c b/gdk/x11/gdkapplaunchcontext-x11.c
+index 8051229ba5..2341bb2e1f 100644
+--- a/gdk/x11/gdkapplaunchcontext-x11.c
++++ b/gdk/x11/gdkapplaunchcontext-x11.c
+@@ -45,6 +45,9 @@ get_display_name (GFile     *file,
+   if (name == NULL)
+     {
+       name = g_file_get_basename (file);
++      if (name == NULL)
++        name = g_file_get_uri (file);
++
+       if (!g_utf8_validate (name, -1, NULL))
+         {
+           tmp = name;
+-- 
+GitLab
+
diff --git a/subprojects/shared-modules/gtk2/gtk2-use-adwaita-theme.patch b/subprojects/shared-modules/gtk2/gtk2-use-adwaita-theme.patch
index 916b3491..e0350545 100644
--- a/subprojects/shared-modules/gtk2/gtk2-use-adwaita-theme.patch
+++ b/subprojects/shared-modules/gtk2/gtk2-use-adwaita-theme.patch
@@ -17,7 +17,7 @@ index 186a8f5cb2..f5c39b5afe 100644
 +  if (var)
 +    path = g_build_filename (var, "share", "themes", NULL);
 +  else
-+    path = g_build_filename ("/usr", "share", "themes", NULL);
++    path = g_build_filename ("/app", "share", "themes", NULL);
 +
 +  return path;
 +}
diff --git a/subprojects/shared-modules/gtk2/gtk2.json b/subprojects/shared-modules/gtk2/gtk2.json
index cb39de7d..bfca223a 100644
--- a/subprojects/shared-modules/gtk2/gtk2.json
+++ b/subprojects/shared-modules/gtk2/gtk2.json
@@ -57,18 +57,21 @@
       "sources": [
         {
           "type": "archive",
-          "url": "https://download.gnome.org/sources/gtk+/2.24/gtk+-2.24.32.tar.xz",
-          "sha256": "b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e"
+          "url": "https://download.gnome.org/sources/gtk+/2.24/gtk+-2.24.33.tar.xz",
+          "sha256": "ac2ac757f5942d318a311a54b0c80b5ef295f299c2a73c632f6bfb1ff49cc6da"
         },
         {
           "type": "patch",
           "path": "gtk2-use-adwaita-theme.patch"
+        },
+        {
+          "type": "patch",
+          "path": "gtk2-fix-crash-in-show-uri.patch"
         }
       ]
     },
     {
       "name": "ibus-gtk2",
-      "no-make-install": true,
       "config-opts": [
         "--disable-xim",
         "--disable-dconf",
@@ -90,18 +93,18 @@
         "--disable-introspection",
         "--disable-python2"
       ],
-      "ensure-writable": [
-        "/lib/gtk-2.0/2.10.0/immodules.cache"
+      "make-install-args": [
+        "-C", "client/gtk2"
       ],
       "post-install": [
-        "install -m644 --target-directory=${FLATPAK_DEST}/lib/gtk-2.0/2.10.0/immodules client/gtk2/.libs/im-ibus.so",
-        "gtk-query-immodules-2.0 > ${FLATPAK_DEST}/lib/gtk-2.0/2.10.0/immodules.cache"
+        "gtk-query-immodules-2.0 > immodules.cache",
+        "install immodules.cache -t $(pkg-config --variable=libdir gtk+-2.0)/gtk-2.0/2.10.0/"
       ],
       "sources": [
         {
           "type": "archive",
-          "url": "https://github.com/ibus/ibus/releases/download/1.5.21/ibus-1.5.21.tar.gz",
-          "sha256": "adc1e5e620d6a89a49306f022b50561f2c05218dec13d0c9b136dc8b6568a2b9"
+          "url": "https://github.com/ibus/ibus/releases/download/1.5.23/ibus-1.5.23.tar.gz",
+          "sha256": "b7e8d5bdb7d71a5ba4ee43cdf374675f77121a71c1679c9b9e7e02875bd0e150"
         }
       ]
     }
diff --git a/subprojects/shared-modules/gtk2/murrine-engine-fix-crash.patch b/subprojects/shared-modules/gtk2/murrine-engine-fix-crash.patch
new file mode 100644
index 00000000..6200e771
--- /dev/null
+++ b/subprojects/shared-modules/gtk2/murrine-engine-fix-crash.patch
@@ -0,0 +1,12 @@
+Index: gtk2-engines-murrine-0.98.2/src/murrine_style.c
+===================================================================
+--- gtk2-engines-murrine-0.98.2.orig/src/murrine_style.c
++++ gtk2-engines-murrine-0.98.2/src/murrine_style.c
+@@ -2171,6 +2171,7 @@ murrine_style_draw_layout (GtkStyle
+ 			cairo_t *cr; 
+ 			cr = murrine_begin_paint (window, area); 
+ 			cairo_translate (cr, x+xos, y+yos); 
++			pango_cairo_update_layout (cr, layout);
+ 			pango_cairo_layout_path (cr, layout);
+ 			murrine_set_color_rgba (cr, &temp, 0.5);
+ 			cairo_stroke (cr);
diff --git a/subprojects/shared-modules/gudev/gudev.json b/subprojects/shared-modules/gudev/gudev.json
index c86a3f91..50d9c6b9 100644
--- a/subprojects/shared-modules/gudev/gudev.json
+++ b/subprojects/shared-modules/gudev/gudev.json
@@ -1,6 +1,12 @@
 {
   "name": "gudev",
-  "config-opts": [ "--disable-umockdev"],
+  "buildsystem": "meson",
+  "config-opts": [
+    "-Dtests=disabled",
+    "-Dvapi=disabled",
+    "-Dintrospection=disabled",
+    "-Dgtk_doc=false"
+  ],
   "cleanup": [
     "/include",
     "/etc",
@@ -20,8 +26,8 @@
   "sources": [
     {
       "type": "archive",
-      "url": "https://download.gnome.org/sources/libgudev/233/libgudev-233.tar.xz",
-      "sha256": "587c4970eb23f4e2deee2cb1fb7838c94a78c578f41ce12cac0a3f4a80dabb03"
+      "url": "https://download.gnome.org/sources/libgudev/237/libgudev-237.tar.xz",
+      "sha256": "0d06b21170d20c93e4f0534dbb9b0a8b4f1119ffb00b4031aaeb5b9148b686aa"
     }
   ]
 }
diff --git a/subprojects/shared-modules/gzdoom/description.patch b/subprojects/shared-modules/gzdoom/description.patch
new file mode 100644
index 00000000..5f760cca
--- /dev/null
+++ b/subprojects/shared-modules/gzdoom/description.patch
@@ -0,0 +1,18 @@
+diff --git a/src/d_iwad.cpp b/src/d_iwad.cpp
+index b421b1b35..9f0b16948 100644
+--- a/src/d_iwad.cpp
++++ b/src/d_iwad.cpp
+@@ -683,9 +683,10 @@ int FIWadManager::IdentifyVersion (TArray<FString> &wadfiles, const char *iwad,
+ 					  "2. Edit your ~/Library/Preferences/" GAMENAMELOWERCASE ".ini and add the directories\n"
+ 					  "of your iwads to the list beneath [IWADSearch.Directories]");
+ #else
+-					  "1. Place one or more of these wads in ~/.config/" GAMENAMELOWERCASE "/.\n"
+-					  "2. Edit your ~/.config/" GAMENAMELOWERCASE "/" GAMENAMELOWERCASE ".ini and add the directories of your\n"
+-					  "iwads to the list beneath [IWADSearch.Directories]");
++					  "1. Place one or more of these wads in ~/.var/app/org.zdoom.GZDoom/.config/" GAMENAMELOWERCASE "/\n"
++					  "2. Edit your ~/.var/app/org.zdoom.GZDoom/.config/" GAMENAMELOWERCASE "/" GAMENAMELOWERCASE ".ini and\n"
++					  "     add the directories of your iwads to the list beneath [IWADSearch.Directories]\n"
++					  "3. Validate your Flatpak permissions, so that Flatpak has access to your directories with wads");
+ #endif
+ 	}
+ 	int pick = 0;
diff --git a/subprojects/shared-modules/gzdoom/gzdoom.json b/subprojects/shared-modules/gzdoom/gzdoom.json
new file mode 100644
index 00000000..1ab16bdc
--- /dev/null
+++ b/subprojects/shared-modules/gzdoom/gzdoom.json
@@ -0,0 +1,50 @@
+{
+    "name": "gzdoom",
+    "buildsystem": "cmake-ninja",
+    "config-opts": [
+        "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
+    ],
+    "cleanup": [
+        "/lib/*.a",
+        "/lib/*.la",
+        "/lib/pkgconfig",
+        "/include"
+    ],
+    "sources": [
+        {
+            "type": "git",
+            "url": "https://github.com/coelckers/gzdoom.git",
+            "tag": "g4.7.1",
+            "commit": "107ff702423686414680d6458fea63a2647692c4"
+        },
+        {
+            "type": "file",
+            "url": "https://github.com/coelckers/gzdoom/raw/g4.7.1/soundfont/gzdoom.sf2",
+            "sha256": "fca3e514b635a21789d4224e84865d2954a2a914d46b64aa8219ddb565c44869"
+        },
+        /* I've discussed these patches upstream and a special -DFLATPAK_BUNDLE has been approved */
+        {
+            "type": "patch",
+            "path": "description.patch"
+        }
+    ],
+    "post-install": [
+        "install -Dm 644 gzdoom.sf2 /app/share/sounds/sf2/gzdoom.sf2"
+    ],
+    "modules": [
+        {
+            "name": "zmusic",
+            "buildsystem": "cmake-ninja",
+            "config-opts": [
+                "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
+            ],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://github.com/coelckers/ZMusic/archive/1.1.8.tar.gz",
+                    "sha256": "73082f661b7b0bb33348d1d186c132deec9132a1613480348a00172b49c9fd68"
+                }
+            ]
+        }
+    ]
+}
diff --git a/subprojects/shared-modules/intltool/intltool-0.51.json b/subprojects/shared-modules/intltool/intltool-0.51.json
index 3a092241..c1f7d269 100644
--- a/subprojects/shared-modules/intltool/intltool-0.51.json
+++ b/subprojects/shared-modules/intltool/intltool-0.51.json
@@ -6,6 +6,10 @@
       "type": "archive",
       "url": "https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz",
       "sha256": "67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd"
+    },
+    {
+      "type": "patch",
+      "path": "intltool-perl5.26-regex-fixes.patch"
     }
   ]
 }
diff --git a/subprojects/shared-modules/intltool/intltool-perl5.26-regex-fixes.patch b/subprojects/shared-modules/intltool/intltool-perl5.26-regex-fixes.patch
new file mode 100644
index 00000000..234b82bd
--- /dev/null
+++ b/subprojects/shared-modules/intltool/intltool-perl5.26-regex-fixes.patch
@@ -0,0 +1,59 @@
+Description: Escape "{", to prevent complaints from perl 5.22 and 5.26
+Author: Roderich Schupp <roderich.schupp@gmail.com>
+Author: gregor herrmann <gregoa@debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=788705
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=826471
+Bug-Upstream: https://bugs.launchpad.net/intltool/+bug/1490906
+
+Index: intltool-0.51.0/intltool-update.in
+===================================================================
+--- intltool-0.51.0.orig/intltool-update.in	2017-07-23 17:24:35.113169465 +0200
++++ intltool-0.51.0/intltool-update.in	2017-07-23 17:24:35.109169052 +0200
+@@ -1062,13 +1062,13 @@
+ 	}
+     }
+ 
+-    if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/)
++    if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/)
+     {
+ 	my $rest = $3;
+ 	my $untouched = $1;
+ 	my $sub = "";
+         # Ignore recursive definitions of variables
+-        $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\${?$2}?/;
++        $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\$\{?$2}?/;
+ 
+ 	return SubstituteVariable ("$untouched$sub$rest");
+     }
+@@ -1190,10 +1190,10 @@
+ 	$name    =~ s/\(+$//g;
+ 	$version =~ s/\(+$//g;
+ 
+-	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
+-	$varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
+-	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
+-	$varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
++	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);
++	$varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
++	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);
++	$varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
+     }
+ 
+     if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m)
+@@ -1219,11 +1219,11 @@
+ 	$version =~ s/\(+$//g;
+         $bugurl  =~ s/\(+$//g if (defined $bugurl);
+ 
+-	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
+-	$varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
+-	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
+-	$varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
+-        $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/);
++	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);
++	$varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
++	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);
++	$varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
++        $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+}?/);
+     }
+ 
+     # \s makes this not work, why?
diff --git a/subprojects/shared-modules/libappindicator/libappindicator-fix-crash-from-incorrect-signal-emission.patch b/subprojects/shared-modules/libappindicator/libappindicator-fix-crash-from-incorrect-signal-emission.patch
new file mode 100644
index 00000000..28927a37
--- /dev/null
+++ b/subprojects/shared-modules/libappindicator/libappindicator-fix-crash-from-incorrect-signal-emission.patch
@@ -0,0 +1,74 @@
+--- libappindicator-12.10.0/src/app-indicator.c	2012-07-11 13:28:34.415113869 -0400
++++ wrk/src/app-indicator.c	2020-03-19 12:14:47.813191652 -0400
+@@ -443,7 +443,7 @@
+ 	                                  G_STRUCT_OFFSET (AppIndicatorClass, new_icon),
+ 	                                  NULL, NULL,
+ 	                                  g_cclosure_marshal_VOID__VOID,
+-	                                  G_TYPE_NONE, 0, G_TYPE_NONE);
++	                                  G_TYPE_NONE, 0);
+ 
+ 	/**
+ 	 * AppIndicator::new-attention-icon:
+@@ -457,7 +457,7 @@
+ 	                                            G_STRUCT_OFFSET (AppIndicatorClass, new_attention_icon),
+ 	                                            NULL, NULL,
+ 	                                            g_cclosure_marshal_VOID__VOID,
+-	                                            G_TYPE_NONE, 0, G_TYPE_NONE);
++	                                            G_TYPE_NONE, 0);
+ 
+ 	/**
+ 	 * AppIndicator::new-status:
+@@ -505,7 +505,7 @@
+ 	                                            G_STRUCT_OFFSET (AppIndicatorClass, connection_changed),
+ 	                                            NULL, NULL,
+ 	                                            g_cclosure_marshal_VOID__BOOLEAN,
+-	                                            G_TYPE_NONE, 1, G_TYPE_BOOLEAN, G_TYPE_NONE);
++	                                            G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+ 
+ 	/**
+ 	 * AppIndicator::new-icon-theme-path:
+@@ -1175,7 +1175,7 @@
+ 	gchar * guide = priv->label_guide != NULL ? priv->label_guide : "";
+ 
+ 	g_signal_emit(G_OBJECT(self), signals[NEW_LABEL], 0,
+-	              label, guide, TRUE);
++	              label, guide);
+ 	if (priv->dbus_registration != 0 && priv->connection != NULL) {
+ 		GError * error = NULL;
+ 
+@@ -1490,7 +1490,7 @@
+ static void
+ theme_changed_cb (GtkIconTheme * theme, gpointer user_data)
+ {
+-	g_signal_emit (user_data, signals[NEW_ICON], 0, TRUE);
++	g_signal_emit (user_data, signals[NEW_ICON], 0);
+ 
+ 	AppIndicator * self = (AppIndicator *)user_data;
+ 	AppIndicatorPrivate *priv = self->priv;
+@@ -1904,7 +1904,7 @@
+ 	}
+ 
+ 	if (changed) {
+-		g_signal_emit (self, signals[NEW_ATTENTION_ICON], 0, TRUE);
++		g_signal_emit (self, signals[NEW_ATTENTION_ICON], 0);
+ 
+ 		if (self->priv->dbus_registration != 0 && self->priv->connection != NULL) {
+ 			GError * error = NULL;
+@@ -1982,7 +1982,7 @@
+ 	}
+ 
+ 	if (changed) {
+-		g_signal_emit (self, signals[NEW_ICON], 0, TRUE);
++		g_signal_emit (self, signals[NEW_ICON], 0);
+ 
+ 		if (self->priv->dbus_registration != 0 && self->priv->connection != NULL) {
+ 			GError * error = NULL;
+@@ -2048,7 +2048,7 @@
+ 
+ 		self->priv->icon_theme_path = g_strdup(icon_theme_path);
+ 
+-		g_signal_emit (self, signals[NEW_ICON_THEME_PATH], 0, self->priv->icon_theme_path, TRUE);
++		g_signal_emit (self, signals[NEW_ICON_THEME_PATH], 0, self->priv->icon_theme_path);
+ 
+ 		if (self->priv->dbus_registration != 0 && self->priv->connection != NULL) {
+ 			GError * error = NULL;
diff --git a/subprojects/shared-modules/libappindicator/libappindicator-fix-crash-iterating-icon-themes.patch b/subprojects/shared-modules/libappindicator/libappindicator-fix-crash-iterating-icon-themes.patch
new file mode 100644
index 00000000..44f6fe48
--- /dev/null
+++ b/subprojects/shared-modules/libappindicator/libappindicator-fix-crash-iterating-icon-themes.patch
@@ -0,0 +1,11 @@
+--- libappindicator-12.10.0/src/app-indicator.c
++++ libappindicator-12.10.0/src/app-indicator.c
+@@ -1606,7 +1606,7 @@ status_icon_changes (AppIndicator * self, gpointer data)
+ 		gint n_elements, i;
+ 		gboolean found=FALSE;
+ 		gtk_icon_theme_get_search_path(icon_theme, &path, &n_elements);
+-		for (i=0; i< n_elements || path[i] == NULL; i++) {
++		for (i=0; i< n_elements; i++) {
+ 			if(g_strcmp0(path[i], self->priv->icon_theme_path) == 0) {
+ 				found=TRUE;
+ 				break;
diff --git a/subprojects/shared-modules/libappindicator/libappindicator-gtk2-12.10.json b/subprojects/shared-modules/libappindicator/libappindicator-gtk2-12.10.json
index b65cfa3f..4e1d38fa 100644
--- a/subprojects/shared-modules/libappindicator/libappindicator-gtk2-12.10.json
+++ b/subprojects/shared-modules/libappindicator/libappindicator-gtk2-12.10.json
@@ -1,7 +1,8 @@
 {
   "name": "libappindicator",
   "build-options": {
-    "cflags": "-Wno-error"
+    "cflags": "-Wno-error",
+    "make-args": [ "-j1" ]
   },
   "rm-configure": true,
   "config-opts": [
@@ -34,6 +35,14 @@
       "path": "libappindicator-no-python.patch"
     },
     {
+      "type": "patch",
+      "path": "libappindicator-fix-crash-from-incorrect-signal-emission.patch"
+    },
+    {
+      "type": "patch",
+      "path": "libappindicator-fix-crash-iterating-icon-themes.patch"
+    },
+    {
       "type": "script",
       "commands": ["autoreconf -sfi"],
       "dest-filename": "autogen.sh"
@@ -41,7 +50,7 @@
   ],
   "modules": [
     "../intltool/intltool-0.51.json",
-    "../dbus-glib/dbus-glib-0.110.json",
+    "../dbus-glib/dbus-glib.json",
     {
       "name": "libdbusmenu",
       "build-options": {
diff --git a/subprojects/shared-modules/libappindicator/libappindicator-gtk3-12.10.json b/subprojects/shared-modules/libappindicator/libappindicator-gtk3-12.10.json
index 46e6f438..c613f8fb 100644
--- a/subprojects/shared-modules/libappindicator/libappindicator-gtk3-12.10.json
+++ b/subprojects/shared-modules/libappindicator/libappindicator-gtk3-12.10.json
@@ -1,7 +1,8 @@
 {
   "name": "libappindicator",
   "build-options": {
-    "cflags": "-Wno-error"
+    "cflags": "-Wno-error",
+    "make-args": [ "-j1" ]
   },
   "rm-configure": true,
   "config-opts": [
@@ -34,6 +35,14 @@
       "path": "libappindicator-no-python.patch"
     },
     {
+      "type": "patch",
+      "path": "libappindicator-fix-crash-from-incorrect-signal-emission.patch"
+    },
+    {
+      "type": "patch",
+      "path": "libappindicator-fix-crash-iterating-icon-themes.patch"
+    },
+    {
       "type": "script",
       "commands": ["autoreconf -sfi"],
       "dest-filename": "autogen.sh"
@@ -41,7 +50,7 @@
   ],
   "modules": [
     "../intltool/intltool-0.51.json",
-    "../dbus-glib/dbus-glib-0.110.json",
+    "../dbus-glib/dbus-glib.json",
     {
       "name": "libdbusmenu",
       "build-options": {
diff --git a/subprojects/shared-modules/libappindicator/libappindicator-gtk3-introspection-12.10.json b/subprojects/shared-modules/libappindicator/libappindicator-gtk3-introspection-12.10.json
index 5df82527..c49742ed 100644
--- a/subprojects/shared-modules/libappindicator/libappindicator-gtk3-introspection-12.10.json
+++ b/subprojects/shared-modules/libappindicator/libappindicator-gtk3-introspection-12.10.json
@@ -1,7 +1,8 @@
 {
   "name": "libappindicator",
   "build-options": {
-    "cflags": "-Wno-error"
+    "cflags": "-Wno-error",
+    "make-args": [ "-j1" ]
   },
   "rm-configure": true,
   "config-opts": [
@@ -34,6 +35,14 @@
       "path": "libappindicator-no-python.patch"
     },
     {
+      "type": "patch",
+      "path": "libappindicator-fix-crash-from-incorrect-signal-emission.patch"
+    },
+    {
+      "type": "patch",
+      "path": "libappindicator-fix-crash-iterating-icon-themes.patch"
+    },
+    {
       "type": "script",
       "commands": ["autoreconf -sfi"],
       "dest-filename": "autogen.sh"
@@ -41,7 +50,7 @@
   ],
   "modules": [
     "../intltool/intltool-0.51.json",
-    "../dbus-glib/dbus-glib-0.110.json",
+    "../dbus-glib/dbus-glib.json",
     {
       "name": "libdbusmenu",
       "build-options": {
diff --git a/subprojects/shared-modules/libappindicator/libappindicator.json.in b/subprojects/shared-modules/libappindicator/libappindicator.json.in
index 2b383af7..3e53a81a 100644
--- a/subprojects/shared-modules/libappindicator/libappindicator.json.in
+++ b/subprojects/shared-modules/libappindicator/libappindicator.json.in
@@ -1,7 +1,8 @@
 {
   "name": "libappindicator",
   "build-options": {
-    "cflags": "-Wno-error"
+    "cflags": "-Wno-error",
+    "make-args": [ "-j1" ]
   },
   "rm-configure": true,
   "config-opts": [
@@ -34,6 +35,14 @@
       "path": "libappindicator-no-python.patch"
     },
     {
+      "type": "patch",
+      "path": "libappindicator-fix-crash-from-incorrect-signal-emission.patch"
+    },
+    {
+      "type": "patch",
+      "path": "libappindicator-fix-crash-iterating-icon-themes.patch"
+    },
+    {
       "type": "script",
       "commands": ["autoreconf -sfi"],
       "dest-filename": "autogen.sh"
@@ -41,7 +50,7 @@
   ],
   "modules": [
     "../intltool/intltool-0.51.json",
-    "../dbus-glib/dbus-glib-0.110.json",
+    "../dbus-glib/dbus-glib.json",
     {
       "name": "libdbusmenu",
       "build-options": {
diff --git a/subprojects/shared-modules/libcanberra/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch b/subprojects/shared-modules/libcanberra/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch
new file mode 100644
index 00000000..763c3a99
--- /dev/null
+++ b/subprojects/shared-modules/libcanberra/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch
@@ -0,0 +1,123 @@
+From d6dd5cdf45c1aac6c0519c8a4f5f89321770fb53 Mon Sep 17 00:00:00 2001
+From: Michael Meeks <michael.meeks@suse.com>
+Date: Fri, 9 Nov 2012 16:16:40 +0000
+Subject: [PATCH] gtk: Don't assume all GdkDisplays are GdkX11Displays:
+ broadway/wayland
+
+Co-Authored-By: Bastien Nocera <hadess@hadess.net>
+---
+ src/canberra-gtk-module.c | 15 +++++++++++++++
+ src/canberra-gtk.c        | 28 ++++++++++++++++++++++------
+ 2 files changed, 37 insertions(+), 6 deletions(-)
+
+diff --git a/src/canberra-gtk-module.c b/src/canberra-gtk-module.c
+index 67791f0..c1532ab 100644
+--- a/src/canberra-gtk-module.c
++++ b/src/canberra-gtk-module.c
+@@ -307,6 +307,11 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) {
+         guchar *data = NULL;
+         gint ret = -1;
+ 
++#ifdef GDK_IS_X11_DISPLAY
++        if (!GDK_IS_X11_DISPLAY(d))
++                return 0;
++#endif
++
+         if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w),
+                                gdk_x11_get_xatom_by_name_for_display(d, "_NET_WM_DESKTOP"),
+                                0, G_MAXLONG, False, XA_CARDINAL, &type_return,
+@@ -335,6 +340,11 @@ static gint display_get_desktop(GdkDisplay *d) {
+         guchar *data = NULL;
+         gint ret = -1;
+ 
++#ifdef GDK_IS_X11_DISPLAY
++        if (!GDK_IS_X11_DISPLAY(d))
++                return 0;
++#endif
++
+         if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), DefaultRootWindow(GDK_DISPLAY_XDISPLAY(d)),
+                                gdk_x11_get_xatom_by_name_for_display(d, "_NET_CURRENT_DESKTOP"),
+                                0, G_MAXLONG, False, XA_CARDINAL, &type_return,
+@@ -365,6 +375,11 @@ static gboolean window_is_xembed(GdkDisplay *d, GdkWindow *w) {
+         gboolean ret = FALSE;
+         Atom xembed;
+ 
++#ifdef GDK_IS_X11_DISPLAY
++        if (!GDK_IS_X11_DISPLAY(d))
++                return FALSE;
++#endif
++
+         /* Gnome Panel applets are XEMBED windows. We need to make sure we
+          * ignore them */
+ 
+diff --git a/src/canberra-gtk.c b/src/canberra-gtk.c
+index 34446f5..47285f8 100644
+--- a/src/canberra-gtk.c
++++ b/src/canberra-gtk.c
+@@ -185,6 +185,11 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) {
+         guchar *data = NULL;
+         gint ret = -1;
+ 
++#ifdef GDK_IS_X11_DISPLAY
++        if (!GDK_IS_X11_DISPLAY(d))
++                return 0;
++#endif
++
+         if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w),
+                                gdk_x11_get_xatom_by_name_for_display(d, "_NET_WM_DESKTOP"),
+                                0, G_MAXLONG, False, XA_CARDINAL, &type_return,
+@@ -254,18 +259,28 @@ int ca_gtk_proplist_set_for_widget(ca_proplist *p, GtkWidget *widget) {
+ 
+         if (gtk_widget_get_realized(GTK_WIDGET(w))) {
+                 GdkWindow *dw = NULL;
++#ifdef GDK_IS_X11_DISPLAY
+                 GdkScreen *screen = NULL;
++#endif
+                 GdkDisplay *display = NULL;
+                 gint x = -1, y = -1, width = -1, height = -1, screen_width = -1, screen_height = -1;
+ 
+-                if ((dw = gtk_widget_get_window(GTK_WIDGET(w))))
+-                        if ((ret = ca_proplist_setf(p, CA_PROP_WINDOW_X11_XID, "%lu", (unsigned long) GDK_WINDOW_XID(dw))) < 0)
+-                                return ret;
++                if ((dw = gtk_widget_get_window(GTK_WIDGET(w)))) {
++#ifdef GDK_IS_X11_DISPLAY
++                        if (GDK_IS_X11_DISPLAY(display)) {
++                                if ((ret = ca_proplist_setf(p, CA_PROP_WINDOW_X11_XID, "%lu", (unsigned long) GDK_WINDOW_XID(dw))) < 0)
++                                        return ret;
++                        }
++#endif
++                }
+ 
+                 if ((display = gtk_widget_get_display(GTK_WIDGET(w)))) {
+-                        if ((t = gdk_display_get_name(display)))
++#ifdef GDK_IS_X11_DISPLAY
++                        if (GDK_IS_X11_DISPLAY(display) && (t = gdk_display_get_name(display))) {
+                                 if ((ret = ca_proplist_sets(p, CA_PROP_WINDOW_X11_DISPLAY, t)) < 0)
+                                         return ret;
++                        }
++#endif
+ 
+                         if (dw)  {
+                                 gint desktop = window_get_desktop(display, dw);
+@@ -276,7 +291,8 @@ int ca_gtk_proplist_set_for_widget(ca_proplist *p, GtkWidget *widget) {
+                         }
+                 }
+ 
+-                if ((screen = gtk_widget_get_screen(GTK_WIDGET(w)))) {
++#ifdef GDK_IS_X11_DISPLAY
++                if (GDK_IS_X11_DISPLAY(display) && (screen = gtk_widget_get_screen(GTK_WIDGET(w)))) {
+ 
+                         if ((ret = ca_proplist_setf(p, CA_PROP_WINDOW_X11_SCREEN, "%i", gdk_screen_get_number(screen))) < 0)
+                                 return ret;
+@@ -285,7 +301,7 @@ int ca_gtk_proplist_set_for_widget(ca_proplist *p, GtkWidget *widget) {
+                                 if ((ret = ca_proplist_setf(p, CA_PROP_WINDOW_X11_MONITOR, "%i", gdk_screen_get_monitor_at_window(screen, dw))) < 0)
+                                         return ret;
+                 }
+-
++#endif
+                 /* FIXME, this might cause a round trip */
+ 
+                 if (dw) {
+-- 
+2.34.1
+
diff --git a/subprojects/shared-modules/libcanberra/libcanberra.json b/subprojects/shared-modules/libcanberra/libcanberra.json
new file mode 100644
index 00000000..ac441941
--- /dev/null
+++ b/subprojects/shared-modules/libcanberra/libcanberra.json
@@ -0,0 +1,35 @@
+{
+    "name": "libcanberra",
+    "cleanup": [
+        "*.la",
+        "/bin",
+        "/etc",
+        "/include",
+        "/libexec",
+        "/share/gtk-doc",
+        "/share/man"
+    ],
+    "config-opts": [
+        "--disable-static",
+        "--disable-gtk-doc",
+        "--disable-oss",
+        "--enable-pulse",
+        "--disable-udev",
+        "--disable-gtk",
+        "--enable-gtk3",
+        "--disable-lynx"
+    ],
+    "sources": [
+        {
+            "type": "archive",
+            "url": "http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.30.tar.xz",
+            "sha256": "c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72",
+            "git-init" : true
+        },
+        {
+            "type": "patch",
+            "path": "0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch",
+            "use-git-am": true
+        }
+    ]
+}
diff --git a/subprojects/shared-modules/libmad/libmad.json b/subprojects/shared-modules/libmad/libmad.json
index 7ee6cc78..cfebd20e 100644
--- a/subprojects/shared-modules/libmad/libmad.json
+++ b/subprojects/shared-modules/libmad/libmad.json
@@ -1,5 +1,9 @@
 {
   "name" : "libmad",
+  "post-install": [
+    "install -d $FLATPAK_DEST/lib/pkgconfig",
+    "install -Dm644 -t $FLATPAK_DEST/lib/pkgconfig mad.pc"
+  ],
   "sources" : [
     {
       "type" : "archive",
@@ -31,6 +35,10 @@
       "path": "libmad-0.15.1b-cflags-O2.patch"
     },
     {
+      "type": "file",
+      "path": "mad.pc"
+    },
+    {
       "type": "shell",
       "commands": [
         "cp /usr/share/gnu-config/config.sub .",
diff --git a/subprojects/shared-modules/libmad/mad.pc b/subprojects/shared-modules/libmad/mad.pc
new file mode 100644
index 00000000..15d85311
--- /dev/null
+++ b/subprojects/shared-modules/libmad/mad.pc
@@ -0,0 +1,11 @@
+prefix=/app
+exec_prefix=/app
+libdir=/app/lib
+includedir=/app/include
+
+Name: mad
+Description: MPEG Audio Decoder
+Requires:
+Version: 0.15.1b
+Libs: -L/app/lib} -lmad -lm
+Cflags: -I/app/include
+\ No newline at end of file
diff --git a/subprojects/shared-modules/libsecret/libsecret.json b/subprojects/shared-modules/libsecret/libsecret.json
index a2d34f58..ae347bba 100644
--- a/subprojects/shared-modules/libsecret/libsecret.json
+++ b/subprojects/shared-modules/libsecret/libsecret.json
@@ -4,20 +4,20 @@
   "config-opts": [
     "-Dmanpage=false",
     "-Dvapi=false",
-    "-Dgtk_doc=false"
+    "-Dgtk_doc=false",
+    "-Dintrospection=false"
   ],
   "cleanup": [
     "/bin",
     "/include",
     "/lib/pkgconfig",
-    "/share/gir-1.0",
     "/share/man"
   ],
   "sources": [
     {
       "type": "archive",
-      "url": "https://ftp.gnome.org/pub/GNOME/sources/libsecret/0.20/libsecret-0.20.1.tar.xz",
-      "sha256": "57f73e94ec6263a17a077fb809cf8cf424637a897a7f15b4eec42ce4aef52447"
+      "url": "https://download.gnome.org/sources/libsecret/0.20/libsecret-0.20.5.tar.xz",
+      "sha256": "3fb3ce340fcd7db54d87c893e69bfc2b1f6e4d4b279065ffe66dac9f0fd12b4d"
     }
   ]
 }
diff --git a/subprojects/shared-modules/libusb/libusb.json b/subprojects/shared-modules/libusb/libusb.json
new file mode 100644
index 00000000..21dddf80
--- /dev/null
+++ b/subprojects/shared-modules/libusb/libusb.json
@@ -0,0 +1,19 @@
+{
+    "name": "libusb",
+    "config-opts": [ "--disable-static" ],
+    "cleanup": [
+        "/lib/*.la",
+        "/lib/pkgconfig",
+        "/include"
+    ],
+    "sources": [
+        {
+            "type": "archive",
+            "url": "https://github.com/libusb/libusb/releases/download/v1.0.26/libusb-1.0.26.tar.bz2",
+            "sha256": "12ce7a61fc9854d1d2a1ffe095f7b5fac19ddba095c259e6067a46500381b5a5"
+        }
+    ],
+    "post-install": [
+        "install -Dm644 COPYING /app/share/licenses/libusb/COPYING"
+    ]
+}
diff --git a/subprojects/shared-modules/linux-audio/dssi.json b/subprojects/shared-modules/linux-audio/dssi.json
new file mode 100644
index 00000000..ec33fd37
--- /dev/null
+++ b/subprojects/shared-modules/linux-audio/dssi.json
@@ -0,0 +1,29 @@
+{
+    "name": "dssi",
+    "rm-configure": true,
+    "config-opts": [
+        "--disable-static"
+    ],
+    "cleanup": [
+      "/bin",
+      "/include",
+      "/lib/dssi",
+      "/lib/pkgconfig",
+      "/share/man",
+      "*.la"
+    ],
+    "sources": [
+        {
+            "type": "archive",
+            "url": "http://download.sf.net/sourceforge/dssi/dssi-1.1.1.tar.gz",
+            "sha256": "f2c82b073a947c8255284249097667f9b14e660bf86186f3fcd3b3b3e087814e"
+        },
+        {
+            "type": "script",
+            "commands": [
+                "autoreconf -fiv"
+            ],
+            "dest-filename": "autogen.sh"
+        }
+    ]
+}
diff --git a/subprojects/shared-modules/linux-audio/fftw3f-static.json b/subprojects/shared-modules/linux-audio/fftw3f-static.json
new file mode 100644
index 00000000..66757499
--- /dev/null
+++ b/subprojects/shared-modules/linux-audio/fftw3f-static.json
@@ -0,0 +1,44 @@
+{
+  "name": "fftw3f",
+  "config-opts": [
+    "--enable-threads",
+    "--enable-static",
+    "--disable-shared",
+    "--enable-float"
+  ],
+  "build-options": {
+    "cflags": "-fPIC",
+    "arch": {
+      "x86_64": {
+        "config-opts": [
+          "--enable-sse2",
+          "--enable-avx",
+          "--enable-avx-128-fma"
+        ]
+      },
+      "aarch64": {
+          "config-opts": [
+              "--enable-neon"
+          ]
+      }
+    }
+  },
+  "sources": [
+    {
+      "type": "archive",
+      "url": "https://www.fftw.org/fftw-3.3.10.tar.gz",
+      "sha256": "56c932549852cddcfafdab3820b0200c7742675be92179e59e6215b340e26467"
+    }
+  ],
+  "cleanup": [
+    "/bin",
+    "/include",
+    "/lib/cmake",
+    "/lib/pkgconfig",
+    "/share/info",
+    "/share/man",
+    "*.a",
+    "*.la",
+    "*.so"
+  ]
+}
diff --git a/subprojects/shared-modules/linux-audio/fftw3f.json b/subprojects/shared-modules/linux-audio/fftw3f.json
new file mode 100644
index 00000000..ee10c757
--- /dev/null
+++ b/subprojects/shared-modules/linux-audio/fftw3f.json
@@ -0,0 +1,41 @@
+{
+    "name": "fftw3f",
+    "config-opts": [
+        "--enable-threads",
+        "--enable-shared",
+        "--disable-static",
+        "--enable-float"
+    ],
+    "build-options": {
+        "arch": {
+            "x86_64": {
+                "config-opts": [
+                    "--enable-sse2",
+                    "--enable-avx",
+                    "--enable-avx-128-fma"
+                ]
+            },
+            "aarch64": {
+                "config-opts": [
+                    "--enable-neon"
+                ]
+            }
+        }
+    },
+    "sources": [
+        {
+            "type": "archive",
+            "url": "https://www.fftw.org/fftw-3.3.10.tar.gz",
+            "sha256": "56c932549852cddcfafdab3820b0200c7742675be92179e59e6215b340e26467"
+        }
+    ],
+    "cleanup": [
+        "/bin",
+        "/include",
+        "/lib/cmake",
+        "/lib/pkgconfig",
+        "/share/man",
+        "*.la",
+        "*.so"
+    ]
+}
diff --git a/subprojects/shared-modules/linux-audio/fluidsynth2-static.json b/subprojects/shared-modules/linux-audio/fluidsynth2-static.json
new file mode 100644
index 00000000..67cea185
--- /dev/null
+++ b/subprojects/shared-modules/linux-audio/fluidsynth2-static.json
@@ -0,0 +1,27 @@
+{
+  "name": "fluidsynth",
+  "buildsystem": "cmake-ninja",
+  "build-options": {
+    "cflags": "-fPIC",
+    "cxxflags": "-fPIC"
+  },
+  "config-opts": [
+    "-DLIB_SUFFIX=",
+    "-DBUILD_SHARED_LIBS=OFF"
+  ],
+  "cleanup": [
+    "/bin",
+    "/include",
+    "/lib/pkgconfig",
+    "/share/man",
+    "*.so",
+    "*.a"
+  ],
+  "sources": [
+    {
+      "type": "archive",
+      "url": "https://github.com/FluidSynth/fluidsynth/archive/v2.2.8.tar.gz",
+      "sha256": "7c29a5cb7a2755c8012d941d1335da7bda957bbb0a86b7c59215d26773bb51fe"
+    }
+  ]
+}
diff --git a/subprojects/shared-modules/linux-audio/fluidsynth2.json b/subprojects/shared-modules/linux-audio/fluidsynth2.json
new file mode 100644
index 00000000..a22a060b
--- /dev/null
+++ b/subprojects/shared-modules/linux-audio/fluidsynth2.json
@@ -0,0 +1,21 @@
+{
+    "name": "fluidsynth",
+    "buildsystem": "cmake-ninja",
+    "config-opts": [
+        "-DLIB_SUFFIX="
+    ],
+    "cleanup": [
+        "/bin",
+        "/include",
+        "/lib/pkgconfig",
+        "/share/man",
+        "*.so"
+    ],
+    "sources": [
+        {
+            "type": "archive",
+            "url": "https://github.com/FluidSynth/fluidsynth/archive/v2.2.8.tar.gz",
+            "sha256": "7c29a5cb7a2755c8012d941d1335da7bda957bbb0a86b7c59215d26773bb51fe"
+        }
+    ]
+}
diff --git a/subprojects/shared-modules/linux-audio/jack2.json b/subprojects/shared-modules/linux-audio/jack2.json
new file mode 100644
index 00000000..9077fea3
--- /dev/null
+++ b/subprojects/shared-modules/linux-audio/jack2.json
@@ -0,0 +1,23 @@
+{
+    "name": "jack2",
+    "buildsystem": "simple",
+    "build-commands": [
+        "./waf configure --prefix=$FLATPAK_DEST --htmldir=$FLATPAK_DEST/share/doc/jack/ --classic",
+        "./waf build -j $FLATPAK_BUILDER_N_JOBS",
+        "./waf install"
+    ],
+    "cleanup": [
+        "/include",
+        "/lib/jack",
+        "/lib/libjack*",
+        "/lib/pkgconfig",
+        "/share/man"
+    ],
+    "sources": [
+        {
+            "type": "archive",
+            "url": "https://github.com/jackaudio/jack2/archive/v1.9.17.tar.gz",
+            "sha256": "38f674bbc57852a8eb3d9faa1f96a0912d26f7d5df14c11005ad499c8ae352f2"
+        }
+    ]
+}
diff --git a/subprojects/shared-modules/linux-audio/ladspa.json b/subprojects/shared-modules/linux-audio/ladspa.json
new file mode 100644
index 00000000..d3637fff
--- /dev/null
+++ b/subprojects/shared-modules/linux-audio/ladspa.json
@@ -0,0 +1,17 @@
+{
+    "name": "ladspa",
+    "no-autogen": true,
+    "subdir": "src",
+    "make-install-args": [
+        "INSTALL_PLUGINS_DIR=/app/lib/ladspa",
+        "INSTALL_INCLUDE_DIR=/app/include",
+        "INSTALL_BINARY_DIR=/app/bin"
+    ],
+    "sources": [
+        {
+            "type": "archive",
+            "url": "http://www.ladspa.org/download/ladspa_sdk_1.17.tgz",
+            "sha256": "27d24f279e4b81bd17ecbdcc38e4c42991bb388826c0b200067ce0eb59d3da5b"
+        }
+    ]
+}
diff --git a/subprojects/shared-modules/linux-audio/lash.json b/subprojects/shared-modules/linux-audio/lash.json
new file mode 100644
index 00000000..4d0ccb28
--- /dev/null
+++ b/subprojects/shared-modules/linux-audio/lash.json
@@ -0,0 +1,41 @@
+{
+    "name": "lash",
+    "rm-configure": true,
+    "config-opts": [
+        "--disable-static",
+        "--disable-serv-inst",
+        "CFLAGS=-D_GNU_SOURCE"
+    ],
+    "sources": [
+        {
+            "type": "archive",
+            "url": "https://download.savannah.gnu.org/releases/lash/lash-0.5.4.tar.gz",
+            "sha256": "105a7da84415c4725c6bcad28e70f23aeb4534f94fc80ca262b6a2cef2226c16"
+        },
+        {
+            "type": "patch",
+            "strip-components": 0,
+            "path": "patches/lash-0.5.3-no-static-lib.patch"
+        },
+        {
+            "type": "patch",
+            "path": "patches/lash-gcc47.patch"
+        },
+        {
+            "type": "patch",
+            "path": "patches/lash-linking.patch"
+        },
+        {
+            "type": "patch",
+            "strip-components": 0,
+            "path": "patches/lash-configure.patch"
+        },
+        {
+            "type": "script",
+            "commands": [
+                "autoreconf -fiv"
+            ],
+            "dest-filename": "autogen.sh"
+        }
+    ]
+}
diff --git a/subprojects/shared-modules/linux-audio/libinstpatch.json b/subprojects/shared-modules/linux-audio/libinstpatch.json
new file mode 100644
index 00000000..fb00c206
--- /dev/null
+++ b/subprojects/shared-modules/linux-audio/libinstpatch.json
@@ -0,0 +1,17 @@
+{
+    "name": "libinstpatch",
+    "buildsystem": "cmake-ninja",
+    "config-opts": [
+        "-DLIB_SUFFIX="
+    ],
+    "cleanup": [
+	"/share/doc"
+    ],
+    "sources": [
+        {
+            "type": "archive",
+            "url": "https://github.com/swami/libinstpatch/archive/v1.1.6.tar.gz",
+            "sha256": "8e9861b04ede275d712242664dab6ffa9166c7940fea3b017638681d25e10299"
+        }
+    ]
+}
diff --git a/subprojects/shared-modules/linux-audio/liblo-static.json b/subprojects/shared-modules/linux-audio/liblo-static.json
new file mode 100644
index 00000000..4ca2eb77
--- /dev/null
+++ b/subprojects/shared-modules/linux-audio/liblo-static.json
@@ -0,0 +1,25 @@
+{
+  "name": "liblo",
+  "cleanup": [
+    "/bin",
+    "/include",
+    "/lib/pkgconfig",
+    "*.la",
+    "*.a",
+    "*.so"
+  ],
+  "build-options": {
+    "cflags": "-fPIC"
+  },
+  "config-opts": [
+    "--enable-static",
+    "--disable-shared"
+  ],
+  "sources": [
+    {
+      "type": "archive",
+      "url": "http://download.sf.net/sourceforge/liblo/liblo-0.31.tar.gz",
+      "sha256": "2b4f446e1220dcd624ecd8405248b08b7601e9a0d87a0b94730c2907dbccc750"
+    }
+  ]
+}
diff --git a/subprojects/shared-modules/linux-audio/liblo.json b/subprojects/shared-modules/linux-audio/liblo.json
new file mode 100644
index 00000000..17de750e
--- /dev/null
+++ b/subprojects/shared-modules/linux-audio/liblo.json
@@ -0,0 +1,17 @@
+{
+  "name": "liblo",
+  "cleanup": [
+    "/bin",
+    "/include",
+    "/lib/pkgconfig",
+    "*.la",
+    "*.so"
+  ],
+  "sources": [
+    {
+      "type": "archive",
+      "url": "http://download.sf.net/sourceforge/liblo/liblo-0.31.tar.gz",
+      "sha256": "2b4f446e1220dcd624ecd8405248b08b7601e9a0d87a0b94730c2907dbccc750"
+    }
+  ]
+}
diff --git a/subprojects/shared-modules/linux-audio/lilv.json b/subprojects/shared-modules/linux-audio/lilv.json
new file mode 100644
index 00000000..2c080535
--- /dev/null
+++ b/subprojects/shared-modules/linux-audio/lilv.json
@@ -0,0 +1,100 @@
+{
+  "name": "lilv",
+  "buildsystem": "simple",
+  "build-commands": [
+    "python3 ./waf configure --prefix=$FLATPAK_DEST",
+    "python3 ./waf build -j $FLATPAK_BUILDER_N_JOBS",
+    "python3 ./waf install"
+  ],
+  "modules": [
+    {
+      "name": "serd",
+      "buildsystem": "simple",
+      "build-commands": [
+        "python3 ./waf configure --prefix=$FLATPAK_DEST",
+        "python3 ./waf build -j $FLATPAK_BUILDER_N_JOBS",
+        "python3 ./waf install"
+      ],
+      "sources": [
+        {
+          "type": "archive",
+          "url": "https://download.drobilla.net/serd-0.30.10.tar.bz2",
+          "sha256": "affa80deec78921f86335e6fc3f18b80aefecf424f6a5755e9f2fa0eb0710edf"
+        }
+      ],
+      "post-install": [
+        "install -Dm644 -t /app/share/licenses/serd COPYING"
+      ],
+      "cleanup": [
+        "/bin",
+        "/include",
+        "/lib/pkgconfig",
+        "/share/man"
+      ]
+    },
+    {
+      "name": "sord",
+      "buildsystem": "simple",
+      "build-commands": [
+        "python3 ./waf configure --prefix=$FLATPAK_DEST",
+        "python3 ./waf build -j $FLATPAK_BUILDER_N_JOBS",
+        "python3 ./waf install"
+      ],
+      "sources": [
+        {
+          "type": "archive",
+          "url": "https://download.drobilla.net/sord-0.16.8.tar.bz2",
+          "sha256": "7c289d2eaabf82fa6ac219107ce632d704672dcfb966e1a7ff0bbc4ce93f5e14"
+        }
+      ],
+      "post-install": [
+        "install -Dm644 -t /app/share/licenses/sord COPYING"
+      ],
+      "cleanup": [
+        "/bin",
+        "/include",
+        "/lib/pkgconfig",
+        "/share/man"
+      ]
+    },
+    {
+      "name": "sratom",
+      "buildsystem": "simple",
+      "build-commands": [
+        "python3 ./waf configure --prefix=$FLATPAK_DEST",
+        "python3 ./waf build -j $FLATPAK_BUILDER_N_JOBS",
+        "python3 ./waf install"
+      ],
+      "cleanup": [
+        "/include",
+        "/lib/pkgconfig"
+      ],
+      "sources": [
+        {
+          "type": "archive",
+          "url": "https://download.drobilla.net/sratom-0.6.8.tar.bz2",
+          "sha256": "3acb32b1adc5a2b7facdade2e0818bcd6c71f23f84a1ebc17815bb7a0d2d02df"
+        }
+      ],
+      "post-install": [
+        "install -Dm644 -t /app/share/licenses/sratom COPYING"
+      ]
+    }
+  ],
+  "sources": [
+    {
+      "type": "archive",
+      "url": "https://download.drobilla.net/lilv-0.24.12.tar.bz2",
+      "sha256": "26a37790890c9c1f838203b47f5b2320334fe92c02a4d26ebbe2669dbd769061"
+    }
+  ],
+  "post-install": [
+    "install -Dm644 -t /app/share/licenses/lilv COPYING"
+  ],
+  "cleanup": [
+    "/bin",
+    "/etc",
+    "/lib/pkgconfig",
+    "/share/man"
+  ]
+}
diff --git a/subprojects/shared-modules/linux-audio/lrdf.json b/subprojects/shared-modules/linux-audio/lrdf.json
new file mode 100644
index 00000000..29d19dd5
--- /dev/null
+++ b/subprojects/shared-modules/linux-audio/lrdf.json
@@ -0,0 +1,50 @@
+{
+    "name": "lrdf",
+    "rm-configure": true,
+    "cleanup": [
+        "/include",
+        "/lib/pkgconfig",
+        "*.so"
+    ],
+    "config-opts": [
+        "--disable-static"
+    ],
+    "modules": [
+        "ladspa.json",
+        {
+            "name": "raptor2",
+            "cleanup": [
+                "/include",
+                "/lib/pkgconfig",
+                "/share/gtk-doc",
+                "*.so"
+            ],
+            "config-opts": [
+                "--disable-documentation",
+                "--disable-static"
+            ],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "http://download.librdf.org/source/raptor2-2.0.15.tar.gz",
+                    "sha256": "ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed"
+                }
+            ]
+        }
+    ],
+    "sources": [
+        {
+            "type": "archive",
+            "url": "https://github.com/swh/LRDF/tarball/0.5.0",
+            "dest-filename": "swh-LRDF-0.5.0-0-g7ebc032.tar.gz",
+            "sha256": "013002b91ef209827fe99552b8c7f0b569cddb3d6f1439bedbd8bafe1956a93c"
+        },
+        {
+            "type": "script",
+            "commands": [
+                "autoreconf -fiv"
+            ],
+            "dest-filename": "autogen.sh"
+        }
+    ]
+}
diff --git a/subprojects/shared-modules/linux-audio/lv2.json b/subprojects/shared-modules/linux-audio/lv2.json
new file mode 100644
index 00000000..5cf5a67c
--- /dev/null
+++ b/subprojects/shared-modules/linux-audio/lv2.json
@@ -0,0 +1,26 @@
+{
+    "name": "lv2",
+    "buildsystem": "simple",
+    "build-commands": [
+        "python3 ./waf configure --prefix=$FLATPAK_DEST --lv2dir=$FLATPAK_DEST/lib/lv2 --copy-headers",
+        "python3 ./waf build -j $FLATPAK_BUILDER_N_JOBS",
+        "python3 ./waf install"
+    ],
+    "cleanup": [
+        "/bin",
+        "/include",
+        "/lib/pkgconfig",
+        "/share"
+    ],
+    "sources": [
+        {
+            "type": "archive",
+            "url": "https://lv2plug.in/spec/lv2-1.18.2.tar.bz2",
+            "sha256": "4e891fbc744c05855beb5dfa82e822b14917dd66e98f82b8230dbd1c7ab2e05e"
+        }
+    ],
+    "post-install": [
+        "install -Dm644 -t $FLATPAK_DEST/share/licenses/lv2 COPYING",
+        "ln -sf lv2.pc $FLATPAK_DEST/lib/pkgconfig/lv2core.pc"
+    ]
+}
diff --git a/subprojects/shared-modules/linux-audio/patches/lash-0.5.3-no-static-lib.patch b/subprojects/shared-modules/linux-audio/patches/lash-0.5.3-no-static-lib.patch
new file mode 100644
index 00000000..54d1cd7b
--- /dev/null
+++ b/subprojects/shared-modules/linux-audio/patches/lash-0.5.3-no-static-lib.patch
@@ -0,0 +1,10 @@
+--- lash-1.0.pc.in~	2007-10-07 06:33:27.000000000 -0700
++++ lash-1.0.pc.in	2007-10-07 06:35:00.000000000 -0700
+@@ -7,6 +7,5 @@
+ Description: Audio session management
+ Requires: @PC_REQUIRES@
+ Version: @PACKAGE_VERSION@
+-Libs: -llash
+-Libs.static: -lpthread -luuid
++Libs: -llash -lpthread -luuid
+ Cflags: -I${includedir}/lash-1.0
diff --git a/subprojects/shared-modules/linux-audio/patches/lash-configure.patch b/subprojects/shared-modules/linux-audio/patches/lash-configure.patch
new file mode 100644
index 00000000..ba9bb8ba
--- /dev/null
+++ b/subprojects/shared-modules/linux-audio/patches/lash-configure.patch
@@ -0,0 +1,11 @@
+--- configure.ac	2007-11-14 16:58:51.000000000 -0500
++++ configure.ac.new	2019-01-24 13:48:46.284377086 -0500
+@@ -2,7 +2,7 @@
+ AC_CONFIG_SRCDIR([lash/types.h])
+ AC_CONFIG_HEADER([config.h])
+ AM_INIT_AUTOMAKE
+-AM_ACLOCAL_INCLUDE([m4])
++dnl AM_ACLOCAL_INCLUDE([m4])
+ 
+ ### Check for programs ###
+ AC_LANG([C])
diff --git a/subprojects/shared-modules/linux-audio/patches/lash-gcc47.patch b/subprojects/shared-modules/linux-audio/patches/lash-gcc47.patch
new file mode 100644
index 00000000..41710ca5
--- /dev/null
+++ b/subprojects/shared-modules/linux-audio/patches/lash-gcc47.patch
@@ -0,0 +1,11 @@
+diff -rupN lash-0.5.4.old/liblash/lash.c lash-0.5.4/liblash/lash.c
+--- lash-0.5.4.old/liblash/lash.c	2007-03-09 10:34:40.000000000 -0500
++++ lash-0.5.4/liblash/lash.c	2012-07-22 18:17:46.003963521 -0400
+@@ -22,6 +22,7 @@
+ #include <string.h>
+ #include <strings.h>
+ #include <pthread.h>
++#include <sys/resource.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ #include <sys/socket.h>
diff --git a/subprojects/shared-modules/linux-audio/patches/lash-linking.patch b/subprojects/shared-modules/linux-audio/patches/lash-linking.patch
new file mode 100644
index 00000000..e46d1647
--- /dev/null
+++ b/subprojects/shared-modules/linux-audio/patches/lash-linking.patch
@@ -0,0 +1,90 @@
+diff -rupN lash-0.5.4.old/clients/control/Makefile.am lash-0.5.4/clients/control/Makefile.am
+--- lash-0.5.4.old/clients/control/Makefile.am	2007-01-13 13:20:03.000000000 -0500
++++ lash-0.5.4/clients/control/Makefile.am	2010-02-10 03:08:04.000000000 -0500
+@@ -18,6 +18,6 @@ lash_control_CFLAGS = $(LASH_CFLAGS)
+ 
+ lash_control_LDADD = \
+ 	$(top_builddir)/liblash/liblash.la \
+-	$(LASH_LIBS) @READLINE_LIBS@
++	$(LASH_LIBS) @READLINE_LIBS@ -luuid
+ 
+ endif
+diff -rupN lash-0.5.4.old/clients/control/Makefile.in lash-0.5.4/clients/control/Makefile.in
+--- lash-0.5.4.old/clients/control/Makefile.in	2007-11-14 17:00:09.000000000 -0500
++++ lash-0.5.4/clients/control/Makefile.in	2010-02-10 03:09:26.000000000 -0500
+@@ -236,7 +236,7 @@ AM_CPPFLAGS = -I$(top_srcdir)
+ @HAVE_READLINE_TRUE@lash_control_CFLAGS = $(LASH_CFLAGS)
+ @HAVE_READLINE_TRUE@lash_control_LDADD = \
+ @HAVE_READLINE_TRUE@	$(top_builddir)/liblash/liblash.la \
+-@HAVE_READLINE_TRUE@	$(LASH_LIBS) @READLINE_LIBS@
++@HAVE_READLINE_TRUE@	$(LASH_LIBS) @READLINE_LIBS@ -luuid
+ 
+ all: all-am
+ 
+diff -rupN lash-0.5.4.old/clients/panel/Makefile.am lash-0.5.4/clients/panel/Makefile.am
+--- lash-0.5.4.old/clients/panel/Makefile.am	2005-09-13 01:22:59.000000000 -0400
++++ lash-0.5.4/clients/panel/Makefile.am	2010-02-10 03:17:10.000000000 -0500
+@@ -13,7 +13,7 @@ lash_panel_CFLAGS = \
+ 
+ lash_panel_LDADD = \
+ 	$(top_builddir)/liblash/liblash.la \
+-	$(GTK2_LIBS)
++	$(GTK2_LIBS) -luuid
+ 
+ if HAVE_GTK2
+   bin_PROGRAMS = lash_panel
+diff -rupN lash-0.5.4.old/clients/panel/Makefile.in lash-0.5.4/clients/panel/Makefile.in
+--- lash-0.5.4.old/clients/panel/Makefile.in	2007-11-14 17:00:09.000000000 -0500
++++ lash-0.5.4/clients/panel/Makefile.in	2010-02-10 03:17:23.000000000 -0500
+@@ -230,7 +230,7 @@ lash_panel_CFLAGS = \
+ 
+ lash_panel_LDADD = \
+ 	$(top_builddir)/liblash/liblash.la \
+-	$(GTK2_LIBS)
++	$(GTK2_LIBS) -luuid
+ 
+ all: all-am
+ 
+diff -rupN lash-0.5.4.old/clients/synth/Makefile.am lash-0.5.4/clients/synth/Makefile.am
+--- lash-0.5.4.old/clients/synth/Makefile.am	2005-09-13 01:22:59.000000000 -0400
++++ lash-0.5.4/clients/synth/Makefile.am	2010-02-10 03:22:39.000000000 -0500
+@@ -20,4 +20,4 @@ lash_synth_LDADD = \
+ 	$(JACK_LIBS) \
+ 	$(ALSA_LIBS) \
+ 	$(GTK2_LIBS) \
+-	-lpthread
++	-lpthread -lm
+diff -rupN lash-0.5.4.old/clients/synth/Makefile.in lash-0.5.4/clients/synth/Makefile.in
+--- lash-0.5.4.old/clients/synth/Makefile.in	2007-11-14 17:00:10.000000000 -0500
++++ lash-0.5.4/clients/synth/Makefile.in	2010-02-10 03:22:51.000000000 -0500
+@@ -238,7 +238,7 @@ lash_synth_LDADD = \
+ 	$(JACK_LIBS) \
+ 	$(ALSA_LIBS) \
+ 	$(GTK2_LIBS) \
+-	-lpthread
++	-lpthread -lm
+ 
+ all: all-am
+ 
+diff -rupN lash-0.5.4.old/lashd/Makefile.am lash-0.5.4/lashd/Makefile.am
+--- lash-0.5.4.old/lashd/Makefile.am	2006-09-16 16:27:46.000000000 -0400
++++ lash-0.5.4/lashd/Makefile.am	2010-07-23 15:13:59.000000000 -0400
+@@ -32,6 +32,7 @@ lashd_LDADD = \
+ 	$(ALSA_LIBS) \
+ 	$(XML2_LIBS) \
+ 	$(UUID_LIBS) \
++	-lpthread \
+ 	$(top_builddir)/liblash/liblash.la
+ 
+ lashd_CFLAGS = \
+diff -rupN lash-0.5.4.old/lashd/Makefile.in lash-0.5.4/lashd/Makefile.in
+--- lash-0.5.4.old/lashd/Makefile.in	2007-11-14 17:00:10.000000000 -0500
++++ lash-0.5.4/lashd/Makefile.in	2010-07-23 15:14:29.000000000 -0400
+@@ -262,6 +262,7 @@ lashd_LDADD = \
+ 	$(ALSA_LIBS) \
+ 	$(XML2_LIBS) \
+ 	$(UUID_LIBS) \
++	-lpthread \
+ 	$(top_builddir)/liblash/liblash.la
+ 
+ lashd_CFLAGS = \
diff --git a/subprojects/shared-modules/linux-audio/patches/stk-install.sh b/subprojects/shared-modules/linux-audio/patches/stk-install.sh
new file mode 100644
index 00000000..e2d9c9b7
--- /dev/null
+++ b/subprojects/shared-modules/linux-audio/patches/stk-install.sh
@@ -0,0 +1,54 @@
+
+INCLUDE_DIR=/app/include
+DATA_DIR=/app/share
+LIB_DIR=/app/lib
+BIN_DIR=/app/bin
+
+
+
+
+install -Dm644 -t $INCLUDE_DIR/stk include/*
+install -Dm644 -t $LIB_DIR src/libstk.*
+install -Dm644 -t $DATA_DIR/stk/rawwaves rawwaves/*.raw
+
+#cp -pr projects/demo/tcl $DATA_DIR/stk/demo
+#cp -pr projects/demo/scores $DATA_DIR/stk/demo
+#cp -p projects/demo/demo $BIN_DIR/stk-demo
+#cp -p projects/demo/Md2Skini $BIN_DIR/Md2Skini
+#for f in Banded Drums Modal Physical Shakers StkDemo Voice ; do
+#  chmod +x projects/demo/$f
+#  sed -e 's,\./demo,$BIN_DIR/stk-demo,' -e '1i#! /bin/sh' \
+#    -i projects/demo/$f
+#  cp -p projects/demo/$f $DATA_DIR/stk/demo
+#done
+
+#cp -pr projects/examples/midifiles $DATA_DIR/stk/examples
+#cp -pr projects/examples/rawwaves $DATA_DIR/stk/examples
+#cp -pr projects/examples/scores $DATA_DIR/stk/examples
+#for f in sine sineosc foursine audioprobe midiprobe duplex play \
+#    record inetIn inetOut rtsine crtsine bethree controlbee \
+#    threebees playsmf grains ; do
+#  cp -p projects/examples/$f $BIN_DIR/stk-$f
+#  # absolute links, will be shortened later
+#  ln -s $BIN_DIR/stk-$f $DATA_DIR/stk/examples/$f
+#done
+
+install -Dm644 -t $DATA_DIR/stk/effects projects/effects/tcl
+install -Dm644 -t $BIN_DIR/stk-effects projects/effects/effects
+sed -e 's,\./effects,$BIN_DIR/stk-effects,' -e '1i#! /bin/sh' \
+    -i projects/effects/StkEffects
+install -Dm644 -t $DATA_DIR/stk/effects projects/effects/StkEffects
+
+install -Dm644 -t $DATA_DIR/stk/ragamatic projects/ragamatic/tcl
+install -Dm644 -t $DATA_DIR/stk/ragamatic projects/ragamatic/rawwaves
+install -Dm644 -t $BIN_DIR/stk-ragamat projects/ragamatic/ragamat
+sed -e 's,\./ragamat,$BIN_DIR/stk-ragamat,' -e '1i#! /bin/sh' \
+  -i projects/ragamatic/Raga
+install -Dm644 -t $DATA_DIR/stk/ragamatic projects/ragamatic/Raga
+
+install -Dm644 -t $DATA_DIR/stk/eguitar projects/eguitar/tcl
+install -Dm644 -t $DATA_DIR/stk/eguitar projects/eguitar/scores
+install -Dm644 -t $BIN_DIR/stk-eguitar projects/eguitar/eguitar
+sed -e 's,\./eguitar,$BIN_DIR/stk-eguitar,' -e '1i#! /bin/sh' \
+  -i projects/eguitar/ElectricGuitar
+install -Dm644 -t $DATA_DIR/stk/eguitar projects/eguitar/ElectricGuitar
diff --git a/subprojects/shared-modules/linux-audio/stk.json b/subprojects/shared-modules/linux-audio/stk.json
new file mode 100644
index 00000000..cf4d8f93
--- /dev/null
+++ b/subprojects/shared-modules/linux-audio/stk.json
@@ -0,0 +1,28 @@
+{
+    "name": "stk",
+    "build-commands": [
+        "make -j $FLATPAK_BUILDER_N_JOBS -C src",
+        "make -j $FLATPAK_BUILDER_N_JOBS -C projects/effects libeffects",
+        "make -j $FLATPAK_BUILDER_N_JOBS -C projects/ragamatic libragamat",
+        "make -j $FLATPAK_BUILDER_N_JOBS -C projects/eguitar libeguitar"
+    ],
+    "post-install": [
+        "sh ./stk-install.sh"
+    ],
+    "cleanup": [
+        "/bin/*",
+        "/include",
+        "*.a"
+    ],
+    "sources": [
+        {
+            "type": "archive",
+            "url": "http://ccrma.stanford.edu/software/stk/release/stk-4.6.1.tar.gz",
+            "sha256": "e77ba3c80cdd93ca02c34098b9b7f918df3d648c87f1ed5d94fe854debd6d101"
+        },
+        {
+            "type": "file",
+            "path": "patches/stk-install.sh"
+        }
+    ]
+}
diff --git a/subprojects/shared-modules/lua5.1/lua-5.1.5-so.patch b/subprojects/shared-modules/lua5.1/lua-5.1.5-so.patch
new file mode 100644
index 00000000..5fc61a08
--- /dev/null
+++ b/subprojects/shared-modules/lua5.1/lua-5.1.5-so.patch
@@ -0,0 +1,43 @@
+diff -ur lua-5.1.4/src/Makefile lua-5.1.4-new/src/Makefile
+--- lua-5.1.4/src/Makefile	2008-01-19 20:37:58.000000000 +0100
++++ lua-5.1.4-new/src/Makefile	2012-02-23 18:26:43.000000000 +0100
+@@ -23,6 +23,7 @@
+ PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
+ 
+ LUA_A=	liblua.a
++LUA_SO=	liblua.so
+ CORE_O=	lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \
+ 	lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o  \
+ 	lundump.o lvm.o lzio.o
+@@ -36,7 +37,7 @@
+ LUAC_O=	luac.o print.o
+ 
+ ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O)
+-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
++ALL_T= $(LUA_A) $(LUA_SO) $(LUA_T) $(LUAC_T)
+ ALL_A= $(LUA_A)
+ 
+ default: $(PLAT)
+@@ -51,6 +52,11 @@
+ 	$(AR) $@ $?
+ 	$(RANLIB) $@
+ 
++$(LUA_SO): $(CORE_O) $(LIB_O)
++	$(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS)
++	ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V)
++	ln -sf $(LUA_SO).$(R) $(LUA_SO)
++
+ $(LUA_T): $(LUA_O) $(LUA_A)
+ 	$(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
+ 
+--- lua-5.1.4/Makefile	2008-08-12 02:40:48.000000000 +0200
++++ lua-5.1.4-new/Makefile	2012-02-23 19:06:32.000000000 +0100
+@@ -53,7 +53,7 @@
+ all:	$(PLAT)
+ 
+ $(PLATS) clean:
+-	cd src && $(MAKE) $@
++	cd src && $(MAKE) $@ V=$(V) R=$(R)
+ 
+ test:	dummy
+ 	src/lua test/hello.lua
diff --git a/subprojects/shared-modules/lua5.1/lua-5.1.5.json b/subprojects/shared-modules/lua5.1/lua-5.1.5.json
new file mode 100644
index 00000000..896cadb9
--- /dev/null
+++ b/subprojects/shared-modules/lua5.1/lua-5.1.5.json
@@ -0,0 +1,38 @@
+{
+    "name": "lua-5.1",
+    "buildsystem": "simple",
+    "build-commands": [
+        "make -j $FLATPAK_BUILDER_N_JOBS CFLAGS=\"$CFLAGS -fPIC -DLUA_USE_LINUX\" linux",
+        "make INSTALL_TOP=$FLATPAK_DEST TO_LIB='liblua.a liblua.so.5.1.5' install",
+        "ln -sf liblua.so.5.1.5 $FLATPAK_DEST/lib/liblua.so",
+        "ln -sf liblua.so.5.1.5 $FLATPAK_DEST/lib/liblua.so.5.1",
+        "install -Dm0644 etc/lua.pc $FLATPAK_DEST/lib/pkgconfig/lua.pc",
+        "ln -sf lua.pc $FLATPAK_DEST/lib/pkgconfig/lua51.pc",
+        "ln -sf lua.pc $FLATPAK_DEST/lib/pkgconfig/lua5.1.pc",
+        "ln -sf lua.pc $FLATPAK_DEST/lib/pkgconfig/lua-5.1.pc"
+    ],
+    "sources": [
+        {
+            "type": "archive",
+            "url": "https://www.lua.org/ftp/lua-5.1.5.tar.gz",
+            "sha256": "2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333"
+        },
+        {
+            "type": "patch",
+            "path": "lua-5.1.5-so.patch"
+        },
+        {
+            "type": "shell",
+            "commands": [
+                "sed -i \"s|/usr/local|$FLATPAK_DEST|\" etc/lua.pc src/luaconf.h"
+            ]
+        }
+    ],
+    "cleanup": [
+        "*.a",
+        "/bin",
+        "/include",
+        "/lib/pkgconfig",
+        "/man"
+    ]
+}
diff --git a/subprojects/shared-modules/lua5.3/lua-5.3.0-autotoolize.patch b/subprojects/shared-modules/lua5.3/lua-5.3.0-autotoolize.patch
deleted file mode 100644
index 3e4723a5..00000000
--- a/subprojects/shared-modules/lua5.3/lua-5.3.0-autotoolize.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-diff -up lua-5.3.0/configure.ac.autoxxx lua-5.3.0/configure.ac
---- lua-5.3.0/configure.ac.autoxxx	2015-01-15 10:20:03.826889574 -0500
-+++ lua-5.3.0/configure.ac	2015-01-15 10:20:03.826889574 -0500
-@@ -0,0 +1,69 @@
-+AC_PREREQ(2.59)
-+AC_INIT([lua], [5.3.0], [https://bugzilla.redhat.com/], [lua-at], [http://www.lua.org])
-+AC_SUBST([MAJOR_VERSION], [5.3])
-+
-+AC_CONFIG_HEADERS([config.h])
-+AC_CONFIG_SRCDIR([src/lapi.c])
-+
-+AM_INIT_AUTOMAKE([1.9 foreign])
-+
-+AC_PROG_CC
-+AC_PROG_LIBTOOL
-+
-+AC_ARG_WITH(
-+  [readline],
-+  [AC_HELP_STRING([--with-readline], [Use readline for interpreter input [default=yes]])],
-+  [use_readline=$withval],
-+  [use_readline=yes]
-+)
-+
-+LUA_LIBS="-lm"
-+
-+# Check for readline
-+READLINE_DEFS="#undef LUA_USE_READLINE"
-+if test "x$use_readline" == "xyes"; then
-+  AC_CHECK_LIB([readline], [readline], [:], [use_readline=no], [-lncurses])
-+  AC_CHECK_HEADERS([readline/readline.h readline/history.h], [], [use_readline=no])
-+  if test "x$use_readline" == "xno"; then
-+    AC_MSG_WARN([readline headers could not be found, disabling readline support])
-+  else
-+    READLINE_DEFS="#define LUA_USE_READLINE"
-+    READLINE_LIBS="-lreadline -lncurses"
-+  fi
-+fi
-+AC_SUBST(READLINE_DEFS)
-+AC_SUBST(READLINE_LIBS)
-+
-+case "$host" in
-+  *-mingw*)  use_os=win32  ;;
-+  *-darwin*) use_os=macosx ;;
-+  *)         use_os=posix  ;;
-+esac
-+
-+POSIX_DEFS="#undef LUA_USE_POSIX"
-+LUA_DL_DEFS="#undef LUA_USE_DLOPEN"
-+LUA_BUILD_AS_DLL_DEFS="#undef LUA_BUILD_AS_DLL"
-+
-+if test "x$use_os" == "xwin32"; then
-+  LUA_BUILD_AS_DLL_DEFS="#define LUA_BUILD_AS_DLL"
-+elif test "x$use_os" == "xmacosx"; then
-+  POSIX_DEFS="#define LUA_USE_POSIX"
-+  LUA_DL_DEFS="#define LUA_DL_DYLD"
-+elif test "x$use_os" == "xposix"; then
-+  POSIX_DEFS="#define LUA_USE_POSIX"
-+  LUA_DL_DEFS="#define LUA_DL_DLOPEN"
-+  LUA_LIBS="$LUA_LIBS -ldl"
-+fi
-+AC_SUBST(POSIX_DEFS)
-+AC_SUBST(LUA_DL_DEFS)
-+AC_SUBST(LUA_BUILD_AS_DLL_DEFS)
-+
-+AC_SUBST(LUA_LIBS)
-+
-+AC_CONFIG_FILES([Makefile
-+                 src/Makefile
-+                 src/lua.pc
-+                 src/luaconf.h.template
-+                 doc/Makefile
-+])
-+AC_OUTPUT
-diff -up lua-5.3.0/doc/Makefile.am.autoxxx lua-5.3.0/doc/Makefile.am
---- lua-5.3.0/doc/Makefile.am.autoxxx	2015-01-15 10:20:03.826889574 -0500
-+++ lua-5.3.0/doc/Makefile.am	2015-01-15 10:20:03.826889574 -0500
-@@ -0,0 +1,4 @@
-+man1_MANS = lua.1 luac.1
-+
-+EXTRA_DIST = \
-+	contents.html logo.gif lua.1 luac.1 lua.css manual.css manual.html osi-certified-72x60.png readme.html
-diff -up lua-5.3.0/Makefile.am.autoxxx lua-5.3.0/Makefile.am
---- lua-5.3.0/Makefile.am.autoxxx	2015-01-15 10:20:03.826889574 -0500
-+++ lua-5.3.0/Makefile.am	2015-01-15 10:20:03.826889574 -0500
-@@ -0,0 +1,3 @@
-+SUBDIRS = src doc
-+
-+EXTRA_DIST = README
-diff -up lua-5.3.0/src/.gitignore.autoxxx lua-5.3.0/src/.gitignore
---- lua-5.3.0/src/.gitignore.autoxxx	2015-01-15 10:20:03.826889574 -0500
-+++ lua-5.3.0/src/.gitignore	2015-01-15 10:20:03.826889574 -0500
-@@ -0,0 +1,5 @@
-+lua
-+lua.pc
-+luac
-+luaconf.h
-+luaconf.h.template
-diff -up lua-5.3.0/src/luaconf.h.template.in.autoxxx lua-5.3.0/src/luaconf.h.template.in
---- lua-5.3.0/src/luaconf.h.template.in.autoxxx	2015-01-15 10:20:03.828889562 -0500
-+++ lua-5.3.0/src/luaconf.h.template.in	2015-01-15 10:22:37.420027778 -0500
-@@ -11,6 +11,11 @@
- #include <limits.h>
- #include <stddef.h>
- 
-+@POSIX_DEFS@
-+@LUA_DL_DEFS@
-+@LUA_BUILD_AS_DLL_DEFS@
-+@READLINE_DEFS@
-+
- 
- /*
- ** ===================================================================
-@@ -175,9 +180,9 @@
- 
- #else			/* }{ */
- 
--#define LUA_ROOT	"/usr/local/"
--#define LUA_LDIR	LUA_ROOT "share/lua/" LUA_VDIR "/"
--#define LUA_CDIR	LUA_ROOT "lib/lua/" LUA_VDIR "/"
-+#define LUA_ROOT	"@prefix@/"
-+#define LUA_LDIR	"@pkgdatadir@/lua/" LUA_VDIR "/"
-+#define LUA_CDIR	"@libdir@/lua/" LUA_VDIR "/"
- #define LUA_PATH_DEFAULT  \
- 		LUA_LDIR"?.lua;"  LUA_LDIR"?/init.lua;" \
- 		LUA_CDIR"?.lua;"  LUA_CDIR"?/init.lua;" \
-diff -up lua-5.3.0/src/lua.pc.in.autoxxx lua-5.3.0/src/lua.pc.in
---- lua-5.3.0/src/lua.pc.in.autoxxx	2015-01-15 10:20:03.827889568 -0500
-+++ lua-5.3.0/src/lua.pc.in	2015-01-15 10:20:03.827889568 -0500
-@@ -0,0 +1,13 @@
-+V= @MAJOR_VERSION@
-+R= @VERSION@
-+prefix= @prefix@
-+exec_prefix=${prefix}
-+libdir= @libdir@
-+includedir=${prefix}/include
-+
-+Name: Lua
-+Description: An Extensible Extension Language
-+Version: ${R}
-+Requires:
-+Libs: -llua @LUA_LIBS@
-+Cflags: -I${includedir}
-diff -up lua-5.3.0/src/Makefile.am.autoxxx lua-5.3.0/src/Makefile.am
---- lua-5.3.0/src/Makefile.am.autoxxx	2015-01-15 10:20:03.826889574 -0500
-+++ lua-5.3.0/src/Makefile.am	2015-01-15 10:20:03.826889574 -0500
-@@ -0,0 +1,46 @@
-+AM_CFLAGS = -Wall
-+
-+include_HEADERS = lua.h lualib.h lauxlib.h lua.hpp
-+
-+nodist_include_HEADERS = luaconf.h
-+
-+lib_LTLIBRARIES = liblua.la
-+liblua_la_LDFLAGS = -release @MAJOR_VERSION@
-+liblua_la_SOURCES = \
-+	lapi.c lauxlib.c lbaselib.c lbitlib.c lcode.c lcorolib.c lctype.c ldblib.c \
-+	ldebug.c ldo.c ldump.c lfunc.c lgc.c linit.c liolib.c llex.c lmathlib.c lmem.c \
-+	loadlib.c lobject.c lopcodes.c loslib.c lparser.c lstate.c lstring.c lstrlib.c \
-+	ltable.c ltablib.c ltm.c lundump.c lutf8lib.c lvm.c lzio.c \
-+	lapi.h lcode.h lctype.h ldebug.h ldo.h lfunc.h lgc.h llex.h llimits.h \
-+	lmem.h lobject.h lopcodes.h lparser.h lstate.h lstring.h ltable.h ltm.h \
-+	lundump.h lvm.h lzio.h
-+
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = lua.pc
-+
-+bin_PROGRAMS = lua luac
-+
-+lua_SOURCES = lua.c
-+lua_LDADD = liblua.la @LUA_LIBS@ @READLINE_LIBS@
-+lua_DEPENDENCIES = liblua.la
-+
-+luac_SOURCES = luac.c
-+# Statically link liblua against luac since luac uses symbols not exported in liblua
-+luac_LDADD = .libs/liblua.a @LUA_LIBS@
-+luac_DEPENDENCIES = liblua.la
-+
-+EXTRA_DIST = luaconf.h.template
-+BUILT_SOURCES = luaconf.h
-+CLEANFILES = luaconf.h luaconf.h.template
-+
-+readline_defs = @READLINE_DEFS@
-+
-+edit = 	sed \
-+	  -e 's,%prefix%,$(prefix),g' \
-+	  -e 's,%lua_datadir%,$(datadir),g' \
-+	  -e 's,%lua_libdir%,$(libdir),g'
-+
-+luaconf.h : luaconf.h.template
-+	rm -f $@ $@.tmp
-+	$(edit) $< >$@.tmp
-+	mv $@.tmp $@
diff --git a/subprojects/shared-modules/lua5.3/lua-5.3.0-configure-compat-module.patch b/subprojects/shared-modules/lua5.3/lua-5.3.0-configure-compat-module.patch
deleted file mode 100644
index bd5d41d4..00000000
--- a/subprojects/shared-modules/lua5.3/lua-5.3.0-configure-compat-module.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -up lua-5.2.2/configure.ac.compat-module lua-5.2.2/configure.ac
---- lua-5.2.2/configure.ac.compat-module	2013-05-10 10:16:05.344137597 -0400
-+++ lua-5.2.2/configure.ac	2013-05-10 10:16:05.357137596 -0400
-@@ -11,6 +11,20 @@ AC_PROG_CC
- AC_PROG_LIBTOOL
- 
- AC_ARG_WITH(
-+  [compat-module],
-+  [AC_HELP_STRING([--with-compat-module], [Enable LUA_COMPAT_MODULE functions [default=no]])],
-+  [use_compat_module=$withval],
-+  [use_compat_module=no]
-+)
-+
-+COMPAT_DEFS="#undef LUA_COMPAT_ALL"
-+if test "x$use_compat_module" == "xyes"; then
-+  COMPAT_DEFS="#define LUA_COMPAT_5_1
-+#define LUA_COMPAT_5_2"
-+fi
-+AC_SUBST(COMPAT_DEFS)
-+
-+AC_ARG_WITH(
-   [readline],
-   [AC_HELP_STRING([--with-readline], [Use readline for interpreter input [default=yes]])],
-   [use_readline=$withval],
-diff -up lua-5.2.2/src/luaconf.h.template.in.compat-module lua-5.2.2/src/luaconf.h.template.in
---- lua-5.2.2/src/luaconf.h.template.in.compat-module	2013-05-10 10:25:42.586116963 -0400
-+++ lua-5.2.2/src/luaconf.h.template.in	2013-05-10 10:26:29.957115269 -0400
-@@ -15,6 +15,7 @@
- @LUA_DL_DEFS@
- @LUA_BUILD_AS_DLL_DEFS@
- @READLINE_DEFS@
-+@COMPAT_DEFS@
- 
- 
- /*
diff --git a/subprojects/shared-modules/lua5.3/lua-5.3.0-idsize.patch b/subprojects/shared-modules/lua5.3/lua-5.3.0-idsize.patch
deleted file mode 100644
index 16107fe2..00000000
--- a/subprojects/shared-modules/lua5.3/lua-5.3.0-idsize.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up lua-5.3.0/src/luaconf.h.template.in.idsize lua-5.3.0/src/luaconf.h.template.in
---- lua-5.3.0/src/luaconf.h.template.in.idsize	2015-01-15 10:23:20.515801344 -0500
-+++ lua-5.3.0/src/luaconf.h.template.in	2015-01-15 10:23:48.955651916 -0500
-@@ -693,7 +693,7 @@
- @@ of a function in debug information.
- ** CHANGE it if you want a different size.
- */
--#define LUA_IDSIZE	60
-+#define LUA_IDSIZE	512
- 
- 
- /*
diff --git a/subprojects/shared-modules/lua5.3/lua-5.3.5.json b/subprojects/shared-modules/lua5.3/lua-5.3.5.json
index fd5f2682..c789fd65 100644
--- a/subprojects/shared-modules/lua5.3/lua-5.3.5.json
+++ b/subprojects/shared-modules/lua5.3/lua-5.3.5.json
@@ -1,7 +1,17 @@
 {
     "name": "lua-5.3",
-    "config-opts": [
-        "--with-compat-module"
+    "buildsystem": "simple",
+    "build-commands": [
+        "make -j $FLATPAK_BUILDER_N_JOBS CFLAGS=\"$CFLAGS -fPIC -DLUA_USE_LINUX\" linux",
+        "make TO_LIB=liblua.so.5.3.5 INSTALL_TOP=$FLATPAK_DEST install",
+        "ln -sf liblua.so.5.3.5 $FLATPAK_DEST/lib/liblua.so",
+        "ln -sf liblua.so.5.3.5 $FLATPAK_DEST/lib/liblua.so.5.3",
+        "make INSTALL_TOP=${FLATPAK_DEST} pc > lua.pc",
+        "cat lua.pc.in >> lua.pc",
+        "install -Dm644 lua.pc $FLATPAK_DEST/lib/pkgconfig/lua.pc",
+        "ln -sf lua.pc $FLATPAK_DEST/lib/pkgconfig/lua53.pc",
+        "ln -sf lua.pc $FLATPAK_DEST/lib/pkgconfig/lua5.3.pc",
+        "ln -sf lua.pc $FLATPAK_DEST/lib/pkgconfig/lua-5.3.pc"
     ],
     "sources": [
         {
@@ -10,25 +20,27 @@
             "sha256": "0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac"
         },
         {
-            "type": "shell",
-            "commands": [ "mv src/luaconf.h src/luaconf.h.template.in" ]
-        },
-        {
             "type": "patch",
-            "path": "lua-5.3.0-autotoolize.patch"
+            "path": "makefile-add-liblua.so-rule.patch"
         },
         {
-            "type": "patch",
-            "path": "lua-5.3.0-idsize.patch"
-        },
-        {
-            "type": "patch",
-            "path": "lua-5.3.0-configure-compat-module.patch"
+            "type": "file",
+            "path": "lua.pc.in"
         },
         {
             "type": "shell",
-            "commands": [ "autoreconf -i" ]
+            "commands": [
+                "sed -i \"s|/usr/local/|$FLATPAK_DEST/|;s|LUA_IDSIZE	60|LUA_IDSIZE	512|\" src/luaconf.h",
+                "# Lua 5.3.5 has wrong release version in its Makefile. Fix it.",
+                "sed 's/^R= \$V.4/R= \$V.5/' -i Makefile",
+                "sed -i '12 a\\\\n#define LUA_COMPAT_5_1\\n#define LUA_COMPAT_5_2' src/luaconf.h"
+            ]
         }
     ],
-    "cleanup": [ "/bin", "/include", "/lib/pkgconfig", "/lib/*.a", "/lib/*.la", "/share/man" ]
+    "cleanup": [
+        "/bin",
+        "/include",
+        "/lib/pkgconfig",
+        "/share/man"
+    ]
 }
diff --git a/subprojects/shared-modules/lua5.3/lua.pc.in b/subprojects/shared-modules/lua5.3/lua.pc.in
new file mode 100644
index 00000000..6698f8bc
--- /dev/null
+++ b/subprojects/shared-modules/lua5.3/lua.pc.in
@@ -0,0 +1,8 @@
+exec_prefix=${prefix}
+
+Name: Lua
+Description: An Extensible Extension Language
+Version: ${version}
+Requires: 
+Libs: -L${libdir} -llua -lm
+Cflags: -I${includedir}
+\ No newline at end of file
diff --git a/subprojects/shared-modules/lua5.3/makefile-add-liblua.so-rule.patch b/subprojects/shared-modules/lua5.3/makefile-add-liblua.so-rule.patch
new file mode 100644
index 00000000..f675d4d4
--- /dev/null
+++ b/subprojects/shared-modules/lua5.3/makefile-add-liblua.so-rule.patch
@@ -0,0 +1,47 @@
+diff --git a/Makefile b/Makefile
+index 7fa91c8..dccf485 100644
+--- a/Makefile
++++ b/Makefile
+@@ -52,7 +52,7 @@ R= $V.0
+ all:	$(PLAT)
+ 
+ $(PLATS) clean:
+-	cd src && $(MAKE) $@
++	cd src && $(MAKE) $@ V=$(V) R=$(R)
+ 
+ test:	dummy
+ 	src/lua -v
+diff --git a/src/Makefile b/src/Makefile
+index 2e7a412..fa5769f 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -29,6 +29,7 @@ MYOBJS=
+ PLATS= aix bsd c89 freebsd generic linux macosx mingw posix solaris
+ 
+ LUA_A=	liblua.a
++LUA_SO= liblua.so
+ CORE_O=	lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
+ 	lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \
+ 	ltm.o lundump.o lvm.o lzio.o
+@@ -43,7 +44,7 @@ LUAC_T=	luac
+ LUAC_O=	luac.o
+ 
+ ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
+-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
++ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO)
+ ALL_A= $(LUA_A)
+ 
+ # Targets start here.
+@@ -59,6 +60,12 @@ $(LUA_A): $(BASE_O)
+ 	$(AR) $@ $(BASE_O)
+ 	$(RANLIB) $@
+ 
++$(LUA_SO): $(CORE_O) $(LIB_O)
++	$(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS)
++	ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V)
++	ln -sf $(LUA_SO).$(R) $(LUA_SO)
++
++
+ $(LUA_T): $(LUA_O) $(LUA_A)
+ 	$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
+ 
+\ No newline at end of file
diff --git a/subprojects/shared-modules/lua5.4/lua-5.4.json b/subprojects/shared-modules/lua5.4/lua-5.4.json
new file mode 100644
index 00000000..a164fb83
--- /dev/null
+++ b/subprojects/shared-modules/lua5.4/lua-5.4.json
@@ -0,0 +1,44 @@
+{
+    "name": "lua-5.4",
+    "buildsystem": "simple",
+    "build-commands": [
+        "make -j $FLATPAK_BUILDER_N_JOBS CFLAGS=\"$CFLAGS -fPIC -DLUA_USE_LINUX\" linux",
+        "make TO_LIB=liblua.so.5.4.4 INSTALL_TOP=$FLATPAK_DEST install",
+        "ln -sf liblua.so.5.4.4 $FLATPAK_DEST/lib/liblua.so",
+        "ln -sf liblua.so.5.4.4 $FLATPAK_DEST/lib/liblua.so.5.4",
+        "make INSTALL_TOP=${FLATPAK_DEST} pc > lua.pc",
+        "cat lua.pc.in >> lua.pc",
+        "install -Dm644 lua.pc $FLATPAK_DEST/lib/pkgconfig/lua.pc",
+        "ln -sf lua.pc $FLATPAK_DEST/lib/pkgconfig/lua54.pc",
+        "ln -sf lua.pc $FLATPAK_DEST/lib/pkgconfig/lua5.4.pc",
+        "ln -sf lua.pc $FLATPAK_DEST/lib/pkgconfig/lua-5.4.pc"
+    ],
+    "sources": [
+        {
+            "type": "archive",
+            "url": "https://www.lua.org/ftp/lua-5.4.4.tar.gz",
+            "sha256": "164c7849653b80ae67bec4b7473b884bf5cc8d2dca05653475ec2ed27b9ebf61"
+        },
+        {
+            "type": "patch",
+            "path": "makefile-add-liblua.so-rule.patch"
+        },
+        {
+            "type": "file",
+            "path": "lua.pc.in"
+        },
+        {
+            "type": "shell",
+            "commands": [
+                "sed -i \"s|/usr/local/|$FLATPAK_DEST/|;s|LUA_IDSIZE	60|LUA_IDSIZE	512|\" src/luaconf.h",
+                "sed -i '12 a\\\\n#define LUA_COMPAT_5_1\\n#define LUA_COMPAT_5_2' src/luaconf.h"
+            ]
+        }
+    ],
+    "cleanup": [
+        "/bin",
+        "/include",
+        "/lib/pkgconfig",
+        "/share/man"
+    ]
+}
diff --git a/subprojects/shared-modules/lua5.4/lua.pc.in b/subprojects/shared-modules/lua5.4/lua.pc.in
new file mode 100644
index 00000000..6698f8bc
--- /dev/null
+++ b/subprojects/shared-modules/lua5.4/lua.pc.in
@@ -0,0 +1,8 @@
+exec_prefix=${prefix}
+
+Name: Lua
+Description: An Extensible Extension Language
+Version: ${version}
+Requires: 
+Libs: -L${libdir} -llua -lm
+Cflags: -I${includedir}
+\ No newline at end of file
diff --git a/subprojects/shared-modules/lua5.4/makefile-add-liblua.so-rule.patch b/subprojects/shared-modules/lua5.4/makefile-add-liblua.so-rule.patch
new file mode 100644
index 00000000..7452f106
--- /dev/null
+++ b/subprojects/shared-modules/lua5.4/makefile-add-liblua.so-rule.patch
@@ -0,0 +1,42 @@
+--- a/Makefile	2021-12-24 10:55:05.836294155 -0500
++++ b/Makefile	2021-03-02 15:04:35.000000000 -0500
+@@ -52,7 +52,7 @@
+ all:	$(PLAT)
+ 
+ $(PLATS) help test clean:
+-	@cd src && $(MAKE) $@
++	@cd src && $(MAKE) $@ V=$(V) R=$(R)
+ 
+ install: dummy
+ 	cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)
+--- a/src/Makefile	2021-12-24 10:56:23.279935521 -0500
++++ b/src/Makefile	2021-02-09 13:47:17.000000000 -0500
+@@ -32,6 +32,7 @@
+ PLATS= guess aix bsd c89 freebsd generic linux linux-readline macosx mingw posix solaris
+ 
+ LUA_A=	liblua.a
++LUA_SO= liblua.so
+ CORE_O=	lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o lundump.o lvm.o lzio.o
+ LIB_O=	lauxlib.o lbaselib.o lcorolib.o ldblib.o liolib.o lmathlib.o loadlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o linit.o
+ BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS)
+@@ -44,7 +44,7 @@
+ LUAC_O=	luac.o
+ 
+ ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
+-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
++ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO)
+ ALL_A= $(LUA_A)
+ 
+ # Targets start here.
+@@ -60,6 +60,11 @@
+ 	$(AR) $@ $(BASE_O)
+ 	$(RANLIB) $@
+ 
++$(LUA_SO): $(CORE_O) $(LIB_O)
++	$(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS)
++	ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V)
++	ln -sf $(LUA_SO).$(R) $(LUA_SO)
++
+ $(LUA_T): $(LUA_O) $(LUA_A)
+ 	$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
+ 
diff --git a/subprojects/shared-modules/mac/mac.json b/subprojects/shared-modules/mac/mac.json
new file mode 100644
index 00000000..101b3dc2
--- /dev/null
+++ b/subprojects/shared-modules/mac/mac.json
@@ -0,0 +1,19 @@
+{
+  "name": "libmac",
+  "subdir": "Source/Projects/NonWindows",
+  "no-autogen": true,
+  "make-install-args": [
+    "prefix=/app"
+  ],
+  "cleanup": [
+    "/include/MAC"
+  ],
+  "sources": [
+    {
+        "type": "archive",
+        "url": "https://freac.org/patches/MAC_SDK_723.zip",
+        "sha256": "1d17d469dd2b4652e19cb91aa7cf76786fec999871a8f5729cd24064f989e9ae",
+        "strip-components": 0
+    }
+  ]
+}
diff --git a/subprojects/shared-modules/openjpeg/openjpeg.json b/subprojects/shared-modules/openjpeg/openjpeg.json
deleted file mode 100644
index 5eefa4c8..00000000
--- a/subprojects/shared-modules/openjpeg/openjpeg.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "name": "openjpeg",
-  "buildsystem": "cmake-ninja",
-  "builddir": true,
-  "config-opts": [
-    "-DCMAKE_BUILD_TYPE=RelWithDebInfo",
-    "-DBUILD_CODEC:BOOL=OFF",
-    "-DBUILD_DOC:BOOL=OFF",
-    "-DBUILD_STATIC_LIBS:BOOL=OFF",
-    "-DBUILD_TESTING:BOOL=OFF"
-  ],
-  "sources": [
-    {
-      "type": "archive",
-      "url": "https://github.com/uclouvain/openjpeg/archive/v2.3.1.tar.gz",
-      "sha256": "63f5a4713ecafc86de51bfad89cc07bb788e9bba24ebbf0c4ca637621aadb6a9"
-    }
-  ],
-  "cleanup": [
-    "/include",
-    "/lib/openjpeg-*",
-    "/lib/pkgconfig",
-    "/share"
-  ]
-}
diff --git a/subprojects/shared-modules/physfs/physfs.json b/subprojects/shared-modules/physfs/physfs.json
new file mode 100644
index 00000000..5cc06271
--- /dev/null
+++ b/subprojects/shared-modules/physfs/physfs.json
@@ -0,0 +1,18 @@
+{
+    "name": "PhysicsFS",
+    "buildsystem": "cmake-ninja",
+    "config-opts": [ "-DPHYSFS_BUILD_TEST=OFF", "-DPHYSFS_BUILD_STATIC=OFF" ],
+    "cleanup": [
+        "/include",
+        "/lib/pkgconfig",
+        "/bin"
+    ],
+    "sources": [
+        {
+            "type": "archive",
+            "url": "https://icculus.org/physfs/downloads/physfs-3.0.2.tar.bz2",
+            "sha256": "304df76206d633df5360e738b138c94e82ccf086e50ba84f456d3f8432f9f863",
+            "size": 194888
+        }
+    ]
+}
diff --git a/subprojects/shared-modules/pygame/pygame-1.9.4.json b/subprojects/shared-modules/pygame/pygame-1.9.6.json
index b80e892d..d3c84c77 100644
--- a/subprojects/shared-modules/pygame/pygame-1.9.4.json
+++ b/subprojects/shared-modules/pygame/pygame-1.9.6.json
@@ -3,8 +3,8 @@
     "sources": [
         {
             "type": "archive",
-            "url": "https://files.pythonhosted.org/packages/b2/6b/c510f0853765eb2219ca5aa3d416d65bb0dea7cd9bb2984aea0a0e04c24d/pygame-1.9.4.tar.gz",
-            "sha256": "700d1781c999af25d11bfd1f3e158ebb660f72ebccb2040ecafe5069d0b2c0b6"
+            "url": "https://files.pythonhosted.org/packages/0f/9c/78626be04e193c0624842090fe5555b3805c050dfaa81c8094d6441db2be/pygame-1.9.6.tar.gz",
+            "sha256": "301c6428c0880ecd4a9e3951b80e539c33863b6ff356a443db1758de4f297957"
         }
     ],
     "buildsystem": "simple",
@@ -78,8 +78,8 @@
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://downloads.sourceforge.net/project/fluidsynth/fluidsynth-1.1.6/fluidsynth-1.1.6.tar.bz2",
-                    "sha256": "d28b47dfbf7f8e426902ae7fa2981d821fbf84f41da9e1b85be933d2d748f601"
+                    "url": "https://github.com/FluidSynth/fluidsynth/archive/refs/tags/v1.1.11.tar.gz",
+                    "sha256": "da8878ff374d12392eecf87e96bad8711b8e76a154c25a571dd8614d1af80de8"
                 },
                 {
                     "type": "patch",
diff --git a/subprojects/shared-modules/pygtk/pygtk.json b/subprojects/shared-modules/pygtk/pygtk.json
new file mode 100644
index 00000000..5319e4b3
--- /dev/null
+++ b/subprojects/shared-modules/pygtk/pygtk.json
@@ -0,0 +1,107 @@
+{
+  "name": "pygtk",
+  "config-opts": [
+    "--disable-docs"
+  ],
+  "sources": [
+    {
+      "type": "archive",
+      "url": "https://download.gnome.org/sources/pygtk/2.24/pygtk-2.24.0.tar.gz",
+      "sha256": "6e3e54fa6e65a69ac60bd58cb2e60a57f3346ac52efe995f3d10b6c38c972fd8"
+    },
+    {
+      "type": "patch",
+      "path": "pygtk.patch"
+    },
+    {
+      "type": "shell",
+      "commands": [
+        "cp -p /usr/share/automake-*/config.{sub,guess} ."
+      ]
+    }
+  ],
+  "cleanup": [
+    "/bin",
+    "/include/pygtk-2.0",
+    "*.la",
+    "/lib/pkgconfig",
+    "/lib/pygtk",
+    "/share/gtk-doc",
+    "/share/pygtk"
+  ],
+  "modules": [
+    {
+      "name": "python2-pycairo",
+      "buildsystem": "meson",
+      "config-opts": [
+        "-Dpython=python2"
+      ],
+      "cleanup": [
+        "/include/pycairo",
+        "/lib/pkgconfig",
+        "/lib/python2.7/site-packages/cairo/include"
+      ],
+      "sources": [
+        {
+          "type": "archive",
+          "url": "https://github.com/pygobject/pycairo/releases/download/v1.18.2/pycairo-1.18.2.tar.gz",
+          "sha256": "dcb853fd020729516e8828ad364084e752327d4cff8505d20b13504b32b16531"
+        }
+      ]
+    },
+    {
+      "name": "pygobject",
+      "config-opts": [
+        "--disable-glibtest"
+      ],
+      "cleanup": [
+        "/bin",
+        "/include/pygtk-2.0",
+        "*.la",
+        "/lib/pkgconfig",
+        "/share/gtk-doc",
+        "/share/pygobject"
+      ],
+      "sources": [
+        {
+          "type": "archive",
+          "url": "https://download.gnome.org/sources/pygobject/2.28/pygobject-2.28.7.tar.xz",
+          "sha256": "bb9d25a3442ca7511385a7c01b057492095c263784ef31231ffe589d83a96a5a"
+        }
+      ]
+    },
+    {
+      "name": "libglade",
+      "rm-configure": true,
+      "cleanup": [
+        "/bin",
+        "/include/libglade-2.0",
+        "*.a",
+        "*.la",
+        "/lib/pkgconfig",
+        "/share/gtk-doc",
+        "/share/xml/libglade"
+      ],
+      "sources": [
+        {
+          "type": "archive",
+          "url": "https://download.gnome.org/sources/libglade/2.6/libglade-2.6.4.tar.gz",
+          "sha256": "c41d189b68457976069073e48d6c14c183075d8b1d8077cb6dfb8b7c5097add3"
+        },
+        {
+          "type": "shell",
+          "commands": [
+            "rm -f config.guess"
+          ]
+        },
+        {
+          "type": "script",
+          "commands": [
+            "autoreconf -fiv"
+          ],
+          "dest-filename": "autogen.sh"
+        }
+      ]
+    }
+  ]
+}
diff --git a/subprojects/shared-modules/pygtk/pygtk.patch b/subprojects/shared-modules/pygtk/pygtk.patch
new file mode 100644
index 00000000..ba4141e3
--- /dev/null
+++ b/subprojects/shared-modules/pygtk/pygtk.patch
@@ -0,0 +1,39 @@
+From 877164b6b70780468a31d8211f29421b6f34b0c8 Mon Sep 17 00:00:00 2001
+From: Mathieu Bridon <bochecha@daitauha.fr>
+Date: Thu, 24 Oct 2019 22:58:36 +0200
+Subject: [PATCH] Drop the PangoFont find_shaper virtual method
+
+This API has been removed from Pango 1.44.6, because it was completely
+unused by anything.
+
+However, PyGTK tries to bind everything, even unused API.
+
+Removing this from PyGTK means we can build it against the latest Pango
+again.
+---
+ pango.defs | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/pango.defs b/pango.defs
+index 2a79ecc..862667a 100644
+--- a/pango.defs
++++ b/pango.defs
+@@ -1391,15 +1391,6 @@
+   )
+ )
+ 
+-(define-virtual find_shaper
+-  (of-object "PangoFont")
+-  (return-type "PangoEngineShape*")
+-  (parameters
+-    '("PangoLanguage*" "lang")
+-    '("guint32" "ch")
+-  )
+-)
+-
+ (define-virtual get_glyph_extents
+   (of-object "PangoFont")
+   (return-type "none")
+-- 
+2.21.0
+
diff --git a/subprojects/shared-modules/python2.7/python-2.7.json b/subprojects/shared-modules/python2.7/python-2.7.json
index 14253764..afdef902 100644
--- a/subprojects/shared-modules/python2.7/python-2.7.json
+++ b/subprojects/shared-modules/python2.7/python-2.7.json
@@ -3,8 +3,8 @@
     "sources": [
         {
             "type": "archive",
-            "url": "https://www.python.org/ftp/python/2.7.17/Python-2.7.17.tar.xz",
-            "sha256": "4d43f033cdbd0aa7b7023c81b0e986fd11e653b5248dac9144d508f11812ba41"
+            "url": "https://www.python.org/ftp/python/2.7.18/Python-2.7.18.tar.xz",
+            "sha256": "b62c0e7937551d0cc02b8fd5cb0f544f9405bafc9a54d3808ed4594812edef43"
         }
     ],
     "config-opts": [
diff --git a/subprojects/shared-modules/qt4/fixgcc11.patch b/subprojects/shared-modules/qt4/fixgcc11.patch
new file mode 100644
index 00000000..b0fd3d1b
--- /dev/null
+++ b/subprojects/shared-modules/qt4/fixgcc11.patch
@@ -0,0 +1,11 @@
+--- a/tools/linguist/linguist/messagemodel.cpp    2021-06-07 12:18:43.713434493 +0200
++++ b/tools/linguist/linguist/messagemodel.cpp    2021-06-07 12:24:24.828016548 +0200
+@@ -183,7 +183,7 @@
+         if (ContextItem *c = one->findContext(oc->context())) {
+             for (int j = 0; j < oc->messageCount(); ++j) {
+                 MessageItem *m = oc->messageItem(j);
+-                if (c->findMessage(m->text(), m->comment()) >= 0)
++                if (c->findMessage(m->text(), m->comment()))
+                     ++inBoth;
+             }
+         }
diff --git a/subprojects/shared-modules/qt4/fixgcc9.patch b/subprojects/shared-modules/qt4/fixgcc9.patch
new file mode 100644
index 00000000..6501a83c
--- /dev/null
+++ b/subprojects/shared-modules/qt4/fixgcc9.patch
@@ -0,0 +1,31 @@
+--- qt-everywhere-opensource-src-4.8.7/src/corelib/global/qglobal.h	2015-05-07 16:14:48.000000000 +0200
++++ qt-everywhere-opensource-src-4.8.7-gcc9/src/corelib/global/qglobal.h	2020-05-28 16:24:45.160340385 +0200
+@@ -2482,22 +2482,22 @@
+ 
+ #endif /* Q_NO_TYPESAFE_FLAGS */
+ 
+-#if defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && !defined(Q_CC_RVCT)
++#if (defined(Q_CC_GNU) && !defined(Q_CC_RVCT))
+ /* make use of typeof-extension */
+ template <typename T>
+ class QForeachContainer {
+ public:
+-    inline QForeachContainer(const T& t) : c(t), brk(0), i(c.begin()), e(c.end()) { }
++    inline QForeachContainer(const T& t) : c(t), i(c.begin()), e(c.end()), control(1) { }
+     const T c;
+-    int brk;
+     typename T::const_iterator i, e;
++    int control;
+ };
+ 
+ #define Q_FOREACH(variable, container)                                \
+ for (QForeachContainer<__typeof__(container)> _container_(container); \
+-     !_container_.brk && _container_.i != _container_.e;              \
+-     __extension__  ({ ++_container_.brk; ++_container_.i; }))                       \
+-    for (variable = *_container_.i;; __extension__ ({--_container_.brk; break;}))
++     _container_.control && _container_.i != _container_.e;         \
++     ++_container_.i, _container_.control ^= 1)                     \
++    for (variable = *_container_.i; _container_.control; _container_.control = 0)
+ 
+ #else
+ 
diff --git a/subprojects/shared-modules/qt4/qt4-4.8.7-minimal.json b/subprojects/shared-modules/qt4/qt4-4.8.7-minimal.json
index fe7b74a4..00cc5706 100644
--- a/subprojects/shared-modules/qt4/qt4-4.8.7-minimal.json
+++ b/subprojects/shared-modules/qt4/qt4-4.8.7-minimal.json
@@ -77,6 +77,14 @@
             "path": "disable-sslv3.patch"
         },
         {
+            "type": "patch",
+            "path": "fixgcc9.patch"
+        },
+        {
+            "type": "patch",
+            "path": "fixgcc11.patch"
+        },
+        {
             "type": "shell",
             "commands": [
                 "sed -i \"s|-O2|${CXXFLAGS}|\" mkspecs/common/{g++,gcc}-base.conf",
diff --git a/subprojects/shared-modules/smpeg/smpeg-0.4.5.json b/subprojects/shared-modules/smpeg/smpeg-0.4.5.json
index a4d82aab..a931bac9 100644
--- a/subprojects/shared-modules/smpeg/smpeg-0.4.5.json
+++ b/subprojects/shared-modules/smpeg/smpeg-0.4.5.json
@@ -13,6 +13,12 @@
             "sha256": "1276ea797dd9fde8a12dd3f33f180153922544c28ca9fc7b477c018876be1916"
         },
         {
+            "type": "shell",
+            "commands": [
+                "sed -i '/^## libtool.m4/,/^#####/d' acinclude.m4"
+            ]
+        },
+        {
             "type": "script",
             "dest-filename": "autogen.sh",
             "commands": [
diff --git a/subprojects/shared-modules/vorbisgain/0001-temp_files.patch b/subprojects/shared-modules/vorbisgain/0001-temp_files.patch
new file mode 100644
index 00000000..4e6d6706
--- /dev/null
+++ b/subprojects/shared-modules/vorbisgain/0001-temp_files.patch
@@ -0,0 +1,75 @@
+Description: Apply patch to use temp files, which are dependent
+ on the file which is beeing processed, instead always using the same
+ filename, which can result to data loss in scenarios where two or more
+ vorbis processes are running parallel.
+Author: Pavel N. Krivitsky <pavel@krivitsky.name>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=505164
+Forwarded: no
+---
+ vorbis.c |   17 +++++++++--------
+ 1 file changed, 9 insertions(+), 8 deletions(-)
+
+--- a/vorbis.c
++++ b/vorbis.c
+@@ -56,7 +56,7 @@
+ #define PROGRESS_FORMAT_SIZE 8
+ #define MIN_FILENAME_SIZE 5
+ #define MIN_MIDDLE_TRUNCATE_SIZE 20
+-#define TEMP_NAME "vorbisgain.tmpXXXXXX"
++#define TEMP_EXT ".vgain.tmpXXXXXX"
+ 
+ 
+ /**
+@@ -684,11 +684,10 @@
+         }
+     }
+ 
+-    /* Make sure temp is in same folder as file. And yes, the malloc is larger
+-     * than necessary (and not always needed). Lets keep it simple though (at
+-     * the expense of a few bytes)...
++    /* Construct a temporary file name by appending TEMP_EXT to
++     * the name of the file being modified.
+      */
+-    temp_name = malloc(strlen(filename) + sizeof(TEMP_NAME));
++    temp_name = malloc(strlen(filename)*sizeof(char) + sizeof(TEMP_EXT));
+ 
+     if (temp_name == NULL)
+     {
+@@ -697,7 +696,7 @@
+     }
+ 
+     strcpy(temp_name, filename);
+-    strcpy((char *) last_path(temp_name), TEMP_NAME);
++    strcat(temp_name, TEMP_EXT);
+ 
+ #ifdef WIN32
+     temp_name = _mktemp(temp_name);
+@@ -779,6 +778,7 @@
+         file_error(_("Note: Couldn't set mode for file '%s': "), filename);
+     }
+ 
++#if 0 /* Disable for Debian, this surprises people and is not useful --liw */
+     utime_buf.actime = stat_buf.st_atime;
+     utime_buf.modtime = stat_buf.st_mtime;
+ 
+@@ -786,6 +786,7 @@
+     {
+         file_error(_("Note: Couldn't set time for file '%s': "), filename);
+     }
++#endif
+ 
+     result = 0;
+ 
+@@ -817,10 +818,10 @@
+ 
+     if (delete_temp)
+     {
+-        if (remove(TEMP_NAME) != 0)
++        if (remove(temp_name) != 0)
+         {
+             file_error(_("Note: Couldn't remove temporary file '%s': "), 
+-                TEMP_NAME);
++                temp_name);
+         }
+     }
+ 
diff --git a/subprojects/shared-modules/vorbisgain/0002-errno.patch b/subprojects/shared-modules/vorbisgain/0002-errno.patch
new file mode 100644
index 00000000..b01f2ad8
--- /dev/null
+++ b/subprojects/shared-modules/vorbisgain/0002-errno.patch
@@ -0,0 +1,33 @@
+Description: Zero errno before readdir call.
+From: http://bugs.debian.org/375110
+Forwarded: no
+---
+ recurse.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/recurse.c
++++ b/recurse.c
+@@ -408,6 +408,7 @@
+  */
+ static int read_dir(DIRECTORY *directory)
+ {
++    errno = 0;
+     directory->entry = readdir(directory->dir);
+ 
+     if (directory->entry != NULL)
+@@ -622,6 +623,7 @@
+     /* Check for wildcards */
+     settings->pattern = last_path(my_path);
+ 
++#if 0 /* Disable for Debian, as it suprises people. --liw */
+     if (contains_pattern(settings->pattern))
+     {
+         /* Strip last part of path */
+@@ -637,6 +639,7 @@
+         }
+     }
+     else
++#endif
+     {
+         settings->pattern = NULL;
+     }
diff --git a/subprojects/shared-modules/vorbisgain/0003-manpage.patch b/subprojects/shared-modules/vorbisgain/0003-manpage.patch
new file mode 100644
index 00000000..8aaeaf1c
--- /dev/null
+++ b/subprojects/shared-modules/vorbisgain/0003-manpage.patch
@@ -0,0 +1,248 @@
+Description: Man page says --silent, should be --skip
+From: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=355783
+Forwarded: no
+---
+ vorbisgain.1 |   60 ++++++++++++-----------------------------------------------
+ 1 file changed, 13 insertions(+), 47 deletions(-)
+
+--- a/vorbisgain.1
++++ b/vorbisgain.1
+@@ -2,10 +2,8 @@
+ .\" groff -man -Tascii vorbisgain.1
+ .\"
+ .TH vorbisgain 1 "2004 Jan 3" "" "VorbisGain"
+-
+ .SH NAME
+ vorbisgain \- calculate the replay gain for Ogg Vorbis files
+-
+ .SH SYNOPSIS
+ .B vorbisgain
+ [
+@@ -16,7 +14,6 @@
+ .I album gain
+ ]
+ .I input_files \fR...
+-
+ .SH DESCRIPTION
+ .B vorbisgain
+ calculates the ReplayGain values for the named Ogg Vorbis input files and
+@@ -27,7 +24,6 @@
+ uses a default target level of 89 dB, rather than the 83 dB recommended by the
+ ReplayGain standard, when calculating the gain to apply. (Some players include
+ a pre-amplification setting with which the target level can be changed.)
+-
+ .PP
+ .B vorbisgain
+ input files must be Ogg Vorbis I files with 1 or 2 channels and a sample rate
+@@ -35,21 +31,16 @@
+ kHz. If an input file contains multiple streams (i.e., it is chained), the
+ streams must all have the same format, in terms of sampling frequency and
+ number of channels.
+-
+ .PP
+ All streams in a chained file are processed, but the ReplayGain tags are
+ only written to (or removed from) the first stream.
+-
+ .SH OPTIONS
+-
+ .IP "-h, --help"
+ Show command help.
+-
+ .IP "-a, --album"
+ Activates album mode, in which the album gain (sometimes called the audiophile
+ gain) is calculated in addition to the track gain (sometimes called the radio
+ gain).
+-
+ .IP "-g n, --album-gain=n"
+ Sets the album gain value to use. Default is to calculate it, if
+ .I -a
+@@ -59,38 +50,31 @@
+ dB, specifying the
+ .B change
+ in volume that should be applied.
+-
+ .IP "-c, --clean"
+ Remove any ReplayGain tags from the specified files. If a file does not
+ contain any ReplayGain tags, the file is not modified.
+-
+ .IP "-C, --convert"
+ Convert old format ReplayGain tags to a new format (see section TAG FORMAT
+ below for details). If a file does not contain all ReplayGain tags that are
+ needed for a conversion, the file is not modified. The album peak tag is
+ only created if
+ .I -a
+-is specified, and the album gain value is then checked for concistency.
++is specified, and the album gain value is then checked for consistency.
+ Otherwise any album gain is converted without any checks.
+-
+ .IP "-d, --display-only"
+ Display the result only; do not write anything to disk. This applies to all
+ options.
+-
+ .IP "-f, --fast"
+ Only calculate the gain for files that do not contain all replay gain tags
+ needed (the album gain and peak tags are only considered if
+ .I -a
+ has been specified).
+-
+ .IP "-n, --no-progress"
+ Only display results, but don't show progress in percentages and times. This
+ can be useful if the output is piped into other programs.
+-
+ .IP "-q, --quiet"
+ Do not display any output while processing. Only error and warning messages will
+ be printed.
+-
+ .IP "-r, --recursive"
+ Enter directories (recursively) and search for files, if directories or file
+ patterns are specified.
+@@ -98,65 +82,51 @@
+ Only available if
+ .B vorbisgain
+ was configured with --enable-recursive.
+-
+-.IP "-s, --silent"
+-Sliently skip any non-Vorbis files found. Vorbis files that can't be processed
++.IP "-s, --skip"
++Silently skip any non-Vorbis files found. Vorbis files that can't be processed
+ for some reason are skipped as well, though not silently. Default is to stop
+ when such files are encountered.
+-
+ .IP "-v, --version"
+ Display the version of the program.
+-
+ .SH EXAMPLES
+-
+ Simplest version. Calculate the track gain and peak only.
+ .PP
+ .RS
+ vorbisgain somefile.ogg
+ .RE
+-
+ .PP
+ Note that the following examples are only possible if
+ .B vorbisgain
+ was configured with --enable-recursive.
+-
+ .PP
+ Calculate the album gain and peak, in addition to the track gain and peak, for
+ all .ogg files in the directory "music" (and all subdirectories). All files in
+ one directory are treated as belonging to the same album. Files that already
+ have ReplayGain tags are not re-calculated. Note the quotes, as they cause the
+ shell to not do any filename globbing:
+-
+ .PP
+ .RS
+ vorbisgain -a -f -r "music/*.ogg"
+ .RE
+-
+ .PP
+ Calculate the album gain. The files specified before the directory "album"
+ are treated as one album, the files in the directory "album" as another
+ album and the remaining files as a third album:
+-
+ .PP
+ .RS
+ vorbisgain -a -r a.ogg b.ogg c.ogg album d.ogg e.ogg f.ogg
+ .RE
+-
+ .PP
+ Remove all replaygain tags from a collection of oggs:
+-
+ .PP
+ .RS
+ vorbisgain -c -r "music/*.ogg"
+ .RE
+-
+ .SH TAG FORMAT
+-
+ .B vorbisgain
+ creates tags like these (when in
+ .I -a
+ mode):
+-
+ .PP
+ .RS
+ REPLAYGAIN_TRACK_GAIN=-7.03 dB
+@@ -170,18 +140,15 @@
+ .RS
+ REPLAYGAIN_ALBUM_PEAK=1.21822226
+ .RE
+-
+ .PP
+ Gain specifies how much the volume should be changed before playback, in dB.
+ Peak is the maximum sample value of the file before any gain has been
+ applied, where 1.0 means "full sample value" (32,767 when decoding to signed
+ 16 bit samples).
+-
+ .PP
+ Earlier versions of
+ .B vorbisgain
+ (before 0.30) created the following tags:
+-
+ .PP
+ .RS
+ RG_RADIO
+@@ -192,7 +159,6 @@
+ .RS
+ RG_AUDIOPHILE
+ .RE
+-
+ .PP
+ When
+ .I -c
+@@ -200,44 +166,44 @@
+ REPLAYGAIN_TRACK_PEAK, RG_AUDIOPHILE to REPLAYGAIN_ALBUM_GAIN and
+ REPLAYGAIN_ALBUM_PEAK is calculated as the maximum of all RG_PEAK tags in
+ the album.
+-
+ .SH AUTHORS
+-
+ .TP
+ Program Code:
+ .br
+ Gian-Carlo Pascutto <gcp@sjeng.org>
+ .br
+ Magnus Holmgren <lear@algonet.se>
+-
+ .TP
+ ReplayGain Analysis Code:
+ .br
+ Glen Sawyer <glensawyer@hotmail.com>
+ .br
+ Frank Klemm (http://www.uni-jena.de/~pfk/)
+-
+ .TP
+ Man Page:
+ .br
+ Magnus Holmgren <lear@algonet.se>
+-
+ .SH BUGS
+-
+ None known.
+-
+ .SH SEE ALSO
+-
+ .TP
+ http://sjeng.org/vorbisgain.html
+ Home page for VorbisGain. The latest version, and a Windows executable,
+ can be found here.
+-
+ .TP
+ http://www.replaygain.org/
+ Contains detailed information about ReplayGain and how it is calculated.
+-
+ .TP
+ http://www.hydrogenaudio.org/
+ Discussion forum for audio compression and related issues, including Ogg
+ Vorbis and VorbisGain.
++.SH NOTE
++The version of vorbisgain packaged for Debian differs in two ways from
++the upstream version. First, it does not retain the modification time
++of the input file: if tags are changed in a file, the mtime will change.
++Second, it does not try to process wildcards in filenames. This makes
++it impossible to say "process all foo*.ogg in all subdirectories", but
++also avoids problems with filenames that actually contain wildcards.
++Without this change, "vorbisgain *.ogg" in a directory with a file that
++contains a question mark would result in that file being treated as
++being in a different album.
diff --git a/subprojects/shared-modules/vorbisgain/0004-vorbisgain_mtime.patch b/subprojects/shared-modules/vorbisgain/0004-vorbisgain_mtime.patch
new file mode 100644
index 00000000..0abd7ce1
--- /dev/null
+++ b/subprojects/shared-modules/vorbisgain/0004-vorbisgain_mtime.patch
@@ -0,0 +1,183 @@
+Description: When a file's metadata is updated, the mtime is changed
+ to the current time. Whether this is correct or not is often a
+ religious issue (metadata-vs-data), but, generally, all other
+ tag-editing software choose to keep the timestamp.
+ .
+ Since the upstream fixed the issue, it is bad to ignore the fix
+ altogether. At the very least, there should be a command-line
+ option to follow the upstream and The Only Right(tm) behaviour.
+Author: Adam Borowski <kilobyte@angband.pl>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=445958
+---
+ vorbis.c     |   18 ++++++++++--------
+ vorbis.h     |    2 +-
+ vorbisgain.1 |    7 ++++++-
+ vorbisgain.c |   20 ++++++++++++++------
+ vorbisgain.h |    1 +
+ 5 files changed, 32 insertions(+), 16 deletions(-)
+
+--- a/vorbis.c
++++ b/vorbis.c
+@@ -557,7 +557,8 @@
+  *         message has been printed).
+  */
+ int write_gains(const char *filename, float track_peak, float track_gain,
+-    float album_peak, float album_gain, int verbose, int remove_tags)
++    float album_peak, float album_gain, int verbose, int remove_tags,
++    SETTINGS* settings)
+ {
+     struct stat stat_buf;
+     struct utimbuf utime_buf;
+@@ -778,15 +779,16 @@
+         file_error(_("Note: Couldn't set mode for file '%s': "), filename);
+     }
+ 
+-#if 0 /* Disable for Debian, this surprises people and is not useful --liw */
+-    utime_buf.actime = stat_buf.st_atime;
+-    utime_buf.modtime = stat_buf.st_mtime;
+-
+-    if (utime(filename, &utime_buf) != 0)
++    if (!settings->trample_mtime)
+     {
+-        file_error(_("Note: Couldn't set time for file '%s': "), filename);
++        utime_buf.actime = stat_buf.st_atime;
++        utime_buf.modtime = stat_buf.st_mtime;
++
++        if (utime(filename, &utime_buf) != 0)
++        {
++            file_error(_("Note: Couldn't set time for file '%s': "), filename);
++        }
+     }
+-#endif
+ 
+     result = 0;
+ 
+--- a/vorbisgain.1
++++ b/vorbisgain.1
+@@ -72,6 +72,10 @@
+ .IP "-n, --no-progress"
+ Only display results, but don't show progress in percentages and times. This
+ can be useful if the output is piped into other programs.
++.IP "-p, --preserve-mtime"
++Do not trample upon the timestamps of any files being worked on.  This obeys
++the expected data-vs-metadata behaviour, but can confuse some naive
++archivers.
+ .IP "-q, --quiet"
+ Do not display any output while processing. Only error and warning messages will
+ be printed.
+@@ -200,7 +204,8 @@
+ .SH NOTE
+ The version of vorbisgain packaged for Debian differs in two ways from
+ the upstream version. First, it does not retain the modification time
+-of the input file: if tags are changed in a file, the mtime will change.
++of the input file by default: if tags are changed in a file, the mtime will
++change; you can specify "-p" to get the normal behaviour.
+ Second, it does not try to process wildcards in filenames. This makes
+ it impossible to say "process all foo*.ogg in all subdirectories", but
+ also avoids problems with filenames that actually contain wildcards.
+--- a/vorbisgain.c
++++ b/vorbisgain.c
+@@ -235,7 +235,7 @@
+         {
+             if (write_gains(file->filename, file->track_peak, 
+                 file->track_gain, album_peak, file->album_gain, 
+-                !settings->quiet, 0) < 0)
++                !settings->quiet, 0, settings) < 0)
+             {
+                 return -1;
+             }
+@@ -288,7 +288,7 @@
+             else
+             {
+                 if (write_gains(file->filename, NO_PEAK, NO_GAIN, 
+-                    NO_PEAK, NO_GAIN, !settings->quiet, 1) < 0)
++                    NO_PEAK, NO_GAIN, !settings->quiet, 1, settings) < 0)
+                 {
+                     return -1;
+                 }
+@@ -425,7 +425,8 @@
+             if (!settings->album)
+             {
+                 if (!settings->display_only && write_gains(file->filename,
+-                    file->track_peak, file->track_gain, NO_PEAK, NO_GAIN, 0, 0) < 0)
++                    file->track_peak, file->track_gain, NO_PEAK, NO_GAIN, 0, 0,
++                    settings) < 0)
+                 {
+                     return -1;
+                 }
+@@ -466,7 +467,7 @@
+ 
+                 if (write_gains(file->filename, file->track_peak,
+                     file->track_gain, album_peak, album_gain,
+-                    !settings->quiet, 0) < 0)
++                    !settings->quiet, 0, settings) < 0)
+                 {
+                     return -1;
+                 }
+@@ -497,6 +498,7 @@
+     fprintf(stderr, _("  -h, --help           Print this help text\n"));
+     fprintf(stderr, _("  -n, --no-progress    Don't show progress, just print results\n"));
+     fprintf(stderr, _("  -q, --quiet          Don't print any output (except errors)\n"));
++    fprintf(stderr, _("  -p, --preserve-mtime Don't change the timestamps\n"));
+ #ifdef ENABLE_RECURSIVE
+     fprintf(stderr, _("  -r, --recursive      Search for files recursivly, each folder as an album\n"));
+ #endif
+@@ -522,6 +524,7 @@
+     {"fast",         0, NULL, 'f'},
+     {"help",         0, NULL, 'h'},
+     {"no-progress",  0, NULL, 'n'},
++    {"preserve-mtime",0,NULL, 'p'},
+     {"quiet",        0, NULL, 'q'},
+ #ifdef ENABLE_RECURSIVE
+     {"recursive",    0, NULL, 'r'},
+@@ -533,9 +536,9 @@
+ 
+ 
+ #ifdef ENABLE_RECURSIVE
+-#define ARG_STRING "acCdfg:hnqrst:v"
++#define ARG_STRING "acCdfg:hnpqrst:v"
+ #else
+-#define ARG_STRING "acCdfg:hnqst:v"
++#define ARG_STRING "acCdfg:hnpqst:v"
+ #endif
+ 
+ 
+@@ -549,6 +552,7 @@
+     memset(&settings, 0, sizeof(settings));
+     settings.first_file = 1;
+     settings.album_gain = NO_GAIN;
++    settings.trample_mtime = 1;
+     settings.show_progress = 1;
+ 
+ #ifdef WIN32
+@@ -623,6 +627,10 @@
+ 	  settings.show_progress = 0;
+ 	  break;
+ 
++        case 'p':
++            settings.trample_mtime = 0;
++            break;
++
+         case 'q':
+             settings.quiet = 1;
+             break;
+--- a/vorbisgain.h
++++ b/vorbisgain.h
+@@ -31,6 +31,7 @@
+     int convert;            /**< Convert old format tags to new format */
+     int display_only;
+     int fast;               /**< Skip files that already have all needed tags */
++    int trample_mtime;
+     int quiet;
+ #ifdef ENABLE_RECURSIVE
+     int recursive;
+--- a/vorbis.h
++++ b/vorbis.h
+@@ -15,6 +15,6 @@
+     SETTINGS *settings);
+ extern int write_gains(const char *filename, float track_peak, 
+     float track_gain, float album_gain, float album_peak, int verbose, 
+-    int remove_tags);
++    int remove_tags, SETTINGS *settings);
+ 
+ #endif /* VG_VORBIS_H */
diff --git a/subprojects/shared-modules/vorbisgain/0005-double_fclose.patch b/subprojects/shared-modules/vorbisgain/0005-double_fclose.patch
new file mode 100644
index 00000000..2a183292
--- /dev/null
+++ b/subprojects/shared-modules/vorbisgain/0005-double_fclose.patch
@@ -0,0 +1,21 @@
+Description: Don't call fclose() twice.
+Author: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=632947
+---
+ vorbis.c |    5 -----
+ 1 file changed, 5 deletions(-)
+
+--- a/vorbis.c
++++ b/vorbis.c
+@@ -813,11 +813,6 @@
+         fclose(infile);
+     }
+ 
+-    if (infile != NULL)
+-    {
+-        fclose(infile);
+-    }
+-
+     if (delete_temp)
+     {
+         if (remove(temp_name) != 0)
diff --git a/subprojects/shared-modules/vorbisgain/0006-manpage_hyphens.patch b/subprojects/shared-modules/vorbisgain/0006-manpage_hyphens.patch
new file mode 100644
index 00000000..cb518e69
--- /dev/null
+++ b/subprojects/shared-modules/vorbisgain/0006-manpage_hyphens.patch
@@ -0,0 +1,56 @@
+Description: Resolved hyphen-used-as-minus-sign lintian complaints.
+Forwarded: no
+--- a/vorbisgain.1
++++ b/vorbisgain.1
+@@ -85,7 +85,7 @@
+ .I Note:
+ Only available if
+ .B vorbisgain
+-was configured with --enable-recursive.
++was configured with \-\-enable\-recursive.
+ .IP "-s, --skip"
+ Silently skip any non-Vorbis files found. Vorbis files that can't be processed
+ for some reason are skipped as well, though not silently. Default is to stop
+@@ -101,7 +101,7 @@
+ .PP
+ Note that the following examples are only possible if
+ .B vorbisgain
+-was configured with --enable-recursive.
++was configured with \-\-enable\-recursive.
+ .PP
+ Calculate the album gain and peak, in addition to the track gain and peak, for
+ all .ogg files in the directory "music" (and all subdirectories). All files in
+@@ -110,7 +110,7 @@
+ shell to not do any filename globbing:
+ .PP
+ .RS
+-vorbisgain -a -f -r "music/*.ogg"
++vorbisgain \-a \-f \-r "music/*.ogg"
+ .RE
+ .PP
+ Calculate the album gain. The files specified before the directory "album"
+@@ -118,13 +118,13 @@
+ album and the remaining files as a third album:
+ .PP
+ .RS
+-vorbisgain -a -r a.ogg b.ogg c.ogg album d.ogg e.ogg f.ogg
++vorbisgain \-a \-r a.ogg b.ogg c.ogg album d.ogg e.ogg f.ogg
+ .RE
+ .PP
+ Remove all replaygain tags from a collection of oggs:
+ .PP
+ .RS
+-vorbisgain -c -r "music/*.ogg"
++vorbisgain \-c \-r "music/*.ogg"
+ .RE
+ .SH TAG FORMAT
+ .B vorbisgain
+@@ -205,7 +205,7 @@
+ The version of vorbisgain packaged for Debian differs in two ways from
+ the upstream version. First, it does not retain the modification time
+ of the input file by default: if tags are changed in a file, the mtime will
+-change; you can specify "-p" to get the normal behaviour.
++change; you can specify "\-p" to get the normal behaviour.
+ Second, it does not try to process wildcards in filenames. This makes
+ it impossible to say "process all foo*.ogg in all subdirectories", but
+ also avoids problems with filenames that actually contain wildcards.
diff --git a/subprojects/shared-modules/vorbisgain/0007-recursively_spelling.patch b/subprojects/shared-modules/vorbisgain/0007-recursively_spelling.patch
new file mode 100644
index 00000000..4a6fbf9c
--- /dev/null
+++ b/subprojects/shared-modules/vorbisgain/0007-recursively_spelling.patch
@@ -0,0 +1,14 @@
+Description: "recursivly" should be spelled "recursively". Thanks Adam.
+From: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=661999
+Forwarded: no
+--- a/vorbisgain.c
++++ b/vorbisgain.c
+@@ -500,7 +500,7 @@
+     fprintf(stderr, _("  -q, --quiet          Don't print any output (except errors)\n"));
+     fprintf(stderr, _("  -p, --preserve-mtime Don't change the timestamps\n"));
+ #ifdef ENABLE_RECURSIVE
+-    fprintf(stderr, _("  -r, --recursive      Search for files recursivly, each folder as an album\n"));
++    fprintf(stderr, _("  -r, --recursive      Search for files recursively, each folder as an album\n"));
+ #endif
+     fprintf(stderr, _("  -s, --skip           Skip non-Vorbis or faulty files\n"));
+     fprintf(stderr, _("  -v, --version        Display version number and exit\n\n"));
diff --git a/subprojects/shared-modules/vorbisgain/0008-manpage_recursion_mistake.patch b/subprojects/shared-modules/vorbisgain/0008-manpage_recursion_mistake.patch
new file mode 100644
index 00000000..81792532
--- /dev/null
+++ b/subprojects/shared-modules/vorbisgain/0008-manpage_recursion_mistake.patch
@@ -0,0 +1,23 @@
+Description: The manpage shows methods that don't work. They have been replaced.
+From: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=447402
+Forwarded: no
+--- a/vorbisgain.1
++++ b/vorbisgain.1
+@@ -110,7 +110,7 @@
+ shell to not do any filename globbing:
+ .PP
+ .RS
+-vorbisgain \-a \-f \-r "music/*.ogg"
++vorbisgain \-a \-f \-r music/
+ .RE
+ .PP
+ Calculate the album gain. The files specified before the directory "album"
+@@ -124,7 +124,7 @@
+ Remove all replaygain tags from a collection of oggs:
+ .PP
+ .RS
+-vorbisgain \-c \-r "music/*.ogg"
++vorbisgain \-c \-r music/
+ .RE
+ .SH TAG FORMAT
+ .B vorbisgain
diff --git a/subprojects/shared-modules/vorbisgain/0009-hardening.patch b/subprojects/shared-modules/vorbisgain/0009-hardening.patch
new file mode 100644
index 00000000..67f50a03
--- /dev/null
+++ b/subprojects/shared-modules/vorbisgain/0009-hardening.patch
@@ -0,0 +1,13 @@
+Description: Allow build with dh compat level 9 (debian build flags)
+Forwarded: no
+--- a/misc.c
++++ b/misc.c
+@@ -56,7 +56,7 @@
+     vfprintf(stderr, message, args);
+     va_end(args);
+ 
+-    fprintf(stderr, strerror(err_num));
++    fputs(strerror(err_num), stderr);
+     fprintf(stderr, "\n");
+ }
+ 
diff --git a/subprojects/shared-modules/vorbisgain/0010-fclose.patch b/subprojects/shared-modules/vorbisgain/0010-fclose.patch
new file mode 100644
index 00000000..12378987
--- /dev/null
+++ b/subprojects/shared-modules/vorbisgain/0010-fclose.patch
@@ -0,0 +1,13 @@
+Solve "too many open files" by closing those which are not compatible with vorbisgain. Thanks to Marcel Rehberg for the patch.
+--- a/vorbis.c
++++ b/vorbis.c
+@@ -357,7 +357,8 @@
+         {
+ 	        vorbis_error(result, _("Couldn't process '%s': "), filename);
+         }
+-
++        // make sure file is closed, since ov_open failed we are still responsible
++        fclose(file);
+         return -1;
+     }
+ 
diff --git a/subprojects/shared-modules/vorbisgain/README.md b/subprojects/shared-modules/vorbisgain/README.md
new file mode 100644
index 00000000..42d83947
--- /dev/null
+++ b/subprojects/shared-modules/vorbisgain/README.md
@@ -0,0 +1,23 @@
+Vorbisgain comes in two version;
+- The main source: https://sjeng.org/ftp/vorbis/
+- The Debian version: http://deb.debian.org/debian/pool/main/v/vorbisgain/
+
+The catch is... Debian has 10 patches:
+- 0001-temp_files.patch
+- 0002-errno.patch
+- 0003-manpage.patch
+- 0004-vorbisgain_mtime.patch
+- 0005-double_fclose.patch
+- 0006-manpage_hyphens.patch
+- 0007-recursively_spelling.patch
+- 0008-manpage_recursion_mistake.patch
+- 0009-hardening.patch
+- 0010-fclose.patch
+
+Of particular concern are 0005, 0009 and 0010 which might have implications for memory-leaks and string inputs.
+
+## Other points of concern
+
+https://pkgs.org/download/vorbisgain
+
+Lots of distributions don't include these patches as well, but I prefer to stick with the tried and tested package from Debian.
diff --git a/subprojects/shared-modules/vorbisgain/vorbisgain_0.37-2.json b/subprojects/shared-modules/vorbisgain/vorbisgain_0.37-2.json
new file mode 100644
index 00000000..0a9a40da
--- /dev/null
+++ b/subprojects/shared-modules/vorbisgain/vorbisgain_0.37-2.json
@@ -0,0 +1,29 @@
+{
+    "name": "vorbisgain",
+    "buildsystem": "autotools",
+    "cleanup": [
+        "/man"
+    ],
+    "sources": [
+        {
+            "type": "archive",
+            "url": "http://deb.debian.org/debian/pool/main/v/vorbisgain/vorbisgain_0.37.orig.tar.gz",
+            "sha256": "dd6db051cad972bcac25d47b4a9e40e217bb548a1f16328eddbb4e66613530ec"
+        },
+        {
+            "type": "patch",
+            "paths": [
+                "0001-temp_files.patch",
+                "0002-errno.patch",
+                "0003-manpage.patch",
+                "0004-vorbisgain_mtime.patch",
+                "0005-double_fclose.patch",
+                "0006-manpage_hyphens.patch",
+                "0007-recursively_spelling.patch",
+                "0008-manpage_recursion_mistake.patch",
+                "0009-hardening.patch",
+                "0010-fclose.patch"
+            ]
+        }
+    ]
+}
author	Nathan Pratta Teodosio <nathan.teodosio@canonical.com>	2023-03-23 10:22:25 -0300
committer	Nathan Pratta Teodosio <nathan.teodosio@canonical.com>	2023-03-23 10:22:25 -0300
commit	030555bcc6344332989199b3bf33b0adab47bab2 (patch)
tree	f83df2b065ee6038777c5eea9846b8e253cfa558
parent	079c8cd8284a3c22e14b611e19a02e61a0e36721 (diff)
parent	11fa1a75fc1377a4afdbffe60c8890fdfe713a3f (diff)