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

--- smeserver-mailsorting-1.2/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/userpanel-mailsort.pootle 2006-10-24 15:23:50.000000000 +1000
+++ smeserver-mailsorting-1.2/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/userpanel-mailsort        2008-02-25 19:47:56.000000000 +1100
@@ -1,9 +1,4 @@
 <lexicon lang="en-us">
-
-    <entry>
-        <base>Your Settings</base>
-        <trans>Your Settings</trans>
-    </entry>
     <entry>
         <base>Process Mail</base>
         <trans>Process Mail</trans>
@@ -12,21 +7,16 @@
         <base>configure your email sorting</base>
         <trans>configure your email sorting</trans>
     </entry>
-
     <entry>
       <base>FORM_TITLE</base>
       <trans>Mail sorting rules</trans>
     </entry>
     <entry>
       <base>FORM_DESCRIPTION</base>
-         <trans>  <![CDATA[
-          <p>
-               Rules are executed as email arrives in your mailbox on the server,
+      <trans>  Rules are executed as email arrives in your mailbox on the server,
                and are independent of your email client.
-               Your current rules, if you have any are listed below.
-          </p>
-          ]]>
-          </trans>
+               Your current rules, if you have any are listed below.
+      </trans>
     </entry>
     <entry>
       <base>LABEL_USER</base>
@@ -37,19 +27,18 @@
       <trans>User Name</trans>
     </entry>
     <entry>
-        <base>ADD_RULE</base>
-        <trans>
+      <base>ADD_RULE</base>
+      <trans>
             <![CDATA[
             <a class="button-like"
                 href="userpanel-mailsort?page=0&page_stack=&Next=Next&key=new&basis=Subject&action=sort&RULE_MODIFY">Add new rule</a>
                 ]]>
-        </trans>
+      </trans>
     </entry>
     <entry>
       <base>CURRENT_RULES</base>
       <trans>Current rules</trans>
     </entry>
-
     <entry>
       <base>REMOVE_DESCRIPTION</base>
       <trans>You are about to remove a rule</trans>
@@ -62,35 +51,27 @@
       <base>SUCCESS</base>
       <trans>Success</trans>
     </entry>
-
     <entry>
       <base>CREATE_RULE_DESCRIPTION</base>
-         <trans>  <![CDATA[
-          <p>
-             Select the part of the email to be tested. You can match against
+      <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.
              Size is in bytes. Delete, sort or Forward any matches.
-             The second match is optional, but if used both rules must match.
-          <P>
-          ]]>
-       </trans>
+             The second match is optional, but if used both rules must match. </trans>
     </entry>
-
     <entry>
       <base>MODIFY_RULE_DESCRIPTION</base>
