summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone
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/standalone
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/standalone')
-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
4 files changed, 12 insertions, 12 deletions
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/!;