Port to QCoro

GIT_SILENT Sync po/docbooks with svn
2022-08-24 09:16:06 +02:00 · 2022-08-14 01:51:10 +00:00 · 2022-08-08 01:57:12 +00:00 · 2022-08-08 01:51:52 +00:00 · 2022-08-08 00:48:13 +00:00 · 2022-08-07 01:54:32 +00:00
47 changed files with 625 additions and 392 deletions
@@ -32,12 +32,15 @@ ecm_setup_version(${PROJECT_VERSION}
 )

 kde_enable_exceptions()
+add_compile_options(-fsanitize=address)
+add_link_options(-fsanitize=address)

 find_package(Qt5 ${QT5_MIN_VERSION} REQUIRED COMPONENTS Core Gui Qml QuickControls2 Svg Sql)
 find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Kirigami2 I18n CoreAddons Crash)
 find_package(pybind11 REQUIRED)
 find_package(Ytdlp REQUIRED RUNTIME)
 find_package(YTMusicAPI REQUIRED RUNTIME)
+find_package(QCoro5 REQUIRED COMPONENTS Core Qml Network)

 ki18n_install(po)

@@ -5,16 +5,6 @@
        "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"yt-dlp\" --no-build-isolation"
    ],
    "sources": [
-        {
-            "type": "file",
-            "url": "https://files.pythonhosted.org/packages/9a/bf/1bc7e3096ddc2c398b3d04176530a9c02efe08546d9730c9eef0b07a0a43/yt_dlp-2022.5.18-py2.py3-none-any.whl",
-            "sha256": "deec1009442312c1e2ee5298966842194d0e950b433f0d4fc844ef464b9c32a7"
-        },
-        {
-            "type": "file",
-            "url": "https://files.pythonhosted.org/packages/11/dd/e015f3780f42dd9af62cf0107b44ea1298926627ecd70c17b0e484e95bcd/certifi-2022.5.18.1-py3-none-any.whl",
-            "sha256": "f1d53542ee8cbedbe2118b5686372fb33c297fcd6379b050cca0ef13a597382a"
-        },
        {
            "type": "file",
            "url": "https://files.pythonhosted.org/packages/f8/a3/622d9acbfb9a71144b5d7609906bc648c62e3ca5fdbb1c8cca222949d82c/websockets-10.3.tar.gz",
@@ -32,8 +22,18 @@
        },
        {
            "type": "file",
-            "url": "https://files.pythonhosted.org/packages/24/40/e249ac3845a2333ce50f1bb02299ffb766babdfe80ca9d31e0158ad06afd/pycryptodomex-3.14.1.tar.gz",
-            "sha256": "2ce76ed0081fd6ac8c74edc75b9d14eca2064173af79843c24fa62573263c1f2"
+            "url": "https://files.pythonhosted.org/packages/e9/06/d3d367b7af6305b16f0d28ae2aaeb86154fa91f144f036c2d5002a5a202b/certifi-2022.6.15-py3-none-any.whl",
+            "sha256": "fe86415d55e84719d75f8b69414f6438ac3547d2078ab91b67e779ef69378412"
+        },
+        {
+            "type": "file",
+            "url": "https://files.pythonhosted.org/packages/1f/13/b1f7b4e44b11584a5f077af87895961b57911217a629efb8d3a9efd2a491/yt_dlp-2022.7.18-py2.py3-none-any.whl",
+            "sha256": "d7d1f81d230756f094b4d9ee59b37b2c13b2e63ff5fb72cda53625edb072cdae"
+        },
+        {
+            "type": "file",
+            "url": "https://files.pythonhosted.org/packages/52/0d/6cc95a83f6961a1ca041798d222240890af79b381e97eda3b9b538dba16f/pycryptodomex-3.15.0.tar.gz",
+            "sha256": "7341f1bb2dadb0d1a0047f34c3a58208a92423cdbd3244d998e4b28df5eac0ed"
        }
    ]
 }
@@ -7,23 +7,18 @@
    "sources": [
        {
            "type": "file",
-            "url": "https://files.pythonhosted.org/packages/ec/03/062e6444ce4baf1eac17a6a0ebfe36bb1ad05e1df0e20b110de59c278498/urllib3-1.26.9-py2.py3-none-any.whl",
-            "sha256": "44ece4d53fb1706f667c9bd1c648f5469a2ec925fcf3a776667042d645472c14"
+            "url": "https://files.pythonhosted.org/packages/94/69/64b11e8c2fb21f08634468caef885112e682b0ebe2908e74d3616eb1c113/charset_normalizer-2.1.0-py3-none-any.whl",
+            "sha256": "5189b6f22b01957427f35b6a08d9a0bc45b46d3788ef5a92e978433c7a35f8a5"
        },
        {
            "type": "file",
-            "url": "https://files.pythonhosted.org/packages/11/dd/e015f3780f42dd9af62cf0107b44ea1298926627ecd70c17b0e484e95bcd/certifi-2022.5.18.1-py3-none-any.whl",
-            "sha256": "f1d53542ee8cbedbe2118b5686372fb33c297fcd6379b050cca0ef13a597382a"
+            "url": "https://files.pythonhosted.org/packages/68/47/93d3d28e97c7577f563903907912f4b3804054e4877a5ba6651f7182c53b/urllib3-1.26.10-py2.py3-none-any.whl",
+            "sha256": "8298d6d56d39be0e3bc13c1c97d133f9b45d797169a0e11cdd0e0489d786f7ec"
        },
        {
            "type": "file",
-            "url": "https://files.pythonhosted.org/packages/06/b3/24afc8868eba069a7f03650ac750a778862dc34941a4bebeb58706715726/charset_normalizer-2.0.12-py3-none-any.whl",
-            "sha256": "6881edbebdb17b39b4eaaa821b438bf6eddffb4468cf344f09f89def34a8b1df"
-        },
-        {
-            "type": "file",
-            "url": "https://files.pythonhosted.org/packages/2d/61/08076519c80041bc0ffa1a8af0cbd3bf3e2b62af10435d269a9d0f40564d/requests-2.27.1-py2.py3-none-any.whl",
-            "sha256": "f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d"
+            "url": "https://files.pythonhosted.org/packages/ca/91/6d9b8ccacd0412c08820f72cebaa4f0c0441b5cda699c90f618b6f8a1b42/requests-2.28.1-py3-none-any.whl",
+            "sha256": "8fefa2a1a1365bf5520aac41836fbee479da67864514bdb821f31ce07ce65349"
        },
        {
            "type": "file",
@@ -34,6 +29,11 @@
            "type": "file",
            "url": "https://files.pythonhosted.org/packages/04/a2/d918dcd22354d8958fe113e1a3630137e0fc8b44859ade3063982eacd2a4/idna-3.3-py3-none-any.whl",
            "sha256": "84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff"
+        },
+        {
+            "type": "file",
+            "url": "https://files.pythonhosted.org/packages/e9/06/d3d367b7af6305b16f0d28ae2aaeb86154fa91f144f036c2d5002a5a202b/certifi-2022.6.15-py3-none-any.whl",
+            "sha256": "fe86415d55e84719d75f8b69414f6438ac3547d2078ab91b67e779ef69378412"
        }
    ]
 }
@@ -22,6 +22,7 @@ SPDX-License-Identifier: CC0-1.0
  <name xml:lang="it">AudioTube</name>
  <name xml:lang="ko">AudioTube</name>
  <name xml:lang="nl">AudioTube</name>
+  <name xml:lang="nn">AudioTube</name>
  <name xml:lang="pa">ਆਡੀਓ-ਟਿਊਬ</name>
  <name xml:lang="pl">AudioTube</name>
  <name xml:lang="pt">AudioTube</name>
@@ -49,6 +50,7 @@ SPDX-License-Identifier: CC0-1.0
  <summary xml:lang="it">Client YouTube Music convergente</summary>
  <summary xml:lang="ko">올인원 YouTube Music 클라이언트</summary>
  <summary xml:lang="nl">Convergente muziekclient van YouTube</summary>
+  <summary xml:lang="nn">YouTube Music-klient, tilpassa ulike brukarflater</summary>
  <summary xml:lang="pl">Adaptacyjny program do YouTube Music</summary>
  <summary xml:lang="pt">Cliente de música do YouTube convergente</summary>
  <summary xml:lang="pt-BR">Um cliente convergente para o YouTube Music</summary>
@@ -77,6 +79,7 @@ SPDX-License-Identifier: CC0-1.0
  <developer_name xml:lang="it">Comunità KDE</developer_name>
  <developer_name xml:lang="ko">KDE 커뮤니티</developer_name>
  <developer_name xml:lang="nl">KDE-gemeenschap</developer_name>
+  <developer_name xml:lang="nn">KDE-fellesskapet</developer_name>
  <developer_name xml:lang="pa">ਕੇਡੀਈ ਕਮਿਊਨਟੀ</developer_name>
  <developer_name xml:lang="pl">Społeczność KDE</developer_name>
  <developer_name xml:lang="pt">Comunidade do KDE</developer_name>
@@ -129,11 +132,14 @@ SPDX-License-Identifier: CC0-1.0
  <launchable type="desktop-id">org.kde.audiotube.desktop</launchable>
  <screenshots>
    <screenshot>
-      <image>https://cdn.kde.org/screenshots/audiotube/desktop.png</image>
+      <image>https://cdn.kde.org/screenshots/audiotube/library.png</image>
    </screenshot>
    <screenshot>
      <image>https://cdn.kde.org/screenshots/audiotube/mobile_playlist.png</image>
    </screenshot>
+    <screenshot>
+      <image>https://cdn.kde.org/screenshots/audiotube/desktop.png</image>
+    </screenshot>
  </screenshots>
  <recommends>
    <control>pointing</control>
@@ -156,6 +162,7 @@ SPDX-License-Identifier: CC0-1.0
    <p xml:lang="it">AudioTube può eseguire ricerche su YouTube Music, elencare album e artisti, riprodurre scalette e album generati automaticamente e ti consente di creare la tua scaletta.</p>
    <p xml:lang="ko">AudioTube는 YouTube Music을 검색하고, 앨범과 아티스트를 표시하고, 자동 생성된 재생 목록, 앨범을 재생하고, 사용자 정의 재생 목록을 만들 수 있습니다.</p>
    <p xml:lang="nl">AudioTube kan in YouTube Music zoeken, een lijst maken van albums en artiesten, automatically gegenereerde afspeellijsten, albums afspelen en biedt u het samenstellen van uw eigen afspeellijst.</p>
+    <p xml:lang="nn">Med AudioTube kan du søkja på YouTube Music, visa album og artistar, spela automatiske genererte spelelister og album samt laga eigne spelelister.</p>
    <p xml:lang="pl">AudioTube może przeszukiwać serwis YouTube Music, wypisać albumy i wykonawców, odtwarzać samoczynnie utworzone listy odtwarzania, albumy oraz umożliwia tworzenie własnych list odtwarzania.</p>
    <p xml:lang="pt">O AudioTube consegue pesquisar no YouTube Music, enumerar os álbuns e artistas, reproduzir listas geradas automaticamente, álbuns e permite-lhe reproduzir as suas próprias listas de reprodução.</p>
    <p xml:lang="pt-BR">O AudioTube pode pesquisar no YouTube Music, listar álbuns e artistas, rodar listas de reprodução geradas automaticamente, álbuns inteiros, e criar a sua própria lista de reprodução.</p>
@@ -15,6 +15,7 @@ Name[hi]=ओडियो-ट्यूब
 Name[it]=AudioTube
 Name[ko]=AudioTube
 Name[nl]=AudioTube
+Name[nn]=AudioTube
 Name[pa]=ਆਡੀਓ-ਟਿਊਬ
 Name[pl]=AudioTube
 Name[pt]=AudioTube
@@ -43,6 +44,7 @@ Comment[hi]=यूट्यूब संगीत क्लाएंट
 Comment[it]=Client YouTube Music
 Comment[ko]=YouTube Music 클라이언트
 Comment[nl]=Muziekclient van YouTube
