← Back to team overview

zeitgeist team mailing list archive

[Merge] lp:~jbicha/activity-log-manager/rename-to-security-and-privacy into lp:activity-log-manager

 

Jeremy Bicha has proposed merging lp:~jbicha/activity-log-manager/rename-to-security-and-privacy 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/rename-to-security-and-privacy/+merge/173296

This goes along with https://code.launchpad.net/~jbicha/activity-log-manager/add-security-tab/+merge/173295

and matches the Ubuntu mobile naming:
http://iloveubuntu.net/pictures_me/ubuntu%20system%20settings%20saucy%20universe%20new.png
-- 
https://code.launchpad.net/~jbicha/activity-log-manager/rename-to-security-and-privacy/+merge/173296
Your team Activity Log Manager is requested to review the proposed merge of lp:~jbicha/activity-log-manager/rename-to-security-and-privacy into lp:activity-log-manager.
=== modified file 'data/gnome-activity-log-manager-panel.desktop.in'
--- data/gnome-activity-log-manager-panel.desktop.in	2013-06-12 23:31:37 +0000
+++ data/gnome-activity-log-manager-panel.desktop.in	2013-07-06 01:18:25 +0000
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Version=1.0
 
-_Name=Privacy
+_Name=Security & Privacy
 _Comment=Privacy and Activity Manager
 
 Icon=activity-log-manager
@@ -18,7 +18,7 @@
 
 # Translators: Add whatever keywords you want in your language, separated by semicolons
 # These keywords are used when searching for applications in dashes, etc.
-_Keywords=privacy;activity;log;zeitgeist;
+_Keywords=privacy;activity;log;zeitgeist;diagnostics;error reports;
 
 X-AppInstall-Ignore=true
 X-Ayatana-Desktop-Shortcuts=X-Activity-Log-Manager;


Follow ups