From ed8c9c7f3096c626c9a0419626524f477d3ae854 Mon Sep 17 00:00:00 2001 From: Ahmad Samir Date: Sat, 2 Apr 2011 19:39:51 +0000 Subject: - use 'cannot' instead of 'can not' - use 'LDAP' instead of 'Ldap' --- perl-install/install/any.pm | 6 +++--- perl-install/install/commands.pm | 20 ++++++++++---------- perl-install/install/help/help.pm | 2 +- perl-install/install/pkgs.pm | 2 +- perl-install/install/share/list.xml | 2 +- perl-install/install/steps_gtk.pm | 10 +++++----- perl-install/install/steps_interactive.pm | 2 +- 7 files changed, 22 insertions(+), 22 deletions(-) (limited to 'perl-install/install') 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] []\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] []\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 + /sbin/mount.ntfs-3g /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'; } } -- cgit v1.2.1