summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStew Benedict <stewb@mandriva.org>2003-06-09 16:40:00 +0000
committerStew Benedict <stewb@mandriva.org>2003-06-09 16:40:00 +0000
commit05d25065b976f70c96e5484bd11153e4b442e338 (patch)
tree6054d7f55e80d4b89e3b914d74067ed05e129d81
parentc3772be78eceba6877de997d0ad8eef9dd7f0988 (diff)
downloaddrakx-backup-do-not-use-05d25065b976f70c96e5484bd11153e4b442e338.tar
drakx-backup-do-not-use-05d25065b976f70c96e5484bd11153e4b442e338.tar.gz
drakx-backup-do-not-use-05d25065b976f70c96e5484bd11153e4b442e338.tar.bz2
drakx-backup-do-not-use-05d25065b976f70c96e5484bd11153e4b442e338.tar.xz
drakx-backup-do-not-use-05d25065b976f70c96e5484bd11153e4b442e338.zip
Translation fixes (thx, gc, pixel). Another GUI crash fix.
Diffstat
-rwxr-xr-xperl-install/standalone/drakbackup634
1 files changed, 318 insertions, 316 deletions
diff --git a/perl-install/standalone/drakbackup b/perl-install/standalone/drakbackup
index a32612a3f..89a111872 100755
--- a/perl-install/standalone/drakbackup
+++ b/perl-install/standalone/drakbackup
@@ -604,7 +604,7 @@ sub read_cron_files() {
sub save_cron_files() {
if ($nonroot_user) {
- show_warning("w", N_("Cron not available yet as non-root")) if $not_warned;
+ show_warning("w", N("Cron not available yet as non-root")) if $not_warned;
$not_warned = 0;
$backup_daemon = 0;
return 1;
@@ -718,9 +718,9 @@ my $in;
sub show_warning {
my ($mode, $warning) = @_;
- $mode = N_("WARNING") if $mode eq "w";
- $mode = N_("FATAL") if $mode eq "f";
- $mode = N_("INFO") if $mode eq "i";
+ $mode = N("WARNING") if $mode eq "w";
+ $mode = N("FATAL") if $mode eq "f";
+ $mode = N("INFO") if $mode eq "i";
if ($interactive) {
$in->ask_warn('', translate($mode).": ".translate($warning));
} else {
@@ -732,12 +732,12 @@ sub show_warning {
sub complete_results() {
system_state();
$results .= "***********************************************************************\n\n";
- $daemon or $results .= N_("\n DrakBackup Report \n\n");
- $daemon and $results .= N_("\n DrakBackup Daemon Report\n\n\n");
+ $daemon or $results .= N("\n DrakBackup Report \n\n");
+ $daemon and $results .= N("\n DrakBackup Daemon Report\n\n\n");
$results .= "***********************************************************************\n\n";
$results .= $system_state;
$results .= "\n\n***********************************************************************\n\n";
- $results .= N_("\n DrakBackup Report Details\n\n\n");
+ $results .= N("\n DrakBackup Report Details\n\n\n");
$results .= "***********************************************************************\n\n";
}
@@ -759,7 +759,7 @@ sub ftp_client() {
$ftp->put($_, undef, undef);
$interactive and progress($pbar, $plabel, 0.5, $_);
$interactive and $pbar->set_text($_);
- $interactive and progress($pbar3, $plabel3, 1/@file_list_to_send_by_ftp, N_("Total progess"));
+ $interactive and progress($pbar3, $plabel3, 1/@file_list_to_send_by_ftp, N("Total progess"));
}
$ftp->quit;
return 0;
@@ -814,7 +814,7 @@ sub do_expect {
$exp_command = "ssh-copy-id -i $_ $login_user\@$host_name" if $mode eq "sendkey";
if (-e $backup_key && $mode eq "sendkey") {
- if ($in->ask_yesorno('', N_("%s exists, delete?\n\nWarning: If you've already done this process you'll probably\n need to purge the entry from authorized_keys on the server.", $backup_key))) {
+ if ($in->ask_yesorno('', N("%s exists, delete?\n\nWarning: If you've already done this process you'll probably\n need to purge the entry from authorized_keys on the server.", $backup_key))) {
unlink($backup_key);
unlink($backup_key . '.pub');
} else {
@@ -823,16 +823,16 @@ sub do_expect {
}
if (!(-e $backup_key) && $mode eq "sendkey") {
- $in->ask_warn('', N_("This may take a moment to generate the keys."));
+ $in->ask_warn('', N("This may take a moment to generate the keys."));
cursor_wait();
#- not using a passphrase for the moment
system("ssh-keygen -P '' -t dsa -f $backup_key");
cursor_norm();
}
- my $exp = Expect->spawn($exp_command) or $in->ask_warn('', N_("ERROR: Cannot spawn %s.", $exp_command));
+ my $exp = Expect->spawn($exp_command) or $in->ask_warn('', N("ERROR: Cannot spawn %s.", $exp_command));
- $interactive and progress($pbar3, $plabel3, 1/@send_files, N_("Total progess"));
+ $interactive and progress($pbar3, $plabel3, 1/@send_files, N("Total progess"));
$interactive and $stext->set_text($_);
#- run scp, look for some common errors and try to track successful progress for GUI
@@ -847,17 +847,17 @@ sub do_expect {
[ '-re', 'No such file or directory', sub { $bad_dir = 1; Expect::exp_continue() } ],
# [ '-re', '%', sub { update_scp_progress(); Expect::exp_continue(); } ],
[ eof => sub {
- if (!$spawn_ok) { show_warning("f", N_("No password prompt on %s at port %s", $host_name, $scp_port)) }
- if ($bad_passwd) { show_warning("f", N_("Bad password on %s", $host_name)) }
- if ($no_perm) { show_warning("f", N_("Permission denied transferring %s to %s", $_, $host_name)) }
- if ($bad_dir) { show_warning("f", N_("Can't find %s on %s", $host_path, $host_name)) }
+ if (!$spawn_ok) { show_warning("f", N("No password prompt on %s at port %s", $host_name, $scp_port)) }
+ if ($bad_passwd) { show_warning("f", N("Bad password on %s", $host_name)) }
+ if ($no_perm) { show_warning("f", N("Permission denied transferring %s to %s", $_, $host_name)) }
+ if ($bad_dir) { show_warning("f", N("Can't find %s on %s", $host_path, $host_name)) }
}
],
- [ timeout => sub { show_warning("f", N_("%s not responding", $host_name)) } ],
+ [ timeout => sub { show_warning("f", N("%s not responding", $host_name)) } ],
);
my $exit_stat = $exp->exitstatus;
- $in->ask_warn('', N_("Transfer successful\nYou may want to verify you can login to the server with:\n\nssh -i %s %s\@%s\n\nwithout being prompted for a password.", $backup_key, $login_user, $host_name)) if $exit_stat == 0 && $mode eq "sendkey";
+ $in->ask_warn('', N("Transfer successful\nYou may want to verify you can login to the server with:\n\nssh -i %s %s\@%s\n\nwithout being prompted for a password.", $backup_key, $login_user, $host_name)) if $exit_stat == 0 && $mode eq "sendkey";
$log_buff .= "$_\n" if $exit_stat == 0 && $mode eq "backup";
$exp->hard_close;
}
@@ -888,7 +888,7 @@ sub ssh_client() {
close TMP;
$log_buff .= "\n";
$interactive and progress($pbar, $plabel, 0.5, "Done...");
- $interactive and progress($pbar3, $plabel3, 1/@file_list_to_send_by_ftp, N_("Total progess"));
+ $interactive and progress($pbar3, $plabel3, 1/@file_list_to_send_by_ftp, N("Total progess"));
}
return 0;
}
@@ -902,11 +902,11 @@ sub webdav_client() {
my $command = "sitecopy -u drakbackup";
spawn_progress($command, "Running sitecopy...");
if ($log_buff =~ /Nothing to do - no changes found/) {
- show_warning("w", N_("WebDAV remote site already in sync!"));
+ show_warning("w", N("WebDAV remote site already in sync!"));
return 1;
}
if ($log_buff !~ /Update completed successfully/) {
- show_warning("f", N_("WebDAV transfer failed!"));
+ show_warning("f", N("WebDAV transfer failed!"));
return 1;
}
return 0;
@@ -927,15 +927,15 @@ sub check_for_cd() {
my $command = "cdrecord dev=$cd_device -atip";
spawn_progress($command, "Check for media in drive");
if ($log_buff =~ /No disk/) {
- show_warning("f", N_("No CDR/DVDR in drive!"));
+ show_warning("f", N("No CDR/DVDR in drive!"));
return 1;
}
if ($log_buff !~ /ATIP info from disk/) {
- show_warning("f", N_("Does not appear to be recordable media!"));
+ show_warning("f", N("Does not appear to be recordable media!"));
return 1;
}
if ($log_buff =~ /Is not erasable/ && $media_erase) {
- show_warning("f", N_("Not erasable media!"));
+ show_warning("f", N("Not erasable media!"));
return 1;
}
@@ -974,7 +974,7 @@ sub write_on_cd() {
sub erase_cdrw() {
#- we can only hit this via interactive
$interactive = 0;
- $in->ask_warn('', N_("This may take a moment to erase the media."));
+ $in->ask_warn('', N("This may take a moment to erase the media."));
cursor_wait();
my $command = "cdrecord dev=$cd_device -blank=fast";
spawn_progress($command, "Erasing CDRW...");
@@ -1058,7 +1058,7 @@ sub build_cd() {
if (!check_for_cd()) {
build_iso();
if ($log_buff =~ /Permission denied/) {
- show_warning("f", N_("Permission problem accessing CD."));
+ show_warning("f", N("Permission problem accessing CD."));
$media_problem = 1;
return 1;
} else {
@@ -1085,7 +1085,7 @@ sub build_tape() {
$command = "mt -f $tape_device status";
spawn_progress($command, "Checking for tape");
if ($log_buff =~ /DR_OPEN/) {
- show_warning("f", N_("No tape in %s!", $tape_device));
+ show_warning("f", N("No tape in %s!", $tape_device));
return 1;
}
@@ -1196,7 +1196,7 @@ sub build_backup_files() {
any { /^backup_base_sys/ } @dir_content and $base_sys_exist = 1;
if ($where_hd && !$daemon || $daemon) {
- $interactive and progress($pbar, $plabel, 0.5, N_("Backup system files..."));
+ $interactive and progress($pbar, $plabel, 0.5, N("Backup system files..."));
if ($backup_sys) {
if ($backup_sys_versions) {
$incr = "incr_sys";
@@ -1246,8 +1246,8 @@ sub build_backup_files() {
$results .= "\nfile: $save_path/backup_sys$the_time.$tar_ext\n";
}
}
- $interactive and progress($pbar, $plabel, 0.5, N_("Backup system files..."));
- $interactive and progress($pbar3, $plabel3, 0.3, N_("Hard Disk Backup files..."));
+ $interactive and progress($pbar, $plabel, 0.5, N("Backup system files..."));
+ $interactive and progress($pbar3, $plabel3, 0.3, N("Hard Disk Backup files..."));
if ($backup_user) {
foreach (@user_list) {
@@ -1302,8 +1302,8 @@ sub build_backup_files() {
}
}
}
- $interactive and progress($pbar2, $plabel1, 1, N_("Backup User files..."));
- $interactive and progress($pbar3, $plabel3, 0.4, N_("Hard Disk Backup files..."));
+ $interactive and progress($pbar2, $plabel1, 1, N("Backup User files..."));
+ $interactive and progress($pbar3, $plabel3, 0.4, N("Hard Disk Backup files..."));
if (@list_other) {
if ($backup_other_versions) {
@@ -1352,13 +1352,13 @@ sub build_backup_files() {
$results .= "\nfile: $save_path/backup_other$the_time.$tar_ext\n";
}
}
- $interactive and progress($pbar1, $plabel2, 1, N_("Backup Other files..."));
- $interactive and progress($pbar3, $plabel3, 0.3, N_("Hard Disk Backup Progress..."));
+ $interactive and progress($pbar1, $plabel2, 1, N("Backup Other files..."));
+ $interactive and progress($pbar3, $plabel3, 0.3, N("Hard Disk Backup Progress..."));
}
my $filecount = @file_list_to_send_by_ftp;
if (!$filecount) {
- show_warning("w", N_("No changes to backup!"));
+ show_warning("w", N("No changes to backup!"));
$interactive and cursor_norm();
$interactive and interactive_mode();
return 1;
@@ -1374,17 +1374,17 @@ sub build_backup_files() {
build_cd() if $daemon_media eq 'cd';
build_tape() if $daemon_media eq 'tape';
- $results .= N_("\nDrakbackup activities via %s:\n\n", $daemon_media);
+ $results .= N("\nDrakbackup activities via %s:\n\n", $daemon_media);
$results .= $log_buff;
}
#- leave this one alone for now - works well
#- integrate with other methods later
if (($where_net && !$daemon && $net_proto eq 'ftp') || $daemon && $daemon_media eq 'ftp') {
- $results .= N_("file list sent by FTP: %s\n ", $_) foreach @file_list_to_send_by_ftp;
+ $results .= N("file list sent by FTP: %s\n ", $_) foreach @file_list_to_send_by_ftp;
$interactive and build_backup_ftp_status();
if (ftp_client()) {
- $results .= N_("\n FTP connection problem: It was not possible to send your backup files by FTP.\n");
+ $results .= N("\n FTP connection problem: It was not possible to send your backup files by FTP.\n");
$interactive and client_ftp_pb();
}
}
@@ -1397,17 +1397,17 @@ sub build_backup_files() {
ssh_client() if $net_proto eq 'ssh' && !$use_expect;
do_expect("backup") if $net_proto eq 'ssh' && $use_expect;
webdav_client() if $net_proto eq 'webdav';
- $results .= N_("\nDrakbackup activities via %s:\n\n", $net_proto);
+ $results .= N("\nDrakbackup activities via %s:\n\n", $net_proto);
}
if ($where_cd) {
build_cd();
- $results .= N_("\nDrakbackup activities via CD:\n\n");
+ $results .= N("\nDrakbackup activities via CD:\n\n");
}
if ($where_tape) {
build_tape();
- $results .= N_("\nDrakbackup activities via tape:\n\n");
+ $results .= N("\nDrakbackup activities via tape:\n\n");
}
$results .= $log_buff;
@@ -1416,7 +1416,7 @@ sub build_backup_files() {
if ($send_mail) {
if (send_mail($results)) {
$interactive and send_mail_pb();
- $interactive or print N_(" Error while sending mail. \n");
+ $interactive or print N(" Error while sending mail. \n");
}
}
@@ -1445,7 +1445,7 @@ sub build_backup_files() {
$catalog .= "\n";
local *CATALOG;
- open CATALOG, ">> $cfg_dir/drakbackup_catalog" or show_warning("w", N_("Can't create catalog!"));
+ open CATALOG, ">> $cfg_dir/drakbackup_catalog" or show_warning("w", N("Can't create catalog!"));
print CATALOG $catalog;
close CATALOG;
}
@@ -1548,7 +1548,7 @@ sub file_ok_sel {
sub filedialog_where_hd() {
my $file_dialog;
- $file_dialog = gtksignal_connect(new Gtk2::FileSelection(N_("File Selection")), destroy => sub { $file_dialog->destroy });
+ $file_dialog = gtksignal_connect(new Gtk2::FileSelection(N("File Selection")), destroy => sub { $file_dialog->destroy });
$file_dialog->ok_button->signal_connect(clicked => sub {
$save_path_entry->set_text($file_dialog->get_filename);
$file_dialog->destroy });
@@ -1559,7 +1559,7 @@ sub filedialog_where_hd() {
sub filedialog_restore_find_path() {
my $file_dialog;
- $file_dialog = gtksignal_connect(new Gtk2::FileSelection(N_("File Selection")), destroy => sub { $file_dialog->destroy });
+ $file_dialog = gtksignal_connect(new Gtk2::FileSelection(N("File Selection")), destroy => sub { $file_dialog->destroy });
$file_dialog->ok_button->signal_connect(clicked => sub {
$restore_find_path_entry->set_text($file_dialog->get_filename);
$file_dialog->destroy;
@@ -1587,7 +1587,7 @@ sub filedialog_generic {
sub filedialog() {
my $file_dialog;
- $file_dialog = gtksignal_connect(new Gtk2::FileSelection(N_("Select the files or directories and click on 'OK'")), destroy => sub { $file_dialog->destroy });
+ $file_dialog = gtksignal_connect(new Gtk2::FileSelection(N("Select the files or directories and click on 'OK'")), destroy => sub { $file_dialog->destroy });
$file_dialog->ok_button->signal_connect(clicked => sub { file_ok_sel($file_dialog) });
$file_dialog->cancel_button->signal_connect(clicked => sub { $file_dialog->destroy });
$file_dialog->show;
@@ -1615,15 +1615,15 @@ sub advanced_what_sys() {
gtkpack($advanced_box,
$box_what_sys = gtkpack_(new Gtk2::VBox(0, 15),
- 1, N_("\nPlease check all options that you need.\n"),
- 1, N_("These options can backup and restore all files in your /etc directory.\n"),
- 0, my $check_what_sys = new Gtk2::CheckButton(N_("Backup your System files. (/etc directory)")),
- 0, my $check_what_versions = new Gtk2::CheckButton(N_("Use Incremental/Differential Backups (do not replace old backups)")),
+ 1, N("\nPlease check all options that you need.\n"),
+ 1, N("These options can backup and restore all files in your /etc directory.\n"),
+ 0, my $check_what_sys = new Gtk2::CheckButton(N("Backup your System files. (/etc directory)")),
+ 0, my $check_what_versions = new Gtk2::CheckButton(N("Use Incremental/Differential Backups (do not replace old backups)")),
0, gtkpack__(new Gtk2::HBox(0,0),
- my @mode_buttons = gtkradio((N_("Use Incremental Backups")) x 2, N_("Use Differential Backups")),
+ my @mode_buttons = gtkradio((N("Use Incremental Backups")) x 2, N("Use Differential Backups")),
),
- 0, my $check_what_critical = new Gtk2::CheckButton(N_("Do not include critical files (passwd, group, fstab)")),
- 0, N_("With this option you will be able to restore any version\n of your /etc directory."),
+ 0, my $check_what_critical = new Gtk2::CheckButton(N("Do not include critical files (passwd, group, fstab)")),
+ 0, N("With this option you will be able to restore any version\n of your /etc directory."),
1, new Gtk2::VBox(0, 15),
),
);
@@ -1651,7 +1651,7 @@ sub advanced_what_user {
all_user_list();
gtkpack($advanced_box,
$box_what_user = gtkpack_(new Gtk2::VBox(0, 15),
- 0, N_("Please check all users that you want to include in your backup."),
+ 0, N("Please check all users that you want to include in your backup."),
0, new Gtk2::HSeparator,
1, create_scrolled_window(
gtkpack__(new Gtk2::VBox(0,0),
@@ -1678,10 +1678,10 @@ sub advanced_what_user {
$b } (@all_user_list)
),
),
- 0, my $check_what_browser = new Gtk2::CheckButton(N_("Do not include the browser cache")),
- 0, my $check_what_user_versions = new Gtk2::CheckButton(N_("Use Incremental/Differential Backups (do not replace old backups)")),
+ 0, my $check_what_browser = new Gtk2::CheckButton(N("Do not include the browser cache")),
+ 0, my $check_what_user_versions = new Gtk2::CheckButton(N("Use Incremental/Differential Backups (do not replace old backups)")),
0, gtkpack__(new Gtk2::HBox(0,0),
- my @mode_buttons = gtkradio((N_("Use Incremental Backups")) x 2, N_("Use Differential Backups")),
+ my @mode_buttons = gtkradio((N("Use Incremental Backups")) x 2, N("Use Differential Backups")),
),
),
);
@@ -1730,8 +1730,8 @@ sub advanced_what_other() {
1, create_scrolled_window($list_others),
),
0, gtkadd(gtkset_layout(new Gtk2::HButtonBox, 'spread'),
- gtksignal_connect(new Gtk2::Button(N_("Add")), clicked => sub { filedialog() }),
- gtksignal_connect(new Gtk2::Button(N_("Remove Selected")), clicked => sub {
+ gtksignal_connect(new Gtk2::Button(N("Add")), clicked => sub { filedialog() }),
+ gtksignal_connect(new Gtk2::Button(N("Remove Selected")), clicked => sub {
$list_model->remove($file_iter);
my $iindex = 0;
foreach (@list_other) {
@@ -1743,9 +1743,9 @@ sub advanced_what_other() {
}
}),
),
- 0, my $check_what_other_versions = new Gtk2::CheckButton(N_("Use Incremental/Differential Backups (do not replace old backups)")),
+ 0, my $check_what_other_versions = new Gtk2::CheckButton(N("Use Incremental/Differential Backups (do not replace old backups)")),
0, gtkpack__(new Gtk2::HBox(0,0),
- my @mode_buttons = gtkradio((N_("Use Incremental Backups")) x 2, N_("Use Differential Backups")),
+ my @mode_buttons = gtkradio((N("Use Incremental Backups")) x 2, N("Use Differential Backups")),
),
),
@@ -1783,12 +1783,12 @@ sub advanced_what_entire_sys() {
);
$button_what_other->add(gtkpack(new Gtk2::HBox(0,10),
gtkcreate_img("bootloader"),
- new Gtk2::Label(N_("Linux")),
+ new Gtk2::Label(N("Linux")),
new Gtk2::HBox(0, 5)
));
$button_what_all->add(gtkpack(new Gtk2::HBox(0,10),
gtkcreate_img("user"),
- new Gtk2::Label(N_("Windows (FAT32)")),
+ new Gtk2::Label(N("Windows (FAT32)")),
new Gtk2::HBox(0, 5)
));
fonction_env(\$box_what, \&advanced_what_entire_sys, \&advanced_what, "");
@@ -1818,22 +1818,22 @@ sub advanced_what() {
);
$button_what_sys->add(gtkpack(new Gtk2::HBox(0,10),
gtkcreate_img("ic82-system-40"),
- new Gtk2::Label(N_("System")),
+ new Gtk2::Label(N("System")),
new Gtk2::HBox(0, 5)
));
$button_what_user->add(gtkpack(new Gtk2::HBox(0,10),
gtkcreate_img("ic82-users-40"),
- new Gtk2::Label(N_("Users")),
+ new Gtk2::Label(N("Users")),
new Gtk2::HBox(0, 5)
));
$button_what_other->add(gtkpack(new Gtk2::HBox(0,10),
gtkcreate_img("ic82-others-40"),
- new Gtk2::Label(N_("Other")),
+ new Gtk2::Label(N("Other")),
new Gtk2::HBox(0, 5)
));
# $button_what_all->add(gtkpack(new Gtk2::HBox(0,10),
# gtkcreate_img("ic82-systemeplus-40"),
-# new Gtk2::Label(N_("An Entire System")),
+# new Gtk2::Label(N("An Entire System")),
# new Gtk2::HBox(0, 5)
# ));
@@ -1849,41 +1849,41 @@ sub advanced_where_net_types {
$box_where_net = gtkpack_(new Gtk2::VBox(0, 10),
0, new Gtk2::HSeparator,
0, gtkpack_(new Gtk2::HBox(0,10),
- 0, my $check_where_use_net = new Gtk2::CheckButton(N_("Use network connection to backup")),
+ 0, my $check_where_use_net = new Gtk2::CheckButton(N("Use network connection to backup")),
1, new Gtk2::HBox(0,10),
- 0, new Gtk2::Label(N_("Net Method:")),
+ 0, new Gtk2::Label(N("Net Method:")),
0, gtkset_sensitive(my $entry_net_type = new Gtk2::Combo(), $where_net),
),
0, gtkpack_(new Gtk2::HBox(0,5),
- 0, gtkset_sensitive(my $check_use_expect = new Gtk2::CheckButton(N_("Use Expect for SSH")), ($where_net && $net_proto eq 'ssh')),
- 0, gtkset_sensitive(my $check_xfer_keys = new Gtk2::CheckButton(N_("Create/Transfer\nbackup keys for SSH")), ($where_net && $net_proto eq 'ssh')),
- 0, gtkset_sensitive(my $button_xfer_keys = new Gtk2::Button(N_(" Transfer \nNow")), $xfer_keys),
- 0, gtkset_sensitive(my $check_user_keys = new Gtk2::CheckButton(N_("Other (not drakbackup)\nkeys in place already")), ($where_net && $net_proto eq 'ssh')),
+ 0, gtkset_sensitive(my $check_use_expect = new Gtk2::CheckButton(N("Use Expect for SSH")), ($where_net && $net_proto eq 'ssh')),
+ 0, gtkset_sensitive(my $check_xfer_keys = new Gtk2::CheckButton(N("Create/Transfer\nbackup keys for SSH")), ($where_net && $net_proto eq 'ssh')),
+ 0, gtkset_sensitive(my $button_xfer_keys = new Gtk2::Button(N(" Transfer \nNow")), $xfer_keys),
+ 0, gtkset_sensitive(my $check_user_keys = new Gtk2::CheckButton(N("Other (not drakbackup)\nkeys in place already")), ($where_net && $net_proto eq 'ssh')),
),
0, new Gtk2::HSeparator,
0, gtkpack_(new Gtk2::HBox(0,10),
- 0, gtkset_sensitive(new Gtk2::Label(N_("Please enter the host name or IP.")), $where_net),
+ 0, gtkset_sensitive(new Gtk2::Label(N("Please enter the host name or IP.")), $where_net),
1, new Gtk2::HBox(0,10),
0, gtkset_sensitive(my $host_name_entry = new Gtk2::Entry(), $where_net),
),
0, gtkpack_(new Gtk2::HBox(0,10),
- 0, gtkset_sensitive(new Gtk2::Label(N_("Please enter the directory (or module) to\n put the backup on this host.")), $where_net),
+ 0, gtkset_sensitive(new Gtk2::Label(N("Please enter the directory (or module) to\n put the backup on this host.")), $where_net),
1, new Gtk2::HBox(0,10),
0, gtkset_sensitive(my $host_path_entry = new Gtk2::Entry(), $where_net),
),
0, gtkpack_(new Gtk2::HBox(0,10),
- 0, gtkset_sensitive(new Gtk2::Label(N_("Please enter your login")), $where_net),
+ 0, gtkset_sensitive(new Gtk2::Label(N("Please enter your login")), $where_net),
1, new Gtk2::HBox(0,10),
0, gtkset_sensitive(my $login_user_entry = new Gtk2::Entry(), $where_net),
),
0, gtkpack_(new Gtk2::HBox(0,10),
- 0, gtkset_sensitive(new Gtk2::Label(N_("Please enter your password")), $where_net),
+ 0, gtkset_sensitive(new Gtk2::Label(N("Please enter your password")), $where_net),
1, new Gtk2::HBox(0,10),
0, gtkset_sensitive(my $passwd_user_entry = new Gtk2::Entry(), $where_net),
),
0, gtkpack_(new Gtk2::HBox(0,10),
1, new Gtk2::HBox(0,10),
- 0, gtkset_sensitive(my $check_remember_pass = new Gtk2::CheckButton(N_("Remember this password")), $where_net),
+ 0, gtkset_sensitive(my $check_remember_pass = new Gtk2::CheckButton(N("Remember this password")), $where_net),
),
),
);
@@ -1894,7 +1894,7 @@ sub advanced_where_net_types {
if ($passwd_user && $login_user && $host_name) {
do_expect("sendkey");
} else {
- $in->ask_warn('', N_("Need hostname, username and password!"));
+ $in->ask_warn('', N("Need hostname, username and password!"));
}
});
$passwd_user_entry->set_visibility(0);
@@ -1988,59 +1988,59 @@ sub advanced_where_cd {
gtkpack($advanced_box,
$box_where_cd = gtkpack_(new Gtk2::VBox(0, 6),
- 0, my $check_where_cd = new Gtk2::CheckButton(N_("Use CD/DVDROM to backup")),
+ 0, my $check_where_cd = new Gtk2::CheckButton(N("Use CD/DVDROM to backup")),
0, new Gtk2::HSeparator,
0, gtkpack_(new Gtk2::HBox(0,10),
- 0, gtkset_sensitive(new Gtk2::Label(N_("Please choose your CD/DVD device\n(Press Enter to propogate settings to other fields.\nThis field isn't necessary, only a tool to fill in the form.)")), $where_cd),
+ 0, gtkset_sensitive(new Gtk2::Label(N("Please choose your CD/DVD device\n(Press Enter to propogate settings to other fields.\nThis field isn't necessary, only a tool to fill in the form.)")), $where_cd),
1, new Gtk2::VBox(0, 5),
0, gtkset_sensitive(gtkset_size_request($combo_where_cd_device, 200, 20), $where_cd),
),
0, gtkpack_(new Gtk2::HBox(0,10),
- 0, gtkset_sensitive(new Gtk2::Label(N_("Please choose your CD/DVD media size (Mb)")), $where_cd),
+ 0, gtkset_sensitive(new Gtk2::Label(N("Please choose your CD/DVD media size (Mb)")), $where_cd),
1, new Gtk2::VBox(0, 5),
0, gtkset_sensitive(gtkset_size_request($combo_where_cd_time, 200, 20), $where_cd),
),
0, new Gtk2::VBox(0, 5),
0, gtkpack_(new Gtk2::HBox(0,10),
- 0, gtkset_sensitive(new Gtk2::Label(N_("Please check for multisession CD")), $where_cd),
+ 0, gtkset_sensitive(new Gtk2::Label(N("Please check for multisession CD")), $where_cd),
1, new Gtk2::VBox(0, 5),
0, gtkset_sensitive(my $check_multisession = new Gtk2::CheckButton(), $where_cd),
),
0, new Gtk2::VBox(0, 5),
0, gtkpack_(new Gtk2::HBox(0,10),
- 0, gtkset_sensitive(new Gtk2::Label(N_("Please check if you are using CDRW media")), $where_cd),
+ 0, gtkset_sensitive(new Gtk2::Label(N("Please check if you are using CDRW media")), $where_cd),
1, new Gtk2::VBox(0, 5),
0, gtkset_sensitive(my $check_cdrw = new Gtk2::CheckButton(), $where_cd),
),
0, new Gtk2::VBox(0, 5),
0, gtkpack_(new Gtk2::HBox(0,10),
- 0, gtkset_sensitive(new Gtk2::Label(N_("Please check if you want to erase your RW media (1st Session)")), $cdrw && $where_cd),
- 0, gtkset_sensitive(my $button_erase_now = new Gtk2::Button(N_(" Erase Now ")), $cdrw),
+ 0, gtkset_sensitive(new Gtk2::Label(N("Please check if you want to erase your RW media (1st Session)")), $cdrw && $where_cd),
+ 0, gtkset_sensitive(my $button_erase_now = new Gtk2::Button(N(" Erase Now ")), $cdrw),
1, new Gtk2::VBox(0, 5),
0, gtkset_sensitive(my $check_cdrw_erase = new Gtk2::CheckButton(), $cdrw && $where_cd),
),
0, new Gtk2::VBox(0, 5),
0, gtkpack_(new Gtk2::HBox(0,10),
- 0, gtkset_sensitive(new Gtk2::Label(N_("Please check if you are using a DVDR device")), $where_cd),
+ 0, gtkset_sensitive(new Gtk2::Label(N("Please check if you are using a DVDR device")), $where_cd),
1, new Gtk2::VBox(0, 5),
0, gtkset_sensitive(my $check_dvdr = new Gtk2::CheckButton(), $where_cd),
),
0, new Gtk2::VBox(0, 5),
0, gtkpack_(new Gtk2::HBox(0,10),
- 0, gtkset_sensitive(new Gtk2::Label(N_("Please check if you are using a DVDRAM device")), $where_cd),
+ 0, gtkset_sensitive(new Gtk2::Label(N("Please check if you are using a DVDRAM device")), $where_cd),
1, new Gtk2::VBox(0, 5),
0, gtkset_sensitive(my $check_dvdram = new Gtk2::CheckButton(), $where_cd),
),
# don't know what this is about - hold off for now (SB)
# 0, new Gtk2::VBox(0, 5),
# 0, gtkpack_(new Gtk2::HBox(0,10),
-# 0, gtkset_sensitive(new Gtk2::Label(N_("Please check if you want to include\n install boot on your CD.")), $where_cd),
+# 0, gtkset_sensitive(new Gtk2::Label(N("Please check if you want to include\n install boot on your CD.")), $where_cd),
# 1, new Gtk2::VBox(0, 5),
# 0, gtkset_sensitive(my $check_cd_with_install_boot = new Gtk2::CheckButton(), $where_cd),
# ),
0, new Gtk2::VBox(0, 5),
0, gtkpack_(new Gtk2::HBox(0,10),
- 0, gtkset_sensitive(new Gtk2::Label(N_("Please enter your CD Writer device name\n ex: 0,1,0")), $where_cd),
+ 0, gtkset_sensitive(new Gtk2::Label(N("Please enter your CD Writer device name\n ex: 0,1,0")), $where_cd),
1, new Gtk2::VBox(0, 5),
# 0, gtkset_size_request(gtkset_sensitive($cd_device_entry = new Gtk2::Entry(), $where_cd), 200, 20),
0, gtkset_sensitive(gtkset_size_request($combo_where_cdrecord_device, 200, 20), $where_cd),
@@ -2073,7 +2073,7 @@ sub advanced_where_cd {
if ($cd_device) {
erase_cdrw();
} else {
- $in->ask_warn('', N_("No CD device defined!"));
+ $in->ask_warn('', N("No CD device defined!"));
}
});
$combo_where_cdrecord_device->entry->set_text($cd_device);
@@ -2122,34 +2122,34 @@ sub advanced_where_tape {
gtkpack($advanced_box,
$box_where_tape = gtkpack_(new Gtk2::VBox(0, 6),
0, new Gtk2::HSeparator,
- 0, my $check_where_tape = new Gtk2::CheckButton(N_("Use tape to backup")),
+ 0, my $check_where_tape = new Gtk2::CheckButton(N("Use tape to backup")),
0, new Gtk2::HSeparator,
0, gtkpack_(new Gtk2::HBox(0,10),
- 0, gtkset_sensitive(new Gtk2::Label(N_("Please enter the device name to use for backup")), $where_tape),
+ 0, gtkset_sensitive(new Gtk2::Label(N("Please enter the device name to use for backup")), $where_tape),
1, new Gtk2::VBox(0, 6),
0, gtkset_sensitive(gtkset_size_request($combo_where_tape_device, 200, 20), $where_tape),
),
0, new Gtk2::VBox(0, 5),
0, gtkpack_(new Gtk2::HBox(0,10),
- 0, gtkset_sensitive(new Gtk2::Label(N_("Please check if you want to use the non-rewinding device.")), $where_tape),
+ 0, gtkset_sensitive(new Gtk2::Label(N("Please check if you want to use the non-rewinding device.")), $where_tape),
1, new Gtk2::VBox(0, 5),
0, gtkset_sensitive(my $check_tape_rewind = new Gtk2::CheckButton(), $where_tape),
),
0, new Gtk2::VBox(0, 5),
0, gtkpack_(new Gtk2::HBox(0,10),
- 0, gtkset_sensitive(new Gtk2::Label(N_("Please check if you want to erase your tape before the backup.")), $where_tape),
+ 0, gtkset_sensitive(new Gtk2::Label(N("Please check if you want to erase your tape before the backup.")), $where_tape),
1, new Gtk2::VBox(0, 5),
0, gtkset_sensitive(my $check_tape_erase = new Gtk2::CheckButton(), $where_tape),
),
0, new Gtk2::VBox(0, 5),
0, gtkpack_(new Gtk2::HBox(0,10),
- 0, gtkset_sensitive(new Gtk2::Label(N_("Please check if you want to eject your tape after the backup.")), $where_tape),
+ 0, gtkset_sensitive(new Gtk2::Label(N("Please check if you want to eject your tape after the backup.")), $where_tape),
1, new Gtk2::VBox(0, 5),
0, gtkset_sensitive(my $check_tape_eject = new Gtk2::CheckButton(), $where_tape),
),
0, new Gtk2::VBox(0, 6),
0, gtkpack_(new Gtk2::HBox(0,10),
- 0, gtkset_sensitive(new Gtk2::Label(N_("Please enter the maximum size\n allowed for Drakbackup")), $where_tape),
+ 0, gtkset_sensitive(new Gtk2::Label(N("Please enter the maximum size\n allowed for Drakbackup")), $where_tape),
1, new Gtk2::VBox(0, 6),
0, gtkset_size_request(gtkset_sensitive($spinner = new Gtk2::SpinButton($adj, 0, 0), $where_tape), 200, 20),
),
@@ -2211,10 +2211,10 @@ sub advanced_where_hd {
gtkpack($advanced_box,
$box_where_hd = gtkpack_(new Gtk2::VBox(0, 6),
0, new Gtk2::HSeparator,
-# 0, my $check_where_hd = new Gtk2::CheckButton( N_("Use Hard Disk to backup")),
+# 0, my $check_where_hd = new Gtk2::CheckButton( N("Use Hard Disk to backup")),
# 0, new Gtk2::HSeparator,
0, gtkpack_(new Gtk2::HBox(0,10),
- 0, gtkset_sensitive(new Gtk2::Label(N_("Please enter the directory to save to:")), $where_hd),
+ 0, gtkset_sensitive(new Gtk2::Label(N("Please enter the directory to save to:")), $where_hd),
1, new Gtk2::VBox(0, 6),
0, gtkset_size_request(gtkset_sensitive($save_path_entry = new Gtk2::Entry(), $where_hd), 152, 20),
0, gtkset_sensitive($button = gtksignal_connect(new Gtk2::Button(), clicked => sub {
@@ -2223,13 +2223,13 @@ sub advanced_where_hd {
),
0, new Gtk2::VBox(0, 6),
0, gtkpack_(new Gtk2::HBox(0,10),
- 0, gtkset_sensitive(new Gtk2::Label(N_("Please enter the maximum size\n allowed for Drakbackup")), $where_hd),
+ 0, gtkset_sensitive(new Gtk2::Label(N("Please enter the maximum size\n allowed for Drakbackup")), $where_hd),
1, new Gtk2::VBox(0, 6),
0, gtkset_size_request(gtkset_sensitive($spinner = new Gtk2::SpinButton($adj, 0, 0), $where_hd), 200, 20),
),
0, gtkpack_(new Gtk2::HBox(0,10),
1, new Gtk2::VBox(0, 6),
- 0, gtkset_sensitive(my $check_where_hd_quota = new Gtk2::CheckButton(N_("Use quota for backup files.")), $where_hd),
+ 0, gtkset_sensitive(my $check_where_hd_quota = new Gtk2::CheckButton(N("Use quota for backup files.")), $where_hd),
0, new Gtk2::VBox(0, 6),
),
),
@@ -2291,22 +2291,22 @@ sub advanced_where() {
);
$button_where_net->add(gtkpack(new Gtk2::HBox(0,10),
gtkcreate_img("ic82-network-40"),
- new Gtk2::Label(N_("Network")),
+ new Gtk2::Label(N("Network")),
new Gtk2::HBox(0, 5)
));
$button_where_cd->add(gtkpack(new Gtk2::HBox(0,10),
gtkcreate_img("ic82-CD-40"),
- new Gtk2::Label(N_("CDROM / DVDROM")),
+ new Gtk2::Label(N("CDROM / DVDROM")),
new Gtk2::HBox(0, 5)
));
$button_where_hd->add(gtkpack(new Gtk2::HBox(0,10),
gtkcreate_img("ic82-discdurwhat-40"),
- new Gtk2::Label(N_("HardDrive / NFS")),
+ new Gtk2::Label(N("HardDrive / NFS")),
new Gtk2::HBox(0, 5)
));
$button_where_tape->add(gtkpack(new Gtk2::HBox(0,10),
gtkcreate_img("ic82-tape-40"),
- new Gtk2::Label(N_("Tape")),
+ new Gtk2::Label(N("Tape")),
new Gtk2::HBox(0, 5)
));
fonction_env(\$box_where, \&advanced_where, \&advanced_box, "");
@@ -2319,15 +2319,15 @@ sub advanced_when() {
my $box_when;
# $daemon_media = '';
my $combo_when_space = new Gtk2::Combo();
- my %trans = (N_("hourly") => 'hourly',
- N_("daily") => 'daily',
- N_("weekly") => 'weekly',
- N_("monthly") => 'monthly');
- my %trans2 = ('hourly' => N_("hourly"),
- 'daily' => N_("daily"),
- 'weekly' => N_("weekly"),
- 'monthly' => N_("monthly"));
- $combo_when_space->set_popdown_strings(N_("hourly"), N_("daily"), N_("weekly"), N_("monthly"));
+ my %trans = (N("hourly") => 'hourly',
+ N("daily") => 'daily',
+ N("weekly") => 'weekly',
+ N("monthly") => 'monthly');
+ my %trans2 = ('hourly' => N("hourly"),
+ 'daily' => N("daily"),
+ 'weekly' => N("weekly"),
+ 'monthly' => N("monthly"));
+ $combo_when_space->set_popdown_strings(N("hourly"), N("daily"), N("weekly"), N("monthly"));
#- drop down list of possible medias - default to config value
my $entry_media_type = new Gtk2::Combo();
@@ -2340,25 +2340,25 @@ sub advanced_when() {
0, gtkpack_(new Gtk2::HBox(0,10),
1, new Gtk2::HBox(0,10),
1, gtkcreate_img("ic82-when-40"),
- 0, my $check_when_daemon = new Gtk2::CheckButton(N_("Use daemon")),
+ 0, my $check_when_daemon = new Gtk2::CheckButton(N("Use daemon")),
1, new Gtk2::HBox(0,10),
),
0, new Gtk2::HSeparator,
0, gtkpack_(new Gtk2::HBox(0,10),
- 0, gtkset_sensitive(new Gtk2::Label(N_("Please choose the time \ninterval between each backup")), $backup_daemon),
+ 0, gtkset_sensitive(new Gtk2::Label(N("Please choose the time \ninterval between each backup")), $backup_daemon),
1, new Gtk2::HBox(0,10),
0, gtkset_sensitive($combo_when_space, $backup_daemon),
),
0, new Gtk2::HBox(0,10),
0, gtkpack_(new Gtk2::HBox(0,10),
- 0, gtkset_sensitive(new Gtk2::Label(N_("Please choose the\nmedia for backup.")), $backup_daemon),
+ 0, gtkset_sensitive(new Gtk2::Label(N("Please choose the\nmedia for backup.")), $backup_daemon),
1, new Gtk2::HBox(0,10),
0, gtkpack_(new Gtk2::VBox(0,10),
0, gtkset_sensitive($entry_media_type, $backup_daemon),
),
),
0, new Gtk2::HSeparator,
- 1, gtkset_sensitive(new Gtk2::Label(N_("Please be sure that the cron daemon is included in your services.
+ 1, gtkset_sensitive(new Gtk2::Label(N("Please be sure that the cron daemon is included in your services.
\nNote that currently all 'net' medias also use the hard drive.")), $backup_daemon),
),
);
@@ -2385,22 +2385,22 @@ sub advanced_options() {
# 0, gtkpack_(new Gtk2::HBox(0,10),
# 1, new Gtk2::VBox(0,10),
# 1, gtkcreate_img("ic82-moreoption-40"),
-# 1, N_("Please choose correct options to backup."),
+# 1, N("Please choose correct options to backup."),
# 1, new Gtk2::VBox(0,10),
# ),
# 0, new Gtk2::HSeparator,
# 0, gtkpack_(new Gtk2::VBox(0,10),
-# 0, gtkset_sensitive(my $check_tar_bz2 = new Gtk2::CheckButton( N_("Use Tar and bzip2 (very slow) [Please be careful if you\n (un)select this option, as all your old backups will be deleted.]")), 0),
-# 0, gtkset_sensitive(my $check_backupignore = new Gtk2::CheckButton( N_("Use .backupignore files")), 0),
+# 0, gtkset_sensitive(my $check_tar_bz2 = new Gtk2::CheckButton( N("Use Tar and bzip2 (very slow) [Please be careful if you\n (un)select this option, as all your old backups will be deleted.]")), 0),
+# 0, gtkset_sensitive(my $check_backupignore = new Gtk2::CheckButton( N("Use .backupignore files")), 0),
0, new Gtk2::VBox(0,10),
0, gtkpack_(new Gtk2::HBox(0,10),
- 0, my $check_mail = new Gtk2::CheckButton(N_("Send mail report after each backup to:")),
+ 0, my $check_mail = new Gtk2::CheckButton(N("Send mail report after each backup to:")),
1, new Gtk2::HBox(0,10),
0, my $mail_entry = new Gtk2::Entry(),
),
# ),
0, gtkpack_(new Gtk2::HBox(0,10),
- 0, my $check_del_hd_files = new Gtk2::CheckButton(N_("Delete Hard Drive tar files after backup to other media.")),
+ 0, my $check_del_hd_files = new Gtk2::CheckButton(N("Delete Hard Drive tar files after backup to other media.")),
),
),
);
@@ -2435,22 +2435,22 @@ sub advanced_box() {
);
$button_what->add(gtkpack(new Gtk2::HBox(0,10),
gtkcreate_img("ic82-discdurwhat-40"),
- new Gtk2::Label(N_("What")),
+ new Gtk2::Label(N("What")),
new Gtk2::HBox(0, 5)
));
$button_where->add(gtkpack(new Gtk2::HBox(0,10),
gtkcreate_img("ic82-where-40"),
- new Gtk2::Label(N_("Where")),
+ new Gtk2::Label(N("Where")),
new Gtk2::HBox(0, 5)
));
$button_when->add(gtkpack(new Gtk2::HBox(0,10),
gtkcreate_img("ic82-when-40"),
- new Gtk2::Label(N_("When")),
+ new Gtk2::Label(N("When")),
new Gtk2::HBox(0, 5)
));
$button_options->add(gtkpack(new Gtk2::HBox(0,10),
gtkcreate_img("ic82-moreoption-40"),
- new Gtk2::Label(N_("More Options")),
+ new Gtk2::Label(N("More Options")),
new Gtk2::HBox(0, 5)
));
fonction_env(\$box_adv, \&advanced_box, \&interactive_mode_box, "");
@@ -2471,7 +2471,7 @@ sub wizard_step3() {
gtkpack($advanced_box,
$box2 = gtkpack_(new Gtk2::HBox(0, 15),
1, gtkpack_(new Gtk2::VBox(0,10),
- 0, N_("Drakbackup Configuration"),
+ 0, N("Drakbackup Configuration"),
1, create_scrolled_window($text),
),
),
@@ -2489,11 +2489,11 @@ sub wizard_step2() {
1, new Gtk2::VBox(0, 5),
1, gtkpack_(new Gtk2::VBox(0, 15),
1, new Gtk2::VBox(0, 5),
- 0, N_("Please choose where you want to backup"),
+ 0, N("Please choose where you want to backup"),
0, gtkpack_(new Gtk2::HBox(0, 15),
- 0, my $check_wizard_hd = new Gtk2::CheckButton(N_("on Hard Drive")),
+ 0, my $check_wizard_hd = new Gtk2::CheckButton(N("on Hard Drive")),
1, new Gtk2::VBox(0, 5),
- 0, gtkset_sensitive(gtksignal_connect(new Gtk2::Button(N_("Configure")), clicked => sub {
+ 0, gtkset_sensitive(gtksignal_connect(new Gtk2::Button(N("Configure")), clicked => sub {
destroy_widget();
to_ok();
advanced_where_hd(\&wizard_step2);
@@ -2501,9 +2501,9 @@ sub wizard_step2() {
}), $where_hd),
),
0, gtkpack_(new Gtk2::HBox(0, 15),
- 0, my $check_wizard_net = new Gtk2::CheckButton(N_("across Network")),
+ 0, my $check_wizard_net = new Gtk2::CheckButton(N("across Network")),
1, new Gtk2::VBox(0, 5),
- 0, gtkset_sensitive(gtksignal_connect(new Gtk2::Button(N_("Configure")), clicked => sub {
+ 0, gtkset_sensitive(gtksignal_connect(new Gtk2::Button(N("Configure")), clicked => sub {
destroy_widget();
to_ok();
advanced_where_net_types(\&wizard_step2);
@@ -2511,17 +2511,17 @@ sub wizard_step2() {
}), $where_net),
),
0, gtkpack_(new Gtk2::HBox(0, 15),
- 0, my $check_wizard_cd = new Gtk2::CheckButton(N_("on CDROM")),
+ 0, my $check_wizard_cd = new Gtk2::CheckButton(N("on CDROM")),
1, new Gtk2::VBox(0, 5),
- 0, gtkset_sensitive(gtksignal_connect(new Gtk2::Button(N_("Configure")), clicked => sub {
+ 0, gtkset_sensitive(gtksignal_connect(new Gtk2::Button(N("Configure")), clicked => sub {
destroy_widget();
advanced_where_cd(\&wizard_step2);
}), $where_cd),
),
0, gtkpack_(new Gtk2::HBox(0, 15),
- 0, my $check_wizard_tape = new Gtk2::CheckButton(N_("on Tape Device")),
+ 0, my $check_wizard_tape = new Gtk2::CheckButton(N("on Tape Device")),
1, new Gtk2::VBox(0, 5),
- 0, gtkset_sensitive(gtksignal_connect(new Gtk2::Button(N_("Configure")), clicked => sub {
+ 0, gtkset_sensitive(gtksignal_connect(new Gtk2::Button(N("Configure")), clicked => sub {
destroy_widget();
advanced_where_tape(\&wizard_step2);
}), $where_tape),
@@ -2562,12 +2562,12 @@ sub wizard() {
1, new Gtk2::VBox(0, 5),
1, gtkpack_(new Gtk2::VBox(0, 15),
1, new Gtk2::VBox(0, 5),
- 0, N_("Please choose what you want to backup"),
- 0, my $check_wizard_sys = new Gtk2::CheckButton(N_("Backup system")),
- 0, my $check_wizard_user = new Gtk2::CheckButton(N_("Backup Users")),
+ 0, N("Please choose what you want to backup"),
+ 0, my $check_wizard_sys = new Gtk2::CheckButton(N("Backup system")),
+ 0, my $check_wizard_user = new Gtk2::CheckButton(N("Backup Users")),
0, gtkpack_(new Gtk2::HBox(0, 15),
1, new Gtk2::VBox(0, 5),
- 0, gtksignal_connect(new Gtk2::Button(N_("Select user manually")), clicked => sub {
+ 0, gtksignal_connect(new Gtk2::Button(N("Select user manually")), clicked => sub {
destroy_widget();
advanced_what_user(\&wizard);
}),
@@ -2649,57 +2649,57 @@ sub system_state() {
# $system_state;
if ($cfg_file_exist) {
- $system_state = N_("\nBackup Sources: \n");
- $backup_sys and $system_state .= N_("\n- System Files:\n");
+ $system_state = N("\nBackup Sources: \n");
+ $backup_sys and $system_state .= N("\n- System Files:\n");
$backup_sys and $system_state .= "\t\t$_\n" foreach @sys_files;
- $backup_user and $system_state .= N_("\n- User Files:\n");
+ $backup_user and $system_state .= N("\n- User Files:\n");
$backup_user and $system_state .= "\t\t$_\n" foreach @user_list;
- @list_other and $system_state .= N_("\n- Other Files:\n");
+ @list_other and $system_state .= N("\n- Other Files:\n");
@list_other and $system_state .= "\t\t$_\n" foreach @list_other;
- $where_hd and $system_state .= N_("\n- Save on Hard drive on path: %s\n", $save_path);
+ $where_hd and $system_state .= N("\n- Save on Hard drive on path: %s\n", $save_path);
if ($del_hd_files && ($where_cd || $where_tape || $where_net) && $daemon_media ne 'hd') {
- $system_state .= N_("\n- Delete hard drive tar files after backup.\n");
+ $system_state .= N("\n- Delete hard drive tar files after backup.\n");
}
#- tape and CDRW share some features
my $erase_media = 'NO';
$erase_media = 'YES' if $media_erase && ($where_cd || $where_tape);
- $where_cd and $system_state .= N_("\n- Burn to CD");
- $where_cd and $cdrw and $system_state .= N_("RW");
- $where_cd and $system_state .= N_(" on device: %s", $cd_device);
- $where_cd and $multi_session and $system_state .= N_(" (multi-session)");
- $where_tape and $system_state .= N_("\n- Save to Tape on device: %s", $tape_device);
- (($where_cd || $where_tape) && $media_erase) and $system_state .= N_("\t\tErase=%s", $erase_media);
+ $where_cd and $system_state .= N("\n- Burn to CD");
+ $where_cd and $cdrw and $system_state .= N("RW");
+ $where_cd and $system_state .= N(" on device: %s", $cd_device);
+ $where_cd and $multi_session and $system_state .= N(" (multi-session)");
+ $where_tape and $system_state .= N("\n- Save to Tape on device: %s", $tape_device);
+ (($where_cd || $where_tape) && $media_erase) and $system_state .= N("\t\tErase=%s", $erase_media);
$where_cd || $where_tape and $system_state .= "\n";
- $where_net and $system_state .= N_("\n- Save via %s on host: %s\n", $net_proto, $host_name);
- $where_net and $system_state .= N_("\t\t user name: %s\n\t\t on path: %s \n", $login_user, $host_path);
- $system_state .= N_("\n- Options:\n");
- $backup_sys or $system_state .= N_("\tDo not include System Files\n");
+ $where_net and $system_state .= N("\n- Save via %s on host: %s\n", $net_proto, $host_name);
+ $where_net and $system_state .= N("\t\t user name: %s\n\t\t on path: %s \n", $login_user, $host_path);
+ $system_state .= N("\n- Options:\n");
+ $backup_sys or $system_state .= N("\tDo not include System Files\n");
if ($comp_mode) {
- $system_state .= N_("\tBackups use tar and bzip2\n");
+ $system_state .= N("\tBackups use tar and bzip2\n");
} else {
- $system_state .= N_("\tBackups use tar and gzip\n");
+ $system_state .= N("\tBackups use tar and gzip\n");
}
- $daemon_media and $system_state .= N_("\n- Daemon (%s) include:\n", $when_space);
- $daemon_media eq 'hd' and $system_state .= N_("\t-Hard drive.\n");
- $daemon_media eq 'cd' and $system_state .= N_("\t-CDROM.\n");
- $daemon_media eq 'tape' and $system_state .= N_("\t-Tape \n");
- $daemon_media eq 'ftp' and $system_state .= N_("\t-Network by FTP.\n");
- $daemon_media eq 'ssh' and $system_state .= N_("\t-Network by SSH.\n");
- $daemon_media eq 'rsync' and $system_state .= N_("\t-Network by rsync.\n");
- $daemon_media eq 'webdav' and $system_state .= N_("\t-Network by webdav.\n");
+ $daemon_media and $system_state .= N("\n- Daemon (%s) include:\n", $when_space);
+ $daemon_media eq 'hd' and $system_state .= N("\t-Hard drive.\n");
+ $daemon_media eq 'cd' and $system_state .= N("\t-CDROM.\n");
+ $daemon_media eq 'tape' and $system_state .= N("\t-Tape \n");
+ $daemon_media eq 'ftp' and $system_state .= N("\t-Network by FTP.\n");
+ $daemon_media eq 'ssh' and $system_state .= N("\t-Network by SSH.\n");
+ $daemon_media eq 'rsync' and $system_state .= N("\t-Network by rsync.\n");
+ $daemon_media eq 'webdav' and $system_state .= N("\t-Network by webdav.\n");
} else {
- $system_state = N_("No configuration, please click Wizard or Advanced.\n");
+ $system_state = N("No configuration, please click Wizard or Advanced.\n");
}
}
sub restore_state() {
my @tmp = split(' ', $restore_step_sys_date);
- $restore_state = N_("List of data to restore:\n\n");
+ $restore_state = N("List of data to restore:\n\n");
if ($restore_sys) { $restore_state .= "- Restore System Files.\n";
$restore_state .= " - from date: $tmp[0] $tmp[1]\n";
}
@@ -2842,7 +2842,7 @@ sub show_backup_details {
0, new Gtk2::VScrollbar($text->vadj),
),
0, gtkadd(gtkset_layout(new Gtk2::HButtonBox, 'spread'),
- gtksignal_connect(new Gtk2::Button(N_("Done")), clicked => sub {
+ gtksignal_connect(new Gtk2::Button(N("Done")), clicked => sub {
destroy_widget();
$function->() }),
),
@@ -2869,9 +2869,9 @@ sub valid_backup_test {
sub restore_aff_backup_problems() {
my $do_restore;
my $text = new Gtk2::TextView;
- my $restore_pbs_state = N_("List of data corrupted:\n\n");
+ my $restore_pbs_state = N("List of data corrupted:\n\n");
$restore_pbs_state .= "\t\t$_\n" foreach @files_corrupted;
- $restore_pbs_state .= N_("Please uncheck or remove it on next time.");
+ $restore_pbs_state .= N("Please uncheck or remove it on next time.");
gtktext_insert($text, [ [ $restore_pbs_state ] ]);
button_box_restore_main();
@@ -2881,7 +2881,7 @@ sub restore_aff_backup_problems() {
1, gtkpack_(new Gtk2::HBox(0, 15),
1, new Gtk2::VBox(0, 5),
0, gtkcreate_img('warning'),
- 0, N_("Backup files are corrupted"),
+ 0, N("Backup files are corrupted"),
1, new Gtk2::VBox(0, 5),
),
0, new Gtk2::VBox(0,10),
@@ -2902,8 +2902,8 @@ sub restore_aff_result() {
gtkpack($advanced_box,
$do_restore = gtkpack_(new Gtk2::VBox(0,10),
1, new Gtk2::VBox(0,10),
- 0, N_(" All of your selected data have been "),
- 0, N_(" Successfuly Restored on %s ", $restore_path),
+ 0, N(" All of your selected data have been "),
+ 0, N(" Successfuly Restored on %s ", $restore_path),
1, new Gtk2::VBox(0,10),
),
);
@@ -3022,7 +3022,7 @@ sub restore_do2() {
gtkpack($advanced_box,
$do_restore = gtkpack_(new Gtk2::VBox(0,10),
- 0, N_(" Restore Configuration "),
+ 0, N(" Restore Configuration "),
1, create_scrolled_window($text),
),
);
@@ -3040,7 +3040,7 @@ sub restore_step_other() {
$retore_step_other = gtkpack_(new Gtk2::VBox(0,10),
1, new Gtk2::VBox(0,10),
1, create_scrolled_window($text),
- 0, my $check_restore_other_sure = new Gtk2::CheckButton(N_("OK to restore the other files.")),
+ 0, my $check_restore_other_sure = new Gtk2::CheckButton(N("OK to restore the other files.")),
1, new Gtk2::VBox(0,10),
),
);
@@ -3057,7 +3057,7 @@ sub restore_step_user() {
gtkpack($advanced_box,
$retore_step_user = gtkpack_(new Gtk2::VBox(0,10),
0, new Gtk2::VBox(0,10),
- 0, N_("User list to restore (only the most recent date per user is important)"),
+ 0, N("User list to restore (only the most recent date per user is important)"),
1, create_scrolled_window(gtkpack__(new Gtk2::VBox(0,0),
map { my $name;
my $var2;
@@ -3136,9 +3136,9 @@ sub restore_step_sys() {
gtkpack($advanced_box,
$restore_step_sys = gtkpack_(new Gtk2::VBox(0,10),
1, new Gtk2::VBox(0,10),
- 0, $check_backup_before = new Gtk2::CheckButton(N_("Backup the system files before:")),
+ 0, $check_backup_before = new Gtk2::CheckButton(N("Backup the system files before:")),
0, gtkpack_(new Gtk2::HBox(0,10),
- 1, N_("please choose the date to restore"),
+ 1, N("please choose the date to restore"),
0, $combo_restore_step_sys,
0, my $details = new Gtk2::Button(" Details "),
0, new Gtk2::HBox(0,10),
@@ -3175,10 +3175,10 @@ sub restore_other_media_hd {
gtkpack($advanced_box,
$box_where_hd = gtkpack_(new Gtk2::VBox(0, 6),
0, new Gtk2::HSeparator,
- 0, my $check_where_hd = new Gtk2::CheckButton(N_("Use Hard Disk to backup")),
+ 0, my $check_where_hd = new Gtk2::CheckButton(N("Use Hard Disk to backup")),
0, new Gtk2::HSeparator,
0, gtkpack_(new Gtk2::HBox(0,10),
- 0, gtkset_sensitive(new Gtk2::Label(N_("Please enter the directory to save:")), $where_hd),
+ 0, gtkset_sensitive(new Gtk2::Label(N("Please enter the directory to save:")), $where_hd),
1, new Gtk2::VBox(0, 6),
0, gtkset_size_request(gtkset_sensitive($save_path_entry = new Gtk2::Entry(), $where_hd), 152, 20),
0, gtkset_sensitive($button = gtksignal_connect(new Gtk2::Button(), clicked => sub {
@@ -3186,13 +3186,13 @@ sub restore_other_media_hd {
),
0, new Gtk2::VBox(0, 6),
0, gtkpack_(new Gtk2::HBox(0,10),
- 0, gtkset_sensitive(new Gtk2::Label(N_("Please enter the maximum size\n allowed for Drakbackup")), $where_hd),
+ 0, gtkset_sensitive(new Gtk2::Label(N("Please enter the maximum size\n allowed for Drakbackup")), $where_hd),
1, new Gtk2::VBox(0, 6),
0, gtkset_size_request(gtkset_sensitive($spinner = new Gtk2::SpinButton($adj, 0, 0), $where_hd), 200, 20),
),
0, gtkpack_(new Gtk2::HBox(0,10),
1, new Gtk2::VBox(0, 6),
- 0, gtkset_sensitive(my $check_where_hd_quota = new Gtk2::CheckButton(N_("Use quota for backup files.")), $where_hd),
+ 0, gtkset_sensitive(my $check_where_hd_quota = new Gtk2::CheckButton(N("Use quota for backup files.")), $where_hd),
0, new Gtk2::VBox(0, 6),
),
),
@@ -3218,9 +3218,9 @@ sub restore_other_media() {
gtkpack($advanced_box,
$box_find_restore = gtkpack_(new Gtk2::VBox(0, 6),
0, new Gtk2::HSeparator,
- 0, my $check_other_media_hd = new Gtk2::CheckButton(N_("Restore from Hard Disk.")),
+ 0, my $check_other_media_hd = new Gtk2::CheckButton(N("Restore from Hard Disk.")),
0, gtkpack_(new Gtk2::HBox(0,10),
- 0, gtkset_sensitive(new Gtk2::Label(N_("Please enter the directory where backups are stored")), $other_media_hd),
+ 0, gtkset_sensitive(new Gtk2::Label(N("Please enter the directory where backups are stored")), $other_media_hd),
1, new Gtk2::VBox(0, 6),
0, gtkset_size_request(gtkset_sensitive($restore_find_path_entry = new Gtk2::Entry(), $other_media_hd), 152, 20),
0, gtkset_sensitive($button = gtksignal_connect(new Gtk2::Button(), clicked => sub {
@@ -3229,7 +3229,7 @@ sub restore_other_media() {
),
1, new Gtk2::VBox(0, 6),
# 0, new Gtk2::HSeparator,
-# 0, my $check_other_media_net = new Gtk2::CheckButton( N_("Restore from Network")),
+# 0, my $check_other_media_net = new Gtk2::CheckButton( N("Restore from Network")),
# 0, new Gtk2::VBox(0, 6),
# 1, gtkpack(new Gtk2::HBox(0,10),
# new Gtk2::VBox(0, 6),
@@ -3289,24 +3289,24 @@ sub restore_step2() {
1, new Gtk2::VBox(0,10),
1, new Gtk2::VBox(0,10),
0, gtkpack_(new Gtk2::HBox(0,10),
- 0, my $check_restore_other_src = new Gtk2::CheckButton(N_("Select another media to restore from")),
+ 0, my $check_restore_other_src = new Gtk2::CheckButton(N("Select another media to restore from")),
1, new Gtk2::HBox(0,10),
- 0, gtkset_sensitive(gtksignal_connect(new Gtk2::Button(N_("Other Media")), clicked => sub {
+ 0, gtkset_sensitive(gtksignal_connect(new Gtk2::Button(N("Other Media")), clicked => sub {
destroy_widget();
restore_other_media();
}), $restore_other_src),
),
- 0, gtkset_sensitive(my $check_restore_sys = new Gtk2::CheckButton(N_("Restore system")), $sys_exist),
- 0, gtkset_sensitive(my $check_restore_user = new Gtk2::CheckButton(N_("Restore Users")), $user_exist),
- 0, gtkset_sensitive(my $check_restore_other = new Gtk2::CheckButton(N_("Restore Other")), $other_exist),
+ 0, gtkset_sensitive(my $check_restore_sys = new Gtk2::CheckButton(N("Restore system")), $sys_exist),
+ 0, gtkset_sensitive(my $check_restore_user = new Gtk2::CheckButton(N("Restore Users")), $user_exist),
+ 0, gtkset_sensitive(my $check_restore_other = new Gtk2::CheckButton(N("Restore Other")), $other_exist),
0, gtkpack_(new Gtk2::HBox(0,10),
- 0, my $check_restore_other_path = new Gtk2::CheckButton(N_("select path to restore (instead of /)")),
+ 0, my $check_restore_other_path = new Gtk2::CheckButton(N("select path to restore (instead of /)")),
1, new Gtk2::HBox(0,10),
0, gtkset_sensitive(my $restore_path_entry = new Gtk2::Entry(), $restore_other_path),
),
- 0, gtkset_sensitive(my $check_backup_bef_restore = new Gtk2::CheckButton(N_("Do new backup before restore (only for incremental backups.)")),
+ 0, gtkset_sensitive(my $check_backup_bef_restore = new Gtk2::CheckButton(N("Do new backup before restore (only for incremental backups.)")),
$backup_sys_versions || $backup_user_versions),
- 0, gtkset_sensitive(my $check_remove_user_dir = new Gtk2::CheckButton(N_("Remove user directories before restore.")), $user_exist),
+ 0, gtkset_sensitive(my $check_remove_user_dir = new Gtk2::CheckButton(N("Remove user directories before restore.")), $user_exist),
1, new Gtk2::VBox(0,10),
),
);
@@ -3424,7 +3424,7 @@ sub catalog_restore() {
1, create_scrolled_window($list_bu_files),
),
0, gtkpack_(new Gtk2::HBox(1, 10),
- 1, gtksignal_connect(new Gtk2::Button(N_("Restore Selected\nCatalog Entry")), clicked => sub {
+ 1, gtksignal_connect(new Gtk2::Button(N("Restore Selected\nCatalog Entry")), clicked => sub {
if ($cat_entry) {
my $media_check = restore_catalog_entry($cat_entry, ());
if ($media_check) {
@@ -3434,7 +3434,7 @@ sub catalog_restore() {
}
}
}),
- 1, gtksignal_connect(new Gtk2::Button(N_("Restore Selected\nFiles")), clicked => sub {
+ 1, gtksignal_connect(new Gtk2::Button(N("Restore Selected\nFiles")), clicked => sub {
my $files = @restore_files;
#- grab the array before the widget clears it
my @passed_files = @restore_files;
@@ -3451,7 +3451,7 @@ sub catalog_restore() {
0, new Gtk2::Label("Restore To Path"),
0, $restore_path_entry = new Gtk2::Entry(),
),
- 1, gtksignal_connect(new Gtk2::Button(N_("Change\nRestore Path")), clicked => sub {
+ 1, gtksignal_connect(new Gtk2::Button(N("Change\nRestore Path")), clicked => sub {
filedialog_generic("Path To Restore To", \$restore_path_entry, \$restore_path);
}),
),
@@ -3517,7 +3517,7 @@ sub restore_catalog_entry {
my @restore_tar_files = glob("$dev_path/*$backup_time*$tar_ext");
my $matches = @restore_tar_files;
if ($matches == 0) {
- show_warning("f", N_("Backup files not found at %s.", $dev_path));
+ show_warning("f", N("Backup files not found at %s.", $dev_path));
return 0;
} else {
my $save_path_org = $save_path;
@@ -3530,9 +3530,9 @@ sub restore_catalog_entry {
if ($media eq 'CD') {
#- we know the cdrecord device, and the label
#- prompt the user for the right CD
- $in->ask_okcancel(N_("Restore From CD"), N_("Insert the CD with volume label %s\n in the CD drive under mount point /mnt/cdrom", $vol_host) ,1) ? ($vol_name = get_cd_volname()) : return 0;
+ $in->ask_okcancel(N("Restore From CD"), N("Insert the CD with volume label %s\n in the CD drive under mount point /mnt/cdrom", $vol_host) ,1) ? ($vol_name = get_cd_volname()) : return 0;
if ($vol_name ne $vol_host) {
- show_warning("f", N_("Not the correct CD label. Disk is labelled %s.", $vol_name));
+ show_warning("f", N("Not the correct CD label. Disk is labelled %s.", $vol_name));
return 0;
} else {
$restore_result = restore_hd_or_cd($cat_entry, '/mnt/cdrom', @restore_files);
@@ -3542,9 +3542,9 @@ sub restore_catalog_entry {
if ($media eq 'Tape') {
#- a little more complicated, we need to check if other backups
#- were done on this tape, and try to find the offset to this one
- $in->ask_okcancel(N_("Restore From Tape"), N_("Insert the tape with volume label %s\n in the tape drive device %s", $vol_host, $dev_path) ,1) ? ($vol_name = get_tape_label($dev_path)) : return 0;
+ $in->ask_okcancel(N("Restore From Tape"), N("Insert the tape with volume label %s\n in the tape drive device %s", $vol_host, $dev_path) ,1) ? ($vol_name = get_tape_label($dev_path)) : return 0;
if ($vol_name ne $vol_host) {
- show_warning("f", N_("Not the correct tape label. Tape is labelled %s.", $vol_name));
+ show_warning("f", N("Not the correct tape label. Tape is labelled %s.", $vol_name));
return 0;
} else {
$restore_result = restore_tape($cat_entry, $dev_path, @restore_files);
@@ -3564,30 +3564,30 @@ sub restore_catalog_entry {
#- rsync - uses a config file with username - rsync.user
#- ftp needs all parameters entered
- $in->ask_from(N_("Restore Via Network"), N_("Restore Via Network Protocol: %s", $media),
- [ { label => N_("Host Name"), val => \$vol_host },
- { label => N_("Host Path or Module"), val => \$dev_path },
- { label => N_("Username"), val => \$username },
- { label => N_("Password"), val => \$userpass, hidden => 1 },
+ $in->ask_from(N("Restore Via Network"), N("Restore Via Network Protocol: %s", $media),
+ [ { label => N("Host Name"), val => \$vol_host },
+ { label => N("Host Path or Module"), val => \$dev_path },
+ { label => N("Username"), val => \$username },
+ { label => N("Password"), val => \$userpass, hidden => 1 },
]) or goto return 0;
if ($media eq 'ftp' || $media eq 'rsync') {
if ($userpass eq '') {
- show_warning("f", N_("Password required"));
+ show_warning("f", N("Password required"));
return 0;
}
}
if ($media eq 'ftp' || $media eq 'rsync' || $media eq 'ssh') {
if ($username eq '') {
- show_warning("f", N_("Username required"));
+ show_warning("f", N("Username required"));
return 0;
} elsif ($vol_host eq '') {
- show_warning("f", N_("Hostname required"));
+ show_warning("f", N("Hostname required"));
return 0;
}
}
if ($dev_path eq '') {
- show_warning("f", N_("Path or Module required"));
+ show_warning("f", N("Path or Module required"));
return 0;
}
@@ -3600,10 +3600,10 @@ sub restore_catalog_entry {
system("rm -f $cfg_dir/restores/*");
if (!$restore_result) {
- show_warning("i", N_("Files Restored..."));
+ show_warning("i", N("Files Restored..."));
return 0;
} else {
- show_warning("f", N_("Restore Failed..."));
+ show_warning("f", N("Restore Failed..."));
return 1;
}
@@ -3837,7 +3837,7 @@ sub restore_box() {
1, gtkpack_(new Gtk2::VBox(0,10),
1, new Gtk2::VBox(0,10),
1, new Gtk2::VBox(0,10),
- 1, gtksignal_connect(new Gtk2::Button(N_("Restore all backups")), clicked => sub {
+ 1, gtksignal_connect(new Gtk2::Button(N("Restore all backups")), clicked => sub {
$retore_box->destroy;
button_box_restore();
@user_list_to_restore2 = sort @user_backuped;
@@ -3846,7 +3846,7 @@ sub restore_box() {
$restore_user = 1;
restore_do()
}),
- 1, gtksignal_connect(new Gtk2::Button(N_("Custom Restore")), clicked => sub {
+ 1, gtksignal_connect(new Gtk2::Button(N("Custom Restore")), clicked => sub {
$retore_box->destroy;
button_box_restore();
restore_step2();
@@ -3873,8 +3873,8 @@ sub restore_find_media_box() {
$message .= "Verify that $path_to_find_restore is the correct path" if $where_hd && $where_cd;
$message .= " and the CD is in the drive" if $where_cd;
if ($where_tape || $net_proto) {
- $message .= "Backups on unmountable media - Use Catalog to restore";
- $mount_media = 0;
+ $message .= "Backups on unmountable media - Use Catalog to restore";
+ $mount_media = 0;
}
$message .= ".";
@@ -3889,16 +3889,15 @@ sub restore_find_media_box() {
1, gtkpack(new Gtk2::HBox(0, 15),
new Gtk2::VBox(0, 5),
gtkpack(new Gtk2::VBox(0, 10),
- gtkset_sensitive(gtksignal_connect(new Gtk2::Button(N_("CD in place - continue.")), clicked => sub {
+ gtkset_sensitive(gtksignal_connect(new Gtk2::Button(N("CD in place - continue.")), clicked => sub {
$good_restore_path = 1;
- $box2->destroy;
interactive_mode_box("restore");
}), $mount_media),
$new_path_entry = gtkset_sensitive(new Gtk2::Entry(), $mount_media),
- gtkset_sensitive(gtksignal_connect(new Gtk2::Button(N_("Browse to new restore repository.")), clicked => sub {
+ gtkset_sensitive(gtksignal_connect(new Gtk2::Button(N("Browse to new restore repository.")), clicked => sub {
filedialog_generic("Directory To Restore From", \$new_path_entry, \$path_to_find_restore);
}), $mount_media),
- gtksignal_connect(new Gtk2::Button(N_("Restore From Catalog")), clicked => sub {
+ gtksignal_connect(new Gtk2::Button(N("Restore From Catalog")), clicked => sub {
$box2->destroy;
catalog_restore();
}),
@@ -3909,7 +3908,8 @@ sub restore_find_media_box() {
),
);
$new_path_entry->set_text($path_to_find_restore);
-
+ $central_widget = \$box2;
+
button_box_find_media($mount_media);
$up_box->show_all;
}
@@ -3926,7 +3926,7 @@ sub restore_status() {
[""],
[""],
[""],
- [N_("Restore Progress")],
+ [N("Restore Progress")],
[""],
[""],
[$pbar3],
@@ -3950,18 +3950,18 @@ sub button_box_adv() {
$button_box_tmp->destroy;
gtkpack($button_box,
$button_box_tmp = gtkpack_(new Gtk2::HButtonBox,
- 0, gtksignal_connect(new Gtk2::Button(N_("Cancel")), clicked => sub {
+ 0, gtksignal_connect(new Gtk2::Button(N("Cancel")), clicked => sub {
interactive_mode_box();
}),
- 0, gtksignal_connect(new Gtk2::Button(N_("Help")), clicked => sub {
+ 0, gtksignal_connect(new Gtk2::Button(N("Help")), clicked => sub {
adv_help(\&$current_widget, $custom_help);
}),
1, new Gtk2::HBox(0, 1),
- 0, gtksignal_connect(new Gtk2::Button(N_("Previous")), clicked => sub {
+ 0, gtksignal_connect(new Gtk2::Button(N("Previous")), clicked => sub {
destroy_widget();
$previous_widget->();
}),
- 0, gtksignal_connect(new Gtk2::Button(N_("Save")), clicked => sub {
+ 0, gtksignal_connect(new Gtk2::Button(N("Save")), clicked => sub {
destroy_widget();
unless (check_pkg_needs()) {
save_conf_file();
@@ -3977,19 +3977,19 @@ sub button_box_restore_main() {
gtkpack($button_box,
$button_box_tmp = gtkpack_(gtkpack_(new Gtk2::HButtonBox,
- 0, gtksignal_connect(new Gtk2::Button(N_("Cancel")), clicked => sub {
+ 0, gtksignal_connect(new Gtk2::Button(N("Cancel")), clicked => sub {
destroy_widget();
interactive_mode_box();
}),
- 0, gtksignal_connect(new Gtk2::Button(N_("Help")), clicked => sub {
+ 0, gtksignal_connect(new Gtk2::Button(N("Help")), clicked => sub {
adv_help(\&$current_widget, $custom_help);
}),
1, new Gtk2::HBox(0, 1),
- 0, gtksignal_connect(new Gtk2::Button(N_("Previous")), clicked => sub {
+ 0, gtksignal_connect(new Gtk2::Button(N("Previous")), clicked => sub {
destroy_widget();
interactive_mode_box()
}),
- 0, gtksignal_connect(new Gtk2::Button(N_("Ok")), clicked => sub {
+ 0, gtksignal_connect(new Gtk2::Button(N("Ok")), clicked => sub {
destroy_widget();
interactive_mode_box() }),
),
@@ -4002,19 +4002,19 @@ sub button_box_backup_end() {
gtkpack($button_box,
$button_box_tmp = gtkpack_(new Gtk2::HButtonBox,
- 0, gtksignal_connect(new Gtk2::Button(N_("Cancel")), clicked => sub {
+ 0, gtksignal_connect(new Gtk2::Button(N("Cancel")), clicked => sub {
destroy_widget();
interactive_mode_box()
}),
- 0, gtksignal_connect(new Gtk2::Button(N_("Help")), clicked => sub {
+ 0, gtksignal_connect(new Gtk2::Button(N("Help")), clicked => sub {
adv_help(\&$current_widget, $custom_help)
}),
1, new Gtk2::HBox(0, 1),
- 0, gtksignal_connect(new Gtk2::Button(N_("Previous")), clicked => sub {
+ 0, gtksignal_connect(new Gtk2::Button(N("Previous")), clicked => sub {
destroy_widget();
$previous_widget->()
}),
- 0, gtksignal_connect(new Gtk2::Button(N_("Build Backup")), clicked => sub {
+ 0, gtksignal_connect(new Gtk2::Button(N("Build Backup")), clicked => sub {
destroy_widget();
build_backup_status();
build_backup_files();
@@ -4028,19 +4028,19 @@ sub button_box_wizard_end() {
gtkpack($button_box,
$button_box_tmp = gtkpack_(new Gtk2::HButtonBox,
- 0, gtksignal_connect(new Gtk2::Button(N_("Cancel")), clicked => sub {
+ 0, gtksignal_connect(new Gtk2::Button(N("Cancel")), clicked => sub {
destroy_widget();
interactive_mode_box();
}),
- 0, gtksignal_connect(new Gtk2::Button(N_("Help")), clicked => sub {
+ 0, gtksignal_connect(new Gtk2::Button(N("Help")), clicked => sub {
adv_help(\&$current_widget, $custom_help);
}),
1, new Gtk2::HBox(0, 1),
- 0, gtksignal_connect(new Gtk2::Button(N_("Previous")), clicked => sub {
+ 0, gtksignal_connect(new Gtk2::Button(N("Previous")), clicked => sub {
destroy_widget();
$previous_widget->();
}),
- 0, gtksignal_connect(new Gtk2::Button(N_("Save")), clicked => sub {
+ 0, gtksignal_connect(new Gtk2::Button(N("Save")), clicked => sub {
destroy_widget();
save_conf_file();
interactive_mode_box();
@@ -4054,19 +4054,19 @@ sub button_box_restore_end() {
gtkpack($button_box,
$button_box_tmp = gtkpack_(new Gtk2::HButtonBox,
- 0, gtksignal_connect(new Gtk2::Button(N_("Cancel")), clicked => sub {
+ 0, gtksignal_connect(new Gtk2::Button(N("Cancel")), clicked => sub {
destroy_widget();
interactive_mode_box();
}),
- 0, gtksignal_connect(new Gtk2::Button(N_("Help")), clicked => sub {
+ 0, gtksignal_connect(new Gtk2::Button(N("Help")), clicked => sub {
adv_help(\&$current_widget, $custom_help);
}),
1, new Gtk2::HBox(0, 1),
- 0, gtksignal_connect(new Gtk2::Button(N_("Previous")), clicked => sub {
+ 0, gtksignal_connect(new Gtk2::Button(N("Previous")), clicked => sub {
destroy_widget();
$previous_widget->();
}),
- 0, gtksignal_connect(new Gtk2::Button(N_("Restore")), clicked => sub {
+ 0, gtksignal_connect(new Gtk2::Button(N("Restore")), clicked => sub {
destroy_widget();
restore_backend();
}),
@@ -4081,7 +4081,7 @@ sub button_box_build_backup_end() {
$button_box_tmp = gtkpack_(new Gtk2::HButtonBox,
1, new Gtk2::HBox(0, 5),
1, new Gtk2::HBox(0, 5),
- 0, gtksignal_connect(new Gtk2::Button(N_("Ok")), clicked => sub {
+ 0, gtksignal_connect(new Gtk2::Button(N("Ok")), clicked => sub {
# destroy_widget();
interactive_mode_box();
}),
@@ -4096,10 +4096,10 @@ sub button_box_restore_pbs_end() {
$button_box_tmp = gtkpack_(new Gtk2::HButtonBox,
1, new Gtk2::HBox(0, 5),
1, new Gtk2::HBox(0, 5),
- 1, gtksignal_connect(new Gtk2::Button(N_("Help")), clicked => sub {
+ 1, gtksignal_connect(new Gtk2::Button(N("Help")), clicked => sub {
adv_help(\&$current_widget, $custom_help);
}),
- 0, gtksignal_connect(new Gtk2::Button(N_("Ok")), clicked => sub {
+ 0, gtksignal_connect(new Gtk2::Button(N("Ok")), clicked => sub {
destroy_widget();
interactive_mode_box();
}),
@@ -4112,19 +4112,19 @@ sub button_box_build_backup() {
gtkpack($button_box,
$button_box_tmp = gtkpack_(new Gtk2::HButtonBox,
- 1, gtksignal_connect(new Gtk2::Button(N_("Cancel")), clicked => sub {
+ 1, gtksignal_connect(new Gtk2::Button(N("Cancel")), clicked => sub {
destroy_widget();
interactive_mode_box();
}),
- 1, gtksignal_connect(new Gtk2::Button(N_("Help")), clicked => sub {
+ 1, gtksignal_connect(new Gtk2::Button(N("Help")), clicked => sub {
adv_help(\&$current_widget, $custom_help);
}),
1, new Gtk2::HBox(0, 0),
- 0, gtksignal_connect(new Gtk2::Button(N_("Previous")), clicked => sub {
+ 0, gtksignal_connect(new Gtk2::Button(N("Previous")), clicked => sub {
destroy_widget();
$previous_widget->();
}),
- 1, gtksignal_connect(new Gtk2::Button(N_("Next")), clicked => sub {
+ 1, gtksignal_connect(new Gtk2::Button(N("Next")), clicked => sub {
destroy_widget();
$next_widget->();
}),
@@ -4138,19 +4138,19 @@ sub button_box_restore() {
gtkpack($button_box,
$button_box_tmp = gtkpack_(new Gtk2::HButtonBox,
- 1, gtksignal_connect(new Gtk2::Button(N_("Cancel")), clicked => sub {
+ 1, gtksignal_connect(new Gtk2::Button(N("Cancel")), clicked => sub {
destroy_widget();
interactive_mode_box();
}),
- 1, gtksignal_connect(new Gtk2::Button(N_("Help")), clicked => sub {
+ 1, gtksignal_connect(new Gtk2::Button(N("Help")), clicked => sub {
adv_help(\&$current_widget, $custom_help);
}),
1, new Gtk2::HBox(0, 0),
- 0, gtksignal_connect(new Gtk2::Button(N_("Previous")), clicked => sub {
+ 0, gtksignal_connect(new Gtk2::Button(N("Previous")), clicked => sub {
destroy_widget();
$previous_widget->();
}),
- 1, gtksignal_connect(new Gtk2::Button(N_("Next")), clicked => sub {
+ 1, gtksignal_connect(new Gtk2::Button(N("Next")), clicked => sub {
destroy_widget();
$next_widget->();
}),
@@ -4167,21 +4167,20 @@ sub button_box_find_media {
gtkpack($button_box,
$button_box_tmp = gtkpack_(new Gtk2::HButtonBox,
- 1, gtksignal_connect(new Gtk2::Button(N_("Cancel")), clicked => sub {
- $box2->destroy;
+ 1, gtksignal_connect(new Gtk2::Button(N("Cancel")), clicked => sub {
+ $central_widget = \$box2;
interactive_mode_box();
}),
- 1, gtksignal_connect(new Gtk2::Button(N_("Help")), clicked => sub {
- $box2->destroy;
- adv_help(\&$current_widget, $custom_help);
+ 1, gtksignal_connect(new Gtk2::Button(N("Help")), clicked => sub {
+ $central_widget = \$box2;
+ adv_help(\&restore_find_media_box, $custom_help);
}),
1, new Gtk2::HBox(0, 0),
- 0, gtksignal_connect(new Gtk2::Button(N_("Previous")), clicked => sub {
- $box2->destroy;
+ 0, gtksignal_connect(new Gtk2::Button(N("Previous")), clicked => sub {
+ $central_widget = \$box2;
interactive_mode_box();
}),
- 1, gtkset_sensitive(gtksignal_connect(new Gtk2::Button(N_("Next")), clicked => sub {
- $box2->destroy;
+ 1, gtkset_sensitive(gtksignal_connect(new Gtk2::Button(N("Next")), clicked => sub {
interactive_mode_box("restore");
}), $mount_media),
),
@@ -4193,19 +4192,19 @@ sub button_box_wizard() {
gtkpack($button_box,
$button_box_tmp = gtkpack_(new Gtk2::HButtonBox,
- 1, gtksignal_connect(new Gtk2::Button(N_("Cancel")), clicked => sub {
+ 1, gtksignal_connect(new Gtk2::Button(N("Cancel")), clicked => sub {
destroy_widget();
interactive_mode_box()
}),
- 1, gtksignal_connect(new Gtk2::Button(N_("Help")), clicked => sub {
+ 1, gtksignal_connect(new Gtk2::Button(N("Help")), clicked => sub {
adv_help(\&$current_widget, $custom_help)
}),
1, new Gtk2::HBox(0, 0),
- 0, gtksignal_connect(new Gtk2::Button($next_widget ? N_("Previous") : N_("OK")), clicked => sub {
+ 0, gtksignal_connect(new Gtk2::Button($next_widget ? N("Previous") : N("OK")), clicked => sub {
destroy_widget();
$previous_widget ? $previous_widget->() : $next_widget->();
}),
- if_($next_widget, 1, gtksignal_connect(new Gtk2::Button(N_("Next")), clicked => sub {
+ if_($next_widget, 1, gtksignal_connect(new Gtk2::Button(N("Next")), clicked => sub {
destroy_widget();
$next_widget ? $next_widget->() : $previous_widget->();
})),
@@ -4218,8 +4217,8 @@ sub button_box_main() {
gtkpack($button_box,
$button_box_tmp = gtkpack(gtkset_layout(new Gtk2::HButtonBox, 'start'),
- gtksignal_connect(new Gtk2::Button(N_("Close")), clicked => sub { ugtk2->exit(0) }),
- gtksignal_connect(new Gtk2::Button(N_("Help")), clicked => sub {
+ gtksignal_connect(new Gtk2::Button(N("Close")), clicked => sub { ugtk2->exit(0) }),
+ gtksignal_connect(new Gtk2::Button(N("Help")), clicked => sub {
adv_help(\&interactive_mode_box, $custom_help)
}),
),
@@ -4250,13 +4249,13 @@ sub dialog_one {
}
sub send_mail_pb() {
- dialog_one(N_("Error during sendmail.
+ dialog_one(N("Error during sendmail.
Your report mail was not sent.
Please configure sendmail"));
}
sub client_ftp_pb() {
- dialog_one(N_("Error during sending file via FTP.
+ dialog_one(N("Error during sending file via FTP.
Please correct your FTP configuration."));
}
@@ -4270,9 +4269,9 @@ sub install_rpm {
my $box_what_user;
gtkpack($advanced_box,
$box_what_user = gtkpack_(new Gtk2::VBox(0, 15),
- 0, N_("The following packages need to be installed:\n") . join(' ', @list_of_rpm_to_install),
+ 0, N("The following packages need to be installed:\n") . join(' ', @list_of_rpm_to_install),
0, new Gtk2::HSeparator,
- 0, gtksignal_connect(new Gtk2::Button(N_("Install")), clicked => sub {
+ 0, gtksignal_connect(new Gtk2::Button(N("Install")), clicked => sub {
system("/usr/sbin/urpmi --X @list_of_rpm_to_install");
destroy_widget();
$previous_widget->();
@@ -4293,7 +4292,7 @@ sub message_norestore_box() {
1, gtkpack(new Gtk2::HBox(0, 15),
new Gtk2::VBox(0, 5),
gtkcreate_img('warning'),
- N_("Please select data to restore..."),
+ N("Please select data to restore..."),
new Gtk2::VBox(0, 5),
),
1, new Gtk2::VBox(0, 5),
@@ -4328,7 +4327,7 @@ sub message_common_box {
}
sub message_noselect_box() {
- message_common_box(N_("Please select media for backup..."));
+ message_common_box(N("Please select media for backup..."));
$previous_widget = \&wizard_step2;
$next_widget = \&wizard_step2;
$central_widget = \$box2;
@@ -4336,7 +4335,7 @@ sub message_noselect_box() {
}
sub message_noselect_what_box() {
- message_common_box(N_("Please select data to backup..."));
+ message_common_box(N("Please select data to backup..."));
$previous_widget = \&wizard;
$next_widget = \&wizard;
$central_widget = \$box2;
@@ -4354,7 +4353,7 @@ sub message_common_box_2 {
1, gtkpack(new Gtk2::HBox(0, 15),
new Gtk2::VBox(0, 5),
gtkcreate_img('warning'),
- N_("%s", $label),
+ N("%s", $label),
new Gtk2::VBox(0, 5),
),
1, new Gtk2::VBox(0, 5),
@@ -4365,11 +4364,11 @@ sub message_common_box_2 {
$up_box->show_all;
}
sub message_noconf_box() {
- message_common_box_2(N_("No configuration file found \nplease click Wizard or Advanced."), 1);
+ message_common_box_2(N("No configuration file found \nplease click Wizard or Advanced."), 1);
}
sub message_underdevel() {
- message_common_box_2(N_("Under Devel ... please wait."), 1);
+ message_common_box_2(N("Under Devel ... please wait."), 1);
}
################################################ BUILD_BACKUP ################################################
@@ -4443,16 +4442,16 @@ sub build_backup_status() {
$table->set_row_spacings(5);
$table->set_col_spacings(10);
- $table->attach_defaults(new Gtk2::Label(N_("Backup system files")), 0, 1, 0, 1);
+ $table->attach_defaults(new Gtk2::Label(N("Backup system files")), 0, 1, 0, 1);
$table->attach_defaults($pbar, 0, 1, 1, 2);
$table->attach_defaults($plabel, 1, 2, 1, 2);
- $table->attach_defaults(new Gtk2::Label(N_("Backup user files")), 0, 1, 2, 3);
+ $table->attach_defaults(new Gtk2::Label(N("Backup user files")), 0, 1, 2, 3);
$table->attach_defaults($pbar1, 0, 1, 3, 4);
$table->attach_defaults($plabel1, 1, 2, 3, 4);
- $table->attach_defaults(new Gtk2::Label(N_("Backup other files")), 0, 1, 4, 5);
+ $table->attach_defaults(new Gtk2::Label(N("Backup other files")), 0, 1, 4, 5);
$table->attach_defaults($pbar2, 0, 1, 5, 6);
$table->attach_defaults($plabel2, 1, 2, 5, 6);
- $table->attach_defaults(new Gtk2::Label(N_("Total Progress")), 0, 1, 6, 7);
+ $table->attach_defaults(new Gtk2::Label(N("Total Progress")), 0, 1, 6, 7);
$table->attach_defaults($pbar3, 0, 1, 7, 8);
$table->attach_defaults($plabel3, 1, 2, 7, 8);
@@ -4481,15 +4480,15 @@ sub build_backup_ftp_status() {
gtkpack($advanced_box,
$table = gtkpack_(new Gtk2::VBox(0, 15),
- 1, N_("Sending files by FTP"),
+ 1, N("Sending files by FTP"),
1, new Gtk2::VBox(0, 15),
1, create_packtable ({ col_spacings => 10, row_spacings => 5 },
- [N_("Sending files...")],
+ [N("Sending files...")],
[""],
[ $plabel = new Gtk2::Label(' ') ],
[ $pbar ],
[""],
- [N_("Total Progress")],
+ [N("Total Progress")],
[ $plabel3 = new Gtk2::Label(' ') ],
[$pbar3],
),
@@ -4512,7 +4511,7 @@ sub build_backup_box_see_conf() {
gtkpack($advanced_box,
$box2 = gtkpack_(new Gtk2::HBox(0, 15),
1, gtkpack_(new Gtk2::VBox(0,10),
- 0, N_("Drakbackup Configuration"),
+ 0, N("Drakbackup Configuration"),
1, create_scrolled_window($text),
),
),
@@ -4567,12 +4566,12 @@ sub build_backup_box() {
$button_from_conf_file->add(gtkpack(new Gtk2::HBox(0,10),
gtkcreate_img("ic82-discdurwhat-40"),
- new Gtk2::Label(N_("Backup Now from configuration file")),
+ new Gtk2::Label(N("Backup Now from configuration file")),
new Gtk2::HBox(0, 5)
));
$button_see_conf->add(gtkpack(new Gtk2::HBox(0,10),
gtkcreate_img("ic82-moreoption-40"),
- new Gtk2::Label(N_("View Backup Configuration.")),
+ new Gtk2::Label(N("View Backup Configuration.")),
new Gtk2::HBox(0, 5)
));
@@ -4585,32 +4584,37 @@ sub build_backup_box() {
sub interactive_mode_box {
- destroy_widget();
my ($mode) = @_;
-
+ if ($mode eq "restore") {
+ $central_widget = \$box2;
+ restore_box();
+ return 0;
+ }
+
+ destroy_widget();
gtkadd($advanced_box,
$box2 = gtkpack_(new Gtk2::HBox(0, 15),
1, new Gtk2::VBox(0, 5),
1, gtkpack_(new Gtk2::VBox(0, 15),
1, new Gtk2::VBox(0, 5),
- 1, gtksignal_connect(new Gtk2::Button(N_("Wizard Configuration")), clicked => sub {
+ 1, gtksignal_connect(new Gtk2::Button(N("Wizard Configuration")), clicked => sub {
destroy_widget();
read_conf_file();
wizard();
}),
- 1, gtksignal_connect(new Gtk2::Button(N_("Advanced Configuration")), clicked => sub {
+ 1, gtksignal_connect(new Gtk2::Button(N("Advanced Configuration")), clicked => sub {
button_box_adv();
destroy_widget();
advanced_box();
}),
- 1, gtksignal_connect(new Gtk2::Button(N_("Backup Now")), clicked => sub {
+ 1, gtksignal_connect(new Gtk2::Button(N("Backup Now")), clicked => sub {
if ($cfg_file_exist) {
build_backup_box();
} else {
message_noconf_box();
}
}),
- 1, gtksignal_connect(new Gtk2::Button(N_("Restore")), clicked => sub {
+ 1, gtksignal_connect(new Gtk2::Button(N("Restore")), clicked => sub {
destroy_widget();
restore_box();
}),
@@ -4619,14 +4623,10 @@ sub interactive_mode_box {
1, new Gtk2::VBox(0, 5),
),
);
+ $central_widget = \$box2;
button_box_main();
$custom_help = "main";
- $central_widget = \$box2;
$up_box->show_all;
- if ($mode eq "restore") {
- destroy_widget();
- restore_box();
- }
}
sub interactive_mode() {
@@ -4639,7 +4639,7 @@ sub interactive_mode() {
$window1 = $my_win->{window};
unless ($::isEmbedded) {
$my_win->{rwindow}->set_position('center');
- $my_win->{rwindow}->set_title(N_("Drakbackup"));
+ $my_win->{rwindow}->set_title(N("Drakbackup"));
}
$my_win->{rwindow}->signal_connect(delete_event => sub { ugtk2->exit(0) });
read_conf_file();
@@ -4686,7 +4686,7 @@ sub adv_help {
my %custom_helps = (
"options" =>
- N_("Options Description:
+ N("Options Description:
In this step Drakbackup allow you to change:
@@ -4716,7 +4716,7 @@ sub adv_help {
"),
"mail_pb" =>
- N_("
+ N("
Some errors during sendmail are caused by
a bad configuration of postfix. To solve it you have to
set myhostname or mydomain in /etc/postfix/main.cf
@@ -4724,7 +4724,7 @@ sub adv_help {
"),
"what" =>
- N_("Options Description:
+ N("Options Description:
- Backup System Files:
@@ -4767,7 +4767,7 @@ sub adv_help {
"),
"restore" =>
- N_("Restore Description:
+ N("Restore Description:
Only the most recent date will be used, because with incremental
backups it is necessary to restore one by one each older backup.
@@ -4795,12 +4795,12 @@ Otherwise, you are able to select only one of these.
"),
"main" =>
- N_(" Copyright (C) 2001-2002 MandrakeSoft by DUPONT Sebastien <dupont_s\@epita.fr>") .
+ 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" . $::license .
+N(" updates 2002 MandrakeSoft by Stew Benedict <sbenedict\@mandrakesoft.com>") .
+"\n\n" . translate($::license) .
"\n\n _____________________\n" .
-N_("Description:
+N("Description:
Drakbackup is used to backup your system.
During the configuration you can select:
@@ -4837,7 +4837,7 @@ Restore Step:
"),
"ftp" =>
- N_("Options Description:
+ N("Options Description:
Please be careful when you are using ftp backup, because only
backups that are already built are sent to the server.
@@ -4846,7 +4846,7 @@ drive before sending it to the server.
"),
"restore_pbs" =>
- N_("
+ N("
Restore Backup Problems:
During the restore step, Drakbackup will verify all your
@@ -4863,17 +4863,19 @@ backup data files by hand.
my $text = new Gtk2::TextView;
gtktext_insert($text, $custom_helps{$custom_help} || $custom_helps{main});
gtkpack($advanced_box,
- my $advanced_box_help = gtkpack_(new Gtk2::VBox(0,10),
+ $box2 = gtkpack_(new Gtk2::VBox(0,10),
+
1, create_scrolled_window($text),
0, gtkadd(gtkset_layout(new Gtk2::HButtonBox, 'spread'),
- gtksignal_connect(new Gtk2::Button(N_("OK")), clicked => sub {
+ gtksignal_connect(new Gtk2::Button(N("OK")), clicked => sub {
destroy_widget();
$function->();
}),
),
)
);
- $central_widget = \$advanced_box_help;
+
+ $central_widget = \$box2;
$up_box->show_all;
}
@@ -4890,6 +4892,6 @@ sub to_normal() {
sub destroy_widget() {
if ($central_widget ne '') {
$$central_widget->destroy;
- $central_widget = '';
+ $central_widget = '';
}
}
generated by cgit v1.2.1 (git 2.21.0) at 2024-05-17 21:58:34 +0000