diff options
| -rwxr-xr-x | dhcp_wizard/Dhcp.pm | 2 | ||||
| -rw-r--r-- | installsrv_wizard/Installsrv.pm | 4 | ||||
| -rwxr-xr-x | kolab_wizard/Kolab.pm | 2 | ||||
| -rw-r--r-- | ldap_wizard/ldap.pm | 4 | ||||
| -rw-r--r-- | nisautofs_wizard/Nisautofs.pm | 6 | ||||
| -rw-r--r-- | pxe_wizard/Pxe.pm | 12 |
6 files changed, 15 insertions, 15 deletions
diff --git a/dhcp_wizard/Dhcp.pm b/dhcp_wizard/Dhcp.pm index 43857a6e..122a389c 100755 --- a/dhcp_wizard/Dhcp.pm +++ b/dhcp_wizard/Dhcp.pm @@ -61,7 +61,7 @@ $o->{pages} = { next => 'ip_range' }, ip_range => { - name => N("Range of addresses used by dhcp") . "\n\n\n" . N("Select the range of addresses assigned to the workstations by the DHCP service; unless you have special needs, you can safely accept the proposed values. (ie: 192.168.100.20 192.168.100.40)") . "\n\n" . N("If You want to enable PXE in your dhcp server please check the box (Pre-boot eXecution Environment, a protocol that allow computers to boot through the network)."), + name => N("Range of addresses used by DHCP") . "\n\n\n" . N("Select the range of addresses assigned to the workstations by the DHCP service; unless you have special needs, you can safely accept the proposed values. (ie: 192.168.100.20 192.168.100.40)") . "\n\n" . N("If you want to enable PXE in your dhcp server please check the box (Pre-boot eXecution Environment, a protocol that allows computers to boot through the network)."), pre => sub { $o->{var}{ip1} ||= compute_range(); $o->{var}{ip2} ||= compute_range2(); diff --git a/installsrv_wizard/Installsrv.pm b/installsrv_wizard/Installsrv.pm index 51612dd7..a3843592 100644 --- a/installsrv_wizard/Installsrv.pm +++ b/installsrv_wizard/Installsrv.pm @@ -72,7 +72,7 @@ $o->{pages} = { next => 'install_srv', }, error_dir => { - name => N("Error, the source directory must be a directory with full Mandrake installation directory."), + name => N("Error, the source path must be a directory with full Mandrake installation directory."), next => 'install_srv', }, dir_already_use => { @@ -95,7 +95,7 @@ $o->{pages} = { next => 'end', }, end => { - 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."), + name => N("Congratulations, Mandrake Install server is now ready. You can now configure a DHCP server with PXE support, and a PXE server. So it will be very easy to install Mandrake through a network."), end => 1, no_back => 1, next => 0 diff --git a/kolab_wizard/Kolab.pm b/kolab_wizard/Kolab.pm index 88c6af17..422905a4 100755 --- a/kolab_wizard/Kolab.pm +++ b/kolab_wizard/Kolab.pm @@ -96,7 +96,7 @@ $o->{pages} = { next => 'end' }, end => { - name => N("Congratulations") . "\n\n" . N("The kolab server is now configured and running. Log in as 'manager' with the password you entered."), + name => N("Congratulations") . "\n\n" . N("The kolab server is now configure and running. Log in as 'manager' with the password you entered."), end => 1, next => 0 }, diff --git a/ldap_wizard/ldap.pm b/ldap_wizard/ldap.pm index 6e823605..4f11dd8d 100644 --- a/ldap_wizard/ldap.pm +++ b/ldap_wizard/ldap.pm @@ -176,8 +176,8 @@ RootDN is the manager of your ldap server."), next => 0 }, endadd => { - name => N("Successfully add data"), - data => [ { label => N("The wizard successfully add entry in ldap") } ], + name => N("Successfully added data"), + data => [ { label => N("The wizard successfully added an entry in ldap") } ], no_back => 1, end => 1, next => 0, diff --git a/nisautofs_wizard/Nisautofs.pm b/nisautofs_wizard/Nisautofs.pm index f237853e..de312857 100644 --- a/nisautofs_wizard/Nisautofs.pm +++ b/nisautofs_wizard/Nisautofs.pm @@ -95,7 +95,7 @@ $o->{pages} = { next => 'summaryclient', }, nis_server => { - name => N("NIS server with autofs map") . "\n\n" . N("A NIS server is useful to create user, hostname database. The wizard also build autofs map, so it provides the capabilities 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)."), + name => N("NIS server with autofs map") . "\n\n" . N("A NIS server is useful to create user, hostname database. The wizard also build autofs map, so it provides the capabilities 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 exported 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} }, @@ -129,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 not be 'none' or 'localdomain'") . "\n\n" . N("Please adjust it."), + name => N("Error: nisdomainame should not be 'none' or 'localdomain'.") . "\n\n" . N("Please adjust it."), end => 1, next => 0, }, diff --git a/pxe_wizard/Pxe.pm b/pxe_wizard/Pxe.pm index 243118ed..90d17dea 100644 --- a/pxe_wizard/Pxe.pm +++ b/pxe_wizard/Pxe.pm @@ -153,14 +153,14 @@ $o->{pages} = { next => 'summaryaddrdz', }, removeimg => { - name => N("Remove a boot image") . "\n\n" . N("Please choose the PXE boot image you want to remove from PXE server.") . "\n\n" . N("The PXE boot image, and the related entry in PXE menu will be deleted."), + name => N("Remove a boot image") . "\n\n" . N("Please choose the PXE boot image you want to remove from the PXE server.") . "\n\n" . N("The PXE boot image, and the related entry in PXE menu will be deleted."), data => [ { label => N("Boot image to remove:"), val => \$o->{var}{IMGTOREMOVE}, fixed_list => \@list_menu }, ], next => 'summaryremove', }, modifyimg => { - name => N("Add options to boot image") . "\n\n" . N("In some case, you want to add some option to PXE boot image. This wizard provides an easy way to custom boot image with common parameters.") . "\n\n" . N("Please choose, from the list below, the PXE boot image you want to modify"), + name => N("Add options to boot image") . "\n\n" . N("In some cases, you want to add some options to the PXE boot image. This wizard provides an easy way to customize a boot image with common parameters.") . "\n\n" . N("Please choose, from the list below, the PXE boot image you want to modify"), data => [ { label => N("Boot image to modify:"), val => \$o->{var}{IMGTOMODIFY}, fixed_list => \@list_menu }, ], @@ -168,7 +168,7 @@ $o->{pages} = { next => 'gomodify', }, gomodify => { - name => N("Add option to PXE boot disk") . "\n\n" . N("Server IP: IP address of server, which contain installation directory. You can create one with MDK install server wizard.") . "\n" . N("Install directory: the full path to MDK install server directory") . "\n" . N("Installation method: choose NFS or HTTP."), + name => N("Add option to the PXE boot disk") . "\n\n" . N("Server IP: IP address of the server, which contains installation directory. You can create one with MDK install server wizard.") . "\n" . N("Install directory: the full path to MDK install server directory") . "\n" . N("Installation method: choose NFS or HTTP."), data => [ { label => N("Boot image to modify:"), fixed_val => \$o->{var}{i} }, { label => N("Server IP:"), val => \$o->{var}{IP} }, @@ -190,11 +190,11 @@ $o->{pages} = { next => 'summarymodify', }, pxeserver => { - name => N("Set PXE server") . "\n\n" . N("We need to use a special dhcpd.conf file with PXE parameter. To set up such a DHCP server, launch the DHCP wizard and check the box 'Enable PXE'. If you don't do that, PXE query will not be answered by this server.") . "\n" . N("Now the wizard will configure all needed default configurations files to allow computers to boot through the network."), + name => N("Set PXE server") . "\n\n" . N("We need to use a special dhcpd.conf file with PXE parameter. To set up such a DHCP server, launch the DHCP wizard and check the box 'Enable PXE'. If you don't do that, PXE query will not be answered by this server.") . "\n" . N("Now the wizard will configure all needed default configuration files to allow computers to boot through the network."), next => 'summaryserver', }, error_img => { - name => N("Please provide a bootable image. To boot through network, network computer need a boot image."), + name => N("Please provide a bootable image. To boot through a network, network computers need a boot image."), next => 'addimg', }, needimg => { @@ -206,7 +206,7 @@ $o->{pages} = { }, }, error_imgrdz => { - name => N("Please provide an all.rdz image, wich contain all drivers. You can find one in first CD of Mandrakesoft product, in /isolinux/alt0/ directory."), + name => N("Please provide an all.rdz image, wich contains all drivers. You can find one on the first CD of Mandrakelinux distribution, in /isolinux/alt0/ directory."), next => 'addimgrdz', }, error_path_img => { |