From 16755c17628b28a58d75663d7541036344826961 Mon Sep 17 00:00:00 2001
From: cbarratt <cbarratt>
Date: Fri, 6 Jul 2007 06:43:44 +0000
Subject: [PATCH] * Added Simplified Chinese CGI translation from Youlin Feng.

* Added -l and -L options to BackupPC_tarCreate so that
  provide a file list (without creating the archive).
  Requested by Dirk.

* Fixed single-restore file name charsets for IE, reported by
  Francis Lessard.

* Fixed makeDist so that the --config-dir option to configure.pl
  works correctly.  Reported by Randy Barlow, Tony Shadwick and others.

* Applied patch from Holger Parplies that fixes cleanup of early abort
  in BackupPC_dump.

* Changed BackupPC_sendEmail so that summary admin email doesn't
  include errors from hosts that have $Conf{BackupsDisable} set.
  Reported by James Kyle.  Also, per-user email is now disabled
  when $Conf{BackupsDisable} is set.

* $Conf{IncrLevels} is now defaulted if it is not defined.
---
 ChangeLog                        |   22 +
 bin/BackupPC                     |    3 +-
 bin/BackupPC_archiveStart        |  120 +++
 bin/BackupPC_dump                |    5 +-
 bin/BackupPC_sendEmail           |  181 ++--
 bin/BackupPC_tarCreate           |   74 +-
 conf/config.pl                   |    4 +-
 lib/BackupPC/Attrib.pm           |    5 +
 lib/BackupPC/CGI/RestoreFile.pm  |   16 +-
 lib/BackupPC/Config/Meta.pm      |    2 +-
 lib/BackupPC/Lang/zh_CN.pm       | 1437 ++++++++++++++++++++++++++++++
 lib/BackupPC/Lib.pm              |   22 +-
 lib/BackupPC/Storage.pm          |    2 +-
 lib/BackupPC/Storage/Text.pm     |   19 +
 lib/BackupPC/View.pm             |    8 +-
 lib/BackupPC/Xfer/RsyncFileIO.pm |   41 +-
 makeDist                         |    2 +
 17 files changed, 1828 insertions(+), 135 deletions(-)
 create mode 100755 bin/BackupPC_archiveStart
 create mode 100644 lib/BackupPC/Lang/zh_CN.pm
diff --git a/ChangeLog b/ChangeLog
index ffcc7ca..f184c6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,15 +34,37 @@
 * Added sorting by column feature to host summary table in CGI
   interface.  Implemented by Jeremy Tietsort.
 
+* Added Simplified Chinese CGI translation from Youlin Feng.
+
 * Added FreeBSD init.d file provided by Gabriel Rossetti.
 
+* Added -l and -L options to BackupPC_tarCreate so that
+  provide a file list (without creating the archive).
+  Requested by Dirk.
+
+* Fixed single-restore file name charsets for IE, reported by
+  Francis Lessard.
+
+* Fixed makeDist so that the --config-dir option to configure.pl
+  works correctly.  Reported by Randy Barlow, Tony Shadwick and others.
+
+* Applied patch from Holger Parplies that fixes cleanup of early abort
+  in BackupPC_dump.
+
 * Applied small patch from Sergey to lib/BackupPC/Xfer/Tar.pm that makes
   it ignore "socket ignored" error on incrementals.
 
 * Applied small patch from Sergey to bin/BackupPC_archiveHost.
 
+* Changed BackupPC_sendEmail so that summary admin email doesn't
+  include errors from hosts that have $Conf{BackupsDisable} set.
+  Reported by James Kyle.  Also, per-user email is now disabled
+  when $Conf{BackupsDisable} is set.
+
 * Added RsyncdUserName to the config editor.  Reported by Vicent Roca Daniel.
 
+* $Conf{IncrLevels} is now defaulted if it is not defined.
+
 * configure.pl clears $Conf{ParPath} if it doesn't point to a valid
   executable.
 
diff --git a/bin/BackupPC b/bin/BackupPC
index c4520b1..2053aa5 100755
--- a/bin/BackupPC
+++ b/bin/BackupPC
@@ -59,6 +59,7 @@ use vars qw(%Status %Info $Hosts);
 use lib "/usr/local/BackupPC/lib";
 use BackupPC::Lib;
 use BackupPC::FileZIO;
+use Encode;
 
 use File::Path;
 use Data::Dumper;
@@ -1266,7 +1267,7 @@ sub Main_Check_Client_Messages
                 last;
             }
             $Clients{$client}{mesgCnt}++;
-            $cmd = $2;
+            $cmd = decode_utf8($2);
             if ( $cmd =~ /^stop (\S+)\s+(\S+)\s+(\S*)/ ) {
                 $host = $1;
                 my $user = $2;
diff --git a/bin/BackupPC_archiveStart b/bin/BackupPC_archiveStart
new file mode 100755
index 0000000..54ec76a
--- /dev/null
+++ b/bin/BackupPC_archiveStart
@@ -0,0 +1,120 @@
+#!/bin/perl
+#============================================================= -*-perl-*-
+#
+# BackupPC_archiveStart: start an archive request from the
+# command line.
+#
+# DESCRIPTION
+#  
+#   Usage: BackupPC_archiveStart archiveHost userName hosts...
+#
+#   Initiates an archive request on archive host archiveHost
+#   for the listed hosts.  The latest backup for each host is
+#   archived.  The userName is name of the requesting user,
+#   which appears in the log files.
+#
+# AUTHOR
+#   Craig Barratt  <cbarratt@users.sourceforge.net>
+#
+# COPYRIGHT
+#   Copyright (C) 2007  Craig Barratt
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+#========================================================================
+#
+# Version 3.0.0, released 28 Jan 2007.
+#
+# See http://backuppc.sourceforge.net.
+#
+#========================================================================
+
+use strict;
+no  utf8;
+use lib "/usr/local/BackupPC/lib";
+use Getopt::Std;
+use BackupPC::Lib;
+
+die("BackupPC::Lib->new failed\n") if ( !(my $bpc = BackupPC::Lib->new) );
+
+my %opts;
+
+# no options currently
+if ( !getopts("", \%opts) || @ARGV < 3 ) {
+    print STDERR <<EOF;
+usage: $0 archiveHost userName hosts...
+EOF
+    exit(1);
+}
+
+my $Hosts       = $bpc->HostInfoRead();
+my $ArchiveHost = $ARGV[0];
+my $UserName    = $ARGV[1];
+my $TopDir      = $bpc->{Conf}{TopDir};
+
+if ( !defined($Hosts->{$ArchiveHost}) ) {
+    print(STDERR "$0: archive host $ArchiveHost doesn't exist... quitting\n");
+    exit(1);
+}
+$bpc->ConfigRead($ArchiveHost);
+
+my(@HostList, @BackupList);
+for ( my $i = 2 ; $i < @ARGV ; $i++ ) {
+    my $host = $ARGV[$i];
+    if ( !defined($Hosts->{$host}) ) {
+        print(STDERR "$0: host $host doesn't exist... quitting\n");
+        exit(1);
+    }
+    my @backups = $bpc->BackupInfoRead($host);
+    if ( !@backups ) {
+        print(STDERR "$0: host $host doesn't have any backups... quitting\n");
+        exit(1);
+    }
+    push(@HostList, $host);
+    push(@BackupList, $backups[$#backups]{num});
+}
+
+my $ReqFileName;
+for ( my $i = 0 ; ; $i++ ) {
+    $ReqFileName="archiveReq.$$.$i";
+    last if ( !-f "$TopDir/pc/$ArchiveHost/$ReqFileName" );
+}
+my %ArchiveReq = (
+    archiveloc  => $bpc->{Conf}{ArchiveDest},
+    archtype    => 0,
+    compression => $bpc->{Conf}{CatPath},
+    compext     => '.raw',
+    parfile     => $bpc->{Conf}{ArchivePar},
+    splitsize   => '0000000',
+    host        => $ArchiveHost,
+    HostList    => \@HostList,
+    BackupList  => \@BackupList,
+    user        => $UserName,
+    reqTime     => time,
+);
+my $archive = Data::Dumper->new([\%ArchiveReq], [qw(*ArchiveReq)]);
+$archive->Indent(1);
+if ( !open(REQ, ">", "$TopDir/pc/$ArchiveHost/$ReqFileName") ) {
+    print(STDERR "$0: can't open/write request file $TopDir/pc/$ArchiveHost/$ReqFileName... quitting\n");
+    exit(1);
+}
+binmode(REQ);
+print REQ $archive->Dump;
+close(REQ);
+$bpc->ServerConnect($bpc->{Conf}{ServerHost}, $bpc->{Conf}{ServerPort});
+my $reply = $bpc->ServerMesg("archive $UserName $ArchiveHost $ReqFileName");
+$bpc->ServerDisconnect();
+print("Sent archive request, reply: $reply\n");
+exit(0);
diff --git a/bin/BackupPC_dump b/bin/BackupPC_dump
index 28f3ef7..d0925f0 100755
--- a/bin/BackupPC_dump
+++ b/bin/BackupPC_dump
@@ -1012,9 +1012,9 @@ sub catch_signal
 		    "Aborting backup up after signal $sigName\n");
 
 	    #
-	    # Tell xfer to abort
+	    # Tell xfer to abort, but only if we actually started one
 	    #
-	    $xfer->abort($reason);
+	    $xfer->abort($reason) if ( defined($xfer) );
 
 	    #
 	    # Send ALRMs to BackupPC_tarExtract if we are using it
@@ -1417,6 +1417,7 @@ sub BackupSave
     $Backups[$i]{mangle}        = 1;     # name mangling always on for v1.04+
     $Backups[$i]{xferMethod}    = $Conf{XferMethod};
     $Backups[$i]{charset}       = $Conf{ClientCharset};
+    $Backups[$i]{version}       = $bpc->Version();
     #
     # Save the main backups file
     #
diff --git a/bin/BackupPC_sendEmail b/bin/BackupPC_sendEmail
index 802b8f0..d826893 100755
--- a/bin/BackupPC_sendEmail
+++ b/bin/BackupPC_sendEmail
@@ -120,99 +120,37 @@ EOF
     exit(0);
 }
 
-###########################################################################
-# Generate sysadmin warning messages
-###########################################################################
-my $mesg = "";
-
-my @badHosts = ();
-foreach my $host ( sort(keys(%Status)) ) {
-    next if ( ($Status{$host}{reason} ne "Reason_backup_failed"
-               && $Status{$host}{reason} ne "Reason_restore_failed")
-           || $Status{$host}{error} =~ /^lost network connection to host/ );
-    push(@badHosts, "$host ($Status{$host}{error})");
-}
-if ( @badHosts ) {
-    my $badHosts = join("\n  - ", sort(@badHosts));
-    $mesg .= <<EOF;
-The following hosts had an error that is probably caused by a
-misconfiguration.  Please fix these hosts:
-  - $badHosts
-
-EOF
-}
-
-#
-# Report if we skipped backups because the disk was too full
-#
-if ( $Info{DUDailySkipHostCntPrev} > 0 ) {
-    my $n = $Info{DUDailySkipHostCntPrev};
-    my $m = $Conf{DfMaxUsagePct};
-    $mesg .= <<EOF;
-Yesterday $n hosts were skipped because the file system containing
-$TopDir was too full.  The threshold in the
-configuration file is $m%, while yesterday the file system was
-up to $Info{DUDailyMaxPrev}% full.  Please find more space on the file system,
-or reduce the number of full or incremental backups that we keep.
-
-EOF
-}
-
-#
-# Check for bogus directories (probably PCs that are no longer
-# on the backup list)
-#
-my $d = DirHandle->new("$TopDir/pc") or die("Can't read $TopDir/pc: $!");
-my @oldDirs = ();
-my @files = $d->read;
-$d->close;
-foreach my $host ( @files ) {
-    next if ( $host =~ /^\./ || defined($Status{$host}) );
-    push(@oldDirs, "$TopDir/pc/$host");
-}
-if ( @oldDirs ) {
-    my $oldDirs = join("\n  - ", sort(@oldDirs));
-    $mesg .= <<EOF;
-The following directories are bogus and are not being used by
-BackupPC.  This typically happens when PCs are removed from the
-backup list.  If you don't need any old backups from these PCs you
-should remove these directories.  If there are machines on this
-list that should be backed up then there is a problem with the
-hosts file:
-  - $oldDirs
-
-EOF
-}
-
-if ( $mesg ne "" && $Conf{EMailAdminUserName} ne "" ) {
-    my $headers = $Conf{EMailHeaders};
-    $headers .= "\n" if ( $headers !~ /\n$/ );
-    $mesg = <<EOF;
-To: $Conf{EMailAdminUserName}
-Subject: BackupPC administrative attention needed
-$headers
-${mesg}Regards,
-PC Backup Genie
-EOF
-    SendMail($mesg);
-}
-
 ###########################################################################
 # Generate per-host warning messages sent to each user
 ###########################################################################
 my $Hosts = $bpc->HostInfoRead();
+my @AdminBadHosts = ();
 
 foreach my $host ( sort(keys(%Status)) ) {
-    next if ( $Hosts->{$host}{user} eq "" );
     #
     # read any per-PC config settings (allowing per-PC email settings)
     #
     $bpc->ConfigRead($host);
     %Conf = $bpc->Conf();
     my $user = $Hosts->{$host}{user};
+
+    #
+    # Accumulate host errors for the admin email below
+    #
+    if ( ($Status{$host}{reason} eq "Reason_backup_failed"
+               || $Status{$host}{reason} eq "Reason_restore_failed")
+           && $Status{$host}{error} !~ /^lost network connection to host/
+           && !$Conf{BackupsDisable}
+       ) {
+        push(@AdminBadHosts, "$host ($Status{$host}{error})");
+    }
+
     next if ( time - $UserEmailInfo{$user}{lastTime}
-                        < $Conf{EMailNotifyMinDays} * 24*3600 );
-    next if ($Conf{XferMethod} eq "archive" );
+                        < $Conf{EMailNotifyMinDays} * 24*3600
+              || $Conf{XferMethod} eq "archive"
+              || $Conf{BackupsDisable}
+              || $Hosts->{$host}{user} eq ""
+          );
     my @Backups = $bpc->BackupInfoRead($host);
     my $numBackups = @Backups;
     if ( $numBackups == 0 ) {
@@ -326,6 +264,80 @@ foreach my $host ( sort(keys(%Status)) ) {
                         }) if ( !defined($Jobs{$host}) );
     }
 }
+
+###########################################################################
+# Generate sysadmin warning message
+###########################################################################
+my $adminMesg = "";
+
+if ( @AdminBadHosts ) {
+    my $badHosts = join("\n  - ", sort(@AdminBadHosts));
+    $adminMesg .= <<EOF;
+The following hosts had an error that is probably caused by a
+misconfiguration.  Please fix these hosts:
+  - $badHosts
+
+EOF
+}
+
+#
+# Report if we skipped backups because the disk was too full
+#
+if ( $Info{DUDailySkipHostCntPrev} > 0 ) {
+    my $n = $Info{DUDailySkipHostCntPrev};
+    my $m = $Conf{DfMaxUsagePct};
+    $adminMesg .= <<EOF;
+Yesterday $n hosts were skipped because the file system containing
+$TopDir was too full.  The threshold in the
+configuration file is $m%, while yesterday the file system was
+up to $Info{DUDailyMaxPrev}% full.  Please find more space on the file system,
+or reduce the number of full or incremental backups that we keep.
+
+EOF
+}
+
+#
+# Check for bogus directories (probably PCs that are no longer
+# on the backup list)
+#
+my $d = DirHandle->new("$TopDir/pc") or die("Can't read $TopDir/pc: $!");
+my @oldDirs = ();
+my @files = $d->read;
+$d->close;
+foreach my $host ( @files ) {
+    next if ( $host =~ /^\./ || defined($Status{$host}) );
+    push(@oldDirs, "$TopDir/pc/$host");
+}
+if ( @oldDirs ) {
+    my $oldDirs = join("\n  - ", sort(@oldDirs));
+    $adminMesg .= <<EOF;
+The following directories are bogus and are not being used by
+BackupPC.  This typically happens when PCs are removed from the
+backup list.  If you don't need any old backups from these PCs you
+should remove these directories.  If there are machines on this
+list that should be backed up then there is a problem with the
+hosts file:
+  - $oldDirs
+
+EOF
+}
+
+if ( $adminMesg ne "" && $Conf{EMailAdminUserName} ne "" ) {
+    my $headers = $Conf{EMailHeaders};
+    $headers .= "\n" if ( $headers !~ /\n$/ );
+    $adminMesg = <<EOF;
+To: $Conf{EMailAdminUserName}
+Subject: BackupPC administrative attention needed
+$headers
+${adminMesg}Regards,
+PC Backup Genie
+EOF
+    SendMail($adminMesg);
+}
+
+###########################################################################
+# Save email state and exit
+###########################################################################
 if ( !$opts{t} ) {
     $Data::Dumper::Indent = 1;
     my $dumpStr = Data::Dumper->Dump(
@@ -337,6 +349,7 @@ if ( !$opts{t} ) {
         close(HOST);
     }
 }
+exit(0);
 
 sub user2name
 {
@@ -386,7 +399,13 @@ sub SendMail
     	printf("Can't run sendmail ($Conf{SendmailPath}): $!\n");
 	return;
     }
-    binmode(MAIL, ":utf8") if ( $utf8 );
+    if ( $utf8 ) {
+	binmode(MAIL, ":utf8");
+	if ($mesg =~ /^Subject: (.*)$/m) {
+		my $new_subj = encode('MIME-Header', $1);
+		$mesg =~ s/^Subject: .*$/Subject: $new_subj/m;
+	}
+    }
     print MAIL $mesg;
     close(MAIL);
 }
