summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorAhmad Samir <ahmad@mageia.org>2011-04-02 19:39:51 +0000
committerAhmad Samir <ahmad@mageia.org>2011-04-02 19:39:51 +0000
commited8c9c7f3096c626c9a0419626524f477d3ae854 (patch)
treeaa0ec2ee89a4aee11369bb5ebb3f3997526438b3 /perl-install
parent6faa758048d53251912d14c95f6a7d86790eb78a (diff)
downloaddrakx-ed8c9c7f3096c626c9a0419626524f477d3ae854.tar
drakx-ed8c9c7f3096c626c9a0419626524f477d3ae854.tar.gz
drakx-ed8c9c7f3096c626c9a0419626524f477d3ae854.tar.bz2
drakx-ed8c9c7f3096c626c9a0419626524f477d3ae854.tar.xz
drakx-ed8c9c7f3096c626c9a0419626524f477d3ae854.zip
- use 'cannot' instead of 'can not'
- use 'LDAP' instead of 'Ldap'
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/any.pm4
-rw-r--r--perl-install/authentication.pm6
-rw-r--r--perl-install/bootloader.pm4
-rw-r--r--perl-install/c.pm2
-rw-r--r--perl-install/common.pm4
-rw-r--r--perl-install/diskdrake/interactive.pm8
-rw-r--r--perl-install/diskdrake/smbnfs_gtk.pm2
-rw-r--r--perl-install/do_pkgs.pm2
-rw-r--r--perl-install/fs.pm2
-rw-r--r--perl-install/fs/loopback.pm2
-rw-r--r--perl-install/fs/mount.pm2
-rw-r--r--perl-install/fs/partitioning_wizard.pm6
-rw-r--r--perl-install/fs/type.pm4
-rw-r--r--perl-install/fsedit.pm8
-rw-r--r--perl-install/install/any.pm6
-rw-r--r--perl-install/install/commands.pm20
-rw-r--r--perl-install/install/help/help.pm2
-rw-r--r--perl-install/install/pkgs.pm2
-rw-r--r--perl-install/install/share/list.xml2
-rw-r--r--perl-install/install/steps_gtk.pm10
-rw-r--r--perl-install/install/steps_interactive.pm2
-rw-r--r--perl-install/interactive/http.pm2
-rw-r--r--perl-install/mygtk2.pm10
-rw-r--r--perl-install/partition_table.pm4
-rw-r--r--perl-install/partition_table/raw.pm10
-rw-r--r--perl-install/pkgs.pm2
-rw-r--r--perl-install/run_program.pm8
-rwxr-xr-xperl-install/standalone/bootloader-config8
-rwxr-xr-xperl-install/standalone/drakautoinst2
-rwxr-xr-xperl-install/standalone/fileshareset12
-rwxr-xr-xperl-install/standalone/notify-x11-free-driver-switch2
31 files changed, 80 insertions, 80 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 90dce2613..24d4a9e53 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -434,7 +434,7 @@ sub setupBootloader__general {
my $ok = $b->{password} eq $b->{password2}
or $in->ask_warn('', [ N("The passwords do not match"), N("Please try again") ]);
my $ok2 = !($b->{password} && $b->{method} eq 'grub-graphic')
- or $in->ask_warn('', N("You can not use a password with %s",
+ or $in->ask_warn('', N("You cannot use a password with %s",
bootloader::method2text($b->{method})));
$ok && $ok2;
} },
@@ -1438,7 +1438,7 @@ sub ask_window_manager_to_logout {
);
my $cmd = $h{$wm} or return;
if (member($wm, 'ksmserver', 'kwin', 'gnome-session') && $> == 0) {
- #- we can not use dcop when we are root
+ #- we cannot use dcop when we are root
if (my $user = $ENV{USERHELPER_UID} && getpwuid($ENV{USERHELPER_UID})) {
$cmd = "su $user -c '$cmd'";
} else {
diff --git a/perl-install/authentication.pm b/perl-install/authentication.pm
index 4e6ae2ce9..ab249dc50 100644
--- a/perl-install/authentication.pm
+++ b/perl-install/authentication.pm
@@ -66,7 +66,7 @@ sub kind2description_raw {
LDAP => [ N("LDAP:"), N("Tells your computer to use LDAP for some or all authentication. LDAP consolidates certain types of information within your organization."), ],
NIS => [ N("NIS:"), N("Allows you to run a group of computers in the same Network Information Service domain with a common password and group file."), ],
winbind => [ N("Windows Domain:"), N("Winbind allows the system to retrieve information and authenticate users in a Windows domain."), ],
- KRB5 => [ N("Kerberos 5 :"), N("With Kerberos and Ldap for authentication in Active Directory Server "), ],
+ KRB5 => [ N("Kerberos 5 :"), N("With Kerberos and LDAP for authentication in Active Directory Server "), ],
);
join('', map { $_ ? qq($_->[0]\n$_->[1]) : '' } map { $kind2description{$_} } @kinds);
}
@@ -156,7 +156,7 @@ sub ask_parameters {
my %level = (
1 => N("Use local file for users information"),
- 2 => N("Use Ldap for users information"),
+ 2 => N("Use LDAP for users information"),
);
$in->ask_from('', N(" "),
@@ -351,7 +351,7 @@ EOF
configure_nss_ldap($authentication);
output($conf_file, <<EOF);
-auth=Ldap Directory
+auth=LDAP Directory
server=$authentication->{LDAP_server}
realm=$authentication->{LDAPDOMAIN}
EOF
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index e300f949a..d5c6180f4 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -1982,7 +1982,7 @@ sub install {
my ($bootloader, $all_hds) = @_;
if (my $part = fs::get::device2part($bootloader->{boot}, [ fs::get::fstab($all_hds) ])) {
- die N("You can not install the bootloader on a %s partition\n", $part->{fs_type})
+ die N("You cannot install the bootloader on a %s partition\n", $part->{fs_type})
if $part->{fs_type} eq 'xfs';
}
$bootloader->{keytable} = keytable($bootloader->{keytable});
@@ -2116,7 +2116,7 @@ sub update_for_renumbered_partitions {
} $main_method ? $main_method : ('lilo', 'grub');
if (intersection(\@needed, [ map { $_->{name} } @changed_configs ])) {
- $in->ask_warn('', N("The bootloader can not be installed correctly. You have to boot rescue and choose \"%s\"",
+ $in->ask_warn('', N("The bootloader cannot be installed correctly. You have to boot rescue and choose \"%s\"",
N("Re-install Boot Loader")));
}
1;
diff --git a/perl-install/c.pm b/perl-install/c.pm
index 31d4863b3..2bf733fe6 100644
--- a/perl-install/c.pm
+++ b/perl-install/c.pm
@@ -10,7 +10,7 @@ sub AUTOLOAD() {
my @l = eval { &{$c::stuff::{$1}} };
if (my $err = $@) {
$err =~ /Undefined subroutine &main::/ ?
- die("can not find function $AUTOLOAD\n" . backtrace()) :
+ die("cannot find function $AUTOLOAD\n" . backtrace()) :
die($err);
}
wantarray() ? @l : $l[0];
diff --git a/perl-install/common.pm b/perl-install/common.pm
index 2806e1103..f88f2767c 100644
--- a/perl-install/common.pm
+++ b/perl-install/common.pm
@@ -109,7 +109,7 @@ sub setVirtual {
sub nonblock {
my ($F) = @_;
- fcntl($F, c::F_SETFL(), fcntl($F, c::F_GETFL(), 0) | c::O_NONBLOCK()) or die "can not fcntl F_SETFL: $!";
+ fcntl($F, c::F_SETFL(), fcntl($F, c::F_GETFL(), 0) | c::O_NONBLOCK()) or die "cannot fcntl F_SETFL: $!";
}
#- return a size in sector
@@ -267,7 +267,7 @@ sub open_file {
sub secured_file {
my ($f) = @_;
- c::is_secure_file($f) or die "can not ensure a safe $f";
+ c::is_secure_file($f) or die "cannot ensure a safe $f";
$f;
}
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index e5e2090a7..6500ebcc6 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -369,7 +369,7 @@ sub Auto_allocate {
$in->ask_warn("", [
N("All primary partitions are used"),
- N("I can not add any more partitions"),
+ N("I cannot add any more partitions"),
N("To have more partitions, please delete one to be able to create an extended partition"),
]);
}
@@ -539,7 +539,7 @@ sub Create {
};
if (my $err = $@) {
if ($err =~ /raw_add/ && $hd->hasExtended && !$hd->{primary}{extended}) {
- $in->ask_warn(N("Error"), N("You can not create a new partition
+ $in->ask_warn(N("Error"), N("You cannot create a new partition
(since you reached the maximal number of primary partitions).
First remove a primary partition and create an extended partition."));
return 0;
@@ -909,7 +909,7 @@ filesystem checks will be run on your next boot into Microsoft Windows®"));
} else {
set_isFormatted($part, 0);
partition_table::verifyParts($hd) if !isLVM($hd);
- $part->{mntpoint} = '' if isNonMountable($part); #- mainly for ntfs, which we can not format
+ $part->{mntpoint} = '' if isNonMountable($part); #- mainly for ntfs, which we cannot format
}
$adjust->(0) if $size < $oldsize;
@@ -1048,7 +1048,7 @@ sub Loopback {
write_partitions($in, $hd) or return;
- my $handle = any::inspect($real_part) or $in->ask_warn(N("Error"), N("This partition can not be used for loopback")), return;
+ my $handle = any::inspect($real_part) or $in->ask_warn(N("Error"), N("This partition cannot be used for loopback")), return;
my ($min, $max) = (1, fs::loopback::getFree($handle->{dir}, $real_part));
$max = min($max, 1 << (31 - 9)) if $real_part->{fs_type} eq 'vfat'; #- FAT does not handle file size bigger than 2GB
diff --git a/perl-install/diskdrake/smbnfs_gtk.pm b/perl-install/diskdrake/smbnfs_gtk.pm
index b5ddfbe53..a6fbee88b 100644
--- a/perl-install/diskdrake/smbnfs_gtk.pm
+++ b/perl-install/diskdrake/smbnfs_gtk.pm
@@ -194,7 +194,7 @@ sub import_tree {
my $path = $tree_model->get_path($node);
$tree->expand_row($path, 0);
- foreach ($find_exports->($wservers{$tree_model->get_path_str($node)} || return)) { #- can not die here since insert_node provoque a tree_select_row before the %wservers is filled
+ foreach ($find_exports->($wservers{$tree_model->get_path_str($node)} || return)) { #- cannot die here since insert_node provoque a tree_select_row before the %wservers is filled
my $s = $kind->to_string($_);
my $w = $tree_model->append_set($node, [ 0 => export_icon(find_fstab_entry($kind, $_)),
1 => $s ]);
diff --git a/perl-install/do_pkgs.pm b/perl-install/do_pkgs.pm
index ce340312b..2e9ac6de0 100644
--- a/perl-install/do_pkgs.pm
+++ b/perl-install/do_pkgs.pm
@@ -279,7 +279,7 @@ sub are_installed {
my @l2;
my $query_all = (any { /\*/ } @l) ? 'a' : '';
run_program::run('/bin/rpm', '>', \@l2, '-q' . $query_all, '--qf', "%{name}\n", @l); #- do not care about the return value
- $query_all ? chomp_(@l2) : intersection(\@l, [ chomp_(@l2) ]); #- can not return directly @l2 since it contains things like "package xxx is not installed"
+ $query_all ? chomp_(@l2) : intersection(\@l, [ chomp_(@l2) ]); #- cannot return directly @l2 since it contains things like "package xxx is not installed"
}
sub remove {
diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index 9af2232ef..713feb843 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -56,7 +56,7 @@ sub read_fstab {
$fs_type = $1;
#- with supermount, the type could be something like ext2:vfat
- #- but this can not be done without supermount, so switching to "auto"
+ #- but this cannot be done without supermount, so switching to "auto"
$fs_type = 'auto' if $fs_type =~ /:/;
0;
diff --git a/perl-install/fs/loopback.pm b/perl-install/fs/loopback.pm
index 9d77c7302..8620e6068 100644
--- a/perl-install/fs/loopback.pm
+++ b/perl-install/fs/loopback.pm
@@ -86,7 +86,7 @@ sub getFree {
}
#- returns the size of the loopback file if it already exists
-#- returns -1 is the loopback file can not be used
+#- returns -1 is the loopback file cannot be used
sub verifFile {
my ($dir, $file, $part) = @_;
-e "$dir$file" and return -s "$dir$file";
diff --git a/perl-install/fs/mount.pm b/perl-install/fs/mount.pm
index 3c0696b75..f2e9eac40 100644
--- a/perl-install/fs/mount.pm
+++ b/perl-install/fs/mount.pm
@@ -125,7 +125,7 @@ sub umount {
run_program::run('umount', '2>', \$err, $mntpoint) or die N("error unmounting %s: %s", $mntpoint, common::to_utf8($err));
};
- substInFile { $_ = '' if /(^|\s)$mntpoint\s/ } '/etc/mtab'; #- do not care about error, if we can not read, we will not manage to write... (and mess mtab)
+ substInFile { $_ = '' if /(^|\s)$mntpoint\s/ } '/etc/mtab'; #- do not care about error, if we cannot read, we will not manage to write... (and mess mtab)
}
sub part {
diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm
index affb18033..5bfd2403b 100644
--- a/perl-install/fs/partitioning_wizard.pm
+++ b/perl-install/fs/partitioning_wizard.pm
@@ -296,7 +296,7 @@ sub create_display_box {
my $sep_count = @parts - 1;
#- ratio used to compute initial partition pixel width (each partition should be > min_width)
- #- though, the pixel/sectors ratio can not be the same for all the partitions
+ #- though, the pixel/sectors ratio cannot be the same for all the partitions
my $initial_ratio = $totalsectors ? ($width - @parts * $minwidth - $sep_count) / $totalsectors : 1;
my $vbox = Gtk2::VBox->new;
@@ -428,7 +428,7 @@ sub display_choices {
@solutions = @sol if @sol > 1;
log::l("solutions: ", int @solutions);
- @solutions or $o->ask_warn(N("Partitioning"), N("I can not find any room for installing")), die 'already displayed';
+ @solutions or $o->ask_warn(N("Partitioning"), N("I cannot find any room for installing")), die 'already displayed';
log::l('HERE: ', join(',', map { $solutions{$_}[1] } @solutions));
@@ -574,7 +574,7 @@ sub main {
" (all solutions found: " . join('', map { $_->[1] } @solutions) . ")");
@solutions = @sol if @sol > 1;
log::l("solutions: ", int @solutions);
- @solutions or $o->ask_warn(N("Partitioning"), N("I can not find any room for installing")), die 'already displayed';
+ @solutions or $o->ask_warn(N("Partitioning"), N("I cannot find any room for installing")), die 'already displayed';
log::l('HERE: ', join(',', map { $_->[1] } @solutions));
$o->ask_from_({
title => N("Partitioning"),
diff --git a/perl-install/fs/type.pm b/perl-install/fs/type.pm
index bb90bdfe1..75a851047 100644
--- a/perl-install/fs/type.pm
+++ b/perl-install/fs/type.pm
@@ -390,8 +390,8 @@ sub set_isFormatted {
#- do this before modifying $part->{fs_type}
sub check {
my ($fs_type, $_hd, $part) = @_;
- $fs_type eq "jfs" && $part->{size} < MB(16) and die N("You can not use JFS for partitions smaller than 16MB");
- $fs_type eq "reiserfs" && $part->{size} < MB(32) and die N("You can not use ReiserFS for partitions smaller than 32MB");
+ $fs_type eq "jfs" && $part->{size} < MB(16) and die N("You cannot use JFS for partitions smaller than 16MB");
+ $fs_type eq "reiserfs" && $part->{size} < MB(32) and die N("You cannot use ReiserFS for partitions smaller than 32MB");
}
sub guessed_by_mount() {
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index dc6cf2284..f6e6843bb 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -244,7 +244,7 @@ sub get_hds {
#- already handled in cdie handler above
} elsif ($handle_die_and_cdie->()) {
} elsif ($o_in && $o_in->ask_yesorno(N("Error"),
-N("I can not read the partition table of device %s, it's too corrupted for me :(
+N("I cannot read the partition table of device %s, it's too corrupted for me :(
I can try to go on, erasing over bad partitions (ALL DATA will be lost!).
The other solution is to not allow DrakX to modify the partition table.
(the error is %s)
@@ -462,11 +462,11 @@ Please be sure to add a /boot partition");
}
if ($mntpoint eq "/boot" && (isLUKS($part) || isRawLUKS($part))) {
- die N("You can not use an encrypted file system for mount point %s", "/boot");
+ die N("You cannot use an encrypted file system for mount point %s", "/boot");
}
#- NB: if the LV doesn't exist, lv_nb_pvs returns 0
- die N("You can not use the LVM Logical Volume for mount point %s since it spans physical volumes", $mntpoint)
+ die N("You cannot use the LVM Logical Volume for mount point %s since it spans physical volumes", $mntpoint)
if $mntpoint eq '/boot' && isLVM($part) && lvm::lv_nb_pvs($part) > 1;
cdie N("You've selected the LVM Logical Volume as root (/).
The bootloader is not able to handle this when the volume spans physical volumes.
@@ -480,7 +480,7 @@ You should create a /boot partition first") if $mntpoint eq "/" && isLVM($part)
if !isTrueLocalFS($part) && $mntpoint eq '/';
die N("You need a true filesystem (ext2/3/4, reiserfs, xfs, or jfs) for this mount point\n")
if !isTrueFS($part) && member($mntpoint, '/home', fs::type::directories_needed_to_boot());
- die N("You can not use an encrypted file system for mount point %s", $mntpoint)
+ die N("You cannot use an encrypted file system for mount point %s", $mntpoint)
if $part->{options} =~ /encrypted/ && member($mntpoint, qw(/ /usr /var /boot));
local $part->{mntpoint} = $mntpoint;
diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm
index 76ac3d561..3ff267585 100644
--- a/perl-install/install/any.pm
+++ b/perl-install/install/any.pm
@@ -91,7 +91,7 @@ sub preConfigureTimezone {
my ($o) = @_;
require timezone;
- #- can not be done in install cuz' timeconfig %post creates funny things
+ #- cannot be done in install cuz' timeconfig %post creates funny things
add2hash($o->{timezone}, timezone::read()) if $o->{isUpgrade};
$o->{timezone}{timezone} ||= timezone::bestTimezone($o->{locale}{country});
@@ -890,7 +890,7 @@ sub generate_automatic_stage1_params {
my @l = install::ftp::parse_ftp_url($ENV{URLPREFIX});
@ks = (server => $l[0], directory => $l[1], user => $l[2], pass => $l[3]);
} elsif ($o->{method} eq 'nfs') {
- cat_("/proc/mounts") =~ m|(\S+):(\S+)\s+/tmp/media| or internal_error("can not find nfsimage");
+ cat_("/proc/mounts") =~ m|(\S+):(\S+)\s+/tmp/media| or internal_error("cannot find nfsimage");
@ks = (server => $1, directory => $2);
}
@ks = (method => $method, @ks);
@@ -998,7 +998,7 @@ sub migrate_device_names {
goto found_one;
}
- #- we can not find one and only one matching hd
+ #- we cannot find one and only one matching hd
my @from_fstab_not_handled = map { @$_ } @from_fstab_per_hds;
log::l("we still do not know what to do with: " . join(' ', map { $_->{device} } @from_fstab_not_handled));
diff --git a/perl-install/install/commands.pm b/perl-install/install/commands.pm
index f50d0c99c..55e1f103e 100644
--- a/perl-install/install/commands.pm
+++ b/perl-install/install/commands.pm
@@ -37,7 +37,7 @@ sub false() { exit 1 }
sub cat { @ARGV = @_; print while <> }
sub dirname_ { print dirname(@_), "\n" }
sub basename_ { print basename(@_), "\n" }
-sub rmdir_ { foreach (@_) { rmdir $_ or die "rmdir: can not remove $_\n" } }
+sub rmdir_ { foreach (@_) { rmdir $_ or die "rmdir: cannot remove $_\n" } }
sub lsmod() { print "Module Size Used by\n"; cat("/proc/modules") }
sub which {
ARG: foreach (@_) { foreach my $c (split /:/, $ENV{PATH}) { -x "$c/$_" and print("$c/$_\n"), next ARG } }
@@ -97,7 +97,7 @@ sub rm {
if (!-l $_ && -d $_) {
$rec or die "$_ is a directory\n";
&$rm(glob_($_));
- rmdir $_ or die "can not remove directory $_: $!\n";
+ rmdir $_ or die "cannot remove directory $_: $!\n";
} else { unlink $_ or die "rm of $_ failed: $!\n" }
}
};
@@ -160,7 +160,7 @@ sub ls {
@_ == 1 && -d $_[0] and @_ = glob_($_[0]);
foreach (sort @_) {
if ($l) {
- my @s = lstat or warn("can not stat file $_\n"), next;
+ my @s = lstat or warn("cannot stat file $_\n"), next;
formline(
"@<<<<<<<<< @<<<<<<< @<<<<<<< @>>>>>>>> @>>>>>>>>>>>>>>> @*\n",
rights($s[2]), getpwuid $s[4] || $s[4], getgrgid $s[5] || $s[5],
@@ -214,15 +214,15 @@ sub dd {
$h{$1} = $2;
}
local (*IF, *OF); my ($tmp, $nb, $read);
- ref($h{if}) eq 'GLOB' ? (*IF = $h{if}) : sysopen(IF, $h{if}, 0) || die "error: can not open file $h{if}\n";
- ref($h{of}) eq 'GLOB' ? (*OF = $h{of}) : sysopen(OF, $h{of}, c::O_CREAT()|c::O_WRONLY()) || die "error: can not open file $h{of}\n";
+ ref($h{if}) eq 'GLOB' ? (*IF = $h{if}) : sysopen(IF, $h{if}, 0) || die "error: cannot open file $h{if}\n";
+ ref($h{of}) eq 'GLOB' ? (*OF = $h{of}) : sysopen(OF, $h{of}, c::O_CREAT()|c::O_WRONLY()) || die "error: cannot open file $h{of}\n";
$h{bs} = removeXiBSuffix($h{bs});
for ($nb = 0; !$h{count} || $nb < $h{count}; $nb++) {
printf "\r%02.1d%%", 100 * $nb / $h{count} if $h{count} && $percent;
- $read = sysread(IF, $tmp, $h{bs}) or ($h{count} ? die "error: can not read block $nb\n" : last);
- syswrite(OF, $tmp) or die "error: can not write block $nb\n";
+ $read = sysread(IF, $tmp, $h{bs}) or ($h{count} ? die "error: cannot read block $nb\n" : last);
+ syswrite(OF, $tmp) or die "error: cannot write block $nb\n";
$read < $h{bs} and $read = 1, last;
}
print STDERR "\r$nb+$read records in\n";
@@ -233,7 +233,7 @@ sub head_tail {
my ($h, $n) = getopts(\@_, qw(hn));
$h || @_ < to_bool($n) and die "usage: $0 [-h] [-n lines] [<file>]\n";
$n = $n ? shift : 10;
- my $fh = @_ ? common::open_file($_[0]) || die "error: can not open file $_[0]\n" : *STDIN;
+ my $fh = @_ ? common::open_file($_[0]) || die "error: cannot open file $_[0]\n" : *STDIN;
if ($0 eq 'head') {
local $_;
@@ -278,7 +278,7 @@ sub more {
require devices;
my $tty = devices::make('tty');
my $n = 0;
- open(my $IN, $tty) or die "can not open $tty\n";
+ open(my $IN, $tty) or die "cannot open $tty\n";
local $_;
while (<>) {
if (++$n == 25) {
@@ -373,7 +373,7 @@ sub dmesg() { print cat_("/tmp/syslog") }
sub sort {
my ($n, $h) = getopts(\@_, qw(nh));
$h and die "usage: sort [-n] [<file>]\n";
- my $fh = @_ ? common::open_file($_[0]) || die "error: can not open file $_[0]\n" : *STDIN;
+ my $fh = @_ ? common::open_file($_[0]) || die "error: cannot open file $_[0]\n" : *STDIN;
if ($n) {
print(sort { $a <=> $b } <$fh>);
} else {
diff --git a/perl-install/install/help/help.pm b/perl-install/install/help/help.pm
index 4354a9304..107527f8c 100644
--- a/perl-install/install/help/help.pm
+++ b/perl-install/install/help/help.pm
@@ -692,7 +692,7 @@ OS installed on your machine.
* if a GRUB or LILO boot sector is found, it'll replace it with a new one.
-If DrakX can not determine where to place the boot sector, it'll ask you
+If DrakX cannot determine where to place the boot sector, it'll ask you
where it should place it. Generally, the \"%s\" is the safest place.
Choosing \"%s\" will not install any boot loader. Use this option only if you
know what you're doing.", N("First sector of drive (MBR)"), N("Skip"));
diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm
index 2972584ff..d248a6e3c 100644
--- a/perl-install/install/pkgs.pm
+++ b/perl-install/install/pkgs.pm
@@ -343,7 +343,7 @@ sub empty_packages {
sub readCompssUsers {
my ($file) = @_;
- my $f = common::open_file($file) or log::l("can not find $file: $!"), return;
+ my $f = common::open_file($file) or log::l("cannot find $file: $!"), return;
my ($compssUsers, $gtk_display_compssUsers) = eval join('', <$f>);
if ($@) {
log::l("ERROR: bad $file: $@");
diff --git a/perl-install/install/share/list.xml b/perl-install/install/share/list.xml
index 340cb1521..b3cd021ea 100644
--- a/perl-install/install/share/list.xml
+++ b/perl-install/install/share/list.xml
@@ -183,7 +183,7 @@
/usr/share/locale/UTF-8
/usr/share/terminfo/l/linux
/bin/brltty
- /sbin/mount.ntfs-3g <!-- can not be expanded as binary, not executable for all users -->
+ /sbin/mount.ntfs-3g <!-- cannot be expanded as binary, not executable for all users -->
/sbin/blkid
/usr/bin/drakx-matchbox-window-manager
diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm
index 40911ddf4..e4b896371 100644
--- a/perl-install/install/steps_gtk.pm
+++ b/perl-install/install/steps_gtk.pm
@@ -438,7 +438,7 @@ sub choosePackagesTree {
}
}
}
- $error = [ N("You can not select/unselect this package"),
+ $error = [ N("You cannot select/unselect this package"),
formatList(20, map { my $rb = $state->{rejected}{$_}{backtrack};
my @froms = keys %{$rb->{closure} || {}};
my @unsatisfied = @{$rb->{unsatisfied} || []};
@@ -450,7 +450,7 @@ sub choosePackagesTree {
$_ . ($s ? " ($s)" : '');
} sort @ask_unselect) ];
} elsif (install::pkgs::correctSize($size / sqr(1024)) > $available / sqr(1024)) {
- $error = N("You can not select this package as there is not enough space left to install it");
+ $error = N("You cannot select this package as there is not enough space left to install it");
} elsif (@l > @_ && $common->{state}{auto_deps}) {
$o->ask_okcancel(N("Confirmation"), [ $isSelection ?
N("The following packages are going to be installed") :
@@ -479,11 +479,11 @@ sub choosePackagesTree {
check_interactive_to_toggle => sub {
my $p = install::pkgs::packageByName($packages, $_[0]) or return;
if ($p->flag_base) {
- $o->ask_warn('', N("This is a mandatory package, it can not be unselected"));
+ $o->ask_warn('', N("This is a mandatory package, it cannot be unselected"));
} elsif ($p->flag_installed && !$p->flag_upgrade) {
- $o->ask_warn('', N("You can not unselect this package. It is already installed"));
+ $o->ask_warn('', N("You cannot unselect this package. It is already installed"));
} elsif ($p->flag_selected && $p->flag_installed) {
- $o->ask_warn('', N("You can not unselect this package. It must be upgraded"));
+ $o->ask_warn('', N("You cannot unselect this package. It must be upgraded"));
} else { return 1 }
return;
},
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
index a0605e2c5..b66c1c467 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -74,7 +74,7 @@ fonts, spell checkers, various programs translated etc. that
varies from language to language).")) if $o->{locale}{lang} !~ /^en/ && !lang::load_mo();
} else {
#- no need to have this in po since it is never translated
- $o->ask_warn('', "The characters of your language can not be displayed in console,
+ $o->ask_warn('', "The characters of your language cannot be displayed in console,
so the messages will be displayed in english during installation") if $ENV{LANGUAGE} eq 'C';
}
}
diff --git a/perl-install/interactive/http.pm b/perl-install/interactive/http.pm
index 154fb4639..1370a4a0e 100644
--- a/perl-install/interactive/http.pm
+++ b/perl-install/interactive/http.pm
@@ -115,7 +115,7 @@ sub ask_fromW {
open_stdout(); # re-open for writing
cont_stdout(N("Error"));
- print $q->h1(N("Error")), $q->p("Sorry, you can not go back");
+ print $q->h1(N("Error")), $q->p("Sorry, you cannot go back");
goto redisplay;
}
each_index {
diff --git a/perl-install/mygtk2.pm b/perl-install/mygtk2.pm
index 795ad69fa..0905ebd77 100644
--- a/perl-install/mygtk2.pm
+++ b/perl-install/mygtk2.pm
@@ -309,7 +309,7 @@ sub _gtk__Pixbuf {
if (!$w) {
my $name = delete $opts->{file} or internal_error("missing file");
- my $file = _find_imgfile($name) or internal_error("can not find image $name");
+ my $file = _find_imgfile($name) or internal_error("cannot find image $name");
if (my $size = delete $opts->{size}) {
$w = Gtk2::Gdk::Pixbuf->new_from_file_at_scale($file, $size, $size, 1);
} else {
@@ -373,11 +373,11 @@ sub _gtk__Image {
}
if (my $name = delete $opts->{file}) {
- my $file = _find_imgfile(may_apply($w->{format}, $name)) or internal_error("can not find image $name");
+ my $file = _find_imgfile(may_apply($w->{format}, $name)) or internal_error("cannot find image $name");
$w->{set_from_file}->($w, $file, delete $opts->{size});
} elsif (my $file_ref = delete $opts->{file_ref}) {
my $set = sub {
- my $file = _find_imgfile(may_apply($w->{format}, $$file_ref)) or internal_error("can not find image $$file_ref");
+ my $file = _find_imgfile(may_apply($w->{format}, $$file_ref)) or internal_error("cannot find image $$file_ref");
$w->{set_from_file}->($w, $file, delete $opts->{size});
};
gtkval_register($w, $file_ref, $set);
@@ -839,7 +839,7 @@ sub _gtk_any_Window {
if ($class eq 'Window') {
$w = "Gtk2::$class"->new(delete $opts->{type} || 'toplevel');
} elsif ($class eq 'Plug') {
- $opts->{socket_id} or internal_error("can not create a Plug without a socket_id");
+ $opts->{socket_id} or internal_error("cannot create a Plug without a socket_id");
$w = "Gtk2::$class"->new(delete $opts->{socket_id});
} elsif ($class eq 'FileChooserDialog') {
my $action = delete $opts->{action} || internal_error("missing action for FileChooser");
@@ -867,7 +867,7 @@ sub _gtk_any_Window {
if (my $f = _find_imgfile($name)) {
$w->set_icon(gtknew('Pixbuf', file => $f));
} elsif (!$icon_no_error) {
- internal_error("can not find $name");
+ internal_error("cannot find $name");
}
}
}
diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm
index e62cd3dab..a63eb4258 100644
--- a/perl-install/partition_table.pm
+++ b/perl-install/partition_table.pm
@@ -532,7 +532,7 @@ sub add_extended {
my $e = $hd->{primary}{extended};
if ($e && !verifyInside($part, $e)) {
- #-die "sorry, can not add outside the main extended partition" unless $::unsafe;
+ #-die "sorry, cannot add outside the main extended partition" unless $::unsafe;
my $end = $e->{start} + $e->{size};
my $start = min($e->{start}, $part->{start});
$end = max($end, $part->{start} + $part->{size}) - $start;
@@ -542,7 +542,7 @@ sub add_extended {
local $e->{size} = $end - $start;
eval { verifyPrimary($hd->{primary}) };
$@ and die
-N("You have a hole in your partition table but I can not use it.
+N("You have a hole in your partition table but I cannot use it.
The only solution is to move your primary partitions to have the hole next to the extended partitions.");
}
}
diff --git a/perl-install/partition_table/raw.pm b/perl-install/partition_table/raw.pm
index c2430f703..09a0137e7 100644
--- a/perl-install/partition_table/raw.pm
+++ b/perl-install/partition_table/raw.pm
@@ -273,7 +273,7 @@ sub pt_info_to_primary {
#- try writing what we've just read, yells if it fails
#- testing on last sector of head #0 (unused in 99% cases)
#-
-#- return false if the device can not be written to (especially for Smartmedia)
+#- return false if the device cannot be written to (especially for Smartmedia)
sub test_for_bad_drives {
my ($hd) = @_;
@@ -282,19 +282,19 @@ sub test_for_bad_drives {
sub error { die "$_[0] error: $_[1]" }
- my $F = openit($hd, $::testing ? 0 : 2) or error(openit($hd) ? 'write' : 'read', "can not open device");
+ my $F = openit($hd, $::testing ? 0 : 2) or error(openit($hd) ? 'write' : 'read', "cannot open device");
my $seek = sub {
c::lseek_sector(fileno($F), $sector, 0) or error('read', "seeking to sector $sector failed");
};
my $tmp;
- &$seek; sysread $F, $tmp, $SECTORSIZE or error('read', "can not even read ($!)");
+ &$seek; sysread $F, $tmp, $SECTORSIZE or error('read', "cannot even read ($!)");
return if $hd->{readonly} || $::testing;
- &$seek; syswrite $F, $tmp or error('write', "can not even write ($!)");
+ &$seek; syswrite $F, $tmp or error('write', "cannot even write ($!)");
my $tmp2;
- &$seek; sysread $F, $tmp2, $SECTORSIZE or die "test_for_bad_drives: can not even read again ($!)";
+ &$seek; sysread $F, $tmp2, $SECTORSIZE or die "test_for_bad_drives: cannot even read again ($!)";
$tmp eq $tmp2 or die
N("Something bad is happening on your drive.
A test to check the integrity of data has failed.
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 68749a435..ce22d1a58 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -74,7 +74,7 @@ sub read_rpmsrate_raw {
} elsif (@diff1 == 1 && @diff2 == 1) {
@new_flags = (@common, join('||', $diff1[0], $diff2[0]));
} else {
- log::l("$line_nb: can not handle complicate flags for packages appearing twice ($name)");
+ log::l("$line_nb: cannot handle complicate flags for packages appearing twice ($name)");
$fatal_error++;
}
log::l("$line_nb: package $name appearing twice with different rates ($rate != " . $rates{$name} . ")") if $rate != $rates{$name};
diff --git a/perl-install/run_program.pm b/perl-install/run_program.pm
index b956c5f95..82bdb5964 100644
--- a/perl-install/run_program.pm
+++ b/perl-install/run_program.pm
@@ -142,15 +142,15 @@ sub raw {
if ($stderr && $stderr eq 'STDERR') {
} elsif ($stderr) {
$stderr_mode =~ s/2//;
- open STDERR, "$stderr_mode $stderr" or die_exit("run_program can not output in $stderr (mode `$stderr_mode')");
+ open STDERR, "$stderr_mode $stderr" or die_exit("run_program cannot output in $stderr (mode `$stderr_mode')");
} elsif ($::isInstall) {
- open STDERR, ">> /tmp/ddebug.log" or open STDOUT, ">> /dev/tty7" or die_exit("run_program can not log, give me access to /tmp/ddebug.log");
+ open STDERR, ">> /tmp/ddebug.log" or open STDOUT, ">> /dev/tty7" or die_exit("run_program cannot log, give me access to /tmp/ddebug.log");
}
if ($stdout && $stdout eq 'STDOUT') {
} elsif ($stdout) {
- open STDOUT, "$stdout_mode $stdout" or die_exit("run_program can not output in $stdout (mode `$stdout_mode')");
+ open STDOUT, "$stdout_mode $stdout" or die_exit("run_program cannot output in $stdout (mode `$stdout_mode')");
} elsif ($::isInstall) {
- open STDOUT, ">> /tmp/ddebug.log" or open STDOUT, ">> /dev/tty7" or die_exit("run_program can not log, give me access to /tmp/ddebug.log");
+ open STDOUT, ">> /tmp/ddebug.log" or open STDOUT, ">> /dev/tty7" or die_exit("run_program cannot log, give me access to /tmp/ddebug.log");
}
$root and chroot $root;
diff --git a/perl-install/standalone/bootloader-config b/perl-install/standalone/bootloader-config
index b1582469c..99bc5409e 100755
--- a/perl-install/standalone/bootloader-config
+++ b/perl-install/standalone/bootloader-config
@@ -162,7 +162,7 @@ sub add_kernel() {
return;
}
- my $root_part = fs::get::root([ fs::get::fstab($all_hds) ]) or die "can not find root partition\n";
+ my $root_part = fs::get::root([ fs::get::fstab($all_hds) ]) or die "cannot find root partition\n";
my %opts = (
root => fs::wild_device::from_part('', $root_part),
initrd_options => $initrd_options,
@@ -291,10 +291,10 @@ sub _migrate_to_uuids__fstab() {
_should_prefer_UUID($part) or next;
my $part_ = find { fs::get::is_same_hd($part, $_) } @$fstab
- or log::l("migrate_to_uuids: do not know $part->{device}, can not migrate it"), next;
+ or log::l("migrate_to_uuids: do not know $part->{device}, cannot migrate it"), next;
$part->{device_UUID} = $part_->{device_UUID}
- or log::l("migrate_to_uuids: no UUID for $part->{device}, can not migrate it"), next;
+ or log::l("migrate_to_uuids: no UUID for $part->{device}, cannot migrate it"), next;
$part->{prefer_device_UUID} = 1;
$part->{prefer_device} = 0;
delete $part->{device_alias} if $part->{device_alias} && $part->{device_alias} =~ m!\bmapper/!; # see fs::dmraid::migrate_device_names() for more
@@ -331,7 +331,7 @@ sub _add_uuid_to_swap {
my $ids = fs::type::call_blkid($part);
$ids->{ID_FS_VERSION} eq '2'
- or log::l("ERROR: do not know swap version $ids->{ID_FS_VERSION}, so can not add UUID to it"), return;
+ or log::l("ERROR: do not know swap version $ids->{ID_FS_VERSION}, so cannot add UUID to it"), return;
my $uuid = run_program::get_stdout('uuidgen');
log::l("adding UUID=$uuid to $part->{device}");
diff --git a/perl-install/standalone/drakautoinst b/perl-install/standalone/drakautoinst
index 56bc1b854..5ea9427d5 100755
--- a/perl-install/standalone/drakautoinst
+++ b/perl-install/standalone/drakautoinst
@@ -35,7 +35,7 @@ my $in = 'interactive'->vnew('su', 'default');
my $imagefile = "/root/drakx/replay_install.img";
my $imagefile2 = "/root/drakx/replay_install_drivers.img";
-f $imagefile or $in->ask_warn(N("Error!"),
- N("I can not find needed image file `%s'.", $imagefile), 1), quit_global($in, 0);
+ N("I cannot find needed image file `%s'.", $imagefile), 1), quit_global($in, 0);
$direct or $in->ask_okcancel(N("Auto Install Configurator"),
N("You are about to configure an Auto Install floppy. This feature is somewhat dangerous and must be used circumspectly.
diff --git a/perl-install/standalone/fileshareset b/perl-install/standalone/fileshareset
index f0b04b149..f53ebd849 100755
--- a/perl-install/standalone/fileshareset
+++ b/perl-install/standalone/fileshareset
@@ -54,7 +54,7 @@ qq(You are not authorised to use fileshare'ing
To grant you the rights:
- put "RESTRICT=no" in $authorisation_file
- or put user "$username" in group "$authorisation_group");
-my $no_export_method = "can not export anything: no nfs, no smb";
+my $no_export_method = "cannot export anything: no nfs, no smb";
my %exit_codes = reverse(
1 => $non_authorised,
@@ -142,7 +142,7 @@ my $F_lock;
sub read_conf {
my ($exclusive_lock) = @_;
open $F_lock, $authorisation_file; # do not care if it's missing
- flock($F_lock, $exclusive_lock ? 2 : 1) or die "can not lock";
+ flock($F_lock, $exclusive_lock ? 2 : 1) or die "cannot lock";
my %conf;
foreach (<$F_lock>) {
s/#.*//; # remove comments
@@ -267,7 +267,7 @@ sub write {
$_->{raw} = sprintf("%s %s\n", $mntpoint, $_->{options});
}
}
- open(my $F, ">$conf_file") or die "can not write $conf_file";
+ open(my $F, ">$conf_file") or die "cannot write $conf_file";
print $F $_->{raw} foreach @$nfs_exports;
}
@@ -323,7 +323,7 @@ sub write {
EOF
}
}
- open(my $F, ">$conf_file") or die "can not write $conf_file";
+ open(my $F, ">$conf_file") or die "cannot write $conf_file";
print $F $_->{raw} foreach @$smb_exports;
}
@@ -380,8 +380,8 @@ sub name_mangle {
last A;
}
}
- $_ or die "can not find a unique name";
- # can not find a unique name, dropping the last letter
+ $_ or die "cannot find a unique name";
+ # cannot find a unique name, dropping the last letter
s|(.*).|$1|;
}
}
diff --git a/perl-install/standalone/notify-x11-free-driver-switch b/perl-install/standalone/notify-x11-free-driver-switch
index 5ee462045..51e9cf85a 100755
--- a/perl-install/standalone/notify-x11-free-driver-switch
+++ b/perl-install/standalone/notify-x11-free-driver-switch
@@ -17,7 +17,7 @@ my $reason = cat_utf8($ENV{LOCK});
$in->ask_warn(N("Warning"),
join("\n\n",
- N("The proprietary driver for your graphic card can not be found, the system is now using the free software driver (%s).", $driver),
+ N("The proprietary driver for your graphic card cannot be found, the system is now using the free software driver (%s).", $driver),
if_($reason, N("Reason: %s.", $reason)),
));
unlink $0 if $0 =~ m!/etc/X11/xsetup.d/!;