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

Proposed by Milan Bouchet-Valat on 2011-02-03
Status: Needs review
Proposed branch: lp:~nalimilan/ubuntu/maverick/gnome-system-tools/gnome-system-tools.fix-433654-2
Merge into: lp:ubuntu/natty/gnome-system-tools
Diff against target: 37 lines (+11/-1) (has conflicts)
2 files modified
debian/changelog (+10/-0)
src/users/privileges-table.c (+1/-1)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~nalimilan/ubuntu/maverick/gnome-system-tools/gnome-system-tools.fix-433654-2
Reviewer Review Type Date Requested Status
Chris Coulson 2011-02-03 Pending
Review via email: mp+48481@code.launchpad.net

Description of the change

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

To post a comment you must log in.

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).

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-01-14 03:16:03 +0000
3+++ debian/changelog 2011-02-03 14:38:41 +0000
4@@ -1,3 +1,4 @@
5+<<<<<<< TREE
6 gnome-system-tools (2.32.0-0ubuntu4) natty; urgency=low
7
8 * debian/patches/95_timezone_point_selection.patch: Fix selecting a timezone
9@@ -39,6 +40,15 @@
10
11 -- Didier Roche <didrocks@ubuntu.com> Mon, 13 Sep 2010 18:06:15 +0200
12
13+=======
14+gnome-system-tools (2.31.91-0ubuntu2) lucid; urgency=low
15+
16+ * Fix description of 'audio' group to make it clear people
17+ don't likely want to use it (LP: #433654).
18+
19+ -- Milan Bouchet-Valat <nalimilan@club.fr> Mon, 13 Sep 2010 12:56:54 +0200
20+
21+>>>>>>> MERGE-SOURCE
22 gnome-system-tools (2.31.91-0ubuntu1) maverick; urgency=low
23
24 * New upstream release
25
26=== modified file 'src/users/privileges-table.c'
27--- src/users/privileges-table.c 2010-05-31 16:48:21 +0000
28+++ src/users/privileges-table.c 2011-02-03 14:38:41 +0000
29@@ -52,7 +52,7 @@
30 static const PrivilegeDescription descriptions[] = {
31 { "adm", N_("Monitor system logs") },
32 { ADMIN_GROUP, N_("Administer the system") },
33- { "audio", N_("Use audio devices") },
34+ { "audio", N_("Lock audio devices even when away") },
35 { "cdrom", N_("Use CD-ROM drives") },
36 { "cdwrite", N_("Burn CDs / DVDs") },
37 { "dialout", N_("Use modems") },

Subscribers

People subscribed via source and target branches