diff --git a/bin/BackupPC_tarCreate b/bin/BackupPC_tarCreate
index 500bd8b..5548672 100755
--- a/bin/BackupPC_tarCreate
+++ b/bin/BackupPC_tarCreate
@@ -25,6 +25,8 @@
 #       -w writeBufSz   write buffer size (default 1MB)
 #       -e charset      charset for encoding file names (default: value of
 #                       $Conf{ClientCharset} when backup was done)
+#       -l              just print a file listing; don't generate an archive
+#       -L              just print a detailed file listing; don't generate an archive
 #
 #     The -h, -n and -s options specify which dump is used to generate
 #     the tar archive.  The -r and -p options can be used to relocate
@@ -74,7 +76,7 @@ die("BackupPC::Lib->new failed\n") if ( !(my $bpc = BackupPC::Lib->new) );
 
 my %opts;
 
-if ( !getopts("te:h:n:p:r:s:b:w:", \%opts) || @ARGV < 1 ) {
+if ( !getopts("Llte:h:n:p:r:s:b:w:", \%opts) || @ARGV < 1 ) {
     print STDERR <<EOF;
 usage: $0 [options] files/directories...
   Required options:
@@ -375,6 +377,28 @@ sub TarWriteFileInfo
         from_to($hdr->{linkname}, "utf8", $Charset);
     }
 
+    if ( $opts{l} ) {
+        print($hdr->{name} . "\n");
+        return;
+    } elsif ( $opts{L} ) {
+        my $owner = "$hdr->{uid}/$hdr->{gid}";
+
+        my $name = $hdr->{name};
+
+        if ( $hdr->{type} == BPC_FTYPE_SYMLINK
+                || $hdr->{type} == BPC_FTYPE_HARDLINK ) {
+            $name .= " -> $hdr->{linkname}";
+        }
+        $name =~ s/\n/\\n/g;
+
+        printf("%6o %9s %11.0f %s\n",
+                                    $hdr->{mode},
+                                    $owner,
+                                    $hdr->{size},
+                                    $name);
+        return;
+    }
+
     #
     # Handle long link names (symbolic links)
     #
@@ -432,6 +456,7 @@ sub TarWriteFile
         TarWriteFileInfo($fh, $hdr);
 	$DirCnt++;
     } elsif ( $hdr->{type} == BPC_FTYPE_FILE ) {
+        my($data, $size);
         #
         # Regular file: write the header and file
         #
@@ -442,31 +467,34 @@ sub TarWriteFile
 	    return;
         }
         TarWriteFileInfo($fh, $hdr);
