Activity Log Manager

Merge lp:~robert-ancell/activity-log-manager/time-combo-translation into lp:activity-log-manager

  1. time-combo-translation
  2. Merge into redesign
Proposed by Robert Ancell
Status: Merged
Merged at revision: 88
Proposed branch: lp:~robert-ancell/activity-log-manager/time-combo-translation
Merge into: lp:activity-log-manager
Diff against target: 44 lines (+17/-17)
1 file modified
src/security-widget.vala (+17/-17)
To merge this branch: bzr merge lp:~robert-ancell/activity-log-manager/time-combo-translation
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Activity Log Manager Pending
Review via email: mp+204543@code.launchpad.net

Commit message

Mark time combo values as translatable

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/1/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/activity-log-manager-trusty-amd64-ci/1/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/activity-log-manager-trusty-armhf-ci/1
    FAILURE: http://jenkins.qa.ubuntu.com/job/activity-log-manager-trusty-i386-ci/1/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Adolfo Jayme Barrientos (fitojb) wrote :

This merge proposal is almost a year old. It’s time someone would approve this.

Revision history for this message
Robert Ancell (robert-ancell) wrote :

Oh, I now have access to merge into trunk. I'll do it myself.

Revision history for this message
Gunnar Hjalmarsson (gunnarhj) wrote :

Hi Robert,

What about the Ubuntu patch debian/patches/14_seconds_combo.patch then?

I also noticed https://launchpad.net/bugs/1409550

/ Gunnar

Revision history for this message
Robert Ancell (robert-ancell) wrote :

Trunk didn't have the updated packaging. I've brought all those changes over and applied the patches that should be on trunk.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/security-widget.vala'
2--- src/security-widget.vala 2013-07-09 01:34:49 +0000
3+++ src/security-widget.vala 2014-02-03 17:33:03 +0000
4@@ -42,23 +42,23 @@
5 var liststore_delay = new ListStore (2, typeof (string), typeof (int));
6 TreeIter iter;
7 liststore_delay.append (out iter);
8- liststore_delay.set (iter, 0, "1 second", 1, 0);
9- liststore_delay.append (out iter);
10- liststore_delay.set (iter, 0, "30 seconds", 1, 30);
11- liststore_delay.append (out iter);
12- liststore_delay.set (iter, 0, "1 minute", 1, 60);
13- liststore_delay.append (out iter);
14- liststore_delay.set (iter, 0, "2 minutes", 1, 120);
15- liststore_delay.append (out iter);
16- liststore_delay.set (iter, 0, "3 minutes", 1, 180);
17- liststore_delay.append (out iter);
18- liststore_delay.set (iter, 0, "5 minutes", 1, 300);
19- liststore_delay.append (out iter);
20- liststore_delay.set (iter, 0, "10 minutes", 1, 600);
21- liststore_delay.append (out iter);
22- liststore_delay.set (iter, 0, "30 minutes", 1, 1800);
23- liststore_delay.append (out iter);
24- liststore_delay.set (iter, 0, "1 hour", 1, 3600);
25+ liststore_delay.set (iter, 0, _("1 second"), 1, 0);
26+ liststore_delay.append (out iter);
27+ liststore_delay.set (iter, 0, _("30 seconds"), 1, 30);
28+ liststore_delay.append (out iter);
29+ liststore_delay.set (iter, 0, _("1 minute"), 1, 60);
30+ liststore_delay.append (out iter);
31+ liststore_delay.set (iter, 0, _("2 minutes"), 1, 120);
32+ liststore_delay.append (out iter);
33+ liststore_delay.set (iter, 0, _("3 minutes"), 1, 180);
34+ liststore_delay.append (out iter);
35+ liststore_delay.set (iter, 0, _("5 minutes"), 1, 300);
36+ liststore_delay.append (out iter);
37+ liststore_delay.set (iter, 0, _("10 minutes"), 1, 600);
38+ liststore_delay.append (out iter);
39+ liststore_delay.set (iter, 0, _("30 minutes"), 1, 1800);
40+ liststore_delay.append (out iter);
41+ liststore_delay.set (iter, 0, _("1 hour"), 1, 3600);
42
43 var grid = new Grid();
44 grid.set_halign(Align.START);

Subscribers

People subscribed via source and target branches