[Zeitgeist] [Merge] lp:~jbicha/activity-log-manager/use-exclude into lp:activity-log-manager

2013-06-19 Thread noreply
The proposal to merge lp:~jbicha/activity-log-manager/use-exclude into 
lp:activity-log-manager has been updated.

Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~jbicha/activity-log-manager/use-exclude/+merge/168316
-- 
https://code.launchpad.net/~jbicha/activity-log-manager/use-exclude/+merge/168316
Your team Activity Log Manager is requested to review the proposed merge of 
lp:~jbicha/activity-log-manager/use-exclude 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:~jbicha/activity-log-manager/use-exclude into lp:activity-log-manager

2013-06-09 Thread Jeremy Bicha
Jeremy Bicha has proposed merging lp:~jbicha/activity-log-manager/use-exclude 
into lp:activity-log-manager.

Requested reviews:
  Activity Log Manager (activity-log-manager)

For more details, see:
https://code.launchpad.net/~jbicha/activity-log-manager/use-exclude/+merge/168316
-- 
https://code.launchpad.net/~jbicha/activity-log-manager/use-exclude/+merge/168316
Your team Activity Log Manager is requested to review the proposed merge of 
lp:~jbicha/activity-log-manager/use-exclude into lp:activity-log-manager.
=== modified file 'src/unified-privacy.vala'
--- src/unified-privacy.vala	2013-05-08 13:41:46 +
+++ src/unified-privacy.vala	2013-06-09 22:14:26 +
@@ -247,7 +247,7 @@
 			
 			//Exception List
 			var exception_vbox = new Box(Orientation.VERTICAL, 0);
-			var exception_label = new Label (_("Except for:"));
+			var exception_label = new Label (_("Exclude:"));
 			var al2 = new Alignment (0, 0.5f, 0, 0);
 			al2.add (exception_label);
 			exception_vbox.pack_start (al2, false, false, 5);

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