Merge lp:~nalimilan/ubuntu/maverick/gnome-system-tools/gnome-system-tools.fix-433654-2 into lp:ubuntu/natty/gnome-system-tools

[Milan Bouchet-Valat]

Should be committed now, you (Chris) only delayed it because of the String Freeze last cycle. See bug #433654.

Unmerged revisions

109. By Milan Bouchet-Valat on 2010-09-13

Fix description of 'audio' group to make it clear people
don't likely want to use it (LP: #433654).

=== modified file 'debian/changelog'
--- debian/changelog	2011-01-14 03:16:03 +0000
+++ debian/changelog	2011-02-03 14:38:41 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 gnome-system-tools (2.32.0-0ubuntu4) natty; urgency=low
 
   * debian/patches/95_timezone_point_selection.patch: Fix selecting a timezone
@@ -39,6 +40,15 @@
 
  -- Didier Roche <[e-mail]>  Mon, 13 Sep 2010 18:06:15 +0200
 
+=======
+gnome-system-tools (2.31.91-0ubuntu2) lucid; urgency=low
+
+  * Fix description of 'audio' group to make it clear people
+    don't likely want to use it (LP: #433654).
+
+ -- Milan Bouchet-Valat <[e-mail]>  Mon, 13 Sep 2010 12:56:54 +0200
+
+>>>>>>> MERGE-SOURCE
 gnome-system-tools (2.31.91-0ubuntu1) maverick; urgency=low
 
   * New upstream release
 
=== modified file 'src/users/privileges-table.c'
--- src/users/privileges-table.c	2010-05-31 16:48:21 +0000
+++ src/users/privileges-table.c	2011-02-03 14:38:41 +0000
@@ -52,7 +52,7 @@
 static const PrivilegeDescription descriptions[] = {
 	{ "adm", N_("Monitor system logs") },
 	{ ADMIN_GROUP, N_("Administer the system") },
-	{ "audio", N_("Use audio devices") },
+	{ "audio", N_("Lock audio devices even when away") },
 	{ "cdrom", N_("Use CD-ROM drives") },
 	{ "cdwrite", N_("Burn CDs / DVDs") },
 	{ "dialout", N_("Use modems") },