Merge lp:~nik90/podbird/fix-textfield-color into lp:podbird

[Nekhelesh Ramananthan]

- Fixed placeholder text not being visible in the dark theme due to the backgroundText being set as White by the SDK.
- Fixed 2 strings that were not marked for translation in the episodes page
- Set version to v0.6
- Removed the name "Podbird" being marked for translation in the desktop file

It seems every other dark themed app does indeed use this hack,

// TODO: Workaround for pad.lv/1356779, force the theme's backgroundText color to work with the app's backgroundColor (music app)

Theme.palette.normal.backgroundText = "#81888888"

[lp:~nik90/podbird/fix-textfield-color]

75. By Nekhelesh Ramananthan on 2015-04-22

Fixed 2 strings that were not marked for translation in the episodes page :/

[Nekhelesh Ramananthan (nik90)]

It turns out 2 strings "Mark episode as listened" and "Mark episode as unlistened" were not marked for translation in the episode page :/ .. Luckily the string "Mark episode as listened" was marked for translation in the what's new page. So that leaves one new string.

This is unfortunate as every other UI string in Podbird appears nicely translated except for that one string "Mark episode as unlistened".

[lp:~nik90/podbird/fix-textfield-color]

76. By Nekhelesh Ramananthan on 2015-04-22

Set version to final v0.6

77. By Nekhelesh Ramananthan on 2015-04-23

Removed Podbird marked as translation in the desktop file

[Michael Sheldon (michael-sheldon)]

Looks good :)

review: Approve

=== modified file 'app/Podbird.desktop.in'
--- app/Podbird.desktop.in	2015-01-04 10:20:41 +0000
+++ app/Podbird.desktop.in	2015-04-23 10:02:07 +0000
@@ -1,5 +1,5 @@
 [Desktop Entry]
-_Name=Podbird
+Name=Podbird
 Comment=Podcast manager
 Exec=@EXEC@
 Icon=@ICON@

=== modified file 'app/podbird.qml'
--- app/podbird.qml	2015-04-22 10:15:34 +0000
+++ app/podbird.qml	2015-04-23 10:02:07 +0000
@@ -93,6 +93,9 @@
     Themes.ThemeManager {
         id: themeManager
         source: settings.themeName
+        onSourceChanged: {
+            Theme.palette.normal.backgroundText = UbuntuColors.lightGrey
+        }
     }
 
     property alias appTheme: themeManager.theme

=== modified file 'app/settings/About.qml'
--- app/settings/About.qml	2015-04-22 10:15:34 +0000
+++ app/settings/About.qml	2015-04-23 10:02:07 +0000
@@ -49,7 +49,7 @@
             Label {
                 width: parent.width
                 horizontalAlignment: Text.AlignHCenter
-                text: i18n.tr("Version %1").arg("0.6.beta3")
+                text: i18n.tr("Version %1").arg("0.6")
             }
         }
 

=== modified file 'app/ui/EpisodesPage.qml'
--- app/ui/EpisodesPage.qml	2015-04-22 10:15:34 +0000
+++ app/ui/EpisodesPage.qml	2015-04-23 10:02:07 +0000
@@ -306,7 +306,7 @@
                         Label {
                             id: listenText
                             color: UbuntuColors.darkGrey
-                            text: popover.listened ? "Mark episode unlistened" : "Mark episode listened"
+                            text: popover.listened ? i18n.tr("Mark episode unlistened") : i18n.tr("Mark episode listened")
                         }
                     }
 

=== modified file 'po/com.mikeasoft.podbird.pot'
--- po/com.mikeasoft.podbird.pot	2015-04-22 10:15:34 +0000
+++ po/com.mikeasoft.podbird.pot	2015-04-23 10:02:07 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-22 09:52+0000\n"
+"POT-Creation-Date: 2015-04-23 09:57+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -19,19 +19,19 @@
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #. TRANSLATORS: this refers to a number of songs greater than one. The actual number will be prepended to the string automatically (plural forms are not yet fully supported in usermetrics, the library that displays that string)
-#: ../app/podbird.qml:162
+#: ../app/podbird.qml:165
 msgid "podcasts listened to today"
 msgstr ""
 
-#: ../app/podbird.qml:163
+#: ../app/podbird.qml:166
 msgid "No podcasts listened to today"
 msgstr ""
 
-#: ../app/podbird.qml:225
+#: ../app/podbird.qml:228
 msgid "Add New Podcasts"
 msgstr ""
 
-#: ../app/podbird.qml:239
+#: ../app/podbird.qml:242
 msgid "Settings"
 msgstr ""
 
@@ -193,6 +193,14 @@
 msgid "Download episode"
 msgstr ""
 
+#: ../app/ui/EpisodesPage.qml:309
+msgid "Mark episode unlistened"
+msgstr ""
+
+#: ../app/ui/EpisodesPage.qml:309 ../app/ui/WhatsNewTab.qml:262
+msgid "Mark episode listened"
+msgstr ""
+
 #: ../app/ui/EpisodesPage.qml:335
 msgid "No more episodes"
 msgstr ""
@@ -395,10 +403,6 @@
 msgid "No Episodes found matching the search term."
 msgstr ""
 
-#: ../app/ui/WhatsNewTab.qml:262
-msgid "Mark episode listened"
-msgstr ""
-
 #: ../app/ui/WhatsNewTab.qml:302
 msgid "Pause Episode"
 msgstr ""
@@ -492,7 +496,3 @@
 #: ../app/welcomewizard/Slide6.qml:76
 msgid "Finish"
 msgstr ""
-
-#: /home/krnekhelesh/Documents/Ubuntu-Projects/MP-Reviews/builddir/build-fix-vivid-crash-UbuntuSDK_for_armhf_GCC_ubuntu_sdk_15_04_vivid-Default/po/Podbird.desktop.in.h:1
-msgid "Podbird"
-msgstr ""