git.iko.soy/maciek134/podphoenix
on main help sign in
Merge Daniel's fixes for:
5c97a46Mike Sheldon
app/ui/SearchPage.qml+1
compare with main
unifiedsplit
@@ -307,6 +307,7 @@ Page {
307 }
307 }
308 });
308 });
309 }
309 }
310+ model.subscribed=!model.subscribed;
310 }
311 }
311 }
312 }
312 }
313 }
po/com.mikeasoft.podbird.pot+62−37
@@ -8,7 +8,7 @@ msgid ""
8msgstr ""
8msgstr ""
9"Project-Id-Version: \n"
9"Project-Id-Version: \n"
10"Report-Msgid-Bugs-To: \n"
10"Report-Msgid-Bugs-To: \n"
11−"POT-Creation-Date: 2020-03-25 12:20+0000\n"
11+"POT-Creation-Date: 2020-04-13 18:20+0000\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,9 +24,9 @@ msgstr ""
24msgid "Episodes"
24msgid "Episodes"
25msgstr ""
25msgstr ""
26
26
27−#: ../app/components/TabsList.qml:37 ../app/ui/SearchPage.qml:41
27+#: ../app/components/TabsList.qml:37 ../app/ui/SearchPage.qml:43
28#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/components/TabsList.qml:37
28#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/components/TabsList.qml:37
29−#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:41
29+#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:43
30msgid "Add New Podcasts"
30msgid "Add New Podcasts"
31msgstr ""
31msgstr ""
32
32
@@ -209,10 +209,10 @@ msgid "Search Episode"
209msgstr ""
209msgstr ""
210
210
211#: ../app/ui/EpisodesPage.qml:70 ../app/ui/EpisodesPage.qml:306
211#: ../app/ui/EpisodesPage.qml:70 ../app/ui/EpisodesPage.qml:306
212−#: ../app/ui/SearchPage.qml:275
212+#: ../app/ui/SearchPage.qml:290
213#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/EpisodesPage.qml:70
213#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/EpisodesPage.qml:70
214#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/EpisodesPage.qml:306
214#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/EpisodesPage.qml:306
215−#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:275
215+#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:290
216msgid "Unsubscribe"
216msgid "Unsubscribe"
217msgstr ""
217msgstr ""
218
218
@@ -281,10 +281,10 @@ msgstr ""
281msgid "Are you sure you want to unsubscribe from <b>%1</b>?"
281msgid "Are you sure you want to unsubscribe from <b>%1</b>?"
282msgstr ""
282msgstr ""
283
283
284−#: ../app/ui/EpisodesPage.qml:323 ../app/ui/SearchPage.qml:130
284+#: ../app/ui/EpisodesPage.qml:323 ../app/ui/SearchPage.qml:144
285#: ../app/ui/SettingsPage.qml:85 ../app/ui/SettingsPage.qml:120
285#: ../app/ui/SettingsPage.qml:85 ../app/ui/SettingsPage.qml:120
286#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/EpisodesPage.qml:323
286#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/EpisodesPage.qml:323
287−#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:130
287+#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:144
288#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SettingsPage.qml:85
288#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SettingsPage.qml:85
289#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SettingsPage.qml:120
289#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SettingsPage.qml:120
290msgid "Cancel"
290msgid "Cancel"
@@ -297,10 +297,10 @@ msgid "Episode Description"
297msgstr ""
297msgstr ""
298
298
299#: ../app/ui/EpisodesPage.qml:356 ../app/ui/EpisodesTab.qml:418
299#: ../app/ui/EpisodesPage.qml:356 ../app/ui/EpisodesTab.qml:418
300−#: ../app/ui/SearchPage.qml:179 ../app/ui/SettingsPage.qml:320
300+#: ../app/ui/SearchPage.qml:194 ../app/ui/SettingsPage.qml:320
301#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/EpisodesPage.qml:356
301#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/EpisodesPage.qml:356
302#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/EpisodesTab.qml:418
302#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/EpisodesTab.qml:418
303−#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:179
303+#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:194
304#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SettingsPage.qml:320
304#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SettingsPage.qml:320
305msgid "Close"
305msgid "Close"
306msgstr ""
306msgstr ""
@@ -474,6 +474,11 @@ msgstr ""
474msgid "+%1s"
474msgid "+%1s"
475msgstr ""
475msgstr ""
476
476
477+#: ../app/ui/ImportPage.qml:18
478+#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/ImportPage.qml:18
479+msgid "Choose"
480+msgstr ""
481+
477#: ../app/ui/NowPlayingPage.qml:34
482#: ../app/ui/NowPlayingPage.qml:34
478#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/NowPlayingPage.qml:34
483#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/NowPlayingPage.qml:34
479msgid "Now Playing"
484msgid "Now Playing"
@@ -489,11 +494,11 @@ msgstr ""
489msgid "Queue"
494msgid "Queue"
490msgstr ""
495msgstr ""
491
496
492−#: ../app/ui/PodcastsTab.qml:57 ../app/ui/SearchPage.qml:55
497+#: ../app/ui/PodcastsTab.qml:57 ../app/ui/SearchPage.qml:57
493−#: ../app/ui/SearchPage.qml:161
498+#: ../app/ui/SearchPage.qml:176
494#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/PodcastsTab.qml:57
499#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/PodcastsTab.qml:57
495−#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:55
500+#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:57
496−#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:161
501+#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:176
497msgid "Search Podcast"
502msgid "Search Podcast"
498msgstr ""
503msgstr ""
499
504
@@ -507,9 +512,9 @@ msgstr ""
507msgid "No Podcast Subscriptions"
512msgid "No Podcast Subscriptions"
508msgstr ""
513msgstr ""
509
514
510−#: ../app/ui/PodcastsTab.qml:127 ../app/ui/SearchPage.qml:207
515+#: ../app/ui/PodcastsTab.qml:127 ../app/ui/SearchPage.qml:222
511#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/PodcastsTab.qml:127
516#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/PodcastsTab.qml:127
512−#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:207
517+#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:222
513msgid "No Podcasts Found"
518msgid "No Podcasts Found"
514msgstr ""
519msgstr ""
515
520
@@ -520,9 +525,9 @@ msgid ""
520"page to add some."
525"page to add some."
521msgstr ""
526msgstr ""
522
527
523−#: ../app/ui/PodcastsTab.qml:129 ../app/ui/SearchPage.qml:209
528+#: ../app/ui/PodcastsTab.qml:129 ../app/ui/SearchPage.qml:224
524#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/PodcastsTab.qml:129
529#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/PodcastsTab.qml:129
525−#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:209
530+#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:224
526msgid "No podcasts found matching the search term."
531msgid "No podcasts found matching the search term."
527msgstr ""
532msgstr ""
528
533
@@ -534,62 +539,82 @@ msgid_plural "%1 unheard episodes"
534msgstr[0] ""
539msgstr[0] ""
535msgstr[1] ""
540msgstr[1] ""
536
541
537−#: ../app/ui/SearchPage.qml:63
542+#: ../app/ui/SearchPage.qml:65
538−#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:63
543+#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:65
539msgid "Add Podcast"
544msgid "Add Podcast"
540msgstr ""
545msgstr ""
541
546
542−#: ../app/ui/SearchPage.qml:122
547+#: ../app/ui/SearchPage.qml:73
548+#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:73
549+msgid "Import Podcasts"
550+msgstr ""
551+
552+#: ../app/ui/SearchPage.qml:135
543−#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:122
553+#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:135
544msgid "Save Podcast"
554msgid "Save Podcast"
545msgstr ""
555msgstr ""
546
556
547−#: ../app/ui/SearchPage.qml:149
557+#: ../app/ui/SearchPage.qml:163
548−#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:149
558+#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:163
549msgid "Feed URL"
559msgid "Feed URL"
550msgstr ""
560msgstr ""
551
561
552−#: ../app/ui/SearchPage.qml:176
562+#: ../app/ui/SearchPage.qml:191
553−#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:176
563+#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:191
554msgid "Unable to subscribe"
564msgid "Unable to subscribe"
555msgstr ""
565msgstr ""
556
566
557−#: ../app/ui/SearchPage.qml:177
567+#: ../app/ui/SearchPage.qml:192
558−#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:177
568+#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:192
559msgid "Please check the URL and try again"
569msgid "Please check the URL and try again"
560msgstr ""
570msgstr ""
561
571
562−#: ../app/ui/SearchPage.qml:207
572+#: ../app/ui/SearchPage.qml:222
563−#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:207
573+#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:222
564msgid "Looking to add a new podcast?"
574msgid "Looking to add a new podcast?"
565msgstr ""
575msgstr ""
566
576
567−#: ../app/ui/SearchPage.qml:208
577+#: ../app/ui/SearchPage.qml:223
568−#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:208
578+#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:223
569msgid ""
579msgid ""
570"Click the 'magnifier' at the top to search or the 'plus' button to add by URL"
580"Click the 'magnifier' at the top to search or the 'plus' button to add by URL"
571msgstr ""
581msgstr ""
572
582
573−#: ../app/ui/SearchPage.qml:275
583+#: ../app/ui/SearchPage.qml:290
574−#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:275
584+#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:290
575msgid "Subscribe"
585msgid "Subscribe"
576msgstr ""
586msgstr ""
577
587
578#. TRANSLATORS: The first argument here is the date of when the podcast was last updated followed by
588#. TRANSLATORS: The first argument here is the date of when the podcast was last updated followed by
579#. the podcast description.
589#. the podcast description.
580−#: ../app/ui/SearchPage.qml:313
590+#: ../app/ui/SearchPage.qml:328
581−#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:313
591+#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:327
582#, qt-format
592#, qt-format
583msgid ""
593msgid ""
584"Last Updated: %1\n"
594"Last Updated: %1\n"
585"%2"
595"%2"
586msgstr ""
596msgstr ""
587
597
588−#: ../app/ui/SearchPage.qml:370
598+#: ../app/ui/SearchPage.qml:385
589−#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:370
599+#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:384
590msgid "Not Available"
600msgid "Not Available"
591msgstr ""
601msgstr ""
592
602
603+#: ../app/ui/SearchPage.qml:499
604+#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:498
605+msgid "Please wait"
606+msgstr ""
607+
608+#: ../app/ui/SearchPage.qml:500
609+#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:499
610+msgid "Importing podcasts..."
611+msgstr ""
612+
613+#: ../app/ui/SearchPage.qml:518
614+#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:517
615+msgid "imported"
616+msgstr ""
617+
593#. TRANSLATORS: This strings refers to the seeking of the episode playback. Users can set how far they
618#. TRANSLATORS: This strings refers to the seeking of the episode playback. Users can set how far they
594#. want to seek forward when pressing on this button.
619#. want to seek forward when pressing on this button.
595#: ../app/ui/SettingsPage.qml:65 ../app/ui/SettingsPage.qml:171
620#: ../app/ui/SettingsPage.qml:65 ../app/ui/SettingsPage.qml:171