--- 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>