summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-12-13 15:56:00 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-12-13 15:56:00 +0000
commit4b9d142bd37dcdc94b7bcdbdb3f7109d7a915e25 (patch)
treea12104a3a9468cc42b83634feb5e6a2e72003532 /perl-install/standalone
parentf298cec9f7d4bb4dc1972cc737007b6da86d4cb0 (diff)
downloaddrakx-backup-do-not-use-4b9d142bd37dcdc94b7bcdbdb3f7109d7a915e25.tar
drakx-backup-do-not-use-4b9d142bd37dcdc94b7bcdbdb3f7109d7a915e25.tar.gz
drakx-backup-do-not-use-4b9d142bd37dcdc94b7bcdbdb3f7109d7a915e25.tar.bz2
drakx-backup-do-not-use-4b9d142bd37dcdc94b7bcdbdb3f7109d7a915e25.tar.xz
drakx-backup-do-not-use-4b9d142bd37dcdc94b7bcdbdb3f7109d7a915e25.zip
better english (writing style rather than spoken one)
Diffstat (limited to 'perl-install/standalone')
-rwxr-xr-xperl-install/standalone/bootloader-config4
-rwxr-xr-xperl-install/standalone/drakTermServ16
-rwxr-xr-xperl-install/standalone/drakautoinst2
-rwxr-xr-xperl-install/standalone/drakbackup28
-rwxr-xr-xperl-install/standalone/drakboot4
-rwxr-xr-xperl-install/standalone/drakconnect4
-rwxr-xr-xperl-install/standalone/drakfont2
-rwxr-xr-xperl-install/standalone/drakgw2
-rwxr-xr-xperl-install/standalone/drakperm2
-rwxr-xr-xperl-install/standalone/drakroam2
-rwxr-xr-xperl-install/standalone/drakupdate_fstab2
-rw-r--r--perl-install/standalone/drakvpn8
-rwxr-xr-xperl-install/standalone/fileshareset16
-rwxr-xr-xperl-install/standalone/logdrake2
-rw-r--r--perl-install/standalone/net_applet4
-rwxr-xr-xperl-install/standalone/service_harddrake4
-rw-r--r--perl-install/standalone/service_harddrake.sh4
17 files changed, 53 insertions, 53 deletions
diff --git a/perl-install/standalone/bootloader-config b/perl-install/standalone/bootloader-config
index 0bcd4d377..bcf10d659 100755
--- a/perl-install/standalone/bootloader-config
+++ b/perl-install/standalone/bootloader-config
@@ -42,7 +42,7 @@ $action && member($action, @known_actions) or die "<action> must be one of " . j
if ($image) {
if (my $ver = bootloader::vmlinuz2version($image)) {
if ($kernel_version) {
- $kernel_version eq $ver or die "$kernel_version and $ver don't match (hint: don't pass both --image and --kernel-version)\n";
+ $kernel_version eq $ver or die "$kernel_version and $ver do not match (hint: do not pass both --image and --kernel-version)\n";
} else {
$kernel_version = $ver;
}
@@ -117,7 +117,7 @@ sub add_kernel() {
my $kernel_str = bootloader::vmlinuz2kernel_str($image) or die "bad kernel name $image\n";
- my $root_part = fs::get::root([ fs::get::fstab($all_hds) ]) or die "can't find root partition\n";
+ my $root_part = fs::get::root([ fs::get::fstab($all_hds) ]) or die "can not find root partition\n";
my %opts = (
root => "/dev/$root_part->{device}",
initrd_options => $initrd_options,
diff --git a/perl-install/standalone/drakTermServ b/perl-install/standalone/drakTermServ
index d438055ee..db8315bcd 100755
--- a/perl-install/standalone/drakTermServ
+++ b/perl-install/standalone/drakTermServ
@@ -604,7 +604,7 @@ sub make_boot() {
#- make a boot image on floppy or iso from etherboot images
my $boot_box;
my $rom_path = "/usr/share/etherboot";
- #- doesn't return list sorted
+ #- does not return list sorted
my @nics = sort(all("/usr/share/etherboot/zimg"));
my $list_nics = Gtk2::List->new;
my $nic;
@@ -787,7 +787,7 @@ sub make_nbi() {
sub clear_nbi {
my ($nbi) = @_;
$nbi = $tftpboot . "/" . $nbi;
- my $result = unlink($nbi) or warn("Can't delete $nbi...");
+ my $result = unlink($nbi) or warn("Can not delete $nbi...");
$nbi =~ s|boot-|initrd-|;
$nbi =~ s|nbi|img|;
unlink($nbi);
@@ -823,7 +823,7 @@ sub link_pxe {
my $pxedir = get_platform_pxe();
$kernel =~ s|vmlinuz-||;
if ($nic) {
- #- symlinkf doesn't work?
+ #- symlinkf does not work?
`ln -sf ../../initrd-$nic.$kernel.img $pxedir`;
} else {
`ln -sf ../../initrd-*.$kernel.img $pxedir`;
@@ -1134,7 +1134,7 @@ sub client_set {
# we also need to set runlevel to 5 and restart the display manager
if ($conf{ALLOW_THIN} == 1) {
if (-f "/etc/sysconfig/autologin") {
- my $answer = $in->ask_yesorno('', N("Thin clients won't work with autologin. Disable autologin?"));
+ my $answer = $in->ask_yesorno('', N("Thin clients will not work with autologin. Disable autologin?"));
if ($answer == 1) {
log::explanations("Renaming /etc/sysconfig/autologin to /etc/sysconfig/autologin.bak");
`mv /etc/sysconfig/autologin /etc/sysconfig/autologin.bak`;
@@ -1146,7 +1146,7 @@ sub client_set {
# This file had 2 "Enable=" entries, one for XDMCP and one for debug
change_gdm_xdmcp("true");
log::explanations("Modified files /etc/inittab, /etc/X11/xdm/xdm-config, /usr/share/config/kdm/kdmrc, /etc/X11/gdm/gdm.conf");
- # just XDMCP in hosts.allow is enough for xdm & kdm, but gdm doesn't work - x11 doesn't help either
+ # just XDMCP in hosts.allow is enough for xdm & kdm, but gdm does not work - x11 does not help either
update_hosts_allow("enable");
if ($default eq "all") {
my $inittab = '/etc/initab$$CLIENT$$';
@@ -1456,7 +1456,7 @@ sub write_eb_image {
return if !($result);
$result = system("cat $rom_path/floppyload.bin $rom_path/start16.bin $rom_path/zimg/$nic > /dev/fd0") if $result;
if ($result) {
- $in->ask_warn(N("Error"), N("Couldn't access the floppy!"))
+ $in->ask_warn(N("Error"), N("Could not access the floppy!"))
} else {
$in->ask_warn(N("Information"), N("Floppy can be removed now"))
}
@@ -1806,7 +1806,7 @@ sub change_gdm_xdmcp {
for (my $i = 0; $i < @conf_data; $i++) {
$conf_data[$i] =~ s/^Enable=false/Enable=true/ if $enable eq "true";
$conf_data[$i] =~ s/^Enable=true/Enable=false/ if $enable eq "false";
- # bail here so we don't alter the debug setting
+ # bail here so we do not alter the debug setting
if ($conf_data[$i] eq "[debug]\n") {
output("/etc/X11/gdm/gdm.conf", @conf_data);
last;
@@ -1966,7 +1966,7 @@ sub client_hdw_config {
}
sub create_client_sysnetwork {
- #- this lets gnome operate properly since udhcpc doesn't get the hostname from the dhcpd server
+ #- this lets gnome operate properly since udhcpc does not get the hostname from the dhcpd server
my ($hostname, $ip) = @_;
log::explanations("Adding /etc/sysconfig/network for $ip");
my $network_file = "/etc/sysconfig/network\$\$IP=$ip\$\$";
diff --git a/perl-install/standalone/drakautoinst b/perl-install/standalone/drakautoinst
index abc0e7ea1..4fa2450ad 100755
--- a/perl-install/standalone/drakautoinst
+++ b/perl-install/standalone/drakautoinst
@@ -36,7 +36,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't find needed image file `%s'.", $imagefile), 1), quit_global($in, 0);
+ N("I can not 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/drakbackup b/perl-install/standalone/drakbackup
index 066ee467c..4d8c9e464 100755
--- a/perl-install/standalone/drakbackup
+++ b/perl-install/standalone/drakbackup
@@ -125,7 +125,7 @@ my $untar_prefix = "tar -C $restore_path -x";
# allow not-root user with own config
if ($ENV{USER} ne 'root' && $ENV{HOME} ne '/root') {
standalone::explanations("Running as $ENV{USER}...");
- #- doesn't get defined when run from cron
+ #- does not get defined when run from cron
$user_home = "/home/$ENV{USER}" if $user_home eq '';
$cfg_dir = "$user_home/.drakbackup/";
$conf{PATH_TO_SAVE} = $cfg_dir . "backups";
@@ -185,11 +185,11 @@ sub daemon_mode() {
if (check_for_xserver()) {
eval { require ugtk2 };
- die "Can't load ugtk2...\n" if $@;
+ die "Can not load ugtk2...\n" if $@;
ugtk2->import(qw(:create :dialogs :helpers :wrappers));
interactive_mode();
} else {
- die "Can't run in console mode...";
+ die "Can not run in console mode...";
}
sub set_help_tip {
@@ -258,7 +258,7 @@ sub get_cd_info() {
my @drive_names;
my $i;
require_rpm("cdrecord") if $nonroot_user;
- # just trying load ide-cd, since it doesn't seem to be loaded by default
+ # just trying load ide-cd, since it does not seem to be loaded by default
$nonroot_user ? `cdrecord -scanbus -dev=ATA > /dev/null 2>&1` : `modprobe ide-cd` unless -f "/proc/sys/dev/cdrom";
my @cd_info = cat_("/proc/sys/dev/cdrom/info");
my %data = (
@@ -318,7 +318,7 @@ sub save_conf_file() {
write_sitecopyrc() if $conf{NET_PROTO} eq 'webdav';
write_password_file() if $conf{NET_PROTO} eq 'rsync' && $conf{PASSWD};
return 1 if $conf{SEND_MAIL} && verify_mail_setup();
- #- don't save this, but retain it for this session
+ #- do not save this, but retain it for this session
if ($conf{REMEMBER_PASS} != 1) {
$host_passwd = $conf{PASSWD};
$conf{PASSWD} = undef;
@@ -643,7 +643,7 @@ sub do_expect {
if (!$spawn_ok) { show_warning("f", N("No password prompt on %s at port %s", $conf{HOST_NAME}, $scp_port)) }
if ($bad_passwd) { show_warning("f", N("Bad password on %s", $conf{HOST_NAME})) }
if ($no_perm) { show_warning("f", N("Permission denied transferring %s to %s", $_, $conf{HOST_NAME})) }
- if ($bad_dir) { show_warning("f", N("Can't find %s on %s", $conf{HOST_PATH}, $conf{HOST_NAME})) }
+ if ($bad_dir) { show_warning("f", N("Can not find %s on %s", $conf{HOST_PATH}, $conf{HOST_NAME})) }
$had_err = !$spawn_ok || $bad_passwd || $no_perm || $bad_dir;
}
],
@@ -737,7 +737,7 @@ sub check_for_cd() {
if ($conf{MULTI_SESSION}) {
$command = "cdrecord -s dev=$conf{CD_DEVICE} -msinfo";
spawn_progress($command, "Check for previous session status");
- #- if we don't find a previous session, start fresh
+ #- if we do not find a previous session, start fresh
if ($log_buff =~ /Cannot read session offset/) {
$conf{MEDIA_ERASE} = 1;
return 0;
@@ -945,7 +945,7 @@ sub build_backup_files() {
local $_;
$results = "";
$log_buff = "";
- #- flush these so if the user does 2 runs in a row we don't try to send the same files
+ #- flush these so if the user does 2 runs in a row we do not try to send the same files
@file_list_to_send_by_ftp = ();
@files_for_direct_tape = ();
@@ -1189,10 +1189,10 @@ sub build_backup_files() {
$catalog .= ":F" if !$conf{OTHER_INCREMENTAL_BACKUPS} && $conf{OTHER_FILES};
$catalog .= "\n";
- append_to_file("$cfg_dir/drakbackup_catalog", $catalog) or show_warning("w", N("Can't create catalog!"));
+ append_to_file("$cfg_dir/drakbackup_catalog", $catalog) or show_warning("w", N("Can not create catalog!"));
}
- #- clean up HD files if del_hd_files and media isn't hd
+ #- clean up HD files if del_hd_files and media is not hd
if ($conf{DEL_HD_FILES} && ($conf{USE_CD} || $conf{USE_TAPE} || $conf{USE_NET}) && $conf{DAEMON_MEDIA} ne 'hd') {
foreach (@file_list_to_send_by_ftp) {
unlink($_) if /$conf{OPTION_COMP}$/;
@@ -1875,7 +1875,7 @@ sub advanced_where_tape {
),
0, Gtk2::VBox->new(0, 5),
0, gtkpack_(Gtk2::HBox->new(0,10),
- 0, gtkset_sensitive(Gtk2::Label->new(N("Don't rewind tape after backup")), $conf{USE_TAPE}),
+ 0, gtkset_sensitive(Gtk2::Label->new(N("Do not rewind tape after backup")), $conf{USE_TAPE}),
1, Gtk2::VBox->new(0, 5),
0, gtkset_sensitive(my $check_tape_rewind = Gtk2::CheckButton->new, $conf{USE_TAPE}),
),
@@ -2148,7 +2148,7 @@ sub advanced_when() {
),
),
0, gtkset_sensitive(Gtk2::Label->new(N("Please be sure that the cron daemon is included in your services.")), $backup_daemon),
- 0, gtkset_sensitive(Gtk2::Label->new(N("If your machine isn't on all the time, you might want to install anacron.")), $backup_daemon),
+ 0, gtkset_sensitive(Gtk2::Label->new(N("If your machine is not on all the time, you might want to install anacron.")), $backup_daemon),
0, gtkset_sensitive(Gtk2::Label->new(N("Note that currently all 'net' media also use the hard drive.")), $backup_daemon),
),
);
@@ -3417,7 +3417,7 @@ sub restore_catalog_entry {
my @line_data = split(':', $cat_entry);
my $backup_time = $line_data[0];
- #- use our own variables here so we don't trash a saved config accidentally
+ #- use our own variables here so we do not trash a saved config accidentally
my $media = $line_data[1];
#- can be a volume name or a host name
@@ -3432,7 +3432,7 @@ sub restore_catalog_entry {
$username = $conf{LOGIN};
}
- #- create a restore work directory if we don't have one
+ #- create a restore work directory if we do not have one
-d "$cfg_dir/restores" or mkdir_p "$cfg_dir/restores";
#- can be a device name or a path
diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot
index 5babbda57..493a4c15b 100755
--- a/perl-install/standalone/drakboot
+++ b/perl-install/standalone/drakboot
@@ -108,7 +108,7 @@ my $cur_res;
if (my $x_res = Xconfig::resolution_and_depth::from_bios($bootloader->{default_vga})) {
$cur_res = $x_res->{X} . 'x' . $x_res->{Y};
} else {
- $no_bootsplash = 1; #- we can't select any theme we're not in Framebuffer mode :-/
+ $no_bootsplash = 1; #- we can not select any theme we're not in Framebuffer mode :-/
$cur_res = '800x600'
}
@@ -194,7 +194,7 @@ gtkadd($window,
}),
gtkpack__(gtkset_sensitive($x_box = Gtk2::VBox->new(0, 0), $x_mode),
gtkpack__(Gtk2::VBox->new(0, 0),
- my @auto_buttons = gtkradio((N("No, I don't want autologin")) x 2,
+ my @auto_buttons = gtkradio((N("No, I do not want autologin")) x 2,
N("Yes, I want autologin with this (user, desktop)")),
),
my $auto_box = create_packtable({ col_spacings => 5, row_spacings => 5, homogenous => 1 },
diff --git a/perl-install/standalone/drakconnect b/perl-install/standalone/drakconnect
index 90ef8419d..dc9f96c91 100755
--- a/perl-install/standalone/drakconnect
+++ b/perl-install/standalone/drakconnect
@@ -845,7 +845,7 @@ sub configure_lan() {
my @card_tab;
if (@all_cards < 1) {
- $window->vbox->add(Gtk2::Label->new(N("You don't have any configured interface.
+ $window->vbox->add(Gtk2::Label->new(N("You do not have any configured interface.
Configure them first by clicking on 'Configure'")));
gtkpack(gtkset_layout($window->action_area, 'end'),
gtksignal_connect(Gtk2::Button->new(N("Ok")),
@@ -972,7 +972,7 @@ sub configure_net {
$in->ask_warn(
N("Warning"),
#-PO: here "Add Connection" should be translated the same was as in control-center
- N("You don't have any configured Internet connection.
+ N("You do not have any configured Internet connection.
Run the \"Add Connection\" assistant from the Mandrakelinux Control Center"));
$in->exit;
}
diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont
index 8ab5f5d8c..1576f54a1 100755
--- a/perl-install/standalone/drakfont
+++ b/perl-install/standalone/drakfont
@@ -49,7 +49,7 @@
# Commands buttons:
# - import from windows partition.
# import from all fat32 partitions and look for winnt/windows/font
-# and import all (delete doubles) but don't import if they already exist.
+# and import all (delete doubles) but do not import if they already exist.
# - import from directory
# look to see if each font exists and do not delete the original.
# (replace all, no, none)
diff --git a/perl-install/standalone/drakgw b/perl-install/standalone/drakgw
index 4cf70cc1f..655bcf017 100755
--- a/perl-install/standalone/drakgw
+++ b/perl-install/standalone/drakgw
@@ -326,7 +326,7 @@ Otherwise, I can reconfigure your interface and (re)configure a DHCP server for
N("DHCP Server Configuration.
Here you can select different options for the DHCP server configuration.
-If you don't know the meaning of an option, simply leave it as it is."),
+If you do not know the meaning of an option, simply leave it as it is."),
[ { label => N("(This) DHCP Server IP"), val => \$server_ip, type => 'entry' },
{ label => N("The DNS Server IP"), val => \$nameserver_ip, type => 'entry' },
{ label => N("The internal domain name"), val => \$internal_domain_name, type => 'entry' },
diff --git a/perl-install/standalone/drakperm b/perl-install/standalone/drakperm
index 39579af91..3b680fe9a 100755
--- a/perl-install/standalone/drakperm
+++ b/perl-install/standalone/drakperm
@@ -294,7 +294,7 @@ sub row_setting_dialog {
);
my $usr_check = gtksignal_connect(gtkset_tip($tips, Gtk2::CheckButton->new(N("Current user")),
- N("When checked, owner and group won't be changed")),
+ N("When checked, owner and group will not be changed")),
clicked => sub { $id_box->set_sensitive(!$_[0]->get_active) });
if ($iter && $model->get($iter, 2) eq 'current') {
diff --git a/perl-install/standalone/drakroam b/perl-install/standalone/drakroam
index bdb25e61c..3de4564e2 100755
--- a/perl-install/standalone/drakroam
+++ b/perl-install/standalone/drakroam
@@ -10,7 +10,7 @@
# - deletes comments in config file
# - expects an ifcfg file for static IP configurations (not uncommon)
# - roaming status fails (no idea why)
-# maybe same reason bash-completion killall can't see wlandetect?
+# maybe same reason bash-completion killall can not see wlandetect?
# todo (wlandetect version)
# - make known and available lists have more rows by default (why so small?)
diff --git a/perl-install/standalone/drakupdate_fstab b/perl-install/standalone/drakupdate_fstab
index fde9fa585..83951d46a 100755
--- a/perl-install/standalone/drakupdate_fstab
+++ b/perl-install/standalone/drakupdate_fstab
@@ -141,7 +141,7 @@ sub main {
my $part = device_name_to_entry($device_name);
my $fstab_file = '/etc/fstab';
if (!$part) {
- print STDERR "Can't find device $device_name\n" if $::testing;
+ print STDERR "Can not find device $device_name\n" if $::testing;
return;
} elsif ($::testing) {
cp_af('/etc/fstab', $fstab_file = '/tmp/fstab');
diff --git a/perl-install/standalone/drakvpn b/perl-install/standalone/drakvpn
index a374d36bb..ae9d7ae64 100644
--- a/perl-install/standalone/drakvpn
+++ b/perl-install/standalone/drakvpn
@@ -99,7 +99,7 @@ It's currently enabled.
What would you like to do?"),
[ N_("disable"), N_("reconfigure"), N_("dismiss") ]) or quit_global($in, 0);
- # FIXME: reconfigure isn't handled
+ # FIXME: reconfigure is not handled
if ($r eq "disable") {
if (!$::testing) {
my $_wait_disabl = $in->wait_message('', N("Disabling VPN..."));
@@ -125,7 +125,7 @@ It's currently disabled.
What would you like to do?"),
[ N_("enable"), N_("reconfigure"), N_("dismiss") ]);
- # FIXME: reconfigure isn't handled
+ # FIXME: reconfigure is not handled
if ($r eq "enable") {
foreach ($ipsec_conf, $tunnels_file) {
rename($_, "$_.old") if -f $_;
@@ -445,7 +445,7 @@ N("This is the first section after the config
setup one.\n
Here you define the default settings.
All the other sections will follow this one.
-The left settings are optional. If don't define
+The left settings are optional. If do not define
them here, globally, you can define them in each
section.\n",),
[ { label => N("PFS"), val => \$conn_default->{2}[1], type => 'entry' },
@@ -587,7 +587,7 @@ my $number = network::ipsec::matched_section_key_number_ipsec_conf($choice,$ipse
if ($kernel_version < 2.5) {
if ($choice =~ /^version|block|private|clear|packet/) {
-$in->ask_okcancel(N("Can't edit!"),
+$in->ask_okcancel(N("Can not edit!"),
N("You cannot edit this section.\n
This section is mandatory for Freeswan 2.X.
One has to specify version 2.0 on the top
diff --git a/perl-install/standalone/fileshareset b/perl-install/standalone/fileshareset
index 6d321c7ac..4ca41efac 100755
--- a/perl-install/standalone/fileshareset
+++ b/perl-install/standalone/fileshareset
@@ -43,7 +43,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't export anything: no nfs, no smb";
+my $no_export_method = "can not export anything: no nfs, no smb";
my %exit_codes = reverse(
1 => $non_authorised,
@@ -126,8 +126,8 @@ package authorisation;
my $F_lock;
sub read_conf {
my ($exclusive_lock) = @_;
- open $F_lock, $authorisation_file; # don't care if it's missing
- flock($F_lock, $exclusive_lock ? 2 : 1) or die "can't 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";
my %conf;
foreach (<$F_lock>) {
s/#.*//; # remove comments
@@ -231,7 +231,7 @@ sub read() {
$mntpoint =~ s/\\(\d{3})/chr(oct $1)/ge;
# not accepting weird characters that would break the output
- $mntpoint =~ m/[\0\n\r]/ and die "i won't handle this";
+ $mntpoint =~ m/[\0\n\r]/ and die "i will not handle this";
push @l, { mntpoint => $mntpoint, option => $options, raw => $raw_line };
}
bless \@l, 'nfs_exports';
@@ -248,7 +248,7 @@ sub write {
$_->{raw} = sprintf("%s %s\n", $mntpoint, $_->{options});
}
}
- open(my $F, ">$conf_file") or die "can't write $conf_file";
+ open(my $F, ">$conf_file") or die "can not write $conf_file";
print $F $_->{raw} foreach @$nfs_exports;
}
@@ -304,7 +304,7 @@ sub write {
EOF
}
}
- open(my $F, ">$conf_file") or die "can't write $conf_file";
+ open(my $F, ">$conf_file") or die "can not write $conf_file";
print $F $_->{raw} foreach @$smb_exports;
}
@@ -361,8 +361,8 @@ sub name_mangle {
last A;
}
}
- $_ or die "can't find a unique name";
- # can't find a unique name, dropping the last letter
+ $_ or die "can not find a unique name";
+ # can not find a unique name, dropping the last letter
s|(.*).|$1|;
}
}
diff --git a/perl-install/standalone/logdrake b/perl-install/standalone/logdrake
index df4751115..ed5a6a507 100755
--- a/perl-install/standalone/logdrake
+++ b/perl-install/standalone/logdrake
@@ -489,7 +489,7 @@ if ($r) {
To => $options{MAIL},
Subject => "DrakLog Mail Alert",
})
- or die "Can't open: $!\n";
+ or die "Can not open: $!\n";
print $mailer $r;
$mailer->close;
}
diff --git a/perl-install/standalone/net_applet b/perl-install/standalone/net_applet
index c005862cc..f24b02712 100644
--- a/perl-install/standalone/net_applet
+++ b/perl-install/standalone/net_applet
@@ -43,7 +43,7 @@ my %appletstate = (
changes => [ 'connected' ],
menu => [ 'confNetwork', 'refresh', 'help' ],
tt => [
- N_("You don't have any configured Internet connection.
+ N_("You do not have any configured Internet connection.
Run the \"Add Connection\" assistant from the Mandrakelinux Control Center")
]
}
@@ -98,7 +98,7 @@ sub shouldStart() {
sub md5file {
my @md5;
foreach my $file (@_) {
- open(my $FILE, $file) or do { print STDERR "Can't open '$file': $!"; push @md5, "" };
+ open(my $FILE, $file) or do { print STDERR "Can not open '$file': $!"; push @md5, "" };
binmode($FILE);
push @md5, Digest::MD5->new->addfile($FILE)->hexdigest;
close($FILE);
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index f897ec230..a1eb5a19f 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -94,7 +94,7 @@ foreach my $hw_class (@harddrake::data::tree) {
$id => $i;
} eval { &$detector };
$config{$Ident} = \%ID;
- next if !$is_globetrotter && !$force && is_empty_hash_ref($previous_config); # don't fsck on first run but if --force
+ next if !$is_globetrotter && !$force && is_empty_hash_ref($previous_config); # do not fsck on first run but if --force
my $oldconfig = $previous_config->{$Ident};
@@ -159,7 +159,7 @@ foreach my $hw_class (@harddrake::data::tree) {
next if $is_globetrotter && !$hw_class->{automatic};
next unless $configurator_pool[0];
if (ref($configurator) ne 'CODE' && !-x first(split /\s+/, $configurator_pool[0])) {
- log::explanations(qw(skip $Ident configuration since "$configurator" isn't executable));
+ log::explanations(qw(skip $Ident configuration since "$configurator" is not executable));
next;
}
my ($pid, $no, $res);
diff --git a/perl-install/standalone/service_harddrake.sh b/perl-install/standalone/service_harddrake.sh
index c12bedc31..ce0f10dda 100644
--- a/perl-install/standalone/service_harddrake.sh
+++ b/perl-install/standalone/service_harddrake.sh
@@ -18,7 +18,7 @@ SUBSYS=/var/lock/subsys/harddrake
case "$1" in
start)
-# We (mdk) don't support updfstab (yet)
+# We (mdk) do not support updfstab (yet)
# action "Updating /etc/fstab" /usr/sbin/updfstab
gprintf "Checking for new hardware"
@@ -29,7 +29,7 @@ case "$1" in
else
action "" /bin/false
fi
- # We don't want to run this on random runlevel changes.
+ # We do not want to run this on random runlevel changes.
touch $SUBSYS
# [ /etc/modules.conf -nt /lib/modules/$(uname -r)/modules.dep ] && touch /lib/modules/$(uname -r)/modules.dep 2>/dev/null >/dev/null || : &
exit $RETVAL