smeserver-vacation/contribs7/smeserver-vacation-1.0-pootle.patch

--- smeserver-vacation-1.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/uservacations.pootle 2006-04-13 00:21:06.000000000 +1000
+++ smeserver-vacation-1.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/uservacations        2008-02-25 19:47:58.000000000 +1100
@@ -1,27 +1,17 @@
 <lexicon lang="en-us">
 
     <entry>
-        <base>Collaboration</base>
-        <trans>Collaboration</trans>
+      <base>User vacations</base>
+      <trans>User vacations</trans>
     </entry>
     <entry>
-        <base>User vacations</base>
-        <trans>User vacations</trans>
+      <base>Vacation Message</base>
+      <trans>Vacation Message</trans>
     </entry>
     <entry>
-        <base>Your Settings</base>
-        <trans>Your Settings</trans>
-    </entry>
-    <entry>
-        <base>Vacation Message</base>
-        <trans>Vacation Message</trans>
-    </entry>
-
-    <entry>
       <base>FORM_TITLE</base>
       <trans>Change user vacation settings</trans>
     </entry>
-
     <entry>
       <base>DESCRIPTION</base>
       <trans>
@@ -29,40 +19,30 @@
              on the link to the right of their name below.
       </trans>
     </entry>
-
     <entry>
       <base>CURRENT_LIST_OF_USERS</base>
       <trans>Current list of users</trans>
     </entry>
-
     <entry>
       <base>LABEL_USER</base>
       <trans>Account</trans>
     </entry>
-
     <entry>
       <base>LABEL_FULLNAME</base>
       <trans>User Name</trans>
     </entry>
-
     <entry>
       <base>LABEL_VACATION</base>
       <trans>Vacation</trans>
     </entry>
-
-    <entry>
-      <base>MODIFY</base>
-      <trans>Modify</trans>
-    </entry>
-
     <entry>
       <base>MODIFY_DESCRIPTION</base>
