podbird

Merge lp:~dano6/podbird/podbird into lp:podbird

  1. podbird
  2. Merge into trunk
Proposed by Daniel Kutka
Status: Merged
Merged at revision: 200
Proposed branch: lp:~dano6/podbird/podbird
Merge into: lp:podbird
Diff against target: 230 lines (+63/-37)
2 files modified
app/ui/SearchPage.qml (+1/-0)
po/com.mikeasoft.podbird.pot (+62/-37)
To merge this branch: bzr merge lp:~dano6/podbird/podbird
Reviewer Review Type Date Requested Status
Michael Sheldon Pending
Review via email: mp+382136@code.launchpad.net

Description of the change

Revision 198 implemented https://bugs.launchpad.net/podbird/+bug/1725386 too, but subscribe button didn't respond visually, this should fix it. And I forget to update pot file.

To post a comment you must log in.
lp:~dano6/podbird/podbird updated
200. By Michael Sheldon

Merge Daniel's fixes for:

* Updating POT file
* Fixing subscribe button

Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

Merged, thanks!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'app/ui/SearchPage.qml'
--- app/ui/SearchPage.qml 2020-04-09 10:53:12 +0000
+++ app/ui/SearchPage.qml 2020-04-13 20:16:04 +0000
@@ -307,6 +307,7 @@
307 }307 }
308 });308 });
309 }309 }
310 model.subscribed=!model.subscribed;
310 }311 }
311 }312 }
312 }313 }
313314
=== modified file 'po/com.mikeasoft.podbird.pot'
--- po/com.mikeasoft.podbird.pot 2020-03-25 14:36:39 +0000
+++ po/com.mikeasoft.podbird.pot 2020-04-13 20:16:04 +0000
@@ -8,7 +8,7 @@
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 @@
24msgid "Episodes"24msgid "Episodes"
25msgstr ""25msgstr ""
2626
27#: ../app/components/TabsList.qml:37 ../app/ui/SearchPage.qml:4127#: ../app/components/TabsList.qml:37 ../app/ui/SearchPage.qml:43
28#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/components/TabsList.qml:3728#: ../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:4129#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:43
30msgid "Add New Podcasts"30msgid "Add New Podcasts"
31msgstr ""31msgstr ""
3232
@@ -209,10 +209,10 @@
209msgstr ""209msgstr ""
210210
211#: ../app/ui/EpisodesPage.qml:70 ../app/ui/EpisodesPage.qml:306211#: ../app/ui/EpisodesPage.qml:70 ../app/ui/EpisodesPage.qml:306
212#: ../app/ui/SearchPage.qml:275212#: ../app/ui/SearchPage.qml:290
213#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/EpisodesPage.qml:70213#: ../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:306214#: ../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:275215#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:290
216msgid "Unsubscribe"216msgid "Unsubscribe"
217msgstr ""217msgstr ""
218218
@@ -281,10 +281,10 @@
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 ""
283283
284#: ../app/ui/EpisodesPage.qml:323 ../app/ui/SearchPage.qml:130284#: ../app/ui/EpisodesPage.qml:323 ../app/ui/SearchPage.qml:144
285#: ../app/ui/SettingsPage.qml:85 ../app/ui/SettingsPage.qml:120285#: ../app/ui/SettingsPage.qml:85 ../app/ui/SettingsPage.qml:120
286#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/EpisodesPage.qml:323286#: ../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:130287#: ../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:85288#: ../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:120289#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SettingsPage.qml:120
290msgid "Cancel"290msgid "Cancel"
@@ -297,10 +297,10 @@
297msgstr ""297msgstr ""
298298
299#: ../app/ui/EpisodesPage.qml:356 ../app/ui/EpisodesTab.qml:418299#: ../app/ui/EpisodesPage.qml:356 ../app/ui/EpisodesTab.qml:418
300#: ../app/ui/SearchPage.qml:179 ../app/ui/SettingsPage.qml:320300#: ../app/ui/SearchPage.qml:194 ../app/ui/SettingsPage.qml:320
301#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/EpisodesPage.qml:356301#: ../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:418302#: ../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:179303#: ../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:320304#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SettingsPage.qml:320
305msgid "Close"305msgid "Close"
306msgstr ""306msgstr ""
@@ -474,6 +474,11 @@
474msgid "+%1s"474msgid "+%1s"
475msgstr ""475msgstr ""
476476
477#: ../app/ui/ImportPage.qml:18
478#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/ImportPage.qml:18
479msgid "Choose"
480msgstr ""
481
477#: ../app/ui/NowPlayingPage.qml:34482#: ../app/ui/NowPlayingPage.qml:34
478#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/NowPlayingPage.qml:34483#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/NowPlayingPage.qml:34
479msgid "Now Playing"484msgid "Now Playing"
@@ -489,11 +494,11 @@
489msgid "Queue"494msgid "Queue"
490msgstr ""495msgstr ""
491496
492#: ../app/ui/PodcastsTab.qml:57 ../app/ui/SearchPage.qml:55497#: ../app/ui/PodcastsTab.qml:57 ../app/ui/SearchPage.qml:57
493#: ../app/ui/SearchPage.qml:161498#: ../app/ui/SearchPage.qml:176
494#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/PodcastsTab.qml:57499#: ../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:55500#: ../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:161501#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:176
497msgid "Search Podcast"502msgid "Search Podcast"
498msgstr ""503msgstr ""
499504
@@ -507,9 +512,9 @@
507msgid "No Podcast Subscriptions"512msgid "No Podcast Subscriptions"
508msgstr ""513msgstr ""
509514
510#: ../app/ui/PodcastsTab.qml:127 ../app/ui/SearchPage.qml:207515#: ../app/ui/PodcastsTab.qml:127 ../app/ui/SearchPage.qml:222
511#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/PodcastsTab.qml:127516#: ../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:207517#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:222
513msgid "No Podcasts Found"518msgid "No Podcasts Found"
514msgstr ""519msgstr ""
515520
@@ -520,9 +525,9 @@
520"page to add some."525"page to add some."
521msgstr ""526msgstr ""
522527
523#: ../app/ui/PodcastsTab.qml:129 ../app/ui/SearchPage.qml:209528#: ../app/ui/PodcastsTab.qml:129 ../app/ui/SearchPage.qml:224
524#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/PodcastsTab.qml:129529#: ../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:209530#: ../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 ""
528533
@@ -534,62 +539,82 @@
534msgstr[0] ""539msgstr[0] ""
535msgstr[1] ""540msgstr[1] ""
536541
537#: ../app/ui/SearchPage.qml:63542#: ../app/ui/SearchPage.qml:65
538#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:63543#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:65
539msgid "Add Podcast"544msgid "Add Podcast"
540msgstr ""545msgstr ""
541546
542#: ../app/ui/SearchPage.qml:122547#: ../app/ui/SearchPage.qml:73
543#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:122548#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:73
549msgid "Import Podcasts"
550msgstr ""
551
552#: ../app/ui/SearchPage.qml:135
553#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:135
544msgid "Save Podcast"554msgid "Save Podcast"
545msgstr ""555msgstr ""
546556
547#: ../app/ui/SearchPage.qml:149557#: ../app/ui/SearchPage.qml:163
548#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:149558#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:163
549msgid "Feed URL"559msgid "Feed URL"
550msgstr ""560msgstr ""
551561
552#: ../app/ui/SearchPage.qml:176562#: ../app/ui/SearchPage.qml:191
553#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:176563#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:191
554msgid "Unable to subscribe"564msgid "Unable to subscribe"
555msgstr ""565msgstr ""
556566
557#: ../app/ui/SearchPage.qml:177567#: ../app/ui/SearchPage.qml:192
558#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:177568#: ../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 ""
561571
562#: ../app/ui/SearchPage.qml:207572#: ../app/ui/SearchPage.qml:222
563#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:207573#: ../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 ""
566576
567#: ../app/ui/SearchPage.qml:208577#: ../app/ui/SearchPage.qml:223
568#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:208578#: ../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 ""
572582
573#: ../app/ui/SearchPage.qml:275583#: ../app/ui/SearchPage.qml:290
574#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:275584#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:290
575msgid "Subscribe"585msgid "Subscribe"
576msgstr ""586msgstr ""
577587
578#. TRANSLATORS: The first argument here is the date of when the podcast was last updated followed by588#. 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:313590#: ../app/ui/SearchPage.qml:328
581#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:313591#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:327
582#, qt-format592#, qt-format
583msgid ""593msgid ""
584"Last Updated: %1\n"594"Last Updated: %1\n"
585"%2"595"%2"
586msgstr ""596msgstr ""
587597
588#: ../app/ui/SearchPage.qml:370598#: ../app/ui/SearchPage.qml:385
589#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:370599#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:384
590msgid "Not Available"600msgid "Not Available"
591msgstr ""601msgstr ""
592602
603#: ../app/ui/SearchPage.qml:499
604#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:498
605msgid "Please wait"
606msgstr ""
607
608#: ../app/ui/SearchPage.qml:500
609#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:499
610msgid "Importing podcasts..."
611msgstr ""
612
613#: ../app/ui/SearchPage.qml:518
614#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:517
615msgid "imported"
616msgstr ""
617
593#. TRANSLATORS: This strings refers to the seeking of the episode playback. Users can set how far they618#. 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:171620#: ../app/ui/SettingsPage.qml:65 ../app/ui/SettingsPage.qml:171

Subscribers

People subscribed via source and target branches

to status/vote changes: