X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=lib%2FBackupPC%2FLang%2Fen.pm;h=ba408853bc3661a14e7fdc792a5cfc93cbf8653b;hb=f41207123efc0156687d3f7994cd245a70d7de62;hp=44a07378e47c8a548ac6207ac09d8cb34aefcfc5;hpb=4cdaa6b8a9f5161ee2da4371d68cbbad41248ea0;p=BackupPC.git

diff --git a/lib/BackupPC/Lang/en.pm b/lib/BackupPC/Lang/en.pm
index 44a0737..ba40885 100644
--- a/lib/BackupPC/Lang/en.pm
+++ b/lib/BackupPC/Lang/en.pm
@@ -125,7 +125,12 @@ $Lang{BackupPC_Summary} = <<EOF;
 
 \${h1(qq{$Lang{BackupPC__Server_Summary}})}
 <p>
-This status was generated at \$now.
+<ul>
+<li>This status was generated at \$now.
+<li>Pool file system was recently at \$Info{DUlastValue}%
+    (\$DUlastTime), today\'s max is \$Info{DUDailyMax}% (\$DUmaxTime)
+        and yesterday\'s max was \$Info{DUDailyMaxPrev}%.
+</ul>
 </p>
 
 \${h2("Hosts with good Backups")}
@@ -138,15 +143,16 @@ There are \$hostCntGood hosts that have been backed up, for a total of:
      (prior to pooling and compression).
 </ul>
 </p>
-<table class="tableStnd" border cellpadding="3" cellspacing="1">
+<table class="sortable" id="host_summary_backups" border cellpadding="3" cellspacing="1">
 <tr class="tableheader"><td> Host </td>
     <td align="center"> User </td>
     <td align="center"> #Full </td>
-    <td align="center"> Full Age/days </td>
-    <td align="center"> Full Size/GB </td>
-    <td align="center"> Speed MB/sec </td>
+    <td align="center"> Full Age (days) </td>
+    <td align="center"> Full Size (GB) </td>
+    <td align="center"> Speed (MB/s) </td>
     <td align="center"> #Incr </td>
-    <td align="center"> Incr Age/days </td>
+    <td align="center"> Incr Age (days) </td>
+    <td align="center"> Last Backup (days) </td>
     <td align="center"> State </td>
     <td align="center"> Last attempt </td></tr>
 \$strGood
@@ -156,17 +162,18 @@ There are \$hostCntGood hosts that have been backed up, for a total of:
 <p>
 There are \$hostCntNone hosts with no backups.
 <p>
-<table class="tableStnd" border cellpadding="3" cellspacing="1">
+<table class="sortable" id="host_summary_nobackups" border cellpadding="3" cellspacing="1">
 <tr class="tableheader"><td> Host </td>
     <td align="center"> User </td>
     <td align="center"> #Full </td>
-    <td align="center"> Full Age/days </td>
-    <td align="center"> Full Size/GB </td>
-    <td align="center"> Speed MB/sec </td>
+    <td align="center"> Full Age (days) </td>
+    <td align="center"> Full Size (GB) </td>
+    <td align="center"> Speed (MB/s) </td>
     <td align="center"> #Incr </td>
     <td align="center"> Incr Age/days </td>
-    <td align="center"> Current State </td>
-    <td align="center"> Last backup attempt </td></tr>
+    <td align="center"> Last Backup (days) </td>
+    <td align="center"> State </td>
+    <td align="center"> Last attempt </td></tr>
 \$strNone
 </table>
 EOF
@@ -460,7 +467,7 @@ selected will be overwritten!
 <input type="hidden" name="type" value="3">
 \$hiddenStr
 <input type="hidden" value="\$In{action}" name="action">
-<table border="0">
+<table class="tableStnd" border="0">
 <tr>
     <td>Restore the files to host</td>
     <td><!--<input type="text" size="40" value="\${EscHTML(\$host)}"
@@ -576,8 +583,8 @@ You are about to start a restore directly to the machine \$In{hostDest}.
 The following files will be restored to share \$In{shareDest}, from
 backup number \$num:
 <p>
-<table border>
-<tr><td>Original file/dir</td><td>Will be restored to</td></tr>
+<table class="tableStnd" border>
+<tr class="tableheader"><td>Original file/dir</td><td>Will be restored to</td></tr>
 \$fileListStr
 </table>
 
@@ -822,14 +829,14 @@ $Lang{Backup_browse_for__host} = <<EOF;
 <input type="hidden" name="action" value="Restore">
 <br>
 <table width="100%">
-<tr><td valign="top">
-    <br><table align="center" border="0" cellpadding="0" cellspacing="0" bgcolor="#ffffff">
+<tr><td valign="top" width="30%">
+    <table align="left" border="0" cellpadding="0" cellspacing="0" bgcolor="#ffffff">
     \$dirStr
     </table>
 </td><td width="3%">
 </td><td valign="top">
     <br>
-        <table border="0" width="100%" align="left" cellpadding="3" cellspacing="1">
+        <table border width="100%" align="left" cellpadding="3" cellspacing="1">
         \$fileHeader
         \$topCheckAll
         \$fileStr
@@ -876,7 +883,7 @@ the backups:
 \${h2("History of \${EscHTML(\$dirDisplay)}")}
 
 <br>
-<table cellspacing="2" cellpadding="3">
+<table border cellspacing="2" cellpadding="3">
 <tr class="fviewheader"><td>Backup number</td>\$backupNumStr</tr>
 <tr class="fviewheader"><td>Backup time</td>\$backupTimeStr</tr>
 \$fileStr
@@ -1218,10 +1225,10 @@ $Lang{Status_restore_in_progress} = "restore in progress";
 $Lang{Status_link_pending} = "link pending";
 $Lang{Status_link_running} = "link running";
 
-$Lang{Reason_backup_done}    = "backup done";
+$Lang{Reason_backup_done}    = "done";
 $Lang{Reason_restore_done}   = "restore done";
 $Lang{Reason_archive_done}   = "archive done";
-$Lang{Reason_nothing_to_do}  = "nothing to do";
+$Lang{Reason_nothing_to_do}  = "idle";
 $Lang{Reason_backup_failed}  = "backup failed";
 $Lang{Reason_restore_failed} = "restore failed";
 $Lang{Reason_archive_failed} = "archive failed";
@@ -1229,6 +1236,9 @@ $Lang{Reason_no_ping}        = "no ping";
 $Lang{Reason_backup_canceled_by_user}  = "backup canceled by user";
 $Lang{Reason_restore_canceled_by_user} = "restore canceled by user";
 $Lang{Reason_archive_canceled_by_user} = "archive canceled by user";
+$Lang{Disabled_OnlyManualBackups}  = "auto disabled";  
+$Lang{Disabled_AllBackupsDisabled} = "disabled";                  
+
 
 # ---------
 # Email messages
@@ -1413,6 +1423,7 @@ $Lang{CfgEdit_Header_Host} = <<EOF;
 \${h1("Host \$host Configuration Editor")}
 <p>
 Note: Check Override if you want to modify a value specific to this host.
+<p>
 EOF
 
 $Lang{CfgEdit_Button_Save}     = "Save";
@@ -1422,6 +1433,8 @@ $Lang{CfgEdit_Button_Add}      = "Add";
 $Lang{CfgEdit_Button_Override} = "Override";
 $Lang{CfgEdit_Button_New_Key}  = "New Key";
 
+$Lang{CfgEdit_Error_No_Save}
+            = "Error: No save due to errors";
 $Lang{CfgEdit_Error__must_be_an_integer}
             = "Error: \$var must be an integer";
 $Lang{CfgEdit_Error__must_be_real_valued_number}