+Comment[nn]=YouTube Music-klient
 Comment[pa]=ਯੂਟਿਊਬ ਸੰਗੀਤ ਕਲਾਈਂਟ
 Comment[pl]=Program do YouTube Music
 Comment[pt]=Cliente do YouTube Music
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2022-05-30 00:47+0000\n"
+"POT-Creation-Date: 2022-07-12 00:48+0000\n"
 "PO-Revision-Date: 2022-05-28 23:09+0400\n"
 "Last-Translator: Zayed Al-Saidi <[email protected]>\n"
 "Language-Team: Arabic <[email protected]>\n"
@@ -128,22 +128,22 @@ msgstr "ابحث"
 msgid "AudioTube"
 msgstr "تيوب الصوتي"

-#: contents/ui/MaximizedPlayerPage.qml:86
+#: contents/ui/MaximizedPlayerPage.qml:92
 #, kde-format
 msgid "Now Playing"
 msgstr "المشغل الآن"

-#: contents/ui/MaximizedPlayerPage.qml:112
+#: contents/ui/MaximizedPlayerPage.qml:117
 #, kde-format
 msgid "Queue"
 msgstr "صُفّ"

-#: contents/ui/MaximizedPlayerPage.qml:224
+#: contents/ui/MaximizedPlayerPage.qml:222
 #, kde-format
 msgid "Remove Track"
 msgstr "أزل المسار"

-#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MaximizedPlayerPage.qml:242
 #: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2022-05-30 00:47+0000\n"
+"POT-Creation-Date: 2022-07-12 00:48+0000\n"
 "PO-Revision-Date: 2022-06-19 12:16+0400\n"
 "Last-Translator: Kheyyam <[email protected]>\n"
 "Language-Team: Azerbaijani <[email protected]>\n"
@@ -129,22 +129,22 @@ msgstr "Axtarın"
 msgid "AudioTube"
 msgstr "AudioTube"

-#: contents/ui/MaximizedPlayerPage.qml:86
+#: contents/ui/MaximizedPlayerPage.qml:92
 #, kde-format
 msgid "Now Playing"
 msgstr "İndi səslənir"

-#: contents/ui/MaximizedPlayerPage.qml:112
+#: contents/ui/MaximizedPlayerPage.qml:117
 #, kde-format
 msgid "Queue"
 msgstr "Növbə"

-#: contents/ui/MaximizedPlayerPage.qml:224
+#: contents/ui/MaximizedPlayerPage.qml:222
 #, kde-format
 msgid "Remove Track"
 msgstr "Mahnını silin"

-#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MaximizedPlayerPage.qml:242
 #: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2022-05-30 00:47+0000\n"
+"POT-Creation-Date: 2022-07-12 00:48+0000\n"
 "PO-Revision-Date: 2022-05-26 09:09+0200\n"
 "Last-Translator: Josep M. Ferrer <[email protected]>\n"
 "Language-Team: Catalan <[email protected]>\n"
@@ -132,22 +132,22 @@ msgstr "Cerca"
 msgid "AudioTube"
 msgstr "AudioTube"

-#: contents/ui/MaximizedPlayerPage.qml:86
+#: contents/ui/MaximizedPlayerPage.qml:92
 #, kde-format
 msgid "Now Playing"
 msgstr "Ara s'està reproduint"

-#: contents/ui/MaximizedPlayerPage.qml:112
+#: contents/ui/MaximizedPlayerPage.qml:117
 #, kde-format
 msgid "Queue"
 msgstr "Cua"

-#: contents/ui/MaximizedPlayerPage.qml:224
+#: contents/ui/MaximizedPlayerPage.qml:222
 #, kde-format
 msgid "Remove Track"
 msgstr "Elimina la pista"

-#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MaximizedPlayerPage.qml:242
 #: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2022-05-30 00:47+0000\n"
+"POT-Creation-Date: 2022-07-12 00:48+0000\n"
 "PO-Revision-Date: 2022-05-26 09:09+0200\n"
 "Last-Translator: Josep M. Ferrer <[email protected]>\n"
 "Language-Team: Catalan <[email protected]>\n"
@@ -120,7 +120,7 @@ msgstr "Cançons reproduïdes"
 #: contents/ui/main.qml:39
 #, kde-format
 msgid "Back"
-msgstr "Enrere"
+msgstr "Arrere"

 #: contents/ui/main.qml:73 contents/ui/SearchPage.qml:150
 #, kde-format
@@ -132,22 +132,22 @@ msgstr "Busca"
 msgid "AudioTube"
 msgstr "AudioTube"

-#: contents/ui/MaximizedPlayerPage.qml:86
+#: contents/ui/MaximizedPlayerPage.qml:92
 #, kde-format
 msgid "Now Playing"
 msgstr "Ara s'està reproduint"

-#: contents/ui/MaximizedPlayerPage.qml:112
+#: contents/ui/MaximizedPlayerPage.qml:117
 #, kde-format
 msgid "Queue"
 msgstr "Cua"

-#: contents/ui/MaximizedPlayerPage.qml:224
+#: contents/ui/MaximizedPlayerPage.qml:222
 #, kde-format
 msgid "Remove Track"
 msgstr "Elimina la pista"

-#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MaximizedPlayerPage.qml:242
 #: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2022-05-30 00:47+0000\n"
-"PO-Revision-Date: 2022-01-11 17:36+0100\n"
+"POT-Creation-Date: 2022-07-12 00:48+0000\n"
+"PO-Revision-Date: 2022-06-28 13:58+0200\n"
 "Last-Translator: Vit Pelcak <[email protected]>\n"
 "Language-Team: Czech <[email protected]>\n"
 "Language: cs\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Lokalize 21.12.0\n"
+"X-Generator: Lokalize 22.04.2\n"

 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
@@ -92,32 +92,32 @@ msgstr "Zrušit"
 #: contents/ui/LibraryPage.qml:27
 #, kde-format
 msgid "Favourites"
-msgstr ""
+msgstr "Oblíbené"

 #: contents/ui/LibraryPage.qml:37 contents/ui/LibraryPage.qml:108
 #, kde-format
 msgid "Show All"
-msgstr ""
+msgstr "Zobrazit vše"

 #: contents/ui/LibraryPage.qml:42
 #, kde-format
 msgid "Favourite Songs"
-msgstr ""
+msgstr "Oblíbené skladby"

 #: contents/ui/LibraryPage.qml:98
 #, kde-format
 msgid "Most played"
-msgstr ""
+msgstr "Nejčastěji hrané"

 #: contents/ui/LibraryPage.qml:113
 #, kde-format
 msgid "Played Songs"
-msgstr ""
+msgstr "Přehrané skladby"

 #: contents/ui/main.qml:39
 #, kde-format
 msgid "Back"
-msgstr ""
+msgstr "Zpět"

 #: contents/ui/main.qml:73 contents/ui/SearchPage.qml:150
 #, kde-format
@@ -129,23 +129,22 @@ msgstr "Hledat"
 msgid "AudioTube"
 msgstr "AudioTube"

-#: contents/ui/MaximizedPlayerPage.qml:86
-#, fuzzy, kde-format
-#| msgid "No media playing"
+#: contents/ui/MaximizedPlayerPage.qml:92
+#, kde-format
 msgid "Now Playing"
-msgstr "Nepřehrává se žádné médium"
+msgstr "Nyní přehrávám"

-#: contents/ui/MaximizedPlayerPage.qml:112
+#: contents/ui/MaximizedPlayerPage.qml:117
 #, kde-format
 msgid "Queue"
-msgstr ""
+msgstr "Fronta"

-#: contents/ui/MaximizedPlayerPage.qml:224
+#: contents/ui/MaximizedPlayerPage.qml:222
 #, kde-format
 msgid "Remove Track"
 msgstr "Odstranit skladbu"

-#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MaximizedPlayerPage.qml:242
 #: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
@@ -154,12 +153,12 @@ msgstr "Nepřehrává se žádné médium"
 #: contents/ui/PlaybackHistory.qml:15
 #, kde-format
 msgid "Unknown list of songs"
-msgstr ""
+msgstr "Neznámý seznam skladeb"

 #: contents/ui/PlaybackHistory.qml:25
 #, kde-format
 msgid "No songs here yet"
-msgstr ""
+msgstr "Zatím zde nejsou žádné skladby"

 #: contents/ui/SearchPage.qml:27
 #, kde-format
@@ -190,12 +189,3 @@ msgstr "Rádio"
 #, kde-format
 msgid "Find music on YouTube Music"
 msgstr "Najít hudbu na Hudba YouTube"
-
-#~ msgid "Clear"
-#~ msgstr "Vyprázdnit"
-
-#~ msgid "Pause"
-#~ msgstr "Pozastavit"
-
-#~ msgid "Expand"
-#~ msgstr "Rozvinout"
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2022-05-30 00:47+0000\n"
-"PO-Revision-Date: 2022-06-15 11:16+0200\n"
+"POT-Creation-Date: 2022-07-12 00:48+0000\n"
+"PO-Revision-Date: 2022-07-02 12:04+0200\n"
 "Last-Translator: Frederik Schwarzer <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
 "Language: de\n"
@@ -130,22 +130,22 @@ msgstr "Suchen"
 msgid "AudioTube"
 msgstr "AudioTube"

-#: contents/ui/MaximizedPlayerPage.qml:86
+#: contents/ui/MaximizedPlayerPage.qml:92
 #, kde-format
 msgid "Now Playing"
 msgstr "Aktueller Titel"

-#: contents/ui/MaximizedPlayerPage.qml:112
+#: contents/ui/MaximizedPlayerPage.qml:117
 #, kde-format
 msgid "Queue"
 msgstr "Warteschlange"

-#: contents/ui/MaximizedPlayerPage.qml:224
+#: contents/ui/MaximizedPlayerPage.qml:222
 #, kde-format
 msgid "Remove Track"
 msgstr "Stück entfernen"

-#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MaximizedPlayerPage.qml:242
 #: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
@@ -154,12 +154,12 @@ msgstr "Es werden keine Medien wiedergegeben"
 #: contents/ui/PlaybackHistory.qml:15
 #, kde-format
 msgid "Unknown list of songs"
-msgstr ""
+msgstr "Unbekannte Liste von Liedern"

 #: contents/ui/PlaybackHistory.qml:25
 #, kde-format
 msgid "No songs here yet"
-msgstr ""
+msgstr "Bisher keine Lieder hier"

 #: contents/ui/SearchPage.qml:27
 #, kde-format
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2022-05-30 00:47+0000\n"
-"PO-Revision-Date: 2022-01-01 15:21+0000\n"
+"POT-Creation-Date: 2022-07-12 00:48+0000\n"
+"PO-Revision-Date: 2022-07-22 15:55+0100\n"
 "Last-Translator: Steve Allewell <[email protected]>\n"
 "Language-Team: British English <[email protected]>\n"
 "Language: en_GB\n"
@@ -15,7 +15,7 @@ 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 21.12.0\n"
+"X-Generator: Lokalize 22.04.3\n"

 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
@@ -92,32 +92,32 @@ msgstr "Cancel"
 #: contents/ui/LibraryPage.qml:27
 #, kde-format
 msgid "Favourites"
-msgstr ""
+msgstr "Favourites"

 #: contents/ui/LibraryPage.qml:37 contents/ui/LibraryPage.qml:108
 #, kde-format
 msgid "Show All"
-msgstr ""
+msgstr "Show All"

 #: contents/ui/LibraryPage.qml:42
 #, kde-format
 msgid "Favourite Songs"
-msgstr ""
+msgstr "Favourite Songs"

 #: contents/ui/LibraryPage.qml:98
 #, kde-format
 msgid "Most played"
-msgstr ""
+msgstr "Most played"

 #: contents/ui/LibraryPage.qml:113
 #, kde-format
 msgid "Played Songs"
-msgstr ""
+msgstr "Played Songs"

 #: contents/ui/main.qml:39
 #, kde-format
 msgid "Back"
-msgstr ""
+msgstr "Back"

 #: contents/ui/main.qml:73 contents/ui/SearchPage.qml:150
 #, kde-format
@@ -129,23 +129,22 @@ msgstr "Search"
 msgid "AudioTube"
 msgstr "AudioTube"

-#: contents/ui/MaximizedPlayerPage.qml:86
-#, fuzzy, kde-format
-#| msgid "No media playing"
+#: contents/ui/MaximizedPlayerPage.qml:92
+#, kde-format
 msgid "Now Playing"
-msgstr "No media playing"
+msgstr "Now Playing"

