The Sound Menu

Merge lp:~larsu/indicator-sound/lp1223500 into lp:indicator-sound/13.10

  1. lp1223500
  2. Merge into trunk.13.10
Proposed by Lars Karlitski
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 376
Merged at revision: 374
Proposed branch: lp:~larsu/indicator-sound/lp1223500
Merge into: lp:indicator-sound/13.10
Diff against target: 39 lines (+4/-5)
3 files modified
po/POTFILES.in (+1/-2)
src/service.vala (+2/-2)
src/sound-menu.vala (+1/-1)
To merge this branch: bzr merge lp:~larsu/indicator-sound/lp1223500
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+184970@code.launchpad.net

Description of the change

Update POTFILES.in and mark remaining strings as translatable

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

PASSED: Continuous integration, rev:375
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/46/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-saucy-amd64-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-saucy-armhf-ci/27
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-saucy-armhf-ci/27/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-sound-ci/46/rebuild

review: Approve (continuous-integration)
lp:~larsu/indicator-sound/lp1223500 updated
376. By Lars Karlitski

Remove volume percentage from translatable part of the accessible title

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:376
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/47/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-saucy-amd64-ci/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-saucy-armhf-ci/28
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-saucy-armhf-ci/28/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-sound-ci/47/rebuild

review: Approve (continuous-integration)
Revision history for this message
Sebastien Bacher (seb128) wrote :

looks good to me!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/POTFILES.in'
2--- po/POTFILES.in 2013-07-25 14:39:48 +0000
3+++ po/POTFILES.in 2013-09-11 10:33:19 +0000
4@@ -1,4 +1,3 @@
5 [encoding: UTF-8]
6 src/service.vala
7-src/service.c
8-src/sound-menu.c
9+src/sound-menu.vala
10
11=== modified file 'src/service.vala'
12--- src/service.vala 2013-09-09 11:34:02 +0000
13+++ src/service.vala 2013-09-11 10:33:19 +0000
14@@ -138,10 +138,10 @@
15
16 string accessible_name;
17 if (this.volume_control.mute) {
18- accessible_name = "Volume (muted)";
19+ accessible_name = _("Volume (muted)");
20 } else {
21 int volume_int = (int)(volume * 100);
22- accessible_name = @"Volume ($volume_int%)";
23+ accessible_name = "%s (%d%%)".printf (_("Volume"), volume_int);
24 }
25
26 var root_action = actions.lookup_action ("root") as SimpleAction;
27
28=== modified file 'src/sound-menu.vala'
29--- src/sound-menu.vala 2013-09-09 12:11:47 +0000
30+++ src/sound-menu.vala 2013-09-11 10:33:19 +0000
31@@ -149,7 +149,7 @@
32
33 var submenu = new Menu ();
34 submenu.append_section (null, playlists_section);
35- player_section.append_submenu ("Choose Playlist", submenu);
36+ player_section.append_submenu (_("Choose Playlist"), submenu);
37 }
38
39 MenuItem create_slider_menu_item (string action, double min, double max, double step, string min_icon_name, string max_icon_name) {

Subscribers

People subscribed via source and target branches