Re: [Zeitgeist] [Merge] lp:~robert-ancell/activity-log-manager/time-combo-translation into lp:activity-log-manager

2015-01-12 Thread Gunnar Hjalmarsson
Hi Robert,

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

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

/ Gunnar
-- 
https://code.launchpad.net/~robert-ancell/activity-log-manager/time-combo-translation/+merge/204543
Your team Activity Log Manager is requested to review the proposed merge of 
lp:~robert-ancell/activity-log-manager/time-combo-translation into 
lp:activity-log-manager.

___
Mailing list: https://launchpad.net/~zeitgeist
Post to : zeitgeist@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zeitgeist
More help   : https://help.launchpad.net/ListHelp


Re: [Zeitgeist] [Merge] lp:~robert-ancell/activity-log-manager/time-combo-translation into lp:activity-log-manager

2015-01-11 Thread Robert Ancell
Oh, I now have access to merge into trunk. I'll do it myself.
-- 
https://code.launchpad.net/~robert-ancell/activity-log-manager/time-combo-translation/+merge/204543
Your team Activity Log Manager is requested to review the proposed merge of 
lp:~robert-ancell/activity-log-manager/time-combo-translation into 
lp:activity-log-manager.

___
Mailing list: https://launchpad.net/~zeitgeist
Post to : zeitgeist@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zeitgeist
More help   : https://help.launchpad.net/ListHelp


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

2015-01-11 Thread noreply
The proposal to merge 
lp:~robert-ancell/activity-log-manager/time-combo-translation into 
lp:activity-log-manager has been updated.

Status: Needs review = Merged

For more details, see:
https://code.launchpad.net/~robert-ancell/activity-log-manager/time-combo-translation/+merge/204543
-- 
Your team Activity Log Manager is requested to review the proposed merge of 
lp:~robert-ancell/activity-log-manager/time-combo-translation into 
lp:activity-log-manager.

___
Mailing list: https://launchpad.net/~zeitgeist
Post to : zeitgeist@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zeitgeist
More help   : https://help.launchpad.net/ListHelp


Re: [Zeitgeist] [Merge] lp:~robert-ancell/activity-log-manager/time-combo-translation into lp:activity-log-manager

2015-01-04 Thread Adolfo Jayme
This merge proposal is almost a year old. It’s time someone would approve this.
-- 
https://code.launchpad.net/~robert-ancell/activity-log-manager/time-combo-translation/+merge/204543
Your team Activity Log Manager is requested to review the proposed merge of 
lp:~robert-ancell/activity-log-manager/time-combo-translation into 
lp:activity-log-manager.

___
Mailing list: https://launchpad.net/~zeitgeist
Post to : zeitgeist@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zeitgeist
More help   : https://help.launchpad.net/ListHelp


Re: [Zeitgeist] [Merge] lp:~robert-ancell/activity-log-manager/time-combo-translation into lp:activity-log-manager

2014-02-06 Thread PS Jenkins bot
Review: Needs Fixing continuous-integration

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

-- 
https://code.launchpad.net/~robert-ancell/activity-log-manager/time-combo-translation/+merge/204543
Your team Activity Log Manager is requested to review the proposed merge of 
lp:~robert-ancell/activity-log-manager/time-combo-translation into 
lp:activity-log-manager.

___
Mailing list: https://launchpad.net/~zeitgeist
Post to : zeitgeist@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zeitgeist
More help   : https://help.launchpad.net/ListHelp


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

2014-02-03 Thread Robert Ancell
Robert Ancell has proposed merging 
lp:~robert-ancell/activity-log-manager/time-combo-translation into 
lp:activity-log-manager.

Commit message:
Mark time combo values as translatable

Requested reviews:
  Activity Log Manager (activity-log-manager)
Related bugs:
  Bug #1241028 in Activity Log Manager: Menu not translated
  https://bugs.launchpad.net/activity-log-manager/+bug/1241028

