Activity Log Manager

Merge lp:~jbicha/activity-log-manager/tweak-include-names into lp:activity-log-manager

  1. tweak-include-names
  2. Merge into redesign
Proposed by Jeremy Bícha
Status: Merged
Merged at revision: 49
Proposed branch: lp:~jbicha/activity-log-manager/tweak-include-names
Merge into: lp:activity-log-manager
Diff against target: 27 lines (+8/-8)
1 file modified
src/unified-privacy.vala (+8/-8)
To merge this branch: bzr merge lp:~jbicha/activity-log-manager/tweak-include-names
Reviewer Review Type Date Requested Status
Manish Sinha (मनीष सिन्हा) Approve
Review via email: mp+168318@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Manish Sinha (मनीष सिन्हा) (manishsinha) wrote :

Looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/unified-privacy.vala'
2--- src/unified-privacy.vala 2013-05-08 13:41:46 +0000
3+++ src/unified-privacy.vala 2013-06-09 22:21:27 +0000
4@@ -111,15 +111,15 @@
5 });
6
7 mime_dict = new HashMap<string, string>(str_hash, str_equal);
8- mime_dict.set(_("Audio"), NFO_AUDIO);
9- mime_dict.set(_("Video"), NFO_VIDEO);
10- mime_dict.set(_("Image"), NFO_IMAGE);
11- mime_dict.set(_("Text"), NFO_DOCUMENT);
12- mime_dict.set(_("Presentation"), NFO_PRESENTATION);
13- mime_dict.set(_("Spreadsheet"), NFO_SPREADSHEET);
14+ mime_dict.set(_("Music"), NFO_AUDIO);
15+ mime_dict.set(_("Videos"), NFO_VIDEO);
16+ mime_dict.set(_("Pictures"), NFO_IMAGE);
17+ mime_dict.set(_("Documents"), NFO_DOCUMENT);
18+ mime_dict.set(_("Presentations"), NFO_PRESENTATION);
19+ mime_dict.set(_("Spreadsheets"), NFO_SPREADSHEET);
20 mime_dict.set(_("Instant Messaging"), NMO_IMMESSAGE);
21- mime_dict.set(_("E-mail"), NMO_EMAIL);
22- mime_dict.set(_("Website"), NFO_WEBSITE);
23+ mime_dict.set(_("Emails"), NMO_EMAIL);
24+ mime_dict.set(_("Websites"), NFO_WEBSITE);
25
26 UserDirectory[] special_dirs =
27 {

Subscribers

People subscribed via source and target branches