--- smeserver-dar2-0.0.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/dar2.pm.add2general	2008-04-24 22:10:39.000000000 +0200
+++ smeserver-dar2-0.0.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/dar2.pm	2008-04-24 23:02:27.000000000 +0200
@@ -217,10 +217,10 @@
     print "  <tr>\n    <td colspan=\"2\">\n      ";
     print $q->start_table ({-CLASS => "sme-border"}),"\n        ";
     print $q->Tr(
-    esmith::cgi::genSmallCell($q, $self->localise('LABEL_JOBNAME'),"header"),
-    esmith::cgi::genSmallCell($q, $self->localise('LABEL_DESCRIPTION'),"header"),
-    esmith::cgi::genSmallCell($q, $self->localise('LABEL_TARGET'), "header"),
-    esmith::cgi::genSmallCell($q, $self->localise('LABEL_ACTION'),"header",4));
+    esmith::cgi::genSmallCell($q, $self->localise('JOBNAME'),"header"),
+    esmith::cgi::genSmallCell($q, $self->localise('DESCRIPTION'),"header"),
+    esmith::cgi::genSmallCell($q, $self->localise('TARGET'), "header"),
+    esmith::cgi::genSmallCell($q, $self->localise('ACTION'),"header",4));
 
     my $scriptname = basename($0);
     my $index=0;
@@ -233,7 +233,7 @@
 	my $Target = $rec->prop("Target");
         my $modify  = $self->localise('MODIFY');
         my $backup  = $self->localise('BACKUP');
-        my $restore = $self->localise('LABEL_RESTORE');
+        my $restore = $self->localise('RESTORE');
         my $remove  = $self->localise('REMOVE');
         my $href = "$scriptname?page=0&page_stack=&Next=Next&wherenext";
 
--- smeserver-dar2-0.0.1/root/etc/e-smith/web/functions/dar2.add2general	2006-10-11 21:21:00.000000000 +0200
+++ smeserver-dar2-0.0.1/root/etc/e-smith/web/functions/dar2	2008-04-24 23:01:04.000000000 +0200
@@ -40,7 +40,7 @@
             size="25"
 	    value=""
             validation="nonblank">
-            <label>LABEL_JOBNAME</label>
+            <label>JOBNAME</label>
             <description>DESCRIPTION_JOBNAME</description>
         </field>
 
@@ -50,7 +50,7 @@
             size="50"
 	    value=""
             validation="nonblank">
-            <label>LABEL_DESCRIPTION</label>
+            <label>DESCRIPTION</label>
             <description>DESCRIPTION_DESC</description>	    
         </field>
 
@@ -59,7 +59,7 @@
             id="backup"
 	    value="get_drbackup()"
             validation="nonblank">
-            <label>LABEL_BACKUP</label>
+            <label>BACKUP</label>
 	    <description>DESCRIPTION_BACKUP</description>	    
         </field>
 
@@ -68,7 +68,7 @@
             id="prune"
             value=""
             validation="">
-            <label>LABEL_PRUNE</label>
+            <label>PRUNE</label>
             <description>DESCRIPTION_PRUNE</description>
         </field>
 
@@ -77,7 +77,7 @@
             id="exclude"
 	    value=""
             validation="">
-            <label>LABEL_EXCLUDE</label>
+            <label>EXCLUDE</label>
 	    <description>DESCRIPTION_EXCLUDE</description>	    
         </field>
 
@@ -87,7 +87,7 @@
 	    size="50"
 	    value=""
             validation="">
-            <label>LABEL_TARGET</label>
+            <label>TARGET</label>
 	    <description>DESCRIPTION_TARGET</description>	    
         </field>
 
@@ -97,7 +97,7 @@
 	    size="25"
 	    value=""
             validation="">
-            <label>LABEL_USERNAME</label>
+            <label>USERNAME</label>
         </field>
 
         <field
@@ -106,7 +106,7 @@
 	    size="25"
 	    value=""
             validation="">
-            <label>LABEL_PASSWORD</label>
+            <label>PASSWORD</label>
         </field>	
 
         <field
@@ -117,7 +117,7 @@
 	             'smbfs' => 'smbfs'"
             value="smbfs"
             validation="nonblank">
-            <label>LABEL_VFSTYPE</label>
+            <label>VFSTYPE</label>
 	    <description>DESCRIPTION_VFSTYPE</description>	    
         </field>
 
@@ -127,7 +127,7 @@
 	    size="3"
 	    value="650"
             validation="zero_or_positive()">
-            <label>LABEL_SLICE</label>
+            <label>SLICE</label>
 	    <description>DESCRIPTION_SLICE</description>	    
         </field>
 
@@ -137,7 +137,7 @@
             options="0,1,2,3,4,5,6,7,8,9"
 	    value="0"
             validation="zero_or_positive()">
-            <label>LABEL_COMPRESSION</label>
+            <label>COMPRESSION</label>
 	    <description>DESCRIPTION_COMPRESSION</description>	    
         </field>
 
@@ -147,7 +147,7 @@
 	    size="3"
 	    value="0"
             validation="zero_or_positive()">	    
-            <label>LABEL_EXPIRY</label>
+            <label>EXPIRY</label>
 	    <description>DESCRIPTION_EXPIRY</description>	    
         </field>
 
@@ -157,7 +157,7 @@
             options="'on','off'"
             value="off"
             validation="nonblank">
-            <label>LABEL_VERBOSE</label>
+            <label>VERBOSE</label>
             <description>DESCRIPTION_VERBOSE</description>
         </field>
 
@@ -167,7 +167,7 @@
             options="'manual','*','MON','TUE','WED','THU','FRI','SAT','SUN'"
 	    value="manual"
             validation="nonblank">
-            <label>LABEL_BACKUP_DAY</label>
+            <label>BACKUP_DAY</label>
 	    <description>DESCRIPTION_BACKUP_DAY</description>	    
         </field>
 
@@ -177,7 +177,7 @@
             size="5"
             value="23:30"
             validation="">
-            <label>LABEL_BACKUP_TIME</label>
+            <label>BACKUP_TIME</label>
             <description>DESCRIPTION_BACKUP_TIME</description>
         </field>
 
@@ -193,7 +193,7 @@
         <field
             type="literal"
             id="jobname">
-            <label>LABEL_JOBNAME</label>
+            <label>JOBNAME</label>
         </field>
 
         <field
@@ -202,7 +202,7 @@
             size="50"
 	    value="get_description_value()"
             validation="nonblank">
-            <label>LABEL_DESCRIPTION</label>
+            <label>DESCRIPTION</label>
         </field>
 
         <field
@@ -210,7 +210,7 @@
             id="backup"
 	    value="get_backup_value()"
             validation="nonblank">
-            <label>LABEL_BACKUP</label>
+            <label>BACKUP</label>
         </field>
 
         <field
@@ -218,7 +218,7 @@
             id="prune"
             value="get_prune_value()"
             validation="">
-            <label>LABEL_PRUNE</label>
+            <label>PRUNE</label>
         </field>
 
         <field
@@ -226,7 +226,7 @@
             id="exclude"
 	    value="get_exclude_value()"
             validation="">
-            <label>LABEL_EXCLUDE</label>
+            <label>EXCLUDE</label>
         </field>
 
 
@@ -236,7 +236,7 @@
 	    size="50"
 	    value="get_target_value()"
             validation="">
-            <label>LABEL_TARGET</label>
+            <label>TARGET</label>
         </field>
 
         <field
@@ -245,7 +245,7 @@
 	    size="25"
 	    value="get_username_value()"
             validation="">
-            <label>LABEL_USERNAME</label>
+            <label>USERNAME</label>
         </field>
 
         <field
@@ -254,7 +254,7 @@
 	    size="25"
 	    value="get_password_value()"
             validation="">
-            <label>LABEL_PASSWORD</label>
+            <label>PASSWORD</label>
         </field>	
 
         <field
@@ -265,7 +265,7 @@
 	             'smbfs' => 'smbfs'"
             value="get_vfstype_value()"
             validation="nonblank">
-            <label>LABEL_VFSTYPE</label>
+            <label>VFSTYPE</label>
         </field>
 
         <field
@@ -274,7 +274,7 @@
 	    size="3"
 	    value="get_slice_value()"
             validation="zero_or_positive()">
-            <label>LABEL_SLICE</label>
+            <label>SLICE</label>
         </field>
 
         <field
@@ -283,7 +283,7 @@
             options="0,1,2,3,4,5,6,7,8,9"
 	    value="get_compression_value()"
             validation="zero_or_positive()">
-            <label>LABEL_COMPRESSION</label>
+            <label>COMPRESSION</label>
         </field>
 
         <field
@@ -292,7 +292,7 @@
 	    size="3"
 	    value="get_expiry_value()"
             validation="zero_or_positive()">	    
-            <label>LABEL_EXPIRY</label>
+            <label>EXPIRY</label>
         </field>
 
         <field
@@ -301,7 +301,7 @@
             options="'on','off'"
             value="get_verbose_value()"
             validation="nonblank">
-            <label>LABEL_VERBOSE</label>
+            <label>VERBOSE</label>
         </field>
 
         <field
@@ -310,7 +310,7 @@
             options="'manual','*','MON','TUE','WED','THU','FRI','SAT','SUN'"
 	    value="get_backupday_value()"
             validation="nonblank">
-            <label>LABEL_BACKUP_DAY</label>
+            <label>BACKUP_DAY</label>
         </field>
 
         <field
@@ -319,7 +319,7 @@
             size="5"
 	    value="get_backuptime_value()"
             validation="nonblank">
-            <label>LABEL_BACKUP_TIME</label>
+            <label>BACKUP_TIME</label>
         </field>
 
         <subroutine src="print_button('SAVE')" />
@@ -334,7 +334,7 @@
         <field
             type="literal"
             id="jobname">
-            <label>LABEL_JOBNAME</label>
+            <label>JOBNAME</label>
         </field>
 
         <field
@@ -343,7 +343,7 @@
             size="10"
             value=""
             validation="nonblank">
-            <label>LABEL_RESTORE_DATE</label>
+            <label>RESTORE_DATE</label>
 	    <description>DESCRIPTION_RESTORE_DATE</description>
         </field>
 
@@ -353,7 +353,7 @@
             options="'Enabled','Disabled'"
             value="Disabled"
             validation="nonblank">
-            <label>LABEL_RESTORE_DR</label>
+            <label>RESTORE_DR</label>
             <description>DESCRIPTION_RESTORE_DR</description>
         </field>
 
@@ -362,7 +362,7 @@
             id="restore"
             value=""
             validation="nonblank">
-            <label>LABEL_RESTORE</label>
+            <label>RESTORE</label>
         </field>
 
         <field
@@ -371,7 +371,7 @@
             size="25"
             value=""
             validation="nonblank">
-            <label>LABEL_RESTORE_RESTORETO</label>
+            <label>RESTORE_RESTORETO</label>
         </field>
 
         <subroutine src="print_button('PERFORM')" />
@@ -386,21 +386,21 @@
         <field
             type="literal"
             id="jobname">
-            <label>LABEL_JOBNAME</label>
+            <label>JOBNAME</label>
         </field>
 
         <field
             type="literal"
             id="description"
 	    value="get_description_value()">
-            <label>LABEL_DESCRIPTION</label>
+            <label>DESCRIPTION</label>
         </field>
 
         <field
             type="literal"
             id="target"
 	    value="get_target_value()">
-            <label>LABEL_TARGET</label>
+            <label>TARGET</label>
         </field>
 
         <subroutine src="print_button('PERFORM')" />
@@ -415,21 +415,21 @@
         <field
             type="literal"
             id="jobname">
-            <label>LABEL_JOBNAME</label>
+            <label>JOBNAME</label>
         </field>
 
         <field
             type="literal"
             id="description"
 	    value="get_description_value()">
-            <label>LABEL_DESCRIPTION</label>
+            <label>DESCRIPTION</label>
         </field>
 
         <field
             type="literal"
             id="target"
 	    value="get_target_value()">
-            <label>LABEL_TARGET</label>
+            <label>TARGET</label>
         </field>
 
         <subroutine src="print_button('PERFORM')" />
--- smeserver-dar2-0.0.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/dar2.fix	2008-04-24 18:03:29.000000000 -0600
+++ smeserver-dar2-0.0.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/dar2	2008-04-24 18:09:38.000000000 -0600
@@ -1,23 +1,9 @@
 <lexicon lang="en-us">
     <entry>
-            <base>SAVE</base>
-            <trans>Save</trans>
-    </entry>
-    <entry>
-            <base>PERFORM</base>
-            <trans>Perform</trans>
-    </entry>
-    <entry>
         <base>FORM_TITLE</base>
         <trans>Disk ARchive</trans>
     </entry>
     <entry>
