summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xnews_wizard/Inn.pm19
-rw-r--r--nisautofs_wizard/Nisautofs.pm20
2 files changed, 19 insertions, 20 deletions
diff --git a/news_wizard/Inn.pm b/news_wizard/Inn.pm
index c2689786..a9bf56bf 100755
--- a/news_wizard/Inn.pm
+++ b/news_wizard/Inn.pm
@@ -41,28 +41,28 @@ my $o = {
$o->{pages} = {
welcome => {
- name => N("Welcome to the News Wizard") . "\n\n" . N("This wizard will help you configuring the Internet News services for your network."),
+ name => N("Welcome to the News Wizard") . "\n\n" . N("This wizard will help you configuring the internet News services for your network."),
no_back => 1,
next => 'ask_news_server'
},
ask_news_server => {
- name => N("News Server") . "\n\n" . N("The news server name is the name of the host providing the Internet news to your network; the name is usually provided by your provider.") . "\n\n" . N("Internet host names must be in the form \"host.domain.domaintype\"; for example, if your provider is \"provider.com\", the internet news server is usually \"news.provider.com\"."),
+ name => N("News server") . "\n\n" . N("The news server name is the name of the host providing the internet news to your network; the name is usually provided by your provider.") . "\n\n" . N("Internet host names must be in the form \"host.domain.domaintype\"; for example, if your provider is \"provider.com\", the internet news server is usually \"news.provider.com\"."),
pre => sub {
$o->{var}{news_server} ||= get_server();
},
data => [
- { label => N("News Server Name:"), val => \$o->{var}{news_server} },
+ { label => N("News server name:"), val => \$o->{var}{news_server} },
],
post => sub { $o->{var}{news_server} || 'error_in_news_server' },
next => 'ask_news_freq'
},
ask_news_freq => {
- name => N("Polling Period") . "\n\n" . N("Your server will regularly poll the News Server for obtaning the latest Internet News; the polling period set the interval between two consecutive polling.") . "\n\n" . N("Depending on the kind of internet connection you have, an appropriate polling period can change between 6 and 24 hours."),
+ name => N("Polling period") . "\n\n" . N("Your server will regularly poll the News server for obtaning the latest internet News; the polling period set the interval between two consecutive polling.") . "\n\n" . N("Depending on the kind of internet connection you have, an appropriate polling period can change between 6 and 24 hours."),
pre => sub {
$o->{var}{news_freq} ||= 24;
},
data => [
- { label => N("Polling Period (Hours):"), val => \$o->{var}{news_freq} },
+ { label => N("Polling period (hours):"), val => \$o->{var}{news_freq} },
],
post => \&check_valid_hours,
next => 'summary'
@@ -83,17 +83,16 @@ $o->{pages} = {
next => 'ask_news_freq'
},
summary => {
- name => N("Configuring the Internet News") . "\n\n" . N("The wizard collected the following parameters
-needed to configure your Internet News Service:") . "\n\n" . N("To accept these values, and configure your server, click the Next button or use the Back button to correct them."),
+ name => N("Configuring the internet News") . "\n\n" . N("The wizard collected the following parameters needed to configure your internet News service:") . "\n\n" . N("To accept these values, and configure your server, click the next button or use the back button to correct them."),
data => [
- { label => N("News Server:"), fixed_val => \$o->{var}{news_server} },
- { label => N("Polling Interval:"), fixed_val => \$o->{var}{news_freq} },
+ { label => N("News server:"), fixed_val => \$o->{var}{news_server} },
+ { label => N("Polling interval:"), fixed_val => \$o->{var}{news_freq} },
],
post => \&do_it,
next => 'end'
},
end => {
- name => N("Congratulations") . "\n\n" . N("The wizard successfully configured your Internet News service of your server."),
+ name => N("Congratulations") . "\n\n" . N("The wizard successfully configured your internet News service of your server."),
end => 1,
next => 0
},
diff --git a/nisautofs_wizard/Nisautofs.pm b/nisautofs_wizard/Nisautofs.pm
index cf3755a4..db63d8bf 100644
--- a/nisautofs_wizard/Nisautofs.pm
+++ b/nisautofs_wizard/Nisautofs.pm
@@ -68,8 +68,8 @@ my $o = {
};
my %level = (
- 1 => N("NIS Server with autofs map"),
- 2 => N("NIS Client"),
+ 1 => N("NIS server with autofs map"),
+ 2 => N("NIS client"),
);
$o->{pages} = {
@@ -89,8 +89,8 @@ $o->{pages} = {
nis_client => {
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} },
+ { label => N("NIS server:"), val => \$o->{var}{NISSERVER} },
+ { label => N("NIS domain:"), val => \$o->{var}{NISDOMAIN} },
],
next => 'summaryclient',
},
@@ -111,10 +111,10 @@ $o->{pages} = {
{ label => N("Home NIS:"), fixed_val => \$o->{var}{HOMENIS} },
{ label => N("NIS domainname:"), fixed_val => \$o->{var}{NISDOMAIN} },
{ label => N("NIS directory:"), fixed_val => \$o->{var}{NIS_DIRMAKEFILE} },
- { label => N("Network File:"), fixed_val => \$o->{var}{NETWORKFILE} },
- { label => N("NFS exports:"), fixed_val => \$o->{var}{NFSEXPORTS} },
- { label => N("Auto master:"), fixed_val => \$o->{var}{AUTOMASTER} },
- { label => N("Auto home:"), fixed_val => \$o->{var}{AUTOHOME} },
+# { label => N("Network file:"), fixed_val => \$o->{var}{NETWORKFILE} },
+# { label => N("NFS exports:"), fixed_val => \$o->{var}{NFSEXPORTS} },
+# { label => N("Auto master:"), fixed_val => \$o->{var}{AUTOMASTER} },
+# { label => N("Auto home:"), fixed_val => \$o->{var}{AUTOHOME} },
],
post => \&do_it_server,
next => 'endserver',
@@ -307,7 +307,7 @@ sub uninstall_rpm {
sub do_it_server {
return if $::testing;
my $in = 'interactive'->vnew('su', 'nisautofsconfig');
- my $w = $in->wait_message(N("NIS with autofs map"), N("Configuring your system to be a NIS server with Autofs map..."));
+ my $w = $in->wait_message(N("NIS with Autofs map"), N("Configuring your system to be a NIS server with Autofs map..."));
# system("urpme --auto autofs") if (system("/bin/rpm -q autofs >/dev/null"));
uninstall_rpm('autofs');
system("urpmi --auto --auto-select ypserv");
@@ -336,7 +336,7 @@ sub do_it_server {
sub do_it_client {
return if $::testing;
my $in = 'interactive'->vnew('su', 'nisautofsclient');
- my $w = $in->wait_message(N("NIS Client"), N("Configuring your system as NIS Client ..."));
+ my $w = $in->wait_message(N("NIS client"), N("Configuring your system as NIS client ..."));
uninstall_rpm('ypserv');
system("urpmi --auto-select --auto autofs");
test_autofile();