e-smith-base/sme8/e-smith-base-4.18.0-tags2general.patch

diff -Nur -x '*.orig' -x '*.rej' e-smith-base-4.18.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/groups mezzanine_patched_e-smith-base-4.18.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/groups
--- e-smith-base-4.18.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/groups  2005-11-21 15:28:05.000000000 +1100
+++ mezzanine_patched_e-smith-base-4.18.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/groups        2008-02-14 00:14:14.000000000 +1100
@@ -85,19 +85,10 @@
         <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>
@@ -126,18 +117,10 @@
             ]]></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>
@@ -150,10 +133,6 @@
         <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>
@@ -168,10 +147,6 @@
                ]]></trans>
     </entry>
     <entry>
-        <base>Collaboration</base>
-        <trans>Collaboration</trans>
-    </entry>
-    <entry>
         <base>Groups</base>
         <trans>Groups</trans>
     </entry>
diff -Nur -x '*.orig' -x '*.rej' e-smith-base-4.18.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/localnetworks mezzanine_patched_e-smith-base-4.18.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/localnetworks
--- e-smith-base-4.18.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/localnetworks   2008-02-14 00:17:04.000000000 +1100
+++ mezzanine_patched_e-smith-base-4.18.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/localnetworks 2008-02-14 00:11:20.000000000 +1100
@@ -158,10 +158,6 @@
         <trans>Error occurred while deleting network.</trans>
     </entry>
     <entry>
-        <base>Security</base>
-        <trans>Security</trans>
-    </entry>
-    <entry>
         <base>NO_ADDITIONAL_NETWORKS</base>
         <trans>No additional networks</trans>
     </entry>
diff -Nur -x '*.orig' -x '*.rej' e-smith-base-4.18.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/reboot mezzanine_patched_e-smith-base-4.18.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/reboot
--- e-smith-base-4.18.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/reboot  2006-02-17 14:41:51.000000000 +1100
+++ mezzanine_patched_e-smith-base-4.18.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/reboot        2008-02-14 00:14:34.000000000 +1100
@@ -62,10 +62,6 @@
        </trans>
     </entry>
     <entry>
-       <base>Administration</base>
-       <trans>Administration</trans>
-    </entry>
-    <entry>
        <base>Reboot or shutdown</base>
        <trans>Reboot or shutdown</trans>
     </entry>
diff -Nur -x '*.orig' -x '*.rej' e-smith-base-4.18.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/remoteaccess mezzanine_patched_e-smith-base-4.18.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/remoteaccess
--- e-smith-base-4.18.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/remoteaccess    2008-02-14 00:17:04.000000000 +1100
+++ mezzanine_patched_e-smith-base-4.18.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/remoteaccess  2008-02-14 00:15:58.000000000 +1100
@@ -24,26 +24,10 @@
         <trans>Error occurred while updating system configuration.</trans>
     </entry>
     <entry>
-       <base>DISABLED</base>
-       <trans>Disabled</trans>
-    </entry>
-    <entry>
-       <base>YES</base>
-       <trans>Yes</trans>
-    </entry>
-    <entry>
-       <base>NO</base>
-       <trans>No</trans>
-    </entry>            
-    <entry>
        <base>OFF</base>
        <trans>Off</trans>
     </entry>
     <entry>
-       <base>ENABLED</base>
-       <trans>Enabled</trans>
-    </entry>
-    <entry>
        <base>NO_ACCESS</base>
        <trans>No Access</trans>
     </entry>
@@ -152,10 +136,6 @@
        </trans>
     </entry>
     <entry>
-       <base>SAVE</base>
-       <trans>Save</trans>
-    </entry>
-    <entry>
        <base>VALUE_ZERO_OR_POSITIVE</base>
        <trans>Value must be zero or a positive integer</trans>
     </entry>
@@ -182,10 +162,6 @@
        </trans>
     </entry>
     <entry>
-       <base>NETWORK</base>
-       <trans>Network</trans>
-    </entry>
-    <entry>
        <base>SUBNET_MASK</base>
        <trans>Subnet mask</trans>
     </entry>
@@ -212,22 +188,10 @@
        <trans>Unable to locate httpd-admin record in configuration db</trans>
     </entry>
     <entry>