-#: contents/ui/MaximizedPlayerPage.qml:112
+#: contents/ui/MaximizedPlayerPage.qml:117
 #, kde-format
 msgid "Queue"
-msgstr ""
+msgstr "Queue"

-#: contents/ui/MaximizedPlayerPage.qml:224
+#: contents/ui/MaximizedPlayerPage.qml:222
 #, kde-format
 msgid "Remove Track"
 msgstr "Remove Track"

-#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MaximizedPlayerPage.qml:242
 #: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
@@ -154,12 +153,12 @@ msgstr "No media playing"
 #: contents/ui/PlaybackHistory.qml:15
 #, kde-format
 msgid "Unknown list of songs"
-msgstr ""
+msgstr "Unknown list of songs"

 #: contents/ui/PlaybackHistory.qml:25
 #, kde-format
 msgid "No songs here yet"
-msgstr ""
+msgstr "No songs here yet"

 #: contents/ui/SearchPage.qml:27
 #, kde-format
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2022-05-30 00:47+0000\n"
+"POT-Creation-Date: 2022-07-12 00:48+0000\n"
 "PO-Revision-Date: 2022-05-27 12:34+0200\n"
 "Last-Translator: Eloy Cuadra <[email protected]>\n"
 "Language-Team: Spanish <[email protected]>\n"
@@ -131,22 +131,22 @@ msgstr "Buscar"
 msgid "AudioTube"
 msgstr "AudioTube"

-#: contents/ui/MaximizedPlayerPage.qml:86
+#: contents/ui/MaximizedPlayerPage.qml:92
 #, kde-format
 msgid "Now Playing"
 msgstr "Reproduciendo"

-#: contents/ui/MaximizedPlayerPage.qml:112
+#: contents/ui/MaximizedPlayerPage.qml:117
 #, kde-format
 msgid "Queue"
 msgstr "Cola"

-#: contents/ui/MaximizedPlayerPage.qml:224
+#: contents/ui/MaximizedPlayerPage.qml:222
 #, kde-format
 msgid "Remove Track"
 msgstr "Eliminar pista"

-#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MaximizedPlayerPage.qml:242
 #: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2022-05-30 00:47+0000\n"
-"PO-Revision-Date: 2022-02-21 18:58+0100\n"
+"POT-Creation-Date: 2022-07-12 00:48+0000\n"
+"PO-Revision-Date: 2022-07-18 22:37+0200\n"
 "Last-Translator: Iñigo Salvador Azurmendi <[email protected]>\n"
 "Language-Team: Basque <[email protected]>\n"
 "Language: eu\n"
@@ -18,7 +18,7 @@ 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 21.12.2\n"
+"X-Generator: Lokalize 22.04.3\n"

 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
@@ -95,32 +95,32 @@ msgstr "Utzi"
 #: contents/ui/LibraryPage.qml:27
 #, kde-format
 msgid "Favourites"
-msgstr ""
+msgstr "Gogokoak"

 #: contents/ui/LibraryPage.qml:37 contents/ui/LibraryPage.qml:108
 #, kde-format
 msgid "Show All"
-msgstr ""
+msgstr "Erakutsi denak"

 #: contents/ui/LibraryPage.qml:42
 #, kde-format
 msgid "Favourite Songs"
-msgstr ""
+msgstr "Gogoko abestiak"

 #: contents/ui/LibraryPage.qml:98
 #, kde-format
 msgid "Most played"
-msgstr ""
+msgstr "Gehien jotakoa"

 #: contents/ui/LibraryPage.qml:113
 #, kde-format
 msgid "Played Songs"
-msgstr ""
+msgstr "Jotako abestiak"

 #: contents/ui/main.qml:39
 #, kde-format
 msgid "Back"
-msgstr ""
+msgstr "Atzera"

 #: contents/ui/main.qml:73 contents/ui/SearchPage.qml:150
 #, kde-format
@@ -132,23 +132,22 @@ msgstr "Bilatu"
 msgid "AudioTube"
 msgstr "AudioTube"

-#: contents/ui/MaximizedPlayerPage.qml:86
-#, fuzzy, kde-format
-#| msgid "No media playing"
+#: contents/ui/MaximizedPlayerPage.qml:92
+#, kde-format
 msgid "Now Playing"
-msgstr "Ez da euskarririk jotzen ari"
+msgstr "Orain jotzen"

-#: contents/ui/MaximizedPlayerPage.qml:112
+#: contents/ui/MaximizedPlayerPage.qml:117
 #, kde-format
 msgid "Queue"
-msgstr ""
+msgstr "Ilara"

-#: contents/ui/MaximizedPlayerPage.qml:224
+#: contents/ui/MaximizedPlayerPage.qml:222
 #, kde-format
 msgid "Remove Track"
 msgstr "Kendu pista"

-#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MaximizedPlayerPage.qml:242
 #: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
@@ -157,12 +156,12 @@ msgstr "Ez da euskarririk jotzen ari"
 #: contents/ui/PlaybackHistory.qml:15
 #, kde-format
 msgid "Unknown list of songs"
-msgstr ""
+msgstr "Abesti zerrenda ezezaguna"

 #: contents/ui/PlaybackHistory.qml:25
 #, kde-format
 msgid "No songs here yet"
-msgstr ""
+msgstr "Hemen oraindik ez dago abestirik"

 #: contents/ui/SearchPage.qml:27
 #, kde-format
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2022-05-30 00:47+0000\n"
-"PO-Revision-Date: 2022-01-11 22:47+0200\n"
+"POT-Creation-Date: 2022-07-12 00:48+0000\n"
+"PO-Revision-Date: 2022-06-13 19:11+0300\n"
 "Last-Translator: Tommi Nieminen <[email protected]>\n"
 "Language-Team: Finnish <[email protected]>\n"
 "Language: fi\n"
@@ -15,7 +15,7 @@ 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 20.04.2\n"
+"X-Generator: Lokalize 21.12.3\n"

 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
@@ -91,32 +91,32 @@ msgstr "Peru"
 #: contents/ui/LibraryPage.qml:27
 #, kde-format
 msgid "Favourites"
-msgstr ""
+msgstr "Suosikit"

 #: contents/ui/LibraryPage.qml:37 contents/ui/LibraryPage.qml:108
 #, kde-format
 msgid "Show All"
-msgstr ""
+msgstr "Näytä kaikki"

 #: contents/ui/LibraryPage.qml:42
 #, kde-format
 msgid "Favourite Songs"
-msgstr ""
+msgstr "Suosikkikappaleet"

 #: contents/ui/LibraryPage.qml:98
 #, kde-format
 msgid "Most played"
-msgstr ""
+msgstr "Soitetuimmat"

 #: contents/ui/LibraryPage.qml:113
 #, kde-format
 msgid "Played Songs"
-msgstr ""
+msgstr "Soitetut kappaleet"

 #: contents/ui/main.qml:39
 #, kde-format
 msgid "Back"
-msgstr ""
+msgstr "Takaisin"

 #: contents/ui/main.qml:73 contents/ui/SearchPage.qml:150
 #, kde-format
@@ -128,23 +128,22 @@ msgstr "Etsi"
 msgid "AudioTube"
 msgstr "AudioTube"

-#: contents/ui/MaximizedPlayerPage.qml:86
-#, fuzzy, kde-format
-#| msgid "No media playing"
+#: contents/ui/MaximizedPlayerPage.qml:92
+#, kde-format
 msgid "Now Playing"
-msgstr "Mitään ei toisteta"
+msgstr "Nyt soi"

-#: contents/ui/MaximizedPlayerPage.qml:112
+#: contents/ui/MaximizedPlayerPage.qml:117
 #, kde-format
 msgid "Queue"
-msgstr ""
+msgstr "Jono"

-#: contents/ui/MaximizedPlayerPage.qml:224
+#: contents/ui/MaximizedPlayerPage.qml:222
 #, kde-format
 msgid "Remove Track"
 msgstr "Poista raita"

-#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MaximizedPlayerPage.qml:242
 #: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
@@ -153,12 +152,12 @@ msgstr "Mitään ei toisteta"
 #: contents/ui/PlaybackHistory.qml:15
 #, kde-format
 msgid "Unknown list of songs"
-msgstr ""
+msgstr "Tuntematon kappaleluettelo"

 #: contents/ui/PlaybackHistory.qml:25
 #, kde-format
 msgid "No songs here yet"
-msgstr ""
+msgstr "Ei vielä kappaleita"

 #: contents/ui/SearchPage.qml:27
 #, kde-format
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2022-05-30 00:47+0000\n"
+"POT-Creation-Date: 2022-07-12 00:48+0000\n"
 "PO-Revision-Date: 2022-06-05 18:56+0200\n"
 "Last-Translator: Xavier Besnard <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
@@ -126,22 +126,22 @@ msgstr "Rechercher"
 msgid "AudioTube"
 msgstr "AudioTube"

-#: contents/ui/MaximizedPlayerPage.qml:86
+#: contents/ui/MaximizedPlayerPage.qml:92
 #, kde-format
 msgid "Now Playing"
 msgstr "En cours de lecture"

-#: contents/ui/MaximizedPlayerPage.qml:112
+#: contents/ui/MaximizedPlayerPage.qml:117
 #, kde-format
 msgid "Queue"
 msgstr "Mettre en file d'attente"

-#: contents/ui/MaximizedPlayerPage.qml:224
+#: contents/ui/MaximizedPlayerPage.qml:222
 #, kde-format
 msgid "Remove Track"
 msgstr "Supprimer une piste"

-#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MaximizedPlayerPage.qml:242
 #: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2022-05-30 00:47+0000\n"
+"POT-Creation-Date: 2022-07-12 00:48+0000\n"
 "PO-Revision-Date: 2021-09-17 20:09+0530\n"
 "Last-Translator: Raghavendra Kamath <[email protected]>\n"
 "Language-Team: kde-hindi\n"
@@ -128,23 +128,23 @@ msgstr "खोजें"
 msgid "AudioTube"
 msgstr "ओडियो-ट्यूब"

-#: contents/ui/MaximizedPlayerPage.qml:86
+#: contents/ui/MaximizedPlayerPage.qml:92
 #, fuzzy, kde-format
 #| msgid "No media playing"
 msgid "Now Playing"
 msgstr "कोई मीडिया नहीं बजा रहा है"

-#: contents/ui/MaximizedPlayerPage.qml:112
+#: contents/ui/MaximizedPlayerPage.qml:117
 #, kde-format
 msgid "Queue"
 msgstr ""

-#: contents/ui/MaximizedPlayerPage.qml:224
+#: contents/ui/MaximizedPlayerPage.qml:222
 #, kde-format
 msgid "Remove Track"
 msgstr "गाना हटाएँ"

-#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MaximizedPlayerPage.qml:242
 #: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2022-05-30 00:47+0000\n"
+"POT-Creation-Date: 2022-07-12 00:48+0000\n"
 "PO-Revision-Date: 2022-05-26 14:13+0200\n"
 "Last-Translator: Vincenzo Reale <[email protected]>\n"
 "Language-Team: Italian <[email protected]>\n"
@@ -129,22 +129,22 @@ msgstr "Cerca"
 msgid "AudioTube"
 msgstr "AudioTube"

-#: contents/ui/MaximizedPlayerPage.qml:86
+#: contents/ui/MaximizedPlayerPage.qml:92
 #, kde-format
 msgid "Now Playing"
 msgstr "In riproduzione"

-#: contents/ui/MaximizedPlayerPage.qml:112
+#: contents/ui/MaximizedPlayerPage.qml:117
 #, kde-format
 msgid "Queue"
 msgstr "Coda"

-#: contents/ui/MaximizedPlayerPage.qml:224
+#: contents/ui/MaximizedPlayerPage.qml:222
 #, kde-format
 msgid "Remove Track"
 msgstr "Rimuovi traccia"

-#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MaximizedPlayerPage.qml:242
 #: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
@@ -1,13 +1,13 @@
 # Copyright (C) YEAR This file is copyright:
 # This file is distributed under the same license as the audiotube package.
-# Shinjo Park <[email protected]>, 2021.
+# Shinjo Park <[email protected]>, 2021, 2022.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2022-05-30 00:47+0000\n"
-"PO-Revision-Date: 2021-12-08 00:45+0100\n"
+"POT-Creation-Date: 2022-07-12 00:48+0000\n"
+"PO-Revision-Date: 2022-07-13 15:34+0200\n"
 "Last-Translator: Shinjo Park <[email protected]>\n"
 "Language-Team: Korean <[email protected]>\n"
 "Language: ko\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Lokalize 21.08.1\n"
