summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2002-11-20 14:51:56 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2002-11-20 14:51:56 +0000
commit1a811bbdc5ff75d98d8e6211754e374cf4599048 (patch)
tree976cb444447ddc02493cac496fd05fd704bc8990
parentc6a6010149afb7f4b77555f8eae14b57ed7efef0 (diff)
downloaddrakx-1a811bbdc5ff75d98d8e6211754e374cf4599048.tar
drakx-1a811bbdc5ff75d98d8e6211754e374cf4599048.tar.gz
drakx-1a811bbdc5ff75d98d8e6211754e374cf4599048.tar.bz2
drakx-1a811bbdc5ff75d98d8e6211754e374cf4599048.tar.xz
drakx-1a811bbdc5ff75d98d8e6211754e374cf4599048.zip
- don't gratuitously copy a 70 lines help text with typo changes,
translators will kill us - use strict, fix it
-rwxr-xr-xperl-install/standalone/drakbackup79
1 files changed, 6 insertions, 73 deletions
diff --git a/perl-install/standalone/drakbackup b/perl-install/standalone/drakbackup
index 0d22edf02..9087c0833 100755
--- a/perl-install/standalone/drakbackup
+++ b/perl-install/standalone/drakbackup
@@ -119,7 +119,7 @@
use Gtk;
use lib qw(/usr/lib/libDrakX);
-
+use strict;
use standalone; #- warning, standalone must be loaded very first, for 'explanations'
use interactive;
@@ -701,6 +701,8 @@ sub write_password_file {
chmod(0600, "$cfg_dir/rsync.user");
}
+my $in;
+
sub show_warning {
my ($mode, $warning) = @_;
$mode = N_("WARNING") if ($mode eq "w");
@@ -4641,7 +4643,7 @@ sub interactive_mode {
} else {
my_gtk->import(qw(:helpers :wrappers));
}
- my $in = 'interactive'->vnew('', 'default');
+ $in = 'interactive'->vnew('', 'default');
my $box;
$my_win = my_gtk->new('drakbackup');
@@ -4805,20 +4807,7 @@ Otherwise, you are able to select only one of these.
N(" Copyright (C) 2001-2002 MandrakeSoft by DUPONT Sebastien <dupont_s\@epita.fr>") .
"\n" .
N(" updates 2002 MandrakeSoft by Stew Benedict <sbenedict\@mandrakesoft.com>") .
-"\n\n" .
-N(" 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, 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.") .
+"\n\n" . $::license .
"\n\n _____________________\n" .
N("Description:
@@ -4847,7 +4836,6 @@ N("Description:
Configuration file:
/etc/drakconf/drakbackup/drakbakup.conf
-
Restore Step:
During the restore step, DrakBackup will remove
@@ -4879,64 +4867,9 @@ backup data files by hand.
")
);
- my $default_help = N(" Copyright (C) 2001-2002 MandrakeSoft by DUPONT Sebastien <dupont_s\@epita.fr>") .
-"\n" .
-N(" updates 2002 MandrakeSoft by Stew Benedict <sbenedict\@mandrakesoft.com>") .
-"\n\n" .
-N(" 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, 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.") .
-"\n\n _____________________\n" .
-N("Description:
-
- Drakbackup is used to backup your system.
- During the configuration you can select
- - System files,
- - Users files,
- - Other files.
- or All your system ... and Other (like Windows Partitions)
-
- Drakbackup allows you to backup your system on:
- - Harddrive.
- - NFS.
- - CDROM (CDRW), DVDROM (with autoboot, rescue and autoinstall.).
- - FTP.
- - Rsync.
- - Webdav.
- - Tape.
-
- Drakbackup allows you to restore your system to
- a user selected directory.
-
- Per default all backup will be stored on your
- /var/lib/drakbackup directory
-
- Configuration file:
- /etc/drakconf/drakbackup/drakbakup.conf
-
-Restore Step:
-
- During the restore step, Drakbackup will remove
- your original directory and verify that all
- backup files are not corrupted. It is recommended
- you do a last backup before restoring.
-
-
-");
-
################################################ help function ##############################################
- gtktext_insert($text, $custom_helps{$custom_help} || $default_help);
+ gtktext_insert($text, $custom_helps{$custom_help} || $custom_helps{main});
gtkpack($advanced_box,
$advanced_box_help = gtkpack_(new Gtk::VBox(0,10),
1, gtkpack_(new Gtk::HBox(0,0),