e-smith-domains/sme8/e-smith-domains-1.4.0-novirtual.patch

diff -Nur -x '*.orig' -x '*.rej' e-smith-domains-1.4.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/domains mezzanine_patched_e-smith-domains-1.4.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/domains
--- e-smith-domains-1.4.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/domains       2007-01-13 10:34:02.000000000 -0700
+++ mezzanine_patched_e-smith-domains-1.4.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/domains     2007-01-13 10:33:22.000000000 -0700
@@ -17,7 +17,7 @@
         <base>FORM_DESCRIPTION</base>
         <trans>
             <![CDATA[
-            <p>When you create a virtual domain, your server will be able to
+            <p>When you create a domain, your server will be able to
                 receive e-mail for that domain and will also be able to host a
                 web site for that domain.</p>
             <p><a class="button-like"
@@ -29,7 +29,7 @@
     <entry>
         <base>NO_VIRTUAL_DOMAINS</base>
         <trans> 
-            There are no virtual domains in the system.
+            There are no domains in the system.
         </trans>
     </entry>
     <entry>
@@ -77,7 +77,7 @@
     <entry>
         <base>CREATE_TITLE</base>
         <trans>
-            Create a new virtual domain
+            Create a new domain
         </trans>
     </entry>
     <entry>
@@ -136,14 +136,14 @@
         <base>SYSTEM_DOMAIN_ERROR</base>
         <trans>
             Error: domain {$domainName} is your system domain name.  You
-            cannot have a virtual domain with the same name.  Did not create
+            cannot have a domain with the same name.  Did not create
             new domain.
         </trans>
     </entry>
     <entry>
         <base>SUCCESSFULLY_CREATED</base>
         <trans>
-            Successfully created virtual domain {$domainName}.  Your web
+            Successfully created domain {$domainName}.  Your web
             server is now being restarted.  The links on this page will be
             inactive until the web server restart is complete.
         </trans>
@@ -155,7 +155,7 @@
     <entry>
         <base>MODIFY_TITLE</base>
         <trans>
-            Modify virtual domain
+            Modify domain
         </trans>
     </entry>
     <entry>
@@ -167,7 +167,7 @@
     <entry>
         <base>SUCCESSFULLY_MODIFIED</base>
         <trans>
-            Successfully modified virtual domain {$domainName}.  Your web
+            Successfully modified domain {$domainName}.  Your web
             server is now being restarted.  The links on this page will be
             inactive until the web server restart is complete.
         </trans>
@@ -175,7 +175,7 @@
     <entry>
         <base>REMOVE_TITLE</base>
         <trans>
-            Remove virtual domain
+            Remove domain
         </trans>
     </entry>
     <entry>
@@ -183,7 +183,7 @@
         <trans>
             <![CDATA[
             <p>
-                You are about to remove the virtual domain {$domain}
+                You are about to remove the domain {$domain}
                 ({$domainDesc}).  
             </p>
             <p>
@@ -195,14 +195,14 @@
     <entry>
         <base>ERROR_WHILE_REMOVING_DOMAIN</base>
         <trans>
-            Error: internal failure while removing virtual domain
+            Error: internal failure while removing domain
             {$domain}.
         </trans>
     </entry>
     <entry>
         <base>SUCCESSFULLY_DELETED</base>
         <trans>
-            Successfully deleted virtual domain {$domain}.  Your web server
+            Successfully deleted domain {$domain}.  Your web server
             is now being restarted.  The links on this page will be inactive
             until the web server restart is complete.
         </trans>
1	diff -Nur -x '.orig' -x '.rej' e-smith-domains-1.4.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/domains mezzanine_patched_e-smith-domains-1.4.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/domains
2	--- e-smith-domains-1.4.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/domains 2007-01-13 10:34:02.000000000 -0700
3	+++ mezzanine_patched_e-smith-domains-1.4.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/domains 2007-01-13 10:33:22.000000000 -0700
4	@@ -17,7 +17,7 @@
5	<base>FORM_DESCRIPTION</base>
6	<trans>
7	<![CDATA[
8	- <p>When you create a virtual domain, your server will be able to
9	+ <p>When you create a domain, your server will be able to
10	receive e-mail for that domain and will also be able to host a
11	web site for that domain.</p>
12	<p><a class="button-like"
13	@@ -29,7 +29,7 @@
14	<entry>
15	<base>NO_VIRTUAL_DOMAINS</base>
16	<trans>
17	- There are no virtual domains in the system.
18	+ There are no domains in the system.
19	</trans>
20	</entry>
21	<entry>
22	@@ -77,7 +77,7 @@
23	<entry>
24	<base>CREATE_TITLE</base>
25	<trans>
26	- Create a new virtual domain
27	+ Create a new domain
28	</trans>
29	</entry>
30	<entry>
31	@@ -136,14 +136,14 @@
32	<base>SYSTEM_DOMAIN_ERROR</base>
33	<trans>
34	Error: domain {$domainName} is your system domain name. You
35	- cannot have a virtual domain with the same name. Did not create
36	+ cannot have a domain with the same name. Did not create
37	new domain.
38	</trans>
39	</entry>
40	<entry>
41	<base>SUCCESSFULLY_CREATED</base>
42	<trans>
43	- Successfully created virtual domain {$domainName}. Your web
44	+ Successfully created domain {$domainName}. Your web
45	server is now being restarted. The links on this page will be
46	inactive until the web server restart is complete.
47	</trans>
48	@@ -155,7 +155,7 @@
49	<entry>
50	<base>MODIFY_TITLE</base>
51	<trans>
52	- Modify virtual domain
53	+ Modify domain
54	</trans>
55	</entry>
56	<entry>
57	@@ -167,7 +167,7 @@
58	<entry>
59	<base>SUCCESSFULLY_MODIFIED</base>
60	<trans>
61	- Successfully modified virtual domain {$domainName}. Your web
62	+ Successfully modified domain {$domainName}. Your web
63	server is now being restarted. The links on this page will be
64	inactive until the web server restart is complete.
65	</trans>
66	@@ -175,7 +175,7 @@
67	<entry>
68	<base>REMOVE_TITLE</base>
69	<trans>
70	- Remove virtual domain
71	+ Remove domain
72	</trans>
73	</entry>
74	<entry>
75	@@ -183,7 +183,7 @@
76	<trans>
77	<![CDATA[
78	<p>
79	- You are about to remove the virtual domain {$domain}
80	+ You are about to remove the domain {$domain}
81	({$domainDesc}).
82	</p>
83	<p>
84	@@ -195,14 +195,14 @@
85	<entry>
86	<base>ERROR_WHILE_REMOVING_DOMAIN</base>
87	<trans>
88	- Error: internal failure while removing virtual domain
89	+ Error: internal failure while removing domain
90	{$domain}.
91	</trans>
92	</entry>
93	<entry>
94	<base>SUCCESSFULLY_DELETED</base>
95	<trans>
96	- Successfully deleted virtual domain {$domain}. Your web server
97	+ Successfully deleted domain {$domain}. Your web server
98	is now being restarted. The links on this page will be inactive
99	until the web server restart is complete.
100	</trans>