+"X-Generator: Lokalize 21.12.3\n"

 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
@@ -90,32 +90,32 @@ msgstr "취소"
 #: contents/ui/LibraryPage.qml:27
 #, kde-format
 msgid "Favourites"
-msgstr ""
+msgstr "책갈피"

 #: contents/ui/LibraryPage.qml:37 contents/ui/LibraryPage.qml:108
 #, kde-format
 msgid "Show All"
-msgstr ""
+msgstr "모두 표시"

 #: contents/ui/LibraryPage.qml:42
 #, kde-format
 msgid "Favourite Songs"
-msgstr ""
+msgstr "책갈피에 등록된 노래"

 #: contents/ui/LibraryPage.qml:98
 #, kde-format
 msgid "Most played"
-msgstr ""
+msgstr "가장 많이 재생됨"

 #: contents/ui/LibraryPage.qml:113
 #, kde-format
 msgid "Played Songs"
-msgstr ""
+msgstr "재생한 노래"

 #: contents/ui/main.qml:39
 #, kde-format
 msgid "Back"
-msgstr ""
+msgstr "뒤로"

 #: contents/ui/main.qml:73 contents/ui/SearchPage.qml:150
 #, kde-format
@@ -127,23 +127,22 @@ msgstr "검색"
 msgid "AudioTube"
 msgstr "AudioTube"

-#: contents/ui/MaximizedPlayerPage.qml:86
-#, fuzzy, kde-format
-#| msgid "No media playing"
+#: contents/ui/MaximizedPlayerPage.qml:92
+#, kde-format
 msgid "Now Playing"
-msgstr "재생 중인 미디어 없음"
+msgstr "지금 재생 중"

-#: contents/ui/MaximizedPlayerPage.qml:112
+#: contents/ui/MaximizedPlayerPage.qml:117
 #, kde-format
 msgid "Queue"
-msgstr ""
+msgstr "대기열에 추가"

-#: contents/ui/MaximizedPlayerPage.qml:224
+#: contents/ui/MaximizedPlayerPage.qml:222
 #, kde-format
 msgid "Remove Track"
 msgstr "트랙 삭제"

-#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MaximizedPlayerPage.qml:242
 #: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
@@ -152,12 +151,12 @@ msgstr "재생 중인 미디어 없음"
 #: contents/ui/PlaybackHistory.qml:15
 #, kde-format
 msgid "Unknown list of songs"
-msgstr ""
+msgstr "알 수 없는 노래 목록"

 #: contents/ui/PlaybackHistory.qml:25
 #, kde-format
 msgid "No songs here yet"
-msgstr ""
+msgstr "목록에 등록된 곡 없음"

 #: contents/ui/SearchPage.qml:27
 #, kde-format
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2022-05-30 00:47+0000\n"
+"POT-Creation-Date: 2022-07-12 00:48+0000\n"
 "PO-Revision-Date: 2022-05-26 13:17+0200\n"
 "Last-Translator: Freek de Kruijf <[email protected]>\n"
 "Language-Team: \n"
@@ -129,22 +129,22 @@ msgstr "Zoeken"
 msgid "AudioTube"
 msgstr "AudioTube"

-#: contents/ui/MaximizedPlayerPage.qml:86
+#: contents/ui/MaximizedPlayerPage.qml:92
 #, kde-format
 msgid "Now Playing"
 msgstr "Speelt nu"

-#: contents/ui/MaximizedPlayerPage.qml:112
+#: contents/ui/MaximizedPlayerPage.qml:117
 #, kde-format
 msgid "Queue"
 msgstr "Wachtrij"

-#: contents/ui/MaximizedPlayerPage.qml:224
+#: contents/ui/MaximizedPlayerPage.qml:222
 #, kde-format
 msgid "Remove Track"
 msgstr "Track verwijderen"

-#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MaximizedPlayerPage.qml:242
 #: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
@@ -0,0 +1,192 @@
+# Translation of audiotube to Norwegian Nynorsk
+#
+# Øystein Steffensen-Alværvik <[email protected]>, 2022.
+# Karl Ove Hufthammer <[email protected]>, 2022.
+msgid ""
+msgstr ""
+"Project-Id-Version: audiotube\n"
+"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
+"POT-Creation-Date: 2022-07-12 00:48+0000\n"
+"PO-Revision-Date: 2022-08-07 12:08+0200\n"
+"Last-Translator: Karl Ove Hufthammer <[email protected]>\n"
+"Language-Team: Norwegian Nynorsk <[email protected]>\n"
+"Language: nn\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: Lokalize 22.04.3\n"
+"X-Environment: kde\n"
+"X-Accelerator-Marker: &\n"
+"X-Text-Markup: kde4\n"
+
+#, kde-format
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Øystein Steffensen-Alværvik"
+
+#, kde-format
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "[email protected]"
+
+#: contents/ui/AlbumPage.qml:19 contents/ui/PlaylistPage.qml:19
+#, kde-format
+msgid "Play"
+msgstr "Spel av"
+
+#: contents/ui/AlbumPage.qml:26 contents/ui/PlaylistPage.qml:26
+#, kde-format
+msgid "Shuffle"
+msgstr "Stokk om"
+
+#: contents/ui/AlbumPage.qml:68 contents/ui/ArtistPage.qml:101
+#: contents/ui/PlaybackHistory.qml:74 contents/ui/PlaylistPage.qml:67
+#, kde-format
+msgid "Play Next"
+msgstr "Spel som neste"
+
+#: contents/ui/AlbumPage.qml:73 contents/ui/ArtistPage.qml:107
+#: contents/ui/PlaybackHistory.qml:79 contents/ui/PlaylistPage.qml:72
+#: contents/ui/SearchPage.qml:123
+#, kde-format
+msgid "Add to Playlist"
+msgstr "Legg til speleliste"
+
+#: contents/ui/ArtistPage.qml:39 contents/ui/SearchPage.qml:67
+#, kde-format
+msgid ""
+"Video playback is not supported yet. Do you want to play only the audio of "
+"\"%1\"?"
+msgstr "Videoavspeling er endå ikkje støtta. Vil du spela av lyden til «%1»?"
+
+#: contents/ui/ArtistPage.qml:55 contents/ui/SearchPage.qml:25
+#, kde-format
+msgid "Albums"
+msgstr "Album"
+
+#: contents/ui/ArtistPage.qml:57
+#, kde-format
+msgid "Singles"
+msgstr "Singelplater"
+
+#: contents/ui/ArtistPage.qml:59 contents/ui/SearchPage.qml:31
+#, kde-format
+msgid "Songs"
+msgstr "Songar"
+
+#: contents/ui/ArtistPage.qml:61 contents/ui/SearchPage.qml:33
+#, kde-format
+msgid "Videos"
+msgstr "Videoar"
+
+#: contents/ui/ConfirmationMessage.qml:16
+#, kde-format
+msgid "OK"
+msgstr "OK"
+
+#: contents/ui/ConfirmationMessage.qml:21
+#, kde-format
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: contents/ui/LibraryPage.qml:27
+#, kde-format
+msgid "Favourites"
+msgstr "Favorittar"
+
+#: contents/ui/LibraryPage.qml:37 contents/ui/LibraryPage.qml:108
+#, kde-format
+msgid "Show All"
+msgstr "Vis alle"
+
+#: contents/ui/LibraryPage.qml:42
+#, kde-format
+msgid "Favourite Songs"
+msgstr "Favorittsongar"
+
+#: contents/ui/LibraryPage.qml:98
+#, kde-format
+msgid "Most played"
+msgstr "Oftast avspela"
+
+#: contents/ui/LibraryPage.qml:113
+#, kde-format
+msgid "Played Songs"
+msgstr "Avspela songar"
+
+#: contents/ui/main.qml:39
+#, kde-format
+msgid "Back"
+msgstr "Tilbake"
+
+#: contents/ui/main.qml:73 contents/ui/SearchPage.qml:150
+#, kde-format
+msgid "Search"
+msgstr "Søk"
+
+#: contents/ui/main.qml:85
+#, kde-format
+msgid "AudioTube"
+msgstr "AudioTube"
+
+#: contents/ui/MaximizedPlayerPage.qml:92
+#, kde-format
+msgid "Now Playing"
+msgstr "Spelar no"
+
+#: contents/ui/MaximizedPlayerPage.qml:117
+#, kde-format
+msgid "Queue"
+msgstr "Kø"
+
+#: contents/ui/MaximizedPlayerPage.qml:222
+#, kde-format
+msgid "Remove Track"
+msgstr "Fjern spor"
+
+#: contents/ui/MaximizedPlayerPage.qml:242
+#: contents/ui/MinimizedPlayerControls.qml:96
+#, kde-format
+msgid "No media playing"
+msgstr "Inkje medium vert spela"
+
+#: contents/ui/PlaybackHistory.qml:15
+#, kde-format
+msgid "Unknown list of songs"
+msgstr "Ukjend songliste"
+
+#: contents/ui/PlaybackHistory.qml:25
+#, kde-format
+msgid "No songs here yet"
+msgstr "Ingen songar enno"
+
+#: contents/ui/SearchPage.qml:27
+#, kde-format
+msgid "Artists"
+msgstr "Artistar"
+
+#: contents/ui/SearchPage.qml:29
+#, kde-format
+msgid "Playlists"
+msgstr "Spelelister"
+
+#: contents/ui/SearchPage.qml:36
+#, kde-format
+msgid "Unknown"
+msgstr "Ukjend"
+
+#: contents/ui/SearchPage.qml:117
+#, kde-format
+msgid "Play next"
+msgstr "Spel som neste"
+
+#: contents/ui/SearchPage.qml:129
+#, kde-format
+msgid "Radio"
+msgstr "Radio"
+
+#: contents/ui/SearchPage.qml:147
+#, kde-format
+msgid "Find music on YouTube Music"
+msgstr "Søk etter musikk på YouTube Music"
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2022-05-30 00:47+0000\n"
+"POT-Creation-Date: 2022-07-12 00:48+0000\n"
 "PO-Revision-Date: 2022-01-01 09:11-0800\n"
 "Last-Translator: A S Alam <[email protected]>\n"
 "Language-Team: Punjabi <[email protected]>\n"
@@ -127,23 +127,23 @@ msgstr "ਖੋਜੋ"
 msgid "AudioTube"
 msgstr "ਆਡੀਓ-ਟਿਊਬ"

-#: contents/ui/MaximizedPlayerPage.qml:86
+#: contents/ui/MaximizedPlayerPage.qml:92
 #, fuzzy, kde-format
 #| msgid "No media playing"
 msgid "Now Playing"
 msgstr "ਕੋਈ ਮੀਡੀਆ ਨਹੀਂ ਚੱਲਦਾ"

-#: contents/ui/MaximizedPlayerPage.qml:112
+#: contents/ui/MaximizedPlayerPage.qml:117
 #, kde-format
 msgid "Queue"
 msgstr ""

-#: contents/ui/MaximizedPlayerPage.qml:224
+#: contents/ui/MaximizedPlayerPage.qml:222
 #, kde-format
 msgid "Remove Track"
 msgstr "ਟਰੈਕ ਨੂੰ ਹਟਾਓ"

-#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MaximizedPlayerPage.qml:242
 #: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
@@ -1,14 +1,14 @@
 # Copyright (C) YEAR This file is copyright:
 # This file is distributed under the same license as the audiotube package.
 #
-# Łukasz Wojniłowicz <[email protected]>, 2021.
+# Łukasz Wojniłowicz <[email protected]>, 2021, 2022.
 # Ignacy Kajdan <[email protected]>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2022-05-30 00:47+0000\n"
-"PO-Revision-Date: 2021-12-30 12:38+0100\n"
+"POT-Creation-Date: 2022-07-12 00:48+0000\n"
+"PO-Revision-Date: 2022-06-26 20:24+0200\n"
 "Last-Translator: Łukasz Wojniłowicz <[email protected]>\n"
 "Language-Team: Polish <[email protected]>\n"
 "Language: pl\n"