-       <base>REMOVE</base>
-       <trans>Remove</trans>
-    </entry>
-    <entry>
-       <base>Security</base>
-       <trans>Security</trans>
-    </entry>
-    <entry>
        <base>Remote access</base>
        <trans>Remote access</trans>
     </entry>
     <entry>
-       <base>ACTION</base>
-       <trans>Action</trans>
-    </entry>
-    <entry>
         <base>LABEL_SERIAL_CONSOLE_ACCESS</base>
         <trans>Serial console</trans>
     </entry>
diff -Nur -x '*.orig' -x '*.rej' e-smith-base-4.18.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/useraccounts mezzanine_patched_e-smith-base-4.18.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/useraccounts
--- e-smith-base-4.18.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/useraccounts    2008-02-14 00:17:04.000000000 +1100
+++ mezzanine_patched_e-smith-base-4.18.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/useraccounts  2008-02-14 00:13:12.000000000 +1100
@@ -103,10 +103,6 @@
         <trans>Account name</trans>
     </entry>
     <entry>
-        <base>ACTION</base>
-        <trans>Action</trans>
-    </entry>
-    <entry>
         <base>FIRSTNAME</base>
         <trans>First name</trans>
     </entry>
@@ -159,23 +155,10 @@
         <trans>Group memberships</trans>
     </entry>
     <entry>
-        <base>ACCOUNT</base>
-        <trans>Account</trans>
-    </entry>
-    <entry>
         <base>USER_NAME</base>
         <trans>User name</trans>
     </entry>
     <entry>
-        <base>SAVE</base>
-        <trans>Save</trans>
-    </entry>
-    <entry>
-        <base>ADD</base>
-        <trans>Add</trans>
-    </entry>
-
-    <entry>
         <base>PASSWORD1</base>
         <trans>New password</trans>
     </entry>
@@ -226,10 +209,6 @@
             initials to this field."</trans>
     </entry>
     <entry>
-        <base>MODIFY</base>
-        <trans>Modify</trans>
-    </entry>
-    <entry>
         <base>RESET_PASSWORD</base>
         <trans>Reset password</trans>
     </entry>
@@ -238,10 +217,6 @@
         <trans>Lock account</trans>
     </entry>
     <entry>
-        <base>REMOVE</base>
-        <trans>Remove</trans>
-    </entry>
-    <entry>
         <base>LOCK_ACCOUNT_TITLE</base>
         <trans>Lock user account</trans>
     </entry>
@@ -297,10 +272,6 @@
         <trans>Account is locked</trans>
     </entry>
     <entry>
-        <base>Collaboration</base>
-        <trans>Collaboration</trans>
-    </entry>
-    <entry>
         <base>Users</base>
         <trans>Users</trans>
     </entry>
@@ -342,10 +313,6 @@
         <trans>Member?</trans>
     </entry>
     <entry>
-        <base>GROUP</base>
-        <trans>Group</trans>
-    </entry>
-    <entry>
         <base>DESCRIPTION</base>
         <trans>Description</trans>
     </entry>
@@ -354,15 +321,6 @@
         <trans>VPN Client Access</trans>
     </entry>
     <entry>
-        <base>YES</base>
-        <trans>Yes</trans>
-    </entry>
-    <entry>
-        <base>NO</base>
-        <trans>No</trans>
-    </entry>            
-
-    <entry>
         <base>SYSTEM_PASSWORD_FORM_TITLE</base>
         <trans>Change system password</trans>
     </entry>    
