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 @@ Select an action - PERFORM - Perform - - X_BACKUP_OR_RESTORE X Backup or restore server data @@ -208,10 +204,6 @@ Backup file to restore from - RESTORE - Restore - - VERIFY_BACKUP_DESC Error occured while restoring initial group of 'www'. - ERR_UPDATING_SYSCONF - Error occurred while updating system configuration. - - RESTORE_FAILED Restore failed! The backup file was incomplete. @@ -619,10 +607,6 @@ - WORKSTN_PASSWORD - Password - - WORKSTATION_BACKUP_DEST Backup workstation settings 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 {