@@ -94,32 +94,32 @@ msgstr "Anuluj"
 #: contents/ui/LibraryPage.qml:27
 #, kde-format
 msgid "Favourites"
-msgstr ""
+msgstr "Ulubione"

 #: contents/ui/LibraryPage.qml:37 contents/ui/LibraryPage.qml:108
 #, kde-format
 msgid "Show All"
-msgstr ""
+msgstr "Pokaż wszystkie"

 #: contents/ui/LibraryPage.qml:42
 #, kde-format
 msgid "Favourite Songs"
-msgstr ""
+msgstr "Ulubione utwory"

 #: contents/ui/LibraryPage.qml:98
 #, kde-format
 msgid "Most played"
-msgstr ""
+msgstr "Najczęściej odtwarzane"

 #: contents/ui/LibraryPage.qml:113
 #, kde-format
 msgid "Played Songs"
-msgstr ""
+msgstr "Odtwarzane utwory"

 #: contents/ui/main.qml:39
 #, kde-format
 msgid "Back"
-msgstr ""
+msgstr "Wstecz"

 #: contents/ui/main.qml:73 contents/ui/SearchPage.qml:150
 #, kde-format
@@ -131,23 +131,22 @@ msgstr "Szukaj"
 msgid "AudioTube"
 msgstr "AudioTube"

-#: contents/ui/MaximizedPlayerPage.qml:86
-#, fuzzy, kde-format
-#| msgid "No media playing"
+#: contents/ui/MaximizedPlayerPage.qml:92
+#, kde-format
 msgid "Now Playing"
-msgstr "Nic nie jest odtwarzane"
+msgstr "Teraz odtwarzany"

-#: contents/ui/MaximizedPlayerPage.qml:112
+#: contents/ui/MaximizedPlayerPage.qml:117
 #, kde-format
 msgid "Queue"
-msgstr ""
+msgstr "Kolejka"

-#: contents/ui/MaximizedPlayerPage.qml:224
+#: contents/ui/MaximizedPlayerPage.qml:222
 #, kde-format
 msgid "Remove Track"
 msgstr "Usuń utwór"

-#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MaximizedPlayerPage.qml:242
 #: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
@@ -156,12 +155,12 @@ msgstr "Nic nie jest odtwarzane"
 #: contents/ui/PlaybackHistory.qml:15
 #, kde-format
 msgid "Unknown list of songs"
-msgstr ""
+msgstr "Nieznana lista utworów"

 #: contents/ui/PlaybackHistory.qml:25
 #, kde-format
 msgid "No songs here yet"
-msgstr ""
+msgstr "Jeszcze nie ma tutaj utworów"

 #: contents/ui/SearchPage.qml:27
 #, kde-format
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2022-05-30 00:47+0000\n"
+"POT-Creation-Date: 2022-07-12 00:48+0000\n"
 "PO-Revision-Date: 2022-06-03 17:36+0100\n"
 "Last-Translator: José Nuno Coelho Pires <[email protected]>\n"
 "Language-Team: Portuguese <[email protected]>\n"
@@ -131,22 +131,22 @@ msgstr "Procurar"
 msgid "AudioTube"
 msgstr "AudioTube"

-#: contents/ui/MaximizedPlayerPage.qml:86
+#: contents/ui/MaximizedPlayerPage.qml:92
 #, kde-format
 msgid "Now Playing"
 msgstr "Agora a Ouvir"

-#: contents/ui/MaximizedPlayerPage.qml:112
+#: contents/ui/MaximizedPlayerPage.qml:117
 #, kde-format
 msgid "Queue"
 msgstr "Fila"

-#: contents/ui/MaximizedPlayerPage.qml:224
+#: contents/ui/MaximizedPlayerPage.qml:222
 #, kde-format
 msgid "Remove Track"
 msgstr "Remover a Faixa"

-#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MaximizedPlayerPage.qml:242
 #: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
@@ -1,14 +1,14 @@
 # Copyright (C) YEAR This file is copyright:
 # This file is distributed under the same license as the audiotube package.
 #
-# Luiz Fernando Ranghetti <[email protected]>, 2021.
+# Luiz Fernando Ranghetti <[email protected]>, 2021, 2022.
 # Thiago Masato Costa Sueto <[email protected]>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2022-05-30 00:47+0000\n"
-"PO-Revision-Date: 2021-12-09 10:13-0300\n"
+"POT-Creation-Date: 2022-07-12 00:48+0000\n"
+"PO-Revision-Date: 2022-07-13 14:59-0300\n"
 "Last-Translator: Luiz Fernando Ranghetti <[email protected]>\n"
 "Language-Team: Portuguese <[email protected]>\n"
 "Language: pt_BR\n"
@@ -16,7 +16,7 @@ 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 20.04.2\n"
+"X-Generator: Lokalize 21.12.3\n"

 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
@@ -93,32 +93,32 @@ msgstr "Cancelar"
 #: contents/ui/LibraryPage.qml:27
 #, kde-format
 msgid "Favourites"
-msgstr ""
+msgstr "Favoritos"

 #: contents/ui/LibraryPage.qml:37 contents/ui/LibraryPage.qml:108
 #, kde-format
 msgid "Show All"
-msgstr ""
+msgstr "Mostrar tudo"

 #: contents/ui/LibraryPage.qml:42
 #, kde-format
 msgid "Favourite Songs"
-msgstr ""
+msgstr "Músicas favoritas"

 #: contents/ui/LibraryPage.qml:98
 #, kde-format
 msgid "Most played"
-msgstr ""
+msgstr "Mais reproduzidas"

 #: contents/ui/LibraryPage.qml:113
 #, kde-format
 msgid "Played Songs"
-msgstr ""
+msgstr "Músicas reproduzidas"

 #: contents/ui/main.qml:39
 #, kde-format
 msgid "Back"
-msgstr ""
+msgstr "Voltar"

 #: contents/ui/main.qml:73 contents/ui/SearchPage.qml:150
 #, kde-format
@@ -130,23 +130,22 @@ msgstr "Pesquisar"
 msgid "AudioTube"
 msgstr "AudioTube"

-#: contents/ui/MaximizedPlayerPage.qml:86
-#, fuzzy, kde-format
-#| msgid "No media playing"
+#: contents/ui/MaximizedPlayerPage.qml:92
+#, kde-format
 msgid "Now Playing"
-msgstr "Nenhuma mídia em reprodução"
+msgstr "Reproduzindo agora"

-#: contents/ui/MaximizedPlayerPage.qml:112
+#: contents/ui/MaximizedPlayerPage.qml:117
 #, kde-format
 msgid "Queue"
-msgstr ""
+msgstr "Fila"

-#: contents/ui/MaximizedPlayerPage.qml:224
+#: contents/ui/MaximizedPlayerPage.qml:222
 #, kde-format
 msgid "Remove Track"
 msgstr "Remover faixa"

-#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MaximizedPlayerPage.qml:242
 #: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
@@ -155,12 +154,12 @@ msgstr "Nenhuma mídia em reprodução"
 #: contents/ui/PlaybackHistory.qml:15
 #, kde-format
 msgid "Unknown list of songs"
-msgstr ""
+msgstr "Lista de músicas desconhecida"

 #: contents/ui/PlaybackHistory.qml:25
 #, kde-format
 msgid "No songs here yet"
-msgstr ""
+msgstr "Nenhuma música ainda"

 #: contents/ui/SearchPage.qml:27
 #, kde-format
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2022-05-30 00:47+0000\n"
+"POT-Creation-Date: 2022-07-12 00:48+0000\n"
 "PO-Revision-Date: 2022-05-10 21:39+0300\n"
 "Last-Translator: Alexander Yavorsky <[email protected]>\n"
 "Language-Team: Russian <[email protected]>\n"
@@ -128,22 +128,22 @@ msgstr "Поиск"
 msgid "AudioTube"
 msgstr "AudioTube"

-#: contents/ui/MaximizedPlayerPage.qml:86
+#: contents/ui/MaximizedPlayerPage.qml:92
 #, kde-format
 msgid "Now Playing"
 msgstr ""

-#: contents/ui/MaximizedPlayerPage.qml:112
+#: contents/ui/MaximizedPlayerPage.qml:117
 #, kde-format
 msgid "Queue"
 msgstr ""

-#: contents/ui/MaximizedPlayerPage.qml:224
+#: contents/ui/MaximizedPlayerPage.qml:222
 #, kde-format
 msgid "Remove Track"
 msgstr "Удалить дорожку"

-#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MaximizedPlayerPage.qml:242
 #: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2022-05-30 00:47+0000\n"
+"POT-Creation-Date: 2022-07-12 00:48+0000\n"
 "PO-Revision-Date: 2022-04-07 18:01+0200\n"
 "Last-Translator: Roman Paholik <[email protected]>\n"
 "Language-Team: Slovak <[email protected]>\n"
@@ -126,23 +126,23 @@ msgstr "Hľadať"
 msgid "AudioTube"
 msgstr "AudioTube"

-#: contents/ui/MaximizedPlayerPage.qml:86
+#: contents/ui/MaximizedPlayerPage.qml:92
 #, fuzzy, kde-format
 #| msgid "No media playing"
 msgid "Now Playing"
 msgstr "Neprehráva sa žiadne médium"

-#: contents/ui/MaximizedPlayerPage.qml:112
+#: contents/ui/MaximizedPlayerPage.qml:117
 #, kde-format
 msgid "Queue"
 msgstr ""

-#: contents/ui/MaximizedPlayerPage.qml:224
+#: contents/ui/MaximizedPlayerPage.qml:222
 #, kde-format
 msgid "Remove Track"
 msgstr ""

-#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MaximizedPlayerPage.qml:242
 #: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2022-05-30 00:47+0000\n"
+"POT-Creation-Date: 2022-07-12 00:48+0000\n"
 "PO-Revision-Date: 2022-05-27 07:50+0200\n"
 "Last-Translator: Matjaž Jeran <[email protected]>\n"
 "Language-Team: Slovenian <[email protected]>\n"
@@ -128,22 +128,22 @@ msgstr "Išči"
 msgid "AudioTube"
 msgstr "AudioTube"

-#: contents/ui/MaximizedPlayerPage.qml:86
+#: contents/ui/MaximizedPlayerPage.qml:92
 #, kde-format
 msgid "Now Playing"
 msgstr "Pravkar predvajano"

-#: contents/ui/MaximizedPlayerPage.qml:112
+#: contents/ui/MaximizedPlayerPage.qml:117
 #, kde-format
 msgid "Queue"
 msgstr "Čakalna vrsta"

-#: contents/ui/MaximizedPlayerPage.qml:224
+#: contents/ui/MaximizedPlayerPage.qml:222
 #, kde-format
 msgid "Remove Track"
 msgstr "Odstrani sled"

-#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MaximizedPlayerPage.qml:242
 #: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2022-05-30 00:47+0000\n"
+"POT-Creation-Date: 2022-07-12 00:48+0000\n"
 "PO-Revision-Date: 2022-05-26 10:40+0200\n"
 "Last-Translator: Stefan Asserhäll <[email protected]>\n"
 "Language-Team: Swedish <[email protected]>\n"
@@ -127,22 +127,22 @@ msgstr "Sök"
 msgid "AudioTube"
 msgstr "AudioTube"

-#: contents/ui/MaximizedPlayerPage.qml:86
+#: contents/ui/MaximizedPlayerPage.qml:92
 #, kde-format
 msgid "Now Playing"
 msgstr "Spelar nu"

-#: contents/ui/MaximizedPlayerPage.qml:112
+#: contents/ui/MaximizedPlayerPage.qml:117
 #, kde-format
 msgid "Queue"
 msgstr "Köa"

-#: contents/ui/MaximizedPlayerPage.qml:224
+#: contents/ui/MaximizedPlayerPage.qml:222
 #, kde-format
 msgid "Remove Track"
 msgstr "Ta bort spår"

-#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MaximizedPlayerPage.qml:242
 #: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2022-05-30 00:47+0000\n"
+"POT-Creation-Date: 2022-07-12 00:48+0000\n"
 "PO-Revision-Date: 2022-05-26 10:29+0300\n"
 "Last-Translator: Emir SARI <[email protected]>\n"
 "Language-Team: Turkish <[email protected]>\n"
@@ -129,22 +129,22 @@ msgstr "Ara"
 msgid "AudioTube"
 msgstr "AudioTube"