1	diff -Nur -x '.orig' -x '.rej' e-smith-base-4.18.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/groups mezzanine_patched_e-smith-base-4.18.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/groups
2	--- e-smith-base-4.18.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/groups 2005-11-21 15:28:05.000000000 +1100
3	+++ mezzanine_patched_e-smith-base-4.18.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/groups 2008-02-14 00:14:14.000000000 +1100
4	@@ -85,19 +85,10 @@
5	<trans>Add</trans>
6	</entry>
7	<entry>
8	- <base>REMOVE</base>
9	- <trans>Remove</trans>
10	- </entry>
11	- <entry>
12	<base>MODIFY_SAVE</base>
13	<trans>Save</trans>
14	</entry>
15	<entry>
16	- <base>MODIFY</base>
17	- <trans>Modify</trans>
18	- </entry>
19	-
20	- <entry>
21	<base>GROUP_NAME</base>
22	<trans>Group Name</trans>
23	</entry>
24	@@ -126,18 +117,10 @@
25	]]></trans>
26	</entry>
27	<entry>
28	- <base>ACCOUNT</base>
29	- <trans>Account</trans>
30	- </entry>
31	- <entry>
32	<base>USERNAME</base>
33	<trans>User Name</trans>
34	</entry>
35	<entry>
36	- <base>ACTION</base>
37	- <trans>Action</trans>
38	- </entry>
39	- <entry>
40	<base>CLICK_TO_CREATE</base>
41	<trans>Add group</trans>
42	</entry>
43	@@ -150,10 +133,6 @@
44	<trans><![CDATA[<p>Current list of User Groups</p>]]></trans>
45	</entry>
46	<entry>
47	- <base>GROUP</base>
48	- <trans>Group</trans>
49	- </entry>
50	- <entry>
51	<base>GROUP_MEMBERS</base>
52	<trans>Group Members</trans>
53	</entry>
54	@@ -168,10 +147,6 @@
55	]]></trans>
56	</entry>
57	<entry>
58	- <base>Collaboration</base>
59	- <trans>Collaboration</trans>
60	- </entry>
61	- <entry>
62	<base>Groups</base>
63	<trans>Groups</trans>
64	</entry>
65	diff -Nur -x '.orig' -x '.rej' e-smith-base-4.18.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/localnetworks mezzanine_patched_e-smith-base-4.18.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/localnetworks
66	--- e-smith-base-4.18.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/localnetworks 2008-02-14 00:17:04.000000000 +1100
67	+++ mezzanine_patched_e-smith-base-4.18.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/localnetworks 2008-02-14 00:11:20.000000000 +1100
68	@@ -158,10 +158,6 @@
69	<trans>Error occurred while deleting network.</trans>
70	</entry>
71	<entry>
72	- <base>Security</base>
73	- <trans>Security</trans>
74	- </entry>
75	- <entry>
76	<base>NO_ADDITIONAL_NETWORKS</base>
77	<trans>No additional networks</trans>
78	</entry>
79	diff -Nur -x '.orig' -x '.rej' e-smith-base-4.18.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/reboot mezzanine_patched_e-smith-base-4.18.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/reboot
80	--- e-smith-base-4.18.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/reboot 2006-02-17 14:41:51.000000000 +1100
81	+++ mezzanine_patched_e-smith-base-4.18.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/reboot 2008-02-14 00:14:34.000000000 +1100
82	@@ -62,10 +62,6 @@
83	</trans>
84	</entry>
85	<entry>
86	- <base>Administration</base>
87	- <trans>Administration</trans>
88	- </entry>
89	- <entry>
90	<base>Reboot or shutdown</base>
91	<trans>Reboot or shutdown</trans>
92	</entry>
93	diff -Nur -x '.orig' -x '.rej' e-smith-base-4.18.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/remoteaccess mezzanine_patched_e-smith-base-4.18.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/remoteaccess
94	--- e-smith-base-4.18.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/remoteaccess 2008-02-14 00:17:04.000000000 +1100
95	+++ mezzanine_patched_e-smith-base-4.18.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/remoteaccess 2008-02-14 00:15:58.000000000 +1100
96	@@ -24,26 +24,10 @@
97	<trans>Error occurred while updating system configuration.</trans>
98	</entry>
99	<entry>
100	- <base>DISABLED</base>
101	- <trans>Disabled</trans>
102	- </entry>
103	- <entry>
104	- <base>YES</base>
105	- <trans>Yes</trans>
106	- </entry>
107	- <entry>
108	- <base>NO</base>
109	- <trans>No</trans>
110	- </entry>
111	- <entry>
112	<base>OFF</base>
113	<trans>Off</trans>
114	</entry>
115	<entry>
116	- <base>ENABLED</base>
117	- <trans>Enabled</trans>
118	- </entry>
119	- <entry>
120	<base>NO_ACCESS</base>
121	<trans>No Access</trans>
122	</entry>
123	@@ -152,10 +136,6 @@
124	</trans>
125	</entry>
126	<entry>
127	- <base>SAVE</base>
128	- <trans>Save</trans>
129	- </entry>
130	- <entry>
131	<base>VALUE_ZERO_OR_POSITIVE</base>
132	<trans>Value must be zero or a positive integer</trans>
133	</entry>
134	@@ -182,10 +162,6 @@
135	</trans>
136	</entry>
137	<entry>
138	- <base>NETWORK</base>
139	- <trans>Network</trans>
140	- </entry>
141	- <entry>
142	<base>SUBNET_MASK</base>
143	<trans>Subnet mask</trans>
144	</entry>
145	@@ -212,22 +188,10 @@
146	<trans>Unable to locate httpd-admin record in configuration db</trans>
147	</entry>
148	<entry>
149	- <base>REMOVE</base>
150	- <trans>Remove</trans>
151	- </entry>
152	- <entry>
153	- <base>Security</base>
154	- <trans>Security</trans>
155	- </entry>
156	- <entry>
157	<base>Remote access</base>
158	<trans>Remote access</trans>
159	</entry>
160	<entry>
161	- <base>ACTION</base>
162	- <trans>Action</trans>
163	- </entry>
164	- <entry>
165	<base>LABEL_SERIAL_CONSOLE_ACCESS</base>
166	<trans>Serial console</trans>
167	</entry>
168	diff -Nur -x '.orig' -x '.rej' e-smith-base-4.18.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/useraccounts mezzanine_patched_e-smith-base-4.18.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/useraccounts
169	--- e-smith-base-4.18.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/useraccounts 2008-02-14 00:17:04.000000000 +1100
170	+++ mezzanine_patched_e-smith-base-4.18.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/useraccounts 2008-02-14 00:13:12.000000000 +1100
171	@@ -103,10 +103,6 @@
172	<trans>Account name</trans>
173	</entry>
174	<entry>
175	- <base>ACTION</base>
176	- <trans>Action</trans>
177	- </entry>
178	- <entry>
179	<base>FIRSTNAME</base>
180	<trans>First name</trans>
181	</entry>
182	@@ -159,23 +155,10 @@
183	<trans>Group memberships</trans>
184	</entry>
185	<entry>
186	- <base>ACCOUNT</base>
187	- <trans>Account</trans>
188	- </entry>
189	- <entry>
190	<base>USER_NAME</base>
191	<trans>User name</trans>
192	</entry>
193	<entry>
194	- <base>SAVE</base>
195	- <trans>Save</trans>
196	- </entry>
197	- <entry>
198	- <base>ADD</base>
199	- <trans>Add</trans>
200	- </entry>
201	-
202	- <entry>
203	<base>PASSWORD1</base>
204	<trans>New password</trans>
205	</entry>
206	@@ -226,10 +209,6 @@
207	initials to this field."</trans>
208	</entry>
209	<entry>
210	- <base>MODIFY</base>
211	- <trans>Modify</trans>
212	- </entry>
213	- <entry>
214	<base>RESET_PASSWORD</base>
215	<trans>Reset password</trans>
216	</entry>
217	@@ -238,10 +217,6 @@
218	<trans>Lock account</trans>
219	</entry>
220	<entry>
221	- <base>REMOVE</base>
222	- <trans>Remove</trans>
223	- </entry>
224	- <entry>
225	<base>LOCK_ACCOUNT_TITLE</base>
226	<trans>Lock user account</trans>
227	</entry>
228	@@ -297,10 +272,6 @@
229	<trans>Account is locked</trans>
230	</entry>
231	<entry>
232	- <base>Collaboration</base>
233	- <trans>Collaboration</trans>
234	- </entry>
235	- <entry>
236	<base>Users</base>
237	<trans>Users</trans>
238	</entry>
239	@@ -342,10 +313,6 @@
240	<trans>Member?</trans>
241	</entry>
242	<entry>
243	- <base>GROUP</base>
244	- <trans>Group</trans>
245	- </entry>
246	- <entry>
247	<base>DESCRIPTION</base>
248	<trans>Description</trans>
249	</entry>
250	@@ -354,15 +321,6 @@
251	<trans>VPN Client Access</trans>
252	</entry>
253	<entry>
254	- <base>YES</base>
255	- <trans>Yes</trans>
256	- </entry>
257	- <entry>
258	- <base>NO</base>
259	- <trans>No</trans>
260	- </entry>
261	-
262	- <entry>
263	<base>SYSTEM_PASSWORD_FORM_TITLE</base>
264	<trans>Change system password</trans>
265	</entry>