[gnome-system-tools] Make groups management UI clearer

[Milan Bouchet-Valat <milanbv src gnome org>]

commit 85e1a925a90920f6efb59c60825195f98d3ee889
Author: Milan Bouchet-Valat <nalimilan club fr>
Date:   Wed Aug 11 11:43:20 2010 +0200

    Make groups management UI clearer
    
    It's been reported that the Add/Delete buttons of the
    groups management dialog are ambiguous, because you
    don't know whether they add a group to the system or
    the user to a group. This was a problem esp. in Chinese.
    
    Move the Manage Groups button so that it's obvious that
    you're not editing settings for the current user, but
    for the system. Also explain that the groups list shows
    available groups, and not groups the user is member of.
    
    https://bugs.launchpad.net/ubuntu-translations/+bug/603746

 interfaces/users.ui |   52 +++++++++++++++++++++++++++++++-------------------
 1 files changed, 32 insertions(+), 20 deletions(-)
---
diff --git a/interfaces/users.ui b/interfaces/users.ui
index 016c02c..da70782 100644
--- a/interfaces/users.ui
+++ b/interfaces/users.ui
@@ -145,6 +145,20 @@
                 <property name="position">1</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkButton" id="manage_groups">
+                <property name="label" translatable="yes">_Manage Groups</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="image">image19</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="position">0</property>
@@ -324,24 +338,6 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="manage_groups">
-                <property name="label" translatable="yes">_Manage Groups</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="image">image19</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">5</property>
-                <property name="bottom_attach">6</property>
-                <property name="x_options">GTK_EXPAND</property>
-                <property name="y_options"></property>
-              </packing>
-            </child>
-            <child>
               <object class="GtkLabel" id="label5">
                 <property name="visible">True</property>
               </object>
@@ -398,6 +394,9 @@
             <child>
               <placeholder/>
             </child>
+            <child>
+              <placeholder/>
+            </child>
           </object>
           <packing>
             <property name="position">1</property>
@@ -1512,9 +1511,22 @@
       <object class="GtkVBox" id="dialog-vbox12">
         <property name="visible">True</property>
         <child>
+          <object class="GtkLabel" id="label7">
+            <property name="visible">True</property>
+            <property name="xalign">0</property>
+            <property name="xpad">6</property>
+            <property name="label" translatable="yes">Groups available on the system:</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="padding">3</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
           <object class="GtkHBox" id="hbox79">
             <property name="visible">True</property>
-            <property name="border_width">5</property>
+            <property name="border_width">6</property>
             <property name="spacing">6</property>
             <child>
               <object class="GtkScrolledWindow" id="groups_table_sw">
@@ -1594,7 +1606,7 @@
             </child>
           </object>
           <packing>
-            <property name="position">1</property>
+            <property name="position">2</property>
           </packing>
         </child>
         <child internal-child="action_area">