-         <trans>  <![CDATA[
-             <p>
-                Enter a vacation message here. You can use "$SUBJECT"
-             anywhere in the text to be replaced with the subject line
+      <trans>  <![CDATA[
+          <p>
+             Enter a vacation message here. You can use "$SUBJECT"
+             anywhere in the text to be replaced with the subject line
              from the email that activated the auto-reply.
-          </p>
+          </p>
           <p>
              This message must be composed of two parts separated by a blank line. 
              The first will be integrated into the headings of the email reply,
@@ -74,67 +54,46 @@
              To change the vacation message back to the default type "reset".
           </p>
           ]]>
-      </trans>
+      </trans>
     </entry>
-
     <entry>
       <base>MESSAGE</base>
       <trans>Vacation message</trans>
     </entry>
-
     <entry>
       <base>VACATION_STATUS</base>
       <trans>Enable vacation messages</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>SUCCESS</base>
       <trans>Success</trans>
     </entry>
-
     <entry>
       <base>FROM</base>
       <trans>From:</trans>
     </entry>
-
     <!-- this is read into a ~/.vacation.msg verbatim
     leave a blank line after the subject line but not before, 
     and don't translate $SUBJECT -->
     <entry>
       <base>AWAY_FROM_MAIL</base>
-      <trans>    
-Subject: Re: $SUBJECT - Away from my email
-
-I will not be reading my mail for a while. Your mail regarding
-
+      <trans> <![CDATA[ Subject: Re: $SUBJECT - Away from my email 
+<p>
+I will not be reading my mail for a while. Your mail regarding  
+</p><p>
     $SUBJECT
-
+</p><p>
 will be read when I return.
+</p>   
+        ]]>
       </trans>
     </entry>
-
     <entry>
       <base>INVALID_USER</base>
       <trans>Invalid user</trans>
     </entry>
-
-    <entry>
-      <base>NO_ACCOUNTS</base>
-      <trans>There are no user accounts in the system.</trans>
+    <entry>
+      <base>NO_ACCOUNTS</base>
+      <trans>There are no user accounts in the system.</trans>
     </entry>
-    
 </lexicon>
1	dungog	1.1	--- smeserver-vacation-1.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/uservacations.pootle 2006-04-13 00:21:06.000000000 +1000
2			+++ smeserver-vacation-1.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/uservacations 2008-02-25 19:47:58.000000000 +1100
3			@@ -1,27 +1,17 @@
4			<lexicon lang="en-us">
5
6			<entry>
7			- <base>Collaboration</base>
8			- <trans>Collaboration</trans>
9			+ <base>User vacations</base>
10			+ <trans>User vacations</trans>
11			</entry>
12			<entry>
13			- <base>User vacations</base>
14			- <trans>User vacations</trans>
15			+ <base>Vacation Message</base>
16			+ <trans>Vacation Message</trans>
17			</entry>
18			<entry>
19			- <base>Your Settings</base>
20			- <trans>Your Settings</trans>
21			- </entry>
22			- <entry>
23			- <base>Vacation Message</base>
24			- <trans>Vacation Message</trans>
25			- </entry>
26			-
27			- <entry>
28			<base>FORM_TITLE</base>
29			<trans>Change user vacation settings</trans>
30			</entry>
31			-
32			<entry>
33			<base>DESCRIPTION</base>
34			<trans>
35			@@ -29,40 +19,30 @@
36			on the link to the right of their name below.
37			</trans>
38			</entry>
39			-
40			<entry>
41			<base>CURRENT_LIST_OF_USERS</base>
42			<trans>Current list of users</trans>
43			</entry>
44			-
45			<entry>
46			<base>LABEL_USER</base>
47			<trans>Account</trans>
48			</entry>
49			-
50			<entry>
51			<base>LABEL_FULLNAME</base>
52			<trans>User Name</trans>
53			</entry>
54			-
55			<entry>
56			<base>LABEL_VACATION</base>
57			<trans>Vacation</trans>
58			</entry>
59			-
60			- <entry>
61			- <base>MODIFY</base>
62			- <trans>Modify</trans>
63			- </entry>
64			-
65			<entry>
66			<base>MODIFY_DESCRIPTION</base>
67			- <trans> <![CDATA[
68			- <p>
69			- Enter a vacation message here. You can use "$SUBJECT"
70			- anywhere in the text to be replaced with the subject line
71			+ <trans> <![CDATA[
72			+ <p>
73			+ Enter a vacation message here. You can use "$SUBJECT"
74			+ anywhere in the text to be replaced with the subject line
75			from the email that activated the auto-reply.
76			- </p>
77			+ </p>
78			<p>
79			This message must be composed of two parts separated by a blank line.
80			The first will be integrated into the headings of the email reply,
81			@@ -74,67 +54,46 @@
82			To change the vacation message back to the default type "reset".
83			</p>
84			]]>
85			- </trans>
86			+ </trans>
87			</entry>
88			-
89			<entry>
90			<base>MESSAGE</base>
91			<trans>Vacation message</trans>
92			</entry>
93			-
94			<entry>
95			<base>VACATION_STATUS</base>
96			<trans>Enable vacation messages</trans>
97			</entry>
98			-
99			- <entry>
100			- <base>YES</base>
101			- <trans>Yes</trans>
102			- </entry>
103			- <entry>
104			- <base>NO</base>
105			- <trans>No</trans>
106			- </entry>
107			-
108			- <entry>
109			- <base>SAVE</base>
110			- <trans>Save</trans>
111			- </entry>
112			-
113			<entry>
114			<base>SUCCESS</base>
115			<trans>Success</trans>
116			</entry>
117			-
118			<entry>
119			<base>FROM</base>
120			<trans>From:</trans>
121			</entry>
122			-
123			<!-- this is read into a ~/.vacation.msg verbatim
124			leave a blank line after the subject line but not before,
125			and don't translate $SUBJECT -->
126			<entry>
127			<base>AWAY_FROM_MAIL</base>
128			- <trans>
129			-Subject: Re: $SUBJECT - Away from my email
130			-
131			-I will not be reading my mail for a while. Your mail regarding
132			-
133			+ <trans> <![CDATA[ Subject: Re: $SUBJECT - Away from my email
134			+<p>
135			+I will not be reading my mail for a while. Your mail regarding
136			+</p><p>
137			$SUBJECT
138			-
139			+</p><p>
140			will be read when I return.
141			+</p>
142			+ ]]>
143			</trans>
144			</entry>
145			-
146			<entry>
147			<base>INVALID_USER</base>
148			<trans>Invalid user</trans>
149			</entry>
150			-
151			- <entry>
152			- <base>NO_ACCOUNTS</base>
153			- <trans>There are no user accounts in the system.</trans>
154			+ <entry>
155			+ <base>NO_ACCOUNTS</base>
156			+ <trans>There are no user accounts in the system.</trans>
157			</entry>
158			-
159			</lexicon>