For more details, see:
https://code.launchpad.net/~robert-ancell/activity-log-manager/time-combo-translation/+merge/204543
-- 
https://code.launchpad.net/~robert-ancell/activity-log-manager/time-combo-translation/+merge/204543
Your team Activity Log Manager is requested to review the proposed merge of 
lp:~robert-ancell/activity-log-manager/time-combo-translation into 
lp:activity-log-manager.
=== modified file 'src/security-widget.vala'
--- src/security-widget.vala	2013-07-09 01:34:49 +
+++ src/security-widget.vala	2014-02-03 17:33:03 +
@@ -42,23 +42,23 @@
 			var liststore_delay = new ListStore (2, typeof (string), typeof (int));
 			TreeIter iter;
 			liststore_delay.append (out iter);
-			liststore_delay.set (iter, 0, 1 second, 1, 0);
-			liststore_delay.append (out iter);
-			liststore_delay.set (iter, 0, 30 seconds, 1, 30);
-			liststore_delay.append (out iter);
-			liststore_delay.set (iter, 0, 1 minute, 1, 60);
-			liststore_delay.append (out iter);
-			liststore_delay.set (iter, 0, 2 minutes, 1, 120);
-			liststore_delay.append (out iter);
-			liststore_delay.set (iter, 0, 3 minutes, 1, 180);
-			liststore_delay.append (out iter);
-			liststore_delay.set (iter, 0, 5 minutes, 1, 300);
-			liststore_delay.append (out iter);
-			liststore_delay.set (iter, 0, 10 minutes, 1, 600);
-			liststore_delay.append (out iter);
-			liststore_delay.set (iter, 0, 30 minutes, 1, 1800);
-			liststore_delay.append (out iter);
-			liststore_delay.set (iter, 0, 1 hour, 1, 3600);
+			liststore_delay.set (iter, 0, _(1 second), 1, 0);
+			liststore_delay.append (out iter);
+			liststore_delay.set (iter, 0, _(30 seconds), 1, 30);
+			liststore_delay.append (out iter);
+			liststore_delay.set (iter, 0, _(1 minute), 1, 60);
+			liststore_delay.append (out iter);
+			liststore_delay.set (iter, 0, _(2 minutes), 1, 120);
+			liststore_delay.append (out iter);
+			liststore_delay.set (iter, 0, _(3 minutes), 1, 180);
+			liststore_delay.append (out iter);
+			liststore_delay.set (iter, 0, _(5 minutes), 1, 300);
+			liststore_delay.append (out iter);
+			liststore_delay.set (iter, 0, _(10 minutes), 1, 600);
+			liststore_delay.append (out iter);
+			liststore_delay.set (iter, 0, _(30 minutes), 1, 1800);
+			liststore_delay.append (out iter);
+			liststore_delay.set (iter, 0, _(1 hour), 1, 3600);
 
 			var grid = new Grid();
 			grid.set_halign(Align.START);

___
Mailing list: https://launchpad.net/~zeitgeist
Post to : zeitgeist@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zeitgeist
More help   : https://help.launchpad.net/ListHelp


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

2014-02-03 Thread Robert Ancell
The proposal to merge 
lp:~robert-ancell/activity-log-manager/time-combo-translation into 
lp:activity-log-manager has been updated.

Commit Message changed to:

Mark time combo values as translatable

For more details, see:
https://code.launchpad.net/~robert-ancell/activity-log-manager/time-combo-translation/+merge/204543
-- 
https://code.launchpad.net/~robert-ancell/activity-log-manager/time-combo-translation/+merge/204543
Your team Activity Log Manager is requested to review the proposed merge of 
lp:~robert-ancell/activity-log-manager/time-combo-translation into 
lp:activity-log-manager.

___
Mailing list: https://launchpad.net/~zeitgeist
Post to : zeitgeist@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zeitgeist
More help   : https://help.launchpad.net/ListHelp