ubuntu-system-settings

Merge lp://qastaging/~seb128/ubuntu-system-settings/rename-sounds-sound into lp://qastaging/ubuntu-system-settings

  1. rename-sounds-sound
  2. Merge into trunk
Proposed by Sebastien Bacher
Status: Merged
Approved by: Iain Lane
Approved revision: 89
Merged at revision: 90
Proposed branch: lp://qastaging/~seb128/ubuntu-system-settings/rename-sounds-sound
Merge into: lp://qastaging/ubuntu-system-settings
Prerequisite: lp://qastaging/~seb128/ubuntu-system-settings/sound-first-interface
Diff against target: 44 lines (+4/-4)
3 files modified
plugins/plugins.pro (+1/-1)
plugins/sound/sound.pro (+1/-1)
plugins/sound/sound.settings (+2/-2)
To merge this branch: bzr merge lp://qastaging/~seb128/ubuntu-system-settings/rename-sounds-sound
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Iain Lane Approve
Review via email: mp+172510@code.qastaging.launchpad.net

Commit message

sound: rename, use the singular form for consistency

Description of the change

sound: rename, use the singular form for consistency

see https://wiki.ubuntu.com/SystemSettings?action=diff&rev2=39&rev1=38

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:88
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/49/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/49/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-system-settings-ci/49/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Iain Lane (laney) wrote :

You need to rename sounds.pro and sounds.settings too (FTBFS), and you probably want to do the svg also.

review: Needs Fixing
lp://qastaging/~seb128/ubuntu-system-settings/rename-sounds-sound updated
89. By Sebastien Bacher

rename extra files

Revision history for this message
Sebastien Bacher (seb128) wrote :

> You need to rename sounds.pro and sounds.settings too (FTBFS)

thanks, nicely spotted, I though I had tested it but I did some last minute tweaks before submitting ...

> and you probably want to do the svg also.

those are a copy from the theme one, I will get the theme renamed and carry the change here once it's done (we want to drop the copy over time to use the theme version)

Revision history for this message
Iain Lane (laney) wrote :

ta, works now

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches