summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xsamba_wizard/Samba.pm30
-rw-r--r--time_wizard/Ntp.pm12
2 files changed, 21 insertions, 21 deletions
diff --git a/samba_wizard/Samba.pm b/samba_wizard/Samba.pm
index f922c814..d23b4a5a 100755
--- a/samba_wizard/Samba.pm
+++ b/samba_wizard/Samba.pm
@@ -62,13 +62,13 @@ my $o = {
};
my %level = (
- 1 => N("All - No access restriction"),
- 2 => N("My rules - Ask me allowed and denied hosts")
+ 1 => N("All - no access restriction"),
+ 2 => N("My rules - ask me allowed and denied hosts")
);
$o->{pages} = {
welcome => {
- name => N("Samba Configuration Wizard") . "\n\n" . N("Samba allows your server to behave as a file and print server for workstations running non-Linux systems.") . "\n\n" . N("This wizard will help you configuring the Samba services of your server."),
+ name => N("Samba configuration wizard") . "\n\n" . N("Samba allows your server to behave as a file and print server for workstations running non-Linux systems.") . "\n\n" . N("This wizard will help you configuring the Samba services of your server."),
no_back => 1,
next => 'ask_workgroup'
},
@@ -89,7 +89,7 @@ $o->{pages} = {
next => 'ask_workgroup'
},
ask_banner => {
- name => N("Server Banner.") . "\n\n" . N("The banner is the way this server will be described in the Windows workstations."),
+ name => N("Server banner.") . "\n\n" . N("The banner is the way this server will be described in the Windows workstations."),
pre => sub {
$o->{var}{wiz_banner} ||= get_banner()
},
@@ -100,7 +100,7 @@ $o->{pages} = {
next => 'ask_net'
},
error_in_banner => {
- name => N("Error.") . "\n\n" . N("The Server Banner is incorrect"),
+ name => N("Error.") . "\n\n" . N("The server banner is incorrect"),
ignore => 1,
next => 'ask_banner'
},
@@ -116,7 +116,7 @@ $o->{pages} = {
next => 'ask_services'
},
ask_netmask => {
- name => N("Access control") . "\n\n" . N("* Example 1: allow all IPs in 150.203.*.*; except one\nhosts allow = 150.203. EXCEPT 150.203.6.66") . "\n\n" . N("* Example 2: allow hosts that match the given network/netmask\nhosts allow = 150.203.15.0/255.255.255.0") . "\n\n" . N("* Example 3: allow a couple of hosts\nhosts allow = lapland, arvidsjaur") . "\n\n" . N("* Example 4: allow only hosts in NIS netgroup \"foonet\", but deny access from one particular host\nhosts allow = \@foonet\nhosts deny = pirate") . "\n\n" . N("Note that access still requires suitable user-level passwords."),
+ name => N("Access control") . "\n\n" . N("* Example 1: allow all IP in 150.203.*.*; except one\nhosts allow = 150.203. EXCEPT 150.203.6.66") . "\n\n" . N("* Example 2: allow hosts that match the given network/netmask\nhosts allow = 150.203.15.0/255.255.255.0") . "\n\n" . N("* Example 3: allow a couple of hosts\nhosts allow = lapland, arvidsjaur") . "\n\n" . N("* Example 4: allow only hosts in NIS netgroup \"foonet\", but deny access from one particular host\nhosts allow = \@foonet\nhosts deny = pirate") . "\n\n" . N("Note that access still requires suitable user-level passwords."),
pre => sub {
$o->{var}{wiz_hosts_allow} ||= get_allow_host();
$o->{var}{wiz_hosts_deny} ||= get_deny_host()
@@ -129,7 +129,7 @@ $o->{pages} = {
next => 'ask_services'
},
ask_services => {
- name => N("Enabled Samba Services") . "\n\n" . N("Samba can provide a common file sharing area to your Windows workstation, and can also provide printer sharing for the printers connected to your server."),
+ name => N("Enabled Samba services") . "\n\n" . N("Samba can provide a common file sharing area to your Windows workstation, and can also provide printer sharing for the printers connected to your server."),
pre => sub {
$o->{var}{wiz_do_file_sharing} ||= get_file_sharing();
$o->{var}{wiz_do_printer_sharing} ||= 1;
@@ -138,7 +138,7 @@ $o->{pages} = {
post => \&check_services,
data => [
{ text => N("Enable file sharing area"), type => 'bool', val => \$o->{var}{wiz_do_file_sharing} },
- { text => N("Enable Server Printer Sharing"), type => 'bool', val => \$o->{var}{wiz_do_printer_sharing} },
+ { text => N("Enable server Printer Sharing"), type => 'bool', val => \$o->{var}{wiz_do_printer_sharing} },
{ text => N("Make home directories available for their owners"), type => 'bool', val => \$o->{var}{wiz_do_homes} },
],
next => 'ask_dir'
@@ -173,8 +173,8 @@ $o->{pages} = {
},
# post => \&check_users,
data => [
- { label => N("read list:"), help => N("root, fred, \@users, \@wheel"), val => \$o->{var}{wiz_read_list} },
- { label => N("write list:"), help => N("root, fred, \@users, \@wheel"), val => \$o->{var}{wiz_write_list} },
+ { label => N("Read list:"), help => N("root, fred, \@users, \@wheel"), val => \$o->{var}{wiz_read_list} },
+ { label => N("Write list:"), help => N("root, fred, \@users, \@wheel"), val => \$o->{var}{wiz_write_list} },
],
next => 'ask_printers'
},
@@ -210,13 +210,13 @@ $o->{pages} = {
$o->{var}{file_sharing} = $o->{var}{wiz_do_file_sharing} ? N("enabled") : N("disabled");
$o->{var}{printer_sharing} = $o->{var}{wiz_do_printer_sharing} ? N("enabled") : N("disabled");
$o->{var}{shared_homes} = $o->{var}{wiz_do_homes} ? N("enabled") : N("disabled")
- },
+ },
data => [
{ label => N("Workgroup:"), fixed_val => \$o->{var}{wiz_workgroup} },
- { label => N("Server Banner:"), fixed_val => \$o->{var}{wiz_banner} },
- { label => N("File Sharing:"), fixed_val => \$o->{var}{file_sharing} },
+ { label => N("Server banner:"), fixed_val => \$o->{var}{wiz_banner} },
+ { label => N("File sharing:"), fixed_val => \$o->{var}{file_sharing} },
{ label => N("Shared directory:"), fixed_val => \$o->{var}{wiz_dir} },
- { label => N("Print Server:"), fixed_val => \$o->{var}{printer_sharing} },
+ { label => N("Print server:"), fixed_val => \$o->{var}{printer_sharing} },
{ label => N("Home:"), fixed_val => \$o->{var}{shared_homes} },
{ label => N("Printers:"), fixed_val => \$o->{var}{printers} },
],
@@ -224,7 +224,7 @@ $o->{pages} = {
next => 'end'
},
end => {
- name => N("Congratulations") . "\n\n" . N("The wizard successfully configured your Samba server."),
+ name => N("Congratulations") . "\n\n" . N("The wizard successfully configured your Samba server."),
end => 1,
next => 0
},
diff --git a/time_wizard/Ntp.pm b/time_wizard/Ntp.pm
index 9ea8144f..1d5fa309 100644
--- a/time_wizard/Ntp.pm
+++ b/time_wizard/Ntp.pm
@@ -84,14 +84,14 @@ $o->{pages} = {
next => 'config'
},
config => {
- name => N("Time Servers") . "\n\n" . N("Select a primary and secondary server from the list.") . "\n\n" . N("(we recommend using the server pool.ntp.org twice as this server randomly points to available time servers)"),
+ name => N("Time servers") . "\n\n" . N("Select a primary and secondary server from the list.") . "\n\n" . N("(we recommend using the server pool.ntp.org twice as this server randomly points to available time servers)"),
pre => sub {
$o->{var}{varserver1} ||= 'pool.ntp.org';
$o->{var}{varserver2} ||= 'pool.ntp.org';
},
data => [
- { label => N("Primary Time Server:"), val => \$o->{var}{varserver1}, list => [ keys %ntp_servers ], format => sub { $ntp_servers{$_[0]} } },
- { label => N("Secondary Time Server:"), val => \$o->{var}{varserver2}, list => [ keys %ntp_servers ], format => sub { $ntp_servers{$_[0]} } },
+ { label => N("Primary time server:"), val => \$o->{var}{varserver1}, list => [ keys %ntp_servers ], format => sub { $ntp_servers{$_[0]} } },
+ { label => N("Secondary time server:"), val => \$o->{var}{varserver2}, list => [ keys %ntp_servers ], format => sub { $ntp_servers{$_[0]} } },
],
next => 'choose_region'
},
@@ -127,8 +127,8 @@ $o->{pages} = {
},
post => \&test,
data => [
- { label => N("Primary Time Server:"), fixed_val => \$o->{var}{varserver1} },
- { label => N("Secondary Time Server:"), fixed_val => \$o->{var}{varserver2} },
+ { label => N("Primary time server:"), fixed_val => \$o->{var}{varserver1} },
+ { label => N("Secondary time server:"), fixed_val => \$o->{var}{varserver2} },
{ label => N("Time zone:"), fixed_val => \$o->{var}{wiz_timezone} },
],
next => 'end'
@@ -154,7 +154,7 @@ $o->{pages} = {
'end'
} else {
'test_server'
- }
+ }
},
data => [
{ val => \$o->{var}{action}, list => [ keys %actions ], format => sub { $actions{$_[0]} } },