-#: contents/ui/MaximizedPlayerPage.qml:86
+#: contents/ui/MaximizedPlayerPage.qml:92
 #, kde-format
 msgid "Now Playing"
 msgstr "Şimdi Çalınıyor"

-#: contents/ui/MaximizedPlayerPage.qml:112
+#: contents/ui/MaximizedPlayerPage.qml:117
 #, kde-format
 msgid "Queue"
 msgstr "Kuyruk"

-#: contents/ui/MaximizedPlayerPage.qml:224
+#: contents/ui/MaximizedPlayerPage.qml:222
 #, kde-format
 msgid "Remove Track"
 msgstr "Parçayı Kaldır"

-#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MaximizedPlayerPage.qml:242
 #: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2022-05-30 00:47+0000\n"
+"POT-Creation-Date: 2022-07-12 00:48+0000\n"
 "PO-Revision-Date: 2022-05-26 08:15+0300\n"
 "Last-Translator: Yuri Chornoivan <[email protected]>\n"
 "Language-Team: Ukrainian <[email protected]>\n"
@@ -130,22 +130,22 @@ msgstr "Пошук"
 msgid "AudioTube"
 msgstr "AudioTube"

-#: contents/ui/MaximizedPlayerPage.qml:86
+#: contents/ui/MaximizedPlayerPage.qml:92
 #, kde-format
 msgid "Now Playing"
 msgstr "Зараз відтворюємо"

-#: contents/ui/MaximizedPlayerPage.qml:112
+#: contents/ui/MaximizedPlayerPage.qml:117
 #, kde-format
 msgid "Queue"
 msgstr "Додати до черги"

-#: contents/ui/MaximizedPlayerPage.qml:224
+#: contents/ui/MaximizedPlayerPage.qml:222
 #, kde-format
 msgid "Remove Track"
 msgstr "Вилучити композицію"

-#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MaximizedPlayerPage.qml:242
 #: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kdeorg\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2022-05-30 00:47+0000\n"
-"PO-Revision-Date: 2022-06-19 07:00\n"
+"POT-Creation-Date: 2022-07-12 00:48+0000\n"
+"PO-Revision-Date: 2022-08-13 03:53\n"
 "Last-Translator: \n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
@@ -127,22 +127,22 @@ msgstr "搜索"
 msgid "AudioTube"
 msgstr "AudioTube"

-#: contents/ui/MaximizedPlayerPage.qml:86
+#: contents/ui/MaximizedPlayerPage.qml:92
 #, kde-format
 msgid "Now Playing"
 msgstr ""

-#: contents/ui/MaximizedPlayerPage.qml:112
+#: contents/ui/MaximizedPlayerPage.qml:117
 #, kde-format
 msgid "Queue"
 msgstr ""

-#: contents/ui/MaximizedPlayerPage.qml:224
+#: contents/ui/MaximizedPlayerPage.qml:222
 #, kde-format
 msgid "Remove Track"
 msgstr "移除曲目"

-#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MaximizedPlayerPage.qml:242
 #: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2022-05-30 00:47+0000\n"
+"POT-Creation-Date: 2022-07-12 00:48+0000\n"
 "PO-Revision-Date: 2022-05-30 00:47+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -128,22 +128,22 @@ msgstr ""
 msgid "AudioTube"
 msgstr ""

-#: contents/ui/MaximizedPlayerPage.qml:86
+#: contents/ui/MaximizedPlayerPage.qml:92
 #, kde-format
 msgid "Now Playing"
 msgstr ""

-#: contents/ui/MaximizedPlayerPage.qml:112
+#: contents/ui/MaximizedPlayerPage.qml:117
 #, kde-format
 msgid "Queue"
 msgstr ""

-#: contents/ui/MaximizedPlayerPage.qml:224
+#: contents/ui/MaximizedPlayerPage.qml:222
 #, kde-format
 msgid "Remove Track"
 msgstr ""

-#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MaximizedPlayerPage.qml:242
 #: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
@@ -48,6 +48,9 @@ target_link_libraries(audiotube
    KF5::I18n
    KF5::CoreAddons
    KF5::Crash
+    QCoro5::Core
+    QCoro5::Qml
+    QCoro5::Network
    ytm
    asyncdatabase
 )
@@ -4,26 +4,43 @@

 #include "albummodel.h"