-        my($data, $size);
-        while ( $f->read(\$data, $BufSize) > 0 ) {
-            if ( $size + length($data) > $hdr->{size} ) {
-                print(STDERR "Error: truncating $hdr->{fullPath} to"
-                           . " $hdr->{size} bytes\n");
-                $data = substr($data, 0, $hdr->{size} - $size);
-                $ErrorCnt++;
-            }
-            TarWrite($fh, \$data);
-            $size += length($data);
-        }
-        $f->close;
-        if ( $size != $hdr->{size} ) {
-            print(STDERR "Error: padding $hdr->{fullPath} to $hdr->{size}"
-                       . " bytes from $size bytes\n");
-            $ErrorCnt++;
-            while ( $size < $hdr->{size} ) {
-                my $len = $hdr->{size} - $size;
-                $len = $BufSize if ( $len > $BufSize );
-                $data = "\0" x $len;
+        if ( $opts{l} || $opts{L} ) {
+            $size = $hdr->{size};
+        } else {
+            while ( $f->read(\$data, $BufSize) > 0 ) {
+                if ( $size + length($data) > $hdr->{size} ) {
+                    print(STDERR "Error: truncating $hdr->{fullPath} to"
+                               . " $hdr->{size} bytes\n");
+                    $data = substr($data, 0, $hdr->{size} - $size);
+                    $ErrorCnt++;
+                }
                 TarWrite($fh, \$data);
-                $size += $len;
+                $size += length($data);
+            }
+            $f->close;
+            if ( $size != $hdr->{size} ) {
+                print(STDERR "Error: padding $hdr->{fullPath} to $hdr->{size}"
+                           . " bytes from $size bytes\n");
+                $ErrorCnt++;
+                while ( $size < $hdr->{size} ) {
+                    my $len = $hdr->{size} - $size;
+                    $len = $BufSize if ( $len > $BufSize );
+                    $data = "\0" x $len;
+                    TarWrite($fh, \$data);
+                    $size += $len;
+                }
             }
+            TarWritePad($fh, $size);
         }
-        TarWritePad($fh, $size);
 	$FileCnt++;
 	$ByteCnt += $size;
     } elsif ( $hdr->{type} == BPC_FTYPE_HARDLINK ) {
diff --git a/conf/config.pl b/conf/config.pl
index eac455e..fd78dfc 100644
--- a/conf/config.pl
+++ b/conf/config.pl
@@ -1862,8 +1862,8 @@ $Conf{CgiURL} = undef;
 #   
 # Language to use.  See lib/BackupPC/Lang for the list of supported
 # languages, which include English (en), French (fr), Spanish (es),
-# German (de), Italian (it), Dutch (nl) and Portuguese Brazillian
-# (pt_br).
+# German (de), Italian (it), Dutch (nl), Portuguese Brazillian
+# (pt_br) and Chinese (zh_CH).
 #
 # Currently the Language setting applies to the CGI interface and email
 # messages sent to users.  Log files and other text are still in English.
diff --git a/lib/BackupPC/Attrib.pm b/lib/BackupPC/Attrib.pm
index 4618c69..2a76244 100644
--- a/lib/BackupPC/Attrib.pm
+++ b/lib/BackupPC/Attrib.pm
@@ -43,6 +43,7 @@ use strict;
 use Carp;
 use File::Path;
 use BackupPC::FileZIO;
+use Encode;
 require Exporter;
 
 use vars qw( @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS );
@@ -198,6 +199,8 @@ sub read
     my($data);
 
     $file = $a->fileName($dir, $file);
+    from_to($file, "utf8", $a->{charsetLegacy})
+                    if ( $a->{charsetLegacy} ne "" );
     my $fd = BackupPC::FileZIO->open($file, 0, $a->{compress});
     if ( !$fd ) {
 	$a->{_errStr} = "Can't open $file";
@@ -240,6 +243,8 @@ sub read
 	    }
 	}
 	(my $fileName, $data) = unpack("a$len a*", $data);
+        from_to($fileName, $a->{charsetLegacy}, "utf8")
+                        if ( $a->{charsetLegacy} ne "" );
 	my $nFldsW = @FldsUnixW;
 	my $nFldsN = @FldsUnixN;
 	if ( length($data) < 5 * $nFldsW + 4 * $nFldsN ) {
diff --git a/lib/BackupPC/CGI/RestoreFile.pm b/lib/BackupPC/CGI/RestoreFile.pm
index e5b316a..2a726d2 100644
--- a/lib/BackupPC/CGI/RestoreFile.pm
+++ b/lib/BackupPC/CGI/RestoreFile.pm
@@ -37,12 +37,11 @@
 package BackupPC::CGI::RestoreFile;
 
 use strict;
-use Encode;
 use BackupPC::CGI::Lib qw(:all);
 use BackupPC::FileZIO;
 use BackupPC::Attrib qw(:all);
 use BackupPC::View;
-
+use Encode qw/from_to/;
 
 sub action
 {
@@ -144,6 +143,8 @@ sub restoreFile
     if ( !$Privileged ) {
         ErrorExit(eval("qq{$Lang->{Only_privileged_users_can_restore_backup_files2}}"));
     }
+    $bpc->ConfigRead($host);
+    %Conf = $bpc->Conf();
     ServerConnect();
     ErrorExit($Lang->{Empty_host_name}) if ( $host eq "" );
 
@@ -177,8 +178,19 @@ sub restoreFile
 				    || "application/octet-stream";
     my $fileName = $1 if ( $dir =~ /.*\/(.*)/ );
     $fileName =~ s/"/\\"/g;
+
     print "Content-Type: $contentType\n";
     print "Content-Transfer-Encoding: binary\n";
+
+    if ( $ENV{HTTP_USER_AGENT} =~ /\bmsie\b/i ) {
+        #
+        # Convert to cp1252 for MS IE.  TODO: find a way to get IE
+        # to accept UTF8 encoding.  Firefox accepts inline encoding
+        # using the "=?UTF-8?B?base64?=" format, but IE doesn't.
+        #
+        from_to($fileName, "utf8", "cp1252")
+                        if ( $Conf{ClientCharset} ne "" );
+    }
     print "Content-Disposition: attachment; filename=\"$fileName\"\n\n";
     while ( $f->read(\$data, 1024 * 1024) > 0 ) {
         print STDOUT $data;
diff --git a/lib/BackupPC/Config/Meta.pm b/lib/BackupPC/Config/Meta.pm
index 1ad7d85..f21df2d 100644
--- a/lib/BackupPC/Config/Meta.pm
+++ b/lib/BackupPC/Config/Meta.pm
@@ -312,7 +312,7 @@ use vars qw(%ConfigMeta);
     CgiURL	 	=> "string",
     Language	 	=> {
 	    type   => "select",
-	    values => [qw(de en es fr it nl pt_br)],
+	    values => [qw(de en es fr it nl pt_br zh_CN)],
     },
     CgiUserHomePageCheck => "string",
     CgiUserUrlCreate    => "string",
diff --git a/lib/BackupPC/Lang/zh_CN.pm b/lib/BackupPC/Lang/zh_CN.pm
new file mode 100644
index 0000000..645711a
--- /dev/null
+++ b/lib/BackupPC/Lang/zh_CN.pm
@@ -0,0 +1,1437 @@
+#!/usr/bin/perl
+
+#my %lang;
+#use strict;
+use utf8;
+
+# --------------------------------
+
+$Lang{Start_Archive} = "å¼å§å¤æ¡£";
+$Lang{Stop_Dequeue_Archive} = "ä¸­æ­¢ï¼åæ¶å¤æ¡£";
+$Lang{Start_Full_Backup} = "å¼å§å®å¨å¤ä»½";
+$Lang{Start_Incr_Backup} = "å¼å§å¢éå¤ä»½";
+$Lang{Stop_Dequeue_Backup} = "ä¸­æ­¢ï¼åæ¶å¤ä»½";
+$Lang{Restore} = "æ¢å¤";
+
+$Lang{Type_full} = "å®å¨";
+$Lang{Type_incr} = "å¢é";
+
+# -----
+
+$Lang{Only_privileged_users_can_view_admin_options} = "åªæç¹æç¨æ·å¯ä»¥æ¥çç®¡çéé¡¹ã";
+$Lang{H_Admin_Options} = "BackupPC æå¡å¨ï¼ç®¡çéé¡¹";
+$Lang{Admin_Options} = "ç®¡çéé¡¹";
+$Lang{Admin_Options_Page} = <<EOF;
+\${h1(qq{$Lang{Admin_Options}})}
+<br>
+\${h2("æå¡å¨æ§å¶")}
+<form name="ReloadForm" action="\$MyURL" method="get">
+<input type="hidden" name="action" value="">
+<table class="tableStnd">
+  <tr><td>æ´æ°æå¡å¨éç½®ï¼<td><input type="button" value="æ´æ°éç½®"
+     onClick="document.ReloadForm.action.value='Reload';
+              document.ReloadForm.submit();">
+</table>
+</form>
+<!--
+\${h2("æå¡å¨éç½®")}
+<ul>
+  <li><i>å¶å®éé¡¹ï¼å¦ï¼</i>
+  <li>æ´æ¹æå¡å¨éç½®
+</ul>
+-->
+EOF
+$Lang{Unable_to_connect_to_BackupPC_server} = "æ æ³è¿æ¥å° BackupPC æå¡å¨",
+            "CGI èæ¬ç¨åº (\$MyURL) æ æ³è¿æ¥å° BackupPC æå¡å¨ \$Conf{ServerHost} ç«¯å£ \$Conf{ServerPort}ãéè¯¯ä¿¡æ¯ï¼\$errã",
+            "å¯è½ BackupPC æå¡å¨æ²¡æè¿è¡ï¼æèæå¡å¨éç½®ä¸æ­£ç¡®ãè¯·éç¥ç½ç»ç³»ç»ç®¡çåã";
+$Lang{Admin_Start_Server} = <<EOF;
+\${h1(qq{$Lang{Unable_to_connect_to_BackupPC_server}})}
+<form action="\$MyURL" method="get">
+BackupPC æå¡å¨ <tt>\$Conf{ServerHost}</tt> ç«¯å£ <tt>\$Conf{ServerPort}</tt>
+æ­¤å»æ²¡æè¿è¡ï¼å¯è½åè¢«åæ­¢ï¼æèè¿æ²¡è¢«å¯å¨ï¼ã<br>
+ä½ æ³ç°å¨å¯å¨å®åï¼
+<input type="hidden" name="action" value="startServer">
+<input type="submit" value="å¯å¨æå¡å¨" name="ignore">
+</form>
+EOF
+
+# -----
+
+$Lang{H_BackupPC_Server_Status} = "BackupPC æå¡å¨ç¶æ";
+
+$Lang{BackupPC_Server_Status_General_Info}= <<EOF;
+\${h2(\"æå¡å¨æ»ä½ä¿¡æ¯\")}
+
+<ul>
+<li> æå¡å¨è¿ç¨å·æ¯ \$Info{pid}ï¼è¿è¡å¨ä¸»æº \$Conf{ServerHost} ä¸ï¼
+     çæ¬å· \$Info{Version}ï¼å¼å§è¿è¡äº \$serverStartTimeã
+<li> æ­¤ç¶ææ¥åçæäº \$nowã
+<li> æå¡å¨éç½®æè¿ä¸æ¬¡å è½½äº \$configLoadTimeã
+<li> æå¡å¨ä»»å¡éåä¸æ¬¡å¯å¨æ¶é´æ¯ \$nextWakeupTimeã
+<li> å¶å®ä¿¡æ¯ï¼
+    <ul>
+        <li>\$numBgQueue ä¸ªèªä¸æ¬¡éçå¤ä»½è¯·æ±ï¼
+        <li>\$numUserQueue ä¸ªå¾å¤çç¨æ·å¤ä»½è¯·æ±ï¼
+        <li>\$numCmdQueue ä¸ªå¾å¤çå½ä»¤è¯·æ±ï¼
+        \$poolInfo
+        <li>å¤ä»½æ± æä»¶ç³»ç»ç£çç©ºé´å ç¨çæ¯ \$Info{DUlastValue}%
+            ï¼ç»è®¡äº \$DUlastTimeï¼ï¼ä»å¤©çæå¤§å ç¨çæ¯ \$Info{DUDailyMax}%ï¼ç»è®¡äº \$DUmaxTimeï¼ï¼
+            æ¨å¤©çæå¤§å ç¨çæ¯ \$Info{DUDailyMaxPrev}%ã
+    </ul>
+</ul>
+EOF
+
+$Lang{BackupPC_Server_Status} = <<EOF;
+\${h1(qq{$Lang{H_BackupPC_Server_Status}})}
+
+<p>
+\$generalInfo
+
+\${h2("æ­£å¨è¿è¡çä»»å¡")}
+<p>
+<table class="tableStnd" border cellspacing="1" cellpadding="3">
+<tr class="tableheader"><td> å®¢æ·æº </td>
+    <td> ç±»å </td>
+    <td> ç¨æ· </td>
+    <td> å¼å§æ¶é´ </td>
+    <td> å½ä»¤ </td>
+    <td align="center"> è¿ç¨å· </td>
+    <td align="center"> ä¼ è¾è¿ç¨å· </td>
+    </tr>
+\$jobStr
+</table>
+<p>
+
+\${h2("éè¦å³æ³¨çéè¯¯")}
+<p>
+<table class="tableStnd" border cellspacing="1" cellpadding="3">
+<tr class="tableheader"><td align="center"> å®¢æ·æº </td>
+    <td align="center"> ç±»å </td>
+    <td align="center"> ç¨æ· </td>
+    <td align="center"> æåä¸æ¬¡å°è¯ </td>
+    <td align="center"> è¯¦æ </td>
+    <td align="center"> éè¯¯æ¶é´ </td>
+    <td> æåä¸æ¬¡éè¯¯ï¼ PING å¤±è´¥é¤å¤ï¼ </td></tr>
+\$statusStr
+</table>
+EOF
+
+# --------------------------------
+$Lang{BackupPC__Server_Summary} = "BackupPC: å®¢æ·æºæ¥å";
+$Lang{BackupPC__Archive} = "BackupPC: å¤æ¡£";
+$Lang{BackupPC_Summary} = <<EOF;
+
+\${h1(qq{$Lang{BackupPC__Server_Summary}})}
+<p>
+æ­¤ç¶ææ¥åçæäº \$nowã
+</p>
+
+\${h2("å·²æåå®æå¤ä»½çå®¢æ·æº")}
+<p>
+æ \$hostCntGood å°å®¢æ·æºå·²å®æå¤ä»½ï¼æ»æ°æ¯ï¼
+<ul>
+<li> \$fullTot ä¸ªå®å¨å¤ä»½ï¼æ»å¤§å°æ¯ \${fullSizeTot}GB
+     ï¼è¢«åç¼©åå¼ï¼ï¼
+<li> \$incrTot ä¸ªå¢éå¤ä»½ï¼æ»å¤§å°æ¯ \${incrSizeTot}GB
+     ï¼è¢«åç¼©åå¼ï¼ã
+</ul>
+</p>
+<table class="tableStnd" border cellpadding="3" cellspacing="1">
+<tr class="tableheader"><td> å®¢æ·æº </td>
+    <td align="center"> ç¨æ· </td>
+    <td align="center"> å®å¨å¤ä»½ä¸ªæ° </td>
+    <td align="center"> æåä¸æ¬¡å®å¨å¤ä»½ (å¤©å) </td>
+    <td align="center"> å®å¨å¤ä»½å¤§å° (GB) </td>
+    <td align="center"> å®å¨å¤ä»½éåº¦ (MB/s) </td>
+    <td align="center"> å¢éå¤ä»½ä¸ªæ° </td>
+    <td align="center"> æåä¸æ¬¡å¢éå¤ä»½ (å¤©å) </td>
+    <td align="center"> æåä¸æ¬¡å¤ä»½ (å¤©å) </td>
+    <td align="center"> å½åç¶æ </td>
+    <td align="center"> æåä¸æ¬¡å¤ä»½ç»æ </td></tr>
+\$strGood
+</table>
+<br><br>
+\${h2("æªå¤ä»½è¿çå®¢æ·æº")}
+<p>
+æ \$hostCntNone å°å®¢æ·æºä»æªè¢«å¤ä»½è¿ã
+<p>
+<table class="tableStnd" border cellpadding="3" cellspacing="1">
+<tr class="tableheader"><td> å®¢æ·æº </td>
+    <td align="center"> ç¨æ· </td>
+    <td align="center"> å®å¨å¤ä»½ä¸ªæ° </td>
+    <td align="center"> æåä¸æ¬¡å®å¨å¤ä»½ (å¤©å) </td>
+    <td align="center"> å®å¨å¤ä»½å¤§å° (GB) </td>
+    <td align="center"> å®å¨å¤ä»½éåº¦ (MB/s) </td>
+    <td align="center"> å¢éå¤ä»½ä¸ªæ° </td>
+    <td align="center"> æåä¸æ¬¡å¢éå¤ä»½ (å¤©å) </td>
+    <td align="center"> æåä¸æ¬¡å¤ä»½ (å¤©å) </td>
+    <td align="center"> å½åç¶æ </td>
+    <td align="center"> æåä¸æ¬¡å¤ä»½ç»æ </td></tr>
+\$strNone
+</table>
+EOF
+
+$Lang{BackupPC_Archive} = <<EOF;
+\${h1(qq{$Lang{BackupPC__Archive}})}
+<script language="javascript" type="text/javascript">
+<!--
+
+    function checkAll(location)
+    {
+      for (var i=0;i<document.form1.elements.length;i++)
+      {
+        var e = document.form1.elements[i];
+        if ((e.checked || !e.checked) && e.name != \'all\') {
+            if (eval("document.form1."+location+".checked")) {
+                e.checked = true;
+            } else {
+                e.checked = false;
+            }
+        }
+      }
+    }
+
+    function toggleThis(checkbox)
+    {
+       var cb = eval("document.form1."+checkbox);
+       cb.checked = !cb.checked;
+    }
+
+//-->
+</script>
+
+ä¸å±æ \$hostCntGood å°å®¢æ·æºå·²ç»è¢«å¤ä»½ï¼æ»å¤ä»½å¤§å°ä¸º \${fullSizeTot}GB
+<p>
+<form name="form1" method="post" action="\$MyURL">
+<input type="hidden" name="fcbMax" value="\$checkBoxCnt">
+<input type="hidden" name="type" value="1">
+<input type="hidden" name="host" value="\${EscHTML(\$archHost)}">
+<input type="hidden" name="action" value="Archive">
+<table class="tableStnd" border cellpadding="3" cellspacing="1">
+<tr class="tableheader"><td align=center> å®¢æ·æº </td>
+    <td align="center"> ç¨æ· </td>
+    <td align="center"> å¤ä»½å¤§å° </td>
+\$strGood
+\$checkAllHosts
+</table>
+</form>
+<p>
+
+EOF
+
+$Lang{BackupPC_Archive2} = <<EOF;
+\${h1(qq{$Lang{BackupPC__Archive}})}
+å³å°ä¸ºä¸åå®¢æ·æºå¤æ¡£
+<ul>
+\$HostListStr
+</ul>
+<form action="\$MyURL" method="post">
+\$hiddenStr
+<input type="hidden" name="action" value="Archive">
+<input type="hidden" name="host" value="\${EscHTML(\$archHost)}">
+<input type="hidden" name="type" value="2">
+<input type="hidden" value="0" name="archive_type">
+<table class="tableStnd" border cellspacing="1" cellpadding="3">
+\$paramStr
+<tr>
+    <td colspan=2><input type="submit" value="å¼å§å¤æ¡£" name="ignore"></td>
+</tr>
+</form>
+</table>
+EOF
+
+$Lang{BackupPC_Archive2_location} = <<EOF;
+<tr>
+    <td>å¤æ¡£ç®çå°ï¼å¤è®¾</td>
+    <td><input type="text" value="\$ArchiveDest" name="archive_device"></td>
+</tr>
+EOF
+
+$Lang{BackupPC_Archive2_compression} = <<EOF;
+<tr>
+    <td>åç¼©</td>
+    <td>
+    <input type="radio" value="0" name="compression" \$ArchiveCompNone>æ <br>
+    <input type="radio" value="1" name="compression" \$ArchiveCompGzip>gzip<br>
+    <input type="radio" value="2" name="compression" \$ArchiveCompBzip2>bzip2
+    </td>
+</tr>
+EOF
+
+$Lang{BackupPC_Archive2_parity} = <<EOF;
+<tr>
+    <td>å¥å¶æ ¡éªæ°æ®æ¯ä¾ (0 = ä¸å¯ç¨ï¼5 = å¸åè®¾ç½®)</td>
+    <td><input type="numeric" value="\$ArchivePar" name="par"></td>
+</tr>
+EOF
+
+$Lang{BackupPC_Archive2_split} = <<EOF;
+<tr>
+    <td>å°è¾åºåå¼ä¸º</td>
+    <td><input type="numeric" value="\$ArchiveSplit" name="splitsize">åå­è</td>
+</tr>
+EOF
+
+# -----------------------------------
+$Lang{Pool_Stat} = <<EOF;
+        <li>å¤ä»½æå¡å¨æä»¶æ± å¤§å°æ¯ \${poolSize}GB åå« \$info->{"\${name}FileCnt"} ä¸ªæä»¶
+            å \$info->{"\${name}DirCnt"} ä¸ªæä»¶å¤¹ï¼ç®å½ï¼æªè³ \$poolTimeï¼ãæä»¶æ± å¤§å°åºæ¬å°±æ¯ææå¤ä»½æ°æ®å ç¨çå®éç£çç©ºé´ã
+        <li>æå¡å¨æä»¶æ± æ£åæä½(Hashing)åç° \$info->{"\${name}FileCntRep"} 
+            ä¸ªæä»¶å·æéå¤æ£åå¼ï¼å¶ä¸­ \$info->{"\${name}FileRepMax"} ä¸ªæä»¶å·æç¸åæ£åå¼ãç¸åæ£åå¼å¹¶ä¸æå³çç¸åæä»¶ãæ£åæä½è¢«ç¨æ¥èçç¸åæä»¶æå ç¨çç£çç©ºé´ã
+        <li>æ¯æ¥ä¾è¡æ¸çè¿ææ°æ®æä½å é¤äº \$info->{"\${name}FileCntRm"} ä¸ªæä»¶å±
+             \${poolRmSize}GB ï¼æä½äº \$poolTime ï¼ã
+EOF
+
+# --------------------------------
+$Lang{BackupPC__Backup_Requested_on__host} = "BackupPC: å®¢æ·æº \$host æå¤ä»½è¯·æ±";
+# --------------------------------
+$Lang{REPLY_FROM_SERVER} = <<EOF;
+\${h1(\$str)}
+<p>
+æå¡å¨ç­å¤æ¯ï¼\$reply
+<p>
+è¿å <a href="\$MyURL?host=\$host">\$host ä¸»é¡µ</a>ã
+EOF
+# --------------------------------
+$Lang{BackupPC__Start_Backup_Confirm_on__host} = "BackupPC: å®¢æ·æº \$host å¼å§å¤ä»½ç¡®è®¤";
+# --------------------------------
+$Lang{Are_you_sure_start} = <<EOF;
+\${h1("ç¡®å®ï¼")}
+<p>
+ä½ å³å°å¨å®¢æ·æº \$host ä¸å¼å§ \$type å¤ä»½ã
+
+<form name="Confirm" action="\$MyURL" method="get">
+<input type="hidden" name="host" value="\$host">
+<input type="hidden" name="hostIP" value="\$ipAddr">
+<input type="hidden" name="doit" value="1">
+<input type="hidden" name="action" value="">
+ä½ è½ç¡®å®åï¼
+<input type="button" value="\$buttonText"
+  onClick="document.Confirm.action.value='\$In{action}';
+           document.Confirm.submit();">
+<input type="submit" value="åæ¶" name="ignore">
+</form>
+EOF
+# --------------------------------
+$Lang{BackupPC__Stop_Backup_Confirm_on__host} = "BackupPC: å®¢æ·æº \$host åæ­¢å¤ä»½ç¡®è®¤";
+# --------------------------------
+$Lang{Are_you_sure_stop} = <<EOF;
+
+\${h1("ç¡®å®ï¼")}
+
+<p>
+ä½ å³å°å¨å®¢æ·æº \$host ä¸åæ­¢ï¼åæ¶å¤ä»½æä½ï¼
+
+<form name="Confirm" action="\$MyURL" method="get">
+<input type="hidden" name="host"   value="\$host">
+<input type="hidden" name="doit"   value="1">
+<input type="hidden" name="action" value="">
+å¦æç¡®å®åæ¶å¤ä»½æä½ï¼è¯·ä»ç°å¨èµ·
+<input type="text" name="backoff" size="10" value="\$backoff"> å°æ¶åä¸è¦åå¯å¨å¦ä¸å¤ä»½æä½ã
+<p>
+ä½ è½ç¡®å®åï¼
+<input type="button" value="\$buttonText"
+  onClick="document.Confirm.action.value='\$In{action}';
+           document.Confirm.submit();">
+<input type="submit" value="ä¸" name="ignore">
+</form>
+
+EOF
+# --------------------------------
+$Lang{Only_privileged_users_can_view_queues_} = "åªæç¹æç¨æ·å¯ä»¥æ¥çä»»å¡è¯·æ±éåã";
+# --------------------------------
+$Lang{Only_privileged_users_can_archive} = "åªæç¹æç¨æ·å¯ä»¥æ§è¡å¤æ¡£æä½ã";
+# --------------------------------
+$Lang{BackupPC__Queue_Summary} = "BackupPC: éåæ¥å";
+# --------------------------------
+$Lang{Backup_Queue_Summary} = <<EOF;
+\${h1("å¤ä»½è¯·æ±éåæ¥å")}
+<br><br>
+\${h2("ç¨æ·éåæ¥å")}
+<p>
+ä¸åç¨æ·è¯·æ±æå¨éåä¸­ï¼
+</p>
+<table class="tableStnd" border cellspacing="1" cellpadding="3" width="80%">
+<tr class="tableheader"><td> å®¢æ·æº </td>
+    <td> è¯·æ±æ¶é´ </td>
+    <td> ç¨æ· </td></tr>
+\$strUser
+</table>
+<br><br>
+
+\${h2("åå°è¯·æ±éåæ¥å")}
+<p>
+ä¸ååå°è¯·æ±æå¨éåä¸­ï¼
+</p>
+<table class="tableStnd" border cellspacing="1" cellpadding="3" width="80%">
+<tr class="tableheader"><td> å®¢æ·æº </td>
+    <td> è¯·æ±æ¶é´ </td>
+    <td> ç¨æ· </td></tr>
+\$strBg
+</table>
+<br><br>
+\${h2("å½ä»¤éåæ¥å")}
+<p>
+ä¸åå½ä»¤è¯·æ±æå¨éåä¸­ï¼
+</p>
+<table class="tableStnd" border cellspacing="1" cellpadding="3" width="80%">
+<tr class="tableheader"><td> å®¢æ·æº </td>
+    <td> è¯·æ±æ¶é´ </td>
+    <td> ç¨æ· </td>
+    <td> å½ä»¤ </td></tr>
+\$strCmd
+</table>
+EOF
+
+# --------------------------------
+$Lang{Backup_PC__Log_File__file} = "BackupPC: æ¥å¿æä»¶ \$file";
+$Lang{Log_File__file__comment} = <<EOF;
+\${h1("æ¥å¿æä»¶ \$file \$comment")}
+<p>
+EOF
+# --------------------------------
+$Lang{Contents_of_log_file} = <<EOF;
+æ¥å¿æä»¶ <tt>\$file</tt>ï¼ ä¿®æ¹æ¶é´ \$mtimeStr \$comment
+EOF
+
+# --------------------------------
+$Lang{skipped__skipped_lines} = "[ ç¥è¿ \$skipped è¡ ]\n";
+# --------------------------------
+$Lang{_pre___Can_t_open_log_file__file} = "<pre>\næ æ³æå¼æ¥å¿æä»¶ \$file\n";
+
+# --------------------------------
+$Lang{BackupPC__Log_File_History} = "BackupPC: æ¥å¿æä»¶åå²";
+$Lang{Log_File_History__hdr} = <<EOF;
+\${h1("æ¥å¿æä»¶åå² \$hdr")}
+<p>
+<table class="tableStnd" border cellspacing="1" cellpadding="3" width="80%">
+<tr class="tableheader"><td align="center"> æä»¶ </td>
+    <td align="center"> å¤§å° </td>
+    <td align="center"> ä¿®æ¹æ¶é´ </td></tr>
+\$str
+</table>
+EOF
+
+# -------------------------------
+$Lang{Recent_Email_Summary} = <<EOF;
+\${h1("æè¿çµå­é®ä»¶æ¥åï¼ææ°æåï¼")}
+<p>
+<table class="tableStnd" border cellspacing="1" cellpadding="3" width="80%">
+<tr class="tableheader"><td align="center"> æ¶ä¿¡äºº </td>
+    <td align="center"> å®¢æ·æº </td>
+    <td align="center"> æ¶é´ </td>
+    <td align="center"> æ é¢ </td></tr>
+\$str
+</table>
+EOF
+ 
+
+# ------------------------------
+$Lang{Browse_backup__num_for__host} = "BackupPC: æµè§å®¢æ·æº \$host å¤ä»½åºåå· \$num";
+
+# ------------------------------
+$Lang{Restore_Options_for__host} = "BackupPC: å®¢æ·æº \$host æ¢å¤éé¡¹";
+$Lang{Restore_Options_for__host2} = <<EOF;
+\${h1("å®¢æ·æº \$host æ¢å¤éé¡¹")}
+<p>
+ä½ ä»å¤ä»½åºå #\$numï¼å· \$share ä¸­éæ©äºä»¥ä¸æä»¶ï¼ç®å½ï¼
+<ul>
+\$fileListStr
+</ul>
+</p><p>
+ä½ æä¸ç§éæ©æ¥æ¢å¤è¿äºæä»¶ï¼ç®å½ã
+è¯·ä»ä¸åä¸ç§æ¹æ³ä¸­éæ©å¶ä¸ã
+</p>
+\${h2("æ¹æ³ 1ï¼ç´æ¥æ¢å¤")}
+<p>
+EOF
+
+$Lang{Restore_Options_for__host_Option1} = <<EOF;
+ä½ å¯ä»¥å°è¿äºæä»¶ç´æ¥æ¢å¤å°å®¢æ·æº \$host ä¸ã
+</p><p>
+<b>è­¦åï¼</b> å®¢æ·æºä¸ç°å­çæä»¶ï¼å¦æåè¢«æ¢å¤çæä»¶å·æç¸åæä»¶åå¹¶ä¸ä½äºç¸åè·¯å¾ï¼å¶åå®¹å°ä¼è¢«æ¿æ¢ï¼
+</p>
+<form action="\$MyURL" method="post" name="direct">
+<input type="hidden" name="host" value="\${EscHTML(\$host)}">
+<input type="hidden" name="num" value="\$num">
+<input type="hidden" name="type" value="3">
+\$hiddenStr
+<input type="hidden" value="\$In{action}" name="action">
+<table class="tableStnd" border="0">
+<tr>
+    <td>æ¢å¤å°å®¢æ·æº</td>
+    <td><!--<input type="text" size="40" value="\${EscHTML(\$host)}"
+	 name="hostDest">-->
+	 <select name="hostDest" onChange="document.direct.shareDest.value=''">
+	 \$hostDestSel
+	 </select>
+	 <script language="Javascript">
+	 function myOpen(URL) {
+		window.open(URL,'','width=500,height=400');
+	 }
+	 </script>
+	 <!--<a href="javascript:myOpen('\$MyURL?action=findShares&host='+document.direct.hostDest.options.value)">æå¯»å¯ä¾ä½¿ç¨çæä»¶å·ï¼æ­¤åè½è¿æªè¢«å®ç°ï¼</a>--></td>
+</tr><tr>
+    <td>æ¢å¤å°å·</td>
+    <td><input type="text" size="40" value="\${EscHTML(\$share)}"
+	 name="shareDest"></td>
+</tr><tr>
+    <td>æ¢å¤å°æ­¤ç®å½ä¸­<br>ï¼ä½äºä¸è¿°å·ä¸ï¼</td>
+    <td valign="top"><input type="text" size="40" maxlength="256"
+	value="\${EscHTML(\$pathHdr)}" name="pathHdr"></td>
+</tr><tr>
+    <td><input type="submit" value="å¼å§æ¢å¤" name="ignore"></td>
+</table>
+</form>
+EOF
+
+$Lang{Restore_Options_for__host_Option1_disabled} = <<EOF;
+ç´æ¥æ¢å¤å°å®¢æ·æº \${EscHTML(\$hostDest) çåè½è¢«å³é­ã
+è¯·éæ©å¶å®æ¢å¤æ¹æ³ã
+EOF
+
+# ------------------------------
+$Lang{Option_2__Download_Zip_archive} = <<EOF;
+<p>
+\${h2("æ¹æ³ 2ï¼ä¸è½½ Zip å¤æ¡£")}
+<p>
+ä½ å¯ä»¥å°ææä½ éæ©çæä»¶åç®å½ä¸è½½è¿ä¸ä¸ª Zip å¤æ¡£ãç¶ååç¨ä¸ä¸ªæ¬å°åºç¨ï¼
+ä¾å¦ WinZipï¼æ¥æµè§ææåå¶ä¸­çä»»ä½æä»¶ã 
+</p><p>
+<b>è­¦åï¼</b> åå³äºä½ éæ©çæä»¶ï¼ç®å½ï¼æ­¤å¤æ¡£å¯è½ä¼å ç¨å¾å¤§å­å¨ç©ºé´ã
+å¯è½éè¦è¥å¹²åéææ´é¿æ¶é´æ¥çæåä¼ è¾æ­¤å¤æ¡£ï¼å¹¶ä¸è¿éè¦è¶³å¤å¤§çæ¬å°ç£çç©ºé´ã
+</p>
+<form action="\$MyURL" method="post">
+<input type="hidden" name="host" value="\${EscHTML(\$host)}">
+<input type="hidden" name="num" value="\$num">
+<input type="hidden" name="type" value="2">
+\$hiddenStr
+<input type="hidden" value="\$In{action}" name="action">
+<input type="checkbox" value="1" name="relative" checked> å¤æ¡£ä¸­æææä»¶å·æç¸å¯¹è·¯å¾ï¼å¨ \${EscHTML(\$pathHdr eq "" ? "/" : \$pathHdr)} ç®å½å
+ï¼å¦åå¤æ¡£ä¸­æä»¶å·æå®æ´è·¯å¾ï¼ã
+<br>
+éæ©åç¼©æ¯ï¼0ï¼ä¸åç¼©ï¼1ï¼æä½ä½éåº¦å¿«ï¼...ï¼9ï¼æé«ä½éåº¦æ¢ï¼
+<input type="text" size="6" value="5" name="compressLevel">
+<br>
+<input type="submit" value="ä¸è½½ Zip æä»¶" name="ignore">
+</form>
+EOF
+
+# ------------------------------
+
+$Lang{Option_2__Download_Zip_archive2} = <<EOF;
+<p>
+\${h2("æ¹æ³ 2ï¼ä¸è½½ Zip å¤æ¡£")}
+<p>
+å æå¡å¨æ²¡æå®è£ Perl ç»ä»¶ Archive::Zipï¼Zip å¤æ¡£æ æ³è¢«çæã
+è¯·èç³»ç³»ç»ç®¡çåå®è£ Archive::Zipï¼ä¸è½½å°å
+<a href="http://www.cpan.org">www.cpan.org</a>ã
+</p>
+EOF
+
+
+# ------------------------------
+$Lang{Option_3__Download_Zip_archive} = <<EOF;
+\${h2("æ¹æ³ 3ï¼ä¸è½½ Tar å¤æ¡£")}
+<p>
+ä½ å¯ä»¥å°ææä½ éæ©çæä»¶åç®å½ä¸è½½è¿ä¸ä¸ª Tar å¤æ¡£ãç¶ååç¨ä¸ä¸ªæ¬å°åºç¨ï¼
+ä¾å¦ tar æ WinZipï¼æ¥æµè§ææåå¶ä¸­çä»»ä½æä»¶ã 
+</p><p>
+<b>è­¦åï¼</b> åå³äºä½ éæ©çæä»¶ï¼ç®å½ï¼æ­¤å¤æ¡£å¯è½ä¼å ç¨å¾å¤§å­å¨ç©ºé´ã
+å¯è½éè¦è¥å¹²åéææ´é¿æ¶é´æ¥çæåä¼ è¾æ­¤å¤æ¡£ï¼å¹¶ä¸è¿éè¦è¶³å¤å¤§çæ¬å°ç£çç©ºé´ã
+</p>
+<form action="\$MyURL" method="post">
+<input type="hidden" name="host" value="\${EscHTML(\$host)}">
+<input type="hidden" name="num" value="\$num">
+<input type="hidden" name="type" value="1">
+\$hiddenStr
+<input type="hidden" value="\$In{action}" name="action">
+<input type="checkbox" value="1" name="relative" checked> å¤æ¡£ä¸­æææä»¶å·æç¸å¯¹è·¯å¾ï¼å¨ \${EscHTML(\$pathHdr eq "" ? "/" : \$pathHdr)} ç®å½å
+ï¼å¦åå¤æ¡£ä¸­æä»¶å·æå®æ´è·¯å¾ï¼ã
+<br>
+<input type="submit" value="ä¸è½½ Tar æä»¶" name="ignore">
+</form>
+EOF
+
+
+# ------------------------------
+$Lang{Restore_Confirm_on__host} = "BackupPC: å®¢æ·æº \$host å¼å§æ¢å¤ç¡®è®¤";
+
+$Lang{Are_you_sure} = <<EOF;
+\${h1("ç¡®å®ï¼")}
+<p>
+ä½ å³å°å¼å§æ¢å¤æ°æ®ç´æ¥å°å®¢æ·æº \$In{hostDest} ä¸ã
+å¨å­å¨å¤ä»½å· \$num ä¸­çä¸åæä»¶å°è¢«æ¢å¤å°å· \$In{shareDest} åï¼
+<p>
+<table class="tableStnd" border>
+<tr class="tableheader"><td>åå§æä»¶ï¼ç®å½</td><td>å°è¢«æ¢å¤å°</td></tr>
+\$fileListStr
+</table>
+
+<form name="RestoreForm" action="\$MyURL" method="post">
+<input type="hidden" name="host" value="\${EscHTML(\$host)}">
+<input type="hidden" name="hostDest" value="\${EscHTML(\$In{hostDest})}">
+<input type="hidden" name="shareDest" value="\${EscHTML(\$In{shareDest})}">
+<input type="hidden" name="pathHdr" value="\${EscHTML(\$In{pathHdr})}">
+<input type="hidden" name="num" value="\$num">
+<input type="hidden" name="type" value="4">
+<input type="hidden" name="action" value="">
+\$hiddenStr
+ä½ ç¡®å®åï¼
+<input type="button" value="\$Lang->{Restore}"
+ onClick="document.RestoreForm.action.value='Restore';
+          document.RestoreForm.submit();">
+<input type="submit" value="ä¸" name="ignore">
+</form>
+EOF
+
+
+# --------------------------
+$Lang{Restore_Requested_on__hostDest} = "BackupPC: å®¢æ·æº \$hostDest ææ¢å¤è¯·æ±";
+$Lang{Reply_from_server_was___reply} = <<EOF;
+\${h1(\$str)}
+<p>
+æå¡å¨ç­å¤æ¯ï¼\$reply
+<p>
+è¿å <a href="\$MyURL?host=\$hostDest">\$hostDest ä¸»é¡µ</a>ã
+EOF
+
+$Lang{BackupPC_Archive_Reply_from_server} = <<EOF;
+\${h1(\$str)}
+<p>
+æå¡å¨ç­å¤æ¯ï¼\$reply
+EOF
+
+
+# -------------------------
+$Lang{Host__host_Backup_Summary} = "BackupPC: å®¢æ·æº \$host å¤ä»½æ¥å";
+
+$Lang{Host__host_Backup_Summary2} = <<EOF;
+\${h1("å®¢æ·æº \$host å¤ä»½æ¥å")}
+<p>
+\$warnStr
+<ul>
+\$statusStr
+</ul>
+</p>
+\${h2("ç¨æ·æä½")}
+<p>
+<form name="StartStopForm" action="\$MyURL" method="get">
+<input type="hidden" name="host"   value="\$host">
+<input type="hidden" name="action" value="">
+\$startIncrStr
+<input type="button" value="\$Lang->{Start_Full_Backup}"
+ onClick="document.StartStopForm.action.value='Start_Full_Backup';
+          document.StartStopForm.submit();">
+<input type="button" value="\$Lang->{Stop_Dequeue_Backup}"
+ onClick="document.StartStopForm.action.value='Stop_Dequeue_Backup';
+          document.StartStopForm.submit();">
+</form>
+</p>
+\${h2("å¤ä»½æ¥å")}
+<p>
+ç¹å»å¤ä»½åºåå·æµè§åæ¢å¤æä»¶ã
+</p>
+<table class="tableStnd" border cellspacing="1" cellpadding="3">
+<tr class="tableheader"><td align="center"> å¤ä»½åºåå·ï¼ </td>
+    <td align="center"> ç±»å </td>
+    <td align="center"> å®æ´ </td>
+    <td align="center"> å¤ä»½çº§å« </td>
+    <td align="center"> å¼å§æ¶é´ </td>
+    <td align="center"> èæ¶ï¼åéï¼</td>
+    <td align="center"> è·ç¦»ç°å¨ï¼å¤©åï¼</td>
+    <td align="center"> æå¡å¨ä¸å¤ä»½è·¯å¾ </td>
+</tr>
+\$str
+</table>
+<p>
+
+\$restoreStr
+</p>
+<br><br>
+\${h2("ä¼ è¾éè¯¯æ¥å")}
+<br><br>
+<table class="tableStnd" border cellspacing="1" cellpadding="3" width="80%">
+<tr class="tableheader"><td align="center"> å¤ä»½åºåå·ï¼ </td>
+    <td align="center"> ç±»å </td>
+    <td align="center"> æ¥ç </td>
+    <td align="center"> ä¼ è¾éè¯¯æ°ç® </td>
+    <td align="center"> æåæä»¶æ°ç® </td>
+    <td align="center"> æåæä»¶ç³»ç»å·æ°ç® </td>
+    <td align="center"> æå Tar æä»¶æ°ç® </td>
+</tr>
+\$errStr
+</table>
+<br><br>
+
+\${h2("æä»¶å¤§å°ï¼æ°ç®ç»è®¡")}
+<p>
+"åææä»¶"æ¯æååå·²å­å¨å¤ä»½æ± ä¸­çæä»¶ï¼"æ°å¢æä»¶"æ¯æå¤ä»½æ°åå¥æ± ä¸­çæä»¶ã
+ç©ºæä»¶ä¸è¢«ç»è®¡å¨åã
+</p>
+<table class="tableStnd" border cellspacing="1" cellpadding="3" width="80%">
+<tr class="tableheader"><td colspan="2" bgcolor="#ffffff"></td>
+    <td align="center" colspan="3"> åè®¡ </td>
+    <td align="center" colspan="2"> åææä»¶ </td>
+    <td align="center" colspan="2"> æ°å¢æä»¶ </td>
+</tr>
+<tr class="tableheader">
+    <td align="center"> å¤ä»½åºåå·ï¼ </td>
+    <td align="center"> ç±»å </td>
+    <td align="center"> æä»¶æ°ç® </td>
+    <td align="center"> å¤§å°(MB) </td>
+    <td align="center"> å¤ä»½éåº¦(MB/sec) </td>
+    <td align="center"> æä»¶æ°ç® </td>
+    <td align="center"> å¤§å°(MB) </td>
+    <td align="center"> æä»¶æ°ç® </td>
+    <td align="center"> å¤§å°(MB) </td>
+</tr>
+\$sizeStr
+</table>
+<br><br>
+
+\${h2("åç¼©æ¥å")}
+<p>
+å¤ä»½æ± ä¸­åææä»¶åæ°å¢æä»¶çåç¼©æ§è½æ¥åã
+</p>
+<table class="tableStnd" border cellspacing="1" cellpadding="3" width="80%">
+<tr class="tableheader"><td colspan="3" bgcolor="#ffffff"></td>
+    <td align="center" colspan="3"> åææä»¶ </td>
+    <td align="center" colspan="3"> æ°å¢æä»¶ </td>
+</tr>
+<tr class="tableheader"><td align="center"> å¤ä»½åºåå·ï¼ </td>
+    <td align="center"> ç±»å </td>
+    <td align="center"> åç¼©çº§å« </td>
+    <td align="center"> åç¼©å(MB) </td>
+    <td align="center"> åç¼©å(MB) </td>
+    <td align="center"> åç¼©æ¯ </td>
+    <td align="center"> åç¼©å(MB) </td>
+    <td align="center"> åç¼©å(MB) </td>
+    <td align="center"> åç¼©æ¯ </td>
+</tr>
+\$compStr
+</table>
+<br><br>
+EOF
+
+$Lang{Host__host_Archive_Summary} = "BackupPC: å®¢æ·æº \$host å¤æ¡£æ¥å";
+$Lang{Host__host_Archive_Summary2} = <<EOF;
+\${h1("å®¢æ·æº \$host å¤æ¡£æ¥å")}
+<p>
+\$warnStr
+<ul>
+\$statusStr
+</ul>
+
+\${h2("ç¨æ·æä½")}
+<p>
+<form name="StartStopForm" action="\$MyURL" method="get">
+<input type="hidden" name="archivehost" value="\$host">
+<input type="hidden" name="host" value="\$host">
+<input type="hidden" name="action" value="">
+<input type="button" value="\$Lang->{Start_Archive}"
+ onClick="document.StartStopForm.action.value='Start_Archive';
+          document.StartStopForm.submit();">
+<input type="button" value="\$Lang->{Stop_Dequeue_Archive}"
+ onClick="document.StartStopForm.action.value='Stop_Dequeue_Archive';
+          document.StartStopForm.submit();">
+</form>
+
+\$ArchiveStr
+
+EOF
+
+# -------------------------
+$Lang{Error} = "BackupPC: éè¯¯";
+$Lang{Error____head} = <<EOF;
+\${h1("éè¯¯ï¼\$head")}
+<p>\$mesg</p>
+EOF
+
+# -------------------------
+$Lang{NavSectionTitle_} = "æå¡å¨";
+
+# -------------------------
+$Lang{Backup_browse_for__host} = <<EOF;
+\${h1("å®¢æ·æº \$host å¤ä»½æµè§")}
+
+<script language="javascript" type="text/javascript">
+<!--
+
+    function checkAll(location)
+    {
+      for (var i=0;i<document.form1.elements.length;i++)
+      {
+        var e = document.form1.elements[i];
+        if ((e.checked || !e.checked) && e.name != \'all\') {
+            if (eval("document.form1."+location+".checked")) {
+            	e.checked = true;
+            } else {
+            	e.checked = false;
+            }
+        }
+      }
+    }
+    
+    function toggleThis(checkbox)
+    {
+       var cb = eval("document.form1."+checkbox);
+       cb.checked = !cb.checked;	
+    }
+
+//-->
+</script>
+
+<form name="form0" method="post" action="\$MyURL">
+<input type="hidden" name="num" value="\$num">
+<input type="hidden" name="host" value="\$host">
+<input type="hidden" name="share" value="\${EscHTML(\$share)}">
+<input type="hidden" name="action" value="browse">
+<ul>
+<li> ä½ æ­£å¨æµè§å¤ä»½ #\$numï¼è¯¥å¤ä»½å¼å§äº \$backupTime 
+       ï¼\$backupAge å¤©åï¼ã
+\$filledBackup
+<li> è¿å¥ç®å½ï¼<input type="text" name="dir" size="50" maxlength="4096" value="\${EscHTML(\$dir)}"> <input type="submit" value="\$Lang->{Go}" name="Submit">
+<li> ç¹å»ç®å½åè¿å¥ç¸åºç®å½ã
+<li> ç¹å»æä»¶åæ¢å¤ç¸åºæä»¶ã
+<li> æ¥çå½åç®å½çå¤ä»½<a href="\$MyURL?action=dirHistory&host=\${EscURI(\$host)}&share=\$shareURI&dir=\$pathURI">åå²</a>ã
+</ul>
+</form>
+
+\${h2("\${EscHTML(\$dirDisplay)} çåå®¹")}
+<form name="form1" method="post" action="\$MyURL">
+<input type="hidden" name="num" value="\$num">
+<input type="hidden" name="host" value="\$host">
+<input type="hidden" name="share" value="\${EscHTML(\$share)}">
+<input type="hidden" name="fcbMax" value="\$checkBoxCnt">
+<input type="hidden" name="action" value="Restore">
+<br>
+<table width="100%">
+<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 width="100%" align="left" cellpadding="3" cellspacing="1">
+        \$fileHeader
+        \$topCheckAll
+        \$fileStr
+        \$checkAll
+        </table>
+    </td></tr></table>
+<br>
+<!--
+This is now in the checkAll row
+<input type="submit" name="Submit" value="æ¢å¤è¢«éæ©çæä»¶">
+-->
+</form>
+EOF
+
+# ------------------------------
+$Lang{DirHistory_backup_for__host} = "BackupPC: å®¢æ·æº \$host ç®å½å¤ä»½åå²";
+
+#
+# These two strings are used to build the links for directories and
+# file versions.  Files are appended with a version number.
+#
+$Lang{DirHistory_dirLink}  = "ç®å½";
+$Lang{DirHistory_fileLink} = "v";
+
+$Lang{DirHistory_for__host} = <<EOF;
+\${h1("å®¢æ·æº \$host ç®å½å¤ä»½åå²")}
+<p>
+æ¬é¡µæ¾ç¤ºæä»¶å¨ææå¤ä»½ä¸­çä¸åçæ¬ï¼
+<ul>
+<li> ç¹å»å¤ä»½åºåå·è¿åç¸åºå¤ä»½æµè§ä¸»é¡µï¼
+<li> ç¹å»ç®å½é¾æ¥æ è®° (\$Lang->{DirHistory_dirLink}) è¿å¥ç¸åºç®å½ï¼
+<li> ç¹å»æä»¶çæ¬é¾æ¥æ è®° (\$Lang->{DirHistory_fileLink}0,
+     \$Lang->{DirHistory_fileLink}1, ...) ä¸è½½ç¸åºæä»¶ï¼
+<li> å¦æä¸ä¸ªæä»¶çåå®¹å¨å¤ä¸ªå¤ä»½ä¸­ç¸åï¼æä»¶å¨å¤ä¸ªå¤ä»½ä¸­å·æç¸åçæ¬å·ï¼
+<li> å¦æä¸ä¸ªæä»¶æç®å½å¨æä¸ªå¤ä»½ä¸­ä¸å­å¨ï¼ä¸è¡¨ä¸­ç¨ç©ºç½è¡¨ç¤ºï¼
+<li> å·æç¸åçæ¬å·çæä»¶å¯è½å¨ä¸åå¤ä»½ä¸­æä¸åçæä»¶å±æ§ãå¯ä»¥ç¹å»å¤ä»½åºåå·æ¥æ¥çæä»¶å¨ç¸åºå¤ä»½ä¸­çå±æ§ã
+</ul>
+
+\${h2("\${EscHTML(\$dirDisplay)} çåå²")}
+
+<br>
+<table border cellspacing="2" cellpadding="3">
+<tr class="fviewheader"><td>å¤ä»½åºåå·</td>\$backupNumStr</tr>
+<tr class="fviewheader"><td>å¤ä»½æ¶é´</td>\$backupTimeStr</tr>
+\$fileStr
+</table>
+EOF
+
+# ------------------------------
+$Lang{Restore___num_details_for__host} = "BackupPC: å®¢æ·æº \$host æ¢å¤ #\$num è¯¦æ";
+
+$Lang{Restore___num_details_for__host2} = <<EOF;
+\${h1("å®¢æ·æº \$host æ¢å¤ #\$num è¯¦æ")}
+<p>
+<table class="tableStnd" border cellspacing="1" cellpadding="3" width="90%">
+<tr><td class="tableheader"> æ¢å¤åºåå· </td><td class="border"> \$Restores[\$i]{num} </td></tr>
+<tr><td class="tableheader"> è¯·æ±æ¹ </td><td class="border"> \$RestoreReq{user} </td></tr>
+<tr><td class="tableheader"> è¯·æ±æ¶é´ </td><td class="border"> \$reqTime </td></tr>
+<tr><td class="tableheader"> ç»æ </td><td class="border"> \$Restores[\$i]{result} </td></tr>
+<tr><td class="tableheader"> éè¯¯ä¿¡æ¯ </td><td class="border"> \$Restores[\$i]{errorMsg} </td></tr>
+<tr><td class="tableheader"> æºå®¢æ·æº </td><td class="border"> \$RestoreReq{hostSrc} </td></tr>
+<tr><td class="tableheader"> æºå¤ä»½åºåå· </td><td class="border"> \$RestoreReq{num} </td></tr>
+<tr><td class="tableheader"> æºæä»¶å· </td><td class="border"> \$RestoreReq{shareSrc} </td></tr>
+<tr><td class="tableheader"> ç®çå®¢æ·æº </td><td class="border"> \$RestoreReq{hostDest} </td></tr>
+<tr><td class="tableheader"> ç®çæä»¶å· </td><td class="border"> \$RestoreReq{shareDest} </td></tr>
+<tr><td class="tableheader"> æ¢å¤å¼å§æ¶é´ </td><td class="border"> \$startTime </td></tr>
+<tr><td class="tableheader"> èæ¶ </td><td class="border"> \$duration åé </td></tr>
+<tr><td class="tableheader"> æä»¶ä¸ªæ° </td><td class="border"> \$Restores[\$i]{nFiles} </td></tr>
+<tr><td class="tableheader"> æä»¶æ»å¤§å° </td><td class="border"> \${MB} MB </td></tr>
+<tr><td class="tableheader"> ä¼ è¾éç </td><td class="border"> \$MBperSec MB/sec </td></tr>
+<tr><td class="tableheader"> Tar çæè¿ç¨éè¯¯ä¸ªæ° </td><td class="border"> \$Restores[\$i]{tarCreateErrs} </td></tr>
+<tr><td class="tableheader"> ä¼ è¾è¿ç¨éè¯¯ä¸ªæ° </td><td class="border"> \$Restores[\$i]{xferErrs} </td></tr>
+<tr><td class="tableheader"> ä¼ è¾æ¥å¿æä»¶ </td><td class="border">
+<a href="\$MyURL?action=view&type=RestoreLOG&num=\$Restores[\$i]{num}&host=\$host">æ¥çæ¥å¿</a>,
+<a href="\$MyURL?action=view&type=RestoreErr&num=\$Restores[\$i]{num}&host=\$host">æ¥çéè¯¯</a>
+</tr></tr>
+</table>
+</p>
+\${h1("æä»¶ï¼ç®å½åè¡¨")}
+<p>
+<table class="tableStnd" border cellspacing="1" cellpadding="3" width="100%">
+<tr class="tableheader"><td>åå§æä»¶ï¼ç®å½</td><td>æ¢å¤è³</td></tr>
+\$fileListStr
+</table>
+EOF
+
+# ------------------------------
+$Lang{Archive___num_details_for__host} = "BackupPC: å®¢æ·æº \$host å¤æ¡£ #\$num è¯¦æ";
+
+$Lang{Archive___num_details_for__host2 } = <<EOF;
+\${h1("å®¢æ·æº \$host å¤æ¡£ #\$num è¯¦æ")}
+<p>
+<table class="tableStnd" border cellspacing="1" cellpadding="3" width="80%">
+<tr><td class="tableheader"> å¤æ¡£åºåå· </td><td class="border"> \$Archives[\$i]{num} </td></tr>
+<tr><td class="tableheader"> è¯·æ±æ¹ </td><td class="border"> \$ArchiveReq{user} </td></tr>
+<tr><td class="tableheader"> è¯·æ±æ¹ </td><td class="border"> \$reqTime </td></tr>
+<tr><td class="tableheader"> ç»æ </td><td class="border"> \$Archives[\$i]{result} </td></tr>
+<tr><td class="tableheader"> éè¯¯ä¿¡æ¯ </td><td class="border"> \$Archives[\$i]{errorMsg} </td></tr>
+<tr><td class="tableheader"> å¼å§æ¶é´ </td><td class="border"> \$startTime </td></tr>
+<tr><td class="tableheader"> èæ¶ </td><td class="border"> \$duration åé </td></tr>
+<tr><td class="tableheader"> ä¼ è¾æ¥å¿æä»¶ </td><td class="border">
+<a href="\$MyURL?action=view&type=ArchiveLOG&num=\$Archives[\$i]{num}&host=\$host">æ¥çæ¥å¿</a>,
+<a href="\$MyURL?action=view&type=ArchiveErr&num=\$Archives[\$i]{num}&host=\$host">æ¥çéè¯¯</a>
+</tr></tr>
+</table>
+<p>
+\${h1("å®¢æ·æºåè¡¨")}
+<p>
+<table class="tableStnd" border cellspacing="1" cellpadding="3" width="80%">
+<tr class="tableheader"><td>å®¢æ·æº</td><td>å¤ä»½åºåå·</td></tr>
+\$HostListStr
+</table>
+EOF
+
+# -----------------------------------
+$Lang{Email_Summary} = "BackupPC: çµå­é®ä»¶æ¥å";
+
+# -----------------------------------
+#  !! ERROR messages !!
+# -----------------------------------
+$Lang{BackupPC__Lib__new_failed__check_apache_error_log} = "BackupPC::Lib->new æ­¥éª¤å¤±è´¥ï¼è¯·æ£æ¥ Apache æå¡å¨æ¥å¿\n";
+$Lang{Wrong_user__my_userid_is___} =  
+              "éè¯¯ç¨æ·ï¼æçç¨æ· ID æ¯ \$>, ä¸æ¯ \$uid"
+            . "(\$Conf{BackupPCUser})\n";
+# $Lang{Only_privileged_users_can_view_PC_summaries} = "Only privileged users can view PC summaries.";
+$Lang{Only_privileged_users_can_stop_or_start_backups} = 
+                  "åªæç¹æç¨æ·å¯ä»¥æ§è¡å¤ä»½çå¼å§æåæ­¢æä½äºå®¢æ·æº"
+		. " \${EscHTML(\$host)}.";
+$Lang{Invalid_number__num} = "æ ææ°å­ \$num";
+$Lang{Unable_to_open__file__configuration_problem} = "æ æ³æå¼æä»¶ \$fileï¼éç½®æè¯¯ï¼";
+$Lang{Only_privileged_users_can_view_log_or_config_files} = "åªæç¹æç¨æ·å¯ä»¥æ¥çæ¥å¿æéç½®æä»¶ã";
+$Lang{Only_privileged_users_can_view_log_files} = "åªæç¹æç¨æ·å¯ä»¥æ¥çæ¥å¿æä»¶ã";
+$Lang{Only_privileged_users_can_view_email_summaries} = "åªæç¹æç¨æ·å¯ä»¥æ¥ççµå­é®ä»¶æ¥åã";
+$Lang{Only_privileged_users_can_browse_backup_files} = "åªæç¹æç¨æ·å¯ä»¥æµè§"
+                . "å®¢æ·æº \${EscHTML(\$In{host})} çå¤ä»½æä»¶ã";
+$Lang{Empty_host_name} = "ç©ºå®¢æ·æºåã";
+$Lang{Directory___EscHTML} = "ç®å½ \${EscHTML(\"\$TopDir/pc/\$host/\$num\")}"
+		    . " ä¸ºç©º";
+$Lang{Can_t_browse_bad_directory_name2} = "æ æ³æµè§éæ³ç®å½å"
+	            . " \${EscHTML(\$relDir)}";
+$Lang{Only_privileged_users_can_restore_backup_files} = "åªæç¹æç¨æ·å¯ä»¥æ¢å¤"
+                . "å®¢æ·æº \${EscHTML(\$In{host})} çå¤ä»½æä»¶ã";
+$Lang{Bad_host_name} = "éè¯¯å®¢æ·æºå \${EscHTML(\$host)}";
+$Lang{You_haven_t_selected_any_files__please_go_Back_to} = "ä½ è¿æ²¡æéæ©ä»»ä½æä»¶ï¼è¯·è¿åä¸ä¸é¡µ"
+                . "éæ©æä»¶ã";
+$Lang{You_haven_t_selected_any_hosts} = "ä½ è¿æ²¡æéæ©ä»»ä½å®¢æ·æºï¼è¯·è¿åä¸ä¸é¡µ"
+                . "éæ©å®¢æ·æºã";
+$Lang{Nice_try__but_you_can_t_put} = "å¯¹ä¸èµ·ï¼æä»¶ååä¸è½åå« \'..\'";
+$Lang{Host__doesn_t_exist} = "å®¢æ·æº \${EscHTML(\$In{hostDest})} ä¸å­å¨";
+$Lang{You_don_t_have_permission_to_restore_onto_host} = "ä½ æ²¡ææéæ¢å¤å®¢æ·æº"
+		    . " \${EscHTML(\$In{hostDest})}";
+$Lang{Can_t_open_create__openPath} = "æ æ³æå¼ï¼åå»º "
+		. "\${EscHTML(\"\$openPath\")}";
+$Lang{Only_privileged_users_can_restore_backup_files2} = "åªæç¹æç¨æ·å¯ä»¥æ¢å¤"
+                . "å®¢æ·æº \${EscHTML(\$host)} çå¤ä»½æä»¶ã";
+$Lang{Empty_host_name} = "ç©ºå®¢æ·æºå";
+$Lang{Unknown_host_or_user} = "æªç¥å®¢æ·æºæç¨æ· \${EscHTML(\$host)}";
+$Lang{Only_privileged_users_can_view_information_about} = "åªæç¹æç¨æ·å¯ä»¥æ¥ç"
+                . "å®¢æ·æº \${EscHTML(\$host)} çä¿¡æ¯ã" ;
+$Lang{Only_privileged_users_can_view_archive_information} = "åªæç¹æç¨æ·å¯ä»¥æ¥çå¤æ¡£ä¿¡æ¯ã";
+$Lang{Only_privileged_users_can_view_restore_information} = "åªæç¹æç¨æ·å¯ä»¥æ¥çæ¢å¤ä¿¡æ¯ã";
+$Lang{Restore_number__num_for_host__does_not_exist} = "å®¢æ·æº \${EscHTML(\$host)} æ¢å¤åºåå· \$num "
+	        . "ä¸å­å¨ã";
+$Lang{Archive_number__num_for_host__does_not_exist} = "å®¢æ·æº \${EscHTML(\$host)} å¤æ¡£åºåå· \$num "
+	        . "ä¸å­å¨ã";
+$Lang{Can_t_find_IP_address_for} = "å®¢æ·æº \${EscHTML(\$host)} ç IP å°åæ æ³æ¾å°";
+$Lang{host_is_a_DHCP_host} = <<EOF;
+å®¢æ·æº \$host çç½ç»è®¾ç½®æ¯ä½¿ç¨å¨æ IP å°åï¼DHCPï¼ï¼ç°å¨å®ç IP å°åæªç¥ãå·²ç»æ£æ¥è¿ \$ENV{REMOTE_ADDR}\$tryIP ç NETBIOS åï¼ä½é£å°æºå¨ä¸æ¯ \$hostã
+<p>
+é¤éè·å¾å®¢æ·æº \$host çå¨æ IP å°åï¼å¦ååªè½ä»å®¢æ·ä¸»æºä¸ååºæ­¤ä»»å¡è¯·æ±ã
+EOF
+
+# ------------------------------------
+# !! Server Mesg !!
+# ------------------------------------
+
+$Lang{Backup_requested_on_DHCP__host} = "ç¨æ· \$User ä» \$ENV{REMOTE_ADDR} åèµ·è¯·æ±å¤ä»½ä½¿ç¨å¨æ IP çå®¢æ·æº \$host (\$In{hostIP})";
+$Lang{Backup_requested_on__host_by__User} = "ç¨æ· \$User åèµ·è¯·æ±å¤ä»½å®¢æ·æº \$host";
+$Lang{Backup_stopped_dequeued_on__host_by__User} = "ç¨æ· \$User åæ­¢ï¼åæ¶äºå¯¹å®¢æ·æº \$host çå¤ä»½";
+$Lang{Restore_requested_to_host__hostDest__backup___num} = "ç¨æ· \$User ä» \$ENV{REMOTE_ADDR} åèµ·è¯·æ±æ¢å¤å®¢æ·æº \$hostDestï¼ä½¿ç¨å¤ä»½åºåå· #\$num";
+$Lang{Archive_requested} = "ç¨æ· \$User ä» \$ENV{REMOTE_ADDR} åèµ·å¤æ¡£è¯·æ±";
+
+# -------------------------------------------------
+# ------- Stuff that was forgotten ----------------
+# -------------------------------------------------
+
+$Lang{Status} = "ç¶æ";
+$Lang{PC_Summary} = "å®¢æ·æºæ¥å";
+$Lang{LOG_file} = "æ¥å¿æä»¶";
+$Lang{LOG_files} = "æ¥å¿æä»¶åè¡¨";
+$Lang{Old_LOGs} = "æ§æ¥å¿";
+$Lang{Email_summary} = "çµå­é®ä»¶æ¥å";
+$Lang{Config_file} = "éç½®æä»¶";
+# $Lang{Hosts_file} = "Hosts file";
+$Lang{Current_queues} = "å½åéå";
+$Lang{Documentation} = "ææ¡£èµæ";
+
+#$Lang{Host_or_User_name} = "<small>Host or User name:</small>";
+$Lang{Go} = "ç¡®å®";
+$Lang{Hosts} = "å®¢æ·æº";
+$Lang{Select_a_host} = "éæ©å®¢æ·æºå...";
+
+$Lang{There_have_been_no_archives} = "<h2> è¿å°æºå¨è¿ä»æ¥æ²¡ææ§è¡è¿å¤æ¡£æä½ï¼</h2>\n";
+$Lang{This_PC_has_never_been_backed_up} = "<h2> è¿å°æºå¨è¿ä»æ¥æ²¡æè¢«å¤ä»½è¿ï¼ï¼</h2>\n";
+$Lang{This_PC_is_used_by} = "<li>è¿å°æºå¨çç¨æ·åæ¬ \${UserLink(\$user)}";
+
+$Lang{Extracting_only_Errors} = "ï¼åªæåéè¯¯ä¿¡æ¯ï¼";
+$Lang{XferLOG} = "ä¼ è¾æ¥å¿";
+$Lang{Errors}  = "éè¯¯";
+
+# ------------
+$Lang{Last_email_sent_to__was_at___subject} = <<EOF;
+<li>ç»ç¨æ· \${UserLink(\$user)} çæè¿ä¸å°é®ä»¶éåºäº \$mailTimeï¼æ é¢æ¯"\$subj"ã
+EOF
+# ------------
+$Lang{The_command_cmd_is_currently_running_for_started} = <<EOF;
+<li>å½ä»¤ \$cmd æ­£å¨ä¸ºå®¢æ·æº \$host è¿è¡ï¼å¼å§äº \$startTimeã
+EOF
+
+# -----------
+$Lang{Host_host_is_queued_on_the_background_queue_will_be_backed_up_soon} = <<EOF;
+<li>å®¢æ·æº \$host å·²å¨åå°éåä¸­ç­å¾ï¼å³å°è¢«å¤ä»½ï¼ã
+EOF
+
+# ----------
+$Lang{Host_host_is_queued_on_the_user_queue__will_be_backed_up_soon} = <<EOF;
+<li>å®¢æ·æº \$host å·²å¨ç¨æ·éåä¸­ç­å¾ï¼å³å°è¢«å¤ä»½ï¼ã
+EOF
+
+# ---------
+$Lang{A_command_for_host_is_on_the_command_queue_will_run_soon} = <<EOF;
+<li>éå¯¹å®¢æ·æº \$host çä¸æ¡å½ä»¤å·²å¨å½ä»¤éåä¸­ç­å¾ï¼å³å°è¢«æ§è¡ï¼ã
+EOF
+
+# --------
+$Lang{Last_status_is_state_StatusHost_state_reason_as_of_startTime} = <<EOF;
+<li>æåç¶ææ¯ \"\$Lang->{\$StatusHost{state}}\"\$reasonï¼å½æ¶æ¶é´ \$startTimeã
+EOF
+
+# --------
+$Lang{Last_error_is____EscHTML_StatusHost_error} = <<EOF;
+<li>æåéè¯¯ä¿¡æ¯æ¯ \"\${EscHTML(\$StatusHost{error})}\"ã
+EOF
+
+# ------
+$Lang{Pings_to_host_have_failed_StatusHost_deadCnt__consecutive_times} = <<EOF;
+<li>è¯å¾ä¸å®¢æ·æº \$host èç³»ï¼Ping æä½ï¼å·²è¿ç»­å¤±è´¥ \$StatusHost{deadCnt} æ¬¡ã 
+EOF
+
+# -----
+$Lang{Prior_to_that__pings} = "ååï¼Ping";
+
+# -----
+$Lang{priorStr_to_host_have_succeeded_StatusHostaliveCnt_consecutive_times} = <<EOF;
+<li>\$priorStr å®¢æ·æº \$host å·²è¿ç»­æå \$StatusHost{aliveCnt} æ¬¡ã
+EOF
+
+$Lang{Because__host_has_been_on_the_network_at_least__Conf_BlackoutGoodCnt_consecutive_times___} = <<EOF;
+<li>å ä¸ºå®¢æ·æº \$host å·²ç»å¨ç½ç»ä¸è³å°è¿ç»­ \$Conf{BlackoutGoodCnt} æ¬¡ï¼
+å¨ä¸åæ¶æ®µ \$blackoutStrï¼å®å°ä¸è¿è¡å¤ä»½æä½ã
+EOF
+
+$Lang{__time0_to__time1_on__days} = "\$t0 to \$t1 å¨ \$days";
+
+$Lang{Backups_are_deferred_for_hours_hours_change_this_number} = <<EOF;
+<li>å¤ä»½è¢«æ¨è¿ \$hours å°æ¶
+(<a href=\"\$MyURL?action=Stop_Dequeue_Backup&host=\$host\">æ¹åæ¶é´</a>)ã
+EOF
+
+$Lang{tryIP} = " å \$StatusHost{dhcpHostIP}";
+
+# $Lang{Host_Inhost} = "Host \$In{host}";
+
+$Lang{checkAll} = <<EOF;
+<tr><td class="fviewborder">
+<input type="checkbox" name="allFiles" onClick="return checkAll('allFiles');">&nbsp;å¨é
+</td><td colspan="5" align="center" class="fviewborder">
+<input type="submit" name="Submit" value="æ¢å¤è¢«éæ©çæä»¶">
+</td></tr>
+EOF
+
+$Lang{checkAllHosts} = <<EOF;
+<tr><td class="fviewborder">
+<input type="checkbox" name="allFiles" onClick="return checkAll('allFiles');">&nbsp;å¨é
+</td><td colspan="2" align="center" class="fviewborder">
+<input type="submit" name="Submit" value="å¤æ¡£è¢«éæ©çå®¢æ·æº">
+</td></tr>
+EOF
+
+$Lang{fileHeader} = <<EOF;
+    <tr class="fviewheader"><td align=center> æä»¶ï¼ç®å½å</td>
+       <td align="center"> ç±»å</td>
+       <td align="center"> è¯»åæé</td>
+       <td align="center"> å¤ä»½åºåå·</td>
+       <td align="center"> å¤§å°</td>
+       <td align="center"> ä¿®æ¹æ¥æ</td>
+    </tr>
+EOF
+
+$Lang{Home} = "ä¸»é¡µ";
+$Lang{Browse} = "æµè§å¤ä»½";
+$Lang{Last_bad_XferLOG} = "æè¿åºéä¼ è¾æ¥å¿";
+$Lang{Last_bad_XferLOG_errors_only} = "æè¿åºéä¼ è¾æ¥å¿ï¼åªå«éè¯¯ï¼";
+
+$Lang{This_display_is_merged_with_backup} = <<EOF;
+<li> æ¬é¡µæ¾ç¤ºçæ¯ä¸å¤ä»½åºå #\$numF åæçç»æã
+EOF
+
+$Lang{Visit_this_directory_in_backup} = <<EOF;
+<li> éæ©ä½ æ³æ¥ççå¤ä»½ï¼<select onChange="window.location=this.value">\$otherDirs </select>
+EOF
+
+$Lang{Restore_Summary} = <<EOF;
+\${h2("æ¢å¤æ¥å")}
+<p>
+ç¹å»æ¢å¤åºåå·è·åè¯¦æã
+<table class="tableStnd" border cellspacing="1" cellpadding="3" width="80%">
+<tr class="tableheader"><td align="center"> æ¢å¤åºåå· </td>
+    <td align="center"> ç»æ </td>
+    <td align="right"> å¼å§æ¶é´ </td>
+    <td align="right"> èæ¶ï¼åéï¼</td>
+    <td align="right"> æä»¶ä¸ªæ° </td>
+    <td align="right"> å¤§å°(MB) </td>
+    <td align="right"> Tar éè¯¯ä¸ªæ° </td>
+    <td align="right"> ä¼ è¾éè¯¯ä¸ªæ° </td>
+</tr>
+\$restoreStr
+</table>
+<p>
+EOF
+
+$Lang{Archive_Summary} = <<EOF;
+\${h2("å¤æ¡£æ¥å")}
+<p>
+ç¹å»å¤æ¡£åºåå·è·åè¯¦æã
+<table class="tableStnd" border cellspacing="1" cellpadding="3" width="80%">
+<tr class="tableheader"><td align="center"> å¤æ¡£åºåå· </td>
+    <td align="center"> ç»æ </td>
+    <td align="right"> å¼å§æ¶é´ </td>
+    <td align="right"> èæ¶ï¼åéï¼</td>
+</tr>
+\$ArchiveStr
+</table>
+<p>
+EOF
+
+$Lang{BackupPC__Documentation} = "BackupPC: ææ¡£èµæ";
+
+$Lang{No} = "å¦";
+$Lang{Yes} = "æ¯";
+
+$Lang{The_directory_is_empty} = <<EOF;
+<tr><td bgcolor="#ffffff">ç®å½ \${EscHTML(\$dirDisplay)} æ¯ç©ºç®å½
+</td></tr>
+EOF
+
+#$Lang{on} = "å¼";
+$Lang{off} = "å³";
+
+$Lang{backupType_full}    = "å®å¨";
+$Lang{backupType_incr}    = "å¢é";
+$Lang{backupType_partial} = "é¨å";
+
+$Lang{failed} = "å¤±è´¥";
+$Lang{success} = "æå";
+$Lang{and} = "å";
+
+# ------
+# Hosts states and reasons
+$Lang{Status_idle} = "ç©ºé²";
+$Lang{Status_backup_starting} = "å¤ä»½å·²å¼å§";
+$Lang{Status_backup_in_progress} = "å¤ä»½è¿è¡ä¸­";
+$Lang{Status_restore_starting} = "æ¢å¤å·²å¼å§";
+$Lang{Status_restore_in_progress} = "æ¢å¤è¿è¡ä¸­";
+$Lang{Status_link_pending} = "æä»¶é¾æ¥å¾å»ºç«";
+$Lang{Status_link_running} = "æä»¶é¾æ¥å»ºç«ä¸­";
+
+$Lang{Reason_backup_done}    = "å®æ";
+$Lang{Reason_restore_done}   = "æ¢å¤å®æ";
+$Lang{Reason_archive_done}   = "å¤æ¡£å®æ";
+$Lang{Reason_nothing_to_do}  = "ç©ºé²";
+$Lang{Reason_backup_failed}  = "å¤ä»½å¤±è´¥";
+$Lang{Reason_restore_failed} = "æ¢å¤å¤±è´¥";
+$Lang{Reason_archive_failed} = "å¤æ¡£å¤±è´¥";
+$Lang{Reason_no_ping}        = "ç½ç»è¿æ¥ä¸­æ­(no ping)";
+$Lang{Reason_backup_canceled_by_user}  = "å¤ä»½è¢«ç¨æ·åæ¶";
+$Lang{Reason_restore_canceled_by_user} = "æ¢å¤è¢«ç¨æ·åæ¶";
+$Lang{Reason_archive_canceled_by_user} = "å¤æ¡£è¢«ç¨æ·åæ¶";
+$Lang{Disabled_OnlyManualBackups}  = "èªå¨å¤ä»½è¢«å³é­";  
+$Lang{Disabled_AllBackupsDisabled} = "å³é­";                  
+
+
+# ---------
+# Email messages
+
+# No backup ever
+$Lang{EMailNoBackupEverSubj} = "BackupPC: å®¢æ·æº \$host ä»æªè¢«æåå¤ä»½è¿";
+$Lang{EMailNoBackupEverMesg} = <<'EOF';
+To: $user$domain
+cc:
+Subject: $subj
+$headers
+å°æ¬çç¨æ· $userName,
+
+æ¨ççµè ($host) è¿ä»æ¥æ²¡æè¢«æä»¬çå¤ä»½ç³»ç»æåå¤ä»½è¿ã
+æ­£å¸¸æåµä¸ï¼å½æ¨ççµèä¸ç½ç»è¿æ¥æ¶çµèå¤ä»½ä¼èªå¨è¿è¡ã
+å¦ææ¨å±äºä¸é¢ä¸¤ç§æåµï¼è¯·ä¸ç³»ç»ç®¡çåèç³»ï¼
+
+  ï¼ æ¨ççµèç»å¸¸æ¯è¿å¨ç½ç»ä¸çãè¿æå³çå¯è½æ¯æäºéç½®
+     æ¹é¢çé®é¢å¯¼è´å¤ä»½æ æ³è¿è¡ã
+
+  ï¼ æ¨ä¸å¸ææ¨ççµèè¢«å¤ä»½ï¼å¹¶ä¸ä¸æ¿åæ¶å°è¿äºçµå­é®ä»¶ã
+
+å¦æä¸æ¯ä»¥ä¸è¿äºæåµï¼è¯·ç¡®è®¤æ¨ççµèæ¯è¢«è¿æ¥å¨ç½ç»ä¸çã
+
+æ­¤è´æ¬ç¤¼ï¼
+
+BackupPC Genie
+http://backuppc.sourceforge.net
+EOF
+
+# No recent backup
+$Lang{EMailNoBackupRecentSubj} = "BackupPC: å®¢æ·æº \$host æè¿æªè¢«å¤ä»½è¿";
+$Lang{EMailNoBackupRecentMesg} = <<'EOF';
+To: $user$domain
+cc:
+Subject: $subj
+$headers
+å°æ¬çç¨æ· $userName,
+
+æ¨ççµè ($host) å·²ç»æ $days å¤©æ²¡æè¢«æåå¤ä»½è¿äºãæ¨ççµè
+ç¬¬ä¸æ¬¡è¢«å¤ä»½æ¯å¨ $firstTime å¤©åï¼ç´è³ $days å¤©åå·²ç»è¢«å¤ä»½è¿ $numBackups æ¬¡ã
+æ­£å¸¸æåµä¸ï¼å½æ¨ççµèä¸ç½ç»è¿æ¥æ¶çµèå¤ä»½ä¼èªå¨è¿è¡ã
+
+å¨æè¿ $days å¤©åï¼å¦ææ¨ççµèå·²ç»ä¸ç½ç»è¿æ¥äºè¥å¹²å°æ¶ï¼
+è¯·ä¸ç³»ç»ç®¡çåèç³»ä»¥å¤æ­ä¸ºä»ä¹å¤ä»½æ²¡æè¿è¡ã
+
+é¤æ­¤ä¹å¤ï¼å¦ææ¨ä¸å¨åå¬å®¤ï¼æ¨åªè½æå¨æ·è´éè¦æä»¶å°å¶å®å­å¨ä»è´¨ä¸ã
+åºè¯¥æéæ¨çæ¯ï¼å¦ææ¨ççµèç£çæåï¼æ¨å¨æè¿ $days å¤©ååå»ºæä¿®æ¹
+çæä»¶ï¼åæ¬æ°æ¶å°ççµå­é®ä»¶åéä»¶ï¼å°æ æ³è¢«æ¢å¤ã
+
+æ­¤è´æ¬ç¤¼ï¼
+
+BackupPC Genie
+http://backuppc.sourceforge.net
+EOF
+
+# Old Outlook files
+$Lang{EMailOutlookBackupSubj} = "BackupPC: å®¢æ·æº \$host ä¸çå¾®è½¯ Outlook æä»¶éè¦å¤ä»½";
+$Lang{EMailOutlookBackupMesg} = <<'EOF';
+To: $user$domain
+cc:
+Subject: $subj
+$headers
+å°æ¬çç¨æ· $userName,
+
+æ¨ççµèä¸ç Outlook æä»¶ $howLongã
+
+è¿äºæä»¶åæ¬æææ¨ççµå­é®ä»¶ï¼éä»¶ï¼éè®¯å½åæ¥ç¨è¡¨ä¿¡æ¯ã
+æ¨ççµèç¬¬ä¸æ¬¡è¢«å¤ä»½æ¯å¨ $firstTime å¤©åï¼ç´è³ $lastTime å¤©åå·²ç»è¢«
+å¤ä»½è¿ $numBackups æ¬¡ãä½æ¯ï¼Outlook å¨è¿è¡æ¶éä½æææå±æä»¶ï¼
+å¯¼è´è¿äºæä»¶æ æ³è¢«å¤ä»½ã
+
+å»ºè®®æ¨ä¾ä»¥ä¸æ¹å¼å¤ä»½ Outlook æä»¶ï¼
+
+1ãé¦åç¡®è®¤çµèæ¯è¿æ¥å¨ç½è·¯ä¸ï¼
+2ãéåº Outlook åææå¶å®åºç¨ï¼
+3ãä½¿ç¨ç½é¡µæµè§å¨è®¿é®æ­¤é¾æ¥ï¼
+
+    $CgiURL?host=$host               
+
+éæ© âå¼å§å¢éå¤ä»½âï¼å¯å¨å¢éå¤ä»½æä½ï¼ç¶åéæ© âè¿å $host ä¸»é¡µâ
+å¹¶ç¨æµè§å¨ç âå·æ°â åè½æ¥æ£æ¥è¯¥å¤ä»½æä½çç¶æã
+
+æ­¤è´æ¬ç¤¼ï¼
+
+BackupPC Genie
+http://backuppc.sourceforge.net
+EOF
+
+$Lang{howLong_not_been_backed_up} = "è¿ä»æªè¢«æåå¤ä»½è¿";
+$Lang{howLong_not_been_backed_up_for_days_days} = "å·²ç»æ \$days å¤©æªè¢«å¤ä»½è¿";
+
+#######################################################################
+# RSS strings
+#######################################################################
+$Lang{RSS_Doc_Title}       = "BackupPC æå¡å¨";
+$Lang{RSS_Doc_Description} = "RSS feed for BackupPC";
+$Lang{RSS_Host_Summary}    = <<EOF;
+å®å¨å¤ä»½ä¸ªæ°ï¼\$fullCnt;
+æåä¸æ¬¡å®å¨å¤ä»½ (å¤©å)ï¼\$fullAge;
+å®å¨å¤ä»½å¤§å° (GB)ï¼\$fullSize;
+å®å¨å¤ä»½éåº¦ (MB/sec)ï¼\$fullRate;
+å¢éå¤ä»½ä¸ªæ°ï¼\$incrCnt;
+æåä¸æ¬¡å¢éå¤ä»½ (å¤©å)ï¼\$incrAge;
+å½åç¶æï¼\$host_state;
+æåä¸æ¬¡å¤ä»½ç»æï¼\$host_last_attempt;
+EOF
+
+#######################################################################
+# Configuration editor strings
+#######################################################################
+
+$Lang{Only_privileged_users_can_edit_config_files} = "åªæç¹æç¨æ·å¯ä»¥ç¼è¾æå¡å¨éç½®ã";
+$Lang{CfgEdit_Edit_Config} = "ä¿®æ¹æå¡å¨éç½®";
+$Lang{CfgEdit_Edit_Hosts}  = "å¢å å®¢æ·æº";
+
+$Lang{CfgEdit_Title_Server} = "æå¡å¨";
+$Lang{CfgEdit_Title_General_Parameters} = "æ»ä½åæ°";
+$Lang{CfgEdit_Title_Wakeup_Schedule} = "å¤éè°åº¦";
+$Lang{CfgEdit_Title_Concurrent_Jobs} = "å¹¶è¡ä»»å¡";
+$Lang{CfgEdit_Title_Pool_Filesystem_Limits} = "å¤ä»½æ± æä»¶ç³»ç»èµæºéå¶";
+$Lang{CfgEdit_Title_Other_Parameters} = "å¶å®åæ°";
+$Lang{CfgEdit_Title_Remote_Apache_Settings} = "è¿ç¨ Apache æå¡å¨è®¾ç½®";
+$Lang{CfgEdit_Title_Program_Paths} = "ç¨åºè·¯å¾";
+$Lang{CfgEdit_Title_Install_Paths} = "å®è£è·¯å¾";
+$Lang{CfgEdit_Title_Email} = "çµå­é®ä»¶";
+$Lang{CfgEdit_Title_Email_settings} = "çµå­é®ä»¶è®¾ç½®";
+$Lang{CfgEdit_Title_Email_User_Messages} = "ç¨æ·é®ä»¶åå®¹è®¾ç½®";
+$Lang{CfgEdit_Title_CGI} = "CGI";
+$Lang{CfgEdit_Title_Admin_Privileges} = "ç®¡çç¹æ";
+$Lang{CfgEdit_Title_Page_Rendering} = "ç½é¡µå¤è§";
+$Lang{CfgEdit_Title_Paths} = "è·¯å¾";
+$Lang{CfgEdit_Title_User_URLs} = "ç¨æ· URLs";
+$Lang{CfgEdit_Title_User_Config_Editing} = "ç¨æ·éç½®ç¼è¾";
+$Lang{CfgEdit_Title_Xfer} = "ä¼ è¾";
+$Lang{CfgEdit_Title_Xfer_Settings} = "ä¼ è¾è®¾ç½®";
+$Lang{CfgEdit_Title_Smb_Settings} = "Smb è®¾ç½®";
+$Lang{CfgEdit_Title_Tar_Settings} = "Tar è®¾ç½®";
+$Lang{CfgEdit_Title_Rsync_Settings} = "Rsync è®¾ç½®";
+$Lang{CfgEdit_Title_Rsyncd_Settings} = "Rsyncd è®¾ç½®";
+$Lang{CfgEdit_Title_BackupPCd_Settings} = "BackupPCd è®¾ç½®";
+$Lang{CfgEdit_Title_Archive_Settings} = "å¤æ¡£è®¾ç½®";
+$Lang{CfgEdit_Title_Include_Exclude} = "åå«ï¼æé¤";
+$Lang{CfgEdit_Title_Smb_Paths_Commands} = "Smb è·¯å¾ï¼å½ä»¤";
+$Lang{CfgEdit_Title_Tar_Paths_Commands} = "Tar è·¯å¾ï¼å½ä»¤";
+$Lang{CfgEdit_Title_Rsync_Paths_Commands_Args} = "Rsync è·¯å¾ï¼å½ä»¤ï¼åæ°";
+$Lang{CfgEdit_Title_Rsyncd_Port_Args} = "Rsyncd ç«¯å£ï¼åæ°";
+$Lang{CfgEdit_Title_Archive_Paths_Commands} = "å¤æ¡£è·¯å¾ï¼å½ä»¤";
+$Lang{CfgEdit_Title_Schedule} = "è°åº¦";
+$Lang{CfgEdit_Title_Full_Backups} = "å®å¨å¤ä»½";
+$Lang{CfgEdit_Title_Incremental_Backups} = "å¢éå¤ä»½";
+$Lang{CfgEdit_Title_Blackouts} = "å¤ä»½æåæ";
+$Lang{CfgEdit_Title_Other} = "å¶å®";
+$Lang{CfgEdit_Title_Backup_Settings} = "å¤ä»½è®¾ç½®";
+$Lang{CfgEdit_Title_Client_Lookup} = "å®¢æ·æºæ¥æ¾";
+$Lang{CfgEdit_Title_Other} = "å¶å®";
+$Lang{CfgEdit_Title_User_Commands} = "ç¨æ·å½ä»¤";
+$Lang{CfgEdit_Title_Hosts} = "å®¢æ·æº";
+
+$Lang{CfgEdit_Hosts_Comment} = <<EOF;
+è¦å¢å ä¸å°æ°çå¤ä»½å®¢æ·æºï¼è¯·ç¹å»"æ·»å "ï¼ç¶åå¨ "host" åè¾å¥å¶ä¸»æºåã
+å³äº "dhcp" åçéæ©ï¼åªè¦è¯¥å®¢æ·æºç IP å°åè½è¢« nslookup æ nmblookup å½ä»¤
+è·å¾ï¼å°±ä¸éæ©æ­¤æ å¿ä½ã"user" åä¸­å¡«å¥è¯¥å®¢æ·æºçä¸ä¸ªæ¥æèæä½¿ç¨èçç¨æ·åï¼
+æ­¤ç¨æ·æ¥æå¼å§ï¼ä¸­æ­¢ï¼æµè§ï¼æ¢å¤è¯¥å®¢æ·æºå¤ä»½çæé;åæ¶æ­¤ç¨æ·å°è¢«ä¼ éçµå­é®ä»¶ï¼
+æä»¥æ­¤ç¨æ·åå¿é¡»æ¯ä¸ä¸ªåæ³çµå­é®ä»¶ç¨æ·åã"moreUsers" åä¸­å¯å¡«å¥è¯¥å®¢æ·æºç
+å¶ä»ä½¿ç¨èçç¨æ·åï¼ä»ä»¬ä¹æ¥æå¼å§ï¼ä¸­æ­¢ï¼æµè§ï¼æ¢å¤è¯¥å®¢æ·æºå¤ä»½çæéï¼
+å¤ä¸ªç¨æ·åé´ç¨éå·åéä¸ä¸è½å«ç©ºæ ¼ãä¸ "user" åä¸åçæ¯ï¼"moreUsers" å
+ä¸­ç¨æ·ä¸è¢«ä¼ éçµå­é®ä»¶ï¼æä»¥ä»ä»¬ä¸å¿æ¯åæ³çµå­é®ä»¶ç¨æ·åï¼åªè¦è½è¢« 
+Apache Web æå¡å¨è®¤è¯ç»å½å³å¯ã å¦ææ³å¨ä¸å°ç°æå®¢æ·æºçç®¡çéç½®çåºç¡ä¸
+éç½®ä¸å°æ°æºï¼è¯¥æ°æºä¸»æºåå¯å¨ "host" åä»¥è¿ç§æ¹å¼è¾å¥ "NEWHOST=COPYHOST" ï¼
+è¿é NEWHOST æ¯æ°æºä¸»æºåï¼COPYHOST æ¯ç°æå®¢æ·æºä¸»æºåãä¹å¯ä»¥ä»¥è¿ç§æ¹å¼
+ä¿®æ¹ä¸ä¸ªç°æå®¢æ·æºçéç½®ãè¦å é¤ä¸å°ç°æå¤ä»½å®¢æ·æºï¼è¯·ç¹å»å¶æå¨è¡ç"å é¤"ã
+ææä¸è¿°ä¿®æ¹åªæå¨ç¹å»"ä¿å­âåæè½çæãè¢«å é¤çå¤ä»½å®¢æ·æºï¼å¶å¤ä»½æ°æ®
+å¹¶æ²¡æè¢«å é¤ãæä»¥å¦æä¸æ"å é¤"ä¸å°å¤ä»½å®¢æ·æºï¼åªééæ°"æ·»å "å³å¯ãè¦æ³
+å®å¨å é¤ä¸å°å¤ä»½å®¢æ·æºçå¤ä»½æ°æ®ï¼ä½ éè¦æå¨å é¤å¤ä»½æå¡å¨ç®å½
+ \$topDir/pc/HOST ä¸çæææä»¶ï¼è¿é HOST æ¯è¯¥å®¢æ·æºä¸»æºåã
+EOF
+
+$Lang{CfgEdit_Header_Main} = <<EOF;
+\${h1("æ»ä½éç½®ç¼è¾")}
+EOF
+
+$Lang{CfgEdit_Header_Host} = <<EOF;
+\${h1("å®¢æ·æº \$host éç½®ç¼è¾")}
+<p>
+æ³¨æï¼éç¨äºææå®¢æ·æºçå¨å±æ§é»è®¤éç½®ï¼å¶ç¸åº âæ¿æ¢â æçæ¹æ¡æ¯ä¸è¢«éæ©çãå¦æè¦ä¿®æ¹æ¬å®¢æ·æºçæé¡¹è®¾ç½®ï¼è¯·ç¹å» âæ¿æ¢â æçæ¹æ¡ãå¦æè¯¥è®¾ç½®å·²ç»å¤äºè¢«ä¿®æ¹ç¶æï¼åä¿®æ¹åä¸éç¹å» âæ¿æ¢â æçæ¹æ¡ãå¦æè¦å°å¶è¿åä½¿ç¨é»è®¤éç½®ï¼åéç¹å» âæ¿æ¢â æçæ¹æ¡ï¼ä½¿å¶å¤äºæªè¢«ä¿®æ¹ç¶æã
+<p>
+EOF
+
+$Lang{CfgEdit_Button_Save}     = "ä¿å­";
+$Lang{CfgEdit_Button_Insert}   = "æå¥";
+$Lang{CfgEdit_Button_Delete}   = "å é¤";
+$Lang{CfgEdit_Button_Add}      = "æ·»å ";
+$Lang{CfgEdit_Button_Override} = "æ¿æ¢";
+$Lang{CfgEdit_Button_New_Key}  = "æä»¶å·å(Windows Share)";
+
+$Lang{CfgEdit_Error_No_Save}
+            = "éè¯¯ï¼æè¯¯ï¼æ æ³ä¿å­";
+$Lang{CfgEdit_Error__must_be_an_integer}
+            = "éè¯¯ï¼\$var å¿é¡»æ¯æ´æ°";
+$Lang{CfgEdit_Error__must_be_real_valued_number}
+            = "éè¯¯ï¼\$var å¿é¡»æ¯å®æ°ï¼ä¸è½æ¯æµ®ç¹æ°";
+$Lang{CfgEdit_Error__entry__must_be_an_integer}
+            = "éè¯¯ï¼\$var åå®¹ \$k å¿é¡»æ¯æ´æ°";
+$Lang{CfgEdit_Error__entry__must_be_real_valued_number}
+            = "éè¯¯ï¼\$var åå®¹ \$k å¿é¡»æ¯å®æ°ï¼ä¸è½æ¯æµ®ç¹æ°";
+$Lang{CfgEdit_Error__must_be_executable_program}
+            = "éè¯¯ï¼\$var å¿é¡»æ¯å¯æ§è¡ç¨åº";
+$Lang{CfgEdit_Error__must_be_valid_option}
+            = "éè¯¯ï¼\$var å¿é¡»æ¯åæ³éé¡¹";
+$Lang{CfgEdit_Error_Copy_host_does_not_exist}
+            = "å®¢æ·æº \$copyHost ä¸å­å¨ï¼çæå¨è®¡ç®æºå \$fullHostãå¦ææ­¤å®¢æ·æºä¸æ¯ä½ æ³è¦çï¼è¯·å°å®å é¤ã";
+
+$Lang{CfgEdit_Log_Copy_host_config}
+            = "ç¨æ· \$User æ·è´äºå®¢æ·æº \$fromHost çéç½®å°å®¢æ·æº \$host\n";
+$Lang{CfgEdit_Log_Delete_param}
+            = "ç¨æ· \$User ä»éç½® \$conf ä¸­å é¤äº \$p\n";
+$Lang{CfgEdit_Log_Add_param_value}
+            = "ç¨æ· \$User æ·»å äº \$p å°éç½® \$conf ä¸­ï¼å¼è®¾ä¸º \$value\n";
+$Lang{CfgEdit_Log_Change_param_value}
+            = "ç¨æ· \$User å°éç½® \$conf ä¸­ç \$p ä» \$valueOld æ´æ¹ä¸º \$valueNew\n";
+$Lang{CfgEdit_Log_Host_Delete}
+            = "ç¨æ· \$User å é¤äºå®¢æ·æº \$host\n";
+$Lang{CfgEdit_Log_Host_Change}
+            = "ç¨æ· \$User å°å®¢æ·æº \$host ä¸ç \$key ä» \$valueOld æ´æ¹ä¸º \$valueNew\n";
+$Lang{CfgEdit_Log_Host_Add}
+            = "ç¨æ· \$User æ·»å äºå®¢æ·æº \$host: \$value\n";
+  
+#end of lang_zh_CN.pm
diff --git a/lib/BackupPC/Lib.pm b/lib/BackupPC/Lib.pm
index 44de3c5..e1dda82 100644
--- a/lib/BackupPC/Lib.pm
+++ b/lib/BackupPC/Lib.pm
@@ -49,6 +49,7 @@ use Socket;
 use Cwd;
 use Digest::MD5;
 use Config;
+use Encode;
 
 use vars qw( $IODirentOk );
 use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
@@ -451,6 +452,10 @@ sub HostsMTime
 # $need is a hash of file attributes we need: type, inode, or nlink.
 # If set, these parameters are added to the returned hash.
 #
+# To support browsing pre-3.0.0 backups where the charset encoding
+# is typically iso-8859-1, the charsetLegacy option can be set in
+# $need to convert the path from utf8 and convert the names to utf8.
+#
 # If IO::Dirent is successful if will get type and inode for free.
 # Otherwise, a stat is done on each file, which is more expensive.
 #
@@ -459,6 +464,8 @@ sub dirRead
     my($bpc, $path, $need) = @_;
     my(@entries, $addInode);
 
+    from_to($path, "utf8", $need->{charsetLegacy})
+                        if ( $need->{charsetLegacy} ne "" );
     return if ( !opendir(my $fh, $path) );
     if ( $IODirentOk ) {
         @entries = sort({ $a->{inode} <=> $b->{inode} } readdirent($fh));
@@ -495,6 +502,14 @@ sub dirRead
     # sorted above)
     #
     @entries = sort({ $a->{inode} <=> $b->{inode} } @entries) if ( $addInode );
+    #
+    # for browing pre-3.0.0 backups, map iso-8859-1 to utf8 if requested
+    #
+    if ( $need->{charsetLegacy} ne "" ) {
+        for ( my $i = 0 ; $i < @entries ; $i++ ) {
+            from_to($entries[$i]{name}, $need->{charsetLegacy}, "utf8");
+        }
+    }
     return \@entries;
 }
 
@@ -504,9 +519,9 @@ sub dirRead
 #
 sub dirReadNames
 {
-    my($bpc, $path) = @_;
+    my($bpc, $path, $need) = @_;
 
-    my $entries = $bpc->dirRead($path);
+    my $entries = $bpc->dirRead($path, $need);
     return if ( !defined($entries) );
     my @names = map { $_->{name} } @$entries;
     return \@names;
@@ -711,7 +726,10 @@ sub ServerMesg
 {
     my($bpc, $mesg) = @_;
     return if ( !defined(my $fh = $bpc->{ServerFD}) );
+    $mesg =~ s/\n/\\n/g;
+    $mesg =~ s/\r/\\r/g;
     my $md5 = Digest::MD5->new;
+    $mesg = encode_utf8($mesg);
     $md5->add($bpc->{ServerSeed} . $bpc->{ServerMesgCnt}
             . $bpc->{Conf}{ServerMesgSecret} . $mesg);
     print($fh $md5->b64digest . " $mesg\n");
diff --git a/lib/BackupPC/Storage.pm b/lib/BackupPC/Storage.pm
index e54802b..0f7a43e 100644
--- a/lib/BackupPC/Storage.pm
+++ b/lib/BackupPC/Storage.pm
@@ -52,7 +52,7 @@ sub new
                     xferErrs xferBadFile xferBadShare tarErrs
                     compress sizeExistComp sizeNewComp
                     noFill fillFromNum mangle xferMethod level
-                    charset
+                    charset version
                 )],
         RestoreFields => [qw(
                     num startTime endTime result errorMsg nFiles size
diff --git a/lib/BackupPC/Storage/Text.pm b/lib/BackupPC/Storage/Text.pm
index 4dea60e..b99648d 100644
--- a/lib/BackupPC/Storage/Text.pm
+++ b/lib/BackupPC/Storage/Text.pm
@@ -84,6 +84,19 @@ sub BackupInfoRead
         close(BK_INFO);
     }
     close(LOCK);
+    #
+    # Default the level and version fields if not present
+    #
+    for ( my $i = 0 ; $i < @Backups ; $i++ ) {
+        if ( defined($Backups[$i]{level}) ) {
+            if ( !defined($Backups[$i]{version}) ) {
+                $Backups[$i]{version} = "3.0.0";
+            }
+        } else {
+            $Backups[$i]{level} = $Backups[$i]{type} eq "incr" ? 1 : 0;
+            $Backups[$i]{version} = "2.1.2";
+        }
+    }
     return @Backups;
 }
 
@@ -279,6 +292,7 @@ sub ConfigDataRead
         }
         %$conf = ( %$conf, %Conf );
     }
+
     #
     # Promote BackupFilesOnly and BackupFilesExclude to hashes
     #
@@ -306,6 +320,11 @@ sub ConfigDataRead
         delete($conf->{BlackoutWeekDays});
     }
 
+    #
+    # Make sure IncrLevels is defined
+    #
+    $conf->{IncrLevels} = [1] if ( !defined($conf->{IncrLevels}) );
+
     return (undef, $conf);
 }
 
diff --git a/lib/BackupPC/View.pm b/lib/BackupPC/View.pm
index cf03983..64d5abe 100644
--- a/lib/BackupPC/View.pm
+++ b/lib/BackupPC/View.pm
@@ -64,10 +64,6 @@ sub new
                                 # are added to the returned hash.
                                 # See BackupPC::Lib::dirRead().
     }, $class;
-    for ( my $i = 0 ; $i < @{$m->{backups}} ; $i++ ) {
-	next if ( defined($m->{backups}[$i]{level}) );
-	$m->{backups}[$i]{level} = $m->{backups}[$i]{type} eq "incr" ? 1 : 0;
-    }
     $m->{topDir} = $m->{bpc}->TopDir();
     return $m;
 }
@@ -138,7 +134,7 @@ sub dirCache
         my $attr;
 	if ( $mangle ) {
 	    $attr = BackupPC::Attrib->new({ compress => $compress });
-	    if ( -f $attr->fileName($path) && !$attr->read($path) ) {
+	    if ( !$attr->read($path) ) {
                 $m->{error} = "Can't read attribute file in $path";
 		$attr = undef;
 	    }
@@ -402,7 +398,7 @@ sub dirHistory
         my $attr;
 	if ( $mangle ) {
 	    $attr = BackupPC::Attrib->new({ compress => $compress });
-	    if ( -f $attr->fileName($path) && !$attr->read($path) ) {
+	    if ( !$attr->read($path) ) {
                 $m->{error} = "Can't read attribute file in $path";
 		$attr = undef;
 	    }
diff --git a/lib/BackupPC/Xfer/RsyncFileIO.pm b/lib/BackupPC/Xfer/RsyncFileIO.pm
index 044ee55..221fd3f 100644
--- a/lib/BackupPC/Xfer/RsyncFileIO.pm
+++ b/lib/BackupPC/Xfer/RsyncFileIO.pm
@@ -436,6 +436,8 @@ sub attribSet
     my($fio, $f, $placeHolder) = @_;
     my($dir, $file);
 
+    return if ( $placeHolder && $fio->{phase} > 0 );
+
     if ( $f->{name} =~ m{(.*)/(.*)}s ) {
 	$file = $2;
 	$dir  = "$fio->{shareM}/" . $1;
@@ -447,10 +449,13 @@ sub attribSet
 	$file = $f->{name};
     }
 
-    if ( !defined($fio->{attribLastDir}) || $fio->{attribLastDir} ne $dir ) {
+    if ( $dir ne ""
+            && (!defined($fio->{attribLastDir}) || $fio->{attribLastDir} ne $dir) ) {
         #
         # Flush any directories that don't match the first part
-        # of the new directory
+        # of the new directory.  Don't flush the top-level directory
+        # (ie: $dir eq "") since the "." might get sorted in the middle
+        # of other top-level directories or files.
         #
         foreach my $d ( keys(%{$fio->{attrib}}) ) {
             next if ( $d eq "" || "$dir/" =~ m{^\Q$d/} );
@@ -459,17 +464,29 @@ sub attribSet
 	$fio->{attribLastDir} = $dir;
     }
     if ( !exists($fio->{attrib}{$dir}) ) {
+        $fio->log("attribSet: dir=$dir not found") if ( $fio->{logLevel} >= 4 );
         $fio->{attrib}{$dir} = BackupPC::Attrib->new({
 				     compress => $fio->{xfer}{compress},
 				});
-	my $path = $fio->{outDir} . $dir;
-        if ( -f $fio->{attrib}{$dir}->fileName($path)
-                    && !$fio->{attrib}{$dir}->read($path) ) {
-            $fio->log(sprintf("Unable to read attribute file %s",
+        my $dirM = $dir;
+	$dirM = $1 . "/" . $fio->{bpc}->fileNameMangle($2)
+			if ( $dirM =~ m{(.*?)/(.*)}s );
+	my $path = $fio->{outDir} . $dirM;
+        if ( -f $fio->{attrib}{$dir}->fileName($path) ) {
+            if ( !$fio->{attrib}{$dir}->read($path) ) {
+                $fio->log(sprintf("Unable to read attribute file %s",
 			    $fio->{attrib}{$dir}->fileName($path)));
+            } else {
+                $fio->log(sprintf("attribRead file %s",
+			    $fio->{attrib}{$dir}->fileName($path)))
+                                     if ( $fio->{logLevel} >= 4 );
+            }
         }
+    } else {
+        $fio->log("attribSet: dir=$dir exists") if ( $fio->{logLevel} >= 4 );
     }
-    $fio->log("attribSet(dir=$dir, file=$file)") if ( $fio->{logLevel} >= 4 );
+    $fio->log("attribSet(dir=$dir, file=$file, size=$f->{size}, placeholder=$placeHolder)")
+                        if ( $fio->{logLevel} >= 4 );
 
     my $mode = $f->{mode};
 
@@ -490,11 +507,6 @@ sub attribWrite
     my($fio, $d) = @_;
     my($poolWrite);
 
-    #
-    # Don't write attributes on 2nd phase - they're already
-    # taken care of during the first phase.
-    #
-    return if ( $fio->{phase} > 0 );
     if ( !defined($d) ) {
         #
         # flush all entries (in reverse order)
@@ -505,6 +517,7 @@ sub attribWrite
         return;
     }
     return if ( !defined($fio->{attrib}{$d}) );
+
     #
     # Set deleted files in the attributes.  Any file in the view
     # that doesn't have attributes is flagged as deleted for
@@ -541,7 +554,7 @@ sub attribWrite
 				}) if ( $fio->{logLevel} >= 2
                                       && $a->{type} == BPC_FTYPE_FILE );
 		    }
-		} elsif ( !$fio->{full} ) {
+		} elsif ( $fio->{phase} == 0 && !$fio->{full} ) {
 		    ##print("Delete file $f\n");
 		    $fio->logFileAction("delete", {
 				%{$fio->{viewCache}{$d}{$f}},
@@ -559,7 +572,7 @@ sub attribWrite
 	    }
 	}
     }
-    if ( $fio->{attrib}{$d}->fileCount ) {
+    if ( $fio->{attrib}{$d}->fileCount || $fio->{phase} > 0 ) {
         my $data = $fio->{attrib}{$d}->writeData;
 	my $dirM = $d;
 
diff --git a/makeDist b/makeDist
index ad21c6f..506fb5d 100755
--- a/makeDist
+++ b/makeDist
@@ -292,6 +292,8 @@ sub InstallFile
 		print OUT "$1'__TOPDIR__'$2\n";
 	    } elsif ( $file =~ /Lib.pm/ && /^(\s*\$installDir\s*=\s*)'.*'(\s*if\s.*)/ ) {
 		print OUT "$1'__INSTALLDIR__'$2\n";
+	    } elsif ( $file =~ /Lib.pm/ && /^(\s*ConfDir\s*=\>\s*\$confDir eq.*)'.*'(.*)/ ) {
+		print OUT "$1'__CONFDIR__'$2\n";
             } elsif ( $file =~ /Lib.pm/ && /^(\s*my \$useFHS\s*=\s*)\d;/ ) {
                 print OUT "${1}0;\n";
             } elsif ( $file =~ /Lib.pm/ && /(.*Version *=> .*)'[\w\d\.]+',/ ) {
-- 
2.20.1


æ¢å¤å°å®¢æ·æº	+ + +
æ¢å¤å°å·
æ¢å¤å°æ¤ç®å½ä¸ ï¼ä½äºä¸è¿°å·ä¸ï¼
		åè®¡			åææä»¶		æ°å¢æä»¶
å¤ä»½åºåå·ï¼	ç±»å	æä»¶æ°ç®	å¤§å°(MB)	å¤ä»½éåº¦(MB/sec)	æä»¶æ°ç®	å¤§å°(MB)	æä»¶æ°ç®	å¤§å°(MB)
æ¢å¤åºåå·	\$Restores[\$i]{num}
è¯·æ±æ¹	\$RestoreReq{user}
è¯·æ±æ¶é´	\$reqTime
ç»æ	\$Restores[\$i]{result}
éè¯¯ä¿¡æ¯	\$Restores[\$i]{errorMsg}
æºå®¢æ·æº	\$RestoreReq{hostSrc}
æºå¤ä»½åºåå·	\$RestoreReq{num}
æºæä»¶å·	\$RestoreReq{shareSrc}
ç®çå®¢æ·æº	\$RestoreReq{hostDest}
ç®çæä»¶å·	\$RestoreReq{shareDest}
æ¢å¤å¼å§æ¶é´	\$startTime
èæ¶	\$duration åé
æä»¶ä¸ªæ°	\$Restores[\$i]{nFiles}
æä»¶æ»å¤§å°	\${MB} MB
ä¼ è¾éç	\$MBperSec MB/sec
Tar çæè¿ç¨éè¯¯ä¸ªæ°	\$Restores[\$i]{tarCreateErrs}
ä¼ è¾è¿ç¨éè¯¯ä¸ªæ°	\$Restores[\$i]{xferErrs}
ä¼ è¾æ¥å¿æä»¶	+æ¥çæ¥å¿, +æ¥çéè¯¯ +
å¤æ¡£åºåå·	\$Archives[\$i]{num}
è¯·æ±æ¹	\$ArchiveReq{user}
è¯·æ±æ¹	\$reqTime
ç»æ	\$Archives[\$i]{result}
éè¯¯ä¿¡æ¯	\$Archives[\$i]{errorMsg}
å¼å§æ¶é´	\$startTime
èæ¶	\$duration åé
ä¼ è¾æ¥å¿æä»¶	+æ¥çæ¥å¿, +æ¥çéè¯¯ +