e-smith-email/sme7/e-smith-email-4.17.0-tags2general.patch

diff -Nur -x '*.orig' -x '*.rej' e-smith-email-4.17.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/emailsettings mezzanine_patched_e-smith-email-4.17.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/emailsettings
--- e-smith-email-4.17.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/emailsettings  2008-02-13 23:35:54.000000000 +1100
+++ mezzanine_patched_e-smith-email-4.17.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/emailsettings        2008-02-13 23:32:34.000000000 +1100
@@ -154,14 +154,6 @@
         <trans>Select sort header (for multi-drop)</trans>
     </entry>
     <entry>
-        <base>ENABLED</base>
-        <trans>Enabled</trans>
-    </entry>
-    <entry>
-        <base>DISABLED</base>
-        <trans>Disabled</trans>
-    </entry>
-    <entry>
         <base>LABEL_FETCH_PROTO</base>
         <trans>Protocol (for multi-drop)</trans>
     </entry>
@@ -331,14 +323,6 @@
         <base>ERROR_UPDATING</base>
         <trans>Error occurred while updating system configuration.</trans>
     </entry>
-    <entry>
-        <base>NO</base>
-        <trans>No</trans>
-     </entry>
-     <entry>
-        <base>YES</base>
-        <trans>Yes</trans>
-     </entry>
      <entry>
         <base>LABEL_BLOCK_EXECUTABLE_CONTENT</base>
         <trans>Executable content blocking</trans>
@@ -430,16 +414,6 @@
                 ]]>
         </trans>
     </entry>
-
-    <entry>
-        <base>DESC_SECTIONBAR</base>
-        <trans>
-            <![CDATA[
-            <hr class="sectionbar"/>
-            ]]>
-        </trans>
-    </entry>
-
     <entry>
        <base>LABEL_VIRUS_SCAN</base>
        <trans>Virus scanning</trans>
diff -Nur -x '*.orig' -x '*.rej' e-smith-email-4.17.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/pseudonyms mezzanine_patched_e-smith-email-4.17.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/pseudonyms
--- e-smith-email-4.17.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/pseudonyms     2008-02-13 23:35:54.000000000 +1100
+++ mezzanine_patched_e-smith-email-4.17.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/pseudonyms   2008-02-13 23:31:06.000000000 +1100
@@ -92,14 +92,6 @@
         <trans><![CDATA[<b>Current List of Pseudonyms</b>]]></trans>
     </entry>
     <entry>
-        <base>MODIFY</base>
-        <trans>Modify</trans>
-    </entry>
-    <entry>
-        <base>SAVE</base>
-        <trans>Save</trans>
-    </entry>
-    <entry>
         <base>TITLE_CREATE</base>
         <trans>Create a pseudonym</trans>
     </entry>
@@ -156,11 +148,6 @@
         <base>PSEUDONYM_INVALID_SAMEACCT</base>
         <trans>A pseudonym cannot point to the same account</trans>
     </entry>
-
-    <entry>
-        <base>REMOVE</base>
-        <trans>Remove</trans>
-    </entry>
     <entry>
         <base>CREATE_SUCCEEDED</base>
         <trans>Successfully created pseudonym</trans>
@@ -174,19 +161,9 @@
         <trans>Successfully removed pseudonym</trans>
     </entry>
     <entry>
-      <base>ACTION</base>
-      <trans>Action</trans>
-    </entry>
-    <entry>
       <base>EVERYONE</base>
       <trans>Everyone</trans>
     </entry>
-
-      <entry>
-        <base>Collaboration</base>
-        <trans>Collaboration</trans>
-      </entry>
-
       <entry>
         <base>Pseudonyms</base>
         <trans>Pseudonyms</trans>
1	bytegw	1.1	diff -Nur -x '.orig' -x '.rej' e-smith-email-4.17.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/emailsettings mezzanine_patched_e-smith-email-4.17.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/emailsettings
2			--- e-smith-email-4.17.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/emailsettings 2008-02-13 23:35:54.000000000 +1100
3			+++ mezzanine_patched_e-smith-email-4.17.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/emailsettings 2008-02-13 23:32:34.000000000 +1100
4			@@ -154,14 +154,6 @@
5			<trans>Select sort header (for multi-drop)</trans>
6			</entry>
7			<entry>
8			- <base>ENABLED</base>
9			- <trans>Enabled</trans>
10			- </entry>
11			- <entry>
12			- <base>DISABLED</base>
13			- <trans>Disabled</trans>
14			- </entry>
15			- <entry>
16			<base>LABEL_FETCH_PROTO</base>
17			<trans>Protocol (for multi-drop)</trans>
18			</entry>
19			@@ -331,14 +323,6 @@
20			<base>ERROR_UPDATING</base>
21			<trans>Error occurred while updating system configuration.</trans>
22			</entry>
23			- <entry>
24			- <base>NO</base>
25			- <trans>No</trans>
26			- </entry>
27			- <entry>
28			- <base>YES</base>
29			- <trans>Yes</trans>
30			- </entry>
31			<entry>
32			<base>LABEL_BLOCK_EXECUTABLE_CONTENT</base>
33			<trans>Executable content blocking</trans>
34			@@ -430,16 +414,6 @@
35			]]>
36			</trans>
37			</entry>
38			-
39			- <entry>
40			- <base>DESC_SECTIONBAR</base>
41			- <trans>
42			- <![CDATA[
43			- <hr class="sectionbar"/>
44			- ]]>
45			- </trans>
46			- </entry>
47			-
48			<entry>
49			<base>LABEL_VIRUS_SCAN</base>
50			<trans>Virus scanning</trans>
51			diff -Nur -x '.orig' -x '.rej' e-smith-email-4.17.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/pseudonyms mezzanine_patched_e-smith-email-4.17.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/pseudonyms
52			--- e-smith-email-4.17.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/pseudonyms 2008-02-13 23:35:54.000000000 +1100
53			+++ mezzanine_patched_e-smith-email-4.17.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/pseudonyms 2008-02-13 23:31:06.000000000 +1100
54			@@ -92,14 +92,6 @@
55			<trans><![CDATA[<b>Current List of Pseudonyms</b>]]></trans>
56			</entry>
57			<entry>
58			- <base>MODIFY</base>
59			- <trans>Modify</trans>
60			- </entry>
61			- <entry>
62			- <base>SAVE</base>
63			- <trans>Save</trans>
64			- </entry>
65			- <entry>
66			<base>TITLE_CREATE</base>
67			<trans>Create a pseudonym</trans>
68			</entry>
69			@@ -156,11 +148,6 @@
70			<base>PSEUDONYM_INVALID_SAMEACCT</base>
71			<trans>A pseudonym cannot point to the same account</trans>
72			</entry>
73			-
74			- <entry>
75			- <base>REMOVE</base>
76			- <trans>Remove</trans>
77			- </entry>
78			<entry>
79			<base>CREATE_SUCCEEDED</base>
80			<trans>Successfully created pseudonym</trans>
81			@@ -174,19 +161,9 @@
82			<trans>Successfully removed pseudonym</trans>
83			</entry>
84			<entry>
85			- <base>ACTION</base>
86			- <trans>Action</trans>
87			- </entry>
88			- <entry>
89			<base>EVERYONE</base>
90			<trans>Everyone</trans>
91			</entry>
92			-
93			- <entry>
94			- <base>Collaboration</base>
95			- <trans>Collaboration</trans>
96			- </entry>
97			-
98			<entry>
99			<base>Pseudonyms</base>
100			<trans>Pseudonyms</trans>