Merge lp:~jbicha/software-properties/update-gnome-desktop-too into lp:software-properties

[Jeremy Bícha]

This was missed in rev. 823.

[Benjamin Kerensa (bkerensa)]

Looks good.

=== modified file 'data/software-properties-gnome.desktop.in'
--- data/software-properties-gnome.desktop.in	2012-11-08 03:25:41 +0000
+++ data/software-properties-gnome.desktop.in	2013-03-17 06:10:25 +0000
@@ -1,7 +1,8 @@
 [Desktop Entry]
-_Name=Software Sources
-_GenericName=Software Sources
+_Name=Software & Updates
+_GenericName=Software & Updates
 _Comment=Configure the sources for installable software and updates
+_Keywords=Drivers;Repositories;Repository;PPA;
 Exec=software-properties-gtk
 Icon=software-properties
 Terminal=false
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-03-15 11:09:37 +0000
+++ debian/changelog	2013-03-17 06:10:25 +0000
@@ -1,3 +1,10 @@
+software-properties (0.92.17) UNRELEASED; urgency=low
+
+  * data/software-properties-gnome.desktop.in:
+    - Use new "Software & Updates" name on GNOME too
+
+ -- Jeremy Bicha <[e-mail]>  Sun, 17 Mar 2013 01:59:58 -0400
+
 software-properties (0.92.16) raring; urgency=low
 
   * Sync up DEP-8 test metadata with the fact that tests are now run via