e-smith-backup/sme9/e-smith-backup-2.4.0-BackupPanelText.patch

diff -ruN e-smith-backup-2.4.0.old/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/backup e-smith-backup-2.4.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/backup
--- e-smith-backup-2.4.0.old/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/backup     2013-12-12 21:37:57.000000000 -0800
+++ e-smith-backup-2.4.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/backup 2013-12-17 22:38:59.000000000 -0800
@@ -35,36 +35,36 @@
    <base>BACKUP_DESC_DAR</base>
    <trans>
     <![CDATA[
-     <P>The server provides three ways to back up and restore your 
-     server: using your local desktop, a tape drive or a workstation drive.</P>
+     <P>Three ways are provided to back up and restore your 
+     server: using a tape drive, using a network share or a local 
+     removable disk, or using your local desktop.</P>
 
-     <P>The first method creates a copy of your server configuration and user
-     data files, and downloads it to your local desktop via your web browser.
-     Currently your configuration and data files total approximately
-     <b>$tarsize</b>. The backup file will be somewhat less than this,
-     depending on how compressible the data are. This file can be used to restore
-     the server from the console if you copy it to removable storage media 
-     such as a local removable disk.</P>
-
-     <P>The tape backup method uses a software package called <I>$module</I>
+     <P>Tape Backup. This method uses a software package called <I>$module</I>
      to back up your entire hard disk to tape every night. This requires a
      supported tape drive and a tape that is not write-protected. The backup
      is performed automatically at the selected time every night (with a
      reminder automatically e-mailed to the administrator during the day).
      Currently your hard disk contains <b>$dumpsize</b> of data.</P>
 
-     <P>The workstation backup method uses a software package called <I>dar</I>
-     to back up your server configuration and data files to a workstation 
-     on your LAN (or a local removable disk). This requires that you provide a 
-     writable share (cifs or nfs) on the backup workstation or have a local 
-     removable disk such as a USB disk. You can manage how many rotating 
-     sets of backup are kept on the backup share, and also make each 
-     set doing incremental backup upon several days. The backup is performed 
-     automatically at the selected time every day. Currently 
+     <P>Workstation backup. This method uses a software package called <I>dar</I>
+     to back up your server configuration and data files to a network share 
+     or a local removable disk such as a USB disk. 
+     You can manage how many rotating sets of backups are kept,
+     and how many incremental backups to have in each set. 
+     The backup is performed automatically at the selected time every day. Currently 
      configuration and data files total approximately <b>$tarsize</b> uncompressed.
-      Twice the compressed data size must be available on the backup share.</P>
+     Twice the compressed data size must be available on the backup share.</P>
+
+     <P>Backup to Desktop. This method creates a copy of your server 
+     configuration and user data files, and downloads it to your 
+     local desktop via your web browser.
+     Currently your configuration and data files total approximately
+     <b>$tarsize</b>. The backup file will be somewhat less than this,
+     depending on how much the data can be compressed. 
+     This file can be used to restore the server from the console if you 
+     copy it to a local removable disk such as a USB disk.</P>
 
-     <P>All restore methods allow you to restore your configuration and user
+     <P>All backup methods allow you to restore your configuration and user
      data files. Workstation backup provides individual file restore. <b>Ideally, 
      full restore should be performed on a freshly installed server</b>.</P>
      ]]>
1	wellsi	1.1	diff -ruN e-smith-backup-2.4.0.old/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/backup e-smith-backup-2.4.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/backup
2	wellsi	1.2	--- e-smith-backup-2.4.0.old/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/backup 2013-12-12 21:37:57.000000000 -0800
3			+++ e-smith-backup-2.4.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/backup 2013-12-17 22:38:59.000000000 -0800
4			@@ -35,36 +35,36 @@
5	wellsi	1.1	<base>BACKUP_DESC_DAR</base>
6			<trans>
7			<![CDATA[
8			- <P>The server provides three ways to back up and restore your
9			- server: using your local desktop, a tape drive or a workstation drive.</P>
10			+ <P>Three ways are provided to back up and restore your
11			+ server: using a tape drive, using a network share or a local
12			+ removable disk, or using your local desktop.</P>
13
14			- <P>The first method creates a copy of your server configuration and user
15			- data files, and downloads it to your local desktop via your web browser.
16			- Currently your configuration and data files total approximately
17			- <b>$tarsize</b>. The backup file will be somewhat less than this,
18			- depending on how compressible the data are. This file can be used to restore
19			- the server from the console if you copy it to removable storage media
20			- such as a local removable disk.</P>
21			-
22			- <P>The tape backup method uses a software package called <I>$module</I>
23			+ <P>Tape Backup. This method uses a software package called <I>$module</I>
24			to back up your entire hard disk to tape every night. This requires a
25			supported tape drive and a tape that is not write-protected. The backup
26			is performed automatically at the selected time every night (with a
27			reminder automatically e-mailed to the administrator during the day).
28			Currently your hard disk contains <b>$dumpsize</b> of data.</P>
29
30			- <P>The workstation backup method uses a software package called <I>dar</I>
31			- to back up your server configuration and data files to a workstation
32			- on your LAN (or a local removable disk). This requires that you provide a
33			- writable share (cifs or nfs) on the backup workstation or have a local
34			- removable disk such as a USB disk. You can manage how many rotating
35	wellsi	1.2	- sets of backup are kept on the backup share, and also make each
36			- set doing incremental backup upon several days. The backup is performed
37			- automatically at the selected time every day. Currently
38	wellsi	1.1	+ <P>Workstation backup. This method uses a software package called <I>dar</I>
39			+ to back up your server configuration and data files to a network share
40	wellsi	1.2	+ or a local removable disk such as a USB disk.
41			+ You can manage how many rotating sets of backups are kept,
42			+ and how many incremental backups to have in each set.
43			+ The backup is performed automatically at the selected time every day. Currently
44	wellsi	1.1	configuration and data files total approximately <b>$tarsize</b> uncompressed.
45			- Twice the compressed data size must be available on the backup share.</P>
46			+ Twice the compressed data size must be available on the backup share.</P>
47			+
48			+ <P>Backup to Desktop. This method creates a copy of your server
49			+ configuration and user data files, and downloads it to your
50			+ local desktop via your web browser.
51			+ Currently your configuration and data files total approximately
52			+ <b>$tarsize</b>. The backup file will be somewhat less than this,
53	wellsi	1.2	+ depending on how much the data can be compressed.
54			+ This file can be used to restore the server from the console if you
55			+ copy it to a local removable disk such as a USB disk.</P>
56	wellsi	1.1
57	wellsi	1.2	- <P>All restore methods allow you to restore your configuration and user
58			+ <P>All backup methods allow you to restore your configuration and user
59	wellsi	1.1	data files. Workstation backup provides individual file restore. <b>Ideally,
60	wellsi	1.2	full restore should be performed on a freshly installed server</b>.</P>
61			]]>