summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--dns_wizard/Bind.pm8
-rwxr-xr-xftp_wizard/Proftpd.pm2
-rw-r--r--installsrv_wizard/Installsrv.pm8
-rw-r--r--nisautofs_wizard/Nisautofs.pm19
-rwxr-xr-xpostfix_wizard/Postfix.pm16
5 files changed, 27 insertions, 26 deletions
diff --git a/dns_wizard/Bind.pm b/dns_wizard/Bind.pm
index ff57104a..9d5a3ad1 100644
--- a/dns_wizard/Bind.pm
+++ b/dns_wizard/Bind.pm
@@ -123,7 +123,7 @@ $o->{pages} = {
next => 'ipforward',
},
addhost => {
- name => N("Client identification:") . "\n\n" . N("Your client on the network will be identified by name, as in clientname.company.net. Every machine on the network must have a (unique) IP address, in the usual dotted syntax.") . "\n\n" . N("(you don't need to type the domain after the name)") . "\n\n" . N("Note that the given IP address and client name should be unique in the network."),
+ name => N("Client identification:") . "\n\n" . N("Your client on the network will be identified by name, as in clientname.company.net. Every machine on the network must have a (unique) IP address, in the usual dotted syntax.") . "\n\n" . N("(You don't need to add the domain after the name)") . "\n\n" . N("Note that the given IP address and client name should be unique in the network."),
data => [
{ label => N("Name of the machine:"), val => \$o->{var}{CLIENTNAME} },
{ label => N("IP address of the machine:"), val => \$o->{var}{CLIENTIP} },
@@ -132,7 +132,7 @@ $o->{pages} = {
next => 'summaryadd',
},
removehost => {
- name => N("Remove host:") . "\n\n" . N("Remove a host in existing dns configuration.") . "\n\n" . N("Choose the host you want to remove in the following list."),
+ name => N("Remove host:") . "\n\n" . N("Remove a host in existing DNS configuration.") . "\n\n" . N("Choose the host you want to remove in the following list."),
data => [
{ label => N("Computer Name:"), val => \$o->{var}{CLIENTNAME}, fixed_list => \@list_hosts },
],
@@ -205,7 +205,7 @@ $o->{pages} = {
end => 1,
},
summaryslave => {
- name => N("Ok Now building your DNS slave configuration") . "\n\n" . N("with this configuration:"),
+ name => N("Wizard will Now build your DNS slave configuration") . "\n\n" . N("with this configuration:"),
data => [
{ label => N("IP Address of the master DNS server:"), fixed_val => \$o->{var}{IPMASTER} },
],
@@ -266,7 +266,7 @@ $o->{pages} = {
},
error_end => {
name => N("Failed"),
- data => [ { label => N("Relaunch drakwizard, and try to change some parameters.") } ],
+ data => [ { label => N("Please Relaunch drakwizard, and try to change some parameters.") } ],
no_back => 1,
end => 1,
next => 0,
diff --git a/ftp_wizard/Proftpd.pm b/ftp_wizard/Proftpd.pm
index a633702b..017003d0 100755
--- a/ftp_wizard/Proftpd.pm
+++ b/ftp_wizard/Proftpd.pm
@@ -112,7 +112,7 @@ $o->{pages} = {
next => 'config',
},
error_shell => {
- name => N("I can't find bash in list of shells ! It seems you modify it by hand ! Please correct."),
+ name => N("I can't find bash in list of shells! It seems you modify it by hand ! Please correct."),
no_back => 1,
end => 1,
next => 0,
diff --git a/installsrv_wizard/Installsrv.pm b/installsrv_wizard/Installsrv.pm
index fc213b47..42803d37 100644
--- a/installsrv_wizard/Installsrv.pm
+++ b/installsrv_wizard/Installsrv.pm
@@ -68,15 +68,15 @@ $o->{pages} = {
next => 'summary_srv',
},
error_dir_dest => {
- name => N("Destination directory could not be '/var/install/'") . "\n\n" . N("ie use: /var/install/mdk-release"),
+ name => N("The destination directory could not be '/var/install/'") . "\n\n" . N("ie use: /var/install/mdk-release"),
next => 'install_srv',
},
error_dir => {
- name => N("Error, source directory must be a directory with full Mandrake installation directory."),
+ name => N("Error, the source directory must be a directory with full Mandrake installation directory."),
next => 'install_srv',
},
dir_already_use => {
- name => N("Destination directory already in use, please choose another one."),
+ name => N("The Destination directory already in use, please choose another one."),
next => 'install_srv',
},
summary_srv => {
@@ -95,7 +95,7 @@ $o->{pages} = {
next => 'end',
},
end => {
- name => N("Congratulations, Mandrake Install server is now ready."),
+ name => N("Congratulations, Mandrake Install server is now ready. You can now configure a DHCP server with PXE suport, and a PXE server. So it will be very easy to install Mandrake through network."),
end => 1,
no_back => 1,
next => 0
diff --git a/nisautofs_wizard/Nisautofs.pm b/nisautofs_wizard/Nisautofs.pm
index 4954e924..cf3755a4 100644
--- a/nisautofs_wizard/Nisautofs.pm
+++ b/nisautofs_wizard/Nisautofs.pm
@@ -33,7 +33,8 @@ use MDK::Wizard::Wizcommon;
# test root capa
my $wiz = new MDK::Wizard::Wizcommon;
-my $NISDOMAIN = $wiz->{net}->network_get("NISDOMAIN");
+#my $NISDOMAIN = $wiz->{net}->network_get("NISDOMAIN");
+my $NISDOMAIN = chomp_(`dnsdomainname`);
my @HOST = split('\.', $wiz->{net}->network_get("HOSTNAME"));
my $HOST = @HOST[0]; # just need basename and not full qualified computer hostname (with domainaname)
my $NIS_DIRMAKEFILE = "/var/yp/";
@@ -60,7 +61,7 @@ my $o = {
defaultimage => "$ENV{__WIZ_HOME__}/nisautofs_wizard/images/nisautofs.png",
init => sub {
if (member($NISDOMAIN, qw(localdomain (none)))) {
- return 0, N("You need to readjust your NIS domainname. For a NIS server you need a correct NIS domainname, not equal to localdomain or none. Add NISDOMAIN=your_nis_domain in /etc/sysconfig/network file, and do a: nisdomainname your_nis_domain.")
+ return 0, N("You need to readjust your NIS domainname. For a NIS server you need a correct NIS domainname, not equal to localdomain or none.")
}
1
},
@@ -73,7 +74,7 @@ my %level = (
$o->{pages} = {
welcome => {
- name => N("NIS server with autofs map") . "\n\n" . N("Setup a NIS server with autofs map, auto.home and auto.master files.") . "\n\n" . N("Client can automatically mount their home directory when they log on a NIS client computer network."),
+ name => N("NIS server with autofs map") . "\n\n" . N("Setup a NIS server with autofs map, auto.home and auto.master files.") . "\n\n" . N("User automatically mount their home directory from server, when they log on a NIS client computer network."),
no_back => 1,
pre => sub { $o->{var}{wiz_level} ||= 1 },
post => sub { if ($o->{var}{wiz_level} == 2) {
@@ -86,7 +87,7 @@ $o->{pages} = {
next => 'nis_server',
},
nis_client => {
- name => N("Configure computer to be a NIS client") . "\n\n" . N("You just have to put nisdomain and nisserver"),
+ name => N("Configure computer to be a NIS client") . "\n\n" . N("You just have to put nisdomain and nisserver."),
data => [
{ label => N("NIS Server:"), val => \$o->{var}{NISSERVER} },
{ label => N("NIS Domain:"), val => \$o->{var}{NISDOMAIN} },
@@ -94,7 +95,7 @@ $o->{pages} = {
next => 'summaryclient',
},
nis_server => {
- name => N("NIS server with autofs map") . "\n\n" . N("NIS server: name of your computer.") . "\n" . N("Home NIS: home directory for users on NIS server. This directory will be export through NFS server.") . "\n" . N("NIS domain: NIS domain for your NIS server."),
+ name => N("NIS server with autofs map") . "\n\n" . N("A NIS server is usefull to create user, hostname database. The wizard also build autofs map, so it provides the capabilitie for NIS user to automount their home directory on a NIS client computer.") . "\n\n" . N("NIS server: name of your computer.") . "\n" . N("Home NIS: home base directory for users on NIS server. This directory will be export through NFS server.") . "\n" . N("NIS domain: NIS domain to use (generally same as your DNS domainaname)."),
data => [
{ label => N("NIS server:"), val => $HOST },
{ label => N("Home NIS:"), val => \$o->{var}{HOMENIS} },
@@ -104,7 +105,7 @@ $o->{pages} = {
next => 'summaryserver',
},
summaryserver => {
- name => N("Will set your NIS server with autofs map"),
+ name => N("The wizard will set your NIS server with autofs map"),
data => [
{ label => N("NIS server:"), fixed_val => \$HOST },
{ label => N("Home NIS:"), fixed_val => \$o->{var}{HOMENIS} },
@@ -119,7 +120,7 @@ $o->{pages} = {
next => 'endserver',
},
summaryclient => {
- name => N("The ypbind daemon binds NIS client to a NIS domain") . "\n\n" . N("NIS server: hostname of the nisserver.") . "\n" . N("NIS domainname: name of NIS domainname."),
+ name => N("The YPBIND daemon finds the server for NIS domains and maintains the NIS binding informationdaem.") . "\n\n" . N("NIS server: hostname of the NIS server.") . "\n" . N("NIS domainname: name of NIS domain."),
data => [
{ label => N("NIS server:"), fixed_val => \$o->{var}{NISSERVER} },
{ label => N("NIS domainname:"), fixed_val => \$o->{var}{NISDOMAIN} },
@@ -128,11 +129,11 @@ $o->{pages} = {
next => 'endclient',
},
error_homedir => {
- name => N("Error should be a directory"),
+ name => N("Error should be a directory."),
next => 'nis_server',
},
error_nisd => {
- name => N("Error nisdomainame should be correct (not none or localdomain)") . "\n\n" . N("Please adjust with domainname command or in /etc/sysconfig/network file (NISDOMAIN=yournisdomain)"),
+ name => N("Error nisdomainame should not be 'none' or 'localdomain'") . "\n\n" . N("Please adjust it."),
end => 1,
next => 0,
},
diff --git a/postfix_wizard/Postfix.pm b/postfix_wizard/Postfix.pm
index 46991f39..aac18dae 100755
--- a/postfix_wizard/Postfix.pm
+++ b/postfix_wizard/Postfix.pm
@@ -35,16 +35,16 @@ my $wiz_domain_name = $wiz->{net}->network_get("DOMAINNAME");
my $wiz_host_name = $wiz->{net}->network_get("HOSTNAME");
-my $o = {
+my $o = {
name => N("Postfix wizard"),
- var => {
+ var => {
wiz_mail_masquerade => '',
wiz_ext_mail_relay => '',
wiz_myorigin => $wiz_domain_name,
},
init => sub {
check_sendmail();
- my $t = grep { /$wiz_host_name/ } cat_("/etc/hosts");
+ my $t = any { /$wiz_host_name/ } cat_("/etc/hosts");
if ($t == 0) {
return 0, N("Error, can't find your hostname in /etc/hosts. Exiting.")
}
@@ -63,7 +63,7 @@ my %level = (
$o->{pages} = {
welcome => {
- name => N("Internet Mail Configuration Wizard") . "\n\n" . N("This wizard will help you configuring the Internet Mail services for your network, or configure an Internet Mail server."),
+ name => N("Internet Mail Configuration Wizard") . "\n\n" . N("This wizard will help you configuring an Internet Mail serer for your network, or configure an External Mail server."),
no_back => 1,
pre => sub {
$o->{var}{wiz_level} ||= 1;
@@ -141,18 +141,18 @@ $o->{pages} = {
next => 'endext'
},
summaryint => {
- name => N("Configuring the Internal Mail Server"),
+ name => N("The wizard now will configure an Internal Mail Server."),
post => \&do_it_internal,
next => 'endext'
},
endext => {
- name => N("Congratulations") . "\n\n" . N("The wizard successfully configured your Internet Mail service of your server."),
+ name => N("Congratulations") . "\n\n" . N("The wizard successfully configured your Externet Mail server."),
end => 1,
next => 0
},
error_end => {
name => N("Failed"),
- data => [ { label => N("Relaunch drakwizard, and try to change some parameters.") } ],
+ data => [ { label => N("Please relaunch drakwizard, and try to change some parameters.") } ],
no_back => 1,
end => 1,
next => 0,
@@ -169,7 +169,7 @@ sub new {
sub check_sendmail {
my $in = 'interactive'->vnew('su', 'Check sendmail');
my $w = $in->wait_message(N("Postfix Server"), N("Check if sendmail is installed, to avoid conflict...."));
- my $test = grep { /sendmail/ } system("rpm -qa sendmail");
+ my $test = any { /sendmail/ } system("rpm -qa sendmail");
!$test or return 'error_sendmail';
undef $w;
}