diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-12-13 15:56:00 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-12-13 15:56:00 +0000 |
| commit | 4b9d142bd37dcdc94b7bcdbdb3f7109d7a915e25 (patch) | |
| tree | a12104a3a9468cc42b83634feb5e6a2e72003532 | |
| parent | f298cec9f7d4bb4dc1972cc737007b6da86d4cb0 (diff) | |
| download | drakx-4b9d142bd37dcdc94b7bcdbdb3f7109d7a915e25.tar drakx-4b9d142bd37dcdc94b7bcdbdb3f7109d7a915e25.tar.gz drakx-4b9d142bd37dcdc94b7bcdbdb3f7109d7a915e25.tar.bz2 drakx-4b9d142bd37dcdc94b7bcdbdb3f7109d7a915e25.tar.xz drakx-4b9d142bd37dcdc94b7bcdbdb3f7109d7a915e25.zip | |
better english (writing style rather than spoken one)
91 files changed, 913 insertions, 912 deletions
diff --git a/move/move.pm b/move/move.pm index 80894176d..ed6a19d04 100644 --- a/move/move.pm +++ b/move/move.pm @@ -163,7 +163,7 @@ sub init { run_program::run('chown', 'clamav.clamav', '/var/log/clamav/freshclam.log'); #- create remaining /etc and /var subdirectories if not already copied or symlinked, - #- because programs most often won't try to create the missing subdir before trying + #- because programs most often will not try to create the missing subdir before trying #- to write a file, leading to obscure unexpected failures foreach (cat_('/image/move/directories-to-create')) { my ($mode, $uid, $gid, $name) = split; @@ -240,7 +240,7 @@ drakx_stuff: : qw(initGraphical selectLanguage acceptLicense verifyKey selectMouse selectKeyboard configMove startMove) ]; $o->{steps}{first} = $o->{orderedSteps}[0]; - #- don't use shadow passwords since pwconv overwrites /etc/shadow hence contents will be lost for usb key + #- do not use shadow passwords since pwconv overwrites /etc/shadow hence contents will be lost for usb key delete $o->{authentication}{shadow}; foreach my $lang (keys %lang::langs) { @@ -325,7 +325,7 @@ sub key_mount { install_any::getHds($o, $o); } if ($virtual_key_part) { - #- :/ merge_from_mtab didn't got my virtual key, need to add it manually + #- :/ merge_from_mtab did not got my virtual key, need to add it manually push @{$o->{fstab}}, $virtual_key_part; $key_part = $virtual_key_part; return; @@ -376,7 +376,7 @@ sub key_installfiles { my (@files) = @_; my @etcpasswords = glob("$key_sysconf/*/etc/passwd"); if (@etcpasswords > 1) { - print "inconsistency: more than one /etc/passwd on key! can't proceed, please clean the key\n"; + print "inconsistency: more than one /etc/passwd on key! can not proceed, please clean the key\n"; exit 1; } return if !@etcpasswords; @@ -419,13 +419,13 @@ sub key_installfiles { $::o->{steps}{configMove}{done} = 1; } - #- /etc/sudoers can't be a link + #- /etc/sudoers can not be a link unlink($_), cp_f("/image$_", $_) foreach qw(/etc/sudoers); } sub reboot() { output('/var/run/rebootctl', "reboot"); #- tell X_move to not respawn - run_program::run('killall', 'X'); #- kill it ourselves to be sure that it won't lock console when killed by our init + run_program::run('killall', 'X'); #- kill it ourselves to be sure that it will not lock console when killed by our init exit 0; } @@ -443,9 +443,9 @@ sub check_key { #- argh, key is read-only #- try umounting if (eval { fs::umount_part($key_part); undef $key_part; 1 }) { - modules::unload('usb-storage'); #- it won't notice change on write protection otherwise :/ + modules::unload('usb-storage'); #- it will not notice change on write protection otherwise :/ - $o->ask_okcancel_({ title => N("Key isn't writable"), + $o->ask_okcancel_({ title => N("Key is not writable"), messages => formatAlaTeX( N("The USB key seems to have write protection enabled. Please unplug it, remove write protection, and then plug it again.")), @@ -457,9 +457,9 @@ unplug it, remove write protection, and then plug it again.")), } else { #- this case happens when the user boots with a write-protected key containing #- all user and host data, /etc/X11/X which is on key busyfies it - $o->ask_okcancel_({ title => N("Key isn't writable"), + $o->ask_okcancel_({ title => N("Key is not writable"), messages => formatAlaTeX( -N("The USB key seems to have write protection enabled, but we can't safely +N("The USB key seems to have write protection enabled, but we can not safely unplug it now. @@ -470,7 +470,7 @@ plug the key again, and launch Mandrake Move again.")), } } else { my $message = key_parts($o) ? -N("Your USB key doesn't have any valid Windows (FAT) partitions. +N("Your USB key does not have any valid Windows (FAT) partitions. We need one to continue (beside, it's more standard so that you will be able to move and access your files from machines running Windows). Please plug in an USB key containing a @@ -480,7 +480,7 @@ Windows partition instead. You may also proceed without an USB key - you'll still be able to use Mandrake Move as a normal live Mandrake Operating System.") : -N("We didn't detect any USB key on your system. If you +N("We did not detect any USB key on your system. If you plug in an USB key now, Mandrake Move will have the ability to transparently save the data in your home directory and system wide configuration, for next boot on this computer @@ -602,7 +602,7 @@ after_autoconf: log::l("doing remaining toBeDone for undone step $step"); eval { &$f() }; $o->ask_warn(N("Error"), [ -N("An error occurred, but I don't know how to handle it nicely. +N("An error occurred, but I do not know how to handle it nicely. Continue at your own risk."), formatError($@) ]) if $@; } } @@ -702,7 +702,7 @@ sub install2::startMove { require ugtk2; ugtk2::flush(); - #- get info from existing fstab. This won't do anything if we already wrote fstab in configMove + #- get info from existing fstab. This will not do anything if we already wrote fstab in configMove fs::get_info_from_fstab($o->{all_hds}, ''); foreach (fsedit::get_really_all_fstab($o->{all_hds})) { if (isSwap($_)) { @@ -744,7 +744,7 @@ sub install2::startMove { run_program::raw({ detach => 1 }, '/usr/bin/dnotify', '-MCRD', '/etc', '-r', '-e', '/usr/bin/etc-monitorer.pl', '{}') or die "dnotify not found!"; } - #- password in screensaver doesn't make sense if we keep the shell + #- password in screensaver does not make sense if we keep the shell if (cat_('/proc/cmdline') !~ /\bshell\b/) { kill 9, cat_('/var/run/drakx_shell.pid'); output('/dev/tty2', "Killed\n"); @@ -754,7 +754,7 @@ sub install2::startMove { sleep 1; log::l("DrakX waves bye-bye"); - open STDOUT, ">>/tmp/.kde-errors"; #- don't display startkde shit on first console + open STDOUT, ">>/tmp/.kde-errors"; #- do not display startkde shit on first console open STDERR, ">>/tmp/.kde-errors"; my (undef, undef, $uid, $gid, undef, undef, undef, $home, $shell) = getpwnam($username); diff --git a/move/tree/mdk_totem b/move/tree/mdk_totem index 5fbda05f4..0a54248ac 100755 --- a/move/tree/mdk_totem +++ b/move/tree/mdk_totem @@ -74,7 +74,7 @@ if (@$bad_busy) { $in->ask_from_({ title => N("Read carefully!"), - messages => N("You can't use another CDROM when the following programs are running: + messages => N("You can not use another CDROM when the following programs are running: %s", join(", ", uniq(sort @progs))) }, [ { type => 'list', val => \$choice, list => first(list2kv(@l)), format => sub { $l{$_[0]} } } ]) or $in->exit; diff --git a/perl-install/Xconfig/card.pm b/perl-install/Xconfig/card.pm index 86b9d42bd..1c0e36715 100644 --- a/perl-install/Xconfig/card.pm +++ b/perl-install/Xconfig/card.pm @@ -166,7 +166,7 @@ sub card_config__not_listed { log::l("Xconfig::card: $r manually chosen"); - $r eq "Vendor|$card->{BoardName}" and return 1; #- it is unchanged, don't modify $card + $r eq "Vendor|$card->{BoardName}" and return 1; #- it is unchanged, do not modify $card my ($kind, $s) = $r =~ /(.*?)\|(.*)/; @@ -205,7 +205,7 @@ sub configure_auto_install { if ($card->{card_name}) { #- try to get info from given card_name add_to_card__using_Cards($card, $card->{card_name}); - undef $card->{card_name} if !$card->{Driver}; #- bad card_name as we can't find the driver + undef $card->{card_name} if !$card->{Driver}; #- bad card_name as we can not find the driver } return if $card->{Driver}; } @@ -256,7 +256,7 @@ sub configure { eval { install_server($card, $options, $do_pkgs) }; if ($@) { - $in->ask_warn('', N("Can't install Xorg package: %s", $@)); + $in->ask_warn('', N("Can not install Xorg package: %s", $@)); goto card_config__not_listed; } @@ -424,7 +424,7 @@ sub set_glx_restrictions { my ($card) = @_; #- 3D acceleration configuration for XFree 4 using DRI, this is enabled by default - #- but for some there is a need to specify VideoRam (else it won't run). + #- but for some there is a need to specify VideoRam (else it will not run). if ($card->{use_DRI_GLX}) { $card->{needVideoRam} = 1 if $card->{description} =~ /Matrox.* G[245][05]0/; ($card->{needVideoRam}, $card->{VideoRam}) = (1, 16384) diff --git a/perl-install/Xconfig/parse.pm b/perl-install/Xconfig/parse.pm index ab2838b43..d8c8057c6 100644 --- a/perl-install/Xconfig/parse.pm +++ b/perl-install/Xconfig/parse.pm @@ -44,7 +44,7 @@ sub raw_from_file { #- internal my ($comment, $obj, @objs); my $attach_comment = sub { - $obj || @objs or warn "$file:$line: can't attach comment\n"; + $obj || @objs or warn "$file:$line: can not attach comment\n"; if ($comment) { $comment =~ s/\n+$/\n/; ($obj || $objs[0])->{$_[0] . '_comment'} = $comment; diff --git a/perl-install/Xconfig/xfree.pm b/perl-install/Xconfig/xfree.pm index ba2c2cedf..a29713269 100644 --- a/perl-install/Xconfig/xfree.pm +++ b/perl-install/Xconfig/xfree.pm @@ -35,7 +35,7 @@ sub write { if (-l $_) { unlink $_; } else { - rename $_, "$_.old"; #- there won't be any XF86Config-4 anymore, we want this! + rename $_, "$_.old"; #- there will not be any XF86Config-4 anymore, we want this! } } symlinkf 'XF86Config', $xorg; @@ -508,7 +508,7 @@ EndSection Section "ServerFlags" #DontZap # disable <Crtl><Alt><BS> (server abort) #DontZoom # disable <Crtl><Alt><KP_+>/<KP_-> (resolution switching) - AllowMouseOpenFail # allows the server to start up even if the mouse doesn't work + AllowMouseOpenFail # allows the server to start up even if the mouse does not work EndSection END diff --git a/perl-install/any.pm b/perl-install/any.pm index 29aeea8c4..5c68f84f8 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -169,7 +169,7 @@ Assign a new Volume ID?", $dev)))) { } elsif (arch() =~ /ppc/) { if (detect_devices::get_mac_model() !~ /IBM/) { my $of_boot = bootloader::dev2yaboot($b->{boot}); - $in->ask_warn('', N("You may need to change your Open Firmware boot-device to\n enable the bootloader. If you don't see the bootloader prompt at\n reboot, hold down Command-Option-O-F at reboot and enter:\n setenv boot-device %s,\\\\:tbxi\n Then type: shut-down\nAt your next boot you should see the bootloader prompt.", $of_boot)); + $in->ask_warn('', N("You may need to change your Open Firmware boot-device to\n enable the bootloader. If you do not see the bootloader prompt at\n reboot, hold down Command-Option-O-F at reboot and enter:\n setenv boot-device %s,\\\\:tbxi\n Then type: shut-down\nAt your next boot you should see the bootloader prompt.", $of_boot)); } } 1; @@ -1015,11 +1015,11 @@ sub ask_window_manager_to_logout { ); my $cmd = $h{$wm} or return; if ($wm eq 'gnome-session') { - #- NB: consolehelper doesn't destroy $HOME whereas kdesu does + #- NB: consolehelper does not destroy $HOME whereas kdesu does #- for gnome, we use consolehelper, so below works $ENV{ICEAUTHORITY} ||= "$ENV{HOME}/.ICEauthority"; } elsif ($wm eq 'kwin' && $> == 0) { - #- we can't use dcop when we are root + #- we can not use dcop when we are root $cmd = "su $ENV{USER} -c '$cmd'"; } system($cmd); @@ -1043,7 +1043,7 @@ sub alloc_raw_device { sub config_dvd { my ($prefix, $have_devfsd) = @_; - #- can't have both a devfs and a non-devfs config + #- can not have both a devfs and a non-devfs config #- the /etc/sysconfig/rawdevices solution gives errors with devfs my @dvds = grep { detect_devices::isDvdDrive($_) } detect_devices::cdroms() or return; diff --git a/perl-install/authentication.pm b/perl-install/authentication.pm index 6c911a7e1..89ed1d9c3 100644 --- a/perl-install/authentication.pm +++ b/perl-install/authentication.pm @@ -118,7 +118,7 @@ sub ask_parameters { ]) or return; } elsif ($kind eq 'winbind' || $kind eq 'SMBKRB') { #- maybe we should browse the network like diskdrake --smb and get the 'doze server names in a list - #- but networking isn't setup yet necessarily + #- but networking is not setup yet necessarily $in->ask_warn('', N("For this to work for a W2K PDC, you will probably need to have the admin run: C:\\>net localgroup \"Pre-Windows 2000 Compatible Access\" everyone /add and reboot the server. You will also need the username/password of a Domain Admin to join the machine to the Windows(TM) domain. If networking is not yet enabled, Drakx will attempt to join the domain after the network setup step. @@ -192,7 +192,7 @@ sub set { log::l("authentication::set $kind"); - my $pam_modules = $kind2pam_kind{$kind} or log::l("kind2pam_kind doesn't know $kind"); + my $pam_modules = $kind2pam_kind{$kind} or log::l("kind2pam_kind does not know $kind"); $pam_modules ||= []; sshd_config_UsePAM(@$pam_modules > 0); set_pam_authentication(@$pam_modules); @@ -282,7 +282,7 @@ sub set { } elsif ($kind eq 'NIS') { $in->do_pkgs->install(qw(ypbind autofs)); my $domain = $netc->{NISDOMAIN}; - $domain || $authentication->{NIS_server} ne "broadcast" or die N("Can't use broadcast with no NIS domain"); + $domain || $authentication->{NIS_server} ne "broadcast" or die N("Can not use broadcast with no NIS domain"); my $t = $domain ? "domain $domain" . ($authentication->{NIS_server} ne "broadcast" && " server") : "ypserver"; substInFile { $_ = "#~$_" unless /^#/; diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index f63d6d480..14e72a049 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -45,7 +45,7 @@ sub vmlinuz2basename { } sub basename2initrd_basename { my ($basename) = @_; - $basename =~ s!vmlinuz-?!!; #- here we don't use $vmlinuz_regexp since we explictly want to keep all that is not "vmlinuz" + $basename =~ s!vmlinuz-?!!; #- here we do not use $vmlinuz_regexp since we explictly want to keep all that is not "vmlinuz" 'initrd' . ($basename ? "-$basename" : ''); } sub kernel_str2vmlinuz_long { @@ -366,7 +366,7 @@ sub same_entries { next if $inode_a && $inode_b && $inode_a == $inode_b; } - log::l("entries $a->{label} don't have same $_: $a->{$_} ne $b->{$_}"); + log::l("entries $a->{label} do not have same $_: $a->{$_} ne $b->{$_}"); return; } 1; @@ -434,7 +434,7 @@ sub _do_the_symlink { if (-e "$::prefix$old_long_name") { $bootloader->{old_long_names}{$link} = $old_long_name; } else { - log::l("ERROR: $link points to $old_long_name which doesn't exist"); + log::l("ERROR: $link points to $old_long_name which does not exist"); } #- changing the symlink @@ -461,7 +461,7 @@ sub add_kernel { $v->{append} = pack_append($simple, $dict); } - #- new versions of yaboot don't handle symlinks + #- new versions of yaboot do not handle symlinks $b_nolink ||= arch() =~ /ppc/; $b_nolink ||= $kernel_str->{use_long_name}; @@ -761,7 +761,7 @@ wait for default boot. } } - #- remove existing libsafe, don't care if the previous one was modified by the user? + #- remove existing libsafe, do not care if the previous one was modified by the user? @{$bootloader->{entries}} = grep { $_->{label} ne 'failsafe' } @{$bootloader->{entries}}; add_kernel($bootloader, $kernels[0], @@ -777,7 +777,7 @@ wait for default boot. }); } } elsif (arch() !~ /ia64/) { - #- search for dos (or windows) boot partition. Don't look in extended partitions! + #- search for dos (or windows) boot partition. Do not look in extended partitions! my @windows_boot_parts = grep { isFat_or_NTFS($_) && member(fs::type::fs_type_from_magic($_), 'vfat', 'ntfs') } map { @{$_->{primary}{normal}} } @{$all_hds->{hds}}; @@ -973,7 +973,7 @@ sub when_config_changed_yaboot { sub make_label_lilo_compatible { my ($label) = @_; - $label = substr($label, 0, 31); #- lilo doesn't handle more than 31 char long labels + $label = substr($label, 0, 31); #- lilo does not handle more than 31 char long labels $label =~ s/ /_/g; #- lilo does not support blank character in image names, labels or aliases qq("$label"); } @@ -1276,7 +1276,7 @@ sub install_grub { } sub when_config_changed_grub { my ($_bootloader) = @_; - #- don't do anything + #- do not do anything } sub action { @@ -1291,7 +1291,7 @@ sub install { my ($bootloader, $all_hds) = @_; if (my $part = fs::get::device2part($bootloader->{boot}, [ fs::get::fstab($all_hds) ])) { - die N("You can't install the bootloader on a %s partition\n", $part->{fs_type}) + die N("You can not install the bootloader on a %s partition\n", $part->{fs_type}) if $part->{fs_type} eq 'xfs'; } $bootloader->{keytable} = keytable($bootloader->{keytable}); @@ -1351,7 +1351,7 @@ sub update_for_renumbered_partitions { my $config = $_ eq 'grub' ? 'grub_install' : $_; $configs{$config} && $configs{$config}{orig} ne $configs{$config}{new}; } @needed) { - $in->ask_warn('', N("The bootloader can't be installed correctly. You have to boot rescue and choose \"%s\"", + $in->ask_warn('', N("The bootloader can not 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 ee44fa426..f1904ebc4 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't find function $AUTOLOAD\n" . backtrace()) : + die("can not find function $AUTOLOAD\n" . backtrace()) : die($err); } wantarray() ? @l : $l[0]; diff --git a/perl-install/commands.pm b/perl-install/commands.pm index fe6ad8dba..dd7bc1ab5 100644 --- a/perl-install/commands.pm +++ b/perl-install/commands.pm @@ -38,7 +38,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't remove $_\n" } } +sub rmdir_ { foreach (@_) { rmdir $_ or die "rmdir: can not 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 } } @@ -124,7 +124,7 @@ sub rm { if (!-l $_ && -d $_) { $rec or die "$_ is a directory\n"; &$rm(glob_($_)); - rmdir $_ or die "can't remove directory $_: $!\n"; + rmdir $_ or die "can not remove directory $_: $!\n"; } else { unlink $_ or die "rm of $_ failed: $!\n" } } }; @@ -202,7 +202,7 @@ sub ls { @_ == 1 && -d $_[0] and @_ = glob_($_[0]); foreach (sort @_) { if ($l) { - my @s = lstat or warn("can't stat file $_\n"), next; + my @s = lstat or warn("can not stat file $_\n"), next; formline( "@<<<<<<<<< @<<<<<<< @<<<<<<< @>>>>>>>> @>>>>>>>>>>>>>>> @*\n", rights($s[2]), getpwuid $s[4] || $s[4], getgrgid $s[5] || $s[5], @@ -256,15 +256,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't open file $h{if}\n"; - ref($h{of}) eq 'GLOB' ? (*OF = $h{of}) : sysopen(OF, $h{of}, 0x41) || die "error: can't open file $h{of}\n"; + 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}, 0x41) || die "error: can not 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't read block $nb\n" : last); - syswrite(OF, $tmp) or die "error: can't write block $nb\n"; + $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 < $h{bs} and $read = 1, last; } print STDERR "\r$nb+$read records in\n"; @@ -275,7 +275,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; @_ ? open($fh, $_[0]) || die "error: can't open file $_[0]\n" : ($fh = *STDIN); + my $fh; @_ ? open($fh, $_[0]) || die "error: can not open file $_[0]\n" : ($fh = *STDIN); if ($0 eq 'head') { local $_; @@ -320,7 +320,7 @@ sub more { require devices; my $tty = devices::make('tty'); my $n = 0; - open(my $IN, $tty) or die "can't open $tty\n"; + open(my $IN, $tty) or die "can not open $tty\n"; local $_; while (<>) { if (++$n == 25) { @@ -346,7 +346,7 @@ sub insmod { ($f) = modules::extract_modules('/tmp', $name); } if (! -r $f) { - die "can't find module $f\n"; + die "can not find module $f\n"; } run_program::run(["/usr/bin/insmod_", "insmod"], "-f", $f, @_) or die("insmod $f failed"); unlink $f; @@ -434,7 +434,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; @_ ? open($fh, $_[0]) || die "error: can't open file $_[0]\n" : ($fh = *STDIN); + my $fh; @_ ? open($fh, $_[0]) || die "error: can not open file $_[0]\n" : ($fh = *STDIN); if ($n) { print(sort { $a <=> $b } <$fh>); } else { diff --git a/perl-install/common.pm b/perl-install/common.pm index d016c6a23..fb1239d66 100644 --- a/perl-install/common.pm +++ b/perl-install/common.pm @@ -192,7 +192,7 @@ sub take_screenshot() { my $dir = screenshot_dir__and_move() . '/DrakX-screenshots'; my $warn; if (!-e $dir) { - mkdir $dir or $::o->ask_warn('', N("Can't make screenshots before partitioning")), return; + mkdir $dir or $::o->ask_warn('', N("Can not make screenshots before partitioning")), return; $warn = 1; } my $nb = 1; @@ -224,7 +224,7 @@ sub set_alternative { #- (is this needed???) run_program::rooted_get_stdout($::prefix, 'update-alternatives', '--display', $command) =~ /^\Q$executable /m or return; - #- this doesn't handle relative symlink, but neither does update-alternatives ;p + #- this does not handle relative symlink, but neither does update-alternatives ;p symlinkf $executable, "$::prefix/etc/alternatives/$command"; } @@ -232,7 +232,7 @@ sub files_exist { and_(map { -f "$::prefix$_" } @_) } sub secured_file { my ($f) = @_; - c::is_secure_file($f) or die "can't ensure a safe $f"; + c::is_secure_file($f) or die "can not ensure a safe $f"; $f; } diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index 8ba1cc775..5e817d82f 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -127,8 +127,8 @@ sub get_usb_storage_info_24 { my @choices = @{$l{$host} || []} or log::l("weird, host$host from /proc/scsi/usb-storage-*/* is not in /proc/scsi/scsi"), next; if (@choices > 1) { @choices = grep { $_->{info} =~ /^\Q$usbs{$host}{vendor_name}/ } @choices; - @choices or log::l("weird, can't find the good entry host$host from /proc/scsi/usb-storage-*/* in /proc/scsi/scsi"), next; - @choices == 1 or log::l("argh, can't determine the good entry host$host from /proc/scsi/usb-storage-*/* in /proc/scsi/scsi"), next; + @choices or log::l("weird, can not find the good entry host$host from /proc/scsi/usb-storage-*/* in /proc/scsi/scsi"), next; + @choices == 1 or log::l("argh, can not determine the good entry host$host from /proc/scsi/usb-storage-*/* in /proc/scsi/scsi"), next; } add2hash($choices[0], $usbs{$host}); } @@ -776,7 +776,7 @@ sub syslog() { } sub get_mac_model() { - my $mac_model = cat_("/proc/device-tree/model") || die "Can't open /proc/device-tree/model"; + my $mac_model = cat_("/proc/device-tree/model") || die "Can not open /proc/device-tree/model"; log::l("Mac model: $mac_model"); $mac_model; } @@ -944,7 +944,7 @@ sub suggest_mount_point { } elsif ($e->{media_type} eq 'fd') { $name = 'floppy'; } else { - log::l("suggest_mount_point: don't know what to with hd $e->{device}"); + log::l("suggest_mount_point: do not know what to with hd $e->{device}"); } } $name; diff --git a/perl-install/devices.pm b/perl-install/devices.pm index 5ebb848ba..316a2f0f4 100644 --- a/perl-install/devices.pm +++ b/perl-install/devices.pm @@ -19,7 +19,7 @@ sub size { return $size * $common::SECTORSIZE; } - #- sad it didn't work, well searching the size using the dichotomy algorithm! + #- sad it did not work, well searching the size using the dichotomy algorithm! my $low = 0; my ($high, $mid); @@ -172,7 +172,7 @@ sub make($) { if ($file =~ m|/dev/| && -e '/dev/.devfsd') { #- argh, creating devices is no good with devfs... - #- return the file even if the device file doesn't exist + #- return the file even if the device file does not exist #- the caller will fail or not, better compatibility than raising an exception here return $file; } diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm index 20ed88f87..be261c940 100644 --- a/perl-install/diskdrake/interactive.pm +++ b/perl-install/diskdrake/interactive.pm @@ -34,7 +34,7 @@ struct part { string prefer_devfs_name # should the {devfs_device} or the {device} be used in fstab string device_LABEL # volume label. LABEL=xxx can be used in fstab instead of string prefer_device_LABEL # should the {device_LABEL} or the {device} be used in fstab - bool faked_device # false if {device} is a real device, true for nfs/smb/dav/none devices. If the field doesn't exist, we don't know + bool faked_device # false if {device} is a real device, true for nfs/smb/dav/none devices. If the field does not exist, we do not know string rootDevice # 'sda', 'hdc' ... (can also be a VG_name) string real_mntpoint # directly on real /, '/tmp/hdimage' ... @@ -52,7 +52,7 @@ struct part { bool notFormatted # isFormatted means the device is formatted # !isFormatted && notFormatted means the device is not formatted - # !isFormatted && !notFormatted means we don't know which state we're in + # !isFormatted && !notFormatted means we do not know which state we're in string raid # for partitions of type isRawRAID and which isPartOfRAID, the raid device string lvm # partition used as a PV for the VG with {lvm} as VG_name #-# @@ -344,7 +344,7 @@ sub Auto_allocate { $in->ask_warn("", [ N("All primary partitions are used"), - N("I can't add any more partitions"), + N("I can not add any more partitions"), N("To have more partitions, please delete one to be able to create an extended partition"), ]); } @@ -520,7 +520,7 @@ sub Create { }; if (my $err = $@) { if ($err =~ /raw_add/ && $hd->hasExtended && !$hd->{primary}{extended}) { - $in->ask_warn(N("Error"), N("You can't create a new partition + $in->ask_warn(N("Error"), N("You can not 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; @@ -595,7 +595,7 @@ sub Type { put_in_hash($part, $type); set_isFormatted($part, 1); #- assume that if tune2fs works, partition is formatted - #- disable the fsck (don't do it together with -j in case -j fails?) + #- disable the fsck (do not do it together with -j in case -j fails?) fs::format::disable_forced_fsck($part->{device}); return; } @@ -625,7 +625,7 @@ sub Mount_point { callbacks => { complete => sub { !isPartOfLoopback($part) || $mntpoint or $in->ask_warn('', -N("Can't unset mount point as this partition is used for loop back. +N("Can not unset mount point as this partition is used for loop back. Remove the loopback first")), return 1; $part->{mntpoint} eq $mntpoint || check_mntpoint($in, $mntpoint, $hd, $part, $all_hds) or return 1; $migrate_files = need_migration($in, $mntpoint) or return 1; @@ -781,7 +781,7 @@ filesystem checks will be run on your next boot into Windows(TM)")); } else { set_isFormatted($part, 0); partition_table::verifyParts($hd); - $part->{mntpoint} = '' if isNonMountable($part); #- mainly for ntfs, which we can't format + $part->{mntpoint} = '' if isNonMountable($part); #- mainly for ntfs, which we can not format } $adjust->(0) if $size < $oldsize; @@ -863,16 +863,16 @@ sub Loopback { write_partitions($in, $hd) or return; - my $handle = any::inspect($real_part) or $in->ask_warn('', N("This partition can't be used for loopback")), return; + my $handle = any::inspect($real_part) or $in->ask_warn('', N("This partition can not be used for loopback")), return; my ($min, $max) = (1, loopback::getFree($handle->{dir}, $real_part)); - $max = min($max, 1 << (31 - 9)) if $real_part->{fs_type} eq 'vfat'; #- FAT doesn't handle file size bigger than 2GB + $max = min($max, 1 << (31 - 9)) if $real_part->{fs_type} eq 'vfat'; #- FAT does not handle file size bigger than 2GB my $part = { maxsize => $max, size => 0, loopback_device => $real_part, notFormatted => 1 }; if (!fsedit::suggest_part($part, $all_hds)) { $part->{size} = $part->{maxsize}; fs::type::suggest_fs_type($part, 'ext3'); } - delete $part->{mntpoint}; # we don't want the suggested mntpoint + delete $part->{mntpoint}; # we do not want the suggested mntpoint my $type_name = fs::type::part2type_name($part); my $mb_size = $part->{size} >> 11; diff --git a/perl-install/diskdrake/smbnfs_gtk.pm b/perl-install/diskdrake/smbnfs_gtk.pm index 01b0074a1..69c9517a6 100644 --- a/perl-install/diskdrake/smbnfs_gtk.pm +++ b/perl-install/diskdrake/smbnfs_gtk.pm @@ -160,7 +160,7 @@ sub import_tree { return @l if !$@; if ($server->{username}) { - $in->ask_warn('', N("Can't login using username %s (bad password?)", $server->{username})); + $in->ask_warn('', N("Can not login using username %s (bad password?)", $server->{username})); network::smb::remove_bad_credentials($server); } else { if (my @l = network::smb::authentications_available($server)) { @@ -193,7 +193,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't 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)) { #- can not 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 bc4cadc44..dd39c749e 100644 --- a/perl-install/do_pkgs.pm +++ b/perl-install/do_pkgs.pm @@ -207,8 +207,8 @@ sub is_installed { sub are_installed { my ($_do, @l) = @_; my @l2; - run_program::run('/bin/rpm', '>', \@l2, '-q', '--qf', "%{name}\n", @l); #- don't care about the return value - intersection(\@l, [ chomp_(@l2) ]); #- can't return directly @l2 since it contains things like "package xxx is not installed" + run_program::run('/bin/rpm', '>', \@l2, '-q', '--qf', "%{name}\n", @l); #- do not care about the return value + intersection(\@l, [ chomp_(@l2) ]); #- can not 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 8aed5cfb1..542df8a3f 100644 --- a/perl-install/fs.pm +++ b/perl-install/fs.pm @@ -338,7 +338,7 @@ sub prepare_write_fstab { ($device, $fs_type) = ('none', 'supermount'); } else { #- if we were using supermount, the type could be something like ext2:vfat - #- but this can't be done without supermount, so switching to "auto" + #- but this can not be done without supermount, so switching to "auto" $fs_type = 'auto' if $fs_type =~ /:/; } @@ -554,13 +554,13 @@ sub umount { syscall_('umount2', $mntpoint, 0) or die N("error unmounting %s: %s", $mntpoint, $!); }; - substInFile { $_ = '' if /(^|\s)$mntpoint\s/ } '/etc/mtab'; #- don't care about error, if we can't read, we won't manage to write... (and mess mtab) + 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) } sub mount_part { my ($part, $o_prefix, $b_rdonly, $o_wait_message) = @_; - #- root carrier's link can't be mounted + #- root carrier's link can not be mounted loopback::carryRootCreateSymlink($part, $o_prefix); log::l("isMounted=$part->{isMounted}, real_mntpoint=$part->{real_mntpoint}, mntpoint=$part->{mntpoint}"); @@ -592,7 +592,7 @@ sub mount_part { if (isLoopback($part) || $part->{encrypt_key}) { set_loop($part); } elsif ($part->{options} =~ /encrypted/) { - log::l("skip mounting $part->{device} since we don't have the encrypt_key"); + log::l("skip mounting $part->{device} since we do not have the encrypt_key"); return; } elsif (loopback::carryRootLoopback($part)) { $mntpoint = "/initrd/loopfs"; @@ -646,7 +646,7 @@ sub df { if ($part->{isMounted}) { $dir = ($o_prefix || '') . $part->{mntpoint}; } elsif ($part->{notFormatted} && !$part->{isFormatted}) { - return; #- won't even try! + return; #- will not even try! } else { mkdir_p($dir); eval { mount($part->{device}, $dir, $part->{fs_type}, 'readonly') }; diff --git a/perl-install/fs/format.pm b/perl-install/fs/format.pm index bbeeed2f0..c0f2f791f 100644 --- a/perl-install/fs/format.pm +++ b/perl-install/fs/format.pm @@ -80,7 +80,7 @@ sub part_raw { push @options, '-l', 'bootstrap'; } - my ($_pkg, $cmd, @first_options) = @{$cmds{$fs_type} || die N("I don't know how to format %s in type %s", $part->{device}, $part->{fs_type})}; + my ($_pkg, $cmd, @first_options) = @{$cmds{$fs_type} || die N("I do not know how to format %s in type %s", $part->{device}, $part->{fs_type})}; run_program::raw({ timeout => 60 * 60 }, $cmd, @first_options, @options, devices::make($dev)) or die N("%s formatting of %s failed", $fs_type, $dev); diff --git a/perl-install/fs/mount_options.pm b/perl-install/fs/mount_options.pm index b4890e877..77ef74a17 100644 --- a/perl-install/fs/mount_options.pm +++ b/perl-install/fs/mount_options.pm @@ -176,7 +176,7 @@ sub set_default { } if ($part->{media_type} eq 'fd') { - # slow device so don't loose time, write now! + # slow device so do not loose time, write now! $options->{sync} = 1; } diff --git a/perl-install/fs/type.pm b/perl-install/fs/type.pm index 86ae0975a..ed6b4a571 100644 --- a/perl-install/fs/type.pm +++ b/perl-install/fs/type.pm @@ -361,6 +361,6 @@ sub set_isFormatted { #- do this before modifying $part->{fs_type} sub check { my ($fs_type, $_hd, $part) = @_; - $fs_type eq "jfs" && $part->{size} < 16 << 11 and die N("You can't use JFS for partitions smaller than 16MB"); - $fs_type eq "reiserfs" && $part->{size} < 32 << 11 and die N("You can't use ReiserFS for partitions smaller than 32MB"); + $fs_type eq "jfs" && $part->{size} < 16 << 11 and die N("You can not use JFS for partitions smaller than 16MB"); + $fs_type eq "reiserfs" && $part->{size} < 32 << 11 and die N("You can not use ReiserFS for partitions smaller than 32MB"); } diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm index bd93e49b0..a6eea966c 100644 --- a/perl-install/fsedit.pm +++ b/perl-install/fsedit.pm @@ -77,7 +77,7 @@ sub lvms { log::l("looking for vgs in " . join(' ', map { $_->{device} } @pvs)); - #- otherwise vgscan won't find them + #- otherwise vgscan will not find them devices::make($_->{device}) foreach @pvs; require lvm; @@ -166,7 +166,7 @@ sub get_hds { my $err = $@; if ($handle_die_and_cdie->()) { $handled = 1; - 0; #- don't continue, transform cdie into die + 0; #- do not continue, transform cdie into die } else { !$o_in || $o_in->ask_okcancel('', formatError($err)); } @@ -177,7 +177,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't read the partition table of device %s, it's too corrupted for me :( +N("I can not 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) @@ -199,7 +199,7 @@ Do you agree to lose all the partitions? my @parts = partition_table::get_normal_parts($hd); - # checking the magic of the filesystem, don't rely on pt_type + # checking the magic of the filesystem, do not rely on pt_type foreach (grep { member($_->{fs_type}, 'vfat', 'ntfs', 'ext2') || $_->{pt_type} == 0x100 } @parts) { if (my $type = fs::type::type_subpart_from_magic($_)) { if ($type->{fs_type}) { @@ -401,12 +401,12 @@ sub check_mntpoint { cdie N("You've selected a software RAID partition as root (/). No bootloader is able to handle this without a /boot partition. Please be sure to add a /boot partition") if $mntpoint eq "/" && isRAID($part) && !fs::get::has_mntpoint("/boot", $all_hds); - die N("You can't use a LVM Logical Volume for mount point %s", $mntpoint) + die N("You can not use a LVM Logical Volume for mount point %s", $mntpoint) if $mntpoint eq '/boot' && isLVM($hd); cdie N("You've selected a LVM Logical Volume as root (/). The bootloader is not able to handle this without a /boot partition. Please be sure to add a /boot partition") if $mntpoint eq "/" && isLVM($part) && !fs::get::has_mntpoint("/boot", $all_hds); - cdie N("You may not be able to install lilo (since lilo doesn't handle a LV on multiple PVs)") + cdie N("You may not be able to install lilo (since lilo does not handle a LV on multiple PVs)") if 0; # arch() =~ /i.86/ && $mntpoint eq '/' && isLVM($hd) && @{$hd->{disks} || []} > 1; cdie N("This directory should remain within the root filesystem") @@ -417,7 +417,7 @@ Please be sure to add a /boot partition") if $mntpoint eq "/" && isLVM($part) && if !isTrueLocalFS($part) && $mntpoint eq '/'; die N("You need a true filesystem (ext2/ext3, reiserfs, xfs, or jfs) for this mount point\n") if !isTrueFS($part) && member($mntpoint, qw(/home /tmp /usr /var)); - die N("You can't use an encrypted file system for mount point %s", $mntpoint) + die N("You can not use an encrypted file system for mount point %s", $mntpoint) if $part->{options} =~ /encrypted/ && member($mntpoint, qw(/ /usr /var /boot)); local $part->{mntpoint} = $mntpoint; @@ -554,7 +554,7 @@ sub undo { @$_{@partition_table::fields2save} = @$h; if ($_->{hasBeenDirty}) { - partition_table::will_tell_kernel($_, 'force_reboot'); #- next action needing write_partitions will force it. We can't do it now since more undo may occur, and we must not needReboot now + partition_table::will_tell_kernel($_, 'force_reboot'); #- next action needing write_partitions will force it. We can not do it now since more undo may occur, and we must not needReboot now } } @@ -617,7 +617,7 @@ sub compare_with_proc_partitions { if ($len1 != $len2 && arch() ne 'ppc') { die sprintf( - "/proc/partitions doesn't agree with drakx %d != %d:\n%s\n", $len1, $len2, + "/proc/partitions does not agree with drakx %d != %d:\n%s\n", $len1, $len2, "/proc/partitions: " . join(", ", map { "$_->{device} ($_->{rootDevice})" } @l2)); } $len2; diff --git a/perl-install/ftp.pm b/perl-install/ftp.pm index b0f7046b1..e7af86fb0 100644 --- a/perl-install/ftp.pm +++ b/perl-install/ftp.pm @@ -76,7 +76,7 @@ sub rewindGetFile() { #- close any existing connection. foreach (values %hosts) { my ($ftp, $retr) = @{$_ || []}; - #- don't let Timeout kill us! + #- do not let Timeout kill us! eval { $$retr->close } if $$retr; eval { $ftp->close } if $ftp; } diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm index d1cc151ea..7ef67435f 100644 --- a/perl-install/harddrake/sound.pm +++ b/perl-install/harddrake/sound.pm @@ -11,7 +11,7 @@ package harddrake::sound; # o pcmcia cards: snd-vxp440 snd-vxpocket # TODO: -# o ensure sound isn't user (either dsp/midi/sequencer/mixer) +# o ensure sound is not user (either dsp/midi/sequencer/mixer) # o fix sound/alsa services use strict; diff --git a/perl-install/harddrake/v4l.pm b/perl-install/harddrake/v4l.pm index 9b331d6ee..aa005b664 100644 --- a/perl-install/harddrake/v4l.pm +++ b/perl-install/harddrake/v4l.pm @@ -273,7 +273,7 @@ my $cards_lst = { my %pll_lst = ( -1 => N("Default"), - 0 => "don't use pll", + 0 => "do not use pll", 1 => "28 Mhz Crystal (X)", 2 => "35 Mhz Crystal" ); diff --git a/perl-install/help.pm b/perl-install/help.pm index ebdeb98b7..991b0b5e3 100644 --- a/perl-install/help.pm +++ b/perl-install/help.pm @@ -3,7 +3,7 @@ use common; 1; -# IMPORTANT: Don't edit this File - It is automatically generated +# IMPORTANT: Do not edit this File - It is automatically generated # from the manuals !!! # Write a mail to <documentation@mandrakesoft.com> if # you want it changed. @@ -16,16 +16,16 @@ button will reboot your computer.", N("Accept"), N("Quit")); sub addUser() { N("GNU/Linux is a multi-user system which means each user can have his or her own preferences, own files and so on. But unlike \"root\", who is the -system administrator, the users you add at this point won't be authorized +system administrator, the users you add at this point will not be authorized to change anything except their own files and their own configurations, protecting the system from unintentional or malicious changes which could impact on the system as a whole. You'll have to create at least one regular user for yourself -- this is the account which you should use for routine, day-to-day usage. Although it's very easy to log in as \"root\" to do anything and everything, it may also be very dangerous! A very simple -mistake could mean that your system won't work any more. If you make a +mistake could mean that your system will not work any more. If you make a serious mistake as a regular user, the worst that can happen is that you'll -lose some information, but you won't affect the entire system. +lose some information, but you will not affect the entire system. The first field asks you for a real name. Of course, this is not mandatory -- you can actually enter whatever you like. DrakX will use the first word @@ -46,7 +46,7 @@ that user (bash by default). When you're finished adding users, you'll be asked to choose a user who will be automatically logged into the system when the computer boots up. If -you're interested in that feature (and don't care much about local +you're interested in that feature (and do not care much about local security), choose the desired user and window manager, then click on \"%s\". If you're not interested in this feature, uncheck the \"%s\" box.", N("User name"), N("Accept user"), N("Next"), N("Advanced"), N("Next"), N("Do you want to use this feature?")); } @@ -161,7 +161,7 @@ installed. By default Mandrakelinux will automatically start any installed services at boot time. Even if they are safe and have no known issues at the time the distribution was shipped, it is entirely possible that security holes were discovered after this version of Mandrakelinux was -finalized. If you don't know what a particular service is supposed to do or +finalized. If you do not know what a particular service is supposed to do or why it's being installed, then click \"%s\". Clicking \"%s\" will install the listed services and they will be started automatically at boot time. !! @@ -190,7 +190,7 @@ sub configureServices() { time. DrakX will list all services available on the current installation. Review -each one of them carefully and uncheck those which aren't needed at boot +each one of them carefully and uncheck those which are not needed at boot time. A short explanatory text will be displayed about a service when it is @@ -198,7 +198,7 @@ selected. However, if you're not sure whether a service is useful or not, it is safer to leave the default behavior. !! At this stage, be very careful if you intend to use your machine as a -server: you probably don't want to start any services which you don't need. +server: you probably do not want to start any services which you do not need. Please remember that some services can be dangerous if they're enabled on a server. In general, select only those services you really need. !!"); } @@ -355,7 +355,7 @@ to store your data or to install new software. * \"%s\". If you want to delete all data and all partitions present on your hard drive and replace them with your new Mandrakelinux system, choose -this option. Be careful, because you won't be able to undo this operation +this option. Be careful, because you will not be able to undo this operation after you confirm. !! If you choose this option, all data on your disk will be deleted. !! @@ -375,7 +375,7 @@ refer to the ``Managing Your Partitions'' section in the ``Starter Guide''.", N( } sub exitInstall() { N("There you are. Installation is now complete and your GNU/Linux system is -ready to be used. Just click on \"%s\" to reboot the system. Don't forget +ready to be used. Just click on \"%s\" to reboot the system. Do not forget to remove the installation media (CD-ROM or floppy). The first thing you should see after your computer has finished doing its hardware tests is the boot-loader menu, giving you the choice of which operating system to start. @@ -415,12 +415,12 @@ select those partitions as well. Please note that it's not necessary to reformat all pre-existing partitions. You must reformat the partitions containing the operating -system (such as \"/\", \"/usr\" or \"/var\") but you don't have to reformat +system (such as \"/\", \"/usr\" or \"/var\") but you do not have to reformat partitions containing data that you wish to keep (typically \"/home\"). Please be careful when selecting partitions. After the formatting is completed, all data on the selected partitions will be deleted and you -won't be able to recover it. +will not be able to recover it. Click on \"%s\" when you're ready to format the partitions. @@ -450,7 +450,7 @@ higher if the machine is to contain crucial data, or if it's to be directly exposed to the Internet. The trade-off that a higher security level is generally obtained at the expense of ease of use. -If you don't know what to choose, keep the default option. You'll be able +If you do not know what to choose, keep the default option. You'll be able to change it later with the draksec tool, which is part of Mandrakelinux Control Center. @@ -485,7 +485,7 @@ perform this step. floppy disk. * \"%s\": if your partition table is damaged, you can try to recover it -using this option. Please be careful and remember that it doesn't always +using this option. Please be careful and remember that it does not always work. * \"%s\": discards all changes and reloads the partition table that was @@ -562,7 +562,7 @@ disk or partition is called \"C:\")."); } sub selectCountry() { N("\"%s\": check the current country selection. If you're not in this country, -click on the \"%s\" button and choose another. If your country isn't in the +click on the \"%s\" button and choose another. If your country is not in the list shown, click on the \"%s\" button to get the complete country list.", N("Country / Region"), N("Configure"), N("More")); } sub selectInstallClass() { @@ -580,7 +580,7 @@ the file system, you should use this option. * \"%s\". This installation class allows you to update the packages currently installed on your Mandrakelinux system. Your current partitioning -scheme and user data won't be altered. Most of the other configuration +scheme and user data will not be altered. Most of the other configuration steps remain available and are similar to a standard installation. Using the ``Upgrade'' option should work fine on Mandrakelinux systems @@ -596,7 +596,7 @@ Also, you may not have a keyboard which corresponds exactly to your language: for example, if you are an English-speaking Swiss native, you may have a Swiss keyboard. Or if you speak English and are located in Quebec, you may find yourself in the same situation where your native language and -country-set keyboard don't match. In either case, this installation step +country-set keyboard do not match. In either case, this installation step will allow you to select an appropriate keyboard from a list. Click on the \"%s\" button to be shown a list of supported keyboards. @@ -702,10 +702,10 @@ The password should be a mixture of alphanumeric characters and at least 8 characters long. Never write down the \"root\" password -- it makes it far too easy to compromise your system. -One caveat: don't make the password too long or too complicated because you +One caveat: do not make the password too long or too complicated because you must be able to remember it! -The password won't be displayed on screen as you type it. To reduce the +The password will not be displayed on screen as you type it. To reduce the chance of a blind typing error you'll need to enter the password twice. If you do happen to make the same typing error twice, you'll have to use this ``incorrect'' password the first time you'll try to connect as \"root\". @@ -714,7 +714,7 @@ If you want an authentication server to control access to your computer, click on the \"%s\" button. If your network uses either LDAP, NIS, or PDC Windows Domain authentication -services, select the appropriate one for \"%s\". If you don't know which +services, select the appropriate one for \"%s\". If you do not know which one to use, you should ask your network administrator. If you happen to have problems with remembering passwords, or if your @@ -733,9 +733,9 @@ 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't determine where to place the boot sector, it'll ask you +If DrakX can not 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\" won't install any boot loader. Use this option only if you +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")); } sub setupDefaultSpooler() { @@ -743,9 +743,9 @@ sub setupDefaultSpooler() { operating systems may offer you one, but Mandrakelinux offers two. Each of the printing systems is best suited to particular types of configuration. - * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice + * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice if you have a direct connection to your printer, you want to be able to -panic out of printer jams, and you don't have networked printers. (\"%s\" +panic out of printer jams, and you do not have networked printers. (\"%s\" will handle only very simple network cases and is somewhat slow when used within networks.) It's recommended that you use \"pdq\" if this is your first experience with GNU/Linux. @@ -760,7 +760,7 @@ emulate a \"lpd\" server, make sure you turn on the \"cups-lpd\" daemon. \"%s\" includes graphical front-ends for printing or choosing printer options and for managing the printer. -If you make a choice now, and later find that you don't like your printing +If you make a choice now, and later find that you do not like your printing system you may change it by running PrinterDrake from the Mandrakelinux Control Center and clicking on the \"%s\" button.", N("pdq"), N("pdq"), N("CUPS"), N("CUPS"), N("Expert")); } @@ -784,7 +784,7 @@ configure the driver."); } sub sound_config() { N("\"%s\": if a sound card is detected on your system, it'll be displayed -here. If you notice the sound card isn't the one actually present on your +here. If you notice the sound card is not the one actually present on your system, you can click on the button and choose a different driver.", N("Sound card")); } sub summary() { @@ -799,7 +799,7 @@ necessary. * \"%s\": check the current country selection. If you're not in this country, click on the \"%s\" button and choose another. If your country -isn't in the list shown, click on the \"%s\" button to get the complete +is not in the list shown, click on the \"%s\" button to get the complete country list. * \"%s\": by default, DrakX deduces your time zone based on the country @@ -815,18 +815,18 @@ Guide'' for more information on how to set up a new printer. The interface presented in our manual is similar to the one used during installation. * \"%s\": if a sound card is detected on your system, it'll be displayed -here. If you notice the sound card isn't the one actually present on your +here. If you notice the sound card is not the one actually present on your system, you can click on the button and choose a different driver. * \"%s\": if you have a TV card, this is where information about its -configuration will be displayed. If you have a TV card and it isn't +configuration will be displayed. If you have a TV card and it is not detected, click on \"%s\" to try to configure it manually. * \"%s\": you can click on \"%s\" to change the parameters associated with the card if you feel the configuration is wrong. * \"%s\": by default, DrakX configures your graphical interface in -\"800x600\" or \"1024x768\" resolution. If that doesn't suit you, click on +\"800x600\" or \"1024x768\" resolution. If that does not suit you, click on \"%s\" to reconfigure your graphical interface. * \"%s\": if you wish to configure your Internet or local network access, diff --git a/perl-install/http.pm b/perl-install/http.pm index 8c19c104a..dec3773a8 100644 --- a/perl-install/http.pm +++ b/perl-install/http.pm @@ -21,7 +21,7 @@ sub getFile { $sock = IO::Socket::INET->new(PeerAddr => $use_http_proxy ? $ENV{PROXY} : $host, PeerPort => $use_http_proxy ? $ENV{PROXYPORT} : $port || 80, Proto => 'tcp', - Timeout => 60) or die "can't connect $@"; + Timeout => 60) or die "can not connect $@"; $sock->autoflush; print $sock join("\015\012" => "GET " . ($use_http_proxy ? $url : $path) . " HTTP/1.0", diff --git a/perl-install/install2.pm b/perl-install/install2.pm index e34e14391..33b352fec 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -114,7 +114,7 @@ sub setupSCSI { if (!$::testing && !$::uml_install) { -d '/lib/modules/' . c::kernel_version() || - -s modules::cz_file() or die N("Can't access kernel modules corresponding to your kernel (file %s is missing), this generally means your boot floppy in not in sync with the Installation medium (please create a newer boot floppy)", modules::cz_file()); + -s modules::cz_file() or die N("Can not access kernel modules corresponding to your kernel (file %s is missing), this generally means your boot floppy in not in sync with the Installation medium (please create a newer boot floppy)", modules::cz_file()); } installStepsCall($o, $auto, 'setupSCSI', $clicked); @@ -196,7 +196,7 @@ sub formatPartitions { if (any { $_->{usb_media_type} && any { $_->{mntpoint} } partition_table::get_normal_parts($_) } @{$o->{all_hds}{hds}}) { log::l("we use a usb-storage based drive, so keep it as a normal scsi_hostadapter"); } else { - log::l("we don't need usb-storage for booting system, rely on hotplug"); + log::l("we do not need usb-storage for booting system, rely on hotplug"); #- when usb-storage is in scsi_hostadapter, #- hotplug + scsimon do not load sd_mod/sr_mod when needed #- (eg: when plugging a usb key) @@ -328,7 +328,7 @@ sub start_i810fb() { log::l("trying to load i810fb module with xres <$xres> (vga was <$vga>)"); eval { modules::load('intel-agp') }; eval { - any::ddcxinfos(); # keep the result otherwise ddcxinfos doesn't return good results afterwards + any::ddcxinfos(); # keep the result otherwise ddcxinfos does not return good results afterwards my $opt = "xres=$xres hsync1=32 hsync2=48 vsync1=50 vsync2=70 vram=2 bpp=16 accel=1 mtrr=1"; #- this sucking i810fb does not accept floating point numbers in hsync! modules::load_with_options([ 'i810fb' ], { i810fb => $opt }); }; @@ -450,7 +450,7 @@ sub main { mkdir $o->{prefix}, 0755; devices::make("/dev/zero"); #- needed by ddcxinfos - #- make sure we don't pick up any gunk from the outside world + #- make sure we do not pick up any gunk from the outside world my $remote_path = "$o->{prefix}/sbin:$o->{prefix}/bin:$o->{prefix}/usr/sbin:$o->{prefix}/usr/bin:$o->{prefix}/usr/X11R6/bin"; $ENV{PATH} = "/usr/bin:/bin:/sbin:/usr/sbin:/usr/X11R6/bin:$remote_path"; @@ -638,13 +638,13 @@ sub main { detect_devices::install_addons($o->{prefix}); #- mainly for auto_install's - #- do not use run_program::xxx because it doesn't leave stdin/stdout unchanged + #- do not use run_program::xxx because it does not leave stdin/stdout unchanged system("bash", "-c", $o->{postInstallNonRooted}) if $o->{postInstallNonRooted}; system("chroot", $o->{prefix}, "bash", "-c", $o->{postInstall}) if $o->{postInstall}; install_any::ejectCdrom(); - #- to ensure linuxconf doesn't cry against those files being in the future + #- to ensure linuxconf does not cry against those files being in the future foreach ('/etc/modules.conf', '/etc/crontab', '/etc/sysconfig/mouse', '/etc/sysconfig/network', '/etc/X11/fs/config') { my $now = time() - 24 * 60 * 60; utime $now, $now, "$o->{prefix}/$_"; diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 194e942bd..e4898fb18 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -161,7 +161,7 @@ sub errorOpeningFile($) { my $getFile = getFile($file); $getFile && @advertising_images and copy_advertising($::o); $getFile and return $getFile; - $current_medium = 'unknown'; #- don't know what CD is inserted now. + $current_medium = 'unknown'; #- do not know what CD is inserted now. ejectCdrom($cdrom, $mountpoint); --$max; } @@ -169,12 +169,12 @@ sub errorOpeningFile($) { while ($max > 0 && askChangeMedium($current_method, $asked_medium)) { $current_medium = $asked_medium; my $getFile = getFile($file); $getFile and return $getFile; - $current_medium = 'unknown'; #- don't know what CD image has been copied. + $current_medium = 'unknown'; #- do not know what CD image has been copied. --$max; } } - #- Don't unselect supplementary CDs. + #- Do not unselect supplementary CDs. return if $asked_medium =~ /^\d+s$/; #- keep in mind the asked medium has been refused on this way. @@ -213,7 +213,7 @@ sub getFile { $o_altroot ||= '/tmp/image'; $f2 = "$o_altroot/$rel" if $rel !~ m,^/, && (!$postinstall_rpms || !-e $f2); #- $f2 = "/$rel" if !$::o->{packages}{mediums}{$asked_medium}{rpmsdir} && !-e $f2; #- not a relative path, should not be necessary with new media layout - my $F; open($F, $f2) ? $F : do { $f2 !~ /XXX/ and log::l("Can't open $f2: $!"); undef }; + my $F; open($F, $f2) ? $F : do { $f2 !~ /XXX/ and log::l("Can not open $f2: $!"); undef }; } } || errorOpeningFile($f); } @@ -259,7 +259,7 @@ sub setup_postinstall_rpms($$) { #- the complete filename of each package. #- copy the package files in the postinstall RPMS directory. #- last arg is default medium '' known as the CD#1. - #- cp_af doesn't handle correctly a missing file. + #- cp_af does not handle correctly a missing file. eval { cp_af((grep { -r $_ } map { "/tmp/image/" . relGetFile($_->filename) } @toCopy), $postinstall_rpms) }; log::l("copying Auto Install Floppy"); @@ -354,7 +354,7 @@ sub preConfigureTimezone { my ($o) = @_; require timezone; - #- can't be done in install cuz' timeconfig %post creates funny things + #- can not 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}); @@ -540,7 +540,7 @@ sub selectSupplMedia { }; if (!defined $f) { log::l($@) if $@; - $o->ask_warn('', N("Can't find hdlist file on this mirror")); + $o->ask_warn('', N("Can not find hdlist file on this mirror")); useMedium($prev_asked_medium); return 'error'; } @@ -732,7 +732,7 @@ formatAlaTeX( N("You have selected the following server(s): %s -These servers are activated by default. They don't have any known security +These servers are activated by default. They do not have any known security issues, but some new ones could be found. In that case, you must make sure to upgrade as soon as possible. @@ -1165,7 +1165,7 @@ sub loadO { foreach my $fs (arch() =~ /sparc/ ? 'romfs' : ('ext2', 'vfat')) { eval { fs::mount($dev, '/mnt', $fs, 'readonly'); 1 } and goto mount_ok; } - die "Couldn't mount floppy [$dev]"; + die "Could not mount floppy [$dev]"; mount_ok: $f = "/mnt/$f"; } @@ -1222,7 +1222,7 @@ sub generate_automatic_stage1_params { } elsif ($o->{method} eq 'ftp') { @ks = (server => $ENV{HOST}, directory => $ENV{PREFIX}, user => $ENV{LOGIN}, pass => $ENV{PASSWORD}); } elsif ($o->{method} eq 'nfs') { - cat_("/proc/mounts") =~ m|(\S+):(\S+)\s+/tmp/nfsimage| or internal_error("can't find nfsimage"); + cat_("/proc/mounts") =~ m|(\S+):(\S+)\s+/tmp/nfsimage| or internal_error("can not find nfsimage"); @ks = (server => $1, directory => $2); } @ks = (method => $method, @ks); @@ -1326,7 +1326,7 @@ sub migrate_device_names { my $device_prefix = devices::part_prefix($_); push @{$h{$device_prefix}}, $_; } else { - #- hopefully this doesn't need anything special + #- hopefully this does not need anything special } } my @from_fstab_per_hds = values %h or return; @@ -1359,9 +1359,9 @@ sub migrate_device_names { goto found_one; } - #- we can't find one and only one matching hd + #- we can not find one and only one matching hd my @from_fstab_not_handled = map { @$_ } @from_fstab_per_hds; - log::l("we still don't know what to do with: " . join(' ', map { $_->{device} } @from_fstab_not_handled)); + log::l("we still do not know what to do with: " . join(' ', map { $_->{device} } @from_fstab_not_handled)); if (!$o_in) { diff --git a/perl-install/install_gtk.pm b/perl-install/install_gtk.pm index 8d22cdfda..20682c533 100644 --- a/perl-install/install_gtk.pm +++ b/perl-install/install_gtk.pm @@ -70,7 +70,7 @@ sub load_rc { } if ($::move) { - #- override selection color since we won't do inverse-video on the text when it's images + #- override selection color since we will not do inverse-video on the text when it's images Gtk2::Rc->parse_string(q( style "galaxy-default" { diff --git a/perl-install/install_interactive.pm b/perl-install/install_interactive.pm index 43ec810e5..4f1ce5064 100644 --- a/perl-install/install_interactive.pm +++ b/perl-install/install_interactive.pm @@ -64,7 +64,7 @@ For this, create a partition (or click on an existing one). Then choose action ``Mount point'' and set it to `/'"), 1) or return; } if (!any { isSwap($_) } @fstab) { - $ok &&= $o->ask_okcancel('', N("You don't have a swap partition.\n\nContinue anyway?")); + $ok &&= $o->ask_okcancel('', N("You do not have a swap partition.\n\nContinue anyway?")); } if (arch() =~ /ia64/ && !fs::get::has_mntpoint("/boot/efi", $all_hds)) { $o->ask_warn('', N("You must have a FAT partition mounted in /boot/efi")); @@ -233,7 +233,7 @@ filesystem checks will be run on your next boot into Windows(TM)")) if $part->{f $o->enter_console; foreach (@$hds) { print "\n" x 10, N("You can now partition %s. -When you are done, don't forget to save using `w'", partition_table::description($_)); +When you are done, do not forget to save using `w'", partition_table::description($_)); print "\n\n"; my $pid = 0; if (arch() =~ /ppc/) { @@ -268,7 +268,7 @@ sub partitionWizard { @solutions = @sol if @sol > 1; log::l("solutions: ", int @solutions); - @solutions or $o->ask_warn('', N("I can't find any room for installing")), die 'already displayed'; + @solutions or $o->ask_warn('', N("I can not find any room for installing")), die 'already displayed'; log::l('HERE: ', join(',', map { $_->[1] } @solutions)); my $sol; diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 77cbda0ed..3f44f9963 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -80,7 +80,7 @@ sub leavingStep { while (my $f = shift @{$o->{steps}{$step}{toBeDone} || []}) { eval { &$f() }; $o->ask_warn(N("Error"), [ -N("An error occurred, but I don't know how to handle it nicely. +N("An error occurred, but I do not know how to handle it nicely. Continue at your own risk."), formatError($@) ]) if $@; } } @@ -266,7 +266,7 @@ sub choosePartitionsToFormat($$) { $_->{mntpoint} = "swap" if isSwap($_); $_->{mntpoint} or next; - add2hash_($_, { toFormat => $_->{notFormatted} }) if $_->{fs_type}; #- eg: don't set toFormat for isRawRAID (0xfd) + add2hash_($_, { toFormat => $_->{notFormatted} }) if $_->{fs_type}; #- eg: do not set toFormat for isRawRAID (0xfd) $_->{toFormatUnsure} ||= member($_->{mntpoint}, '/', '/usr'); if (!$_->{toFormat}) { @@ -474,14 +474,14 @@ sub installPackages($$) { #- complete REWORK, TODO and TOCHECK! sub afterInstallPackages($) { my ($o) = @_; - die N("Some important packages didn't get installed properly. + die N("Some important packages did not get installed properly. Either your cdrom drive or your cdrom is defective. Check the cdrom on an installed computer using \"rpm -qpl media/main/*.rpm\" ") if any { m|read failed: Input/output error| } cat_("$o->{prefix}/root/drakx/install.log"); if (arch() !~ /^sparc/) { #- TODO restore it as may be needed for sparc -x "$o->{prefix}/usr/bin/dumpkeys" or $::testing or die -"Some important packages didn't get installed properly. +"Some important packages did not get installed properly. Please switch to console 2 (using ctrl-alt-f2) and look at the log file /tmp/ddebug.log @@ -522,7 +522,7 @@ Consoles 1,3,4,7 may also contain interesting information"; qw(random netfs network rawdevices sound kheader keytable syslog crond portmap); if ($o->{mouse}{device} =~ /ttyS/) { - log::l("disabling gpm for serial mice (doesn't get along nicely with X)"); + log::l("disabling gpm for serial mice (does not get along nicely with X)"); run_program::rooted($o->{prefix}, "chkconfig", "--del", "gpm"); } @@ -796,7 +796,7 @@ sub readBootloaderConfigBeforeInstall { require bootloader; add2hash($o->{bootloader} ||= {}, bootloader::read($o->{all_hds})); - $o->{bootloader}{bootUnsafe} = 0 if $o->{bootloader}{boot}; #- when upgrading, don't ask where to install the bootloader (mbr vs boot partition) + $o->{bootloader}{bootUnsafe} = 0 if $o->{bootloader}{boot}; #- when upgrading, do not ask where to install the bootloader (mbr vs boot partition) } sub setupBootloaderBefore { diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm index 108b8a256..b635b7348 100644 --- a/perl-install/install_steps_gtk.pm +++ b/perl-install/install_steps_gtk.pm @@ -133,7 +133,7 @@ sub new($$) { $o->{vga16} = 1 if /VGA16/; &$launchX($prog, $Driver) and goto OK; } - $::move and print("can't launch graphical mode :(\n"), c::_exit(1); + $::move and print("can not launch graphical mode :(\n"), c::_exit(1); } return undef; } @@ -159,7 +159,7 @@ sub enteringStep { printf "Entering step `%s'\n", $o->{steps}{$step}{text}; $o->SUPER::enteringStep($step); install_gtk::update_steps_position($o); -# install_gtk::create_help_window($o); #- HACK: without this it doesn't work (reaches step doPartitionDisks then fail) +# install_gtk::create_help_window($o); #- HACK: without this it does not work (reaches step doPartitionDisks then fail) } sub leavingStep { my ($o, $step) = @_; @@ -344,7 +344,7 @@ sub choosePackagesTree { } } } - $error = [ N("You can't select/unselect this package"), + $error = [ N("You can not select/unselect this package"), formatList(20, map { my $rb = $state->{rejected}{$_}{backtrack}; my @froms = keys %{$rb->{closure} || {}}; my @unsatisfied = @{$rb->{unsatisfied} || []}; @@ -356,7 +356,7 @@ sub choosePackagesTree { $_ . ($s ? " ($s)" : ''); } sort @ask_unselect) ]; } elsif (pkgs::correctSize($size / sqr(1024)) > $available / sqr(1024)) { - $error = N("You can't select this package as there is not enough space left to install it"); + $error = N("You can not select this package as there is not enough space left to install it"); } elsif (@l > @_ && $common->{state}{auto_deps}) { $o->ask_okcancel('', [ $isSelection ? N("The following packages are going to be installed") : @@ -384,15 +384,15 @@ sub choosePackagesTree { check_interactive_to_toggle => sub { my $p = pkgs::packageByName($packages, $_[0]) or return; if ($p->flag_base) { - $o->ask_warn('', N("This is a mandatory package, it can't be unselected")); + $o->ask_warn('', N("This is a mandatory package, it can not be unselected")); } elsif ($p->flag_installed && !$p->flag_upgrade) { - $o->ask_warn('', N("You can't unselect this package. It is already installed")); + $o->ask_warn('', N("You can not unselect this package. It is already installed")); } elsif ($p->flag_selected && $p->flag_installed) { if ($::expert) { $o->ask_yesorno('', N("This package must be upgraded.\nAre you sure you want to deselect it?")) or return; return 1; } else { - $o->ask_warn('', N("You can't unselect this package. It must be upgraded")); + $o->ask_warn('', N("You can not unselect this package. It must be upgraded")); } } else { return 1 } return; @@ -571,7 +571,7 @@ sub installPackages { } else { $r &&= $o->ask_okcancel('', N("Change your Cd-Rom! Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when done. -If you don't have it, press Cancel to avoid installation from this Cd-Rom.", $name), 1); +If you do not have it, press Cancel to avoid installation from this Cd-Rom.", $name), 1); } #- add the elapsed time (otherwise the predicted time will be rubbish) $start_time += time() - $time; diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index efb2954f3..91c4c1995 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -65,7 +65,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't be displayed in console, + $o->ask_warn('', "The characters of your language can not be displayed in console, so the messages will be displayed in english during installation") if $ENV{LANGUAGE} eq 'C'; } } @@ -287,7 +287,7 @@ sub doPartitionDisks { if ($generation =~ /NewWorld/) { #- mac partition table if (defined $partition_table::mac::bootstrap_part) { - #- don't do anything if we've got the bootstrap setup + #- do not do anything if we've got the bootstrap setup #- otherwise, go ahead and create one somewhere in the drive free space } else { my $freepart = $partition_table::mac::freepart; @@ -605,7 +605,7 @@ sub chooseGroups { my $minimal = !any { $_ } values %{$o->{rpmsrate_flags_chosen}}; $o->ask_from(N("Type of install"), - N("You haven't selected any group of packages. + N("You have not selected any group of packages. Please choose the minimal installation you want:"), [ { val => \$o->{rpmsrate_flags_chosen}{X}, type => 'bool', text => N("With X"), disabled => sub { $minimal } }, @@ -621,7 +621,7 @@ Please choose the minimal installation you want:"), if ($minimal) { $o->{rpmsrate_flags_chosen}{$_} = 0 foreach keys %{$o->{rpmsrate_flags_chosen}}; } else { - my $X = $o->{rpmsrate_flags_chosen}{X}; #- don't let setDefaultPackages modify this one + my $X = $o->{rpmsrate_flags_chosen}{X}; #- do not let setDefaultPackages modify this one install_any::setDefaultPackages($o, 'clean'); $o->{rpmsrate_flags_chosen}{X} = $X; } @@ -749,7 +749,7 @@ sub installPackages { } else { $r &&= $o->ask_okcancel('', N("Change your Cd-Rom! Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when done. -If you don't have it, press Cancel to avoid installation from this Cd-Rom.", $name), 1); +If you do not have it, press Cancel to avoid installation from this Cd-Rom.", $name), 1); } return $r; }; diff --git a/perl-install/interactive.pm b/perl-install/interactive.pm index b8fd188bd..c31d333d3 100644 --- a/perl-install/interactive.pm +++ b/perl-install/interactive.pm @@ -348,7 +348,7 @@ sub ask_from_normalize { $e->{disabled} ||= sub { 0 }; } - #- don't display empty lists and one element lists + #- do not display empty lists and one element lists @$l = grep { if ($_->{list} && $_->{not_edit} && !$_->{allow_empty_list}) { if (!@{$_->{list}}) { diff --git a/perl-install/interactive/http.pm b/perl-install/interactive/http.pm index 8a453616f..6825ee007 100644 --- a/perl-install/interactive/http.pm +++ b/perl-install/interactive/http.pm @@ -41,7 +41,7 @@ sub new { } sub end { - -e $pipe_r or return; # don't run this twice + -e $pipe_r or return; # do not run this twice my $q = CGI->new; cont_stdout("Exit"); print "It's done, thanks for playing", $q->end_html; @@ -74,7 +74,7 @@ sub ask_fromW { $e->{type} = 'list' if $e->{type} =~ /(icon|tree)list/; - #- combo doesn't exist, fallback to a sensible default + #- combo does not exist, fallback to a sensible default $e->{type} = $e->{not_edit} ? 'list' : 'entry' if $e->{type} eq 'combo'; if ($e->{type} eq 'bool') { @@ -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't go back"); + print $q->h1(N("Error")), $q->p("Sorry, you can not go back"); goto redisplay; } each_index { diff --git a/perl-install/interactive/newt.pm b/perl-install/interactive/newt.pm index 694c6c2c6..47d77b54a 100644 --- a/perl-install/interactive/newt.pm +++ b/perl-install/interactive/newt.pm @@ -16,7 +16,7 @@ my @wait_messages; sub new { if ($::isInstall) { - system('unicode_start'); #- don't use run_program, we must do it on current console + system('unicode_start'); #- do not use run_program, we must do it on current console { local $ENV{LC_CTYPE} = "en_US.UTF-8"; Newt::Init(1); @@ -135,7 +135,7 @@ sub ask_fromW_real { $e->{type} = 'list' if $e->{type} =~ /iconlist/; - #- combo doesn't exist, fallback to a sensible default + #- combo does not exist, fallback to a sensible default $e->{type} = $e->{not_edit} ? 'list' : 'entry' if $e->{type} eq 'combo'; my $changed = sub { diff --git a/perl-install/interactive/stdio.pm b/perl-install/interactive/stdio.pm index d9de3325f..553f3fec5 100644 --- a/perl-install/interactive/stdio.pm +++ b/perl-install/interactive/stdio.pm @@ -45,7 +45,7 @@ ask_fromW_begin: my ($e) = @_; $e->{type} = 'list' if $e->{type} =~ /(icon|tree)list/; - #- combo doesn't exist, fallback to a sensible default + #- combo does not exist, fallback to a sensible default $e->{type} = $e->{not_edit} ? 'list' : 'entry' if $e->{type} eq 'combo'; if ($e->{type} eq 'entry') { diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm index 30526a83c..2c36c381a 100644 --- a/perl-install/keyboard.pm +++ b/perl-install/keyboard.pm @@ -142,7 +142,7 @@ my %lang2keyboard = # USB kbd table # The numeric values are the bCountryCode field (5th byte) of HID descriptor -# NOTE: we don't trust when the layout is declared as us layout (0x21) +# NOTE: we do not trust when the layout is declared as us layout (0x21) # as most manufacturers just use that value when selling physical devices # with different layouts printed on the keys. my @usb2keyboard = @@ -225,7 +225,7 @@ arch() =~ /^sparc/ ? ( # old XKB layout # Japanese keyboard is dual latin/kana; but telling it here shows a # message to choose the switching key that is misleading, as input methods -# aren't automatically enabled when typing in kana +# are not automatically enabled when typing in kana "jp" => [ N_("_: keyboard\nJapanese 106 keys"), "jp106", "jp", 0 ], "kan" => [ N_("_: keyboard\nKannada"), "us", "kan", 1 ], # There is no XKB korean file yet; but using xmodmap one disables @@ -499,7 +499,7 @@ sub setup { return if arch() =~ /^sparc/; - #- Xpmac doesn't map keys quite right + #- Xpmac does not map keys quite right if (arch() =~ /ppc/ && !$::testing && $ENV{DISPLAY}) { log::l("Fixing Mac keyboard"); run_program::run('xmodmap', "-e", "keycode 59 = BackSpace"); @@ -526,7 +526,7 @@ sub setup { } elsif (-x '/bin/loadkeys') { run_program::run('loadkeys', $kmap); } else { - log::l("ERROR: can't load keymap"); + log::l("ERROR: can not load keymap"); } if (-x "/usr/X11R6/bin/setxkbmap") { diff --git a/perl-install/lang.pm b/perl-install/lang.pm index d59bd331f..fbf19d617 100644 --- a/perl-install/lang.pm +++ b/perl-install/lang.pm @@ -9,7 +9,7 @@ use log; #- extra distinctions) #- [0]: lang name in english #- [1]: transliterated locale name in the locale name (used for sorting) -#- [2]: default locale name to use for that language if there isn't +#- [2]: default locale name to use for that language if there is not #- an existing locale for the combination language+country choosen #- [3]: geographic groups that this language belongs to (for displaying #- in the menu grouped in smaller lists), 1=Europe, 2=Asia, 3=Africa, @@ -100,7 +100,7 @@ our %langs = ( 'oc' => [ 'Occitan', 'Occitan', 'oc_FR', '1 ', 'iso-8859-1', 'oc:fr_FR:fr' ], 'pa' => [ 'Punjabi', 'ZZ Punjabi', 'pa_IN', ' 2 ', 'unicode' ], # 'tl' in priority position for now, as 'ph' is not yet official and 'tl' -# is used instead. Monolingual window managers won't see the menus otherwise +# is used instead. Monolingual window managers will not see the menus otherwise 'ph' => [ 'Filipino', 'Filipino', 'ph_PH', ' 2 ', 'iso-8859-1', 'tl:ph' ], 'pl' => [ 'Polish', 'Polski', 'pl_PL', '1 ', 'iso-8859-2' ], 'pt' => [ 'Portuguese', 'Portugues', 'pt_PT', '1 3 ', 'iso-8859-15', 'pt_PT:pt:pt_BR' ], @@ -174,7 +174,7 @@ sub text_direction_rtl() { #- 4=Oceania&Pacific, 5=America (if you wonder, it's the order #- used in the olympic flag) #- -#- Note: for countries for which a glibc locale don't exist (yet) I tried to +#- Note: for countries for which a glibc locale do not exist (yet) I tried to #- put a locale that makes sense; and a '#' at the end of the line to show #- the locale is not the "correct" one. 'en_US' is used when no good choice #- is available. @@ -520,7 +520,7 @@ my %IM_config = ami => { XIM => 'Ami', #- NOTE: there are several possible versions of ami, for the different - #- desktops (kde, gnome, etc). So XIM_PROGRAM isn't defined; it will + #- desktops (kde, gnome, etc). So XIM_PROGRAM is not defined; it will #- be the xinitrc script, XIM section, that will choose the right one #- XIM_PROGRAM => 'ami', XMODIFIERS => '@im=Ami', @@ -841,7 +841,7 @@ my %charset2pango_font = ( 'iso-8859-7' => "Kerkis 14", 'jisx0208' => "Sans 14", #- Nimbus Sans L is missing some chars used by some cyrillic languages, - #- but tose haven't yet DrakX translations; it also misses vietnamese + #- but tose have not yet DrakX translations; it also misses vietnamese #- latin chars; all other latin and cyrillic are covered. 'default' => "Nimbus Sans L 12" ); @@ -872,7 +872,7 @@ sub set { } my $lang = $locale->{lang}; - exists $langs{$lang} or log::l("lang::set: trying to set to $lang but I don't know it!"), return; + exists $langs{$lang} or log::l("lang::set: trying to set to $lang but I do not know it!"), return; #- set all LC_* variables to a unique locale ("C"), and only redefine #- LC_COLLATE (for sorting) and LANGUAGE (for the po files) @@ -1086,7 +1086,7 @@ sub write { s/^(GreetString)=.*/$1=$welcome/; s/^(Language)=.*/$1=$locale->{lang}/; if (!member($kde_charset, 'iso8859-1', 'iso8859-15')) { - #- don't keep the default for those + #- do not keep the default for those my $font_list = $charset2kde_font{l2charset($locale->{lang})} || $charset2kde_font{default}; my $font_small = $font_list->[0]; my $font_huge = $font_small; @@ -1254,13 +1254,13 @@ sub check() { $err->("invalid charset $_ ($_ does not exist in \%charsets)") foreach difference2(\@wanted_charsets, [ keys %charsets ]); $err->("invalid charset $_ in \%charset2kde_font ($_ does not exist in \%charsets)") foreach difference2([ keys %charset2kde_font ], [ 'default', keys %charsets ]); - $err->("default locale $_->[1] of lang $_->[0] isn't listed in \@locales") + $err->("default locale $_->[1] of lang $_->[0] is not listed in \@locales") foreach grep { !member($_->[1], @locales) } map { [ $_, l2locale($_) ] } list_langs(); $err->("lang image for lang $_->[0] is missing (file $_->[1])") foreach grep { !(-e $_->[1]) } map { [ $_, "pixmaps/langs/lang-$_.png" ] } list_langs(); - $err->("default locale $_->[1] of country $_->[0] isn't listed in \@locales") + $err->("default locale $_->[1] of country $_->[0] is not listed in \@locales") foreach grep { !member($_->[1], @locales) } map { [ $_, c2locale($_) ] } list_countries(); diff --git a/perl-install/loopback.pm b/perl-install/loopback.pm index 3be5a87bb..a3610ddf0 100644 --- a/perl-install/loopback.pm +++ b/perl-install/loopback.pm @@ -93,7 +93,7 @@ sub getFree { } #- returns the size of the loopback file if it already exists -#- returns -1 is the loopback file can't be used +#- returns -1 is the loopback file can not be used sub verifFile { my ($dir, $file, $part) = @_; -e "$dir$file" and return -s "$dir$file"; diff --git a/perl-install/modules.pm b/perl-install/modules.pm index 6bd0026b6..5a1daaccc 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -138,7 +138,7 @@ sub load_category { eval { load_and_configure($conf, $_->{driver}, $_->{options}) }; $_->{error} = $@; - $_->{try} = 1 if member($_->{driver}, 'hptraid', 'ohci1394'); #- don't warn when this fails + $_->{try} = 1 if member($_->{driver}, 'hptraid', 'ohci1394'); #- do not warn when this fails !($_->{error} && $_->{try}); } probe_category($category), diff --git a/perl-install/modules/parameters.pm b/perl-install/modules/parameters.pm index 66590f7d8..fa8fcfae7 100644 --- a/perl-install/modules/parameters.pm +++ b/perl-install/modules/parameters.pm @@ -35,7 +35,7 @@ sub parameters { ($is_a_number, $min, $max) = ($1 ne 'string', $2, $3) if $1 ne 'char'; } elsif (/^($c_types),?\s*(.*)/s) { $_ = $2; - #- here "char" really are size-limited strings, modinfo doesn't display the size limit (but since we don't care about it, it doesn't matter :) + #- here "char" really are size-limited strings, modinfo does not display the size limit (but since we do not care about it, it does not matter :) $is_a_number = $1 ne 'string' if $1 ne 'char'; } else { #- for things like "no format character" or "unknown format character" diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm index dd3b78be8..d79eaa020 100644 --- a/perl-install/mouse.pm +++ b/perl-install/mouse.pm @@ -295,7 +295,7 @@ sub detect { my $univ_mouse = fullname2mouse('Universal|Any PS/2 & USB mice', wacom => \@wacom); if (any { m!^N: Name="(?:SynPS/2 Synaptics TouchPad|AlpsPS/2 ALPS TouchPad)"$! } @input_devices) { $synaptics_mouse = fullname2mouse('Universal|Synaptics Touchpad'); - $::isInstall and $synaptics_mouse->{alternate_install} = $univ_mouse; #- don't try to use synpatics at beginning of install + $::isInstall and $synaptics_mouse->{alternate_install} = $univ_mouse; #- do not try to use synpatics at beginning of install $mouse_nb < 2 and return $synaptics_mouse; $univ_mouse->{auxmouse} = $synaptics_mouse; } diff --git a/perl-install/mygtk2.pm b/perl-install/mygtk2.pm index 30c3efcdc..6e0d88c68 100644 --- a/perl-install/mygtk2.pm +++ b/perl-install/mygtk2.pm @@ -215,7 +215,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't find $name"); + my $file = _find_imgfile($name) or internal_error("can not find $name"); $w = Gtk2::Gdk::Pixbuf->new_from_file($file); } $w; @@ -230,11 +230,11 @@ sub _gtk__Image { } if (my $name = delete $opts->{file}) { - my $file = _find_imgfile(may_apply($w->{format}, $name)) or internal_error("can't find $name"); + my $file = _find_imgfile(may_apply($w->{format}, $name)) or internal_error("can not find $name"); $w->set_from_file($file); } 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't find $$file_ref"); + my $file = _find_imgfile(may_apply($w->{format}, $$file_ref)) or internal_error("can not find $$file_ref"); $w->set_from_file($file); }; gtkval_register($w, $file_ref, $set); @@ -602,7 +602,7 @@ sub _text_insert { $buffer->set_text($t); } #- the following line is needed to move the cursor to the beginning, so that if the - #- textview has a scrollbar, it won't scroll to the bottom when focusing (#3633) + #- textview has a scrollbar, it will not scroll to the bottom when focusing (#3633) $buffer->place_cursor($buffer->get_start_iter); $textview->set_wrap_mode($opts{wrap_mode} || 'word'); $textview->set_editable($opts{editable} || 0); diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm index 49850d1fa..a29f80cdd 100644 --- a/perl-install/network/adsl.pm +++ b/perl-install/network/adsl.pm @@ -35,7 +35,7 @@ sub get_wizard { name => N("Connect to the Internet") . "\n\n" . N("The most common way to connect with adsl is pppoe. Some connections use PPTP, a few use DHCP. -If you don't know, choose 'use PPPoE'"), +If you do not know, choose 'use PPPoE'"), data => [ { label => N("ADSL connection type:"), val => \$wiz->{var}{adsl}{type}, list => [ sort values %l ] }, @@ -151,7 +151,7 @@ sync speedtouch => { modules => [ qw(speedtch) ], - #- won't call pppd since we've just written ONBOOT=no, only runs modem_run + #- will not call pppd since we've just written ONBOOT=no, only runs modem_run start => '/usr/bin/speedtouch-start --boot', overide_script => 1, server => { @@ -331,7 +331,7 @@ user "$adsl->{login}" s/DNS2=.*\n/DNS2=$netc->{dnsServer3}\n/; } "$::prefix/etc/ppp/pppoe.conf"; } else { - log::l("can't find pppoe.conf, make sure the rp-pppoe package is installed"); + log::l("can not find pppoe.conf, make sure the rp-pppoe package is installed"); } } diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm index 13e61f9f4..ec037fff2 100644 --- a/perl-install/network/ethernet.pm +++ b/perl-install/network/ethernet.pm @@ -131,7 +131,7 @@ sub configure_eth_aliases { my @pcmcia = detect_devices::pcmcia_probe(); foreach my $card (get_eth_cards($modules_conf)) { if (any { $_->{device} eq $card->[0] } @pcmcia) { - #- don't write aliases for pcmcia cards, or cardmgr won't be loaded + #- do not write aliases for pcmcia cards, or cardmgr will not be loaded $modules_conf->remove_alias($card->[0]); } else { $modules_conf->set_alias($card->[0], $card->[1]); diff --git a/perl-install/network/ipsec.pm b/perl-install/network/ipsec.pm index bc6706c50..c0ee6e2fb 100644 --- a/perl-install/network/ipsec.pm +++ b/perl-install/network/ipsec.pm @@ -373,7 +373,7 @@ sub write_racoon_conf { } } -open(my $ADD, "> $racoon_conf") or die "Can't open the $racoon_conf file for writing"; +open(my $ADD, "> $racoon_conf") or die "Can not open the $racoon_conf file for writing"; print $ADD "$display\n"; } @@ -509,7 +509,7 @@ sub read_ipsec_conf { local $_; if ($kernel_version < 2.5) { #- kernel 2.4 part ------------------------------- - open(my $LIST, "< $ipsec_conf"); #or die "Can't open the $ipsec_conf file for reading"; + open(my $LIST, "< $ipsec_conf"); #or die "Can not open the $ipsec_conf file for reading"; while (<$LIST>) { chomp($_); $line = $_; @@ -551,7 +551,7 @@ sub read_ipsec_conf { #- kernel 2.6 part ------------------------------- my @mylist; my $myline = ""; - open(my $LIST, "< $ipsec_conf"); #or die "Can't open the $ipsec_conf file for reading"; + open(my $LIST, "< $ipsec_conf"); #or die "Can not open the $ipsec_conf file for reading"; while (<$LIST>) { chomp($_); $myline = $_; @@ -591,7 +591,7 @@ sub write_ipsec_conf { my ($ipsec_conf, $ipsec, $kernel_version) = @_; if ($kernel_version < 2.5) { #- kernel 2.4 part ------------------------------- - open(my $ADD, "> $ipsec_conf") or die "Can't open the $ipsec_conf file for writing"; + open(my $ADD, "> $ipsec_conf") or die "Can not open the $ipsec_conf file for writing"; foreach my $key1 (ikeys %$ipsec) { print $ADD "$ipsec->{$key1}\n" if ! $ipsec->{$key1}{1}; foreach my $key2 (ikeys %{$ipsec->{$key1}}) { @@ -624,7 +624,7 @@ sub write_ipsec_conf { $ipsec->{$key1}{level} . ";\n" }; } - open(my $ADD, "> $ipsec_conf") or die "Can't open the $ipsec_conf file for writing"; + open(my $ADD, "> $ipsec_conf") or die "Can not open the $ipsec_conf file for writing"; print $ADD $display; } } diff --git a/perl-install/network/isdn.pm b/perl-install/network/isdn.pm index b1439bbf7..f631c5c49 100644 --- a/perl-install/network/isdn.pm +++ b/perl-install/network/isdn.pm @@ -165,7 +165,7 @@ sub get_cards_by_type { sub get_cards() { my %buses = ( - isa => N("ISA / PCMCIA") . "/" . N("I don't know"), + isa => N("ISA / PCMCIA") . "/" . N("I do not know"), pci => N("PCI"), usb => N("USB"), ); @@ -191,7 +191,7 @@ sub get_capi_card { #- check if the capi driver is available unless (is_module_installed($capi_card->{driver}) || ($capi_card->{packages} = $in->do_pkgs->check_kernel_module_packages("$capi_card->{driver}-kernel"))) { - log::explanations("a capi driver ($capi_card->{driver}) exists to replace $isdn->{driver}, but it isn't installed and no packages provide it"); + log::explanations("a capi driver ($capi_card->{driver}) exists to replace $isdn->{driver}, but it is not installed and no packages provide it"); return; } diff --git a/perl-install/network/modem.pm b/perl-install/network/modem.pm index 18755d0cb..871019159 100644 --- a/perl-install/network/modem.pm +++ b/perl-install/network/modem.pm @@ -73,7 +73,7 @@ sub ppp_configure { $dev =~ s!^/dev/!!; any::devfssymlinkf({ device => $dev }, 'modem'); #- add a specific udev script in addition to the udev rules file - #- (ttySL0 is a symlink, udev won't be called when it's created) + #- (ttySL0 is a symlink, udev will not be called when it's created) my $udev_conf = "$::prefix/etc/udev/conf.d/modem.conf"; output_p($udev_conf, "ln -sf $dev /dev/modem\n"); chmod 0755, $udev_conf; diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index 5d2df0a9f..54afc5add 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -342,7 +342,7 @@ sub real_main { $netcnx->{isdn_external}{device} = network::modem::first_modem($netc); network::isdn::read_config($netcnx->{isdn_external}); #- FIXME: seems to be specific to ZyXEL Adapter Omni.net/TA 128/Elite 2846i - #- it doesn't even work with TA 128 modems + #- it does not even work with TA 128 modems #- http://bugs.mandrakelinux.com/query.php?bug=1033 $netcnx->{isdn_external}{special_command} = 'AT&F&O2B40'; require network::modem; @@ -385,7 +385,7 @@ sub real_main { isdn_ask_step_1: my $e = $in->ask_from_list_(N("ISDN Configuration"), $label . "\n" . N("What kind of card do you have?"), - [ N_("ISA / PCMCIA"), N_("PCI"), N_("USB"), N_("I don't know") ] + [ N_("ISA / PCMCIA"), N_("PCI"), N_("USB"), N_("I do not know") ] ) or return; isdn_ask_step_1b: if ($e =~ /PCI/) { @@ -450,7 +450,7 @@ If you have a PCMCIA card, you have to know the \"irq\" and \"io\" of your card. isdn_db => { - name => N("ISDN Configuration") . "\n\n" . N("Select your provider.\nIf it isn't listed, choose Unlisted."), + name => N("ISDN Configuration") . "\n\n" . N("Select your provider.\nIf it is not listed, choose Unlisted."), data => sub { [ { label => N("Provider:"), type => "list", val => \$provider, separator => '|', list => [ N("Unlisted - edit manually"), network::isdn::read_providers_backend() ] } ]; @@ -467,7 +467,7 @@ If you have a PCMCIA card, you have to know the \"irq\" and \"io\" of your card. no_supported_winmodem => { - name => N("Warning") . "\n\n" . N("Your modem isn't supported by the system. + name => N("Warning") . "\n\n" . N("Your modem is not supported by the system. Take a look at http://www.linmodems.org"), end => 1, }, @@ -803,7 +803,7 @@ and copy the mgmt.o in /usr/share/speedtouch", 'http://prdownloads.sourceforge.n name => N("Connect to the Internet") . "\n\n" . N("The most common way to connect with adsl is pppoe. Some connections use PPTP, a few use DHCP. -If you don't know, choose 'use PPPoE'"), +If you do not know, choose 'use PPPoE'"), data => [ { text => N("ADSL connection type:"), val => \$adsl_type, type => "list", list => [ sort { $adsl_types{$a} cmp $adsl_types{$b} } keys %adsl_types ], @@ -1129,7 +1129,7 @@ See iwpriv(8) man page for further information."), "ENABLE_$ethntf->{DEVICE}" => "y" }); my $wlan_ssid_file = "$::prefix/etc/wlan/wlancfg-$ethntf->{WIRELESS_ESSID}"; - #- copy default settings for this ESSID if config file doesn't exist + #- copy default settings for this ESSID if config file does not exist -f $wlan_ssid_file or cp_f("$::prefix/etc/wlan/wlancfg-DEFAULT", $wlan_ssid_file); #- enable/disable encryption $update_vars_in_wlan->($wlan_ssid_file, @@ -1327,7 +1327,7 @@ It is not necessary on most networks."), name => sub { $up ? N("The system is now connected to the Internet.") . if_($::isInstall, N("For security reasons, it will be disconnected now.")) : - N("The system doesn't seem to be connected to the Internet. + N("The system does not seem to be connected to the Internet. Try to reconfigure your connection."); }, no_back => 1, @@ -1346,7 +1346,7 @@ Try to reconfigure your connection."); "), if_($::isStandalone && $in->isa('interactive::gtk'), N("After this is done, we recommend that you restart your X environment to avoid any hostname-related problems."))) : N("Problems occurred during configuration. -Test your connection via net_monitor or mcc. If your connection doesn't work, you might want to relaunch the configuration."); +Test your connection via net_monitor or mcc. If your connection does not work, you might want to relaunch the configuration."); }, end => 1, }, diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm index febaa632d..ed5fa646d 100644 --- a/perl-install/network/network.pm +++ b/perl-install/network/network.pm @@ -461,7 +461,7 @@ sub configureNetwork2 { } else { #- disable zeroconf require services; - #- write blank hostname so that drakconnect doesn't assume zeroconf is enabled + #- write blank hostname so that drakconnect does not assume zeroconf is enabled -f "$etc/tmdns.conf" and write_zeroconf("$etc/tmdns.conf", ''); if (-f "$etc/rc.d/init.d/tmdns") { services::stop("tmdns"); diff --git a/perl-install/network/smb.pm b/perl-install/network/smb.pm index 57eba8234..af201fe68 100644 --- a/perl-install/network/smb.pm +++ b/perl-install/network/smb.pm @@ -157,7 +157,7 @@ sub write_smb_conf { my ($domain) = @_; #- was going to just have a canned config in samba-winbind - #- and replace the domain, but sylvestre/buchan didn't bless it yet + #- and replace the domain, but sylvestre/buchan did not bless it yet my $f = "$::prefix/etc/samba/smb.conf"; rename $f, "$f.orig"; @@ -188,7 +188,7 @@ sub write_smb_ads_conf { my ($domain, $realm) = @_; #- was going to just have a canned config in samba-winbind - #- and replace the domain, but sylvestre/buchan didn't bless it yet + #- and replace the domain, but sylvestre/buchan did not bless it yet my $f = "$::prefix/etc/samba/smb.conf"; rename $f, "$f.orig"; diff --git a/perl-install/network/test.pm b/perl-install/network/test.pm index 7c25fce05..cc043b19c 100644 --- a/perl-install/network/test.pm +++ b/perl-install/network/test.pm @@ -19,7 +19,7 @@ sub test_synchronous { $o->{done} = 1; } -#- launch asynchronous test, won't hang +#- launch asynchronous test, will not hang sub start { my ($o) = @_; $o->{done} = 0; @@ -95,7 +95,7 @@ sub update_status { my ($o) = @_; if ($o->{kid}) { my $fd = $o->{kid}{fd}; - fcntl($fd, c::F_SETFL(), c::O_NONBLOCK()) or die "can't fcntl F_SETFL: $!"; + fcntl($fd, c::F_SETFL(), c::O_NONBLOCK()) or die "can not fcntl F_SETFL: $!"; local $| = 1; if (defined(my $output = <$fd>)) { ($o->{address}, $o->{ping}) = $output =~ /^([\d\.]+)\|([\d\.,]+)*$/; diff --git a/perl-install/network/tools.pm b/perl-install/network/tools.pm index 8167c9cee..e82afd16f 100644 --- a/perl-install/network/tools.pm +++ b/perl-install/network/tools.pm @@ -110,7 +110,7 @@ sub connected_bg__raw { local $| = 1; if (ref($kid_pipe) && ref($$kid_pipe)) { my $fd = $$kid_pipe->{fd}; - fcntl($fd, c::F_SETFL(), c::O_NONBLOCK()) or die "can't fcntl F_SETFL: $!"; + fcntl($fd, c::F_SETFL(), c::O_NONBLOCK()) or die "can not fcntl F_SETFL: $!"; my $a = <$fd>; $$status = $a if defined $a; } else { $$kid_pipe = check_link_beat() } diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm index 6af7d26bc..d9f9c1bea 100644 --- a/perl-install/partition_table.pm +++ b/perl-install/partition_table.pm @@ -346,7 +346,7 @@ sub will_tell_kernel { my $part_number; if ($o_part) { ($part_number) = $o_part->{device} =~ /(\d+)$/ or - #- don't die, it occurs when we zero_MBR_and_dirty a raw_lvm_PV + #- do not die, it occurs when we zero_MBR_and_dirty a raw_lvm_PV log::l("ERROR: will_tell_kernel bad device " . description($o_part)), return; } @@ -468,7 +468,7 @@ sub remove { my ($first, $second, $third) = map { $_->{normal} } @{$hd->{extended} || []}; if ($third && $first eq $part) { - die "Can't handle removing hda5 when hda6 is not the second partition" if $second->{start} > $third->{start}; + die "Can not handle removing hda5 when hda6 is not the second partition" if $second->{start} > $third->{start}; } #- otherwise search it in extended partitions @@ -507,7 +507,7 @@ sub add_extended { my $e = $hd->{primary}{extended}; if ($e && !verifyInside($part, $e)) { - #-die "sorry, can't add outside the main extended partition" unless $::unsafe; + #-die "sorry, can not 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; @@ -517,7 +517,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't use it. +N("You have a hole in your partition table but I can not use it. The only solution is to move your primary partitions to have the hole next to the extended partitions."); } } @@ -611,7 +611,7 @@ sub load { $h{totalsectors} == $hd->{totalsectors} or $b_force or cdie "bad totalsectors"; - #- unsure we don't modify totalsectors + #- unsure we do not modify totalsectors local $hd->{totalsectors}; @$hd{@fields2save} = @$h; diff --git a/perl-install/partition_table/gpt.pm b/perl-install/partition_table/gpt.pm index 3e0ac631b..d5c05e8de 100644 --- a/perl-install/partition_table/gpt.pm +++ b/perl-install/partition_table/gpt.pm @@ -119,11 +119,11 @@ sub read_partitionEntries { my ($info, $F) = @_; my $tmp; - c::lseek_sector(fileno($F), $info->{partitionEntriesLBA}, 0) or die "can't seek to sector partitionEntriesLBA"; + c::lseek_sector(fileno($F), $info->{partitionEntriesLBA}, 0) or die "can not seek to sector partitionEntriesLBA"; sysread $F, $tmp, psizeof($partitionEntry_format) * $info->{nbPartitions} or die "error while reading partition table in sector $info->{partitionEntriesLBA}"; $info->{partitionEntriesCRC32} == crc32($tmp) or die "bad partition entries checksum"; - c::lseek_sector(fileno($F), $info->{partitionEntriesLBA}, 0) or die "can't seek to sector partitionEntriesLBA"; + c::lseek_sector(fileno($F), $info->{partitionEntriesLBA}, 0) or die "can not seek to sector partitionEntriesLBA"; my %gpt_types_rev = reverse %gpt_types; my @pt = map { diff --git a/perl-install/partition_table/mac.pm b/perl-install/partition_table/mac.pm index 1c792519a..fc0310b74 100644 --- a/perl-install/partition_table/mac.pm +++ b/perl-install/partition_table/mac.pm @@ -236,7 +236,7 @@ sub write($$$;$) { }; } - # Since we didn't create any new drivers, let's try and match up our driver records with out partitons and see if any are missing. + # Since we did not create any new drivers, let's try and match up our driver records with out partitons and see if any are missing. $info->{bzDrvrCnt} = 0; my @ddstowrite; foreach my $dd (@{$info->{ddMap}}) { diff --git a/perl-install/partition_table/raw.pm b/perl-install/partition_table/raw.pm index eab243cd6..28f0fc797 100644 --- a/perl-install/partition_table/raw.pm +++ b/perl-install/partition_table/raw.pm @@ -214,7 +214,7 @@ sub zero_MBR_and_dirty { #- 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't be written to (especially for Smartmedia) +#- return false if the device can not be written to (especially for Smartmedia) sub test_for_bad_drives { my ($hd) = @_; @@ -223,19 +223,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't open device"); + my $F = openit($hd, $::testing ? 0 : 2) or error(openit($hd) ? 'write' : 'read', "can not 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't even read ($!)"); + &$seek; sysread $F, $tmp, $SECTORSIZE or error('read', "can not even read ($!)"); return if $hd->{readonly} || $::testing; - &$seek; syswrite $F, $tmp or error('write', "can't even write ($!)"); + &$seek; syswrite $F, $tmp or error('write', "can not even write ($!)"); my $tmp2; - &$seek; sysread $F, $tmp2, $SECTORSIZE or die "test_for_bad_drives: can't even read again ($!)"; + &$seek; sysread $F, $tmp2, $SECTORSIZE or die "test_for_bad_drives: can not 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 572e55b10..d42dad558 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -94,7 +94,7 @@ sub isSupplCDMedium($) { #- TODO BEFORE TODO #- size and correction size functions for packages. my $B = 1.20873; -my $C = 4.98663; #- doesn't take hdlist's into account as getAvailableSpace will do it. +my $C = 4.98663; #- does not take hdlist's into account as getAvailableSpace will do it. sub correctSize { $B * $_[0] + $C } sub invCorrectSize { ($_[0] - $C) / $B } @@ -592,7 +592,7 @@ sub read_rpmsrate { my @m3 = ((grep { !/^\d$/ } @m), @m2); if (member('INSTALL', @m3)) { member('NOCOPY', @m3) or push @{$packages->{needToCopy} ||= []}, $_; - next; #- don't need to put INSTALL flag for a package. + next; #- do not need to put INSTALL flag for a package. } if (member('PRINTER', @m3)) { push @{$packages->{needToCopy} ||= []}, $_; @@ -600,7 +600,7 @@ sub read_rpmsrate { if ($p->rate) { my @m4 = $p->rflags; if ((@m3 > 1 || @m4 > 1) && "@m3[1..$#m3]" ne "@m4[1..$#m4]") { - log::l("can't handle complicate flags for packages appearing twice ($_)"); + log::l("can not handle complicate flags for packages appearing twice ($_)"); $fatal_error++; } log::l("package $_ appearing twice with different rates ($rate != " . $p->rate . ")") if $rate != $p->rate; @@ -626,7 +626,7 @@ sub readCompssUsers { my ($file) = @_; my $f = install_any::getFile($file) - or do { log::l("can't find $file: $!"); return (undef, undef) }; + or do { log::l("can not find $file: $!"); return (undef, undef) }; my ($compssUsers, $gtk_display_compssUsers) = eval join('', <$f>); if ($@) { log::l("ERROR: bad $file: $@"); @@ -1138,7 +1138,7 @@ sub install($$$;$$) { $trans->set_script_fd(fileno $LOG); log::l("rpm transactions start"); - my $fd; #- since we return the "fileno", perl doesn't know we're still using it, and so closes it, and :-( + my $fd; #- since we return the "fileno", perl does not know we're still using it, and so closes it, and :-( my @probs = $trans->run($packages, force => 1, nosize => 1, callback_open => sub { my ($data, $_type, $id) = @_; my $pkg = defined $id && $data->{depslist}[$id]; diff --git a/perl-install/printer/data.pm b/perl-install/printer/data.pm index 75616daf5..6e1dc4041 100644 --- a/perl-install/printer/data.pm +++ b/perl-install/printer/data.pm @@ -37,7 +37,7 @@ our %spoolers = ('pdq' => { 'help' => "/usr/bin/pdq -h -P %s 2>&1 |", 'print_command' => 'lpr-pdq', 'print_gui' => 'xpdq', - 'long_name' => N("PDQ - Print, Don't Queue"), + 'long_name' => N("PDQ - Print, Do not Queue"), 'short_name' => N("PDQ"), 'local_queues' => 1, 'packages2add' => [ [ 'pdq' ], [qw(/usr/bin/pdq /usr/X11R6/bin/xpdq)] ], diff --git a/perl-install/printer/main.pm b/perl-install/printer/main.pm index 102d42100..28ee79cb5 100644 --- a/perl-install/printer/main.pm +++ b/perl-install/printer/main.pm @@ -462,7 +462,7 @@ sub read_printer_db { # No local queues available in daemon-less CUPS mode return 1 if $spooler eq "rcups"; - my $DBPATH; #- don't have to do close ... and don't modify globals at least + my $DBPATH; #- do not have to do close ... and do not modify globals at least # Generate the Foomatic printer/driver overview, read it from the # appropriate file when it is already generated open($DBPATH, ($::testing ? $::prefix : "chroot $::prefix/ ") . #-# @@ -1688,7 +1688,7 @@ sub poll_ppd_base { #- to make sure the file /etc/cups/ppds.dat is no more modified. #- If cups continue to modify it (because it reads the ppd files #- available), the poll_ppd_base program simply cores :-) - # else cups will not be happy! and ifup lo don't run ? + # else cups will not be happy! and ifup lo do not run ? run_program::rooted($::prefix, 'ifconfig', 'lo', '127.0.0.1'); printer::services::start_not_running_service("cups"); my $driversthere = scalar(keys %thedb); @@ -2520,7 +2520,7 @@ init.version=2 "# to delete and re-configure this device.\n"; if ($bus eq "par") { print $CONFIG - "# Comment out if you don't care what model is really connected to this\n" . + "# Comment out if you do not care what model is really connected to this\n" . "# parallel port.\n"; } } @@ -2551,7 +2551,7 @@ init.version=2 "# Standard options passed to ptal-mlcd:\n" . "init.mlcd.append+="; if ($bus eq "usb") { - # Important: don't put more quotes around /dev/usb/lp[0-9]*, + # Important: do not put more quotes around /dev/usb/lp[0-9]*, # because ptal-mlcd currently does no globbing: print $CONFIG "-device /dev/usb/lp0 /dev/usb/lp1 /dev/usb/lp2 /dev/usb/lp3 /dev/usb/lp4 /dev/usb/lp5 /dev/usb/lp6 /dev/usb/lp7 /dev/usb/lp8 /dev/usb/lp9 /dev/usb/lp10 /dev/usb/lp11 /dev/usb/lp12 /dev/usb/lp13 /dev/usb/lp14 /dev/usb/lp15"; } elsif ($bus eq "par") { @@ -2577,7 +2577,7 @@ init.version=2 } else { print $CONFIG "\n" . - "# By default ptal-printd isn't started for hpjd: devices.\n" . + "# By default ptal-printd is not started for hpjd: devices.\n" . "# If for some reason you want to start it for this device, then\n" . "# uncomment the following line:\n" . "init.printd.start=1\n"; @@ -2665,7 +2665,7 @@ sub config_sane() { return if (! -f "$::prefix/etc/sane.d/dll.conf"); return if member("hpoj", chomp_(cat_("$::prefix/etc/sane.d/dll.conf"))); eval { append_to_file("$::prefix/etc/sane.d/dll.conf", "hpoj\n") } or - die "can't write SANE config in /etc/sane.d/dll.conf: $!"; + die "can not write SANE config in /etc/sane.d/dll.conf: $!"; } sub config_photocard() { @@ -2689,7 +2689,7 @@ EOF # modify the existing one my $mtoolsfmconf; if (-f "$::prefix/etc/mtoolsfm.conf") { - $mtoolsfmconf = cat_("$::prefix/etc/mtoolsfm.conf") or die "can't read MToolsFM config in $::prefix/etc/mtoolsfm.conf: $!"; + $mtoolsfmconf = cat_("$::prefix/etc/mtoolsfm.conf") or die "can not read MToolsFM config in $::prefix/etc/mtoolsfm.conf: $!"; my $alloweddrives = lc($1) if $mtoolsfmconf =~ m/^\s*DRIVES\s*=\s*"([A-Za-z ]*)"/m; foreach my $letter ("p", "q", "r", "s") { $alloweddrives .= $letter if $alloweddrives !~ /$letter/; diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm index 80183e877..2c850833c 100644 --- a/perl-install/printer/printerdrake.pm +++ b/perl-install/printer/printerdrake.pm @@ -686,7 +686,7 @@ sub first_time_dialog { # Do we have a local network? - # If networking is configured, start it, but don't ask the user to + # If networking is configured, start it, but do not ask the user to # configure networking. my $havelocalnetworks = check_network($printer, $in, $upNetwork, 1) && @@ -906,7 +906,7 @@ sub wizard_welcome { my $autodetectlocal = 0; my $autodetectnetwork = 0; my $autodetectsmb = 0; - # If networking is configured, start it, but don't ask the user to + # If networking is configured, start it, but do not ask the user to # configure networking. my $havelocalnetworks; if ($printer->{expert}) { @@ -950,7 +950,7 @@ This wizard will help you to install your printer(s) connected to this computer, Please plug in and turn on all printers connected to this machine so that it/they can be auto-detected. Also your network printer(s) and your Windows machines must be connected and turned on. -Note that auto-detecting printers on the network takes longer than the auto-detection of only the printers connected to this machine. So turn off the auto-detection of network and/or Windows-hosted printers when you don't need it. +Note that auto-detecting printers on the network takes longer than the auto-detection of only the printers connected to this machine. So turn off the auto-detection of network and/or Windows-hosted printers when you do not need it. Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want to set up your printer(s) now.") : N(" Welcome to the Printer Setup Wizard @@ -967,7 +967,7 @@ This wizard will help you to install your printer(s) connected to this computer If you have printer(s) connected to this machine, Please plug it/them in on this computer and turn it/them on so that it/they can be auto-detected. Also your network printer(s) must be connected and turned on. -Note that auto-detecting printers on the network takes longer than the auto-detection of only the printers connected to this machine. So turn off the auto-detection of network printers when you don't need it. +Note that auto-detecting printers on the network takes longer than the auto-detection of only the printers connected to this machine. So turn off the auto-detection of network printers when you do not need it. Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want to set up your printer(s) now.") : N(" Welcome to the Printer Setup Wizard @@ -1976,7 +1976,7 @@ sub setup_common { my $isHPOJ = 0; my $w; if ($device =~ m!^/dev/! || $device =~ m!^socket://!) { - # Ask user whether he has a multi-function device when he didn't + # Ask user whether he has a multi-function device when he did not # do auto-detection or when auto-detection failed my $searchunknown = N("Unknown model"); if (!$do_auto_detect || @@ -2032,7 +2032,7 @@ sub setup_common { if ($ptaldevice) { # HPOJ has determined the device name, make use of it if we - # didn't know it before + # did not know it before if (!$do_auto_detect || !$makemodel || $makemodel eq $searchunknown || @@ -2316,7 +2316,7 @@ sub setup_common { } else { $dbmakemodel = $entry; } - # Don't try to match if the database entry does not provide + # Do not try to match if the database entry does not provide # make and model next unless $dbmakemodel; # If make and model match exactly, we have found the correct @@ -2758,7 +2758,7 @@ sub get_printer_info { ($printer->{configured}{$queue}{queuedata}{foomatic} || $printer->{configured}{$queue}{queuedata}{ppd})) { if (!$newdriver) { - # The user didn't change the printer/driver + # The user did not change the printer/driver $printer->{ARGS} = $printer->{configured}{$queue}{args}; } elsif ($printer->{currentqueue}{foomatic}) { # The queue was already configured with Foomatic ... @@ -4271,7 +4271,7 @@ sub mainwindow_interactive { while (1) { my ($queue, $newcursorpos) = ('', 0); - # If networking is configured, start it, but don't ask the + # If networking is configured, start it, but do not ask the # user to configure networking. We want to know whether we # have a local network to suppress some buttons when there is # no network diff --git a/perl-install/raid.pm b/perl-install/raid.pm index f8dec7961..32a57f787 100644 --- a/perl-install/raid.pm +++ b/perl-install/raid.pm @@ -39,7 +39,7 @@ sub new { sub add { my ($md_part, $part) = @_; - $md_part->{isMounted} and die N("Can't add a partition to _formatted_ RAID %s", $md_part->{device}); + $md_part->{isMounted} and die N("Can not add a partition to _formatted_ RAID %s", $md_part->{device}); inactivate_and_dirty($md_part); set_isFormatted($part, 0); $part->{raid} = $md_part->{device}; diff --git a/perl-install/resize_fat/boot_sector.pm b/perl-install/resize_fat/boot_sector.pm index ffb1b1f34..dd09755cc 100644 --- a/perl-install/resize_fat/boot_sector.pm +++ b/perl-install/resize_fat/boot_sector.pm @@ -87,7 +87,7 @@ sub read($) { $fs->{nb_fat_entries} = divide($fs->{fat_size}, $fs->{fs_type_size} / 8); - #- - 2 because clusters 0 & 1 doesn't exist + #- - 2 because clusters 0 & 1 does not exist $fs->{nb_clusters} = divide($fs->{nb_sectors} * $fs->{sector_size} - $fs->{cluster_offset}, $fs->{cluster_size}) - 2; $fs->{dir_entries_per_cluster} = divide($fs->{cluster_size}, psizeof($format)); diff --git a/perl-install/resize_fat/fat.pm b/perl-install/resize_fat/fat.pm index c08232628..2bceb129d 100644 --- a/perl-install/resize_fat/fat.pm +++ b/perl-install/resize_fat/fat.pm @@ -30,7 +30,7 @@ sub write($) { #- allocates where all the clusters will be moved to. Clusters before cut_point #- remain in the same position, however cluster that are part of a directory are #- moved regardless (this is a mechanism to prevent data loss) (cut_point is the -#- first cluster that won't occur in the new fs) +#- first cluster that will not occur in the new fs) sub allocate_remap { my ($fs, $cut_point) = @_; my ($cluster, $new_cluster); diff --git a/perl-install/resize_fat/main.pm b/perl-install/resize_fat/main.pm index 3e82c71a3..726875837 100644 --- a/perl-install/resize_fat/main.pm +++ b/perl-install/resize_fat/main.pm @@ -71,7 +71,7 @@ sub construct_dir_tree { if ($resize_fat::isFAT32) { #- fat32's root must remain in the first 64k clusters - #- so don't set it as DIRECTORY, it will be specially handled + #- so do not set it as DIRECTORY, it will be specially handled resize_fat::c_rewritten::set_flag($fs->{fat32_root_dir_cluster}, $resize_fat::any::FREE); } @@ -158,7 +158,7 @@ sub resize { resize_fat::boot_sector::write($fs); - $resize_fat::isFAT32 and eval { resize_fat::info_sector::write($fs) }; #- doesn't matter if this fails - its pretty useless! + $resize_fat::isFAT32 and eval { resize_fat::info_sector::write($fs) }; #- does not matter if this fails - its pretty useless! MDK::Common::System::sync(); close $fs->{fd}; diff --git a/perl-install/run_program.pm b/perl-install/run_program.pm index cb2ea8eb8..e431bf8f8 100644 --- a/perl-install/run_program.pm +++ b/perl-install/run_program.pm @@ -106,15 +106,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't output in $stderr (mode `$stderr_mode')"); + open STDERR, "$stderr_mode $stderr" or die_exit("run_program can not output in $stderr (mode `$stderr_mode')"); } elsif ($::isInstall) { - open STDERR, ">> /tmp/ddebug.log" or open STDOUT, ">> /dev/tty7" or die_exit("run_program can't log, give me access to /tmp/ddebug.log"); + 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"); } if ($stdout && $stdout eq 'STDOUT') { } elsif ($stdout) { - open STDOUT, "$stdout_mode $stdout" or die_exit("run_program can't output in $stdout (mode `$stdout_mode')"); + open STDOUT, "$stdout_mode $stdout" or die_exit("run_program can not output in $stdout (mode `$stdout_mode')"); } elsif ($::isInstall) { - open STDOUT, ">> /tmp/ddebug.log" or open STDOUT, ">> /dev/tty7" or die_exit("run_program can't log, give me access to /tmp/ddebug.log"); + 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"); } $root and chroot $root; diff --git a/perl-install/services.pm b/perl-install/services.pm index 696af6643..9d356756d 100644 --- a/perl-install/services.pm +++ b/perl-install/services.pm @@ -65,8 +65,8 @@ numlock => N_("Automatically switch on numlock key locker under console and Xorg at boot."), oki4daemon => N_("Support the OKI 4w and compatible winprinters."), pcmcia => N_("PCMCIA support is usually to support things like ethernet and -modems in laptops. It won't get started unless configured so it is safe to have -it installed on machines that don't need it."), +modems in laptops. It will not get started unless configured so it is safe to have +it installed on machines that do not need it."), portmap => N_("The portmapper manages RPC connections, which are used by protocols such as NFS and NIS. The portmap server must be running on machines which act as servers for protocols which make use of the RPC mechanism."), diff --git a/perl-install/share/advertising/05.pl b/perl-install/share/advertising/05.pl index 511ecad64..f527b58e7 100644 --- a/perl-install/share/advertising/05.pl +++ b/perl-install/share/advertising/05.pl @@ -14,8 +14,8 @@ $border = 10; #- for leftish text ' ', N("You are now installing <b>Mandrakelinux Download</b>. This is the free version that Mandrakesoft wants to keep <b>available to everyone</b>."), ' ', - N("The Download version <b>cannot include</b> all the software that is not open source. Therefore, you won't find in the Download version:"), + N("The Download version <b>cannot include</b> all the software that is not open source. Therefore, you will not find in the Download version:"), N(" * <b>Proprietary drivers</b> (such as drivers for NVIDIA®, ATI™, etc.)."), N(" * <b>Proprietary software</b> (such as Acrobat® Reader®, RealPlayer®, Flash™, etc.)."), ' ', - N("You won't have access to the <b>services included</b> in the other Mandrakesoft products either.")); + N("You will not have access to the <b>services included</b> in the other Mandrakesoft products either.")); diff --git a/perl-install/share/advertising/12.pl b/perl-install/share/advertising/12.pl index b4ce8799b..f9e56e2f8 100644 --- a/perl-install/share/advertising/12.pl +++ b/perl-install/share/advertising/12.pl @@ -14,6 +14,6 @@ $border = 10; #- for leftish text ' ', N("With your Discovery, you will be introduced to <b>KDE</b>, the most advanced and user-friendly <b>graphical desktop environment</b> available."), ' ', - N("KDE will make your <b>first steps</b> with Linux so <b>easy</b> that you won't ever think of running another operating system!"), + N("KDE will make your <b>first steps</b> with Linux so <b>easy</b> that you will not ever think of running another operating system!"), ' ', N("KDE also includes a lot of <b>well integrated applications</b> such as Konqueror, the web browser and Kontact, the personal information manager."));
\ No newline at end of file diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot index 3afaac167..2161d7e22 100644 --- a/perl-install/share/po/DrakX.pot +++ b/perl-install/share/po/DrakX.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2004-12-02 12:38+0100\n" +"POT-Creation-Date: 2004-12-13 15:52+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -29,7 +29,7 @@ msgstr "" #: ../move/move.pm:448 ../move/move.pm:460 #, c-format -msgid "Key isn't writable" +msgid "Key is not writable" msgstr "" #: ../move/move.pm:450 @@ -52,7 +52,7 @@ msgstr "" #: ../move/move.pm:462 #, c-format msgid "" -"The USB key seems to have write protection enabled, but we can't safely\n" +"The USB key seems to have write protection enabled, but we can not safely\n" "unplug it now.\n" "\n" "\n" @@ -60,7 +60,7 @@ msgid "" "plug the key again, and launch Mandrake Move again." msgstr "" -#: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1356 +#: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1331 #, c-format msgid "Reboot" msgstr "" @@ -68,7 +68,7 @@ msgstr "" #: ../move/move.pm:473 #, c-format msgid "" -"Your USB key doesn't have any valid Windows (FAT) partitions.\n" +"Your USB key does not have any valid Windows (FAT) partitions.\n" "We need one to continue (beside, it's more standard so that you\n" "will be able to move and access your files from machines\n" "running Windows). Please plug in an USB key containing a\n" @@ -83,7 +83,7 @@ msgstr "" #: ../move/move.pm:483 #, c-format msgid "" -"We didn't detect any USB key on your system. If you\n" +"We did not detect any USB key on your system. If you\n" "plug in an USB key now, Mandrake Move will have the ability\n" "to transparently save the data in your home directory and\n" "system wide configuration, for next boot on this computer\n" @@ -131,7 +131,7 @@ msgstr "" msgid "Please wait, detecting and configuring devices..." msgstr "" -#: ../move/move.pm:604 ../move/move.pm:660 ../move/move.pm:664 diskdrake/dav.pm:75 diskdrake/hd_gtk.pm:116 diskdrake/interactive.pm:227 diskdrake/interactive.pm:240 diskdrake/interactive.pm:386 diskdrake/interactive.pm:401 diskdrake/interactive.pm:523 diskdrake/interactive.pm:528 diskdrake/smbnfs_gtk.pm:42 fsedit.pm:179 install_steps.pm:82 install_steps_interactive.pm:38 interactive/http.pm:117 interactive/http.pm:118 network/netconnect.pm:999 network/netconnect.pm:1003 network/netconnect.pm:1008 network/netconnect.pm:1049 network/netconnect.pm:1053 network/netconnect.pm:1191 network/netconnect.pm:1196 network/netconnect.pm:1214 network/netconnect.pm:1397 printer/printerdrake.pm:238 printer/printerdrake.pm:245 printer/printerdrake.pm:270 printer/printerdrake.pm:416 printer/printerdrake.pm:421 printer/printerdrake.pm:434 printer/printerdrake.pm:444 printer/printerdrake.pm:508 printer/printerdrake.pm:1182 printer/printerdrake.pm:1229 printer/printerdrake.pm:1266 printer/printerdrake.pm:1310 printer/printerdrake.pm:1314 printer/printerdrake.pm:1328 printer/printerdrake.pm:1418 printer/printerdrake.pm:1498 printer/printerdrake.pm:1502 printer/printerdrake.pm:1506 printer/printerdrake.pm:1555 printer/printerdrake.pm:1612 printer/printerdrake.pm:1616 printer/printerdrake.pm:1630 printer/printerdrake.pm:1740 printer/printerdrake.pm:1744 printer/printerdrake.pm:1781 printer/printerdrake.pm:1846 printer/printerdrake.pm:1864 printer/printerdrake.pm:1873 printer/printerdrake.pm:1882 printer/printerdrake.pm:1893 printer/printerdrake.pm:1955 printer/printerdrake.pm:2408 printer/printerdrake.pm:2672 printer/printerdrake.pm:2678 printer/printerdrake.pm:3188 printer/printerdrake.pm:3192 printer/printerdrake.pm:3196 printer/printerdrake.pm:3606 printer/printerdrake.pm:3846 printer/printerdrake.pm:3866 printer/printerdrake.pm:3942 printer/printerdrake.pm:4007 printer/printerdrake.pm:4123 standalone/drakTermServ:381 standalone/drakTermServ:739 standalone/drakTermServ:746 standalone/drakTermServ:766 standalone/drakTermServ:985 standalone/drakTermServ:1459 standalone/drakTermServ:1464 standalone/drakTermServ:1471 standalone/drakTermServ:1482 standalone/drakTermServ:1503 standalone/drakauth:37 standalone/drakbackup:512 standalone/drakbackup:626 standalone/drakbackup:1128 standalone/drakbackup:1161 standalone/drakbackup:1665 standalone/drakbackup:1821 standalone/drakbackup:2415 standalone/drakbackup:4104 standalone/drakbackup:4324 standalone/drakbug:235 standalone/drakbug:254 standalone/drakbug:260 standalone/drakclock:125 standalone/drakconnect:648 standalone/drakconnect:651 standalone/drakconnect:670 standalone/drakfloppy:297 standalone/drakfloppy:300 standalone/drakfloppy:306 standalone/drakfont:209 standalone/drakfont:222 standalone/drakfont:258 standalone/drakfont:603 standalone/draksplash:21 standalone/draksplash:501 standalone/drakxtv:107 standalone/logdrake:169 standalone/logdrake:437 standalone/logdrake:442 standalone/scannerdrake:59 standalone/scannerdrake:196 standalone/scannerdrake:255 standalone/scannerdrake:684 standalone/scannerdrake:695 standalone/scannerdrake:834 standalone/scannerdrake:845 standalone/scannerdrake:915 wizards.pm:95 wizards.pm:99 wizards.pm:121 +#: ../move/move.pm:604 ../move/move.pm:660 ../move/move.pm:664 diskdrake/dav.pm:75 diskdrake/hd_gtk.pm:116 diskdrake/interactive.pm:227 diskdrake/interactive.pm:240 diskdrake/interactive.pm:386 diskdrake/interactive.pm:401 diskdrake/interactive.pm:523 diskdrake/interactive.pm:528 diskdrake/smbnfs_gtk.pm:42 fsedit.pm:179 install_steps.pm:82 install_steps_interactive.pm:38 interactive/http.pm:117 interactive/http.pm:118 network/netconnect.pm:999 network/netconnect.pm:1003 network/netconnect.pm:1008 network/netconnect.pm:1049 network/netconnect.pm:1053 network/netconnect.pm:1191 network/netconnect.pm:1196 network/netconnect.pm:1214 network/netconnect.pm:1399 printer/printerdrake.pm:238 printer/printerdrake.pm:245 printer/printerdrake.pm:270 printer/printerdrake.pm:416 printer/printerdrake.pm:421 printer/printerdrake.pm:434 printer/printerdrake.pm:444 printer/printerdrake.pm:508 printer/printerdrake.pm:1182 printer/printerdrake.pm:1229 printer/printerdrake.pm:1266 printer/printerdrake.pm:1310 printer/printerdrake.pm:1314 printer/printerdrake.pm:1328 printer/printerdrake.pm:1418 printer/printerdrake.pm:1498 printer/printerdrake.pm:1502 printer/printerdrake.pm:1506 printer/printerdrake.pm:1555 printer/printerdrake.pm:1612 printer/printerdrake.pm:1616 printer/printerdrake.pm:1630 printer/printerdrake.pm:1740 printer/printerdrake.pm:1744 printer/printerdrake.pm:1781 printer/printerdrake.pm:1846 printer/printerdrake.pm:1864 printer/printerdrake.pm:1873 printer/printerdrake.pm:1882 printer/printerdrake.pm:1893 printer/printerdrake.pm:1955 printer/printerdrake.pm:2408 printer/printerdrake.pm:2672 printer/printerdrake.pm:2678 printer/printerdrake.pm:3188 printer/printerdrake.pm:3192 printer/printerdrake.pm:3196 printer/printerdrake.pm:3606 printer/printerdrake.pm:3846 printer/printerdrake.pm:3866 printer/printerdrake.pm:3942 printer/printerdrake.pm:4007 printer/printerdrake.pm:4123 standalone/drakTermServ:381 standalone/drakTermServ:739 standalone/drakTermServ:746 standalone/drakTermServ:766 standalone/drakTermServ:985 standalone/drakTermServ:1459 standalone/drakTermServ:1464 standalone/drakTermServ:1471 standalone/drakTermServ:1482 standalone/drakTermServ:1503 standalone/drakauth:35 standalone/drakbackup:512 standalone/drakbackup:626 standalone/drakbackup:1128 standalone/drakbackup:1161 standalone/drakbackup:1665 standalone/drakbackup:1821 standalone/drakbackup:2415 standalone/drakbackup:4104 standalone/drakbackup:4324 standalone/drakbug:235 standalone/drakbug:254 standalone/drakbug:260 standalone/drakclock:125 standalone/drakconnect:648 standalone/drakconnect:651 standalone/drakconnect:670 standalone/drakfloppy:297 standalone/drakfloppy:300 standalone/drakfloppy:306 standalone/drakfont:209 standalone/drakfont:222 standalone/drakfont:258 standalone/drakfont:603 standalone/draksplash:21 standalone/draksplash:501 standalone/drakxtv:107 standalone/finish-install:39 standalone/logdrake:169 standalone/logdrake:437 standalone/logdrake:442 standalone/scannerdrake:59 standalone/scannerdrake:196 standalone/scannerdrake:255 standalone/scannerdrake:684 standalone/scannerdrake:695 standalone/scannerdrake:834 standalone/scannerdrake:845 standalone/scannerdrake:915 wizards.pm:95 wizards.pm:99 wizards.pm:121 wizards2.pm:95 wizards2.pm:99 wizards2.pm:121 #, c-format msgid "Error" msgstr "" @@ -139,7 +139,7 @@ msgstr "" #: ../move/move.pm:605 install_steps.pm:83 #, c-format msgid "" -"An error occurred, but I don't know how to handle it nicely.\n" +"An error occurred, but I do not know how to handle it nicely.\n" "Continue at your own risk." msgstr "" @@ -201,7 +201,7 @@ msgstr "" #: ../move/tree/mdk_totem:77 #, c-format msgid "" -"You can't use another CDROM when the following programs are running: \n" +"You can not use another CDROM when the following programs are running: \n" "%s" msgstr "" @@ -279,7 +279,7 @@ msgstr "" #: Xconfig/card.pm:259 #, c-format -msgid "Can't install Xorg package: %s" +msgid "Can not install Xorg package: %s" msgstr "" #: Xconfig/card.pm:269 @@ -339,12 +339,12 @@ msgid "" "NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER." msgstr "" -#: Xconfig/main.pm:90 Xconfig/main.pm:91 Xconfig/monitor.pm:116 any.pm:919 +#: Xconfig/main.pm:90 Xconfig/main.pm:91 Xconfig/monitor.pm:116 any.pm:917 #, c-format msgid "Custom" msgstr "" -#: Xconfig/main.pm:115 diskdrake/dav.pm:26 help.pm:14 install_steps_interactive.pm:88 printer/printerdrake.pm:712 printer/printerdrake.pm:3937 printer/printerdrake.pm:4382 standalone/draksplash:120 standalone/harddrake2:280 standalone/logdrake:174 standalone/net_applet:160 standalone/scannerdrake:446 +#: Xconfig/main.pm:115 diskdrake/dav.pm:26 help.pm:14 install_steps_interactive.pm:86 printer/printerdrake.pm:712 printer/printerdrake.pm:3937 printer/printerdrake.pm:4382 standalone/draksplash:120 standalone/harddrake2:282 standalone/logdrake:174 standalone/net_applet:160 standalone/scannerdrake:446 #, c-format msgid "Quit" msgstr "" @@ -369,7 +369,7 @@ msgstr "" msgid "Test" msgstr "" -#: Xconfig/main.pm:133 diskdrake/dav.pm:65 diskdrake/interactive.pm:427 diskdrake/removable.pm:24 diskdrake/smbnfs_gtk.pm:80 standalone/drakfont:493 standalone/drakfont:555 standalone/harddrake2:277 +#: Xconfig/main.pm:133 diskdrake/dav.pm:65 diskdrake/interactive.pm:427 diskdrake/removable.pm:24 diskdrake/smbnfs_gtk.pm:80 standalone/drakfont:493 standalone/drakfont:555 standalone/harddrake2:279 #, c-format msgid "Options" msgstr "" @@ -475,17 +475,17 @@ msgstr "" msgid "Graphics card: %s" msgstr "" -#: Xconfig/resolution_and_depth.pm:282 interactive.pm:403 interactive/gtk.pm:766 interactive/http.pm:103 interactive/http.pm:156 interactive/newt.pm:317 interactive/newt.pm:419 interactive/stdio.pm:39 interactive/stdio.pm:142 interactive/stdio.pm:143 interactive/stdio.pm:172 standalone/drakTermServ:203 standalone/drakTermServ:476 standalone/drakbackup:3961 standalone/drakbackup:4021 standalone/drakbackup:4065 standalone/drakconnect:165 standalone/drakconnect:851 standalone/drakconnect:938 standalone/drakconnect:1037 standalone/drakfont:576 standalone/drakroam:388 standalone/drakups:208 standalone/net_monitor:344 ugtk2.pm:414 ugtk2.pm:512 ugtk2.pm:1119 ugtk2.pm:1142 +#: Xconfig/resolution_and_depth.pm:282 interactive.pm:403 interactive/gtk.pm:766 interactive/http.pm:103 interactive/http.pm:156 interactive/newt.pm:317 interactive/newt.pm:419 interactive/stdio.pm:39 interactive/stdio.pm:142 interactive/stdio.pm:143 interactive/stdio.pm:172 standalone/drakTermServ:203 standalone/drakTermServ:476 standalone/drakbackup:3961 standalone/drakbackup:4021 standalone/drakbackup:4065 standalone/drakconnect:165 standalone/drakconnect:851 standalone/drakconnect:938 standalone/drakconnect:1037 standalone/drakfont:576 standalone/drakroam:388 standalone/drakups:208 standalone/net_monitor:344 ugtk2.pm:411 ugtk2.pm:508 ugtk2.pm:1038 ugtk2.pm:1061 #, c-format msgid "Ok" msgstr "" -#: Xconfig/resolution_and_depth.pm:282 diskdrake/smbnfs_gtk.pm:81 help.pm:89 help.pm:444 install_steps_gtk.pm:458 install_steps_interactive.pm:425 install_steps_interactive.pm:843 interactive.pm:404 interactive/gtk.pm:770 interactive/http.pm:104 interactive/http.pm:160 interactive/newt.pm:316 interactive/newt.pm:423 interactive/stdio.pm:39 interactive/stdio.pm:142 interactive/stdio.pm:176 printer/printerdrake.pm:3266 standalone/drakautoinst:217 standalone/drakbackup:3887 standalone/drakbackup:3891 standalone/drakbackup:3949 standalone/drakconnect:164 standalone/drakconnect:936 standalone/drakconnect:1036 standalone/drakfont:666 standalone/drakfont:743 standalone/drakups:215 standalone/logdrake:174 standalone/net_monitor:343 ugtk2.pm:408 ugtk2.pm:510 ugtk2.pm:519 ugtk2.pm:1119 +#: Xconfig/resolution_and_depth.pm:282 diskdrake/smbnfs_gtk.pm:81 help.pm:89 help.pm:444 install_steps_gtk.pm:459 install_steps_interactive.pm:423 install_steps_interactive.pm:841 interactive.pm:404 interactive/gtk.pm:770 interactive/http.pm:104 interactive/http.pm:160 interactive/newt.pm:316 interactive/newt.pm:423 interactive/stdio.pm:39 interactive/stdio.pm:142 interactive/stdio.pm:176 printer/printerdrake.pm:3266 standalone/drakautoinst:217 standalone/drakbackup:3887 standalone/drakbackup:3891 standalone/drakbackup:3949 standalone/drakconnect:164 standalone/drakconnect:936 standalone/drakconnect:1036 standalone/drakfont:666 standalone/drakfont:743 standalone/drakups:215 standalone/logdrake:174 standalone/net_monitor:343 ugtk2.pm:405 ugtk2.pm:506 ugtk2.pm:515 ugtk2.pm:1038 #, c-format msgid "Cancel" msgstr "" -#: Xconfig/resolution_and_depth.pm:282 diskdrake/hd_gtk.pm:153 install_steps_gtk.pm:239 install_steps_gtk.pm:645 interactive.pm:498 interactive/gtk.pm:628 interactive/gtk.pm:630 standalone/drakTermServ:282 standalone/drakbackup:3883 standalone/drakbug:128 standalone/drakconnect:160 standalone/drakconnect:245 standalone/drakfont:511 standalone/drakperm:134 standalone/draksec:337 standalone/draksec:339 standalone/draksec:357 standalone/draksec:359 standalone/harddrake2:276 ugtk2.pm:1232 ugtk2.pm:1233 +#: Xconfig/resolution_and_depth.pm:282 diskdrake/hd_gtk.pm:153 install_steps_gtk.pm:240 install_steps_gtk.pm:646 interactive.pm:498 interactive/gtk.pm:628 interactive/gtk.pm:630 standalone/drakTermServ:282 standalone/drakbackup:3883 standalone/drakbug:128 standalone/drakconnect:160 standalone/drakconnect:245 standalone/drakfont:511 standalone/drakperm:134 standalone/draksec:337 standalone/draksec:339 standalone/draksec:357 standalone/draksec:359 standalone/harddrake2:278 ugtk2.pm:1151 ugtk2.pm:1152 #, c-format msgid "Help" msgstr "" @@ -629,17 +629,17 @@ msgstr "" msgid "What norm is your TV using?" msgstr "" -#: any.pm:116 harddrake/sound.pm:180 interactive.pm:441 standalone/drakbug:227 standalone/drakconnect:167 standalone/drakconnect:611 standalone/draksec:68 standalone/drakups:101 standalone/drakxtv:92 standalone/harddrake2:226 standalone/service_harddrake:200 +#: any.pm:144 harddrake/sound.pm:180 interactive.pm:441 standalone/drakbug:227 standalone/drakconnect:167 standalone/drakconnect:611 standalone/draksec:68 standalone/drakups:101 standalone/drakxtv:92 standalone/harddrake2:228 standalone/service_harddrake:202 #, c-format msgid "Please wait" msgstr "" -#: any.pm:116 +#: any.pm:144 #, c-format msgid "Bootloader installation in progress" msgstr "" -#: any.pm:127 +#: any.pm:155 #, c-format msgid "" "LILO wants to assign a new Volume ID to drive %s. However, changing\n" @@ -649,23 +649,23 @@ msgid "" "Assign a new Volume ID?" msgstr "" -#: any.pm:138 +#: any.pm:166 #, c-format msgid "Installation of bootloader failed. The following error occurred:" msgstr "" -#: any.pm:144 +#: any.pm:172 #, c-format msgid "" "You may need to change your Open Firmware boot-device to\n" -" enable the bootloader. If you don't see the bootloader prompt at\n" +" enable the bootloader. If you do not see the bootloader prompt at\n" " reboot, hold down Command-Option-O-F at reboot and enter:\n" " setenv boot-device %s,\\\\:tbxi\n" " Then type: shut-down\n" "At your next boot you should see the bootloader prompt." msgstr "" -#: any.pm:182 +#: any.pm:210 #, c-format msgid "" "You decided to install the bootloader on a partition.\n" @@ -674,396 +674,396 @@ msgid "" "On which drive are you booting?" msgstr "" -#: any.pm:205 help.pm:739 +#: any.pm:233 help.pm:739 #, c-format msgid "First sector of drive (MBR)" msgstr "" -#: any.pm:206 +#: any.pm:234 #, c-format msgid "First sector of the root partition" msgstr "" -#: any.pm:208 +#: any.pm:236 #, c-format msgid "On Floppy" msgstr "" -#: any.pm:210 help.pm:739 printer/printerdrake.pm:3603 +#: any.pm:238 help.pm:739 printer/printerdrake.pm:3603 #, c-format msgid "Skip" msgstr "" -#: any.pm:214 +#: any.pm:242 #, c-format msgid "LILO/grub Installation" msgstr "" -#: any.pm:215 +#: any.pm:243 #, c-format msgid "Where do you want to install the bootloader?" msgstr "" -#: any.pm:240 standalone/drakboot:307 +#: any.pm:268 standalone/drakboot:307 #, c-format msgid "Boot Style Configuration" msgstr "" -#: any.pm:242 any.pm:274 +#: any.pm:270 any.pm:302 #, c-format msgid "Bootloader main options" msgstr "" -#: any.pm:246 +#: any.pm:274 #, c-format msgid "Give the ram size in MB" msgstr "" -#: any.pm:248 +#: any.pm:276 #, c-format msgid "Option ``Restrict command line options'' is of no use without a password" msgstr "" -#: any.pm:249 any.pm:593 install_steps_interactive.pm:1218 +#: any.pm:277 any.pm:610 authentication.pm:165 #, c-format msgid "The passwords do not match" msgstr "" -#: any.pm:249 any.pm:593 diskdrake/interactive.pm:1256 install_steps_interactive.pm:1218 +#: any.pm:277 any.pm:610 authentication.pm:165 diskdrake/interactive.pm:1256 #, c-format msgid "Please try again" msgstr "" -#: any.pm:254 any.pm:277 +#: any.pm:282 any.pm:305 #, c-format msgid "Bootloader to use" msgstr "" -#: any.pm:256 any.pm:279 +#: any.pm:284 any.pm:307 #, c-format msgid "Boot device" msgstr "" -#: any.pm:258 +#: any.pm:286 #, c-format msgid "Delay before booting default image" msgstr "" -#: any.pm:259 +#: any.pm:287 #, c-format msgid "Enable ACPI" msgstr "" -#: any.pm:261 +#: any.pm:289 #, c-format msgid "Force no APIC" msgstr "" -#: any.pm:263 +#: any.pm:291 #, c-format msgid "Force No Local APIC" msgstr "" -#: any.pm:265 any.pm:620 diskdrake/smbnfs_gtk.pm:180 install_steps_interactive.pm:1223 network/netconnect.pm:599 printer/printerdrake.pm:1489 printer/printerdrake.pm:1609 standalone/drakbackup:1647 standalone/drakbackup:3489 standalone/drakups:295 +#: any.pm:293 any.pm:637 authentication.pm:170 diskdrake/smbnfs_gtk.pm:180 network/netconnect.pm:599 printer/printerdrake.pm:1489 printer/printerdrake.pm:1609 standalone/drakbackup:1647 standalone/drakbackup:3489 standalone/drakups:295 #, c-format msgid "Password" msgstr "" -#: any.pm:266 any.pm:621 install_steps_interactive.pm:1224 +#: any.pm:294 any.pm:638 authentication.pm:171 #, c-format msgid "Password (again)" msgstr "" -#: any.pm:267 +#: any.pm:295 #, c-format msgid "Restrict command line options" msgstr "" -#: any.pm:267 +#: any.pm:295 #, c-format msgid "restrict" msgstr "" -#: any.pm:269 +#: any.pm:297 #, c-format msgid "Clean /tmp at each boot" msgstr "" -#: any.pm:270 +#: any.pm:298 #, c-format msgid "Precise RAM size if needed (found %d MB)" msgstr "" -#: any.pm:278 +#: any.pm:306 #, c-format msgid "Init Message" msgstr "" -#: any.pm:280 +#: any.pm:308 #, c-format msgid "Open Firmware Delay" msgstr "" -#: any.pm:281 +#: any.pm:309 #, c-format msgid "Kernel Boot Timeout" msgstr "" -#: any.pm:282 +#: any.pm:310 #, c-format msgid "Enable CD Boot?" msgstr "" -#: any.pm:283 +#: any.pm:311 #, c-format msgid "Enable OF Boot?" msgstr "" -#: any.pm:284 +#: any.pm:312 #, c-format msgid "Default OS?" msgstr "" -#: any.pm:337 +#: any.pm:365 #, c-format msgid "Image" msgstr "" -#: any.pm:338 any.pm:348 +#: any.pm:366 any.pm:376 #, c-format msgid "Root" msgstr "" -#: any.pm:339 any.pm:361 +#: any.pm:367 any.pm:389 #, c-format msgid "Append" msgstr "" -#: any.pm:341 standalone/drakboot:309 standalone/drakboot:313 +#: any.pm:369 standalone/drakboot:309 standalone/drakboot:313 #, c-format msgid "Video mode" msgstr "" -#: any.pm:343 +#: any.pm:371 #, c-format msgid "Initrd" msgstr "" -#: any.pm:344 +#: any.pm:372 #, c-format msgid "Network profile" msgstr "" -#: any.pm:353 any.pm:358 any.pm:360 +#: any.pm:381 any.pm:386 any.pm:388 #, c-format msgid "Label" msgstr "" -#: any.pm:355 any.pm:365 harddrake/v4l.pm:275 standalone/drakfloppy:84 standalone/drakfloppy:90 standalone/draksec:52 +#: any.pm:383 any.pm:393 harddrake/v4l.pm:275 standalone/drakfloppy:84 standalone/drakfloppy:90 standalone/draksec:52 #, c-format msgid "Default" msgstr "" -#: any.pm:362 +#: any.pm:390 #, c-format msgid "Initrd-size" msgstr "" -#: any.pm:364 +#: any.pm:392 #, c-format msgid "NoVideo" msgstr "" -#: any.pm:375 +#: any.pm:403 #, c-format msgid "Empty label not allowed" msgstr "" -#: any.pm:376 +#: any.pm:404 #, c-format msgid "You must specify a kernel image" msgstr "" -#: any.pm:376 +#: any.pm:404 #, c-format msgid "You must specify a root partition" msgstr "" -#: any.pm:377 +#: any.pm:405 #, c-format msgid "This label is already used" msgstr "" -#: any.pm:391 +#: any.pm:419 #, c-format msgid "Which type of entry do you want to add?" msgstr "" -#: any.pm:392 +#: any.pm:420 #, c-format msgid "Linux" msgstr "" -#: any.pm:392 +#: any.pm:420 #, c-format msgid "Other OS (SunOS...)" msgstr "" -#: any.pm:393 +#: any.pm:421 #, c-format msgid "Other OS (MacOS...)" msgstr "" -#: any.pm:393 +#: any.pm:421 #, c-format msgid "Other OS (Windows...)" msgstr "" -#: any.pm:421 +#: any.pm:449 #, c-format msgid "" "Here are the entries on your boot menu so far.\n" "You can create additional entries or change the existing ones." msgstr "" -#: any.pm:579 +#: any.pm:596 #, c-format msgid "access to X programs" msgstr "" -#: any.pm:580 +#: any.pm:597 #, c-format msgid "access to rpm tools" msgstr "" -#: any.pm:581 +#: any.pm:598 #, c-format msgid "allow \"su\"" msgstr "" -#: any.pm:582 +#: any.pm:599 #, c-format msgid "access to administrative files" msgstr "" -#: any.pm:583 +#: any.pm:600 #, c-format msgid "access to network tools" msgstr "" -#: any.pm:584 +#: any.pm:601 #, c-format msgid "access to compilation tools" msgstr "" -#: any.pm:589 +#: any.pm:606 #, c-format msgid "(already added %s)" msgstr "" -#: any.pm:594 +#: any.pm:611 #, c-format msgid "This password is too simple" msgstr "" -#: any.pm:595 +#: any.pm:612 #, c-format msgid "Please give a user name" msgstr "" -#: any.pm:596 +#: any.pm:613 #, c-format msgid "The user name must contain only lower cased letters, numbers, `-' and `_'" msgstr "" -#: any.pm:597 +#: any.pm:614 #, c-format msgid "The user name is too long" msgstr "" -#: any.pm:598 +#: any.pm:615 #, c-format msgid "This user name has already been added" msgstr "" -#: any.pm:602 +#: any.pm:619 #, c-format msgid "Add user" msgstr "" -#: any.pm:603 +#: any.pm:620 #, c-format msgid "" "Enter a user\n" "%s" msgstr "" -#: any.pm:606 diskdrake/dav.pm:66 diskdrake/hd_gtk.pm:157 diskdrake/removable.pm:26 diskdrake/smbnfs_gtk.pm:82 help.pm:530 interactive/http.pm:151 printer/printerdrake.pm:191 printer/printerdrake.pm:376 printer/printerdrake.pm:4382 standalone/drakbackup:2702 standalone/scannerdrake:637 standalone/scannerdrake:787 +#: any.pm:623 diskdrake/dav.pm:66 diskdrake/hd_gtk.pm:157 diskdrake/removable.pm:26 diskdrake/smbnfs_gtk.pm:82 help.pm:530 interactive/http.pm:151 printer/printerdrake.pm:191 printer/printerdrake.pm:376 printer/printerdrake.pm:4382 standalone/drakbackup:2702 standalone/scannerdrake:637 standalone/scannerdrake:787 #, c-format msgid "Done" msgstr "" -#: any.pm:607 help.pm:51 +#: any.pm:624 help.pm:51 #, c-format msgid "Accept user" msgstr "" -#: any.pm:618 +#: any.pm:635 #, c-format msgid "Real name" msgstr "" -#: any.pm:619 standalone/drakbackup:1642 +#: any.pm:636 standalone/drakbackup:1642 #, c-format msgid "Login name" msgstr "" -#: any.pm:622 +#: any.pm:639 #, c-format msgid "Shell" msgstr "" -#: any.pm:624 +#: any.pm:641 #, c-format msgid "Icon" msgstr "" -#: any.pm:671 security/l10n.pm:14 +#: any.pm:688 security/l10n.pm:14 #, c-format msgid "Autologin" msgstr "" -#: any.pm:672 +#: any.pm:689 #, c-format msgid "I can set up your computer to automatically log on one user." msgstr "" -#: any.pm:673 help.pm:51 +#: any.pm:690 help.pm:51 #, c-format msgid "Do you want to use this feature?" msgstr "" -#: any.pm:674 +#: any.pm:691 #, c-format msgid "Choose the default user:" msgstr "" -#: any.pm:675 +#: any.pm:692 #, c-format msgid "Choose the window manager to run:" msgstr "" -#: any.pm:687 +#: any.pm:704 #, c-format msgid "Please choose a language to use." msgstr "" -#: any.pm:688 +#: any.pm:705 #, c-format msgid "Language choice" msgstr "" -#: any.pm:714 +#: any.pm:731 #, c-format msgid "" "Mandrakelinux can support multiple languages. Select\n" @@ -1071,57 +1071,57 @@ msgid "" "when your installation is complete and you restart your system." msgstr "" -#: any.pm:732 help.pm:647 +#: any.pm:749 help.pm:647 #, c-format msgid "Use Unicode by default" msgstr "" -#: any.pm:733 help.pm:647 +#: any.pm:750 help.pm:647 #, c-format msgid "All languages" msgstr "" -#: any.pm:772 help.pm:566 help.pm:855 install_steps_interactive.pm:963 +#: any.pm:789 help.pm:566 help.pm:855 install_steps_interactive.pm:961 #, c-format msgid "Country / Region" msgstr "" -#: any.pm:773 +#: any.pm:790 #, c-format msgid "Please choose your country." msgstr "" -#: any.pm:775 +#: any.pm:792 #, c-format msgid "Here is the full list of available countries" msgstr "" -#: any.pm:776 +#: any.pm:793 #, c-format msgid "Other Countries" msgstr "" -#: any.pm:784 +#: any.pm:801 #, c-format msgid "Input method:" msgstr "" -#: any.pm:785 install_any.pm:420 printer/printerdrake.pm:99 +#: any.pm:802 install_any.pm:420 printer/printerdrake.pm:99 #, c-format msgid "None" msgstr "" -#: any.pm:919 +#: any.pm:917 #, c-format msgid "No sharing" msgstr "" -#: any.pm:919 +#: any.pm:917 #, c-format msgid "Allow all users" msgstr "" -#: any.pm:923 +#: any.pm:921 #, c-format msgid "" "Would you like to allow users to share some of their directories?\n" @@ -1131,32 +1131,32 @@ msgid "" "" msgstr "" -#: any.pm:935 +#: any.pm:933 #, c-format msgid "NFS: the traditional Unix file sharing system, with less support on Mac and Windows." msgstr "" -#: any.pm:938 +#: any.pm:936 #, c-format msgid "SMB: a file sharing system used by Windows, Mac OS X and many modern Linux systems." msgstr "" -#: any.pm:946 +#: any.pm:944 #, c-format msgid "You can export using NFS or SMB. Please select which you would like to use." msgstr "" -#: any.pm:971 +#: any.pm:969 #, c-format msgid "Launch userdrake" msgstr "" -#: any.pm:971 printer/printerdrake.pm:3478 printer/printerdrake.pm:3481 printer/printerdrake.pm:3482 printer/printerdrake.pm:3483 printer/printerdrake.pm:4676 standalone/drakTermServ:291 standalone/drakbackup:4083 standalone/drakbug:151 standalone/drakfont:499 standalone/drakfont:593 standalone/net_monitor:123 standalone/printerdrake:561 +#: any.pm:969 printer/printerdrake.pm:3478 printer/printerdrake.pm:3481 printer/printerdrake.pm:3482 printer/printerdrake.pm:3483 printer/printerdrake.pm:4676 standalone/drakTermServ:291 standalone/drakbackup:4083 standalone/drakbug:151 standalone/drakfont:499 standalone/drakfont:593 standalone/net_monitor:123 standalone/printerdrake:561 #, c-format msgid "Close" msgstr "" -#: any.pm:973 +#: any.pm:971 #, c-format msgid "" "The per-user sharing uses the group \"fileshare\". \n" @@ -1183,7 +1183,7 @@ msgstr "" msgid "Smart Card" msgstr "" -#: authentication.pm:20 authentication.pm:128 +#: authentication.pm:20 authentication.pm:138 #, c-format msgid "Windows Domain" msgstr "" @@ -1198,152 +1198,152 @@ msgstr "" msgid "Active Directory with Winbind" msgstr "" -#: authentication.pm:31 +#: authentication.pm:41 #, c-format msgid "Local file:" msgstr "" -#: authentication.pm:31 +#: authentication.pm:41 #, c-format msgid "Use local for all authentication and information user tell in local file" msgstr "" -#: authentication.pm:32 +#: authentication.pm:42 #, c-format msgid "LDAP:" msgstr "" -#: authentication.pm:32 +#: authentication.pm:42 #, c-format msgid "Tells your computer to use LDAP for some or all authentication. LDAP consolidates certain types of information within your organization." msgstr "" -#: authentication.pm:33 +#: authentication.pm:43 #, c-format msgid "NIS:" msgstr "" -#: authentication.pm:33 +#: authentication.pm:43 #, c-format msgid "Allows you to run a group of computers in the same Network Information Service domain with a common password and group file." msgstr "" -#: authentication.pm:34 +#: authentication.pm:44 #, c-format msgid "Windows Domain:" msgstr "" -#: authentication.pm:34 +#: authentication.pm:44 #, c-format msgid "Winbind allows the system to retrieve information and authenticate users in a Windows domain." msgstr "" -#: authentication.pm:35 +#: authentication.pm:45 #, c-format msgid "Active Directory with SFU:" msgstr "" -#: authentication.pm:35 authentication.pm:36 +#: authentication.pm:45 authentication.pm:46 #, c-format msgid "Kerberos is a secure system for providing network authentication services." msgstr "" -#: authentication.pm:36 +#: authentication.pm:46 #, c-format msgid "Active Directory with Winbind:" msgstr "" -#: authentication.pm:61 +#: authentication.pm:71 #, c-format msgid "Authentication LDAP" msgstr "" -#: authentication.pm:62 +#: authentication.pm:72 #, c-format msgid "LDAP Base dn" msgstr "" -#: authentication.pm:63 share/compssUsers.pl:101 +#: authentication.pm:73 share/compssUsers.pl:101 #, c-format msgid "LDAP Server" msgstr "" -#: authentication.pm:76 fsedit.pm:21 +#: authentication.pm:86 fsedit.pm:21 #, c-format msgid "simple" msgstr "" -#: authentication.pm:77 +#: authentication.pm:87 #, c-format msgid "TLS" msgstr "" -#: authentication.pm:78 +#: authentication.pm:88 #, c-format msgid "SSL" msgstr "" -#: authentication.pm:79 +#: authentication.pm:89 #, c-format msgid "security layout (SASL/Kerberos)" msgstr "" -#: authentication.pm:86 authentication.pm:124 +#: authentication.pm:96 authentication.pm:134 #, c-format msgid "Authentication Active Directory" msgstr "" -#: authentication.pm:87 authentication.pm:126 diskdrake/smbnfs_gtk.pm:181 +#: authentication.pm:97 authentication.pm:136 diskdrake/smbnfs_gtk.pm:181 #, c-format msgid "Domain" msgstr "" -#: authentication.pm:89 diskdrake/dav.pm:63 help.pm:146 printer/printerdrake.pm:135 share/compssUsers.pl:81 +#: authentication.pm:99 diskdrake/dav.pm:63 help.pm:146 printer/printerdrake.pm:135 share/compssUsers.pl:81 #, c-format msgid "Server" msgstr "" -#: authentication.pm:90 +#: authentication.pm:100 #, c-format msgid "LDAP users database" msgstr "" -#: authentication.pm:91 +#: authentication.pm:101 #, c-format msgid "Use Anonymous BIND " msgstr "" -#: authentication.pm:92 +#: authentication.pm:102 #, c-format msgid "LDAP user allowed to browse the Active Directory" msgstr "" -#: authentication.pm:93 +#: authentication.pm:103 #, c-format msgid "Password for user" msgstr "" -#: authentication.pm:94 +#: authentication.pm:104 #, c-format msgid "Encryption" msgstr "" -#: authentication.pm:105 +#: authentication.pm:115 #, c-format msgid "Authentication NIS" msgstr "" -#: authentication.pm:106 +#: authentication.pm:116 #, c-format msgid "NIS Domain" msgstr "" -#: authentication.pm:107 +#: authentication.pm:117 #, c-format msgid "NIS Server" msgstr "" -#: authentication.pm:112 +#: authentication.pm:122 #, c-format msgid "" "For this to work for a W2K PDC, you will probably need to have the admin run: C:\\>net localgroup \"Pre-Windows 2000 Compatible Access\" everyone /add and reboot the server.\n" @@ -1353,34 +1353,60 @@ msgid "" "The command 'wbinfo -t' will test whether your authentication secrets are good." msgstr "" -#: authentication.pm:124 +#: authentication.pm:134 #, c-format msgid "Authentication Windows Domain" msgstr "" -#: authentication.pm:129 +#: authentication.pm:139 #, c-format msgid "Domain Admin User Name" msgstr "" -#: authentication.pm:130 +#: authentication.pm:140 #, c-format msgid "Domain Admin Password" msgstr "" -#: authentication.pm:131 +#: authentication.pm:141 #, c-format msgid "Use Idmap for store UID/SID " msgstr "" -#: authentication.pm:132 +#: authentication.pm:142 #, c-format msgid "Default Idmap " msgstr "" -#: authentication.pm:239 +#: authentication.pm:155 +#, c-format +msgid "Set root password and network authentication methods" +msgstr "" + +#: authentication.pm:156 +#, c-format +msgid "Set root password" +msgstr "" + +#. -PO: keep this short or else the buttons will not fit in the window +#: authentication.pm:161 help.pm:722 +#, c-format +msgid "No password" +msgstr "" + +#: authentication.pm:167 +#, c-format +msgid "This password is too short (it must be at least %d characters long)" +msgstr "" + +#: authentication.pm:172 network/netconnect.pm:600 standalone/drakauth:23 standalone/drakauth:25 standalone/drakconnect:457 +#, c-format +msgid "Authentication" +msgstr "" + +#: authentication.pm:285 #, c-format -msgid "Can't use broadcast with no NIS domain" +msgid "Can not use broadcast with no NIS domain" msgstr "" #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit) @@ -1395,49 +1421,49 @@ msgid "" "" msgstr "" -#: bootloader.pm:844 +#: bootloader.pm:817 #, c-format msgid "LILO with graphical menu" msgstr "" -#: bootloader.pm:845 +#: bootloader.pm:818 #, c-format msgid "LILO with text menu" msgstr "" -#: bootloader.pm:846 +#: bootloader.pm:819 #, c-format msgid "Grub" msgstr "" -#: bootloader.pm:847 +#: bootloader.pm:820 #, c-format msgid "Yaboot" msgstr "" -#: bootloader.pm:909 +#: bootloader.pm:882 #, c-format msgid "not enough room in /boot" msgstr "" -#: bootloader.pm:1321 +#: bootloader.pm:1294 #, c-format msgid "" -"You can't install the bootloader on a %s partition\n" +"You can not install the bootloader on a %s partition\n" "" msgstr "" -#: bootloader.pm:1366 +#: bootloader.pm:1339 #, c-format msgid "Your bootloader configuration must be updated because partition has been renumbered" msgstr "" -#: bootloader.pm:1381 +#: bootloader.pm:1354 #, c-format -msgid "The bootloader can't be installed correctly. You have to boot rescue and choose \"%s\"" +msgid "The bootloader can not be installed correctly. You have to boot rescue and choose \"%s\"" msgstr "" -#: bootloader.pm:1382 +#: bootloader.pm:1355 #, c-format msgid "Re-install Boot Loader" msgstr "" @@ -1479,7 +1505,7 @@ msgstr "" #: common.pm:195 #, c-format -msgid "Can't make screenshots before partitioning" +msgid "Can not make screenshots before partitioning" msgstr "" #: common.pm:202 @@ -1497,17 +1523,17 @@ msgstr "" msgid "consolehelper missing" msgstr "" -#: crypto.pm:14 crypto.pm:43 lang.pm:194 network/adsl_consts.pm:39 network/adsl_consts.pm:47 network/adsl_consts.pm:55 +#: crypto.pm:14 crypto.pm:43 lang.pm:194 network/adsl_consts.pm:38 network/adsl_consts.pm:46 network/adsl_consts.pm:54 #, c-format msgid "Austria" msgstr "" -#: crypto.pm:15 crypto.pm:34 lang.pm:201 network/adsl_consts.pm:62 network/adsl_consts.pm:69 network/adsl_consts.pm:80 network/adsl_consts.pm:88 network/netconnect.pm:50 +#: crypto.pm:15 crypto.pm:34 lang.pm:201 network/adsl_consts.pm:61 network/adsl_consts.pm:68 network/adsl_consts.pm:79 network/adsl_consts.pm:87 network/netconnect.pm:50 #, c-format msgid "Belgium" msgstr "" -#: crypto.pm:16 lang.pm:222 network/adsl_consts.pm:611 network/adsl_consts.pm:618 +#: crypto.pm:16 lang.pm:222 network/adsl_consts.pm:610 network/adsl_consts.pm:617 #, c-format msgid "Switzerland" msgstr "" @@ -1522,32 +1548,32 @@ msgstr "" msgid "Czech Republic" msgstr "" -#: crypto.pm:19 crypto.pm:36 lang.pm:236 network/adsl_consts.pm:413 network/adsl_consts.pm:421 +#: crypto.pm:19 crypto.pm:36 lang.pm:236 network/adsl_consts.pm:412 network/adsl_consts.pm:420 #, c-format msgid "Germany" msgstr "" -#: crypto.pm:20 crypto.pm:33 lang.pm:254 network/adsl_consts.pm:320 network/adsl_consts.pm:331 network/adsl_consts.pm:341 network/adsl_consts.pm:351 network/adsl_consts.pm:361 network/adsl_consts.pm:372 network/adsl_consts.pm:383 network/adsl_consts.pm:393 network/adsl_consts.pm:403 network/netconnect.pm:47 +#: crypto.pm:20 crypto.pm:33 lang.pm:254 network/adsl_consts.pm:319 network/adsl_consts.pm:330 network/adsl_consts.pm:340 network/adsl_consts.pm:350 network/adsl_consts.pm:360 network/adsl_consts.pm:371 network/adsl_consts.pm:382 network/adsl_consts.pm:392 network/adsl_consts.pm:402 network/netconnect.pm:47 #, c-format msgid "France" msgstr "" -#: crypto.pm:21 crypto.pm:37 lang.pm:267 network/adsl_consts.pm:431 +#: crypto.pm:21 crypto.pm:37 lang.pm:267 network/adsl_consts.pm:430 #, c-format msgid "Greece" msgstr "" -#: crypto.pm:22 lang.pm:278 network/adsl_consts.pm:439 +#: crypto.pm:22 lang.pm:278 network/adsl_consts.pm:438 #, c-format msgid "Hungary" msgstr "" -#: crypto.pm:23 crypto.pm:42 lang.pm:287 network/adsl_consts.pm:463 network/adsl_consts.pm:473 network/adsl_consts.pm:480 network/netconnect.pm:49 standalone/drakxtv:47 +#: crypto.pm:23 crypto.pm:42 lang.pm:287 network/adsl_consts.pm:462 network/adsl_consts.pm:472 network/adsl_consts.pm:479 network/netconnect.pm:49 standalone/drakxtv:47 #, c-format msgid "Italy" msgstr "" -#: crypto.pm:24 crypto.pm:41 lang.pm:339 network/adsl_consts.pm:506 network/adsl_consts.pm:514 network/adsl_consts.pm:522 network/adsl_consts.pm:530 network/netconnect.pm:48 +#: crypto.pm:24 crypto.pm:41 lang.pm:339 network/adsl_consts.pm:505 network/adsl_consts.pm:513 network/adsl_consts.pm:521 network/adsl_consts.pm:529 network/netconnect.pm:48 #, c-format msgid "Netherlands" msgstr "" @@ -1557,12 +1583,12 @@ msgstr "" msgid "Norway" msgstr "" -#: crypto.pm:26 lang.pm:352 network/adsl_consts.pm:538 network/adsl_consts.pm:548 +#: crypto.pm:26 lang.pm:352 network/adsl_consts.pm:537 network/adsl_consts.pm:547 #, c-format msgid "Poland" msgstr "" -#: crypto.pm:27 crypto.pm:39 lang.pm:369 network/adsl_consts.pm:604 +#: crypto.pm:27 crypto.pm:39 lang.pm:369 network/adsl_consts.pm:603 #, c-format msgid "Sweden" msgstr "" @@ -1671,7 +1697,7 @@ msgstr "" msgid "Please click on a partition" msgstr "" -#: diskdrake/hd_gtk.pm:208 diskdrake/smbnfs_gtk.pm:63 install_steps_gtk.pm:474 standalone/drakbackup:2937 standalone/drakbackup:2997 +#: diskdrake/hd_gtk.pm:208 diskdrake/smbnfs_gtk.pm:63 install_steps_gtk.pm:475 standalone/drakbackup:2937 standalone/drakbackup:2997 #, c-format msgid "Details" msgstr "" @@ -1711,7 +1737,7 @@ msgstr "" msgid "Windows" msgstr "" -#: diskdrake/hd_gtk.pm:339 install_steps_gtk.pm:298 mouse.pm:168 services.pm:162 standalone/drakbackup:1603 standalone/drakperm:250 +#: diskdrake/hd_gtk.pm:339 install_steps_gtk.pm:299 mouse.pm:168 services.pm:162 standalone/drakbackup:1603 standalone/drakperm:250 #, c-format msgid "Other" msgstr "" @@ -1736,7 +1762,7 @@ msgstr "" msgid "Create" msgstr "" -#: diskdrake/hd_gtk.pm:360 diskdrake/hd_gtk.pm:368 diskdrake/interactive.pm:426 diskdrake/interactive.pm:588 diskdrake/removable.pm:25 diskdrake/removable.pm:48 standalone/harddrake2:101 standalone/harddrake2:110 +#: diskdrake/hd_gtk.pm:360 diskdrake/hd_gtk.pm:368 diskdrake/interactive.pm:426 diskdrake/interactive.pm:588 diskdrake/removable.pm:25 diskdrake/removable.pm:48 standalone/harddrake2:103 standalone/harddrake2:112 #, c-format msgid "Type" msgstr "" @@ -1810,7 +1836,7 @@ msgstr "" msgid "Do you want to save /etc/fstab modifications" msgstr "" -#: diskdrake/interactive.pm:294 install_steps_interactive.pm:323 +#: diskdrake/interactive.pm:294 install_steps_interactive.pm:321 #, c-format msgid "You need to reboot for the partition table modifications to take place" msgstr "" @@ -1825,7 +1851,7 @@ msgstr "" msgid "Auto allocate" msgstr "" -#: diskdrake/interactive.pm:309 help.pm:530 help.pm:566 help.pm:606 help.pm:855 install_steps_interactive.pm:124 +#: diskdrake/interactive.pm:309 help.pm:530 help.pm:566 help.pm:606 help.pm:855 install_steps_interactive.pm:122 #, c-format msgid "More" msgstr "" @@ -1842,7 +1868,7 @@ msgstr "" #: diskdrake/interactive.pm:347 #, c-format -msgid "I can't add any more partitions" +msgid "I can not add any more partitions" msgstr "" #: diskdrake/interactive.pm:348 @@ -1982,7 +2008,7 @@ msgstr "" #: diskdrake/interactive.pm:523 #, c-format msgid "" -"You can't create a new partition\n" +"You can not create a new partition\n" "(since you reached the maximal number of primary partitions).\n" "First remove a primary partition and create an extended partition." msgstr "" @@ -2025,7 +2051,7 @@ msgstr "" #: diskdrake/interactive.pm:628 #, c-format msgid "" -"Can't unset mount point as this partition is used for loop back.\n" +"Can not unset mount point as this partition is used for loop back.\n" "Remove the loopback first" msgstr "" @@ -2098,7 +2124,7 @@ msgstr "" #: diskdrake/interactive.pm:866 #, c-format -msgid "This partition can't be used for loopback" +msgid "This partition can not be used for loopback" msgstr "" #: diskdrake/interactive.pm:879 @@ -2240,7 +2266,7 @@ msgstr "" msgid "Type: " msgstr "" -#: diskdrake/interactive.pm:1164 install_steps_gtk.pm:310 +#: diskdrake/interactive.pm:1164 install_steps_gtk.pm:311 #, c-format msgid "Name: " msgstr "" @@ -2446,7 +2472,7 @@ msgstr "" #: diskdrake/smbnfs_gtk.pm:163 #, c-format -msgid "Can't login using username %s (bad password?)" +msgid "Can not login using username %s (bad password?)" msgstr "" #: diskdrake/smbnfs_gtk.pm:167 diskdrake/smbnfs_gtk.pm:176 @@ -2529,22 +2555,22 @@ msgstr "" msgid "Enabling swap partition %s" msgstr "" -#: fs/format.pm:39 fs/format.pm:46 +#: fs/format.pm:44 fs/format.pm:51 #, c-format msgid "Formatting partition %s" msgstr "" -#: fs/format.pm:43 +#: fs/format.pm:48 #, c-format msgid "Creating and formatting file %s" msgstr "" -#: fs/format.pm:78 +#: fs/format.pm:83 #, c-format -msgid "I don't know how to format %s in type %s" +msgid "I do not know how to format %s in type %s" msgstr "" -#: fs/format.pm:80 +#: fs/format.pm:85 #, c-format msgid "%s formatting of %s failed" msgstr "" @@ -2616,12 +2642,12 @@ msgstr "" #: fs/type.pm:364 #, c-format -msgid "You can't use JFS for partitions smaller than 16MB" +msgid "You can not use JFS for partitions smaller than 16MB" msgstr "" #: fs/type.pm:365 #, c-format -msgid "You can't use ReiserFS for partitions smaller than 32MB" +msgid "You can not use ReiserFS for partitions smaller than 32MB" msgstr "" #: fsedit.pm:25 @@ -2637,7 +2663,7 @@ msgstr "" #: fsedit.pm:180 #, c-format msgid "" -"I can't read the partition table of device %s, it's too corrupted for me :(\n" +"I can not read the partition table of device %s, it's too corrupted for me :(\n" "I can try to go on, erasing over bad partitions (ALL DATA will be lost!).\n" "The other solution is to not allow DrakX to modify the partition table.\n" "(the error is %s)\n" @@ -2673,7 +2699,7 @@ msgstr "" #: fsedit.pm:404 #, c-format -msgid "You can't use a LVM Logical Volume for mount point %s" +msgid "You can not use a LVM Logical Volume for mount point %s" msgstr "" #: fsedit.pm:406 @@ -2686,7 +2712,7 @@ msgstr "" #: fsedit.pm:409 #, c-format -msgid "You may not be able to install lilo (since lilo doesn't handle a LV on multiple PVs)" +msgid "You may not be able to install lilo (since lilo does not handle a LV on multiple PVs)" msgstr "" #: fsedit.pm:412 fsedit.pm:414 @@ -2703,7 +2729,7 @@ msgstr "" #: fsedit.pm:420 #, c-format -msgid "You can't use an encrypted file system for mount point %s" +msgid "You can not use an encrypted file system for mount point %s" msgstr "" #: fsedit.pm:481 @@ -2816,7 +2842,7 @@ msgstr "" msgid "Bridges and system controllers" msgstr "" -#: harddrake/data.pm:270 help.pm:186 help.pm:855 install_steps_interactive.pm:995 printer/printerdrake.pm:875 +#: harddrake/data.pm:270 help.pm:186 help.pm:855 install_steps_interactive.pm:993 printer/printerdrake.pm:875 #, c-format msgid "Printer" msgstr "" @@ -2846,52 +2872,52 @@ msgstr "" msgid "PCMCIA controllers" msgstr "" -#: harddrake/data.pm:330 +#: harddrake/data.pm:326 #, c-format msgid "SCSI controllers" msgstr "" -#: harddrake/data.pm:339 +#: harddrake/data.pm:335 #, c-format msgid "USB controllers" msgstr "" -#: harddrake/data.pm:348 +#: harddrake/data.pm:344 #, c-format msgid "USB ports" msgstr "" -#: harddrake/data.pm:357 +#: harddrake/data.pm:353 #, c-format msgid "SMBus controllers" msgstr "" -#: harddrake/data.pm:366 +#: harddrake/data.pm:362 #, c-format msgid "UPS" msgstr "" -#: harddrake/data.pm:375 help.pm:855 install_steps_interactive.pm:120 install_steps_interactive.pm:955 standalone/keyboarddrake:24 +#: harddrake/data.pm:371 help.pm:855 install_steps_interactive.pm:118 install_steps_interactive.pm:953 standalone/keyboarddrake:24 #, c-format msgid "Keyboard" msgstr "" -#: harddrake/data.pm:388 help.pm:855 install_steps_interactive.pm:988 +#: harddrake/data.pm:384 help.pm:855 install_steps_interactive.pm:986 #, c-format msgid "Mouse" msgstr "" -#: harddrake/data.pm:402 +#: harddrake/data.pm:398 #, c-format msgid "Scanner" msgstr "" -#: harddrake/data.pm:412 standalone/harddrake2:447 +#: harddrake/data.pm:408 standalone/harddrake2:449 #, c-format msgid "Unknown/Others" msgstr "" -#: harddrake/data.pm:440 +#: harddrake/data.pm:436 #, c-format msgid "cpu # " msgstr "" @@ -3118,7 +3144,7 @@ msgid "" "button will reboot your computer." msgstr "" -#: help.pm:14 install_steps_gtk.pm:567 install_steps_interactive.pm:94 install_steps_interactive.pm:748 standalone/drakautoinst:216 +#: help.pm:14 install_steps_gtk.pm:568 install_steps_interactive.pm:92 install_steps_interactive.pm:746 standalone/drakautoinst:216 #, c-format msgid "Accept" msgstr "" @@ -3128,16 +3154,16 @@ msgstr "" msgid "" "GNU/Linux is a multi-user system which means each user can have his or her\n" "own preferences, own files and so on. But unlike \"root\", who is the\n" -"system administrator, the users you add at this point won't be authorized\n" +"system administrator, the users you add at this point will not be authorized\n" "to change anything except their own files and their own configurations,\n" "protecting the system from unintentional or malicious changes which could\n" "impact on the system as a whole. You'll have to create at least one regular\n" "user for yourself -- this is the account which you should use for routine,\n" "day-to-day usage. Although it's very easy to log in as \"root\" to do\n" "anything and everything, it may also be very dangerous! A very simple\n" -"mistake could mean that your system won't work any more. If you make a\n" +"mistake could mean that your system will not work any more. If you make a\n" "serious mistake as a regular user, the worst that can happen is that you'll\n" -"lose some information, but you won't affect the entire system.\n" +"lose some information, but you will not affect the entire system.\n" "\n" "The first field asks you for a real name. Of course, this is not mandatory\n" "-- you can actually enter whatever you like. DrakX will use the first word\n" @@ -3158,7 +3184,7 @@ msgid "" "\n" "When you're finished adding users, you'll be asked to choose a user who\n" "will be automatically logged into the system when the computer boots up. If\n" -"you're interested in that feature (and don't care much about local\n" +"you're interested in that feature (and do not care much about local\n" "security), choose the desired user and window manager, then click on\n" "\"%s\". If you're not interested in this feature, uncheck the \"%s\" box." msgstr "" @@ -3168,7 +3194,7 @@ msgstr "" msgid "User name" msgstr "" -#: help.pm:51 help.pm:51 help.pm:431 help.pm:681 install_steps_gtk.pm:247 interactive.pm:403 interactive/newt.pm:317 network/netconnect.pm:280 network/tools.pm:201 printer/printerdrake.pm:3268 standalone/drakTermServ:374 standalone/drakbackup:3940 standalone/drakbackup:4034 standalone/drakbackup:4051 standalone/drakbackup:4069 ugtk2.pm:512 +#: help.pm:51 help.pm:51 help.pm:431 help.pm:681 install_steps_gtk.pm:248 interactive.pm:403 interactive/newt.pm:317 network/netconnect.pm:280 network/tools.pm:201 printer/printerdrake.pm:3268 standalone/drakTermServ:374 standalone/drakbackup:3940 standalone/drakbackup:4034 standalone/drakbackup:4051 standalone/drakbackup:4069 ugtk2.pm:508 #, c-format msgid "Next" msgstr "" @@ -3297,7 +3323,7 @@ msgstr "" msgid "Graphical Environment" msgstr "" -#: help.pm:146 install_steps_gtk.pm:242 install_steps_interactive.pm:659 +#: help.pm:146 install_steps_gtk.pm:243 install_steps_interactive.pm:657 #, c-format msgid "Individual package selection" msgstr "" @@ -3307,7 +3333,7 @@ msgstr "" msgid "Upgrade" msgstr "" -#: help.pm:146 install_steps_interactive.pm:613 +#: help.pm:146 install_steps_interactive.pm:611 #, c-format msgid "With X" msgstr "" @@ -3340,7 +3366,7 @@ msgid "" "services at boot time. Even if they are safe and have no known issues at\n" "the time the distribution was shipped, it is entirely possible that\n" "security holes were discovered after this version of Mandrakelinux was\n" -"finalized. If you don't know what a particular service is supposed to do or\n" +"finalized. If you do not know what a particular service is supposed to do or\n" "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n" "the listed services and they will be started automatically at boot time. !!\n" "\n" @@ -3359,12 +3385,12 @@ msgid "" "such a floppy." msgstr "" -#: help.pm:180 help.pm:285 help.pm:313 help.pm:444 install_any.pm:729 interactive.pm:149 modules/interactive.pm:71 standalone/drakbackup:2502 standalone/draksec:54 standalone/harddrake2:314 ugtk2.pm:1118 wizards.pm:156 +#: help.pm:180 help.pm:285 help.pm:313 help.pm:444 install_any.pm:741 interactive.pm:149 modules/interactive.pm:71 standalone/drakbackup:2502 standalone/draksec:54 standalone/harddrake2:316 ugtk2.pm:1037 wizards.pm:156 wizards2.pm:158 #, c-format msgid "No" msgstr "" -#: help.pm:180 help.pm:285 help.pm:444 help.pm:444 install_any.pm:729 interactive.pm:149 modules/interactive.pm:71 printer/printerdrake.pm:711 standalone/drakbackup:2502 standalone/drakgw:290 standalone/drakgw:291 standalone/drakgw:299 standalone/drakgw:309 standalone/draksec:55 standalone/harddrake2:313 ugtk2.pm:1118 wizards.pm:156 +#: help.pm:180 help.pm:285 help.pm:444 help.pm:444 install_any.pm:741 interactive.pm:149 modules/interactive.pm:71 printer/printerdrake.pm:711 standalone/drakbackup:2502 standalone/drakgw:290 standalone/drakgw:291 standalone/drakgw:299 standalone/drakgw:309 standalone/draksec:55 standalone/harddrake2:315 ugtk2.pm:1037 wizards.pm:156 wizards2.pm:158 #, c-format msgid "Yes" msgstr "" @@ -3383,7 +3409,7 @@ msgid "" "manual is similar to the one used during installation." msgstr "" -#: help.pm:186 help.pm:566 help.pm:855 help.pm:855 help.pm:855 help.pm:855 help.pm:855 help.pm:855 help.pm:855 install_steps_gtk.pm:623 standalone/drakbackup:2328 standalone/drakbackup:2332 standalone/drakbackup:2336 standalone/drakbackup:2340 +#: help.pm:186 help.pm:566 help.pm:855 help.pm:855 help.pm:855 help.pm:855 help.pm:855 help.pm:855 help.pm:855 install_steps_gtk.pm:624 standalone/drakbackup:2328 standalone/drakbackup:2332 standalone/drakbackup:2336 standalone/drakbackup:2340 #, c-format msgid "Configure" msgstr "" @@ -3395,7 +3421,7 @@ msgid "" "time.\n" "\n" "DrakX will list all services available on the current installation. Review\n" -"each one of them carefully and uncheck those which aren't needed at boot\n" +"each one of them carefully and uncheck those which are not needed at boot\n" "time.\n" "\n" "A short explanatory text will be displayed about a service when it is\n" @@ -3403,7 +3429,7 @@ msgid "" "it is safer to leave the default behavior.\n" "\n" "!! At this stage, be very careful if you intend to use your machine as a\n" -"server: you probably don't want to start any services which you don't need.\n" +"server: you probably do not want to start any services which you do not need.\n" "Please remember that some services can be dangerous if they're enabled on a\n" "server. In general, select only those services you really need. !!" msgstr "" @@ -3425,7 +3451,7 @@ msgid "" "server which can be used by other machines on your local network as well." msgstr "" -#: help.pm:217 install_steps_interactive.pm:890 +#: help.pm:217 install_steps_interactive.pm:888 #, c-format msgid "Hardware clock set to GMT" msgstr "" @@ -3594,7 +3620,7 @@ msgid "" "\n" " * \"%s\". If you want to delete all data and all partitions present on\n" "your hard drive and replace them with your new Mandrakelinux system, choose\n" -"this option. Be careful, because you won't be able to undo this operation\n" +"this option. Be careful, because you will not be able to undo this operation\n" "after you confirm.\n" "\n" " !! If you choose this option, all data on your disk will be deleted. !!\n" @@ -3647,7 +3673,7 @@ msgstr "" #, c-format msgid "" "There you are. Installation is now complete and your GNU/Linux system is\n" -"ready to be used. Just click on \"%s\" to reboot the system. Don't forget\n" +"ready to be used. Just click on \"%s\" to reboot the system. Do not forget\n" "to remove the installation media (CD-ROM or floppy). The first thing you\n" "should see after your computer has finished doing its hardware tests is the\n" "boot-loader menu, giving you the choice of which operating system to start.\n" @@ -3686,17 +3712,17 @@ msgstr "" msgid "Generate auto-install floppy" msgstr "" -#: help.pm:409 install_steps_interactive.pm:1367 +#: help.pm:409 install_steps_interactive.pm:1342 #, c-format msgid "Replay" msgstr "" -#: help.pm:409 install_steps_interactive.pm:1367 +#: help.pm:409 install_steps_interactive.pm:1342 #, c-format msgid "Automated" msgstr "" -#: help.pm:409 install_steps_interactive.pm:1370 +#: help.pm:409 install_steps_interactive.pm:1345 #, c-format msgid "Save packages selection" msgstr "" @@ -3710,12 +3736,12 @@ msgid "" "\n" "Please note that it's not necessary to reformat all pre-existing\n" "partitions. You must reformat the partitions containing the operating\n" -"system (such as \"/\", \"/usr\" or \"/var\") but you don't have to reformat\n" +"system (such as \"/\", \"/usr\" or \"/var\") but you do not have to reformat\n" "partitions containing data that you wish to keep (typically \"/home\").\n" "\n" "Please be careful when selecting partitions. After the formatting is\n" "completed, all data on the selected partitions will be deleted and you\n" -"won't be able to recover it.\n" +"will not be able to recover it.\n" "\n" "Click on \"%s\" when you're ready to format the partitions.\n" "\n" @@ -3726,7 +3752,7 @@ msgid "" "bad blocks on the disk." msgstr "" -#: help.pm:431 install_steps_gtk.pm:402 interactive.pm:404 interactive/newt.pm:316 printer/printerdrake.pm:3266 standalone/drakTermServ:353 standalone/drakbackup:3900 standalone/drakbackup:3939 standalone/drakbackup:4050 standalone/drakbackup:4065 ugtk2.pm:510 +#: help.pm:431 install_steps_gtk.pm:403 interactive.pm:404 interactive/newt.pm:316 printer/printerdrake.pm:3266 standalone/drakTermServ:353 standalone/drakbackup:3900 standalone/drakbackup:3939 standalone/drakbackup:4050 standalone/drakbackup:4065 ugtk2.pm:506 #, c-format msgid "Previous" msgstr "" @@ -3747,7 +3773,7 @@ msgid "" "the selected package(s), or \"%s\" to abort." msgstr "" -#: help.pm:444 help.pm:588 install_steps_gtk.pm:401 install_steps_interactive.pm:158 standalone/drakbackup:4097 +#: help.pm:444 help.pm:588 install_steps_gtk.pm:402 install_steps_interactive.pm:156 standalone/drakbackup:4097 #, c-format msgid "Install" msgstr "" @@ -3761,7 +3787,7 @@ msgid "" "exposed to the Internet. The trade-off that a higher security level is\n" "generally obtained at the expense of ease of use.\n" "\n" -"If you don't know what to choose, keep the default option. You'll be able\n" +"If you do not know what to choose, keep the default option. You'll be able\n" "to change it later with the draksec tool, which is part of Mandrakelinux\n" "Control Center.\n" "\n" @@ -3804,7 +3830,7 @@ msgid "" "floppy disk.\n" "\n" " * \"%s\": if your partition table is damaged, you can try to recover it\n" -"using this option. Please be careful and remember that it doesn't always\n" +"using this option. Please be careful and remember that it does not always\n" "work.\n" "\n" " * \"%s\": discards all changes and reloads the partition table that was\n" @@ -3897,7 +3923,7 @@ msgstr "" #, c-format msgid "" "\"%s\": check the current country selection. If you're not in this country,\n" -"click on the \"%s\" button and choose another. If your country isn't in the\n" +"click on the \"%s\" button and choose another. If your country is not in the\n" "list shown, click on the \"%s\" button to get the complete country list." msgstr "" @@ -3918,7 +3944,7 @@ msgid "" "\n" " * \"%s\". This installation class allows you to update the packages\n" "currently installed on your Mandrakelinux system. Your current partitioning\n" -"scheme and user data won't be altered. Most of the other configuration\n" +"scheme and user data will not be altered. Most of the other configuration\n" "steps remain available and are similar to a standard installation.\n" "\n" "Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n" @@ -3937,7 +3963,7 @@ msgid "" "language: for example, if you are an English-speaking Swiss native, you may\n" "have a Swiss keyboard. Or if you speak English and are located in Quebec,\n" "you may find yourself in the same situation where your native language and\n" -"country-set keyboard don't match. In either case, this installation step\n" +"country-set keyboard do not match. In either case, this installation step\n" "will allow you to select an appropriate keyboard from a list.\n" "\n" "Click on the \"%s\" button to be shown a list of supported keyboards.\n" @@ -4070,10 +4096,10 @@ msgid "" "characters long. Never write down the \"root\" password -- it makes it far\n" "too easy to compromise your system.\n" "\n" -"One caveat: don't make the password too long or too complicated because you\n" +"One caveat: do not make the password too long or too complicated because you\n" "must be able to remember it!\n" "\n" -"The password won't be displayed on screen as you type it. To reduce the\n" +"The password will not be displayed on screen as you type it. To reduce the\n" "chance of a blind typing error you'll need to enter the password twice. If\n" "you do happen to make the same typing error twice, you'll have to use this\n" "``incorrect'' password the first time you'll try to connect as \"root\".\n" @@ -4082,7 +4108,7 @@ msgid "" "click on the \"%s\" button.\n" "\n" "If your network uses either LDAP, NIS, or PDC Windows Domain authentication\n" -"services, select the appropriate one for \"%s\". If you don't know which\n" +"services, select the appropriate one for \"%s\". If you do not know which\n" "one to use, you should ask your network administrator.\n" "\n" "If you happen to have problems with remembering passwords, or if your\n" @@ -4095,12 +4121,6 @@ msgstr "" msgid "authentication" msgstr "" -#. -PO: keep this short or else the buttons will not fit in the window -#: help.pm:722 install_steps_interactive.pm:1214 -#, c-format -msgid "No password" -msgstr "" - #: help.pm:725 #, c-format msgid "" @@ -4115,9 +4135,9 @@ msgid "" "\n" " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n" "\n" -"If DrakX can't determine where to place the boot sector, it'll ask you\n" +"If DrakX can not determine where to place the boot sector, it'll ask you\n" "where it should place it. Generally, the \"%s\" is the safest place.\n" -"Choosing \"%s\" won't install any boot loader. Use this option only if you\n" +"Choosing \"%s\" will not install any boot loader. Use this option only if you\n" "know what you're doing." msgstr "" @@ -4128,9 +4148,9 @@ msgid "" "operating systems may offer you one, but Mandrakelinux offers two. Each of\n" "the printing systems is best suited to particular types of configuration.\n" "\n" -" * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice\n" +" * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n" "if you have a direct connection to your printer, you want to be able to\n" -"panic out of printer jams, and you don't have networked printers. (\"%s\"\n" +"panic out of printer jams, and you do not have networked printers. (\"%s\"\n" "will handle only very simple network cases and is somewhat slow when used\n" "within networks.) It's recommended that you use \"pdq\" if this is your\n" "first experience with GNU/Linux.\n" @@ -4145,7 +4165,7 @@ msgid "" "\"%s\" includes graphical front-ends for printing or choosing printer\n" "options and for managing the printer.\n" "\n" -"If you make a choice now, and later find that you don't like your printing\n" +"If you make a choice now, and later find that you do not like your printing\n" "system you may change it by running PrinterDrake from the Mandrakelinux\n" "Control Center and clicking on the \"%s\" button." msgstr "" @@ -4190,11 +4210,11 @@ msgstr "" #, c-format msgid "" "\"%s\": if a sound card is detected on your system, it'll be displayed\n" -"here. If you notice the sound card isn't the one actually present on your\n" +"here. If you notice the sound card is not the one actually present on your\n" "system, you can click on the button and choose a different driver." msgstr "" -#: help.pm:788 help.pm:855 install_steps_interactive.pm:1022 install_steps_interactive.pm:1039 +#: help.pm:788 help.pm:855 install_steps_interactive.pm:1020 install_steps_interactive.pm:1037 #, c-format msgid "Sound card" msgstr "" @@ -4213,7 +4233,7 @@ msgid "" "\n" " * \"%s\": check the current country selection. If you're not in this\n" "country, click on the \"%s\" button and choose another. If your country\n" -"isn't in the list shown, click on the \"%s\" button to get the complete\n" +"is not in the list shown, click on the \"%s\" button to get the complete\n" "country list.\n" "\n" " * \"%s\": by default, DrakX deduces your time zone based on the country\n" @@ -4229,18 +4249,18 @@ msgid "" "presented in our manual is similar to the one used during installation.\n" "\n" " * \"%s\": if a sound card is detected on your system, it'll be displayed\n" -"here. If you notice the sound card isn't the one actually present on your\n" +"here. If you notice the sound card is not the one actually present on your\n" "system, you can click on the button and choose a different driver.\n" "\n" " * \"%s\": if you have a TV card, this is where information about its\n" -"configuration will be displayed. If you have a TV card and it isn't\n" +"configuration will be displayed. If you have a TV card and it is not\n" "detected, click on \"%s\" to try to configure it manually.\n" "\n" " * \"%s\": you can click on \"%s\" to change the parameters associated with\n" "the card if you feel the configuration is wrong.\n" "\n" " * \"%s\": by default, DrakX configures your graphical interface in\n" -"\"800x600\" or \"1024x768\" resolution. If that doesn't suit you, click on\n" +"\"800x600\" or \"1024x768\" resolution. If that does not suit you, click on\n" "\"%s\" to reconfigure your graphical interface.\n" "\n" " * \"%s\": if you wish to configure your Internet or local network access,\n" @@ -4269,12 +4289,12 @@ msgid "" "idea to review this setup." msgstr "" -#: help.pm:855 install_steps_interactive.pm:981 standalone/drakclock:101 +#: help.pm:855 install_steps_interactive.pm:979 standalone/drakclock:101 #, c-format msgid "Timezone" msgstr "" -#: help.pm:855 install_steps_interactive.pm:1055 +#: help.pm:855 install_steps_interactive.pm:1053 #, c-format msgid "TV card" msgstr "" @@ -4289,32 +4309,32 @@ msgstr "" msgid "Graphical Interface" msgstr "" -#: help.pm:855 install_steps_interactive.pm:1073 standalone/drakbackup:2030 +#: help.pm:855 install_steps_interactive.pm:1071 standalone/drakbackup:2030 #, c-format msgid "Network" msgstr "" -#: help.pm:855 install_steps_interactive.pm:1088 +#: help.pm:855 install_steps_interactive.pm:1086 #, c-format msgid "Proxies" msgstr "" -#: help.pm:855 install_steps_interactive.pm:1099 +#: help.pm:855 install_steps_interactive.pm:1097 #, c-format msgid "Security Level" msgstr "" -#: help.pm:855 install_steps_interactive.pm:1113 +#: help.pm:855 install_steps_interactive.pm:1111 #, c-format msgid "Firewall" msgstr "" -#: help.pm:855 install_steps_interactive.pm:1127 +#: help.pm:855 install_steps_interactive.pm:1125 #, c-format msgid "Bootloader" msgstr "" -#: help.pm:855 install_steps_interactive.pm:1140 services.pm:193 +#: help.pm:855 install_steps_interactive.pm:1138 services.pm:193 #, c-format msgid "Services" msgstr "" @@ -4351,7 +4371,7 @@ msgstr "" #: install2.pm:117 #, c-format -msgid "Can't access kernel modules corresponding to your kernel (file %s is missing), this generally means your boot floppy in not in sync with the Installation medium (please create a newer boot floppy)" +msgid "Can not access kernel modules corresponding to your kernel (file %s is missing), this generally means your boot floppy in not in sync with the Installation medium (please create a newer boot floppy)" msgstr "" #: install2.pm:167 @@ -4406,29 +4426,34 @@ msgstr "" msgid "Insert the CD" msgstr "" -#: install_any.pm:493 +#: install_any.pm:474 +#, c-format +msgid "Unable to mount CD-ROM" +msgstr "" + +#: install_any.pm:497 #, c-format msgid "Insert the CD 1 again" msgstr "" -#: install_any.pm:503 install_any.pm:507 +#: install_any.pm:507 install_any.pm:511 #, c-format msgid "URL of the mirror?" msgstr "" -#: install_any.pm:539 +#: install_any.pm:543 #, c-format -msgid "Can't find hdlist file on this mirror" +msgid "Can not find hdlist file on this mirror" msgstr "" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: install_any.pm:720 +#: install_any.pm:732 #, c-format msgid "" "You have selected the following server(s): %s\n" "\n" "\n" -"These servers are activated by default. They don't have any known security\n" +"These servers are activated by default. They do not have any known security\n" "issues, but some new ones could be found. In that case, you must make sure\n" "to upgrade as soon as possible.\n" "\n" @@ -4438,7 +4463,7 @@ msgid "" msgstr "" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: install_any.pm:743 +#: install_any.pm:755 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -4448,37 +4473,37 @@ msgid "" "" msgstr "" -#: install_any.pm:1123 +#: install_any.pm:1139 #, c-format msgid "Insert a FAT formatted floppy in drive %s" msgstr "" -#: install_any.pm:1127 +#: install_any.pm:1143 #, c-format msgid "This floppy is not FAT formatted" msgstr "" -#: install_any.pm:1139 +#: install_any.pm:1155 #, c-format msgid "To use this saved packages selection, boot installation with ``linux defcfg=floppy''" msgstr "" -#: install_any.pm:1167 partition_table.pm:599 +#: install_any.pm:1183 partition_table.pm:599 #, c-format msgid "Error reading file %s" msgstr "" -#: install_any.pm:1366 +#: install_any.pm:1382 #, c-format msgid "The " msgstr "" -#: install_any.pm:1368 +#: install_any.pm:1384 #, c-format msgid "%s (was %s)" msgstr "" -#: install_any.pm:1406 +#: install_any.pm:1422 #, c-format msgid "An error occurred - no valid devices were found on which to create new filesystems. Please check your hardware for the cause of this problem" msgstr "" @@ -4511,7 +4536,7 @@ msgstr "" #: install_interactive.pm:67 #, c-format msgid "" -"You don't have a swap partition.\n" +"You do not have a swap partition.\n" "\n" "Continue anyway?" msgstr "" @@ -4653,12 +4678,12 @@ msgstr "" #, c-format msgid "" "You can now partition %s.\n" -"When you are done, don't forget to save using `w'" +"When you are done, do not forget to save using `w'" msgstr "" #: install_interactive.pm:271 #, c-format -msgid "I can't find any room for installing" +msgid "I can not find any room for installing" msgstr "" #: install_interactive.pm:275 @@ -4841,13 +4866,13 @@ msgstr "" #: install_steps.pm:477 #, c-format msgid "" -"Some important packages didn't get installed properly.\n" +"Some important packages did not get installed properly.\n" "Either your cdrom drive or your cdrom is defective.\n" "Check the cdrom on an installed computer using \"rpm -qpl media/main/*.rpm\"\n" "" msgstr "" -#: install_steps.pm:603 +#: install_steps.pm:604 #, c-format msgid "No floppy drive available" msgstr "" @@ -4859,7 +4884,7 @@ msgid "" "" msgstr "" -#: install_steps_gtk.pm:184 +#: install_steps_gtk.pm:185 #, c-format msgid "" "Your system is low on resources. You may have some problem installing\n" @@ -4867,433 +4892,428 @@ msgid "" "press `F1' when booting on CDROM, then enter `text'." msgstr "" -#: install_steps_gtk.pm:235 install_steps_interactive.pm:641 +#: install_steps_gtk.pm:236 install_steps_interactive.pm:639 #, c-format msgid "Package Group Selection" msgstr "" -#: install_steps_gtk.pm:264 install_steps_interactive.pm:580 +#: install_steps_gtk.pm:265 install_steps_interactive.pm:578 #, c-format msgid "Total size: %d / %d MB" msgstr "" -#: install_steps_gtk.pm:309 +#: install_steps_gtk.pm:310 #, c-format msgid "Bad package" msgstr "" -#: install_steps_gtk.pm:311 +#: install_steps_gtk.pm:312 #, c-format msgid "Version: " msgstr "" -#: install_steps_gtk.pm:312 +#: install_steps_gtk.pm:313 #, c-format msgid "Size: " msgstr "" -#: install_steps_gtk.pm:312 +#: install_steps_gtk.pm:313 #, c-format msgid "" "%d KB\n" "" msgstr "" -#: install_steps_gtk.pm:313 +#: install_steps_gtk.pm:314 #, c-format msgid "Importance: " msgstr "" -#: install_steps_gtk.pm:346 +#: install_steps_gtk.pm:347 #, c-format -msgid "You can't select/unselect this package" +msgid "You can not select/unselect this package" msgstr "" -#: install_steps_gtk.pm:350 +#: install_steps_gtk.pm:351 #, c-format msgid "due to missing %s" msgstr "" -#: install_steps_gtk.pm:351 +#: install_steps_gtk.pm:352 #, c-format msgid "due to unsatisfied %s" msgstr "" -#: install_steps_gtk.pm:352 +#: install_steps_gtk.pm:353 #, c-format msgid "trying to promote %s" msgstr "" -#: install_steps_gtk.pm:353 +#: install_steps_gtk.pm:354 #, c-format msgid "in order to keep %s" msgstr "" -#: install_steps_gtk.pm:358 +#: install_steps_gtk.pm:359 #, c-format -msgid "You can't select this package as there is not enough space left to install it" +msgid "You can not select this package as there is not enough space left to install it" msgstr "" -#: install_steps_gtk.pm:361 +#: install_steps_gtk.pm:362 #, c-format msgid "The following packages are going to be installed" msgstr "" -#: install_steps_gtk.pm:362 +#: install_steps_gtk.pm:363 #, c-format msgid "The following packages are going to be removed" msgstr "" -#: install_steps_gtk.pm:386 +#: install_steps_gtk.pm:387 #, c-format -msgid "This is a mandatory package, it can't be unselected" +msgid "This is a mandatory package, it can not be unselected" msgstr "" -#: install_steps_gtk.pm:388 +#: install_steps_gtk.pm:389 #, c-format -msgid "You can't unselect this package. It is already installed" +msgid "You can not unselect this package. It is already installed" msgstr "" -#: install_steps_gtk.pm:391 +#: install_steps_gtk.pm:392 #, c-format msgid "" "This package must be upgraded.\n" "Are you sure you want to deselect it?" msgstr "" -#: install_steps_gtk.pm:394 +#: install_steps_gtk.pm:395 #, c-format -msgid "You can't unselect this package. It must be upgraded" +msgid "You can not unselect this package. It must be upgraded" msgstr "" -#: install_steps_gtk.pm:399 +#: install_steps_gtk.pm:400 #, c-format msgid "Show automatically selected packages" msgstr "" -#: install_steps_gtk.pm:404 +#: install_steps_gtk.pm:405 #, c-format msgid "Load/Save on floppy" msgstr "" -#: install_steps_gtk.pm:405 +#: install_steps_gtk.pm:406 #, c-format msgid "Updating package selection" msgstr "" -#: install_steps_gtk.pm:410 +#: install_steps_gtk.pm:411 #, c-format msgid "Minimal install" msgstr "" -#: install_steps_gtk.pm:424 install_steps_interactive.pm:494 +#: install_steps_gtk.pm:425 install_steps_interactive.pm:492 #, c-format msgid "Choose the packages you want to install" msgstr "" -#: install_steps_gtk.pm:440 install_steps_interactive.pm:723 +#: install_steps_gtk.pm:441 install_steps_interactive.pm:721 #, c-format msgid "Installing" msgstr "" -#: install_steps_gtk.pm:447 +#: install_steps_gtk.pm:448 #, c-format msgid "Estimating" msgstr "" -#: install_steps_gtk.pm:453 +#: install_steps_gtk.pm:454 #, c-format msgid "Time remaining " msgstr "" -#: install_steps_gtk.pm:464 +#: install_steps_gtk.pm:465 #, c-format msgid "Please wait, preparing installation..." msgstr "" -#: install_steps_gtk.pm:474 +#: install_steps_gtk.pm:475 #, c-format msgid "No details" msgstr "" -#: install_steps_gtk.pm:527 +#: install_steps_gtk.pm:528 #, c-format msgid "%d packages" msgstr "" -#: install_steps_gtk.pm:532 +#: install_steps_gtk.pm:533 #, c-format msgid "Installing package %s" msgstr "" -#: install_steps_gtk.pm:567 install_steps_interactive.pm:94 install_steps_interactive.pm:748 +#: install_steps_gtk.pm:568 install_steps_interactive.pm:92 install_steps_interactive.pm:746 #, c-format msgid "Refuse" msgstr "" -#: install_steps_gtk.pm:571 install_steps_interactive.pm:752 +#: install_steps_gtk.pm:572 install_steps_interactive.pm:750 #, c-format msgid "" "Change your Cd-Rom!\n" "Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when done.\n" -"If you don't have it, press Cancel to avoid installation from this Cd-Rom." +"If you do not have it, press Cancel to avoid installation from this Cd-Rom." msgstr "" -#: install_steps_gtk.pm:586 install_steps_interactive.pm:763 +#: install_steps_gtk.pm:587 install_steps_interactive.pm:761 #, c-format msgid "There was an error ordering packages:" msgstr "" -#: install_steps_gtk.pm:586 install_steps_gtk.pm:590 install_steps_interactive.pm:763 install_steps_interactive.pm:767 +#: install_steps_gtk.pm:587 install_steps_gtk.pm:591 install_steps_interactive.pm:761 install_steps_interactive.pm:765 #, c-format msgid "Go on anyway?" msgstr "" -#: install_steps_gtk.pm:590 install_steps_interactive.pm:767 +#: install_steps_gtk.pm:591 install_steps_interactive.pm:765 #, c-format msgid "There was an error installing packages:" msgstr "" -#: install_steps_gtk.pm:633 install_steps_interactive.pm:937 install_steps_interactive.pm:1089 +#: install_steps_gtk.pm:634 install_steps_interactive.pm:935 install_steps_interactive.pm:1087 #, c-format msgid "not configured" msgstr "" -#: install_steps_interactive.pm:86 -#, c-format -msgid "Do you want to recover your system?" -msgstr "" - -#: install_steps_interactive.pm:87 +#: install_steps_interactive.pm:85 #, c-format msgid "License agreement" msgstr "" -#: install_steps_interactive.pm:91 install_steps_interactive.pm:91 +#: install_steps_interactive.pm:89 install_steps_interactive.pm:89 #, c-format msgid "Release Notes" msgstr "" -#: install_steps_interactive.pm:121 +#: install_steps_interactive.pm:119 #, c-format msgid "Please choose your keyboard layout." msgstr "" -#: install_steps_interactive.pm:123 +#: install_steps_interactive.pm:121 #, c-format msgid "Here is the full list of available keyboards" msgstr "" -#: install_steps_interactive.pm:153 +#: install_steps_interactive.pm:151 #, c-format msgid "Install/Upgrade" msgstr "" -#: install_steps_interactive.pm:154 +#: install_steps_interactive.pm:152 #, c-format msgid "Is this an install or an upgrade?" msgstr "" -#: install_steps_interactive.pm:160 +#: install_steps_interactive.pm:158 #, c-format msgid "Upgrade %s" msgstr "" -#: install_steps_interactive.pm:170 +#: install_steps_interactive.pm:168 #, c-format msgid "Encryption key for %s" msgstr "" -#: install_steps_interactive.pm:187 +#: install_steps_interactive.pm:185 #, c-format msgid "Please choose your type of mouse." msgstr "" -#: install_steps_interactive.pm:196 standalone/mousedrake:46 +#: install_steps_interactive.pm:194 standalone/mousedrake:46 #, c-format msgid "Mouse Port" msgstr "" -#: install_steps_interactive.pm:197 standalone/mousedrake:47 +#: install_steps_interactive.pm:195 standalone/mousedrake:47 #, c-format msgid "Please choose which serial port your mouse is connected to." msgstr "" -#: install_steps_interactive.pm:207 +#: install_steps_interactive.pm:205 #, c-format msgid "Buttons emulation" msgstr "" -#: install_steps_interactive.pm:209 +#: install_steps_interactive.pm:207 #, c-format msgid "Button 2 Emulation" msgstr "" -#: install_steps_interactive.pm:210 +#: install_steps_interactive.pm:208 #, c-format msgid "Button 3 Emulation" msgstr "" -#: install_steps_interactive.pm:231 +#: install_steps_interactive.pm:229 #, c-format msgid "PCMCIA" msgstr "" -#: install_steps_interactive.pm:231 +#: install_steps_interactive.pm:229 #, c-format msgid "Configuring PCMCIA cards..." msgstr "" -#: install_steps_interactive.pm:238 +#: install_steps_interactive.pm:236 #, c-format msgid "IDE" msgstr "" -#: install_steps_interactive.pm:238 +#: install_steps_interactive.pm:236 #, c-format msgid "Configuring IDE" msgstr "" -#: install_steps_interactive.pm:258 network/tools.pm:191 +#: install_steps_interactive.pm:256 network/tools.pm:191 #, c-format msgid "No partition available" msgstr "" -#: install_steps_interactive.pm:261 +#: install_steps_interactive.pm:259 #, c-format msgid "Scanning partitions to find mount points" msgstr "" -#: install_steps_interactive.pm:268 +#: install_steps_interactive.pm:266 #, c-format msgid "Choose the mount points" msgstr "" -#: install_steps_interactive.pm:306 +#: install_steps_interactive.pm:304 #, c-format msgid "No free space for 1MB bootstrap! Install will continue, but to boot your system, you'll need to create the bootstrap partition in DiskDrake" msgstr "" -#: install_steps_interactive.pm:311 +#: install_steps_interactive.pm:309 #, c-format msgid "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but to boot your system, you'll need to create the bootstrap partition in DiskDrake" msgstr "" -#: install_steps_interactive.pm:347 +#: install_steps_interactive.pm:345 #, c-format msgid "Choose the partitions you want to format" msgstr "" -#: install_steps_interactive.pm:349 +#: install_steps_interactive.pm:347 #, c-format msgid "Check bad blocks?" msgstr "" -#: install_steps_interactive.pm:381 +#: install_steps_interactive.pm:379 #, c-format msgid "Failed to check filesystem %s. Do you want to repair the errors? (beware, you can lose data)" msgstr "" -#: install_steps_interactive.pm:384 +#: install_steps_interactive.pm:382 #, c-format msgid "Not enough swap space to fulfill installation, please add some" msgstr "" -#: install_steps_interactive.pm:391 +#: install_steps_interactive.pm:389 #, c-format msgid "Looking for available packages and rebuilding rpm database..." msgstr "" -#: install_steps_interactive.pm:392 install_steps_interactive.pm:455 +#: install_steps_interactive.pm:390 install_steps_interactive.pm:453 #, c-format msgid "Looking for available packages..." msgstr "" -#: install_steps_interactive.pm:395 +#: install_steps_interactive.pm:393 #, c-format msgid "Looking at packages already installed..." msgstr "" -#: install_steps_interactive.pm:399 +#: install_steps_interactive.pm:397 #, c-format msgid "Finding packages to upgrade..." msgstr "" -#: install_steps_interactive.pm:424 install_steps_interactive.pm:842 +#: install_steps_interactive.pm:422 install_steps_interactive.pm:840 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "" -#: install_steps_interactive.pm:464 +#: install_steps_interactive.pm:462 #, c-format msgid "Your system does not have enough space left for installation or upgrade (%d > %d)" msgstr "" -#: install_steps_interactive.pm:506 +#: install_steps_interactive.pm:504 #, c-format msgid "" "Please choose load or save package selection on floppy.\n" "The format is the same as auto_install generated floppies." msgstr "" -#: install_steps_interactive.pm:508 +#: install_steps_interactive.pm:506 #, c-format msgid "Load from floppy" msgstr "" -#: install_steps_interactive.pm:508 +#: install_steps_interactive.pm:506 #, c-format msgid "Save on floppy" msgstr "" -#: install_steps_interactive.pm:512 +#: install_steps_interactive.pm:510 #, c-format msgid "Package selection" msgstr "" -#: install_steps_interactive.pm:512 +#: install_steps_interactive.pm:510 #, c-format msgid "Loading from floppy" msgstr "" -#: install_steps_interactive.pm:517 +#: install_steps_interactive.pm:515 #, c-format msgid "Insert a floppy containing package selection" msgstr "" -#: install_steps_interactive.pm:594 +#: install_steps_interactive.pm:592 #, c-format msgid "Selected size is larger than available space" msgstr "" -#: install_steps_interactive.pm:609 +#: install_steps_interactive.pm:607 #, c-format msgid "Type of install" msgstr "" -#: install_steps_interactive.pm:610 +#: install_steps_interactive.pm:608 #, c-format msgid "" -"You haven't selected any group of packages.\n" +"You have not selected any group of packages.\n" "Please choose the minimal installation you want:" msgstr "" -#: install_steps_interactive.pm:614 +#: install_steps_interactive.pm:612 #, c-format msgid "With basic documentation (recommended!)" msgstr "" -#: install_steps_interactive.pm:615 +#: install_steps_interactive.pm:613 #, c-format msgid "Truly minimal install (especially no urpmi)" msgstr "" -#: install_steps_interactive.pm:658 standalone/drakxtv:52 +#: install_steps_interactive.pm:656 standalone/drakxtv:52 #, c-format msgid "All" msgstr "" -#: install_steps_interactive.pm:697 +#: install_steps_interactive.pm:695 #, c-format msgid "" "If you have all the CDs in the list below, click Ok.\n" @@ -5301,34 +5321,34 @@ msgid "" "If only some CDs are missing, unselect them, then click Ok." msgstr "" -#: install_steps_interactive.pm:702 +#: install_steps_interactive.pm:700 #, c-format msgid "Cd-Rom labeled \"%s\"" msgstr "" -#: install_steps_interactive.pm:723 +#: install_steps_interactive.pm:721 #, c-format msgid "Preparing installation" msgstr "" -#: install_steps_interactive.pm:732 +#: install_steps_interactive.pm:730 #, c-format msgid "" "Installing package %s\n" "%d%%" msgstr "" -#: install_steps_interactive.pm:781 +#: install_steps_interactive.pm:779 #, c-format msgid "Post-install configuration" msgstr "" -#: install_steps_interactive.pm:787 +#: install_steps_interactive.pm:785 #, c-format msgid "Please insert the Update Modules floppy in drive %s" msgstr "" -#: install_steps_interactive.pm:816 +#: install_steps_interactive.pm:814 #, c-format msgid "" "You now have the opportunity to download updated packages. These packages\n" @@ -5341,195 +5361,175 @@ msgid "" "Do you want to install the updates?" msgstr "" -#: install_steps_interactive.pm:837 +#: install_steps_interactive.pm:835 #, c-format msgid "Contacting Mandrakelinux web site to get the list of available mirrors..." msgstr "" -#: install_steps_interactive.pm:856 +#: install_steps_interactive.pm:854 #, c-format msgid "Contacting the mirror to get the list of available packages..." msgstr "" -#: install_steps_interactive.pm:860 +#: install_steps_interactive.pm:858 #, c-format msgid "Unable to contact mirror %s" msgstr "" -#: install_steps_interactive.pm:860 +#: install_steps_interactive.pm:858 #, c-format msgid "Would you like to try again?" msgstr "" -#: install_steps_interactive.pm:886 standalone/drakclock:46 +#: install_steps_interactive.pm:884 standalone/drakclock:46 #, c-format msgid "Which is your timezone?" msgstr "" -#: install_steps_interactive.pm:891 +#: install_steps_interactive.pm:889 #, c-format msgid "Automatic time synchronization (using NTP)" msgstr "" -#: install_steps_interactive.pm:899 +#: install_steps_interactive.pm:897 #, c-format msgid "NTP Server" msgstr "" -#: install_steps_interactive.pm:941 steps.pm:30 +#: install_steps_interactive.pm:939 steps.pm:30 #, c-format msgid "Summary" msgstr "" -#: install_steps_interactive.pm:954 install_steps_interactive.pm:962 install_steps_interactive.pm:980 install_steps_interactive.pm:987 install_steps_interactive.pm:1139 services.pm:133 standalone/drakbackup:1593 +#: install_steps_interactive.pm:952 install_steps_interactive.pm:960 install_steps_interactive.pm:978 install_steps_interactive.pm:985 install_steps_interactive.pm:1137 services.pm:133 standalone/drakbackup:1593 #, c-format msgid "System" msgstr "" -#: install_steps_interactive.pm:994 install_steps_interactive.pm:1021 install_steps_interactive.pm:1038 install_steps_interactive.pm:1054 install_steps_interactive.pm:1065 +#: install_steps_interactive.pm:992 install_steps_interactive.pm:1019 install_steps_interactive.pm:1036 install_steps_interactive.pm:1052 install_steps_interactive.pm:1063 #, c-format msgid "Hardware" msgstr "" -#: install_steps_interactive.pm:1000 install_steps_interactive.pm:1009 +#: install_steps_interactive.pm:998 install_steps_interactive.pm:1007 #, c-format msgid "Remote CUPS server" msgstr "" -#: install_steps_interactive.pm:1000 +#: install_steps_interactive.pm:998 #, c-format msgid "No printer" msgstr "" -#: install_steps_interactive.pm:1042 +#: install_steps_interactive.pm:1040 #, c-format msgid "Do you have an ISA sound card?" msgstr "" -#: install_steps_interactive.pm:1044 +#: install_steps_interactive.pm:1042 #, c-format msgid "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound card" msgstr "" -#: install_steps_interactive.pm:1046 +#: install_steps_interactive.pm:1044 #, c-format msgid "No sound card detected. Try \"harddrake\" after installation" msgstr "" -#: install_steps_interactive.pm:1066 +#: install_steps_interactive.pm:1064 #, c-format msgid "Graphical interface" msgstr "" -#: install_steps_interactive.pm:1072 install_steps_interactive.pm:1087 +#: install_steps_interactive.pm:1070 install_steps_interactive.pm:1085 #, c-format msgid "Network & Internet" msgstr "" -#: install_steps_interactive.pm:1089 +#: install_steps_interactive.pm:1087 #, c-format msgid "configured" msgstr "" -#: install_steps_interactive.pm:1098 install_steps_interactive.pm:1112 steps.pm:20 +#: install_steps_interactive.pm:1096 install_steps_interactive.pm:1110 steps.pm:20 #, c-format msgid "Security" msgstr "" -#: install_steps_interactive.pm:1117 +#: install_steps_interactive.pm:1115 #, c-format msgid "activated" msgstr "" -#: install_steps_interactive.pm:1117 +#: install_steps_interactive.pm:1115 #, c-format msgid "disabled" msgstr "" -#: install_steps_interactive.pm:1126 +#: install_steps_interactive.pm:1124 #, c-format msgid "Boot" msgstr "" #. -PO: example: lilo-graphic on /dev/hda1 -#: install_steps_interactive.pm:1130 +#: install_steps_interactive.pm:1128 #, c-format msgid "%s on %s" msgstr "" -#: install_steps_interactive.pm:1144 services.pm:175 +#: install_steps_interactive.pm:1142 services.pm:175 #, c-format msgid "Services: %d activated for %d registered" msgstr "" -#: install_steps_interactive.pm:1154 +#: install_steps_interactive.pm:1152 #, c-format msgid "You have not configured X. Are you sure you really want this?" msgstr "" -#: install_steps_interactive.pm:1208 -#, c-format -msgid "Set root password and network authentication methods" -msgstr "" - -#: install_steps_interactive.pm:1209 -#, c-format -msgid "Set root password" -msgstr "" - -#: install_steps_interactive.pm:1220 -#, c-format -msgid "This password is too short (it must be at least %d characters long)" -msgstr "" - -#: install_steps_interactive.pm:1225 network/netconnect.pm:600 standalone/drakauth:25 standalone/drakauth:27 standalone/drakconnect:457 -#, c-format -msgid "Authentication" -msgstr "" - -#: install_steps_interactive.pm:1257 +#: install_steps_interactive.pm:1232 #, c-format msgid "Preparing bootloader..." msgstr "" -#: install_steps_interactive.pm:1267 +#: install_steps_interactive.pm:1242 #, c-format msgid "You appear to have an OldWorld or Unknown machine, the yaboot bootloader will not work for you. The install will continue, but you'll need to use BootX or some other means to boot your machine. The kernel argument for the root fs is: root=%s" msgstr "" -#: install_steps_interactive.pm:1273 +#: install_steps_interactive.pm:1248 #, c-format msgid "Do you want to use aboot?" msgstr "" -#: install_steps_interactive.pm:1276 +#: install_steps_interactive.pm:1251 #, c-format msgid "" "Error installing aboot, \n" "try to force installation even if that destroys the first partition?" msgstr "" -#: install_steps_interactive.pm:1297 +#: install_steps_interactive.pm:1272 #, c-format msgid "In this security level, access to the files in the Windows partition is restricted to the administrator." msgstr "" -#: install_steps_interactive.pm:1325 standalone/drakautoinst:76 +#: install_steps_interactive.pm:1300 standalone/drakautoinst:76 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "" -#: install_steps_interactive.pm:1330 +#: install_steps_interactive.pm:1305 #, c-format msgid "Please insert another floppy for drivers disk" msgstr "" -#: install_steps_interactive.pm:1332 +#: install_steps_interactive.pm:1307 #, c-format msgid "Creating auto install floppy..." msgstr "" -#: install_steps_interactive.pm:1344 +#: install_steps_interactive.pm:1319 #, c-format msgid "" "Some steps are not completed.\n" @@ -5537,12 +5537,12 @@ msgid "" "Do you really want to quit now?" msgstr "" -#: install_steps_interactive.pm:1360 +#: install_steps_interactive.pm:1335 #, c-format msgid "Generate auto install floppy" msgstr "" -#: install_steps_interactive.pm:1362 +#: install_steps_interactive.pm:1337 #, c-format msgid "" "The auto install can be fully automated if wanted,\n" @@ -5589,7 +5589,7 @@ msgstr "" msgid "Basic" msgstr "" -#: interactive.pm:403 interactive/newt.pm:317 ugtk2.pm:512 +#: interactive.pm:403 interactive/newt.pm:317 ugtk2.pm:508 #, c-format msgid "Finish" msgstr "" @@ -6457,7 +6457,7 @@ msgstr "" msgid "Andorra" msgstr "" -#: lang.pm:183 network/adsl_consts.pm:636 +#: lang.pm:183 network/adsl_consts.pm:635 #, c-format msgid "United Arab Emirates" msgstr "" @@ -6502,7 +6502,7 @@ msgstr "" msgid "Antarctica" msgstr "" -#: lang.pm:192 network/adsl_consts.pm:31 standalone/drakxtv:50 +#: lang.pm:192 network/adsl_consts.pm:30 standalone/drakxtv:50 #, c-format msgid "Argentina" msgstr "" @@ -6547,7 +6547,7 @@ msgstr "" msgid "Burkina Faso" msgstr "" -#: lang.pm:203 network/adsl_consts.pm:129 network/adsl_consts.pm:137 +#: lang.pm:203 network/adsl_consts.pm:128 network/adsl_consts.pm:136 #, c-format msgid "Bulgaria" msgstr "" @@ -6582,7 +6582,7 @@ msgstr "" msgid "Bolivia" msgstr "" -#: lang.pm:210 network/adsl_consts.pm:95 network/adsl_consts.pm:105 network/adsl_consts.pm:113 network/adsl_consts.pm:121 +#: lang.pm:210 network/adsl_consts.pm:94 network/adsl_consts.pm:104 network/adsl_consts.pm:112 network/adsl_consts.pm:120 #, c-format msgid "Brazil" msgstr "" @@ -6662,7 +6662,7 @@ msgstr "" msgid "Cameroon" msgstr "" -#: lang.pm:227 network/adsl_consts.pm:145 network/adsl_consts.pm:153 network/adsl_consts.pm:161 network/adsl_consts.pm:169 network/adsl_consts.pm:177 network/adsl_consts.pm:185 network/adsl_consts.pm:193 network/adsl_consts.pm:201 network/adsl_consts.pm:209 network/adsl_consts.pm:217 network/adsl_consts.pm:225 network/adsl_consts.pm:233 network/adsl_consts.pm:241 network/adsl_consts.pm:249 network/adsl_consts.pm:257 network/adsl_consts.pm:265 network/adsl_consts.pm:273 network/adsl_consts.pm:281 network/adsl_consts.pm:289 network/adsl_consts.pm:297 +#: lang.pm:227 network/adsl_consts.pm:144 network/adsl_consts.pm:152 network/adsl_consts.pm:160 network/adsl_consts.pm:168 network/adsl_consts.pm:176 network/adsl_consts.pm:184 network/adsl_consts.pm:192 network/adsl_consts.pm:200 network/adsl_consts.pm:208 network/adsl_consts.pm:216 network/adsl_consts.pm:224 network/adsl_consts.pm:232 network/adsl_consts.pm:240 network/adsl_consts.pm:248 network/adsl_consts.pm:256 network/adsl_consts.pm:264 network/adsl_consts.pm:272 network/adsl_consts.pm:280 network/adsl_consts.pm:288 network/adsl_consts.pm:296 #, c-format msgid "China" msgstr "" @@ -6702,7 +6702,7 @@ msgstr "" msgid "Djibouti" msgstr "" -#: lang.pm:238 network/adsl_consts.pm:305 +#: lang.pm:238 network/adsl_consts.pm:304 #, c-format msgid "Denmark" msgstr "" @@ -6747,7 +6747,7 @@ msgstr "" msgid "Eritrea" msgstr "" -#: lang.pm:247 network/adsl_consts.pm:574 network/adsl_consts.pm:583 network/adsl_consts.pm:594 +#: lang.pm:247 network/adsl_consts.pm:573 network/adsl_consts.pm:582 network/adsl_consts.pm:593 #, c-format msgid "Spain" msgstr "" @@ -6757,7 +6757,7 @@ msgstr "" msgid "Ethiopia" msgstr "" -#: lang.pm:249 network/adsl_consts.pm:312 +#: lang.pm:249 network/adsl_consts.pm:311 #, c-format msgid "Finland" msgstr "" @@ -6787,7 +6787,7 @@ msgstr "" msgid "Gabon" msgstr "" -#: lang.pm:256 network/adsl_consts.pm:644 network/adsl_consts.pm:652 network/netconnect.pm:52 +#: lang.pm:256 network/adsl_consts.pm:643 network/adsl_consts.pm:651 network/netconnect.pm:52 #, c-format msgid "United Kingdom" msgstr "" @@ -6897,12 +6897,12 @@ msgstr "" msgid "Indonesia" msgstr "" -#: lang.pm:280 network/adsl_consts.pm:447 standalone/drakxtv:47 +#: lang.pm:280 network/adsl_consts.pm:446 standalone/drakxtv:47 #, c-format msgid "Ireland" msgstr "" -#: lang.pm:281 network/adsl_consts.pm:455 +#: lang.pm:281 network/adsl_consts.pm:454 #, c-format msgid "Israel" msgstr "" @@ -7037,7 +7037,7 @@ msgstr "" msgid "Lesotho" msgstr "" -#: lang.pm:309 network/adsl_consts.pm:490 +#: lang.pm:309 network/adsl_consts.pm:489 #, c-format msgid "Lithuania" msgstr "" @@ -7057,7 +7057,7 @@ msgstr "" msgid "Libya" msgstr "" -#: lang.pm:313 network/adsl_consts.pm:498 +#: lang.pm:313 network/adsl_consts.pm:497 #, c-format msgid "Morocco" msgstr "" @@ -7262,7 +7262,7 @@ msgstr "" msgid "Palestine" msgstr "" -#: lang.pm:357 network/adsl_consts.pm:556 +#: lang.pm:357 network/adsl_consts.pm:555 #, c-format msgid "Portugal" msgstr "" @@ -7332,7 +7332,7 @@ msgstr "" msgid "Saint Helena" msgstr "" -#: lang.pm:372 network/adsl_consts.pm:563 +#: lang.pm:372 network/adsl_consts.pm:562 #, c-format msgid "Slovenia" msgstr "" @@ -7407,7 +7407,7 @@ msgstr "" msgid "Togo" msgstr "" -#: lang.pm:388 network/adsl_consts.pm:628 +#: lang.pm:388 network/adsl_consts.pm:627 #, c-format msgid "Thailand" msgstr "" @@ -7962,7 +7962,7 @@ msgstr "" msgid "" "The most common way to connect with adsl is pppoe.\n" "Some connections use PPTP, a few use DHCP.\n" -"If you don't know, choose 'use PPPoE'" +"If you do not know, choose 'use PPPoE'" msgstr "" #: network/adsl.pm:41 network/netconnect.pm:808 @@ -8094,7 +8094,7 @@ msgstr "" #: network/isdn.pm:168 network/netconnect.pm:388 #, c-format -msgid "I don't know" +msgid "I do not know" msgstr "" #: network/isdn.pm:169 network/netconnect.pm:388 @@ -8454,7 +8454,7 @@ msgstr "" msgid "External ISDN modem" msgstr "" -#: network/netconnect.pm:377 standalone/harddrake2:205 +#: network/netconnect.pm:377 standalone/harddrake2:207 #, c-format msgid "Select a device!" msgstr "" @@ -8499,7 +8499,7 @@ msgstr "" msgid "A CAPI driver is available for this modem. This CAPI driver can offer more capabilities than the free driver (like sending faxes). Which driver do you want to use?" msgstr "" -#: network/netconnect.pm:427 standalone/drakconnect:116 standalone/drakups:247 standalone/harddrake2:126 +#: network/netconnect.pm:427 standalone/drakconnect:116 standalone/drakups:247 standalone/harddrake2:128 #, c-format msgid "Driver" msgstr "" @@ -8518,7 +8518,7 @@ msgstr "" #, c-format msgid "" "Select your provider.\n" -"If it isn't listed, choose Unlisted." +"If it is not listed, choose Unlisted." msgstr "" #: network/netconnect.pm:455 network/netconnect.pm:567 network/netconnect.pm:723 @@ -8529,7 +8529,7 @@ msgstr "" #: network/netconnect.pm:470 #, c-format msgid "" -"Your modem isn't supported by the system.\n" +"Your modem is not supported by the system.\n" "Take a look at http://www.linmodems.org" msgstr "" @@ -9090,7 +9090,7 @@ msgstr "" #: network/netconnect.pm:1330 #, c-format msgid "" -"The system doesn't seem to be connected to the Internet.\n" +"The system does not seem to be connected to the Internet.\n" "Try to reconfigure your connection." msgstr "" @@ -9103,7 +9103,7 @@ msgstr "" #, c-format msgid "" "Problems occurred during configuration.\n" -"Test your connection via net_monitor or mcc. If your connection doesn't work, you might want to relaunch the configuration." +"Test your connection via net_monitor or mcc. If your connection does not work, you might want to relaunch the configuration." msgstr "" #: network/netconnect.pm:1361 @@ -9114,34 +9114,34 @@ msgid "" "" msgstr "" -#: network/netconnect.pm:1397 +#: network/netconnect.pm:1399 #, c-format msgid "" "An unexpected error has happened:\n" "%s" msgstr "" -#: network/network.pm:318 +#: network/network.pm:319 #, c-format msgid "Proxies configuration" msgstr "" -#: network/network.pm:319 +#: network/network.pm:320 #, c-format msgid "HTTP proxy" msgstr "" -#: network/network.pm:320 +#: network/network.pm:321 #, c-format msgid "FTP proxy" msgstr "" -#: network/network.pm:323 +#: network/network.pm:324 #, c-format msgid "Proxy should be http://..." msgstr "" -#: network/network.pm:324 +#: network/network.pm:325 #, c-format msgid "URL should begin with 'ftp:' or 'http:'" msgstr "" @@ -9196,7 +9196,7 @@ msgstr "" #: partition_table.pm:520 #, c-format msgid "" -"You have a hole in your partition table but I can't use it.\n" +"You have a hole in your partition table but I can not use it.\n" "The only solution is to move your primary partitions to have the hole next to the extended partitions." msgstr "" @@ -9275,7 +9275,7 @@ msgstr "" #: printer/data.pm:40 #, c-format -msgid "PDQ - Print, Don't Queue" +msgid "PDQ - Print, Do not Queue" msgstr "" #: printer/data.pm:41 @@ -10023,7 +10023,7 @@ msgid "" "\n" "Please plug in and turn on all printers connected to this machine so that it/they can be auto-detected. Also your network printer(s) and your Windows machines must be connected and turned on.\n" "\n" -"Note that auto-detecting printers on the network takes longer than the auto-detection of only the printers connected to this machine. So turn off the auto-detection of network and/or Windows-hosted printers when you don't need it.\n" +"Note that auto-detecting printers on the network takes longer than the auto-detection of only the printers connected to this machine. So turn off the auto-detection of network and/or Windows-hosted printers when you do not need it.\n" "\n" " Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want to set up your printer(s) now." msgstr "" @@ -10051,7 +10051,7 @@ msgid "" "\n" "If you have printer(s) connected to this machine, Please plug it/them in on this computer and turn it/them on so that it/they can be auto-detected. Also your network printer(s) must be connected and turned on.\n" "\n" -"Note that auto-detecting printers on the network takes longer than the auto-detection of only the printers connected to this machine. So turn off the auto-detection of network printers when you don't need it.\n" +"Note that auto-detecting printers on the network takes longer than the auto-detection of only the printers connected to this machine. So turn off the auto-detection of network printers when you do not need it.\n" "\n" " Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want to set up your printer(s) now." msgstr "" @@ -10280,7 +10280,7 @@ msgstr "" msgid "Remote printer name missing!" msgstr "" -#: printer/printerdrake.pm:1343 printer/printerdrake.pm:1914 standalone/drakTermServ:431 standalone/drakTermServ:733 standalone/drakTermServ:750 standalone/drakTermServ:1461 standalone/drakTermServ:1469 standalone/drakTermServ:1480 standalone/drakbackup:513 standalone/drakbackup:619 standalone/drakbackup:654 standalone/drakbackup:774 standalone/harddrake2:252 +#: printer/printerdrake.pm:1343 printer/printerdrake.pm:1914 standalone/drakTermServ:431 standalone/drakTermServ:733 standalone/drakTermServ:750 standalone/drakTermServ:1461 standalone/drakTermServ:1469 standalone/drakTermServ:1480 standalone/drakbackup:513 standalone/drakbackup:619 standalone/drakbackup:654 standalone/drakbackup:774 standalone/harddrake2:254 #, c-format msgid "Information" msgstr "" @@ -11446,7 +11446,7 @@ msgstr "" #: raid.pm:42 #, c-format -msgid "Can't add a partition to _formatted_ RAID %s" +msgid "Can not add a partition to _formatted_ RAID %s" msgstr "" #: raid.pm:144 @@ -12323,8 +12323,8 @@ msgstr "" #, c-format msgid "" "PCMCIA support is usually to support things like ethernet and\n" -"modems in laptops. It won't get started unless configured so it is safe to have\n" -"it installed on machines that don't need it." +"modems in laptops. It will not get started unless configured so it is safe to have\n" +"it installed on machines that do not need it." msgstr "" #: services.pm:70 @@ -12457,7 +12457,7 @@ msgid "" "about this service, sorry." msgstr "" -#: services.pm:224 ugtk2.pm:1211 +#: services.pm:224 ugtk2.pm:1130 #, c-format msgid "Info" msgstr "" @@ -12569,7 +12569,7 @@ msgstr "" #: share/advertising/05.pl:17 #, c-format -msgid "The Download version <b>cannot include</b> all the software that is not open source. Therefore, you won't find in the Download version:" +msgid "The Download version <b>cannot include</b> all the software that is not open source. Therefore, you will not find in the Download version:" msgstr "" #: share/advertising/05.pl:18 @@ -12584,7 +12584,7 @@ msgstr "" #: share/advertising/05.pl:21 #, c-format -msgid "You won't have access to the <b>services included</b> in the other Mandrakesoft products either." +msgid "You will not have access to the <b>services included</b> in the other Mandrakesoft products either." msgstr "" #: share/advertising/06.pl:13 @@ -12724,7 +12724,7 @@ msgstr "" #: share/advertising/12.pl:17 #, c-format -msgid "KDE will make your <b>first steps</b> with Linux so <b>easy</b> that you won't ever think of running another operating system!" +msgid "KDE will make your <b>first steps</b> with Linux so <b>easy</b> that you will not ever think of running another operating system!" msgstr "" #: share/advertising/12.pl:19 @@ -13608,7 +13608,7 @@ msgid "" "--disconnect : disconnect to internet if already connected\n" "--force : used with (dis)connect : force (dis)connection.\n" "--status : returns 1 if connected 0 otherwise, then exit.\n" -"--quiet : don't be interactive. To be used with (dis)connect." +"--quiet : do not be interactive. To be used with (dis)connect." msgstr "" #: standalone.pm:107 @@ -13620,8 +13620,8 @@ msgstr "" #, c-format msgid "" "[OPTION]...\n" -" --no-confirmation don't ask first confirmation question in MandrakeUpdate mode\n" -" --no-verify-rpm don't verify packages signatures\n" +" --no-confirmation do not ask first confirmation question in MandrakeUpdate mode\n" +" --no-verify-rpm do not verify packages signatures\n" " --changelog-first display changelog before filelist in the description window\n" " --merge-all-rpmnew propose to merge all .rpmnew/.rpmsave files found" msgstr "" @@ -14124,7 +14124,7 @@ msgstr "" #: standalone/drakTermServ:1137 #, c-format -msgid "Thin clients won't work with autologin. Disable autologin?" +msgid "Thin clients will not work with autologin. Disable autologin?" msgstr "" #: standalone/drakTermServ:1153 @@ -14212,7 +14212,7 @@ msgstr "" #: standalone/drakTermServ:1459 #, c-format -msgid "Couldn't access the floppy!" +msgid "Could not access the floppy!" msgstr "" #: standalone/drakTermServ:1461 @@ -14316,7 +14316,7 @@ msgstr "" #: standalone/drakautoinst:39 #, c-format -msgid "I can't find needed image file `%s'." +msgid "I can not find needed image file `%s'." msgstr "" #: standalone/drakautoinst:41 @@ -14583,7 +14583,7 @@ msgstr "" #: standalone/drakbackup:646 #, c-format -msgid "Can't find %s on %s" +msgid "Can not find %s on %s" msgstr "" #: standalone/drakbackup:650 @@ -14740,7 +14740,7 @@ msgstr "" #: standalone/drakbackup:1192 #, c-format -msgid "Can't create catalog!" +msgid "Can not create catalog!" msgstr "" #: standalone/drakbackup:1414 @@ -14937,7 +14937,7 @@ msgstr "" #: standalone/drakbackup:1878 #, c-format -msgid "Don't rewind tape after backup" +msgid "Do not rewind tape after backup" msgstr "" #: standalone/drakbackup:1884 @@ -15149,7 +15149,7 @@ msgstr "" #: standalone/drakbackup:2151 #, c-format -msgid "If your machine isn't on all the time, you might want to install anacron." +msgid "If your machine is not on all the time, you might want to install anacron." msgstr "" #: standalone/drakbackup:2152 @@ -15955,7 +15955,7 @@ msgstr "" msgid "System mode" msgstr "" -#: standalone/drakboot:74 standalone/drakfloppy:47 standalone/harddrake2:182 standalone/harddrake2:183 standalone/logdrake:70 standalone/printerdrake:157 standalone/printerdrake:158 standalone/printerdrake:159 +#: standalone/drakboot:74 standalone/drakfloppy:47 standalone/harddrake2:184 standalone/harddrake2:185 standalone/logdrake:70 standalone/printerdrake:157 standalone/printerdrake:158 standalone/printerdrake:159 #, c-format msgid "/_File" msgstr "" @@ -15965,7 +15965,7 @@ msgstr "" msgid "/File/_Quit" msgstr "" -#: standalone/drakboot:75 standalone/drakfloppy:48 standalone/harddrake2:183 standalone/logdrake:76 standalone/printerdrake:159 +#: standalone/drakboot:75 standalone/drakfloppy:48 standalone/harddrake2:185 standalone/logdrake:76 standalone/printerdrake:159 #, c-format msgid "<control>Q" msgstr "" @@ -16014,7 +16014,7 @@ msgstr "" #: standalone/drakboot:197 #, c-format -msgid "No, I don't want autologin" +msgid "No, I do not want autologin" msgstr "" #: standalone/drakboot:198 @@ -16446,7 +16446,7 @@ msgstr "" msgid "Mac Address" msgstr "" -#: standalone/drakconnect:572 standalone/harddrake2:23 standalone/harddrake2:113 +#: standalone/drakconnect:572 standalone/harddrake2:23 standalone/harddrake2:115 #, c-format msgid "Bus" msgstr "" @@ -16542,7 +16542,7 @@ msgstr "" #: standalone/drakconnect:848 #, c-format msgid "" -"You don't have any configured interface.\n" +"You do not have any configured interface.\n" "Configure them first by clicking on 'Configure'" msgstr "" @@ -16577,7 +16577,7 @@ msgstr "" #: standalone/drakconnect:975 standalone/net_applet:46 #, c-format msgid "" -"You don't have any configured Internet connection.\n" +"You do not have any configured Internet connection.\n" "Run the \"Add Connection\" assistant from the Mandrakelinux Control Center" msgstr "" @@ -16669,7 +16669,7 @@ msgstr "" msgid "General" msgstr "" -#: standalone/drakfloppy:82 standalone/harddrake2:140 +#: standalone/drakfloppy:82 standalone/harddrake2:142 #, c-format msgid "Device" msgstr "" @@ -17271,7 +17271,7 @@ msgid "" "DHCP Server Configuration.\n" "\n" "Here you can select different options for the DHCP server configuration.\n" -"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." msgstr "" #: standalone/drakgw:330 @@ -17601,7 +17601,7 @@ msgstr "" #: standalone/drakperm:297 #, c-format -msgid "When checked, owner and group won't be changed" +msgid "When checked, owner and group will not be changed" msgstr "" #: standalone/drakperm:307 @@ -17763,7 +17763,7 @@ msgid "" "maximum" msgstr "" -#: standalone/draksec:154 standalone/harddrake2:197 +#: standalone/draksec:154 standalone/harddrake2:199 #, c-format msgid "" "Description of the fields:\n" @@ -18040,7 +18040,7 @@ msgstr "" msgid "Autodetection" msgstr "" -#: standalone/drakups:101 standalone/harddrake2:226 +#: standalone/drakups:101 standalone/harddrake2:228 #, c-format msgid "Detection in progress" msgstr "" @@ -18117,7 +18117,7 @@ msgstr "" msgid "UPS devices" msgstr "" -#: standalone/drakups:247 standalone/drakups:266 standalone/drakups:282 standalone/harddrake2:80 standalone/harddrake2:104 standalone/harddrake2:111 +#: standalone/drakups:247 standalone/drakups:266 standalone/drakups:282 standalone/harddrake2:80 standalone/harddrake2:106 standalone/harddrake2:113 #, c-format msgid "Name" msgstr "" @@ -18465,7 +18465,7 @@ msgid "" "\n" "Here you define the default settings. \n" "All the other sections will follow this one.\n" -"The left settings are optional. If don't define\n" +"The left settings are optional. If do not define\n" "them here, globally, you can define them in each\n" "section.\n" "" @@ -18610,7 +18610,7 @@ msgstr "" #: standalone/drakvpn:590 #, c-format -msgid "Can't edit!" +msgid "Can not edit!" msgstr "" #: standalone/drakvpn:591 @@ -19493,7 +19493,7 @@ msgstr "" msgid "this is the physical bus on which the device is plugged (eg: PCI, USB, ...)" msgstr "" -#: standalone/harddrake2:26 standalone/harddrake2:139 +#: standalone/harddrake2:26 standalone/harddrake2:141 #, c-format msgid "Bus identification" msgstr "" @@ -19925,204 +19925,205 @@ msgid "" "channel number, a target id and a logical unit number" msgstr "" -#: standalone/harddrake2:99 +#. -PO: here, "size" is the size of the ram chip (eg: 128Mo, 256Mo, ...) +#: standalone/harddrake2:101 #, c-format msgid "Installed size" msgstr "" -#: standalone/harddrake2:99 +#: standalone/harddrake2:101 #, c-format msgid "Installed size of the memory bank" msgstr "" -#: standalone/harddrake2:100 +#: standalone/harddrake2:102 #, c-format msgid "Enabled Size" msgstr "" -#: standalone/harddrake2:100 +#: standalone/harddrake2:102 #, c-format msgid "Enabled size of the memory bank" msgstr "" -#: standalone/harddrake2:101 +#: standalone/harddrake2:103 #, c-format msgid "type of the memory device" msgstr "" -#: standalone/harddrake2:102 +#: standalone/harddrake2:104 #, c-format msgid "Speed" msgstr "" -#: standalone/harddrake2:102 +#: standalone/harddrake2:104 #, c-format msgid "Speed of the memory bank" msgstr "" -#: standalone/harddrake2:103 +#: standalone/harddrake2:105 #, c-format msgid "Bank connections" msgstr "" -#: standalone/harddrake2:104 +#: standalone/harddrake2:106 #, c-format msgid "Socket designation of the memory bank" msgstr "" -#: standalone/harddrake2:108 +#: standalone/harddrake2:110 #, c-format msgid "Device file" msgstr "" -#: standalone/harddrake2:108 +#: standalone/harddrake2:110 #, c-format msgid "the device file used to communicate with the kernel driver for the mouse" msgstr "" -#: standalone/harddrake2:109 +#: standalone/harddrake2:111 #, c-format msgid "Emulated wheel" msgstr "" -#: standalone/harddrake2:109 +#: standalone/harddrake2:111 #, c-format msgid "whether the wheel is emulated or not" msgstr "" -#: standalone/harddrake2:110 +#: standalone/harddrake2:112 #, c-format msgid "the type of the mouse" msgstr "" -#: standalone/harddrake2:111 +#: standalone/harddrake2:113 #, c-format msgid "the name of the mouse" msgstr "" -#: standalone/harddrake2:112 +#: standalone/harddrake2:114 #, c-format msgid "Number of buttons" msgstr "" -#: standalone/harddrake2:112 +#: standalone/harddrake2:114 #, c-format msgid "the number of buttons the mouse has" msgstr "" -#: standalone/harddrake2:113 +#: standalone/harddrake2:115 #, c-format msgid "the type of bus on which the mouse is connected" msgstr "" -#: standalone/harddrake2:114 +#: standalone/harddrake2:116 #, c-format msgid "Mouse protocol used by X11" msgstr "" -#: standalone/harddrake2:114 +#: standalone/harddrake2:116 #, c-format msgid "the protocol that the graphical desktop use with the mouse" msgstr "" -#: standalone/harddrake2:121 standalone/harddrake2:130 standalone/harddrake2:137 standalone/harddrake2:145 standalone/harddrake2:324 standalone/harddrake2:324 +#: standalone/harddrake2:123 standalone/harddrake2:132 standalone/harddrake2:139 standalone/harddrake2:147 standalone/harddrake2:326 standalone/harddrake2:326 #, c-format msgid "Identification" msgstr "" -#: standalone/harddrake2:122 standalone/harddrake2:138 +#: standalone/harddrake2:124 standalone/harddrake2:140 #, c-format msgid "Connection" msgstr "" -#: standalone/harddrake2:131 +#: standalone/harddrake2:133 #, c-format msgid "Performances" msgstr "" -#: standalone/harddrake2:132 +#: standalone/harddrake2:134 #, c-format msgid "Bugs" msgstr "" -#: standalone/harddrake2:133 +#: standalone/harddrake2:135 #, c-format msgid "FPU" msgstr "" -#: standalone/harddrake2:141 +#: standalone/harddrake2:143 #, c-format msgid "Partitions" msgstr "" -#: standalone/harddrake2:146 +#: standalone/harddrake2:148 #, c-format msgid "Features" msgstr "" #. -PO: please keep all "/" characters !!! -#: standalone/harddrake2:169 standalone/logdrake:77 standalone/printerdrake:153 standalone/printerdrake:166 +#: standalone/harddrake2:171 standalone/logdrake:77 standalone/printerdrake:153 standalone/printerdrake:166 #, c-format msgid "/_Options" msgstr "" -#: standalone/harddrake2:170 standalone/harddrake2:192 standalone/logdrake:79 standalone/printerdrake:178 standalone/printerdrake:180 standalone/printerdrake:180 standalone/printerdrake:183 standalone/printerdrake:185 +#: standalone/harddrake2:172 standalone/harddrake2:194 standalone/logdrake:79 standalone/printerdrake:178 standalone/printerdrake:180 standalone/printerdrake:180 standalone/printerdrake:183 standalone/printerdrake:185 #, c-format msgid "/_Help" msgstr "" -#: standalone/harddrake2:174 +#: standalone/harddrake2:176 #, c-format msgid "/Autodetect _printers" msgstr "" -#: standalone/harddrake2:175 +#: standalone/harddrake2:177 #, c-format msgid "/Autodetect _modems" msgstr "" -#: standalone/harddrake2:176 +#: standalone/harddrake2:178 #, c-format msgid "/Autodetect _jaz drives" msgstr "" -#: standalone/harddrake2:183 standalone/printerdrake:159 +#: standalone/harddrake2:185 standalone/printerdrake:159 #, c-format msgid "/_Quit" msgstr "" -#: standalone/harddrake2:194 +#: standalone/harddrake2:196 #, c-format msgid "/_Fields description" msgstr "" -#: standalone/harddrake2:196 +#: standalone/harddrake2:198 #, c-format msgid "Harddrake help" msgstr "" -#: standalone/harddrake2:205 +#: standalone/harddrake2:207 #, c-format msgid "Once you've selected a device, you'll be able to see the device information in fields displayed on the right frame (\"Information\")" msgstr "" -#: standalone/harddrake2:211 standalone/printerdrake:183 +#: standalone/harddrake2:213 standalone/printerdrake:183 #, c-format msgid "/_Report Bug" msgstr "" -#: standalone/harddrake2:213 standalone/printerdrake:185 +#: standalone/harddrake2:215 standalone/printerdrake:185 #, c-format msgid "/_About..." msgstr "" -#: standalone/harddrake2:214 +#: standalone/harddrake2:216 #, c-format msgid "About Harddrake" msgstr "" #. -PO: Do not alter the <span ..> and </span> tags -#: standalone/harddrake2:216 +#: standalone/harddrake2:218 #, c-format msgid "" "This is HardDrake, a %s hardware configuration tool.\n" @@ -20132,62 +20133,62 @@ msgid "" "" msgstr "" -#: standalone/harddrake2:233 +#: standalone/harddrake2:235 #, c-format msgid "Harddrake2" msgstr "" -#: standalone/harddrake2:249 +#: standalone/harddrake2:251 #, c-format msgid "Detected hardware" msgstr "" -#: standalone/harddrake2:254 +#: standalone/harddrake2:256 #, c-format msgid "Configure module" msgstr "" -#: standalone/harddrake2:261 +#: standalone/harddrake2:263 #, c-format msgid "Run config tool" msgstr "" -#: standalone/harddrake2:311 standalone/net_monitor:108 standalone/net_monitor:109 standalone/net_monitor:114 +#: standalone/harddrake2:313 standalone/net_monitor:108 standalone/net_monitor:109 standalone/net_monitor:114 #, c-format msgid "unknown" msgstr "" -#: standalone/harddrake2:312 standalone/printerdrake:313 standalone/printerdrake:350 +#: standalone/harddrake2:314 standalone/printerdrake:313 standalone/printerdrake:350 #, c-format msgid "Unknown" msgstr "" -#: standalone/harddrake2:332 +#: standalone/harddrake2:334 #, c-format msgid "Misc" msgstr "" -#: standalone/harddrake2:347 +#: standalone/harddrake2:349 #, c-format msgid "Click on a device in the left tree in order to display its information here." msgstr "" -#: standalone/harddrake2:399 +#: standalone/harddrake2:401 #, c-format msgid "secondary" msgstr "" -#: standalone/harddrake2:399 +#: standalone/harddrake2:401 #, c-format msgid "primary" msgstr "" -#: standalone/harddrake2:403 +#: standalone/harddrake2:405 #, c-format msgid "burner" msgstr "" -#: standalone/harddrake2:403 +#: standalone/harddrake2:405 #, c-format msgid "DVD" msgstr "" @@ -21199,7 +21200,7 @@ msgid "" "" msgstr "" -#: standalone/service_harddrake:200 +#: standalone/service_harddrake:202 #, c-format msgid "Hardware probing in progress" msgstr "" @@ -21304,34 +21305,34 @@ msgstr "" msgid "Exit install" msgstr "" -#: ugtk2.pm:1119 +#: ugtk2.pm:1038 #, c-format msgid "Is this correct?" msgstr "" -#: ugtk2.pm:1247 +#: ugtk2.pm:1165 #, c-format msgid "Expand Tree" msgstr "" -#: ugtk2.pm:1248 +#: ugtk2.pm:1166 #, c-format msgid "Collapse Tree" msgstr "" -#: ugtk2.pm:1249 +#: ugtk2.pm:1167 #, c-format msgid "Toggle between flat and group sorted" msgstr "" -#: wizards.pm:95 +#: wizards.pm:95 wizards2.pm:95 #, c-format msgid "" "%s is not installed\n" "Click \"Next\" to install or \"Cancel\" to quit" msgstr "" -#: wizards.pm:99 +#: wizards.pm:99 wizards2.pm:99 #, c-format msgid "Installation failed" msgstr "" diff --git a/perl-install/standalone.pm b/perl-install/standalone.pm index 4a3cb0c0a..ad8b1e52f 100644 --- a/perl-install/standalone.pm +++ b/perl-install/standalone.pm @@ -103,11 +103,11 @@ Network & Internet connection and monitoring application --disconnect : disconnect to internet if already connected --force : used with (dis)connect : force (dis)connection. --status : returns 1 if connected 0 otherwise, then exit. ---quiet : don't be interactive. To be used with (dis)connect."), +--quiet : do not be interactive. To be used with (dis)connect."), 'printerdrake' => N_(" [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"), 'rpmdrake' => N_("[OPTION]... - --no-confirmation don't ask first confirmation question in MandrakeUpdate mode - --no-verify-rpm don't verify packages signatures + --no-confirmation do not ask first confirmation question in MandrakeUpdate mode + --no-verify-rpm do not verify packages signatures --changelog-first display changelog before filelist in the description window --merge-all-rpmnew propose to merge all .rpmnew/.rpmsave files found"), 'scannerdrake' => N_("[--manual] [--device=dev] [--update-sane=sane_source_dir] [--update-usbtable] [--dynamic=dev]"), 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 diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm index efecc112d..d5e8ce449 100644 --- a/perl-install/ugtk2.pm +++ b/perl-install/ugtk2.pm @@ -374,7 +374,7 @@ sub _create_dialog { $options->{transient_for} = delete $options->{transient} if $options->{transient}; my $dialog = gtknew('Dialog', title => $title, - position_policy => 'center-on-parent', # center-on-parent doesn't work + position_policy => 'center-on-parent', # center-on-parent does not work modal => 1, %$options, ); @@ -756,7 +756,7 @@ sub get_text_coord { $width += $w; } } - #- if wrap_char was at the end, don't forget it, for cases when bold/nonbold text follows + #- if wrap_char was at the end, do not forget it, for cases when bold/nonbold text follows $text =~ /$wrap_char$/ and $current_text .= $wrap_char; $add_line->(); @@ -790,7 +790,7 @@ sub wrap_paragraph { my $currentx; foreach (@elements) { my ($text, %options) = @$_; - #- hack :( if ' ' is at the beginning, don't forget it, substitute + #- hack :( if ' ' is at the beginning, do not forget it, substitute #- with an unbreakable space because gtk allocates too much space otherwise $text =~ /^ (.*)/ and $text = " $1"; my @newlines = get_text_coord($text, $widget4style, $max_width, $currentx, $ydec); @@ -854,7 +854,7 @@ sub new { $o->{wm_icon} ||= $wm_icon || $::Wizard_pix_up || "wiz_default_up.png"; $o->{pop_it} ||= $pop_it || !$o->{isWizard} && !$o->{isEmbedded} || $::WizardTable && do { - #- don't take into account the DrawingArea + #- do not take into account the DrawingArea any { !$_->isa('Gtk2::DrawingArea') && $_->visible } $::WizardTable->get_children; }; @@ -991,7 +991,7 @@ sub _create_window { if ($::isInstall && $::o->{mouse}{unsafe}) { $w->add_events('pointer-motion-mask'); - my $signal; #- don't make this line part of next one, signal_disconnect won't be able to access $signal value + my $signal; #- do not make this line part of next one, signal_disconnect will not be able to access $signal value $signal = $w->signal_connect(motion_notify_event => sub { delete $::o->{mouse}{unsafe}; log::l("unsetting unsafe mouse"); @@ -1377,7 +1377,7 @@ sub ask_browse_tree_info_given_widgets { } 0; }); - $w->{tree}->signal_connect(button_press_event => sub { #- not too good, but CellRendererPixbuf doesn't have the needed signals :( + $w->{tree}->signal_connect(button_press_event => sub { #- not too good, but CellRendererPixbuf does not have the needed signals :( my ($path, $column) = $w->{tree}->get_path_at_pos($_[1]->x, $_[1]->y); if ($path && $column) { $column->{is_pix} and $mouse_toggle_pending = $w->{tree_model}->get($w->{tree_model}->get_iter($path), 0); @@ -1404,7 +1404,7 @@ sub gtk_TextView_get_log { my ($log_w, $log_scroll, $command, $filter_output, $when_command_is_over) = @_; my $pid = open(my $F, "$command |") or return; - fcntl($F, c::F_SETFL(), c::O_NONBLOCK()) or die "can't fcntl F_SETFL: $!"; + fcntl($F, c::F_SETFL(), c::O_NONBLOCK()) or die "can not fcntl F_SETFL: $!"; my $gtk_buffer = $log_w->get_buffer; $log_w->signal_connect(destroy => sub { @@ -1425,7 +1425,7 @@ sub gtk_TextView_get_log { $log_w->scroll_to_iter($end, 0, 0, 0, 0) if $want_scroll_down; } if (waitpid($pid, c::WNOHANG()) > 0) { - #- we do not call $when_command_is_over if $gtk_buffer doesn't exist anymore + #- we do not call $when_command_is_over if $gtk_buffer does not exist anymore #- since it is not a normal case $when_command_is_over->($gtk_buffer) if $when_command_is_over && $gtk_buffer; $pid = ''; diff --git a/perl-install/unused/dns.pm b/perl-install/unused/dns.pm index 5e6bb5f5b..f64783e21 100644 --- a/perl-install/unused/dns.pm +++ b/perl-install/unused/dns.pm @@ -1,7 +1,7 @@ use diagnostics; use strict; -# This is dumb, but glibc doesn't like to do hostname lookups w/o libc.so +# This is dumb, but glibc does not like to do hostname lookups w/o libc.so #TODO TODO |