summaryrefslogtreecommitdiffstats
path: root/perl-install/network
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install/network')
-rw-r--r--perl-install/network/isdn.pm12
-rw-r--r--perl-install/network/netconnect.pm8
-rw-r--r--perl-install/network/network.pm4
-rw-r--r--perl-install/network/tools.pm2
4 files changed, 15 insertions, 11 deletions
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) {