From b6ab813177bf359fc0d84c9baa11dcbca769c20f Mon Sep 17 00:00:00 2001 From: Guillaume Cottenceau Date: Mon, 8 Apr 2002 16:25:07 +0000 Subject: fix a few english strings --- perl-install/Xconfigurator.pm | 36 ++++++++++++------------ perl-install/diskdrake/interactive.pm | 2 +- perl-install/diskdrake/removable_gtk.pm | 2 +- perl-install/fsedit.pm | 4 +-- perl-install/install_interactive.pm | 12 ++++---- perl-install/install_steps_gtk.pm | 4 +-- perl-install/install_steps_interactive.pm | 18 ++++++------ perl-install/interactive_stdio.pm | 4 +-- perl-install/network/isdn.pm | 12 ++++---- perl-install/network/netconnect.pm | 8 ++++-- perl-install/network/network.pm | 4 +-- perl-install/network/tools.pm | 2 +- perl-install/partition_table.pm | 2 +- perl-install/printer.pm | 2 +- perl-install/printerdrake.pm | 46 +++++++++++++++---------------- 15 files changed, 81 insertions(+), 77 deletions(-) diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm index 5c063668f..6e849c3e6 100644 --- a/perl-install/Xconfigurator.pm +++ b/perl-install/Xconfigurator.pm @@ -258,8 +258,8 @@ What do you want to do?"), sub { translate($_[0]{text}) }, \@choices) or return; $card->{server} = 'FBDev' unless !$cardOptions->{allowFB} || $card->{server} || $card->{driver} || $card->{type} || $noauto; my $currentRealName = realName2CardName($card->{type} || $cards[0]{type}) || 'Other|Unlisted'; - $card->{type} = cardName2RealName($in->ask_from_treelist(_("Graphic card"), - _("Select a graphic card"), '|', ['Other|Unlisted', readCardsNames()], + $card->{type} = cardName2RealName($in->ask_from_treelist(_("Graphics card"), + _("Select a graphics card"), '|', ['Other|Unlisted', readCardsNames()], $currentRealName)) or return unless $card->{type} || $card->{server} || $card->{driver}; @@ -493,7 +493,7 @@ NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER.", $xf3_ver)) . " $card->{options_xf4}{DPMS} = 'on'; $card->{flags}{needVideoRam} and - $card->{memory} ||= $videomemory{$in->ask_from_list_('', _("Select the memory size of your graphic card"), + $card->{memory} ||= $videomemory{$in->ask_from_list_('', _("Select the memory size of your graphics card"), [ sort { $videomemory{$a} <=> $videomemory{$b} } keys %videomemory]) || return}; @@ -622,7 +622,7 @@ sub testFinalConfig { $in->ask_warn('', _("Monitor not configured")), return; $o->{card}{server} || $o->{card}{driver} or - $in->ask_warn('', _("Graphic card not configured yet")), return; + $in->ask_warn('', _("Graphics card not configured yet")), return; $o->{card}{depth} or $in->ask_warn('', _("Resolutions not chosen yet")), return; @@ -637,7 +637,7 @@ sub testFinalConfig { $o->{card}{identifier} =~ /Matrox|Rage Mobility [PL]|SiS.*SG86C2.5|SiS.*559[78]|SiS.*300|SiS.*540|SiS.*6C?326|SiS.*6C?236|Tseng.*ET6\d00|Riva.*128/ : $o->{card}{identifier} =~ /i740|Rage Mobility [PL]|3D Rage LT|Rage 128/); $::live and $bad_card ||= $o->{card}{identifier} =~ /S3.*ViRGE/; - log::l("the graphic card does not like X in framebuffer") if $bad_card; + log::l("the graphics card does not like X in framebuffer") if $bad_card; my $verybad_card = $o->{card}{driver} eq 'i810' || $o->{card}{driver} eq 'fbdev'; $verybad_card ||= $o->{card}{driver} eq 'nvidia' && !$::isStandalone; #- avoid testing during install at any price. @@ -647,7 +647,7 @@ sub testFinalConfig { my $def = 1; if ($bad_card && !$::isStandalone) { $skip_badcard and return 1; - $mesg = $mesg . "\n" . _("Warning: testing this graphic card may freeze your computer"); + $mesg = $mesg . "\n" . _("Warning: testing this graphics card may freeze your computer"); $def = 0; } $auto && $def or $in->ask_yesorno(_("Test of the configuration"), $mesg, $def) or return 1; @@ -689,7 +689,7 @@ sub testFinalConfig { while () { /reporting a problem/ and last; push @msg, $_; - $in->ask_warn('', [ _("An error has occurred:"), " ", @msg, _("\ntry to change some parameters") ]); + $in->ask_warn('', [ _("An error occurred:"), " ", @msg, _("\ntry to change some parameters") ]); return 0; } } @@ -701,7 +701,7 @@ sub testFinalConfig { /^$/ and last; push @msg, $_; } - $in->ask_warn('', [ _("An error has occurred:"), " ", @msg, _("\ntry to change some parameters") ]); + $in->ask_warn('', [ _("An error occurred:"), " ", @msg, _("\ntry to change some parameters") ]); return 0; } } @@ -748,7 +748,7 @@ sub testFinalConfig { kill 2, $pid; $::noShadow = 0; - $rc || $err == 222 << 8 or $in->ask_warn('', _("An error has occurred, try to change some parameters")); + $rc || $err == 222 << 8 or $in->ask_warn('', _("An error occurred, try to change some parameters")); $rc; } @@ -873,7 +873,7 @@ sub chooseResolutionsGtk($$;$) { gtkadd($W->{window}, gtkpack_($W->create_box_with_title(_("Choose the resolution and the color depth"), "(" . ($card->{type} ? - _("Graphic card: %s", $card->{type}) : + _("Graphics card: %s", $card->{type}) : _("XFree86 server: %s", $card->{server})) . ")" ), 1, gtkpack2(new Gtk::VBox(0,0), @@ -1512,9 +1512,9 @@ sub info { $info .= _("Monitor: %s\n", $o->{monitor}{type}); $info .= _("Monitor HorizSync: %s\n", $o->{monitor}{hsyncrange}) if $::expert; $info .= _("Monitor VertRefresh: %s\n", $o->{monitor}{vsyncrange}) if $::expert; - $info .= _("Graphic card: %s\n", $o->{card}{type}); - $info .= _("Graphic card identification: %s\n", $o->{card}{identifier}) if $::expert; - $info .= _("Graphic memory: %s kB\n", $o->{card}{memory}) if $o->{card}{memory}; + $info .= _("Graphics card: %s\n", $o->{card}{type}); + $info .= _("Graphics card identification: %s\n", $o->{card}{identifier}) if $::expert; + $info .= _("Graphics memory: %s kB\n", $o->{card}{memory}) if $o->{card}{memory}; if ($o->{default_depth} and my $depth = $o->{card}{depth}{$o->{default_depth}}) { $info .= _("Color depth: %s\n", translate($depths{$o->{default_depth}})); $info .= _("Resolution: %s\n", join "x", @{$depth->[0]}) if $depth && !is_empty_array_ref($depth->[0]); @@ -1564,7 +1564,7 @@ sub main { { format => sub { $_[0][0] }, val => \$f, list => [ [ _("Change Monitor") => sub { $o->{monitor} = monitorConfiguration() } ], - [ _("Change Graphic card") => sub { my $card = cardConfiguration('', 'noauto', $cardOptions); + [ _("Change Graphics card") => sub { my $card = cardConfiguration('', 'noauto', $cardOptions); $card and $o->{card} = $card } ], if_($::expert, [ _("Change Server options") => sub { optionsConfiguration($o) } ]), @@ -1580,7 +1580,7 @@ sub main { } if (!$ok) { $ok = $in->ask_yesorno('', _("Keep the changes? -Current configuration is: +The current configuration is: %s", info($o))); } @@ -1600,9 +1600,9 @@ Current configuration is: if (!$::isStandalone || $0 !~ /Xdrakres/) { $in->set_help('configureXxdm') unless $::isStandalone; - my $run = exists $o->{xdm} ? $o->{xdm} : $::auto || $in->ask_yesorno(_("X at startup"), -_("I can set up your computer to automatically start X upon booting. -Would you like X to start when you reboot?"), 1); + my $run = exists $o->{xdm} ? $o->{xdm} : $::auto || $in->ask_yesorno(_("Graphical interface at startup"), +_("I can setup your computer to automatically start the graphical interface (XFree) upon booting. +Would you like XFree to start when you reboot?"), 1); any::runlevel($prefix, $run ? 5 : 3) unless $::testing; } if ($::isStandalone && $in->isa('interactive_gtk')) { diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm index ab8cb0e22..72f001d31 100644 --- a/perl-install/diskdrake/interactive.pm +++ b/perl-install/diskdrake/interactive.pm @@ -990,7 +990,7 @@ sub need_migration { if (@l && $::isStandalone) { my $choice; my @choices = (__("Move files to the new partition"), __("Hide files")); - $in->ask_from('', _("Directory %s already contain some data\n(%s)", $mntpoint, formatList(5, @l)), + $in->ask_from('', _("Directory %s already contains data\n(%s)", $mntpoint, formatList(5, @l)), [ { val => \$choice, list => \@choices, type => 'list' } ]) or return; $choice eq $choices[0] ? 'migrate' : 'hide'; } else { diff --git a/perl-install/diskdrake/removable_gtk.pm b/perl-install/diskdrake/removable_gtk.pm index ee61fa5b8..da897b67a 100644 --- a/perl-install/diskdrake/removable_gtk.pm +++ b/perl-install/diskdrake/removable_gtk.pm @@ -25,7 +25,7 @@ sub per_entry_action_box { createScrolledWindow(gtkpack__(new Gtk::VBox(0,0), @buttons)))) if @buttons; } else { - my $txt = _("Please click on a media"); + my $txt = _("Please click on a medium"); gtkpack($box, gtktext_insert(new Gtk::Text, $txt)); } } diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm index d973adeb3..1883e9e88 100644 --- a/perl-install/fsedit.pm +++ b/perl-install/fsedit.pm @@ -483,7 +483,7 @@ sub check_mntpoint { if ($mntpoint eq '/' || $mntpoint eq '/boot') && isLVM($hd); die _("This directory should remain within the root filesystem") if member($mntpoint, qw(/bin /dev /etc /lib /sbin)); - die _("You need a true filesystem (ext2, reiserfs) for this mount point\n") + die _("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 _("You can't use an encrypted file system for mount point %s", $mntpoint) if $part->{options} =~ /encrypted/ && member($mntpoint, qw(/ /usr /var)); @@ -694,7 +694,7 @@ sub verifyHds { my ($hds, $readonly, $ok) = @_; if (is_empty_array_ref($hds)) { #- no way - die _("An error has occurred - no valid devices were found on which to create new filesystems. Please check your hardware for the cause of this problem"); + die _("An error occurred - no valid devices were found on which to create new filesystems. Please check your hardware for the cause of this problem"); } my @parts = readProcPartitions($hds); diff --git a/perl-install/install_interactive.pm b/perl-install/install_interactive.pm index aad24c3a0..b9ee10de7 100644 --- a/perl-install/install_interactive.pm +++ b/perl-install/install_interactive.pm @@ -61,7 +61,7 @@ Then choose action ``Mount point'' and set it to `/'"), 1) or return; } if (!grep { isSwap($_) } @fstab) { $o->ask_warn('', _("You must have a swap partition")), $ok=0 if !$::expert; - $ok &&= $::expert || $o->ask_okcancel('', _("You don't have a swap partition\n\nContinue anyway?")); + $ok &&= $::expert || $o->ask_okcancel('', _("You don't have a swap partition.\n\nContinue anyway?")); } if (arch() =~ /ia64/ && !fsedit::has_mntpoint("/boot/efi", $all_hds)) { $o->ask_warn('', _("You must have a FAT partition mounted in /boot/efi")); @@ -97,7 +97,7 @@ sub partitionWizardSolutions { if (my @truefs = grep { isTrueFS($_) } @$fstab) { #- value twice the ext2 partitions - $solutions{existing_part} = [ 6 + @truefs + @$fstab, _("Use existing partition"), sub { $o->ask_mntpoint_s($fstab) } ] + $solutions{existing_part} = [ 6 + @truefs + @$fstab, _("Use existing partitions"), sub { $o->ask_mntpoint_s($fstab) } ] } else { push @wizlog, _("There is no existing partition to use"); } @@ -127,13 +127,13 @@ sub partitionWizardSolutions { $o->set_help('resizeFATChoose'); my $part = $o->ask_from_listf('', _("Which partition do you want to resize?"), \&partition_table::description, \@ok_forloopback) or return; $o->set_help('resizeFATWait'); - my $w = $o->wait_message(_("Resizing"), _("Computing Windows filesystem bounds")); + my $w = $o->wait_message(_("Resizing"), _("Resizing Windows partition")); require resize_fat::main; my $resize_fat = eval { resize_fat::main->new($part->{device}, devices::make($part->{device})) }; $@ and die _("The FAT resizer is unable to handle your partition, the following error occured: %s", $@); my $min_win = $resize_fat->min_size; - $part->{size} > $min_linux + $min_swap + $min_freewin + $min_win or die _("Your Windows partition is too fragmented, please run ``defrag'' first"); + $part->{size} > $min_linux + $min_swap + $min_freewin + $min_win or die _("Your Windows partition is too fragmented. Please reboot your computer under Windows, run the ``defrag'' utility, then restart the Mandrake Linux installation."); $o->ask_okcancel('', _("WARNING! DrakX will now resize your Windows partition. Be careful: @@ -144,7 +144,7 @@ installation. You should also backup your data. When sure, press Ok.")) or return; my $mb_size = $part->{size} >> 11; - $o->ask_from('', _("Which size do you want to keep for windows on"), [ + $o->ask_from('', _("Which size do you want to keep for Windows on"), [ { label => _("partition %s", partition_table::description($part)), val => \$mb_size, min => $min_win >> 11, max => ($part->{size} - $min_linux - $min_swap) >> 11, type => 'range' }, ]) or return; @@ -167,7 +167,7 @@ When sure, press Ok.")) or return; 1; } ] if !$readonly; } else { - push @wizlog, _("There is no FAT partitions to resize or to use as loopback (or not enough space left)") . + push @wizlog, _("There is no FAT partition to resize or to use as loopback (or not enough space left)") . @fats ? "\nFAT partitions:" . join('', map { "\n $_->{device} $_->{free} (" . ($min_linux + $min_swap + $min_freewin) . ")" } @fats) : ''; } diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm index 3ff152681..d9782f4ea 100644 --- a/perl-install/install_steps_gtk.pm +++ b/perl-install/install_steps_gtk.pm @@ -450,7 +450,7 @@ sub choosePackagesTree { } elsif (pkgs::packageFlagUpgrade($p)) { if ($::expert) { if (pkgs::packageFlagSelected($p)) { - $o->ask_yesorno('', _("This package must be upgraded\nAre you sure you want to deselect it?")) or return; + $o->ask_yesorno('', _("This package must be upgraded.\nAre you sure you want to deselect it?")) or return; } return 1; } else { @@ -525,7 +525,7 @@ sub installPackages { )), 0, 1, 0); $details->hide if !@install_any::advertising_images; $w->sync; - $msg->set(_("Please wait, preparing installation")); + $msg->set(_("Please wait, preparing installation...")); gtkset_mousecursor_normal($cancel->window); gtkset_mousecursor_normal($details->window); my $advertize = sub { diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index d58232ca4..e0750031a 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -324,7 +324,7 @@ sub ask_mntpoint_s { my @fstab = grep { isTrueFS($_) } @$fstab; @fstab = grep { isSwap($_) } @$fstab if @fstab == 0; @fstab = @$fstab if @fstab == 0; - die _("no available partitions") if @fstab == 0; + die _("No partition available") if @fstab == 0; { my $w = $o->wait_message('', _("Scanning partitions to find mount points")); @@ -470,13 +470,13 @@ sub formatMountPartitions { #------------------------------------------------------------------------------ sub setPackages { my ($o) = @_; - my $w = $o->wait_message('', _("Looking for available packages")); + my $w = $o->wait_message('', _("Looking for available packages...")); $o->SUPER::setPackages; } #------------------------------------------------------------------------------ sub selectPackagesToUpgrade { my ($o) = @_; - my $w = $o->wait_message('', _("Finding packages to upgrade")); + my $w = $o->wait_message('', _("Finding packages to upgrade...")); $o->SUPER::selectPackagesToUpgrade(); } #------------------------------------------------------------------------------ @@ -893,7 +893,7 @@ Do you want to install the updates ?"))) || return; require crypto; eval { my @mirrors = do { my $w = $o->wait_message('', - _("Contacting Mandrake Linux web site to get the list of available mirrors")); + _("Contacting Mandrake Linux web site to get the list of available mirrors...")); crypto::mirrors() }; #- if no mirror have been found, use current time zone and propose among available. $u->{mirror} ||= crypto::bestMirror($o->{timezone}{timezone}); @@ -907,7 +907,7 @@ Do you want to install the updates ?"))) || return; return if $@ || !$u->{mirror}; my $update_medium = do { - my $w = $o->wait_message('', _("Contacting the mirror to get the list of available packages")); + my $w = $o->wait_message('', _("Contacting the mirror to get the list of available packages...")); crypto::getPackages($o->{prefix}, $o->{packages}, $u->{mirror}); }; @@ -1079,7 +1079,7 @@ sub setRootPassword { complete => sub { $sup->{password} eq $sup->{password2} or $o->ask_warn('', [ _("The passwords do not match"), _("Please try again") ]), return (1,0); length $sup->{password} < 2 * $o->{security} - and $o->ask_warn('', _("This password is too simple (must be at least %d characters long)", 2 * $o->{security})), return (1,0); + and $o->ask_warn('', _("This password is too short (it must be at least %d characters long)", 2 * $o->{security})), return (1,0); return 0 } } }, [ { label => _("Password"), val => \$sup->{password}, hidden => 1 }, @@ -1186,14 +1186,14 @@ because XFS needs a very large driver).") : '')), $o->ask_warn('', _("Insert a floppy in %s", $l{$o->{mkbootdisk}} || $o->{mkbootdisk})); } - my $w = $o->wait_message('', _("Creating bootdisk")); + my $w = $o->wait_message('', _("Creating bootdisk...")); install_steps::createBootdisk($o); } #------------------------------------------------------------------------------ sub setupBootloaderBefore { my ($o) = @_; - my $w = $o->wait_message('', _("Preparing bootloader")); + my $w = $o->wait_message('', _("Preparing bootloader...")); $o->set_help('empty'); $o->SUPER::setupBootloaderBefore($o); } @@ -1282,7 +1282,7 @@ sub generateAutoInstFloppy { my $dev = devices::make($floppy); { - my $w = $o->wait_message('', _("Creating auto install floppy")); + my $w = $o->wait_message('', _("Creating auto install floppy...")); install_any::getAndSaveAutoInstallFloppy($o, $replay, $dev) or return; } common::sync(); #- if you shall remove the floppy right after the LED switches off diff --git a/perl-install/interactive_stdio.pm b/perl-install/interactive_stdio.pm index ef77e8884..519f5ccbe 100644 --- a/perl-install/interactive_stdio.pm +++ b/perl-install/interactive_stdio.pm @@ -91,7 +91,7 @@ ask_fromW_begin: $i and ${$e->{val}} = ${$e->{list}}[$i-1], $common->{callbacks}{changed}->($ind); } elsif ($e->{type} eq 'button') { print _("Button `%s': %s", $e->{label}, may_apply($e->{format}, ${$e->{val}})), " $e->{text}\n"; - print _("Do you want to click on this button? "); + print _("Do you want to click on this button?"); my $i = readln(); ($i && $i !~ /^n/i) and $e->{clicked_may_quit}(), $common->{callbacks}{changed}->($ind); } elsif ($e->{type} eq 'label') { @@ -100,7 +100,7 @@ ask_fromW_begin: print $t; } elsif ($e->{type} eq 'entry') { print "$e->{label} $e->{text}\n"; - print _("Your choice? (default `%s'%s) ", ${$e->{val}}, ${$e->{val}} ne '' ? " enter `void' for void entry" : ''); + print _("Your choice? (default `%s'%s) ", ${$e->{val}}, ${$e->{val}} ne '' ? _(" enter `void' for void entry") : ''); my $i = readln(); ${$e->{val}} = $i || ${$e->{val}}; ${$e->{val}} = '' if ${$e->{val}} eq 'void'; diff --git a/perl-install/network/isdn.pm b/perl-install/network/isdn.pm index 5646ca01f..a6ac063d1 100644 --- a/perl-install/network/isdn.pm +++ b/perl-install/network/isdn.pm @@ -167,7 +167,7 @@ sub isdn_ask_info { my ($isdn, $netc) = @_; my $f = "$ENV{SHARE_PATH}/ldetect-lst/isdn.db"; $f = "$prefix$f" if !-e $f; - my $str= $in->ask_from_treelist( _("ISDN Configuration"), _("Select your provider.\n If it's not in the list, choose Unlisted"), + my $str= $in->ask_from_treelist( _("ISDN Configuration"), _("Select your provider.\nIf it isn't listed, choose Unlisted."), '|', ['Unlisted - edit manually', read_providers_backend($f)], 'Unlisted - edit manually') or return; @@ -182,11 +182,11 @@ sub isdn_ask_protocol { my @toto=( { description => $::expert ? _("Europe protocol (EDSS1)") : _("Europe protocol"), protokol => 2}, - { description => $::expert ? _("Protocol for the rest of the world \n no D-Channel (leased lines)") : _("Protocol for the rest of the world"), + { description => $::expert ? _("Protocol for the rest of the world\nNo D-Channel (leased lines)") : _("Protocol for the rest of the world"), protokol => 3} ); my $e = $in->ask_from_listf(_("ISDN Configuration"), - _("Which protocol do you want to use ?"), + _("Which protocol do you want to use?"), sub { $_[0]{description} }, \@toto ) or return 0; $e->{protokol}; @@ -205,7 +205,7 @@ sub isdn_ask { $in->ask_from_list_(_("ISDN Configuration"), _(" If you have an ISA card, the values on the next screen should be right.\n -If you have a PCMCIA card, you have to know the irq and io of your card. +If you have a PCMCIA card, you have to know the \"irq\" and \"io\" of your card. "), [ __("Continue"), __("Abort") ]) eq 'Continue' or goto isdn_ask_step_1; $isdn->{card_type} = 'isa'; @@ -213,7 +213,7 @@ If you have a PCMCIA card, you have to know the irq and io of your card. isdn_ask_step_2: $e = $in->ask_from_listf(_("ISDN Configuration"), - _("Which is your ISDN card ?"), + _("Which is your ISDN card?"), sub { $_[0]{description} }, [ grep {$_->{card} eq $isdn->{card_type}; } @isdndata ] ) or goto isdn_ask_step_1; $e->{$_} and $isdn->{$_} = $e->{$_} foreach qw(driver type mem io io0 io1 irq firmware); @@ -232,7 +232,7 @@ sub isdn_detect { log::l("found isdn card : $isdn->{description}; vendor : $isdn->{vendor};id : $isdn->{id}; driver : $isdn->{driver}\n"); $isdn->{description} =~ s/\|/ -- /; if ($isdn->{type} eq '') { - isdn_ask($isdn, $netc, _("I have detected an ISDN PCI Card, but I don't know the type. Please select one PCI card on the next screen.")) or return; + isdn_ask($isdn, $netc, _("I have detected an ISDN PCI card, but I don't know its type. Please select a PCI card on the next screen.")) or return; } else { isdn_detect_step_1: $isdn->{protocol}=isdn_ask_protocol() or return; diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index cf5a75bfd..835a09e6f 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -162,7 +162,11 @@ ifdown eth0 $::Wizard_no_previous=1; my @profiles=get_profiles(); $in->ask_from(_("Network Configuration Wizard"), - _("Welcome to The Network Configuration Wizard\n\nWe are about to configure your internet/network connection.\nIf you don't want to use the auto detection, deselect the checkbox.\n"), + _("Welcome to The Network Configuration Wizard. + +We are about to configure your internet/network connection. +If you don't want to use the auto detection, deselect the checkbox. +"), [ if_(@profiles > 1, { label => _("Choose the profile to configure"), val => \$netcnx->{PROFILE}, list => \@profiles }), { label => _("Use auto detection"), val => \$netc->{autodetection}, type => 'bool' }, @@ -265,7 +269,7 @@ The configuration will now be applied to your system. ") . if_($::isStandalone && $in->isa('interactive_gtk'), _("After this is done, we recommend that you restart your X environment to avoid any hostname-related problems.")) : _("Problems occured 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 doesn't work, you might want to relaunch the configuration."); if ($::isWizard) { $::Wizard_no_previous=1; $::Wizard_finished=1; diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm index b811b210a..60d8ffd41 100644 --- a/perl-install/network/network.pm +++ b/perl-install/network/network.pm @@ -290,7 +290,7 @@ sub configureNetworkIntf { } if ($net_device eq $intf->{DEVICE}) { $skip and return 1; - $text = _("WARNING: This device has been previously configured to connect to the Internet. + $text = _("WARNING: this device has been previously configured to connect to the Internet. Simply accept to keep this device configured. Modifying the fields below will override this configuration."); } @@ -385,7 +385,7 @@ sub miscellaneousNetwork { _("Proxies configuration"), [ { label => _("HTTP proxy"), val => \$u->{http_proxy} }, { label => _("FTP proxy"), val => \$u->{ftp_proxy} }, - if_(!$no_track_net, { label => _("Track network card id (usefull for laptops)"), val => \$u->{track_network_id}, type => "bool" }), + if_(!$no_track_net, { label => _("Track network card id (useful for laptops)"), val => \$u->{track_network_id}, type => "bool" }), ], complete => sub { $u->{http_proxy} =~ m,^($|http://), or $in->ask_warn('', _("Proxy should be http://...")), return 1,0; diff --git a/perl-install/network/tools.pm b/perl-install/network/tools.pm index 4d8fff949..731bd58da 100644 --- a/perl-install/network/tools.pm +++ b/perl-install/network/tools.pm @@ -53,7 +53,7 @@ sub ask_connect_now { $up=connected(); } my $m = $up ? (_("The system is now connected to Internet.") . - if_($::isInstall, _("For Security reason, it will be disconnected now.")) ) : + if_($::isInstall, _("For security reason, it will be disconnected now.")) ) : _("The system doesn't seem to be connected to internet. Try to reconfigure your connection."); if ($::isWizard) { diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm index 155462776..a75c68cfa 100644 --- a/perl-install/partition_table.pm +++ b/perl-install/partition_table.pm @@ -680,7 +680,7 @@ sub add_extended { eval { verifyPrimary($hd->{primary}) }; $@ and die _("You have a hole in your partition table but I can't use it. -The only solution is to move your primary partitions to have the hole next to the extended partitions"); +The only solution is to move your primary partitions to have the hole next to the extended partitions."); } } diff --git a/perl-install/printer.pm b/perl-install/printer.pm index 6d7a9302a..05c908c41 100644 --- a/perl-install/printer.pm +++ b/perl-install/printer.pm @@ -596,7 +596,7 @@ sub read_printer_db(;$) { "foomatic-configure -O -q |" || die "Could not run foomatic-configure"; } else { - open DBPATH, $dbpath or die "An error has occurred on $dbpath : $!"; + open DBPATH, $dbpath or die "An error occurred on $dbpath : $!"; } my $entry = {}; diff --git a/perl-install/printerdrake.pm b/perl-install/printerdrake.pm index 0e3042c2e..82b7c11df 100644 --- a/perl-install/printerdrake.pm +++ b/perl-install/printerdrake.pm @@ -142,7 +142,7 @@ sub setup_printer_connection { sub auto_detect { my ($in) = @_; { - my $w = $in->wait_message(_("Test ports"), _("Detecting devices ...")); + my $w = $in->wait_message(_("Test ports"), _("Detecting devices...")); modules::get_alias("usb-interface") and eval { modules::load("printer"); sleep(2); }; foreach (qw(lp parport_pc parport_probe parport)) { eval { modules::unload($_); }; #- on kernel 2.4 parport has to be unloaded to probe again @@ -486,7 +486,7 @@ _(" (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., 1 } # Configure and start HPOJ my $w = $in->wait_message - ('', _("Checking device and configuring HPOJ ...")); + ('', _("Checking device and configuring HPOJ...")); $ptaldevice = printer::configure_hpoj($device, @parport); if ($ptaldevice) { @@ -533,7 +533,7 @@ _(" (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., 1 #- if CUPS is the spooler, make sure that CUPS knows the device if ($printer->{SPOOLER} eq "cups") { my $w = $in->wait_message - ('', _("Making printer port available for CUPS ...")); + ('', _("Making printer port available for CUPS...")); if ($ptaldevice eq "") { printer::assure_device_is_available_for_cups($device); } else { @@ -543,7 +543,7 @@ _(" (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., 1 #- Read the printer driver database if necessary if ((keys %printer::thedb) == 0) { - my $w = $in->wait_message('', _("Reading printer database ...")); + my $w = $in->wait_message('', _("Reading printer database...")); printer::read_printer_db($printer->{SPOOLER}); } @@ -1017,10 +1017,10 @@ sub get_db_entry { my ($printer, $in) = @_; #- Read the printer driver database if necessary if ((keys %printer::thedb) == 0) { - my $w = $in->wait_message('', _("Reading printer database ...")); + my $w = $in->wait_message('', _("Reading printer database...")); printer::read_printer_db($printer->{SPOOLER}); } - my $w = $in->wait_message('', _("Preparing printer database ...")); + my $w = $in->wait_message('', _("Preparing printer database...")); my $queue = $printer->{OLD_QUEUE}; if ($printer->{configured}{$queue}) { # The queue was already configured @@ -1131,7 +1131,7 @@ sub choose_model { $in->set_help('chooseModel') if $::isInstall; #- Read the printer driver database if necessary if ((keys %printer::thedb) == 0) { - my $w = $in->wait_message('', _("Reading printer database ...")); + my $w = $in->wait_message('', _("Reading printer database...")); printer::read_printer_db($printer->{SPOOLER}); } if (!$printer::thedb{$printer->{DBENTRY}}) { @@ -1152,7 +1152,7 @@ sub get_printer_info { my ($printer, $in) = @_; #- Read the printer driver database if necessary #if ((keys %printer::thedb) == 0) { - # my $w = $in->wait_message('', _("Reading printer database ...")); + # my $w = $in->wait_message('', _("Reading printer database...")); # printer::read_printer_db($printer->{SPOOLER}); #} my $queue = $printer->{OLD_QUEUE}; @@ -1461,7 +1461,7 @@ sub setup_options { push(@userinputs, $optshortdefault); push(@widgets, { label => $printer->{ARGS}[$i]{'comment'} . - " ($printer->{ARGS}[$i]{'min'} ... " . + " ($printer->{ARGS}[$i]{'min'}... " . "$printer->{ARGS}[$i]{'max'})", #type => 'range', #min => $printer->{ARGS}[$i]{'min'}, @@ -1794,7 +1794,7 @@ sub copy_queues_from { my $oldspoolerstr; my $noninteractive = 0; { - my $w = $in->wait_message('', _("Reading printer data ...")); + my $w = $in->wait_message('', _("Reading printer data...")); @oldqueues = printer::get_copiable_queues($oldspooler, $newspooler); @oldqueues = sort(@oldqueues); $newspoolerstr = $printer::shortspooler_inv{$newspooler}; @@ -1867,7 +1867,7 @@ You can also type a new name or skip this printer.", [{label => _("New printer name"),val => \$newqueue}]))) { { my $w = $in->wait_message('', - _("Transferring %s ...", $oldqueue)); + _("Transferring %s...", $oldqueue)); printer::copy_foomatic_queue($printer, $oldqueue, $oldspooler, $newqueue) and $queuecopied = 1; @@ -1887,7 +1887,7 @@ You can also type a new name or skip this printer.", } } if ($queuecopied) { - my $w = $in->wait_message('', _("Refreshing printer data ...")); + my $w = $in->wait_message('', _("Refreshing printer data...")); printer::read_configured_queues($printer); } } @@ -1896,7 +1896,7 @@ You can also type a new name or skip this printer.", sub start_network { my ($in, $upNetwork) = @_; my $w = $in->wait_message(_("Configuration of a remote printer"), - _("Starting network ...")); + _("Starting network...")); if ($::isInstall) { return ($upNetwork and do { my $ret = &$upNetwork(); @@ -1979,7 +1979,7 @@ _("The network access was not running and could not be started. Please check you # interrupt print jobs. my $w = $in->wait_message(_("Configuration of a remote printer"), - _("Restarting printing system ...")); + _("Restarting printing system...")); return printer::SIGHUP_daemon($printer->{SPOOLER}); @@ -2221,7 +2221,7 @@ sub setup_default_spooler { printer::removelocalprintersfromapplications($printer); # Get the queues of this spooler { - my $w = $in->wait_message('', _("Reading printer data ...")); + my $w = $in->wait_message('', _("Reading printer data...")); printer::read_configured_queues($printer); } # Copy queues from former spooler @@ -2229,7 +2229,7 @@ sub setup_default_spooler { # Re-read the printer database (CUPS has additional drivers, PDQ # has no raw queue) %printer::thedb = (); - #my $w = $in->wait_message('', _("Reading printer database ...")); + #my $w = $in->wait_message('', _("Reading printer database...")); #printer::read_printer_db($printer->{SPOOLER}); } # Save spooler choice @@ -2239,7 +2239,7 @@ sub setup_default_spooler { sub configure_queue { my ($printer, $in) = @_; - my $w = $in->wait_message('', _("Configuring printer \"%s\" ...", + my $w = $in->wait_message('', _("Configuring printer \"%s\"...", $printer->{currentqueue}{queue})); $printer->{complete} = 1; printer::configure_queue($printer); @@ -2252,7 +2252,7 @@ sub install_foomatic { (!printer::files_exist((qw(/usr/bin/foomatic-configure /usr/lib/perl5/site_perl/5.6.1/Foomatic/DB.pm) )))) { - my $w = $in->wait_message('', _("Installing Foomatic ...")); + my $w = $in->wait_message('', _("Installing Foomatic...")); $in->do_pkgs->install('foomatic'); } } @@ -2318,7 +2318,7 @@ sub main { # Get the default printer if (defined($printer->{SPOOLER}) && ($printer->{SPOOLER} ne '') && ((!defined($printer->{DEFAULT})) || ($printer->{DEFAULT} eq ''))) { - my $w = $in->wait_message('', _("Preparing PrinterDrake ...")); + my $w = $in->wait_message('', _("Preparing PrinterDrake...")); $printer->{DEFAULT} = printer::get_default_printer($printer); if ($printer->{DEFAULT}) { # If a CUPS system has only remote printers and no default @@ -2481,11 +2481,11 @@ sub main { $::expert = !$::expert; # Read printer database for the new user mode %printer::thedb = (); - #my $w = $in->wait_message('', _("Reading printer database ...")); + #my $w = $in->wait_message('', _("Reading printer database...")); #printer::read_printer_db($printer->{SPOOLER}); # Re-read printer queues to switch the tree # structure between expert/normal mode. - my $w = $in->wait_message('', _("Reading printer data ...")); + my $w = $in->wait_message('', _("Reading printer data...")); printer::read_configured_queues($printer); $cursorpos = "::"; next; @@ -2786,7 +2786,7 @@ What do you want to modify on this printer?", configure_queue($printer, $in); # Delete old queue when it was renamed if (lc($printer->{QUEUE}) ne lc($printer->{OLD_QUEUE})) { - my $w = $in->wait_message('', _("Removing old printer \"%s\" ...", $printer->{OLD_QUEUE})); + my $w = $in->wait_message('', _("Removing old printer \"%s\"...", $printer->{OLD_QUEUE})); printer::remove_queue($printer, $printer->{OLD_QUEUE}); # If the default printer was renamed, correct the # the default printer setting of the spooler @@ -2838,7 +2838,7 @@ What do you want to modify on this printer?", if ($in->ask_yesorno('', _("Do you really want to remove the printer \"%s\"?", $queue), 1)) { { - my $w = $in->wait_message('', _("Removing printer \"%s\" ...", $queue)); + my $w = $in->wait_message('', _("Removing printer \"%s\"...", $queue)); if (printer::remove_queue($printer, $queue)) { $editqueue = 0; # Define a new default printer if we have -- cgit v1.2.1