--- smeserver-groupmembers-panel-1.0.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/groupmembers.add2general	2008-04-26 22:06:38.000000000 +0200
+++ smeserver-groupmembers-panel-1.0.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/groupmembers	2008-04-26 22:29:16.000000000 +0200
@@ -6,18 +6,6 @@
         <trans>Edit group members</trans>
     </entry>	
     <entry>
-        <base>CREATE_TITLE</base>
-        <trans>Create user group</trans>
-    </entry>
-    <entry>
-        <base>MODIFY_TITLE</base>
-        <trans>Modify user group</trans>
-    </entry>
-    <entry>
-        <base>REMOVE_TITLE</base>
-        <trans>Remove user group</trans>
-    </entry>
-    <entry>
         <base>GROUP_TOO_LONG</base>
         <trans>Error: group name is too long.The maximum is {$maxLength}
             characters.</trans>
@@ -81,27 +69,6 @@
         <trans>Error: That is not an existing group account.</trans>
     </entry>
     <entry>
-        <base>SAVE</base>
-        <trans>Add</trans>
-    </entry>
-    <entry>
-        <base>REMOVE</base>
-        <trans>Remove</trans>
-    </entry>
-    <entry>
-        <base>MODIFY_SAVE</base>
-        <trans>Save</trans>
-    </entry>
-    <entry>
-        <base>MODIFY</base>
-        <trans>Modify</trans>
-    </entry>
-
-    <entry>
-        <base>GROUP_NAME</base>
-        <trans>Group Name</trans>
-    </entry>
-    <entry>
         <base>GROUP_DESC</base>
         <trans>Brief Description/Windows Group Alias</trans>
     </entry>
@@ -126,53 +93,13 @@
             ]]></trans>
     </entry>
     <entry>
-        <base>ACCOUNT</base>
-        <trans>Account</trans>
-    </entry>
-    <entry>
-        <base>USERNAME</base>
-        <trans>User Name</trans>
-    </entry>
-    <entry>
-        <base>ACTION</base>
-        <trans>Action</trans>
-    </entry>
-    <entry>
-        <base>CLICK_TO_CREATE</base>
-        <trans>Add group</trans>
-    </entry>
-    <entry>
-        <base>NO_GROUPS</base>
-        <trans>There are no user groups in the system.</trans>
-    </entry>
-    <entry>
         <base>CURRENT_LIST</base>
         <trans><![CDATA[<p>Current list of User Groups</p>]]></trans>
     </entry>
     <entry>
-        <base>GROUP</base>
-        <trans>Group</trans>
-    </entry>
-    <entry>
-        <base>GROUP_MEMBERS</base>
-        <trans>Group Members</trans>
-    </entry>
-    <entry>
-        <base>DESCRIPTION</base>
-        <trans>Description</trans>
-    </entry>
-    <entry>
 		<base>DELETE_DESCRIPTION</base>
        	<trans><![CDATA[
         You are about to remove the user group "<b>{$group}</b>."
 		]]></trans>
     </entry>
-    <entry>
-        <base>Collaboration</base>
-        <trans>Collaboration</trans>
-    </entry>
-    <entry>
-        <base>Group members</base>
-        <trans>Group members</trans>
-    </entry>
 </lexicon>  
--- smeserver-groupmembers-panel-1.0.1/root/etc/e-smith/web/functions/groupmembers.add2general	2008-04-26 22:06:38.000000000 +0200
+++ smeserver-groupmembers-panel-1.0.1/root/etc/e-smith/web/functions/groupmembers	2008-04-26 22:29:58.000000000 +0200
@@ -3,7 +3,7 @@
 # vim: ft=xml ts=4 sw=4 et:
 #----------------------------------------------------------------------
 # heading     : Collaboration
-# description : Group members
+# description : GROUP_MEMBERS
 # navigation  : 2000 2200
 #----------------------------------------------------------------------
 #----------------------------------------------------------------------
@@ -112,7 +112,7 @@
     </page>
     <page name="CreateGroup" pre-event="turn_off_buttons()" 
         post-event="create_group()">
-        <title>CREATE_TITLE</title>
+        <title>CREATE_GROUP</title>
         <description>GROUP_NAMING</description>
         <field type="text" id="groupName" 
             validation="validate_group, validate_group_length, validate_group_naming_conflict">
@@ -123,11 +123,11 @@
             <description>GROUP_DESC_EXPL</description>
         </field>
         <subroutine src="genUsers()"/>
-        <subroutine src="print_button('SAVE')" />
+        <subroutine src="print_button('ADD')" />
     </page>
     <page name="Delete"  pre-event="turn_off_buttons()" 
         post-event="delete_group()">
-        <title>REMOVE_TITLE</title>
+        <title>REMOVE_USER_GROUP</title>
         <subroutine src="print_group_delete_desc()"/>
         <subroutine src="print_group_members()"/>
         <subroutine src="print_ibay_list($acct)"/>
@@ -142,6 +142,6 @@
             <label>GROUP_DESC</label>
         </field>
         <subroutine src="genUsers()"/>
-        <subroutine src="print_button('MODIFY_SAVE')" />
+        <subroutine src="print_button('SAVE')" />
     </page>
 </form>