X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=conf%2Fconfig.pl;h=7113463f9d556bf38e9edcf32613af40a134fa2c;hp=fd78dfcede89a45010fff68da9e25e0836a087dd;hb=197383fe39b33180b648de9e4bcc1fd7b7ca6a66;hpb=16755c17628b28a58d75663d7541036344826961 diff --git a/conf/config.pl b/conf/config.pl index fd78dfc..7113463 100644 --- a/conf/config.pl +++ b/conf/config.pl @@ -868,6 +868,17 @@ $Conf{XferLogLevel} = 1; # $Conf{ClientCharset} = ''; +# +# Prior to 3.x no charset conversion was done by BackupPC. Backups were +# stored in what ever charset the XferMethod provided - typically utf8 +# for smbclient and the client's locale settings for rsync and tar (eg: +# cp1252 for rsync on WinXX and perhaps iso-8859-1 with rsync on linux). +# This setting tells BackupPC the charset that was used to store file +# names in old backups taken with BackupPC 2.x, so that non-ascii file +# names in old backups can be viewed and restored. +# +$Conf{ClientCharsetLegacy} = 'iso-8859-1'; + # # Name of the host share that is backed up when using SMB. This can be a # string or an array of strings if there are multiple shares per host. @@ -1862,8 +1873,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), Portuguese Brazillian -# (pt_br) and Chinese (zh_CH). +# German (de), Italian (it), Dutch (nl), Polish (pl), 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. @@ -2034,6 +2045,7 @@ $Conf{CgiUserConfigEdit} = { BlackoutPeriods => 1, BackupZeroFilesIsFatal => 1, ClientCharset => 1, + ClientCharsetLegacy => 1, XferMethod => 1, XferLogLevel => 1, SmbShareName => 1,