-         <trans>  <![CDATA[
+      <trans>  <![CDATA[
           <p>
              Modify your rule.
-          <P></p>
+          </p><p>
              You can change the order in which rules are evaluated by altering the numeric value
              in order of rule execution.
              Priority is determined by ascii value, and must be unique.
-             eg rule user101 goes first, then user5 then user99. because 1<5<9
+             eg rule user101 goes first, then user5 then user99
           </p>
           ]]>
        </trans>
     </entry>
-
     <entry>
       <base>BASIS</base>
       <trans>Match against</trans>
@@ -107,7 +88,6 @@
       <base>2ND_CRITERION</base>
       <trans>2nd rule</trans>
     </entry>
-
     <entry>
       <base>DELIVER</base>
       <trans>Forwarding email address</trans>
@@ -136,7 +116,6 @@
       <base>2ND_ACTION</base>
       <trans>2nd Action</trans>
     </entry>
-
     <entry>
       <base>SORT</base>
       <trans>Sort to mail folder</trans>
@@ -153,7 +132,6 @@
       <base>INBOX</base>
       <trans>Send to my inbox</trans>
     </entry>
-
     <entry>
       <base>MAIL_FOLDER</base>
       <trans>Existing mail folders</trans>
@@ -162,7 +140,6 @@
       <base>PRIORITY</base>
       <trans>Order of rule execution</trans>
     </entry>
-
     <entry>
       <base>Subject</base>
       <trans>Subject</trans>
@@ -187,28 +164,6 @@
       <base>sizelt</base>
       <trans>Size less than</trans>
     </entry>
-
-    <entry>
-      <base>YES</base>
-      <trans>Yes</trans>
-    </entry>
-    <entry>
-      <base>NO</base>
-      <trans>No</trans>
-    </entry>
-    <entry>
-      <base>SAVE</base>
-      <trans>Save</trans>
-    </entry>
-    <entry>
-      <base>MODIFY</base>
-      <trans>Modify</trans>
-    </entry>
-    <entry>
-      <base>REMOVE</base>
-      <trans>Remove</trans>
-    </entry>
-
     <entry>
       <base>ERROR_FORWARD_NO_EMAIL</base>
       <trans>Error: You attempted to forward but failed to enter an email address</trans>
@@ -229,5 +184,4 @@
       <base>USER_DISABLED</base>
       <trans>Mail sorting for this user has been disabled, please contact your administrator.</trans>
     </entry>
-
 </lexicon>
1	dungog	1.1	--- smeserver-mailsorting-1.2/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/userpanel-mailsort.pootle 2006-10-24 15:23:50.000000000 +1000
2			+++ smeserver-mailsorting-1.2/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/userpanel-mailsort 2008-02-25 19:47:56.000000000 +1100
3			@@ -1,9 +1,4 @@
4			<lexicon lang="en-us">
5			-
6			- <entry>
7			- <base>Your Settings</base>
8			- <trans>Your Settings</trans>
9			- </entry>
10			<entry>
11			<base>Process Mail</base>
12			<trans>Process Mail</trans>
13			@@ -12,21 +7,16 @@
14			<base>configure your email sorting</base>
15			<trans>configure your email sorting</trans>
16			</entry>
17			-
18			<entry>
19			<base>FORM_TITLE</base>
20			<trans>Mail sorting rules</trans>
21			</entry>
22			<entry>
23			<base>FORM_DESCRIPTION</base>
24			- <trans> <![CDATA[
25			- <p>
26			- Rules are executed as email arrives in your mailbox on the server,
27			+ <trans> Rules are executed as email arrives in your mailbox on the server,
28			and are independent of your email client.
29			- Your current rules, if you have any are listed below.
30			- </p>
31			- ]]>
32			- </trans>
33			+ Your current rules, if you have any are listed below.
34			+ </trans>
35			</entry>
36			<entry>
37			<base>LABEL_USER</base>
38			@@ -37,19 +27,18 @@
39			<trans>User Name</trans>
40			</entry>
41			<entry>
42			- <base>ADD_RULE</base>
43			- <trans>
44			+ <base>ADD_RULE</base>
45			+ <trans>
46			<![CDATA[
47			<a class="button-like"
48			href="userpanel-mailsort?page=0&page_stack=&Next=Next&key=new&basis=Subject&action=sort&RULE_MODIFY">Add new rule</a>
49			]]>
50			- </trans>
51			+ </trans>
52			</entry>
53			<entry>
54			<base>CURRENT_RULES</base>
55			<trans>Current rules</trans>
56			</entry>
57			-
58			<entry>
59			<base>REMOVE_DESCRIPTION</base>
60			<trans>You are about to remove a rule</trans>
61			@@ -62,35 +51,27 @@
62			<base>SUCCESS</base>
63			<trans>Success</trans>
64			</entry>
65			-
66			<entry>
67			<base>CREATE_RULE_DESCRIPTION</base>
68			- <trans> <![CDATA[
69			- <p>
70			- Select the part of the email to be tested. You can match against
71			+ <trans> Select the part of the email to be tested. You can match against
72			part of an email address, header, subject, or the email size.
73			Size is in bytes. Delete, sort or Forward any matches.
74			- The second match is optional, but if used both rules must match.
75			- <P>
76			- ]]>
77			- </trans>
78			+ The second match is optional, but if used both rules must match. </trans>
79			</entry>
80			-
81			<entry>
82			<base>MODIFY_RULE_DESCRIPTION</base>
83			- <trans> <![CDATA[
84			+ <trans> <![CDATA[
85			<p>
86			Modify your rule.
87			- <P></p>
88			+ </p><p>
89			You can change the order in which rules are evaluated by altering the numeric value
90			in order of rule execution.
91			Priority is determined by ascii value, and must be unique.
92			- eg rule user101 goes first, then user5 then user99. because 1<5<9
93			+ eg rule user101 goes first, then user5 then user99
94			</p>
95			]]>
96			</trans>
97			</entry>
98			-
99			<entry>
100			<base>BASIS</base>
101			<trans>Match against</trans>
102			@@ -107,7 +88,6 @@
103			<base>2ND_CRITERION</base>
104			<trans>2nd rule</trans>
105			</entry>
106			-
107			<entry>
108			<base>DELIVER</base>
109			<trans>Forwarding email address</trans>
110			@@ -136,7 +116,6 @@
111			<base>2ND_ACTION</base>
112			<trans>2nd Action</trans>
113			</entry>
114			-
115			<entry>
116			<base>SORT</base>
117			<trans>Sort to mail folder</trans>
118			@@ -153,7 +132,6 @@
119			<base>INBOX</base>
120			<trans>Send to my inbox</trans>
121			</entry>
122			-
123			<entry>
124			<base>MAIL_FOLDER</base>
125			<trans>Existing mail folders</trans>
126			@@ -162,7 +140,6 @@
127			<base>PRIORITY</base>
128			<trans>Order of rule execution</trans>
129			</entry>
130			-
131			<entry>
132			<base>Subject</base>
133			<trans>Subject</trans>
134			@@ -187,28 +164,6 @@
135			<base>sizelt</base>
136			<trans>Size less than</trans>
137			</entry>
138			-
139			- <entry>
140			- <base>YES</base>
141			- <trans>Yes</trans>
142			- </entry>
143			- <entry>
144			- <base>NO</base>
145			- <trans>No</trans>
146			- </entry>
147			- <entry>
148			- <base>SAVE</base>
149			- <trans>Save</trans>
150			- </entry>
151			- <entry>
152			- <base>MODIFY</base>
153			- <trans>Modify</trans>
154			- </entry>
155			- <entry>
156			- <base>REMOVE</base>
157			- <trans>Remove</trans>
158			- </entry>
159			-
160			<entry>
161			<base>ERROR_FORWARD_NO_EMAIL</base>
162			<trans>Error: You attempted to forward but failed to enter an email address</trans>
163			@@ -229,5 +184,4 @@
164			<base>USER_DISABLED</base>
165			<trans>Mail sorting for this user has been disabled, please contact your administrator.</trans>
166			</entry>
167			-
168			</lexicon>