* Changes in preparation for 3.2.0beta1...

[BackupPC.git] / lib / BackupPC / Lang / en.pm

diff --git a/lib/BackupPC/Lang/en.pm b/lib/BackupPC/Lang/en.pm
index 1b72d71..9f1b3bc 100644 (file)
--- a/lib/BackupPC/Lang/en.pm
+++ b/lib/BackupPC/Lang/en.pm
@@ -1,4 +1,4 @@
-#!/bin/perl
+#!/usr/bin/perl
 
 #my %lang;
 #use strict;
@@ -40,12 +40,16 @@ $Lang{Admin_Options_Page} = <<EOF;
 </ul>
 -->
 EOF
-$Lang{Unable_to_connect_to_BackupPC_server} = "Unable to connect to BackupPC server",
-            "This CGI script (\$MyURL) is unable to connect to the BackupPC"
-          . " server on \$Conf{ServerHost} port \$Conf{ServerPort}.  The error"
-          . " was: \$err.",
-            "Perhaps the BackupPC server is not running or there is a "
-          . " configuration error.  Please report this to your Sys Admin.";
+
+$Lang{Unable_to_connect_to_BackupPC_server} = "Unable to connect to BackupPC server";
+$Lang{Unable_to_connect_to_BackupPC_server_error_message} = <<EOF;
+This CGI script (\$MyURL) is unable to connect to the BackupPC
+server on \$Conf{ServerHost} port \$Conf{ServerPort}.<br>
+The error was: \$err.<br>
+Perhaps the BackupPC server is not running or there is a configuration error.
+Please report this to your Sys Admin.
+EOF
+
 $Lang{Admin_Start_Server} = <<EOF;
 \${h1(qq{$Lang{Unable_to_connect_to_BackupPC_server}})}
 <form action="\$MyURL" method="get">
@@ -154,6 +158,7 @@ There are \$hostCntGood hosts that have been backed up, for a total of:
     <td align="center"> Incr Age (days) </td>
     <td align="center"> Last Backup (days) </td>
     <td align="center"> State </td>
+    <td align="center"> #Xfer errs </td>
     <td align="center"> Last attempt </td></tr>
 \$strGood
 </table>
@@ -173,6 +178,7 @@ There are \$hostCntNone hosts with no backups.
     <td align="center"> Incr Age/days </td>
     <td align="center"> Last Backup (days) </td>
     <td align="center"> State </td>
+    <td align="center"> #Xfer errs </td>
     <td align="center"> Last attempt </td></tr>
 \$strNone
 </table>
@@ -1282,7 +1288,7 @@ $headers
 Dear $userName,
 
 Your PC ($host) has not been successfully backed up for $days days.
-Your PC has been correctly backed up $numBackups times from $firstTime to $days
+Your PC has been correctly backed up $numBackups times from $firstTime to $days days
 ago.  PC backups should occur automatically when your PC is connected
 to the network.
 
@@ -1379,11 +1385,11 @@ $Lang{CfgEdit_Title_User_URLs} = "User URLs";
 $Lang{CfgEdit_Title_User_Config_Editing} = "User Config Editing";
 $Lang{CfgEdit_Title_Xfer} = "Xfer";
 $Lang{CfgEdit_Title_Xfer_Settings} = "Xfer Settings";
+$Lang{CfgEdit_Title_Ftp_Settings} = "FTP Settings";
 $Lang{CfgEdit_Title_Smb_Settings} = "Smb Settings";
 $Lang{CfgEdit_Title_Tar_Settings} = "Tar Settings";
 $Lang{CfgEdit_Title_Rsync_Settings} = "Rsync Settings";
 $Lang{CfgEdit_Title_Rsyncd_Settings} = "Rsyncd Settings";
-$Lang{CfgEdit_Title_BackupPCd_Settings} = "BackupPCd Settings";
 $Lang{CfgEdit_Title_Archive_Settings} = "Archive Settings";
 $Lang{CfgEdit_Title_Include_Exclude} = "Include/Exclude";
 $Lang{CfgEdit_Title_Smb_Paths_Commands} = "Smb Paths/Commands";