smeserver-mailsorting/contribs7/smeserver-mailsorting-1.2-add2general.patch

--- smeserver-mailsorting-1.2/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/userpanel-mailsort.add2general    2008-04-27 19:18:45.000000000 +0200
+++ smeserver-mailsorting-1.2/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/userpanel-mailsort        2008-04-27 19:24:57.000000000 +0200
@@ -19,14 +19,6 @@
       </trans>
     </entry>
     <entry>
-      <base>LABEL_USER</base>
-      <trans>Account</trans>
-    </entry>
-    <entry>
-      <base>LABEL_FULLNAME</base>
-      <trans>User Name</trans>
-    </entry>
-    <entry>
       <base>ADD_RULE</base>
       <trans>
             <![CDATA[
@@ -48,10 +40,6 @@
       <trans>Error updateing</trans>
     </entry>
     <entry>
-      <base>SUCCESS</base>
-      <trans>Success</trans>
-    </entry>
-    <entry>
       <base>CREATE_RULE_DESCRIPTION</base>
       <trans>   Select the part of the email to be tested. You can match against
              part of an email address, header, subject, or the email size.
@@ -101,18 +89,10 @@
       <trans>Fwd</trans>
     </entry>
     <entry>
-      <base>DESTINATION</base>
-      <trans>Destination</trans>
-    </entry>
-    <entry>
       <base>COPY</base>
       <trans>Copy</trans>
     </entry>
     <entry>
-      <base>ACTION</base>
-      <trans>Action</trans>
-    </entry>
-    <entry>
       <base>2ND_ACTION</base>
       <trans>2nd Action</trans>
     </entry>
--- smeserver-mailsorting-1.2/root/etc/e-smith/web/functions/userpanel-mailsort.add2general     2006-10-26 13:40:13.000000000 +0200
+++ smeserver-mailsorting-1.2/root/etc/e-smith/web/functions/userpanel-mailsort 2008-04-27 19:22:03.000000000 +0200
@@ -38,11 +38,11 @@
         <subroutine src="user_status" />
 
         <field type="literal" id="User" value="get_panel_user()">
-            <label>LABEL_USER</label>
+            <label>ACCOUNT</label>
         </field>
 
         <field type="literal" id="FullName" value="get_full_name()">
-            <label>LABEL_FULLNAME</label>
+            <label>USER_NAME</label>
         </field>
 
         <field
1	snetram	1.1	--- smeserver-mailsorting-1.2/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/userpanel-mailsort.add2general 2008-04-27 19:18:45.000000000 +0200
2			+++ smeserver-mailsorting-1.2/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/userpanel-mailsort 2008-04-27 19:24:57.000000000 +0200
3			@@ -19,14 +19,6 @@
4			</trans>
5			</entry>
6			<entry>
7			- <base>LABEL_USER</base>
8			- <trans>Account</trans>
9			- </entry>
10			- <entry>
11			- <base>LABEL_FULLNAME</base>
12			- <trans>User Name</trans>
13			- </entry>
14			- <entry>
15			<base>ADD_RULE</base>
16			<trans>
17			<![CDATA[
18			@@ -48,10 +40,6 @@
19			<trans>Error updateing</trans>
20			</entry>
21			<entry>
22			- <base>SUCCESS</base>
23			- <trans>Success</trans>
24			- </entry>
25			- <entry>
26			<base>CREATE_RULE_DESCRIPTION</base>
27			<trans> Select the part of the email to be tested. You can match against
28			part of an email address, header, subject, or the email size.
29			@@ -101,18 +89,10 @@
30			<trans>Fwd</trans>
31			</entry>
32			<entry>
33			- <base>DESTINATION</base>
34			- <trans>Destination</trans>
35			- </entry>
36			- <entry>
37			<base>COPY</base>
38			<trans>Copy</trans>
39			</entry>
40			<entry>
41			- <base>ACTION</base>
42			- <trans>Action</trans>
43			- </entry>
44			- <entry>
45			<base>2ND_ACTION</base>
46			<trans>2nd Action</trans>
47			</entry>
48			--- smeserver-mailsorting-1.2/root/etc/e-smith/web/functions/userpanel-mailsort.add2general 2006-10-26 13:40:13.000000000 +0200
49			+++ smeserver-mailsorting-1.2/root/etc/e-smith/web/functions/userpanel-mailsort 2008-04-27 19:22:03.000000000 +0200
50			@@ -38,11 +38,11 @@
51			<subroutine src="user_status" />
52
53			<field type="literal" id="User" value="get_panel_user()">
54			- <label>LABEL_USER</label>
55			+ <label>ACCOUNT</label>
56			</field>
57
58			<field type="literal" id="FullName" value="get_full_name()">
59			- <label>LABEL_FULLNAME</label>
60			+ <label>USER_NAME</label>
61			</field>
62
63			<field