e-smith-backup/sme8/e-smith-backup-1.15.0-add2general.patch

diff -Nur -x '*.orig' -x '*.rej' e-smith-backup-1.15.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/backup mezzanine_patched_e-smith-backup-1.15.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/backup
--- e-smith-backup-1.15.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/backup        2008-08-04 07:45:33.000000000 -0600
+++ mezzanine_patched_e-smith-backup-1.15.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/backup      2008-08-04 07:45:17.000000000 -0600
@@ -158,10 +158,6 @@
    <trans>Select an action</trans>
   </entry>
   <entry>
-   <base>PERFORM</base>
-   <trans>Perform</trans>
-  </entry>
-  <entry>
    <base>X_BACKUP_OR_RESTORE</base>
    <trans>X Backup or restore server data</trans>
   </entry>
@@ -208,10 +204,6 @@
    <trans>Backup file to restore from</trans>
   </entry>
   <entry>
-   <base>RESTORE</base>
-   <trans>Restore</trans>
-  </entry>
-  <entry>
    <base>VERIFY_BACKUP_DESC</base>
    <trans>
     <![CDATA[
@@ -273,10 +265,6 @@
    <trans>Error occured while restoring initial group of 'www'.</trans>
   </entry>
   <entry>
-   <base>ERR_UPDATING_SYSCONF</base>
-   <trans>Error occurred while updating system configuration.</trans>
-  </entry>
-  <entry>
    <base>RESTORE_FAILED</base>
    <trans>Restore failed! The backup file was incomplete.</trans>
   </entry>
@@ -619,10 +607,6 @@
    </trans>
   </entry>
   <entry>
-   <base>WORKSTN_PASSWORD</base>
-   <trans>Password</trans>
-  </entry>
-  <entry>
    <base>WORKSTATION_BACKUP_DEST</base>
    <trans>Backup workstation settings</trans>
   </entry>
diff -Nur -x '*.orig' -x '*.rej' e-smith-backup-1.15.0/root/etc/e-smith/web/functions/backup mezzanine_patched_e-smith-backup-1.15.0/root/etc/e-smith/web/functions/backup
--- e-smith-backup-1.15.0/root/etc/e-smith/web/functions/backup 2008-08-04 07:45:33.000000000 -0600
+++ mezzanine_patched_e-smith-backup-1.15.0/root/etc/e-smith/web/functions/backup       2008-08-04 07:45:17.000000000 -0600
@@ -1326,7 +1326,7 @@
        print $q->Tr(
                    esmith::cgi::genCell(
                            $q,
-                           $fm->localise('WORKSTN_PASSWORD')
+                           $fm->localise('PASSWORD')
                        ),
 
            esmith::cgi::genCell ($q, $q->textfield (-name  => 'backupwkPassword',
@@ -2263,7 +2263,7 @@
                system("/usr/sbin/usermod", "-g", "$www_gid", "www") == 0
                    or warn ($fm->localise('ERR_RESTORING_INITIAL_GRP')."\n");
                system("/sbin/e-smith/signal-event", "post-upgrade") == 0
-                   or die ($fm->localise('ERR_UPDATING_SYSCONF')."\n");
+                   or die ($fm->localise('ERROR_UPDATING_CONFIGURATION')."\n");
            }
            else
            {
1	diff -Nur -x '.orig' -x '.rej' e-smith-backup-1.15.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/backup mezzanine_patched_e-smith-backup-1.15.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/backup
2	--- e-smith-backup-1.15.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/backup 2008-08-04 07:45:33.000000000 -0600
3	+++ mezzanine_patched_e-smith-backup-1.15.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/backup 2008-08-04 07:45:17.000000000 -0600
4	@@ -158,10 +158,6 @@
5	<trans>Select an action</trans>
6	</entry>
7	<entry>
8	- <base>PERFORM</base>
9	- <trans>Perform</trans>
10	- </entry>
11	- <entry>
12	<base>X_BACKUP_OR_RESTORE</base>
13	<trans>X Backup or restore server data</trans>
14	</entry>
15	@@ -208,10 +204,6 @@
16	<trans>Backup file to restore from</trans>
17	</entry>
18	<entry>
19	- <base>RESTORE</base>
20	- <trans>Restore</trans>
21	- </entry>
22	- <entry>
23	<base>VERIFY_BACKUP_DESC</base>
24	<trans>
25	<![CDATA[
26	@@ -273,10 +265,6 @@
27	<trans>Error occured while restoring initial group of 'www'.</trans>
28	</entry>
29	<entry>
30	- <base>ERR_UPDATING_SYSCONF</base>
31	- <trans>Error occurred while updating system configuration.</trans>
32	- </entry>
33	- <entry>
34	<base>RESTORE_FAILED</base>
35	<trans>Restore failed! The backup file was incomplete.</trans>
36	</entry>
37	@@ -619,10 +607,6 @@
38	</trans>
39	</entry>
40	<entry>
41	- <base>WORKSTN_PASSWORD</base>
42	- <trans>Password</trans>
43	- </entry>
44	- <entry>
45	<base>WORKSTATION_BACKUP_DEST</base>
46	<trans>Backup workstation settings</trans>
47	</entry>
48	diff -Nur -x '.orig' -x '.rej' e-smith-backup-1.15.0/root/etc/e-smith/web/functions/backup mezzanine_patched_e-smith-backup-1.15.0/root/etc/e-smith/web/functions/backup
49	--- e-smith-backup-1.15.0/root/etc/e-smith/web/functions/backup 2008-08-04 07:45:33.000000000 -0600
50	+++ mezzanine_patched_e-smith-backup-1.15.0/root/etc/e-smith/web/functions/backup 2008-08-04 07:45:17.000000000 -0600
51	@@ -1326,7 +1326,7 @@
52	print $q->Tr(
53	esmith::cgi::genCell(
54	$q,
55	- $fm->localise('WORKSTN_PASSWORD')
56	+ $fm->localise('PASSWORD')
57	),
58
59	esmith::cgi::genCell ($q, $q->textfield (-name => 'backupwkPassword',
60	@@ -2263,7 +2263,7 @@
61	system("/usr/sbin/usermod", "-g", "$www_gid", "www") == 0
62	or warn ($fm->localise('ERR_RESTORING_INITIAL_GRP')."\n");
63	system("/sbin/e-smith/signal-event", "post-upgrade") == 0
64	- or die ($fm->localise('ERR_UPDATING_SYSCONF')."\n");
65	+ or die ($fm->localise('ERROR_UPDATING_CONFIGURATION')."\n");
66	}
67	else
68	{