Merge lp:~vthompson/music-app/remix-do-not-translate-splash-color into lp:music-app/remix

Proposed by Victor Thompson
Status: Merged
Approved by: David Planella
Approved revision: 657
Merged at revision: 657
Proposed branch: lp:~vthompson/music-app/remix-do-not-translate-splash-color
Merge into: lp:music-app/remix
Diff against target: 10 lines (+1/-1)
1 file modified
com.ubuntu.music_music.desktop.in.in (+1/-1)
To merge this branch: bzr merge lp:~vthompson/music-app/remix-do-not-translate-splash-color
Reviewer Review Type Date Requested Status
Kill Animals (community) Approve
David Planella Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Music App Developers Pending
Review via email: mp+237773@code.launchpad.net

This proposal supersedes a proposal from 2014-10-09.

Commit message

Fix Ubuntu-Splash-Color to not get pulled into translations

Description of the change

Commit #650 [1] added a splash screen upon startup with a manually set color. This worked, however, when the pot file is generated the hex color string is being added to the list of translatable strings. This needs to be fixed, as translations should not control the color code.

I'm not updating the POT file here, as that is being done in another MP that is updating the strings. This MP [2] is what surfaced the issue.

[1] http://bazaar.launchpad.net/~music-app-dev/music-app/remix/revision/650
[2] https://code.launchpad.net/~vthompson/music-app/remix-queue-list

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
David Planella (dpm) wrote :

LGTM, thanks!

review: Approve
Revision history for this message
Kill Animals (kill-animals) wrote :

Looks fine.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'com.ubuntu.music_music.desktop.in.in'
2--- com.ubuntu.music_music.desktop.in.in 2014-10-05 20:12:57 +0000
3+++ com.ubuntu.music_music.desktop.in.in 2014-10-09 12:28:51 +0000
4@@ -11,5 +11,5 @@
5 X-Ubuntu-Single-Instance=true
6 X-Ubuntu-Splash-Show-Header=true
7 _X-Ubuntu-Splash-Title=Music
8-_X-Ubuntu-Splash-Color=#1e1e23
9+X-Ubuntu-Splash-Color=#1e1e23
10 X-Ubuntu-Default-Department-ID=sound-video

Subscribers

People subscribed via source and target branches