-#include <QDebug>
+#include <QCoro/QCoroFuture>
+#include <QCoro/QCoroTask>
+
+
+#define AWAIT(coroutine) \
+    ({ \
+        bool __abort = false; \
+        connect(this, &QObject::destroyed, [&]() { \
+            __abort = true; \
+        }); \
+        auto val = co_await coroutine;  \
+        if (abort) { \
+            co_return; \
+        } \
+        val; \
+    })
+
+

 AlbumModel::AlbumModel(QObject *parent)
    : AbstractYTMusicModel(parent)
 {
-    connect(this, &AlbumModel::browseIdChanged, this, [this] {
+    connect(this, &AlbumModel::browseIdChanged, this, [this]() -> QCoro::Task<> {
        setLoading(true);
-        auto future = YTMusicThread::instance()->fetchAlbum(m_browseId);
-        connectFuture(future, this, [=, this](const album::Album &album) {
-            setLoading(false);

-            beginResetModel();
-            m_album = album;
-            endResetModel();
-            std::sort(m_album.thumbnails.begin(), m_album.thumbnails.end());
+        auto album = co_await YTMusicThread::instance()->fetchAlbum(m_browseId).withContext(this);

-            Q_EMIT titleChanged();
-            Q_EMIT thumbnailUrlChanged();
-            Q_EMIT playlistIdChanged();
-        });
+        setLoading(false);
+
+        beginResetModel();
+        m_album = album;
+        endResetModel();
+        std::sort(m_album.thumbnails.begin(), m_album.thumbnails.end());
+
+        Q_EMIT titleChanged();
+        Q_EMIT thumbnailUrlChanged();
+        Q_EMIT playlistIdChanged();
    });

    connect(&YTMusicThread::instance().get(), &AsyncYTMusic::errorOccurred, this, [=, this] {
@@ -6,37 +6,38 @@

 #include <asyncytmusic.h>

+#include <QCoro/QCoroTask>
+#include <QCoro/QCoroFuture>
+
 ArtistModel::ArtistModel(QObject *parent)
    : AbstractYTMusicModel(parent)
    , m_view(albums, singles, songs, videos)
 {
-    connect(this, &ArtistModel::channelIdChanged, this, [this] {
+    connect(this, &ArtistModel::channelIdChanged, this, [this]() -> QCoro::Task<> {
        if (m_channelId.isEmpty()) {
-            return;
+            co_return;
        }

        setLoading(true);

-        auto future = YTMusicThread::instance()->fetchArtist(m_channelId);
-        connectFuture(future, this, [=, this](const artist::Artist &artist) {
-            setLoading(false);
+        auto artist = co_await YTMusicThread::instance()->fetchArtist(m_channelId);
+        setLoading(false);

-            beginResetModel();
-            m_artist = artist;
-            std::sort(m_artist.thumbnails.begin(), m_artist.thumbnails.end());
+        beginResetModel();
+        m_artist = artist;
+        std::sort(m_artist.thumbnails.begin(), m_artist.thumbnails.end());

-            albums = m_artist.albums ? m_artist.albums->results : std::vector<artist::Artist::Album>();
-            singles = m_artist.singles ? m_artist.singles->results : std::vector<artist::Artist::Single>();
-            songs = m_artist.songs ? m_artist.songs->results : std::vector<artist::Artist::Song>();
-            videos = m_artist.videos ? m_artist.videos->results : std::vector<artist::Artist::Video>();
+        albums = m_artist.albums ? m_artist.albums->results : std::vector<artist::Artist::Album>();
+        singles = m_artist.singles ? m_artist.singles->results : std::vector<artist::Artist::Single>();
+        songs = m_artist.songs ? m_artist.songs->results : std::vector<artist::Artist::Song>();
+        videos = m_artist.videos ? m_artist.videos->results : std::vector<artist::Artist::Video>();

-            // std::span can't know if the data pointer underneath it was changed, so re-create
-            m_view = MultiIterableView(albums, singles, songs, videos);
-            endResetModel();
+        // std::span can't know if the data pointer underneath it was changed, so re-create
+        m_view = MultiIterableView(albums, singles, songs, videos);
+        endResetModel();

-            Q_EMIT titleChanged();
-            Q_EMIT thumbnailUrlChanged();
-        });
+        Q_EMIT titleChanged();
+        Q_EMIT thumbnailUrlChanged();
    });
    connect(&YTMusicThread::instance().get(), &AsyncYTMusic::errorOccurred, this, [this] {
        setLoading(false);
@@ -60,7 +60,7 @@ AsyncYTMusic::AsyncYTMusic(QObject *parent)
 //
 // search
 //
-QFuture<std::vector<search::SearchResultItem>> AsyncYTMusic::search(const QString &query)
+QCoro::Task<std::vector<search::SearchResultItem>> AsyncYTMusic::search(const QString &query)
 {
    return invokeAndCatchOnThread([=, this]() {
        return m_ytm->search(query.toStdString());
@@ -70,7 +70,7 @@ QFuture<std::vector<search::SearchResultItem>> AsyncYTMusic::search(const QStrin
 //
 // fetchArtist
 //
-QFuture<artist::Artist> AsyncYTMusic::fetchArtist(const QString &channelId)
+QCoro::Task<artist::Artist> AsyncYTMusic::fetchArtist(const QString &channelId)
 {
    return invokeAndCatchOnThread([=, this]() {
        return m_ytm->get_artist(channelId.toStdString());
@@ -80,7 +80,7 @@ QFuture<artist::Artist> AsyncYTMusic::fetchArtist(const QString &channelId)
 //
 // fetchAlbum
 //
-QFuture<album::Album> AsyncYTMusic::fetchAlbum(const QString &browseId)
+QCoro::Task<album::Album> AsyncYTMusic::fetchAlbum(const QString &browseId)
 {
    return invokeAndCatchOnThread([=, this]() {
        return m_ytm->get_album(browseId.toStdString());
@@ -90,7 +90,7 @@ QFuture<album::Album> AsyncYTMusic::fetchAlbum(const QString &browseId)
 //
 // fetchSong
 //
-QFuture<std::optional<song::Song>> AsyncYTMusic::fetchSong(const QString &videoId)
+QCoro::Task<std::optional<song::Song>> AsyncYTMusic::fetchSong(const QString &videoId)
 {
    return invokeAndCatchOnThread([=, this]() {
        return m_ytm->get_song(videoId.toStdString());
@@ -100,7 +100,7 @@ QFuture<std::optional<song::Song>> AsyncYTMusic::fetchSong(const QString &videoI
 //
 // fetchPlaylist
 //
-QFuture<playlist::Playlist> AsyncYTMusic::fetchPlaylist(const QString &playlistId) {
+QCoro::Task<playlist::Playlist> AsyncYTMusic::fetchPlaylist(const QString &playlistId) {
    return invokeAndCatchOnThread([=, this]() {
        return m_ytm->get_playlist(playlistId.toStdString());
    });
@@ -109,7 +109,7 @@ QFuture<playlist::Playlist> AsyncYTMusic::fetchPlaylist(const QString &playlistI
 //
 // fetchArtistAlbum
 //
-QFuture<std::vector<artist::Artist::Album>> AsyncYTMusic::fetchArtistAlbums(const QString &channelId, const QString &params)
+QCoro::Task<std::vector<artist::Artist::Album>> AsyncYTMusic::fetchArtistAlbums(const QString &channelId, const QString &params)
 {
    return invokeAndCatchOnThread([=, this]() {
        return m_ytm->get_artist_albums(channelId.toStdString(), params.toStdString());
@@ -119,7 +119,7 @@ QFuture<std::vector<artist::Artist::Album>> AsyncYTMusic::fetchArtistAlbums(cons
 //
 // extractVideoInfo
 //
-QFuture<video_info::VideoInfo> AsyncYTMusic::extractVideoInfo(const QString &videoId)
+QCoro::Task<video_info::VideoInfo> AsyncYTMusic::extractVideoInfo(const QString &videoId)
 {
    return invokeAndCatchOnThread([=, this]() {
        return m_ytm->extract_video_info(videoId.toStdString());
@@ -129,7 +129,7 @@ QFuture<video_info::VideoInfo> AsyncYTMusic::extractVideoInfo(const QString &vid
 //
 // fetchWatchPlaylist
 //
-QFuture<watch::Playlist> AsyncYTMusic::fetchWatchPlaylist(const std::optional<QString> &videoId, const std::optional<QString> &playlistId)
+QCoro::Task<watch::Playlist> AsyncYTMusic::fetchWatchPlaylist(const std::optional<QString> &videoId, const std::optional<QString> &playlistId)
 {
    return invokeAndCatchOnThread([=, this]() {
        return m_ytm->get_watch_playlist(
@@ -9,6 +9,9 @@
 #include <QFuture>
 #include <QFutureWatcher>

+#include <QCoroFuture>
+#include <QCoroTask>
+
 #include <vector>

 #include <ytmusic.h>
@@ -100,21 +103,21 @@ class AsyncYTMusic : public QObject

 public:
    // public functions need to be thread safe
-    QFuture<std::vector<search::SearchResultItem>> search(const QString &query);
+    QCoro::Task<std::vector<search::SearchResultItem>> search(const QString &query);

-    QFuture<artist::Artist> fetchArtist(const QString &channelId);
+    QCoro::Task<artist::Artist> fetchArtist(const QString &channelId);

-    QFuture<album::Album> fetchAlbum(const QString &browseId);
+    QCoro::Task<album::Album> fetchAlbum(const QString &browseId);

-    QFuture<std::optional<song::Song> > fetchSong(const QString &videoId);
+    QCoro::Task<std::optional<song::Song> > fetchSong(const QString &videoId);

-    QFuture<playlist::Playlist> fetchPlaylist(const QString &playlistId);
+    QCoro::Task<playlist::Playlist> fetchPlaylist(const QString &playlistId);

-    QFuture<std::vector<artist::Artist::Album>> fetchArtistAlbums(const QString &channelId, const QString &params);
+    QCoro::Task<std::vector<artist::Artist::Album>> fetchArtistAlbums(const QString &channelId, const QString &params);

-    QFuture<video_info::VideoInfo> extractVideoInfo(const QString &videoId);
+    QCoro::Task<video_info::VideoInfo> extractVideoInfo(const QString &videoId);

-    QFuture<watch::Playlist> fetchWatchPlaylist(const std::optional<QString> &videoId = std::nullopt ,
+    QCoro::Task<watch::Playlist> fetchWatchPlaylist(const std::optional<QString> &videoId = std::nullopt ,
                            const std::optional<QString> &playlistId = std::nullopt);

    Q_SIGNAL void errorOccurred(const QString &error);
@@ -125,7 +128,7 @@ protected:
 private:
    /// Invokes the given function on the thread of the YTMusic object, and handles exceptions that occur while invoking it.
    template <typename Func>
-    QFuture<std::invoke_result_t<Func>> invokeAndCatchOnThread(Func fun) {
+    QCoro::Task<std::invoke_result_t<Func>> invokeAndCatchOnThread(Func fun) {
        using ReturnType = std::invoke_result_t<Func>;
        auto interface = std::make_shared<QFutureInterface<ReturnType>>();
        QMetaObject::invokeMethod(this, [=, this]() {
@@ -138,7 +141,7 @@ private:
                Q_EMIT errorOccurred(QString::fromLocal8Bit(err.what()));
            }
        });
-        return interface->future();
+        co_return co_await interface->future();
    }

    // Python interpreter will be initialized from the thread calling the methods
@@ -83,14 +83,13 @@ Item {
            
            ToolButton {
                id: nowPlayingTab
-                text: i18n("Now Playing")
                padding: Kirigami.Units.largeSpacing
                onClicked: swipeView.setCurrentIndex(0)
                Layout.preferredHeight: Kirigami.Units.gridUnit * 2
                Layout.preferredWidth: Kirigami.Units.gridUnit * 9
-                
+
                contentItem: Label {
-                    text: nowPlayingTab.text
+                    text: i18n("Now Playing")
                    horizontalAlignment: Text.AlignHCenter
                    verticalAlignment: Text.AlignVCenter
                    elide: Text.ElideRight
@@ -109,14 +108,13 @@ Item {
            }
            ToolButton {
                id: queueTab
-                text: i18n("Queue")
                padding: Kirigami.Units.largeSpacing
                onClicked: swipeView.setCurrentIndex(1)
                Layout.preferredHeight: Kirigami.Units.gridUnit * 2
                Layout.preferredWidth: Kirigami.Units.gridUnit * 9
                
                contentItem: Label {
-                    text: queueTab.text
+                    text: i18n("Queue")
                    horizontalAlignment: Text.AlignHCenter
                    verticalAlignment: Text.AlignVCenter
                    elide: Text.ElideRight
@@ -12,8 +12,18 @@

 #include "asyncdatabase.h"

+#include <QCoroTask>
+#include <QCoroFuture>
+#include <QCoroQmlTask>
+#include <QCoroNetworkReply>
+
 namespace ranges = std::ranges;

+template <typename T>
+QCoro::Task<T> toTask(QFuture<T> &&future) {
+    co_return co_await future;
+}
+
 Library::Library(QObject *parent)
    : QObject{parent}
    , m_database(ThreadedDatabase::establishConnection([]() -> DatabaseConfiguration {
@@ -41,19 +51,23 @@ Library &Library::instance()
 FavouritesModel *Library::favourites()
 {
    auto future = m_database->getResults<Song>("select * from favourites natural join songs");
-    return new FavouritesModel(std::move(future), this);
+    return new FavouritesModel(toTask(std::move(future)), this);
 }

-void Library::addFavourite(const QString &videoId, const QString &title)
+QCoro::QmlTask Library::addFavourite(const QString &videoId, const QString &title)
 {
-    connectFuture(addSong(videoId, title), this, [=, this] {
-        connectFuture(m_database->execute("insert or ignore into favourites (video_id) values (?)", videoId), this, &Library::favouritesChanged);
-    });
+    return [=, this]() -> QCoro::Task<> {
+        co_await addSong(videoId, title);
+        co_await m_database->execute("insert or ignore into favourites (video_id) values (?)", videoId);
+    }();
 }

-void Library::removeFavourite(const QString &videoId)
+QCoro::QmlTask Library::removeFavourite(const QString &videoId)
 {
-    connectFuture(m_database->execute("delete from favourites where video_id = ?", videoId), this, &Library::favouritesChanged);
+    return [=, this]() -> QCoro::Task<> {
+        co_await m_database->execute("delete from favourites where video_id = ?", videoId);
+        Library::favouritesChanged();
+    }();
 }

 FavouriteWatcher *Library::favouriteWatcher(const QString &videoId)
@@ -66,7 +80,7 @@ FavouriteWatcher *Library::favouriteWatcher(const QString &videoId)

 SearchHistoryModel *Library::searches()
 {
-    return new SearchHistoryModel(m_database->getResults<SingleValue<QString>>("select (search_query) from searches order by search_id desc"), this);
+    return new SearchHistoryModel(toTask(m_database->getResults<SingleValue<QString>>("select (search_query) from searches order by search_id desc")), this);
 }

 void Library::addSearch(const QString &text)
@@ -77,22 +91,22 @@ void Library::addSearch(const QString &text)
 PlaybackHistoryModel *Library::playbackHistory()
 {
    auto future = m_database->getResults<PlayedSong>("select * from played_songs natural join songs");
-    return new PlaybackHistoryModel(std::move(future), this);
+    return new PlaybackHistoryModel(toTask(std::move(future)), this);
 }

-void Library::addPlaybackHistoryItem(const QString &videoId, const QString &title)
+QCoro::QmlTask Library::addPlaybackHistoryItem(const QString videoId, const QString title)
 {
-    connectFuture(addSong(videoId, title), this, [=, this] {
-        connectFuture(m_database->execute("insert or ignore into played_songs (video_id, plays) values (?, ?)", videoId, 0), this, [=, this] {
-            connectFuture(m_database->execute("update played_songs set plays = plays + 1 where video_id = ? ", videoId), this, &Library::playbackHistoryChanged);
-        });
-    });
+    return [=, this]() -> QCoro::Task<> {
+        co_await addSong(videoId, title);
+        co_await m_database->execute("insert or ignore into played_songs (video_id, plays) values (?, ?)", videoId, 0);
+        co_await m_database->execute("update played_songs set plays = plays + 1 where video_id = ? ", videoId);
+    }();
 }

 PlaybackHistoryModel *Library::mostPlayed()
 {
    auto future = m_database->getResults<PlayedSong>("select * from played_songs natural join songs order by plays desc limit 10");
-    return new PlaybackHistoryModel(std::move(future), this);
+    return new PlaybackHistoryModel(toTask(std::move(future)), this);
 }

 QNetworkAccessManager &Library::nam()
@@ -100,14 +114,14 @@ QNetworkAccessManager &Library::nam()
    return m_networkImageCacher;
 }

-QFuture<void> Library::addSong(const QString &videoId, const QString &title)
+QCoro::Task<> Library::addSong(const QString videoId, const QString title)
 {
-    return m_database->execute("insert or ignore into songs (video_id, title, artist, album) values (?, ?, null, null)", videoId, title);
+    co_await m_database->execute("insert or ignore into songs (video_id, title, artist, album) values (?, ?, null, null)", videoId, title);
 }

-void ThumbnailSource::setVideoId(const QString &id) {
+QCoro::Task<> ThumbnailSource::setVideoId(const QString &id) {
    if (m_videoId == id) {
-        return;
+        co_return;
    }

    m_videoId = id;
@@ -119,25 +133,21 @@ void ThumbnailSource::setVideoId(const QString &id) {

    if (QFile::exists(cacheLocation)) {
        setCachedPath(QUrl::fromLocalFile(cacheLocation));
-        return;
+        co_return;
    }

-    auto future = YTMusicThread::instance()->extractVideoInfo(id);
-    connectFuture(future, this, [this, id, cacheLocation](video_info::VideoInfo &&info) {
-        auto *reply = Library::instance().nam().get(QNetworkRequest(QUrl(QString::fromStdString(info.thumbnail))));
-        connect(reply, &QNetworkReply::finished, this, [id, reply, this, cacheLocation]() {
-            QFile file(cacheLocation);
-            file.open(QFile::WriteOnly);
-            file.write(reply->readAll());
-            setCachedPath(QUrl::fromLocalFile(cacheLocation));
-        });
-    });
+    auto info = co_await YTMusicThread::instance()->extractVideoInfo(id);
+    auto *reply = co_await Library::instance().nam().get(QNetworkRequest(QUrl(QString::fromStdString(info.thumbnail))));
+    QFile file(cacheLocation);
+    file.open(QFile::WriteOnly);
+    file.write(reply->readAll());
+    setCachedPath(QUrl::fromLocalFile(cacheLocation));
 }

-PlaybackHistoryModel::PlaybackHistoryModel(QFuture<std::vector<PlayedSong> > &&songs, QObject *parent)
+PlaybackHistoryModel::PlaybackHistoryModel(QCoro::Task<std::vector<PlayedSong> > &&songs, QObject *parent)
    : QAbstractListModel(parent)
 {
-    connectFuture(songs, this, [this](const auto songs) {
+    songs.then([this](const auto songs) {
        beginResetModel();
        m_playedSongs = songs;
        endResetModel();
@@ -172,10 +182,10 @@ QVariant PlaybackHistoryModel::data(const QModelIndex &index, int role) const {
    Q_UNREACHABLE();
 }

-FavouritesModel::FavouritesModel(QFuture<std::vector<Song>> &&songs, QObject *parent)
+FavouritesModel::FavouritesModel(QCoro::Task<std::vector<Song>> &&songs, QObject *parent)
    : QAbstractListModel(parent)
 {
-    connectFuture(songs, this, [this](const auto songs) {
+    songs.then([this](const auto songs) {
        beginResetModel();
        m_favouriteSongs = songs;
        endResetModel();
@@ -207,16 +217,21 @@ QVariant FavouritesModel::data(const QModelIndex &index, int role) const {
    Q_UNREACHABLE();
 }

+template <typename T>
+QCoro::Task<T> toTask(QFuture<T> &future) {
+    auto result = co_await future;
+    co_return result;
+}
+
 FavouriteWatcher::FavouriteWatcher(Library *library, const QString &videoId)
    : QObject(library), m_videoId(videoId), m_library(library)
 {
-    auto update = [this] {
-        connectFuture(m_library->database().getResult<SingleValue<int>>("select count(*) from favourites where video_id = ?", m_videoId), this, [this](auto count) {
-            if (count) {
-                m_isFavourite = count->value > 0;
-                Q_EMIT isFavouriteChanged();
-            }
-        });
+    auto update = [this]() -> QCoro::Task<> {
+        auto count = co_await toTask(m_library->database().getResult<SingleValue<bool>>("select count(*) > 0 from favourites where video_id = ?", m_videoId)).withContext(this);
+        if (count) {
+             m_isFavourite = count->value;
+            Q_EMIT isFavouriteChanged();
+        }
    };
    update();
    connect(library, &Library::favouritesChanged, this, update);
@@ -226,10 +241,10 @@ bool FavouriteWatcher::isFavourite() const {
    return m_isFavourite;
 }

-SearchHistoryModel::SearchHistoryModel(QFuture<std::vector<SingleValue<QString>>> &&historyFuture, QObject *parent)
+SearchHistoryModel::SearchHistoryModel(QCoro::Task<std::vector<SingleValue<QString>>> &&historyFuture, QObject *parent)
    : QAbstractListModel(parent)
 {
-    connectFuture(historyFuture, this, [this](const auto history) {
+   historyFuture.then([this](const auto history) {
        beginResetModel();
        m_history = history;
        endResetModel();
@@ -9,6 +9,8 @@
 #include <QNetworkAccessManager>
 #include <QAbstractListModel>

+#include <QCoroQmlTask>
+
 #include <memory>

 #include "asyncytmusic.h"
@@ -40,7 +42,7 @@ class FavouritesModel : public QAbstractListModel {
    };

 public:
-    FavouritesModel(QFuture<std::vector<Song>> &&songs, QObject *parent = nullptr);
+    FavouritesModel(QCoro::Task<std::vector<Song>> &&songs, QObject *parent = nullptr);

    QHash<int, QByteArray> roleNames() const override;
    int rowCount(const QModelIndex &parent) const override;
@@ -76,7 +78,7 @@ class PlaybackHistoryModel : public QAbstractListModel {
    };

 public:
-    PlaybackHistoryModel(QFuture<std::vector<PlayedSong>> &&songs, QObject *parent = nullptr);
+    PlaybackHistoryModel(QCoro::Task<std::vector<PlayedSong>> &&songs, QObject *parent = nullptr);

    QHash<int, QByteArray> roleNames() const override;
    int rowCount(const QModelIndex &parent) const override;
@@ -90,7 +92,7 @@ class SearchHistoryModel : public QAbstractListModel {
    Q_OBJECT

 public:
-    SearchHistoryModel(QFuture<std::vector<SingleValue<QString>>> &&historyFuture, QObject *parent = nullptr);
+    SearchHistoryModel(QCoro::Task<std::vector<SingleValue<QString>>> &&historyFuture, QObject *parent = nullptr);
    int rowCount(const QModelIndex &parent) const override;
    QVariant data(const QModelIndex &index, int role) const override;

@@ -114,8 +116,8 @@ public:

    FavouritesModel *favourites();
    Q_SIGNAL void favouritesChanged();
-    Q_INVOKABLE void addFavourite(const QString &videoId, const QString &title);
-    Q_INVOKABLE void removeFavourite(const QString &videoId);
+    Q_INVOKABLE QCoro::QmlTask addFavourite(const QString &videoId, const QString &title);
+    Q_INVOKABLE QCoro::QmlTask removeFavourite(const QString &videoId);
    Q_INVOKABLE FavouriteWatcher *favouriteWatcher(const QString &videoId);

    SearchHistoryModel *searches();
@@ -124,7 +126,7 @@ public:

    PlaybackHistoryModel *playbackHistory();
    Q_SIGNAL void playbackHistoryChanged();
-    Q_INVOKABLE void addPlaybackHistoryItem(const QString &videoId, const QString &title);
+    Q_INVOKABLE QCoro::QmlTask addPlaybackHistoryItem(const QString videoId, const QString title);

    PlaybackHistoryModel *mostPlayed();

@@ -134,7 +136,7 @@ public:
    }

 private:
-    QFuture<void> addSong(const QString &videoId, const QString &title);
+    QCoro::Task<> addSong(const QString videoId, const QString title);

    QNetworkAccessManager m_networkImageCacher;
    std::unique_ptr<ThreadedDatabase> m_database;
@@ -150,7 +152,7 @@ class ThumbnailSource : public QObject {
    QString videoId() const {
        return m_videoId;
    }
-    void setVideoId(const QString &id);
+    QCoro::Task<> setVideoId(const QString &id);
    Q_SIGNAL void videoIdChanged();

    QUrl cachedPath() const {
@@ -11,6 +11,8 @@
 #include <KCrash>
 #include <KAboutData>

+#include <QCoroQml>
+
 #include "searchmodel.h"
 #include "albummodel.h"
 #include "videoinfoextractor.h"
@@ -38,6 +40,8 @@ Q_DECL_EXPORT int main(int argc, char *argv[])
    KAboutData::setApplicationData(KAboutData(QStringLiteral("audiotube"), QStringLiteral("AudioTube")));
    KCrash::initialize();

+    QCoro::Qml::registerTypes();
+
    QQmlApplicationEngine engine;

    qmlRegisterType<SearchModel>(URI, 1, 0, "SearchModel");
@@ -16,7 +16,7 @@ PlaylistModel::PlaylistModel(QObject *parent)
    connect(this, &PlaylistModel::playlistIdChanged, this, [=, this] {
        setLoading(true);
        auto future = YTMusicThread::instance()->fetchPlaylist(m_playlistId);
-        connectFuture(future, this, [=, this](const playlist::Playlist &playlist) {
+        future.then(this, [=, this](const playlist::Playlist &playlist) {
            setLoading(false);
            beginResetModel();
            m_playlist = playlist;
@@ -4,25 +4,26 @@

 #include "searchmodel.h"

+#include <QCoroFuture>
+#include <QCoroTask>
+
 SearchModel::SearchModel(QObject *parent)
    : AbstractYTMusicModel(parent)
 {
-    connect(this, &SearchModel::searchQueryChanged, this, [this] {
+    connect(this, &SearchModel::searchQueryChanged, this, [this]() -> QCoro::Task<> {
        if (m_searchQuery.isEmpty()) {
            beginResetModel();
            m_searchResults.clear();
            endResetModel();
-            return;
+            co_return;
        }

        setLoading(true);
-        auto future = YTMusicThread::instance()->search(m_searchQuery);
-        connectFuture(future, this, [=, this](const std::vector<search::SearchResultItem> &results) {
-            beginResetModel();
-            setLoading(false);
-            m_searchResults = results;
-            endResetModel();
-        });
+        auto results = co_await YTMusicThread::instance()->search(m_searchQuery);
+        beginResetModel();
+        setLoading(false);
+        m_searchResults = results;
+        endResetModel();
    });
    connect(&YTMusicThread::instance().get(), &AsyncYTMusic::errorOccurred, this, [this] {
        setLoading(false);
@@ -41,7 +41,7 @@ UserPlaylistModel::UserPlaylistModel(QObject *parent)

        setLoading(true);
        auto future = YTMusicThread::instance()->fetchWatchPlaylist(m_initialVideoId);
-        connectFuture(future, this, handleResult);
+        future.then(this, handleResult);
    });
    connect(this, &UserPlaylistModel::playlistIdChanged, this, [=, this] {
        if (m_playlistId.isEmpty()) {
@@ -50,7 +50,7 @@ UserPlaylistModel::UserPlaylistModel(QObject *parent)

        setLoading(true);
        auto future = YTMusicThread::instance()->fetchWatchPlaylist(std::nullopt, m_playlistId);
-        connectFuture(future, this, handleResult);;
+        future.then(this, handleResult);
    });
    connect(&YTMusicThread::instance().get(), &AsyncYTMusic::errorOccurred, this, [this] {
        setLoading(false);
@@ -27,7 +27,7 @@ VideoInfoExtractor::VideoInfoExtractor(QObject *parent)
        setLoading(true);

        auto future = YTMusicThread::instance()->extractVideoInfo(QString::fromStdString(m_videoId.toStdString()));
-        connectFuture(future, this, [this](const video_info::VideoInfo &videoInfo) {
+        future.then(this, [this](const video_info::VideoInfo &videoInfo) {
            m_videoInfo = videoInfo;
            setLoading(false);
            Q_EMIT audioUrlChanged();
@@ -5,6 +5,7 @@
 #include "ytmusic.h"

 #include <algorithm>
+#include <iostream>

 #include <pybind11/embed.h>
 #include <pybind11/stl.h>
Author	SHA1	Message	Date
Jonah Brüchert	701e5cfddc	Port to QCoro	2022-08-24 09:16:06 +02:00
l10n daemon script	be9b0d57e9	GIT_SILENT Sync po/docbooks with svn	2022-08-14 01:51:10 +00:00
l10n daemon script	b4c6749a76	GIT_SILENT Sync po/docbooks with svn	2022-08-08 01:57:12 +00:00
l10n daemon script	a98e3c7b92	SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	2022-08-08 01:51:52 +00:00
l10n daemon script	26e7bbbdb8	GIT_SILENT made messages (after extraction)	2022-08-08 00:48:13 +00:00
l10n daemon script	efa7dd674a	GIT_SILENT Sync po/docbooks with svn	2022-08-07 01:54:32 +00:00
l10n daemon script	ef59e9d418	GIT_SILENT Sync po/docbooks with svn	2022-07-31 01:57:02 +00:00
l10n daemon script	e1678a76ba	GIT_SILENT Sync po/docbooks with svn	2022-07-23 01:54:34 +00:00
Jonah Brüchert	56ffb52ce5	flatpak: Update python packages	2022-07-19 15:16:41 +02:00
l10n daemon script	f0a2d2e79a	GIT_SILENT Sync po/docbooks with svn	2022-07-19 01:45:53 +00:00
l10n daemon script	182e77a68d	GIT_SILENT Sync po/docbooks with svn	2022-07-17 01:52:45 +00:00
Jonah Brüchert	98ccbfe99d	ytmusic: Include iostream Previously this was not necessary, but now it fails to compile. I suspect this to be related to a gcc update.	2022-07-16 19:31:40 +02:00
l10n daemon script	53bfc641b4	GIT_SILENT Sync po/docbooks with svn	2022-07-15 01:54:45 +00:00
l10n daemon script	1aabf2eefc	GIT_SILENT Sync po/docbooks with svn	2022-07-14 01:58:13 +00:00
l10n daemon script	0d54dfb660	GIT_SILENT Sync po/docbooks with svn	2022-07-12 01:55:23 +00:00
Jonah Brüchert	8093f16f16	player: Set text directly on label instead of on the button I suspect this to be the cause of the duplicated label. However I'm not fully certain this fixes it. Please re-open the bug if the issue persists. BUG: 456597	2022-07-11 22:16:16 +02:00
Jonah Brüchert	bac6ac3362	(very) minor database optimization	2022-07-11 22:09:59 +02:00
Jonah Brüchert	2f914d9f60	appstream: Add library screenshot	2022-07-11 15:44:12 +02:00
l10n daemon script	d3293d22ab	GIT_SILENT Sync po/docbooks with svn	2022-07-11 01:55:30 +00:00
l10n daemon script	4de3fdae81	GIT_SILENT Sync po/docbooks with svn	2022-07-10 01:57:26 +00:00
l10n daemon script	9518c73415	GIT_SILENT Sync po/docbooks with svn	2022-07-09 01:56:21 +00:00
l10n daemon script	05be539411	GIT_SILENT Sync po/docbooks with svn	2022-07-03 02:04:59 +00:00
l10n daemon script	f12c4e3109	GIT_SILENT Sync po/docbooks with svn	2022-06-28 01:48:54 +00:00
l10n daemon script	004ef28a15	GIT_SILENT Sync po/docbooks with svn	2022-06-26 01:47:08 +00:00
l10n daemon script	afa9b25aff	GIT_SILENT Sync po/docbooks with svn	2022-06-25 02:06:45 +00:00