e-smith-backup/sme8/e-smith-backup-1.14.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-04-27 10:28:40.000000000 +0200
+++ mezzanine_patched_e-smith-backup-1.15.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/backup      2008-04-27 10:26:13.000000000 +0200
@@ -154,10 +154,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>
@@ -204,10 +200,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[
--- e-smith-backup-1.15.0/root/etc/e-smith/web/functions/backup.add2general2    2008-07-07 19:31:53.000000000 +0200
+++ e-smith-backup-1.15.0/root/etc/e-smith/web/functions/backup 2008-07-07 19:34:51.000000000 +0200
@@ -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
            {
--- e-smith-backup-1.15.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/backup.add2general2   2008-07-07 19:31:53.000000000 +0200
+++ e-smith-backup-1.15.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/backup        2008-07-07 19:33:20.000000000 +0200
@@ -261,10 +261,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>
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-04-27 10:28:40.000000000 +0200
3	+++ mezzanine_patched_e-smith-backup-1.15.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/backup 2008-04-27 10:26:13.000000000 +0200
4	@@ -154,10 +154,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	@@ -204,10 +200,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	--- e-smith-backup-1.15.0/root/etc/e-smith/web/functions/backup.add2general2 2008-07-07 19:31:53.000000000 +0200
27	+++ e-smith-backup-1.15.0/root/etc/e-smith/web/functions/backup 2008-07-07 19:34:51.000000000 +0200
28	@@ -2263,7 +2263,7 @@
29	system("/usr/sbin/usermod", "-g", "$www_gid", "www") == 0
30	or warn ($fm->localise('ERR_RESTORING_INITIAL_GRP')."\n");
31	system("/sbin/e-smith/signal-event", "post-upgrade") == 0
32	- or die ($fm->localise('ERR_UPDATING_SYSCONF')."\n");
33	+ or die ($fm->localise('ERROR_UPDATING_CONFIGURATION')."\n");
34	}
35	else
36	{
37	--- e-smith-backup-1.15.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/backup.add2general2 2008-07-07 19:31:53.000000000 +0200
38	+++ e-smith-backup-1.15.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/backup 2008-07-07 19:33:20.000000000 +0200
39	@@ -261,10 +261,6 @@
40	<trans>Error occured while restoring initial group of 'www'.</trans>
41	</entry>
42	<entry>
43	- <base>ERR_UPDATING_SYSCONF</base>
44	- <trans>Error occurred while updating system configuration.</trans>
45	- </entry>
46	- <entry>
47	<base>RESTORE_FAILED</base>
48	<trans>Restore failed! The backup file was incomplete.</trans>
49	</entry>