Merge lp:~markellmtthw/switchboard/fix-917023 into lp:~elementary-pantheon/switchboard/switchboard

[Matthew Markell]

[Cassidy James Blaede (cassidyjames)]

review: Approve

[Cassidy James Blaede (cassidyjames)]

Title is a(n) GenericName that lets you Comment.

GenericName=Settings Center
Comment=Change system and user settings

[Cassidy James Blaede (cassidyjames)]

review: Needs Fixing

[lp:~markellmtthw/switchboard/fix-917023]

161. By Matthew Markell on 2012-01-17

updated RE: comments on the merge request

[Cassidy James Blaede (cassidyjames)]

w00t, Switchboard is a Settings Center that lets you Change system and user settings.

review: Approve

[Cassidy James Blaede (cassidyjames)]

Heh, what's funny is that Switchboard is already called "Switchboard Settings Center" on the Launchpad project... After ALL THAT discussion it was sitting there the whole time! xD Oh well, it makes me feel better that the same thing was decided separately. :)

=== modified file 'data/switchboard.desktop'
--- data/switchboard.desktop	2011-06-23 05:56:29 +0000
+++ data/switchboard.desktop	2012-01-17 04:17:22 +0000
@@ -2,8 +2,8 @@
 Type=Application
 Version=0.8
 Name=Switchboard
-_GenericName=Switchboard
-_Comment=Desktop preferences
+_GenericName=Settings Center
+_Comment=Change system and user settings
 Exec=switchboard
 Icon=preferences-desktop
 Terminal=false