Activity Log Manager

Merge lp:~robert-ancell/activity-log-manager/comma-splice into lp:activity-log-manager

  1. comma-splice
  2. Merge into redesign
Proposed by Robert Ancell
Status: Merged
Merged at revision: 106
Proposed branch: lp:~robert-ancell/activity-log-manager/comma-splice
Merge into: lp:activity-log-manager
Diff against target: 25 lines (+2/-2)
2 files modified
src/history-widget.vala (+1/-1)
src/unified-privacy.vala (+1/-1)
To merge this branch: bzr merge lp:~robert-ancell/activity-log-manager/comma-splice
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Activity Log Manager Pending
Review via email: mp+204542@code.launchpad.net

Commit message

Remove comma splices

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

FAILED: Continuous integration, rev:85
http://jenkins.qa.ubuntu.com/job/activity-log-manager-ci/2/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/activity-log-manager-trusty-amd64-ci/2/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/activity-log-manager-trusty-armhf-ci/2
    FAILURE: http://jenkins.qa.ubuntu.com/job/activity-log-manager-trusty-i386-ci/2/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/activity-log-manager-ci/2/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/history-widget.vala'
--- src/history-widget.vala 2013-07-10 06:24:51 +0000
+++ src/history-widget.vala 2014-02-03 17:32:41 +0000
@@ -145,7 +145,7 @@
145 dialog.add_button(Stock.YES, ResponseType.OK);145 dialog.add_button(Stock.YES, ResponseType.OK);
146 dialog.set_title("");146 dialog.set_title("");
147 147
148 var label = new Gtk.Label(_("This operation cannot be undone, are you sure you want to delete this activity?"));148 var label = new Gtk.Label(_("This operation cannot be undone. Are you sure you want to delete this activity?"));
149 label.set_line_wrap(true);149 label.set_line_wrap(true);
150 label.set_line_wrap_mode(Pango.WrapMode.WORD);150 label.set_line_wrap_mode(Pango.WrapMode.WORD);
151 label.set_padding(9,9);151 label.set_padding(9,9);
152152
=== modified file 'src/unified-privacy.vala'
--- src/unified-privacy.vala 2013-07-11 02:13:34 +0000
+++ src/unified-privacy.vala 2014-02-03 17:32:41 +0000
@@ -872,7 +872,7 @@
872 dialog.add_button(Stock.YES, ResponseType.OK);872 dialog.add_button(Stock.YES, ResponseType.OK);
873 dialog.set_title("");873 dialog.set_title("");
874 874
875 var label = new Gtk.Label(_("This operation cannot be undone, are you sure you want to delete this activity?"));875 var label = new Gtk.Label(_("This operation cannot be undone. Are you sure you want to delete this activity?"));
876 label.set_line_wrap(true);876 label.set_line_wrap(true);
877 label.set_line_wrap_mode(Pango.WrapMode.WORD);877 label.set_line_wrap_mode(Pango.WrapMode.WORD);
878 label.set_padding(9,9);878 label.set_padding(9,9);

Subscribers

People subscribed via source and target branches