Merge lp:~popey/ubuntu-rssreader-app/fix-1377638 into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

[Alan Pope 🍺🐧🐱 🦄]

Set splash screen as per bug 1377638

[David Planella (dpm)]

Thanks! See inline comments.

review: Needs Fixing

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:339
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/273/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/843
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/843/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-utopic-amd64-ci/52

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/273/rebuild

review: Approve (continuous-integration)

[lp:~popey/ubuntu-rssreader-app/fix-1377638]

340. By Alan Pope 🍺🐧🐱 🦄 on 2014-10-10

remove translation tag on colours

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:340
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/274/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/844
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/844/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-utopic-amd64-ci/53

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/274/rebuild

review: Approve (continuous-integration)

=== modified file 'com.ubuntu.shorts_shorts.desktop.in.in'
--- com.ubuntu.shorts_shorts.desktop.in.in	2014-09-25 14:19:48 +0000
+++ com.ubuntu.shorts_shorts.desktop.in.in	2014-10-10 13:26:04 +0000
@@ -8,3 +8,7 @@
 _Keywords=shorts;rss;reader;
 X-Ubuntu-Touch=true
 X-Ubuntu-Default-Department-ID=accessories
+X-Ubuntu-Splash-Show-Header=true
+_X-Ubuntu-Splash-Title=Shorts
+X-Ubuntu-Splash-Color=#3a2c32
+X-Ubuntu-Splash-Color-Footer=#9b616c