-        <base>OPERATION_STATUS_REPORT</base>
-        <trans>
-            Operation status report
-        </trans>
-    </entry>
-    <entry>
         <base>FORM_DESCRIPTION</base>
         <trans>
             <![CDATA[
@@ -34,22 +20,10 @@
         <trans>There are no backup jobs in the system.</trans>
     </entry>
     <entry>
-        <base>LABEL_ACTION</base>
-        <trans>Action</trans>
-    </entry>
-    <entry>
         <base>MODIFY</base>
         <trans>View/Modify</trans>
     </entry>
     <entry>
-        <base>BACKUP</base>
-        <trans>Backup</trans>
-    </entry>
-    <entry>
-        <base>REMOVE</base>
-        <trans>Remove</trans>
-    </entry>
-    <entry>
         <base>CREATE_TITLE</base>
         <trans>Create backup job</trans>
     </entry>
@@ -70,79 +44,59 @@
         <trans>Remove backup job</trans>
     </entry>
     <entry>
-            <base>LABEL_JOBNAME</base>
+            <base>JOBNAME</base>
             <trans>Job name</trans>
     </entry>
     <entry>
-            <base>LABEL_DESTINATION</base>
-            <trans>Destination</trans>
-    </entry>
-    <entry>
-            <base>LABEL_BACKUP</base>
+            <base>BACKUP</base>
             <trans>Backup selections</trans>
     </entry>
     <entry>
-            <base>LABEL_EXCLUDE</base>
+            <base>EXCLUDE</base>
             <trans>Exclude files</trans>
     </entry>
     <entry>
-            <base>LABEL_PRUNE</base>
+            <base>PRUNE</base>
             <trans>Prune directories</trans>
     </entry>
     <entry>
-            <base>LABEL_TARGET</base>
+            <base>TARGET</base>
             <trans>Target</trans>
     </entry>
     <entry>
-            <base>LABEL_SLICE</base>
+            <base>SLICE</base>
             <trans>Slice size</trans>
     </entry>
     <entry>
-            <base>LABEL_VFSTYPE</base>
+            <base>VFSTYPE</base>
             <trans>File system</trans>
     </entry>
     
     <entry>
-            <base>LABEL_COMPRESSION</base>
+            <base>COMPRESSION</base>
             <trans>Compression</trans>
     </entry>
     <entry>
-            <base>LABEL_USERNAME</base>
+            <base>USERNAME</base>
             <trans>Username</trans>
     </entry>
     <entry>
-            <base>LABEL_PASSWORD</base>
-            <trans>Password</trans>
-    </entry>
-    <entry>
-            <base>LABEL_DESCRIPTION</base>
-            <trans>Description</trans>
-    </entry>
-    <entry>
-            <base>LABEL_EXPIRY</base>
+            <base>EXPIRY</base>
             <trans>Expiry</trans>
     </entry>
     <entry>
-            <base>LABEL_VERBOSE</base>
+            <base>VERBOSE</base>
             <trans>Verbose</trans>
     </entry>
     <entry>
-            <base>LABEL_BACKUP_DAY</base>
+            <base>BACKUP_DAY</base>
             <trans>Backup day</trans>
     </entry>
     <entry>
-            <base>LABEL_BACKUP_TIME</base>
+            <base>BACKUP_TIME</base>
             <trans>Backup time</trans>
     </entry>
     <entry>
-            <base>DISABLED</base>
-            <trans>Disabled</trans>
-    </entry>
-    <entry>
-            <base>ENABLED</base>
-            <trans>Enabled</trans>
-    </entry>
-    <entry>
             <base>LOCALDRIVE</base>
             <trans>Local drive</trans>
     </entry>
@@ -165,7 +119,7 @@
         </trans>
     </entry>
     <entry>
-            <base>LABEL_RESTORE_DATE</base>
+            <base>RESTORE_DATE</base>
             <trans>Date</trans>
     </entry>
     <entry>
@@ -185,15 +139,11 @@
        </trans>
     </entry>
     <entry>
-            <base>LABEL_RESTORE_DR</base>
+            <base>RESTORE_DR</base>
             <trans>Disaster Recovery</trans>
     </entry>
     <entry>
-            <base>LABEL_RESTORE</base>
-            <trans>Restore</trans>
-    </entry>
-    <entry>
-            <base>LABEL_RESTORE_RESTORETO</base>
+            <base>RESTORE_RESTORETO</base>
             <trans>Restore to</trans>
     </entry>
     <entry>